diff --git a/Dockerfile b/Dockerfile
index 5dd2b2ae..f3150dbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 FROM php:8.2.23-apache
+ENV APACHE_DOCUMENT_ROOT /opt/ianseo
 # Required dependencies
 RUN apt-get update && apt-get install -y \
   libfreetype6-dev \
@@ -14,16 +15,17 @@ RUN apt-get update && apt-get install -y \
   zlib1g zlib1g-dev \
   libpng16-16 libpng-dev \
   libonig5 libonig-dev \
+  && pecl update-channels \
   && docker-php-ext-configure gd \
   && docker-php-ext-install gd \
   && docker-php-ext-install mysqli \
   && docker-php-ext-install curl \
   && docker-php-ext-install mbstring \
   && docker-php-ext-install intl \
-  && docker-php-ext-install zip
-RUN /usr/bin/yes '' | /usr/local/bin/pecl install mcrypt-1.0.6
-RUN /usr/bin/yes '' | /usr/local/bin/pecl install imagick
-RUN apt-get remove \
+  && docker-php-ext-install zip \
+  && /usr/bin/yes '' | /usr/local/bin/pecl install mcrypt-1.0.6 \
+  && /usr/bin/yes '' | /usr/local/bin/pecl install imagick \
+  && apt-get remove \
   libfreetype6-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -37,21 +39,17 @@ RUN apt-get remove \
   libonig-dev \
   apt-get clean all \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-  rm -rf /var/lib/apt/lists/* ; \
-  pecl update-channels ; \
+  rm -rf /var/lib/apt/lists/* /var/cache/apt/archives ; \
   rm -rf /usr/local/src ; \
   rm -rf /tmp/pear ~/.pearrc
 # ianseo setup
 COPY src/ /opt/ianseo
-RUN chmod -R a+wX /opt/ianseo
-# Apache settings
-ENV APACHE_DOCUMENT_ROOT /opt/ianseo
-RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' \
+RUN chmod -R a+wX /opt/ianseo \
+  && sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' \
   /etc/apache2/sites-available/*.conf && \
   sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' \
   /etc/apache2/apache2.conf /etc/apache2/conf-enabled/*.conf
-COPY apache/ianseo.conf /etc/apache2/conf-enabled/
-COPY apache/ianseo.ini /etc/apache2/conf-enabled/
+COPY apache/ /etc/apache2/conf-enabled/
 COPY php/php.ini /usr/local/etc/php
 COPY php/docker-php-ext-ianseo.ini /usr/local/etc/php/conf.d
 # COPY php/ianseo.config.inc.php /opt/ianseo/Common/config.inc.php
diff --git a/README.md b/README.md
index 76b55afc..0dff78e1 100644
--- a/README.md
+++ b/README.md
@@ -1,34 +1,64 @@
-# i@nseo
+# Ianseo Docker container
 
-i@nseo is a software for managing archery tournaments results
+Ianseo is a software for managing archery tournaments results
 
 This is an un-official repository, the official site for this software
 is http://www.ianseo.net/
 
-##### Ernesto Celis notes
-
-Mine is a fork from Brian Nelson's `brian-nelson/ianseo` repository but
-mixed with the official release, since Brian's repository seems
-unmaintained.
-
-This fork goal is running i@anseo in Docker containers. Docker setup is
-out of scope.
+## How to use with compose
 
-## How to use this image
-
-Copy `sample.env` to `.env` and edit to suit your requirements.
+`compose.yaml`
 
 ```
-cp sample.env .env`
+services:
+  ianseodb:
+    image: mariadb:lts
+    environment:
+      - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD:-ianseo}
+      - MARIADB_USER=${MARIADB_USER:-ianseo}
+      - MARIADB_DATABASE=${MARIADB_DATABASE:-ianseo}
+      - MARIADB_PASSWORD=${MARIADB_PASSWORD:-ianseo}
+    restart: always
+  ianseo:
+    image: arqueria/ianseo
+    ports:
+      - "8080:80"
+    depends_on:
+      - ianseodb
+    restart: always
 ```
 
-### Run withDocker compose
+Start the services in the background
 
 ```
 docker compose up -d
 ```
 
-### Run from command line, step by step
+Browse to http://localhost:8080 and follow the instructions to
+finish the installation.
+
+⚠️ In the **Step 2: Database connection data** of ianseo has a default of
+`localhost` for Database host, change it for the name of the MariaDB
+container, `ianseodb` in the example above.
+
+⚠️ Fill in the field for the **ADMIN Password to create users and databases**
+with the value of the variable `MARIADB_ROOT_PASSWORD` of the MariaDB
+container, `ianseo` in the example above.
+
+### Run step by step
+
+The following procedure assumes you created an `.env` file to store the required
+environment variables values.
+
+`.env`
+
+```
+MARIADB_ROOT_PASSWORD=ianseo
+MARIADB_USER=ianseo
+MARIADB_DATABASE=ianseo
+MARIADB_PASSWORD=ianseo
+
+```
 
 First launch a MariaDB container.
 
@@ -45,14 +75,6 @@ docker run -d --name ianseo --link ianseodb:mysql -p 8080:80 arqueria/ianseo
 Browse to http://127.0.0.1:8080 and follow the instructions to
 finish the installation.
 
-⚠️  In the **Step 2: Database connection data** of i@anseo has a default of
-`localhost` for Database host, change it for the name of the MariaDB
-container, `ianseodb` in the example above.
-
-⚠️  Fill the field for the **ADMIN Password to create users and databases**
-with the value of the variable `MARIADB_ROOT_PASSWORD` of the MAriaDB
-container, `ianseo` in the example above.
-
 ## Environment Variables
 
 One of `MARIADB_ROOT_PASSWORD`, `MARIADB_ALLOW_EMPTY_ROOT_PASSWORD`, or
@@ -62,7 +84,7 @@ variables are optional.
 **MARIADB_ROOT_PASSWORD / MYSQL_ROOT_PASSWORD**
 
 This specifies the password that will be set for the MariaDB root
-superuser account. In the above example, it was set to my-secret-pw.
+superuser account. In the above example, it was set to `ianseo`.
 
 **MARIADB_ALLOW_EMPTY_ROOT_PASSWORD / MYSQL_ALLOW_EMPTY_PASSWORD**
 
@@ -97,7 +119,26 @@ by the `MARIADB_ROOT_PASSWORD` / `MYSQL_ROOT_PASSWORD` variable.
 Refer to the MariaDB official repository for deeper information about
 variable environments https://hub.docker.com/_/mariadb
 
-## Fetch newer i@nseo releases
+### .env file
+
+You can use an `.env` file to store the required environment variables values.
+Copy `sample.env` to `.env` and edit to suit your requirements.
+
+```
+cp sample.env .env`
+```
+
+## NodeJS development dependency
+
+NodeJS is used to support some tasks related to maitaining the docker image. NodeJS is **NOT REQUIRED** to run ianseo in docker.
+
+If you plan to contribute to this repository install NodeJS and required modules first.
+
+```
+npm install
+```
+
+## Fetch a newer ianseo releases
 
 ```
 npm run ianseo:fetch <YYYYMMDD>
@@ -105,29 +146,38 @@ npm run ianseo:fetch <YYYYMMDD>
 
 ## Build the docker image
 
-To only build the i@anseo image for the current CPU architechture run:
+To build the ianseo image only for the current CPU architecture run:
 
 ```
 npm run ianseo:build
 ```
 
-To build images for both x86_64, aarch64 and arm7, run:
+To build images for x86_64, aarch64 and arm7, run:
 
 ```
 npm run ianseo:build:multi
 ```
 
-## Relase and Publish images to Docker registries
+## Release and Publish images to Docker registries
 
 There are github actions wired to this repository, after mergin a branch into
 `main` you must tag the commit to publish with semantic versioning.
-Ex: v2022.01.01.1 vYEAR.MONTH.DAY.REVISION. Official I@anseo versioning has
-integers as REVISION, however docker releases may add an alphabetic charater to
-the REVISION integer to support my own releases linked to official ones.
+Ex: v2022.01.01.1 `vYEAR.MONTH.DAY.REVISION`. Official Ianseo versioning has
+integers as **REVISION**, however docker releases may add an alphabetic character
+to the **REVISION** integer to support docker releases linked to official ones.
 
 ```
-git checkout master
+git checkout main
 git pull
 git tag v<YYYY>.<mm>.<dd>.<REVISION>
 git push origin v<YYYY>.<mm>.<dd>.<REVISION>
 ```
+
+##### Ernesto Celis notes
+
+Mine is a fork from Brian Nelson's `brian-nelson/ianseo` repository but
+mixed with the official release, since Brian's repository seems
+unmaintained.
+
+This fork goal is running ianseo in Docker containers. Docker setup is
+out of scope.
diff --git a/bin/fetch.js b/bin/fetch.js
new file mode 100644
index 00000000..ab832321
--- /dev/null
+++ b/bin/fetch.js
@@ -0,0 +1,93 @@
+const https = require("https");
+const fs = require("fs");
+const path = require("path");
+const unzipper = require("unzipper");
+
+(async () => {
+  const IANSEO_URL = "https://ianseo.net";
+  let html = null;
+
+  const getHtml = () => {
+    https
+      .get(`${IANSEO_URL}/Releases.php`, (res) => {
+        let data = [];
+        console.log("Status Code:", res.statusCode);
+
+        res.on("data", (chunk) => {
+          data.push(chunk);
+        });
+
+        res.on("end", async () => {
+          html = Buffer.concat(data).toString();
+          const fileName = getFilename(html);
+          console.log(fileName);
+          if (fileName === null) {
+            throw new Error("No file found");
+          }
+          await downloadFile(fileName);
+          try {
+            await unzipFile(
+              path.join(__dirname, "..", fileName),
+              path.join(__dirname, "..", ".tmp")
+            );
+          } catch (err) {
+            throw new Error(err);
+          }
+        });
+      })
+      .on("error", (err) => {
+        console.log("Error: ", err.message);
+      });
+  };
+
+  const getFilename = (html) => {
+    const regex = /Ianseo_\d{8}\.zip/g;
+    const match = regex.exec(html);
+    if (match.length === 0) {
+      return null;
+    }
+    return match[0];
+  };
+
+  const downloadFile = async (fileName) => {
+    const url = `${IANSEO_URL}/Release/${fileName}`;
+    const filePath = path.join(__dirname, "..", fileName);
+
+    return new Promise((resolve, reject) => {
+      const file = fs.createWriteStream(filePath);
+      https
+        .get(url, (response) => {
+          if (response.statusCode !== 200) {
+            reject(
+              new Error(`Failed to get '${url}' (${response.statusCode})`)
+            );
+            return;
+          }
+
+          response.pipe(file);
+
+          file.on("finish", () => {
+            file.close(resolve);
+          });
+
+          file.on("error", (err) => {
+            fs.unlink(filePath, () => reject(err));
+          });
+        })
+        .on("error", (err) => {
+          fs.unlink(filePath, () => reject(err));
+        });
+    });
+  };
+
+  const unzipFile = async (zipFilePath, outputDir) => {
+    return new Promise((resolve, reject) => {
+      fs.createReadStream(zipFilePath)
+        .pipe(unzipper.Extract({ path: outputDir }))
+        .on("close", resolve)
+        .on("error", reject);
+    });
+  };
+
+  getHtml();
+})();
diff --git a/bin/fetch.sh b/bin/fetch.sh
index 5b8f958c..6e71df50 100755
--- a/bin/fetch.sh
+++ b/bin/fetch.sh
@@ -5,8 +5,7 @@ then
     echo "Usage: fetch.sh <YYYYMMDD>"
     exit 1
 fi
-cd "${ROOT_DIR}"/src
-ROOT_DIR=$(pwd)
+ROOT_DIR=$(dirname $(readlink -f $0))/..
 IANSEO_SRC=Ianseo_${1}.zip
 curl -LSO https://ianseo.net/Release/"${IANSEO_SRC}"
 mkdir -pv "${ROOT_DIR}"/tmp
@@ -14,4 +13,5 @@ cd "${ROOT_DIR}"/tmp
 unzip "${ROOT_DIR}"/"${IANSEO_SRC}"
 rsync -av --delete "${ROOT_DIR}"/tmp/ "${ROOT_DIR}"/src
 cd "${ROOT_DIR}"
-rm "${IANSEO_SRC}" ; rm -rf "${ROOT_DIR}"/tmp
\ No newline at end of file
+rm "${IANSEO_SRC}"
+rm -rf "${ROOT_DIR}"/tmp
\ No newline at end of file
diff --git a/compose.yaml b/compose.yaml
index 4c9a66d1..308791fa 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -2,14 +2,15 @@ services:
   ianseodb:
     image: mariadb:lts
     environment:
-      - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD}
-      - MARIADB_USER=${MARIADB_USER}
-      - MARIADB_DATABASE=${MARIADB_DATABASE}
-      - MARIADB_PASSWORD=${MARIADB_PASSWORD}
+      - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD:-ianseo}
+      - MARIADB_USER=${MARIADB_USER:-ianseo}
+      - MARIADB_DATABASE=${MARIADB_DATABASE:-ianseo}
+      - MARIADB_PASSWORD=${MARIADB_PASSWORD:-ianseo}
+    restart: always
   ianseo:
-    # image: ghcr.io/ecelis/ianseo-docker:v2023.04.01.562a
     image: arqueria/ianseo
     ports:
       - "8080:80"
     depends_on:
       - ianseodb
+    # restart: always
diff --git a/package-lock.json b/package-lock.json
index adbe092f..dd8df352 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,8 @@
       },
       "devDependencies": {
         "husky": "^8.0.0",
-        "standard-version": "^9.5.0"
+        "standard-version": "^9.5.0",
+        "unzipper": "^0.12.3"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -496,6 +497,12 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1245,6 +1252,45 @@
         "node": ">=4"
       }
     },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/duplexer2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -1988,6 +2034,12 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true
+    },
     "node_modules/normalize-package-data": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
@@ -2811,6 +2863,33 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/unzipper": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.12.3.tgz",
+      "integrity": "sha512-PZ8hTS+AqcGxsaQntl3IRBw65QrBI6lxzqDEL7IAo/XCEqRTKGfOX56Vea5TH9SZczRVxuzk1re04z/YjuYCJA==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "~3.7.2",
+        "duplexer2": "~0.1.4",
+        "fs-extra": "^11.2.0",
+        "graceful-fs": "^4.2.2",
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/unzipper/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -3330,6 +3409,12 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3902,6 +3987,47 @@
         }
       }
     },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.8",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -4460,6 +4586,12 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true
+    },
     "normalize-package-data": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
@@ -5043,6 +5175,32 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
+    "unzipper": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.12.3.tgz",
+      "integrity": "sha512-PZ8hTS+AqcGxsaQntl3IRBw65QrBI6lxzqDEL7IAo/XCEqRTKGfOX56Vea5TH9SZczRVxuzk1re04z/YjuYCJA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "~3.7.2",
+        "duplexer2": "~0.1.4",
+        "fs-extra": "^11.2.0",
+        "graceful-fs": "^4.2.2",
+        "node-int64": "^0.4.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "11.2.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+          "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        }
+      }
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
diff --git a/package.json b/package.json
index a37e8bec..6b3b3ab7 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,11 @@
   "homepage": "https://github.com/ecelis/ianseo-docker#readme",
   "devDependencies": {
     "husky": "^8.0.0",
-    "standard-version": "^9.5.0"
+    "standard-version": "^9.5.0",
+    "unzipper": "^0.12.3"
   },
   "dependencies": {
     "@commitlint/cli": "^17.2.0",
     "@commitlint/config-conventional": "^17.2.0"
   }
-}
\ No newline at end of file
+}
diff --git a/src/Accreditation/Accreditation.php b/src/Accreditation/Accreditation.php
index 4266046f..ec44e0a4 100644
--- a/src/Accreditation/Accreditation.php
+++ b/src/Accreditation/Accreditation.php
@@ -1,6 +1,4 @@
 <?php
-define('debug',false);	// settare a true per l'output di debug
-
 require_once(dirname(dirname(__FILE__)) . '/config.php');
 checkACL(AclAccreditation, AclReadWrite);
 require_once('Common/Fun_Number.inc.php');
diff --git a/src/Accreditation/AccreditationPicture.php b/src/Accreditation/AccreditationPicture.php
index 001e93f5..c3d2c0cd 100644
--- a/src/Accreditation/AccreditationPicture.php
+++ b/src/Accreditation/AccreditationPicture.php
@@ -3,6 +3,7 @@
 checkACL(AclAccreditation, AclReadWrite);
 require_once('Common/Lib/CommonLib.php');
 require_once('Common/Fun_Modules.php');
+require_once('Common/Fun_Sessions.inc.php');
 
 CheckTourSession(true);
 
@@ -14,10 +15,21 @@
 $TourIds = ((isset($_SESSION['AccreditationTourIds']) and !empty($_SESSION['AccreditationTourIds'])) ? $_SESSION['AccreditationTourIds'] : $_SESSION['TourId']);
 // loads how many accreditation types there are
 $Accreditations=array();
+$Sessions=array();
 foreach (explode(',',$TourIds) as $ToId) {
-    $q = safe_r_sql("select IcTournament, IcNumber, IcName from IdCards where IcTournament={$ToId} and IcType='A' order by IcNumber");
+    $q = safe_r_sql("select IcTournament, IcNumber, IcName, ToCode
+        FROM IdCards
+        INNER JOIN Tournament on IcTournament = ToId 
+        where IcTournament={$ToId} and IcType='A' order by IcNumber");
     while ($r = safe_fetch($q)) {
-        $Accreditations[$r->IcTournament . "|" . $r->IcNumber] = $r->IcName;
+        $Accreditations[$r->IcTournament . "|" . $r->IcNumber] = $r->ToCode . ' - ' . $r->IcName;
+    }
+    $tmpSess = GetSessions('Q', false, null, $ToId);
+    foreach ($tmpSess as $sess) {
+        if(!array_key_exists($sess->SesOrder, $Sessions)) {
+            $Sessions[$sess->SesOrder] = array();
+        }
+        $Sessions[$sess->SesOrder][$sess->SesTournament] = $sess->SesName;
     }
 }
 
@@ -39,7 +51,10 @@
 $JS_SCRIPT[] = '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/ajax/ObjXMLHttpRequest.js"></script>';
 $JS_SCRIPT[] = '<script type="text/javascript" src="./Fun_AJAX_AccreditationPicture.js"></script>';
 $JS_SCRIPT[] = phpVars2js($param);
-$JS_SCRIPT[] = '<script type="text/javascript">let cardsByCat='.json_encode($SpecificCards).'</script>';
+$JS_SCRIPT[] = '<script type="text/javascript">
+    let cardsByCat='.json_encode($SpecificCards).';
+    let sessByToId='.json_encode($Sessions).';
+    </script>';
 if($param["source"]==0) {
 	$JS_SCRIPT[] = '<script type="text/javascript" src="./TakePicture.js"></script>';
 } else {
@@ -76,8 +91,8 @@
 <tbody id="options">
 
 <tr>
-<th class="Title" width="50%"><?php echo get_text('Options', 'Tournament');?></th>
-<th class="Title" width="50%"><?php echo get_text('FilterRules');?></th>
+<th class="Title w-30"><?php echo get_text('Options', 'Tournament');?></th>
+<th class="Title w-70"><?php echo get_text('FilterRules');?></th>
 </tr>
 
 <tr>
@@ -88,18 +103,18 @@
 	echo get_text('Camera', 'Tournament');
 	echo '<select id="videoSource"></select><br>';
 }
-echo '<input type="checkbox" id="showMenu" ' . (isset($_REQUEST["showMenu"]) ? 'checked' : '') .
-	' onClick="document.location=\'' . $_SERVER["PHP_SELF"]. (isset($_REQUEST["showMenu"]) ? '' : '?showMenu') . '\';">'.get_text('ShowIanseoMenu', 'Tournament');
+echo '<div class="mb-2"><input type="checkbox" id="showMenu" ' . (isset($_REQUEST["showMenu"]) ? 'checked' : '') .
+	' onClick="document.location=\'' . $_SERVER["PHP_SELF"]. (isset($_REQUEST["showMenu"]) ? '' : '?showMenu') . '\';">'.get_text('ShowIanseoMenu', 'Tournament').'<div>';
 if(file_exists($CFG->DOCUMENT_PATH."Modules/Accreditation/AccreditationPictureParameters.php") and empty($_SESSION['ShortMenu']['ACCR'])) {
-	echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="'.$CFG->ROOT_DIR.'Modules/Accreditation/AccreditationPictureParameters.php">'.get_text('AdvancedParams', 'Tournament'). '</a>';
-	echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span onclick="window.BigPicture=window.open(\''.$CFG->ROOT_DIR.'Modules/Accreditation/BigPicture.php\', \'picture\', \'height=1024,width=1024\')">'.get_text('OpenPictureScreen', 'BackNumbers'). '</span>';
+	echo '<br><span class="mx-2"><a href="'.$CFG->ROOT_DIR.'Modules/Accreditation/AccreditationPictureParameters.php">'.get_text('AdvancedParams', 'Tournament'). '</a></span>';
+	echo '<span class="mx-2"><a onclick="window.BigPicture=window.open(\''.$CFG->ROOT_DIR.'Modules/Accreditation/BigPicture.php\', \'picture\', \'height=1024,width=1024\')">'.get_text('OpenPictureScreen', 'BackNumbers'). '</a></span>';
 }
 ?>
 </td>
 <td class="Center">
 <input type="text" name="x_Search" id="x_Search" style="width: 80%;" maxlength="50" onBlur="searchAthletes();" onkeyup="searchAthletes();"><br>
 <input type="checkbox" id="x_Country" name="x_Country" value="1" checked onChange="searchAthletes();"><?php echo get_text('Country') ?>&nbsp;&nbsp;&nbsp;
-<input type="checkbox" id="x_Athlete" name="x_Athlete" value="1" checked onChange="searchAthletes();"> <?php echo get_text('Athlete') ?><br>
+<input type="checkbox" id="x_Athlete" name="x_Athlete" value="1" checked onChange="searchAthletes();"> <?php echo get_text('Name', 'Tournament') ?><br>
 <?php
 
 $TourId=$_SESSION['TourId'];
@@ -107,7 +122,7 @@
 	echo '<br/>';
 	foreach(explode(',', $_SESSION['AccreditationTourIds']) as $id) {
 		$Code=getCodeFromId($id);
-		echo '<input type="checkbox" class="x_Tours" id="x_Tour['.$id.']" value="'.$Code.'" onChange="searchAthletes();">'.$Code.'&nbsp;&nbsp;&nbsp;';
+		echo '<input type="checkbox" class="x_Tours" tourid="'.$id.'" id="x_Tour['.$id.']" value="'.$Code.'" onChange="searchAthletes();">'.$Code.'&nbsp;&nbsp;&nbsp;';
 	}
 	$TourId=$_SESSION['AccreditationTourIds'];
 }
@@ -116,12 +131,14 @@
 echo '<input type="checkbox" class="x_Sessions" id="x_Sessions[0]" onChange="searchAthletes();">'.get_text('Session').' 0&nbsp;&nbsp;&nbsp;';
 $q=safe_r_sql("select distinct SesOrder from Session where SesTournament in ($TourId) and SesType='Q' order by SesOrder");
 while($r=safe_fetch($q)) {
-	echo '<input type="checkbox" class="x_Sessions" id="x_Sessions['.$r->SesOrder.']" onChange="searchAthletes();">'.get_text('Session').' '.$r->SesOrder.'&nbsp;&nbsp;&nbsp;';
+	echo '<span id="sesBlock'.$r->SesOrder.'"><input type="checkbox" class="x_Sessions" id="x_Sessions['.$r->SesOrder.']" onChange="searchAthletes();">'.get_text('Session').' '.$r->SesOrder.'<span id="lblSess'.$r->SesOrder.'"></span>&nbsp;&nbsp;&nbsp;</span>';
 }
-echo '<div class="Flex-line w-100 mt-2"><div class="w-25"><input type="radio" id="x_All" name="PhotoStatus" onChange="searchAthletes();">'. get_text('AllEntries','Tournament'). '</div>'.
-    '<div class="w-25"><input type="radio" id="x_noPhoto" name="PhotoStatus" onChange="searchAthletes();">'.get_text('OnlyWithoutPhoto', 'Tournament'). '</div>'.
-    '<div class="w-25"><input type="radio" id="x_NoPrint" name="PhotoStatus" onChange="searchAthletes();">'.get_text('OnlyPhoto', 'Tournament'). '</div>'.
-    '<div class="w-25"><input type="radio" id="x_noAcc" name="PhotoStatus" checked onChange="searchAthletes();">'.get_text('OnlyWithoutAcc','Tournament'). '</div>'.
+echo '<div class="Flex-line w-100 mt-2">'.
+    '<div class="w-20"><input type="checkbox" id="x_2BPrinted" name="ToBePrinted" onChange="searchAthletes();">'. get_text('BadgeOnlyNotPrinted', 'Tournament'). '</div>'.
+    '<div class="w-20"><input type="radio" id="x_All" name="PhotoStatus" onChange="searchAthletes();">'. get_text('AllEntries','Tournament'). '</div>'.
+    '<div class="w-20"><input type="radio" id="x_noPhoto" name="PhotoStatus" onChange="searchAthletes();">'.get_text('OnlyWithoutPhoto', 'Tournament'). '</div>'.
+    '<div class="w-20"><input type="radio" id="x_NoPrint" name="PhotoStatus" onChange="searchAthletes();">'.get_text('OnlyPhoto', 'Tournament'). '</div>'.
+    '<div class="w-20"><input type="radio" id="x_noAcc" name="PhotoStatus" checked onChange="searchAthletes();">'.get_text('OnlyWithoutAcc','Tournament'). '</div>'.
     '</div>';
 ?>
 </td>
@@ -131,9 +148,9 @@
 
 <table class="Tabella Speaker">
 	<tr>
-		<th class="Title" width="35%"><?php echo get_text('Camera', 'Tournament');?></th>
-		<th class="Title" width="35%"><?php echo get_text('Photo', 'Tournament');?></th>
-		<th class="Title" width="30%"><?php echo get_text('MenuLM_Partecipant List');?> <span id="missingPhotos"></span></th>
+		<th class="Title w-35"><?php echo get_text('Camera', 'Tournament');?></th>
+		<th class="Title w-30"><?php echo get_text('Photo', 'Tournament');?></th>
+		<th class="Title w-35"><?php echo get_text('MenuLM_Partecipant List');?> <span id="missingPhotos"></span></th>
 	</tr>
 <tbody id="tbody">
 	<tr>
@@ -166,7 +183,9 @@
 			<br><img id="athPic" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" width="150">
 			<div id="ManBlock" style="display: none;">
 			<div class="mt-2 mb-3"><input type="button" id="delete-button" value="<?php echo get_text('PhotoDelete', 'Tournament')?>" onClick="deletePicture();" ></div>
-			<?php
+            </div>
+            <div id="PrnBlock" style="display: none;">
+                <?php
 
             if($Accreditations) {
 				if(count($Accreditations)>1) {
@@ -181,6 +200,15 @@
 					}
 				}
 				echo '<input type="button" id="print-button" class="m-2" value="'.get_text('Print', 'Tournament').'" onClick="printAccreditation()" >';
+                if(module_exists('Automator')) {
+                    $AccPrinters = getModuleParameter('Automator', 'AutomatorAccPrint','');
+                    if(!empty($AccPrinters)) {
+                        foreach(explode(',', $AccPrinters) as $kPrn => $printer) {
+                            $tmp=explode('|',$printer);
+                            echo '<br><input type="button" id="prnAuto'.$kPrn.'" class="m-2" value="'.$tmp[0].'" onClick="printAccreditationAuto(\''.$tmp[1].'\')" >';
+                        }
+                    }
+                }
 			}
 
 			?>
@@ -192,9 +220,11 @@
 		<td style="vertical-align: top;">
 			<table class="Tabella" id="List">
 			<thead><tr>
-				<th colspan="2"><?php echo get_text('Athlete')?></th>
+				<th colspan="2"><?php echo get_text('Name','Tournament')?></th>
+                <th><?php echo get_text('Code','Tournament'); ?></th>
 				<th><?php echo get_text('DivisionClass'); ?></th>
-				<th><?php echo get_text('Country')?></th></tr></thead>
+				<th><?php echo get_text('Country')?></th>
+                <th colspan="3"><?php echo 	get_text('TourCode', 'Tournament'); ?></th></tr></thead>
 			<tbody id="ListBody"></tbody>
 			</table>
 		</td>
diff --git a/src/Accreditation/AccreditationPictureList.php b/src/Accreditation/AccreditationPictureList.php
index 91c6a82c..57a60fc6 100644
--- a/src/Accreditation/AccreditationPictureList.php
+++ b/src/Accreditation/AccreditationPictureList.php
@@ -12,6 +12,7 @@
 $srcNoPhoto = !empty($_REQUEST["nophoto"]);
 $srcNoPrint = !empty($_REQUEST["noprint"]);
 $srcAccPhoto = !empty($_REQUEST["noacc"]);
+$src2BPrinted = !empty($_REQUEST["tobeprinted"]);
 
 $srcString = (empty($_REQUEST["search"]) ? '' : $_REQUEST["search"]);
 
@@ -32,14 +33,16 @@
 	$Where="EnTournament=" . StrSafe_DB($_SESSION['TourId']) . " ";
 }
 
-$Sql = "SELECT EnId,
+$Sql = "SELECT EnId, EnCode, ToCode, EnTournament, QuSession,
+       (EnBadgePrinted is not null and EnBadgePrinted!=0) as Printed,
 		CONCAT(EnDivision, '-',EnClass) as Category,
 		CONCAT(CoName, ' (' ,CoCode,')') as Country,
 		CONCAT(UPPER(EnFirstName),' ' ,EnName) as Athlete,
 		(PhEnId IS NOT NULL and PhToRetake=0 ) as hasPicture,
 		(EnBadgePrinted+0 and PhEnId IS NULL) or PhToRetake=1 as NoPrintout
 	FROM Entries
-	INNER JOIN Qualifications ON EnId=QuId
+	INNER JOIN Qualifications ON EnId=QuId 
+	INNER JOIN Tournament ON EnTournament=ToId
 	LEFT JOIN Countries ON EnCountry=CoId
 	LEFT JOIN Photos ON EnId=PhEnId
 	WHERE  ";
@@ -64,6 +67,10 @@
 if($srcAccPhoto) {
 	$Where .= " AND PhEnId IS NULL ";
 }
+if($src2BPrinted) {
+	$Where .= " AND (EnBadgePrinted is null or EnBadgePrinted=0) ";
+}
+
 
 if(!empty($_REQUEST['x_Sessions'])) {
 	$tmp=array();
@@ -78,11 +85,16 @@
 if(safe_num_rows($Rs)) {
 	while ($row = safe_fetch($Rs)) {
 		$Answer .= '<athlete id="' . $row->EnId
+				. '" bib="' . $row->EnCode
 				. '" ath="' . htmlspecialchars($row->Athlete . ($row->NoPrintout ? ' - ONLY PHOTO' : ''))
 				. '" team="' . htmlspecialchars($row->Country)
 				. '" cat="' . htmlspecialchars($row->Category)
 				. '" pic="' . ($row->hasPicture ? 1 : 0)
-				. '" prn="' . ($row->NoPrintout ? 1 : 0) . '">'
+				. '" prn="' . ($row->NoPrintout ? 1 : 0)
+				. '" printed="' . ($row->Printed ? 1 : 0)
+				. '" tourid="' . $row->EnTournament
+				. '" tour="' . $row->ToCode
+				. '" sess="' . $row->QuSession . '">'
 			//. '<id>' . $row->EnId . '</id>'
 			//. '<ath><![CDATA[' . $row->Athlete . ($row->NoPrintout ? ' - ONLY PHOTO' : '') . ']]></ath>'
 			//. '<team><![CDATA[' . $row->Country . ']]></team>'
diff --git a/src/Accreditation/CardCustom.php b/src/Accreditation/CardCustom.php
index e508ff5f..5cb570c1 100644
--- a/src/Accreditation/CardCustom.php
+++ b/src/Accreditation/CardCustom.php
@@ -20,6 +20,7 @@
 
 $CardType=(empty($_REQUEST['CardType']) ? 'A' : $_REQUEST['CardType']);
 $CardNumber=(empty($_REQUEST['CardNumber']) ? 0 : intval($_REQUEST['CardNumber']));
+$AvailableFonts=getFonts();
 
 $SpecialFilter='';
 // $SpecialFilter=' and EnCode in (
@@ -136,7 +137,13 @@
 			$r->Options=unserialize($r->IceOptions);
 			if(!empty($r->Options['Font'])) {
 				$r->Options['FontStyle']='';
-                $r->Options['FontFamily'] = TCPDF_FONTS::addTTFfont(K_PATH_FONTS . $r->Options['Font'] . '.ttf');
+                $FontFile=$AvailableFonts[$r->Options['Font']]['file'] ?? $AvailableFonts[$r->Options['Font'].'.ttf']['file'] ?? K_PATH_FONTS."arial.ttf";
+                if(($AvailableFonts[$r->Options['Font']]['type']??'')=='E') {
+                    $r->Options['FontFamily'] = TCPDF_FONTS::addTTFfont($FontFile, '', '', 32, dirname($AvailableFonts[$r->Options['Font']]['file']).'/');
+                    $pdf->AddFont($r->Options['FontFamily'], '', dirname($AvailableFonts[$r->Options['Font']]['file']).'/'.$r->Options['FontFamily']);
+                } else {
+                    $r->Options['FontFamily'] = TCPDF_FONTS::addTTFfont($FontFile);
+                }
 				if(substr($r->Options['Font'],-1)=='i') {
 					$r->Options['FontStyle']='I';
 					$r->Options['FontFamily']=substr($r->Options['Font'],0,-1);
@@ -474,22 +481,22 @@
                 }
             case 'Club3':
                 if(!isset($Text)) {
-                    if($MyRow->CoId2 != 0) {
+                    if($MyRow->CoId3 != 0) {
                         switch ($Element->IceContent) {
                             case 'NocCaps-ClubCamel':
-                                $Text = array($MyRow->NationCode . ' ' . $MyRow->Nation);
+                                $Text = array($MyRow->NationCode3 . ' ' . $MyRow->Nation3);
                                 break;
                             case 'NocCaps-ClubCaps':
-                                $Text = array($MyRow->NationCode . ' ' . $MyRow->NationCaps);
+                                $Text = array($MyRow->NationCode3 . ' ' . $MyRow->NationCaps3);
                                 break;
                             case 'NocCaps':
-                                $Text = array($MyRow->NationCode);
+                                $Text = array($MyRow->NationCode3);
                                 break;
                             case 'ClubCamel':
-                                $Text = array($MyRow->Nation);
+                                $Text = array($MyRow->Nation3);
                                 break;
                             case 'ClubCaps':
-                                $Text = array($MyRow->NationCaps);
+                                $Text = array($MyRow->NationCaps3);
                                 break;
                         }
                     } else {
@@ -534,6 +541,7 @@
                         case '':
                         case 'Cardinal':  $Text=array($MyRow->Rank); break;
                         case 'Ordinal':  $Text=array(ordinal($MyRow->Rank)); break;
+						case 'Roman': $Text=array(inttoRoman($MyRow->Rank)); break;
                     }
                 }
 			case 'FinalRanking':
@@ -542,6 +550,7 @@
                         case '':
                         case 'Cardinal':  $Text=array($MyRow->RankFinal); break;
                         case 'Ordinal':  $Text=array(ordinal($MyRow->RankFinal)); break;
+						case 'Roman': $Text=array(inttoRoman($MyRow->RankFinal)); break;
                     }
                 }
             case 'WRank':
@@ -625,8 +634,8 @@
 	                } else {
 	                    $pdf->setFontSpacing(0);
 	                }
-					$pdf->SetFont($Element->Options['FontFamily'], $Element->Options['FontStyle'], $Element->Options['Size']);
-				}
+                    $pdf->SetFont($Element->Options['FontFamily'], $Element->Options['FontStyle'], $Element->Options['Size']);
+                }
 				$Fill=false;
 				$WhiteText=false;
 				$BlackText=false;
@@ -987,10 +996,3 @@ function getSystemMemInfo() {
 	return $meminfo;
 }
 
-function ordinal($number) {
-    $ends = array('th','st','nd','rd','th','th','th','th','th','th');
-    if ((($number % 100) >= 11) && (($number%100) <= 13))
-        return $number. 'th';
-    else
-        return $number. $ends[$number % 10];
-}
diff --git a/src/Accreditation/CommonCard.php b/src/Accreditation/CommonCard.php
index 326a332b..e25fec64 100644
--- a/src/Accreditation/CommonCard.php
+++ b/src/Accreditation/CommonCard.php
@@ -53,7 +53,7 @@
 			// EnBadgePrinted contiene data e ora della stampa del badge...
 			// quindi sono da recuperare quelli che hanno la data nulla oppure
 			// oppure quelli la cui data di stampa è anteriore alla foto inserita
-			$Where[] = ' AND (EnBadgePrinted is NULL or EnBadgePrinted=0 '.(empty($_REQUEST['PrintPhoto']) ? '' : 'or PhPhotoEntered is null or EnBadgePrinted < PhPhotoEntered ').') ';
+			$Where[] = ' AND (EnBadgePrinted is NULL or EnBadgePrinted=0 '.(empty($_REQUEST['PrintPhoto']) ? '' : 'or PhPhotoEntered is null  ').') ';
 		}
 		if(!empty($_REQUEST['HasPlastic'])) {
 			$Where[] = " AND aextra.EdExtra='1' and aextra.EdEmail!='1' ";
diff --git a/src/Accreditation/ConfirmPrinted.php b/src/Accreditation/ConfirmPrinted.php
index b0deb35f..2a624952 100644
--- a/src/Accreditation/ConfirmPrinted.php
+++ b/src/Accreditation/ConfirmPrinted.php
@@ -40,7 +40,7 @@
                 $SQL="update Entries set EnBadgePrinted='000-00-00', EnTimestamp=EnTimestamp where EnId in ($ENIDS)";
                 if($_SESSION['AccBooth']) {
                     // we need to log every single Entry...
-                    $q=safe_r_sql("select EnCode, EnIocCode, EnDivision, ToCode from Entries inner join Tournament on EnTournament=ToId where EnId in (($ENIDS)");
+                    $q=safe_r_sql("select EnCode, EnIocCode, EnDivision, ToCode from Entries inner join Tournament on EnTournament=ToId where EnId in ($ENIDS)");
                     while($r=safe_fetch($q)) {
                         LogAccBoothQuerry("update Entries
 						set EnBadgePrinted='0000-00-00', EnTimestamp=EnTimestamp
diff --git a/src/Accreditation/Fun_AJAX_AccreditationPicture.js b/src/Accreditation/Fun_AJAX_AccreditationPicture.js
index 440fac8c..1ea8b6cf 100644
--- a/src/Accreditation/Fun_AJAX_AccreditationPicture.js
+++ b/src/Accreditation/Fun_AJAX_AccreditationPicture.js
@@ -47,19 +47,22 @@ function selectedAthlete(clickObj) {
 							if(typeof window.BigPicture != 'undefined') {
 								window.BigPicture.refresh(clickObj.id);
 							}
+							if(cardsByCat[searchTour]!==undefined && cardsByCat[searchTour][searchCat]!== undefined) {
+								$('#accreditation-number').val(searchTour+'|'+cardsByCat[searchTour][searchCat]);
+							}
 							if(XMLRoot.getElementsByTagName('pic').item(0).firstChild.data!='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==') {
 								document.getElementById("ManBlock").style.display='';
-								if(cardsByCat[searchTour]!==undefined && cardsByCat[searchTour][searchCat]!== undefined) {
-									$('#accreditation-number').val(searchTour+'|'+cardsByCat[searchTour][searchCat]);
-								}
 							} else {
 								document.getElementById("ManBlock").style.display='none';
 								document.getElementById("confirm-button").style.display='none';
 							}
-
+							document.getElementById("PrnBlock").style.display='';
 							if(document.getElementById("stop-button").style.display != '') {
 								document.getElementById("start-button").style.display = '';
 							}
+						} else {
+							document.getElementById("ManBlock").style.display='none';
+							document.getElementById("PrnBlock").style.display='none';
 						}
 
 					} catch(e) {
@@ -74,6 +77,7 @@ function selectedAthlete(clickObj) {
 }
 
 function searchAthletes() {
+	sesNames();
 	var XMLHttp=CreateXMLHttpRequestObject();
 	if (XMLHttp) {
 		try {
@@ -83,7 +87,8 @@ function searchAthletes() {
 					+"&athlete="+($("#x_Athlete").is(":checked") ? 1 : 0)
 					+"&noprint="+($("#x_NoPrint").is(":checked") ? 1 : 0)
 					+"&noacc="+($("#x_noAcc").is(":checked") ? 1 : 0)
-					+"&nophoto="+($("#x_noPhoto").is(":checked") ? 1 : 0);
+					+"&nophoto="+($("#x_noPhoto").is(":checked") ? 1 : 0)
+					+"&tobeprinted="+($("#x_2BPrinted").is(":checked") ? 1 : 0);
 				var srcTours=document.querySelectorAll('.x_Tours');
 				if(srcTours.length>0) {
 					for(var i=0; i< srcTours.length; i++) {
@@ -147,12 +152,23 @@ function searchAthletes() {
 								td.innerHTML=XmlRow.getAttribute('ath');
 								newRow.appendChild(td);
 								var td = document.createElement('td');
+								td.innerHTML=XmlRow.getAttribute('bib');
+								newRow.appendChild(td);
+								var td = document.createElement('td');
 								td.innerHTML=XmlRow.getAttribute('cat');
 								newRow.appendChild(td);
 								var td = document.createElement('td');
 								td.innerHTML=XmlRow.getAttribute('team');
 								newRow.appendChild(td);
-
+								var td = document.createElement('td');
+								td.innerHTML=XmlRow.getAttribute('tour');
+								newRow.appendChild(td);
+								var td = document.createElement('td');
+								td.innerHTML=XmlRow.getAttribute('sess');
+								newRow.appendChild(td);
+								var td = document.createElement('td');
+								td.innerHTML='<i class="fa fas fa-print '+(XmlRow.getAttribute('printed')=="1" ? "text-success" : "text-danger")+'"></i>';
+								newRow.appendChild(td);
 								document.getElementById("ListBody").appendChild(newRow);
 							}
 						}
@@ -168,6 +184,25 @@ function searchAthletes() {
 	}
 }
 
+function sesNames() {
+	if($('.x_Tours:checked').length == 1) {
+		let tId = $('.x_Tours:checked').attr('tourid');
+		$.each(sessByToId, (index, item) => {
+			if(item[tId] != undefined) {
+				$('#lblSess'+index).html('&nbsp;-&nbsp;'+item[tId]);
+				$('#sesBlock'+index).show();
+			} else {
+				$('#sesBlock'+index).hide();
+			}
+		});
+	} else {
+		$('.x_Sessions').each((index, item) => {
+			$('#lblSess'+index).html('');
+			$('#sesBlock'+index).show();
+		});
+	}
+}
+
 function sendPicture(encodedPict) {
 	var XMLHttp=CreateXMLHttpRequestObject();
 	if (XMLHttp) {
@@ -265,6 +300,12 @@ function printAccreditation() {
 	document.getElementById("confirm-button").style.display='';
 }
 
+function printAccreditationAuto(printer) {
+	let ToId=($("#accreditation-number").val().split('|'))[0];
+	let CardNumber=($("#accreditation-number").val().split('|'))[1];
+	$.getJSON('PrintAcc.php?toPrint='+encodeURIComponent(ROOT_DIR+'Accreditation/CardCustom.php?CardType=A&ToString=1&ToId='+ToId+'&CardNumber='+CardNumber+'&Entries[]='+$("#selId").val())+'&printer='+printer);
+}
+
 function ConfirmPrinted() {
 	var CardNumber=document.getElementById("accreditation-number").value;
 	var XMLHttp=CreateXMLHttpRequestObject();
@@ -291,6 +332,7 @@ function ConfirmPrinted() {
 							alert('Error');
 						} else {
 							document.getElementById("confirm-button").style.display='none';
+							searchAthletes();
 						}
 					} catch(e) {
 					}
diff --git a/src/Accreditation/IdCardEdit.php b/src/Accreditation/IdCardEdit.php
index 705200aa..256f4347 100644
--- a/src/Accreditation/IdCardEdit.php
+++ b/src/Accreditation/IdCardEdit.php
@@ -430,6 +430,12 @@
 
 function getFieldPos($r) {
 	global $CFG, $CardType, $CardNumber, $CardFile;
+    static $Fonts='';
+    if(empty($Fonts)) {
+        foreach(getFonts() as $file => $font) {
+            $Fonts.='<option value="'.$file.'">'.$font['name'].'</option>';
+        }
+    }
 	$ret='<tr icetype="'.$r->IceType.'" iceorder="'.$r->IceOrder.'">
 		<th><a href="?delete='.$r->IceOrder.'&CardType='.$CardType.'&CardNumber='.$CardNumber.'" onclick="return(confirm(\''.get_text('MsgAreYouSure').'\'))"><img src="'.$CFG->ROOT_DIR.'Common/Images/drop.png"></a></th>
 		<th><input type="hidden" id="Content['.$r->IceOrder.'][Type]" value="'.$r->IceType.'">
@@ -540,6 +546,7 @@ function getFieldPos($r) {
                 $txt='<select onchange="UpdateRowContent(this)" id="Content['.$r->IceOrder.'][Ranking]">
                     <option value="Cardinal"'   .($r->IceContent=='Cardinal'   ?' selected':'').'>'.get_text('RnkCardinalEN',    'BackNumbers').'</option>
                     <option value="Ordinal"'   .($r->IceContent=='Ordinal'   ?' selected':'').'>'.get_text('RnkOrdinal',    'BackNumbers').'</option>
+					<option value="Roman"'   .($r->IceContent=='Roman'   ?' selected':'').'>'.get_text('RnkRoman',    'BackNumbers').'</option>
                 </select>';
             }
 		case 'FinalRanking':
@@ -547,6 +554,7 @@ function getFieldPos($r) {
                 $txt='<select onchange="UpdateRowContent(this)" id="Content['.$r->IceOrder.'][FinalRanking]">
                     <option value="Cardinal"'   .($r->IceContent=='Cardinal'   ?' selected':'').'>'.get_text('RnkCardinalEN',    'BackNumbers').'</option>
                     <option value="Ordinal"'   .($r->IceContent=='Ordinal'   ?' selected':'').'>'.get_text('RnkOrdinal',    'BackNumbers').'</option>
+					<option value="Roman"'   .($r->IceContent=='Roman'   ?' selected':'').'>'.get_text('RnkRoman',    'BackNumbers').'</option>
                 </select>';
             }
         case 'WRank':
@@ -625,31 +633,7 @@ function getFieldPos($r) {
 					<br/><input size="6" type="text" class="jscolor {hash:true,required:false} jscolor-active" id="Content['.$r->IceOrder.'][Options][BackCol]" onchange="UpdateRowContent(this)" id="Content['.$r->IceOrder.'][Options][BackCol]" value="' . $Options['BackCol'] . '"></td>
 				<td><br/><input type="checkbox" onchange="UpdateRowContent(this)" id="Content['.$r->IceOrder.'][Options][BackCat]"'.(empty($Options['BackCat']) ? '' : ' checked="checked"').'></td>
 				<td><select onchange="UpdateRowContent(this)" id="Content['.$r->IceOrder.'][Options][Font]">
-					<option value="arial"' . ($Options['Font']=='arial' ? ' selected' : '') . '>Arial</option>
-					<option value="arialbd"' . ($Options['Font']=='arialbd' ? ' selected' : '') . '>Arial Bold</option>
-					<option value="ariali"' . ($Options['Font']=='ariali' ? ' selected' : '') . '>Arial Italic</option>
-					<option value="arialbi"' . ($Options['Font']=='arialbi' ? ' selected' : '') . '>Arial Bold Italic</option>
-					<option value="helveticaneueltpro"' . ($Options['Font'] == 'helveticaneueltpro' ? ' selected' : '') . '>Helvetica Neue LT Pro</option>
-					<option value="helveticaneueltprob"' . ($Options['Font'] == 'helveticaneueltprob' ? ' selected' : '') . '>Helvetica Neue LT Pro Bold</option>
-					<option value="helveticaneueltproi"' . ($Options['Font'] == 'helveticaneueltproi' ? ' selected' : '') . '>Helvetica Neue LT Pro Italic</option>
-					<option value="helveticaneueltprobi"' . ($Options['Font'] == 'helveticaneueltprobi' ? ' selected' : '') . '>Helvetica Neue LT Pro Bold Italic</option>
-					<option value="helveticaneueltprocn"' . ($Options['Font'] == 'helveticaneueltprocn' ? ' selected' : '') . '>Helvetica Neue LT Pro Condensed</option>
-					<option value="helveticaneueltprocnb"' . ($Options['Font'] == 'helveticaneueltprocnb' ? ' selected' : '') . '>Helvetica Neue LT Pro Condensed Bold</option>
-					<option value="helveticaneueltprocni"' . ($Options['Font'] == 'helveticaneueltprocni' ? ' selected' : '') . '>Helvetica Neue LT Pro Condensed Italic</option>
-					<option value="helveticaneueltprocnbi"' . ($Options['Font'] == 'helveticaneueltprocnbi' ? ' selected' : '') . '>Helvetica Neue LT Pro Condensed Bold Italic</option>
-					<option value="helveticacondensed"' . ($Options['Font']=='helveticacondensed' ? ' selected' : '') . '>Helvetica Condensed</option>
-					<option value="helveticacondensedbold"' . ($Options['Font']=='helveticacondensedbold' ? ' selected' : '') . '>Helvetica Condensed Bold</option>
-					<option value="times"' . ($Options['Font']=='times' ? ' selected' : '') . '>Times</option>
-					<option value="timesbd"' . ($Options['Font']=='timesbd' ? ' selected' : '') . '>Times Bold</option>
-					<option value="timesi"' . ($Options['Font']=='timesi' ? ' selected' : '') . '>Times Italic</option>
-					<option value="timesbi"' . ($Options['Font']=='timesbi' ? ' selected' : '') . '>Times Bold Italic</option>
-					<option value="cour"' . ($Options['Font']=='cour' ? ' selected' : '') . '>Courier</option>
-					<option value="courbd"' . ($Options['Font']=='courbd' ? ' selected' : '') . '>Courier Bold</option>
-					<option value="couri"' . ($Options['Font']=='couri' ? ' selected' : '') . '>Courier Italic</option>
-					<option value="courbi"' . ($Options['Font']=='courbi' ? ' selected' : '') . '>Courier Bold Italic</option>
-					<option value="FreeSans"' . ($Options['Font']=='FreeSans' ? ' selected' : '') . '>'.get_text('PrintCyrillic', 'Tournament').'</option>
-					<option value="DroidSansFallback"' . ($Options['Font']=='DroidSansFallback' ? ' selected' : '') . '>'.get_text('PrintChinese', 'Tournament').'</option>
-					<option value="arialuni"' . ($Options['Font']=='arialuni' ? ' selected' : '') . '>'.get_text('PrintJapanese', 'Tournament').'</option>
+				    '.preg_replace('/value="'.$Options['Font'].'(.ttf)*"/','$0 selected="selected"', $Fonts).'
 					</select></td>
 				<td><input size="3" type="text" onchange="UpdateRowContent(this)" id="Content['.$r->IceOrder.'][Options][Size]" value="' . $Options['Size'] . '"></td>
 				<td><select onchange="UpdateRowContent(this)" id="Content['.$r->IceOrder.'][Options][Just]">
diff --git a/src/Accreditation/ImgIdCard.php b/src/Accreditation/ImgIdCard.php
index 7b2a75d6..ab1bd8ad 100644
--- a/src/Accreditation/ImgIdCard.php
+++ b/src/Accreditation/ImgIdCard.php
@@ -5,6 +5,7 @@
 require_once('Common/Fun_FormatText.inc.php');
 require_once('IdCardEmpty.php');
 require_once('Common/Lib/Fun_DateTime.inc.php');
+require_once('Common/Lib/CommonLib.php');
 
 if(!CheckTourSession()) {
 	// spedisci una immagine vuota
@@ -18,6 +19,7 @@
 
 $CardType=(empty($_REQUEST['CardType']) ? 'A' : $_REQUEST['CardType']);
 $CardNumber=(empty($_REQUEST['CardNumber']) ? 0 : intval($_REQUEST['CardNumber']));
+$AvailableFonts=getFonts();
 
 $Select
 	= "SELECT IdCards.*, LENGTH(IcBackground) as ImgSize "
@@ -60,7 +62,7 @@
 die();
 
 function draw_pip($r) {
-	global $img, $ColBlk, $CFG;
+	global $img, $ColBlk, $CFG, $AvailableFonts;
 	static $Fonts=array('arial','times','cour');
 
 	$Options=unserialize($r->IceOptions);
@@ -233,7 +235,9 @@ function draw_pip($r) {
 			if(isset($Text)) {
 				if($Options and $Options['H']>0 and $Options['W']>0) {
 					// Calculate the dimensions of the box containing the text
-					$font=dirname(dirname(__FILE__))."/Common/tcpdf/fonts/{$Options['Font']}.ttf";
+                    // we do need a fallback in case there is no available extra font!
+                    $font=$AvailableFonts[$Options['Font']]['file'] ?? $AvailableFonts[$Options['Font'].'.ttf']['file'] ?? dirname(dirname(__FILE__))."/Common/tcpdf/fonts/arial.ttf";
+//                    $font=dirname(dirname(__FILE__))."/Common/tcpdf/fonts/{$Options['Font']}.ttf";
 					if(strpos($Options['Size'],'-') !== false) {
 						list($Options['Size'],) = explode('-',$Options['Size']);
 					}
diff --git a/src/Accreditation/PrintAcc.php b/src/Accreditation/PrintAcc.php
new file mode 100644
index 00000000..1ac1c8ee
--- /dev/null
+++ b/src/Accreditation/PrintAcc.php
@@ -0,0 +1,8 @@
+<?php
+require_once(dirname(dirname(__FILE__)) . '/config.php');
+checkACL(AclAccreditation, AclReadWrite);
+$badge2Print = urldecode($_REQUEST["toPrint"] ?? '');
+$specificAutomator='';
+$customPrinter = $_REQUEST["printer"] ?? '';;
+
+runJack("AutoCheckinPrint", $_SESSION['TourId'], array("URL"=>$badge2Print , "Automator"=>$specificAutomator, "Printer"=>$customPrinter, "TourId"=>$_SESSION['TourId']));
\ No newline at end of file
diff --git a/src/Api/ISK-NG/Devices-action.php b/src/Api/ISK-NG/Devices-action.php
index 6e187d1e..5d7d6870 100644
--- a/src/Api/ISK-NG/Devices-action.php
+++ b/src/Api/ISK-NG/Devices-action.php
@@ -26,8 +26,8 @@
             }
         }
     }
-    if(isset($_REQUEST['groupId']) && preg_match("/^[0-9A-Z]{1}$/i",$_REQUEST['groupId'],$tmpGrp)) {
-        $GROUPID = $tmpGrp[0];
+    if(isset($_REQUEST['groupId']) && is_numeric($_REQUEST['groupId'])) {
+        $GROUPID = intval($_REQUEST['groupId']);
 	    $SEQTYPE=($storeSeq[$GROUPID]['type'][0] ?? '');
         $SQL = "SELECT IskDvDevice FROM IskDevices WHERE IskDvTournament=".$_SESSION["TourId"] ." AND IskDvGroup={$GROUPID}";
         $q = safe_r_SQL($SQL);
@@ -35,8 +35,11 @@
             $tmpDevices[] = $r->IskDvDevice;
         }
     }
-    if(isset($_REQUEST['newGrp']) && preg_match("/^[0-9A-Z]{1}$/i",$_REQUEST['newGrp'])) {
-	    $SEQTYPE=($storeSeq[$_REQUEST['newGrp']]['type'][0] ?? '');
+    if(isset($_REQUEST['newGrp']) && is_numeric($_REQUEST['newGrp'])) {
+        $NewGroup=intval($_REQUEST['newGrp']);
+        if($NewGroup>=0 and $NewGroup<26) {
+            $SEQTYPE=($storeSeq[$_REQUEST['newGrp']]['type'][0] ?? '');
+        }
     }
     $SQL = array();
 	$NeedChanges=true;
@@ -259,8 +262,8 @@
     }
 }
 
-$SQL = "SELECT IskDevices.*, if(IskDvLastSeen=0, 0, TIMESTAMPDIFF(second,IskDvLastSeen,now())) as Seconds, 	
-	least(3, round(TIMESTAMPDIFF(second,IskDvLastSeen,now())/65)) as Difference
+$SQL = "SELECT IskDevices.*, if(IskDvLastSeen=0, 0, TIMESTAMPDIFF(second,CONVERT_TZ(IskDvLastSeen,'+00:00','{$_SESSION['TourTimezone']}'),now())) as Seconds, 	
+	least(3, round(TIMESTAMPDIFF(second,CONVERT_TZ(IskDvLastSeen,'+00:00','{$_SESSION['TourTimezone']}'),now())/65)) as Difference
 	FROM IskDevices
 	ORDER BY IskDvGroup, IskDvTournament={$_SESSION['TourId']} desc, IskDvTarget+0, IskDvProActive desc, IskDvAppVersion desc, IskDvProConnected desc, IskDvTargetReq, IskDvCode";
 $q=safe_r_sql($SQL);
diff --git a/src/Api/ISK-NG/Devices.js b/src/Api/ISK-NG/Devices.js
index 26561f31..5c669088 100644
--- a/src/Api/ISK-NG/Devices.js
+++ b/src/Api/ISK-NG/Devices.js
@@ -94,8 +94,10 @@ function devicesRenderer(data) {
                 } else {
                     $('#bGroups').append(tmpRow);
                 }
-                updateSchedule(gElement.gId);
-                manageDistances(gElement.gId);
+                if(gElement.gDevicesCnt !=0 ) {
+                    updateSchedule(gElement.gId);
+                    manageDistances(gElement.gId);
+                }
             }
             oldGroup.delete(gElement.gId);
         });
@@ -152,7 +154,7 @@ function devicesRenderer(data) {
                 }
                 //App Info
                 tmpRow.append('<td id="devApp_' + this.tDevice + '">' + this.tApp + '</td>');
-                tmpRow.append('<td id="devAppVersion_' + this.tDevice + '">' + this.tAppVersion + '</td>');
+                tmpRow.append('<td id="devAppVersion_' + this.tDevice + '"' + (this.tAppVersion < reqAppVersion ? ' class="versionTooLow"' : '') + '>' + this.tAppVersion + '</td>');
                 //Device IDs
                 tmpRow.append('<td class="txtFixW Right" id="devCode_' + this.tDevice + '">' + this.tCode + '</td>');
                 tmpRow.append('<td class="txtFixW" id="devId_' + this.tDevice + '">' + this.tDevice + '</td>');
diff --git a/src/Api/ISK-NG/Devices.php b/src/Api/ISK-NG/Devices.php
index cd744d34..ad05d490 100644
--- a/src/Api/ISK-NG/Devices.php
+++ b/src/Api/ISK-NG/Devices.php
@@ -69,6 +69,7 @@
         'isPro' => ($_SESSION["UseApi"] === ISK_NG_PRO_CODE),
         'usePersonal' => ($UsePersonalDevices ? true : false),
         'tourCode' => $_SESSION["TourCode"],
+        'reqAppVersion' => reqAppVersion,
         'SocketIP'=>getModuleParameter('ISK-NG', 'SocketIP', gethostbyname($_SERVER['HTTP_HOST'])),
         'SocketPort'=>getModuleParameter('ISK-NG', 'SocketPort', '12346'),
         'scheduleOpts' => array_values($scheduleOpts),
diff --git a/src/Api/ISK-NG/FieldMonitor.js b/src/Api/ISK-NG/FieldMonitor.js
index 927f1bf2..183cf450 100644
--- a/src/Api/ISK-NG/FieldMonitor.js
+++ b/src/Api/ISK-NG/FieldMonitor.js
@@ -188,7 +188,7 @@ function devicesRenderer(data) {
                         window.sessionStorage.setItem('selectedGroups',JSON.stringify(selectedGroups));
                     }
                     let tmpRow = $('<tr ref="' + gElement.gId + '" id="grpRow_' + gElement.gId + '"></tr>');
-                    tmpRow.append('<th class="deviceGroupSmaller">' + gElement.gName + '</th>');
+                    tmpRow.append('<th class="deviceGroupSmaller"><i class="fa-solid fa-down-left-and-up-right-to-center mr-3" id="btnViewS_' + gElement.gId + '" onclick="setViewSize(' + gElement.gId + ',false)"></i>' + gElement.gName + '<i class="fa-solid fa-up-right-and-down-left-from-center ml-3"  id="btnViewL_' + gElement.gId + '"  onclick="setViewSize(' + gElement.gId + ',true)"></i></th>');
                     tmpRow.append('<td><input type="checkbox" class="groupSelector mr-2" id="chkGrp_' + gElement.gId + '" onclick="loadDevices('+gElement.gId+')" ' + (SelectedGroup ? 'checked="checked"' : '') + '><span class="sessionName">' + gElement.gSession + '</span></td>');
                     // we need to select the distance, which is now an array!
                     let distances = '';
@@ -257,7 +257,7 @@ function devicesRenderer(data) {
                     if ($('#deviceTable_' + block.group).length == 0) {
                         let zoomClass = window.sessionStorage.getItem('viewSize'+block.group) || '';
                         $('#DeviceGroupsContainers').append('<table class="Tabella" ref="' + block.group + '" id="deviceTable_' + block.group + '">' +
-                            '<tr><th class="deviceGroup w-5">' + gName + '</th><td id="deviceList_' + block.group + '" class="w-95 sizeS2"></td></tr>' +
+                            '<tr><th class="deviceGroup w-5">' + gName + '</th><td id="deviceList_' + block.group + '" class="w-95 zoomClass"></td></tr>' +
                             '</table>');
                     }
                     somethingChanged = true;
@@ -366,4 +366,19 @@ function devicesRenderer(data) {
         }
     }
     timeOutSetting();
+}
+
+function setViewSize(grpId, increase) {
+    let newClass = '';
+    newClass = $('#deviceList_'+grpId).hasClass('size') ? (increase ? 'sizeL0' : 'sizeS0') : newClass;
+    newClass = $('#deviceList_'+grpId).hasClass('sizeS0') ? (increase ? 'size' : 'sizeS1') : newClass;
+    newClass = $('#deviceList_'+grpId).hasClass('sizeS1') ? (increase ? 'sizeS0' : 'sizeS2') : newClass;
+    newClass = $('#deviceList_'+grpId).hasClass('sizeS2') ? (increase ? 'sizeS1' : 'sizeS2') : newClass;
+    newClass = $('#deviceList_'+grpId).hasClass('sizeL0') ? (increase ? 'sizeL1' : 'size') : newClass;
+    newClass = $('#deviceList_'+grpId).hasClass('sizeL1') ? (increase ? 'sizeL2' : 'sizeL0') : newClass;
+    newClass = $('#deviceList_'+grpId).hasClass('sizeL2') ? (increase ? 'sizeL2' : 'sizeL1') : newClass;
+    newClass = (newClass === '' ? (increase ? 'sizeL0' : 'sizeS0') : newClass);
+
+    $('#deviceList_'+grpId).removeClass('size sizeS0 sizeS1 sizeS2 sizeL0 sizeL1 sizeL2').addClass(newClass);
+    window.sessionStorage.setItem('viewSize'+grpId, newClass);
 }
\ No newline at end of file
diff --git a/src/Api/ISK-NG/FieldMonitor.php b/src/Api/ISK-NG/FieldMonitor.php
index 797fb408..974efe60 100644
--- a/src/Api/ISK-NG/FieldMonitor.php
+++ b/src/Api/ISK-NG/FieldMonitor.php
@@ -31,7 +31,7 @@
 
 //Socket Header
 echo '<table class="Tabella mb-3">';
-echo '<tr><th class="Title" colspan="2">' . $PAGE_TITLE . '</th></tr>';
+echo '<tr><th class="Title" colspan="3">' . $PAGE_TITLE . '</th></tr>';
 if($_SESSION["UseApi"] === ISK_NG_LIVE_CODE) {
     echo '<tr>' .
         '<th class="w-15">' . get_text('ISK-ConnectionStatus', 'Api') . '</th>' .
diff --git a/src/Api/ISK-NG/Lib.php b/src/Api/ISK-NG/Lib.php
index 17c1266c..285131f7 100644
--- a/src/Api/ISK-NG/Lib.php
+++ b/src/Api/ISK-NG/Lib.php
@@ -520,7 +520,7 @@ function DoImportData($Options=array(), $IsSendall=0, &$UpdatedEntries=[]) {
                     IF(TfXNineChars{$Options['dist']}='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars{$Options['dist']}) as XNineChars,
                     EnIndClEvent, EnTeamClEvent, EnIndFEvent, EnTeamFEvent+EnTeamMixEvent as EnTeamFinals,
                     group_concat(concat_ws(':', IskDtEndNo, IskDtArrowstring) separator '|') as IskArrowstring,
-                    ToElabTeam!=127 as MakeTeams, ToLocRule
+                    ToElabTeam!=127 as MakeTeams, ToLocRule, QuConfirm & ".pow(2, $Options['dist']).">0 as StopScore
                 FROM Qualifications
 				INNER JOIN Entries ON QuId=EnId and EnTournament={$CompId}
 				INNER JOIN Tournament ON ToId=EnTournament
@@ -541,6 +541,14 @@ function DoImportData($Options=array(), $IsSendall=0, &$UpdatedEntries=[]) {
 				);
 			$q=safe_r_sql($SQL);
 			while($r=safe_fetch($q)) {
+                if($r->StopScore) {
+                    // scorecard validated, do not accept anything: deletes the data and skip to next record
+                    $Update = "DELETE FROM IskData
+                        WHERE IskDtTournament={$CompId} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q'
+                        AND IskDtTargetNo='{$r->QuTargetNo}' AND IskDtDistance={$Options['dist']}";
+                    safe_w_SQL($Update);
+                    continue;
+                }
 				$arrowString = str_pad($r->Arrowstring,$r->DIArrows*$r->DIEnds);
 				foreach(explode('|', $r->IskArrowstring) as $IskEnds) {
 					list($IskEnd,$IskString)=explode(':', $IskEnds);
@@ -698,7 +706,7 @@ function DoImportData($Options=array(), $IsSendall=0, &$UpdatedEntries=[]) {
 			if($IskSequence['subtype']=='R') {
 				require_once('Modules/RoundRobin/Lib.php');
 				$fSes=$IskSequence['session'];
-				$SQL="SELECT if(EvGoldsChars='', ToGoldsChars, EvGoldsChars) as GoldsChars, if(EvXNineChars='', ToXNineChars, EvXNineChars) as XNineChars, RrMatchEvent, RrMatchMatchNo, RrMatchTeam, RrMatchLevel, RrMatchGroup, RrMatchRound, RrMatchConfirmed,
+				$SQL="SELECT if(EvGoldsChars='', ToGoldsChars, EvGoldsChars) as GoldsChars, if(EvXNineChars='', ToXNineChars, EvXNineChars) as XNineChars, RrMatchEvent, RrMatchMatchNo, RrMatchTeam, RrMatchLevel, RrMatchGroup, RrMatchRound, RrMatchConfirmed as StopScore,
        					RrMatchArrowstring as Arrowstring, RrMatchTiebreak as TieBreak, RrMatchTbClosest as TbClosest, RrMatchTbDecoded as TbDecoded,
        					IskDtMatchNo, group_concat(concat_ws(':', IskDtEndNo, IskDtArrowstring) separator '|') as IskArrowstring, max(IskDtIsClosest) as IskClosest,
        					RrLevArrows as arrows, RrLevEnds as ends, RrLevSO as so, RrLevBestRankMode
@@ -714,6 +722,13 @@ function DoImportData($Options=array(), $IsSendall=0, &$UpdatedEntries=[]) {
 					group by IskDtTournament, IskDtMatchNo, IskDtEvent, IskDtTeamInd, IskDtType, IskDtTargetNo, IskDtDistance, IskDtSession";
 				$q=safe_r_SQL($SQL);
 				while($r=safe_fetch($q)){
+                    if($r->StopScore) {
+                        // score has been confirmed so we remove the data and skip to next record
+                        $Update = "DELETE FROM IskData
+							WHERE IskDtTournament={$CompId} AND IskDtMatchNo={$r->IskDtMatchNo} AND IskDtEvent='{$r->RrMatchEvent}' AND IskDtTeamInd={$IndTeam} AND IskDtType='M'";
+                        safe_w_SQL($Update);
+                        continue;
+                    }
 					foreach(explode('|', $r->IskArrowstring) as $IskEnds) {
 						list($IskEnd,$IskString)=explode(':', $IskEnds);
 
@@ -755,7 +770,8 @@ function DoImportData($Options=array(), $IsSendall=0, &$UpdatedEntries=[]) {
 				$tblHead = ($IndTeam==0 ? 'Fin' : 'Tf');
 
 				$SQL="SELECT if(EvGoldsChars='', ToGoldsChars, EvGoldsChars) as GoldsChars, if(EvXNineChars='', ToXNineChars, EvXNineChars) as XNineChars, FSEvent, FSMatchNo, FSTeamEvent, {$tblHead}Arrowstring as Arrowstring, {$tblHead}Tiebreak as TieBreak, {$tblHead}TbClosest as TbClosest, {$tblHead}TbDecoded as TbDecoded, GrPhase, 
-       				group_concat(concat_ws(':', IskDtEndNo, IskDtArrowstring) separator '|') as IskArrowstring, max(IskDtIsClosest) as IskClosest
+       				group_concat(concat_ws(':', IskDtEndNo, IskDtArrowstring) separator '|') as IskArrowstring, max(IskDtIsClosest) as IskClosest,
+       				{$tblHead}Confirmed as StopScore
 					FROM FinSchedule
                     inner join Events on EvTournament=FSTournament and EvTeamEvent=FSTeamEvent and EvCode=FSEvent
                     inner join Tournament on ToId=FSTournament
@@ -772,6 +788,14 @@ function DoImportData($Options=array(), $IsSendall=0, &$UpdatedEntries=[]) {
 				$SQL.=" group by IskDtTournament, IskDtMatchNo, IskDtEvent, IskDtTeamInd, IskDtType, IskDtTargetNo, IskDtDistance, IskDtSession";
 				$q=safe_r_SQL($SQL);
 				while($r=safe_fetch($q)){
+                    if($r->StopScore) {
+                        // SCORE HAS BEEN CONFIRMED SO
+                        // empty the whole match lines and skip to next record
+                        $Update = "DELETE FROM IskData
+							WHERE IskDtTournament={$CompId} AND IskDtMatchNo={$r->FSMatchNo} AND IskDtEvent='{$r->FSEvent}' AND IskDtTeamInd={$IndTeam} AND IskDtType='M'";
+                        safe_w_SQL($Update);
+                        continue;
+                    }
 					$obj=getEventArrowsParams($r->FSEvent,$r->GrPhase,$r->FSTeamEvent,$CompId);
 					$r->so=$obj->so; // will be used later on in UpdateNgArrowString()
                     $r->startArrow = 10000;
diff --git a/src/Api/ISK-NG/ManualDataDownload.js b/src/Api/ISK-NG/ManualDataDownload.js
new file mode 100644
index 00000000..d3089b2b
--- /dev/null
+++ b/src/Api/ISK-NG/ManualDataDownload.js
@@ -0,0 +1,51 @@
+var lastDeviceCode = '';
+
+$(function() {
+    $('#runningDeviceId').html(lastDeviceCode);
+    $('#data').focus();
+    $("#data").on('keyup', function (e) {
+        if (e.key === 'Enter') {
+            sendMsg();
+        }
+    });
+
+});
+
+function sendMsg() {
+    if(isJsonString($('#data').val())) {
+        let tmpPayload = JSON.parse($('#data').val());
+        if(tmpPayload.action === 'handshake') {
+            lastDeviceCode = tmpPayload.uuid;
+        } else {
+            if(tmpPayload.device === undefined) {
+                tmpPayload.device = lastDeviceCode;
+            } else {
+                lastDeviceCode = tmpPayload.device;
+            }
+            sendPayload(tmpPayload);
+        }
+        $('#runningDeviceId').html(lastDeviceCode);
+        $('#qrLastRead').html(new Date().toLocaleTimeString()
+            + ' - '
+            + (tmpPayload.action === 'handshake' ? 'Device' : (tmpPayload.action === 'sendall' ? 'Scorecard' : tmpPayload.action)));
+        $('#data').val('');
+        $('#data').focus();
+    } else {
+        $.alert({
+            title: Error,
+            content: WrongData,
+            boxWidth: '30%',
+            type: 'red',
+            useBootstrap: false,
+        });
+    }
+}
+
+function isJsonString(str) {
+    try {
+        JSON.parse(str);
+    } catch (e) {
+        return false;
+    }
+    return true;
+}
diff --git a/src/Api/ISK-NG/ManualDataDownload.php b/src/Api/ISK-NG/ManualDataDownload.php
new file mode 100644
index 00000000..4dcddc21
--- /dev/null
+++ b/src/Api/ISK-NG/ManualDataDownload.php
@@ -0,0 +1,54 @@
+<?php
+
+require_once(dirname(__FILE__) . '/config.php');
+require_once('Common/Lib/CommonLib.php');
+
+CheckTourSession(true);
+if(!($_SESSION["UseApi"] == ISK_NG_LIVE_CODE AND module_exists('ISK-NG_Live'))) {
+    CD_redirect($CFG->ROOT_DIR);
+}
+checkACL(AclISKServer, AclReadWrite);
+
+$PAGE_TITLE=get_text('ISK-GetQRData');
+$IncludeJquery = true;
+//$IncludeFA = true;
+
+$JS_SCRIPT=array(
+    phpVars2js(array(
+        'isLive' => ($_SESSION["UseApi"] === ISK_NG_LIVE_CODE and module_exists('ISK-NG_Live')),
+        'tourCode' => $_SESSION["TourCode"],
+        'SocketIP'=>getModuleParameter('ISK-NG', 'SocketIP', gethostbyname($_SERVER['HTTP_HOST'])),
+        'SocketPort'=>getModuleParameter('ISK-NG', 'SocketPort', '12346'),
+        'Error' => get_text('Error'),
+        'WrongData' => get_text('WrongData', 'Errors')
+    )),
+    ($_SESSION["UseApi"] == ISK_NG_LIVE_CODE ? '<script type="text/javascript" src="./socket.js"></script>' : '<script></script>'),
+    '<script type="text/javascript" src="./ManualDataDownload.js"></script>',
+    '<link href="./isk.css" rel="stylesheet" type="text/css">',
+);
+
+include('Common/Templates/head.php');
+
+echo '<table class="Tabella mb-3">'.
+    '<tr><th colspan="3" class="Title">' . $PAGE_TITLE. '</th></tr>';
+echo '<tr>'.
+    (($_SESSION["UseApi"] === ISK_NG_LIVE_CODE) ?
+        '<th class="w-15">' . get_text('ISK-ConnectionStatus', 'Api') . '</th>'.
+        '<th class="w-35">' . get_text('Masters', 'Api') . '</th>'.
+        '<th class="w-50">' . get_text('ISK-DeviceId', 'Api') . '</th>'
+        : ''
+    ).
+    '</tr>';
+echo '<tr>'.
+    (($_SESSION["UseApi"] === ISK_NG_LIVE_CODE) ?
+        '<td id="ctrConnStatus" class="socketOFF" ondblclick="changeMasterSocket()">DISCONNECTED</td>'.
+        '<td class="txtFixW"><span id="ctrMastersNo" class="TargetAssigned"></span><span id="ctrMasters"></span></td>'.
+        '<td class="txtFixW"><span id="runningDeviceId" class="TargetAssigned"></span><span class="ml-3" id="qrLastRead"></span></td>'
+        : ''
+    ).
+    '</tr>';
+echo '<tr><td colspan="3" class="Center"><textarea id="data" class="w-80" name="data" rows="25"></textarea></td></tr>'.
+    '<tr><td colspan="3" class="Center"><input type="button" onclick="sendMsg()" value="'.get_text("CmdSend","Tournament").'"></td></tr>'.
+    '</table>';
+
+include('Common/Templates/tail.php');
\ No newline at end of file
diff --git a/src/Api/ISK-NG/README.md b/src/Api/ISK-NG/README.md
new file mode 100644
index 00000000..b348ab28
--- /dev/null
+++ b/src/Api/ISK-NG/README.md
@@ -0,0 +1,16 @@
+# Ianseo Scorekeeper NG
+
+## Debug
+
+If you are instructed to, please do the following to submit debug information to the developers:
+
+- create a folder called "log" (all lowercase) inside the the ISK-NG folder and make it world-writeable
+- open the competition as usual, then add `?ianseo-debug-session` (including the "**?**") at the URL
+  
+  - Ianseo will turn "brownish" to show it is in debug mode
+  - only the browser where you modified the URL is in debug mode, letting other connected devices to behave normally
+  - to go back to the usual bluish ianseo, just close the competition or quit the browser (or use a different browser) 
+
+This procedure will start log the comunication between ianseo and the devices into a file called `messages-YYYY-MM-DD.log` where Y, M and D are current year, month and day
+
+You will then need to send the file(s) of the problematic day(s) with the export of the competition to isk@ianseo.net
\ No newline at end of file
diff --git a/src/Api/ISK-NG/Results-action.php b/src/Api/ISK-NG/Results-action.php
index efea6f15..32eced49 100644
--- a/src/Api/ISK-NG/Results-action.php
+++ b/src/Api/ISK-NG/Results-action.php
@@ -66,7 +66,7 @@
             $_REQUEST['groups']['g'.$Group]['s'] = $Sequence['session'];
             $_REQUEST['groups']['g'.$Group]['seq'] = $Sequence['IskKey'];
             if(!in_array('d', $_REQUEST['groups']['g'.$Group]) OR !in_array($_REQUEST['groups']['g'.$Group]['d'], $Sequence['distance'])) {
-                $_REQUEST['groups']['g' . $Group]['d'] = $Sequence['distance'][0];
+                $_REQUEST['groups']['g' . $Group]['d'] = ($Sequence['distance'][0]??[]);
             }
         }
     }
@@ -94,7 +94,6 @@
         case 'setDNF':
             $EnId = intval($_REQUEST['archerId'] ?? 0);
             // get the max hits for that distance
-            $QuHits = 0;
             $QuDistHits = 0;
             $Dist = intval($_REQUEST['d'] ?? 1);
             $q = safe_r_sql("select DiEnds*DiArrows as MaxArrows 
@@ -103,7 +102,6 @@
             inner join DistanceInformation on DiTournament=EnTournament and DiSession=QuSession and DiDistance={$Dist}
             where QuId={$EnId}");
             if ($r = safe_fetch($q)) {
-                $QuHits = $r->TotalArrows;
                 $QuDistHits = $r->MaxArrows;
             }
             safe_w_sql("update Qualifications set QuIrmType=5, QuD{$Dist}Hits=$QuDistHits, QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits where QuId={$EnId}");
diff --git a/src/Api/ISK-NG/Results.js b/src/Api/ISK-NG/Results.js
index 3b37e718..85eeeeae 100644
--- a/src/Api/ISK-NG/Results.js
+++ b/src/Api/ISK-NG/Results.js
@@ -98,9 +98,9 @@ function devicesRenderer(data) {
                     somethingChanged = true;
                     if(selectedGroups && selectedGroups['g' + gElement.gId] && (selectedGroups['g' + gElement.gId].seq != gElement.gSequence || selectedGroups['g' + gElement.gId].d != SelectedDistance)) {
                         // it is a new sequence so resets the selections
-                        SelectedDistance=(gElement.gDistances.length>1 ? 0 : gElement.gDistances[0].value);
+                        SelectedDistance=(gElement.gDistances.length>1 ? 0 : (gElement.gDistances[0] ? gElement.gDistances[0].value : 0));
                         SelectedEnd=1;
-                        selectedGroups['g' + gElement.gId].d=(gElement.gDistances.length>1 ? 0 : gElement.gDistances[0].value);
+                        selectedGroups['g' + gElement.gId].d=(gElement.gDistances.length>1 ? 0 : (gElement.gDistances[0] ? gElement.gDistances[0].value : 0));
                         selectedGroups['g' + gElement.gId].e=1;
                         selectedGroups['g' + gElement.gId].seq=gElement.gSequence;
                         window.sessionStorage.setItem('selectedGroups',JSON.stringify(selectedGroups));
@@ -548,7 +548,9 @@ function runPartialDone(gId, d, e, doForce = false) {
                 id: catList,
                 status: selectedGroups
             }
-            notifyControllers(BCastPartialImport, {importPartial: catList, g: gId, d: d, e: e });
+            if(isLive) {
+                notifyControllers(BCastPartialImport, {importPartial: catList, g: gId, d: d, e: e });
+            }
             $.post('Results-action.php', form, (data) => {
                 devicesRenderer(data);
                 if (isLive) {
@@ -574,7 +576,9 @@ function partialImport(obj) {
         status: selectedGroups
     }
     curPartialInput.set(form.id+'|'+form.g+'|'+form.d+'|'+form.e, Date.now())
-    notifyControllers(BCastPartialImport, {importPartial: [form.id], g: gId, d: form.d, e: form.e });
+    if(isLive) {
+        notifyControllers(BCastPartialImport, {importPartial: [form.id], g: gId, d: form.d, e: form.e});
+    }
     $.post('Results-action.php', form, (data) => {
          devicesRenderer(data);
          if(isLive) {
@@ -787,7 +791,9 @@ function removeDetails(obj) {
             $.get('Devices-action.php', form, (data2) => {
                 if (!data2.error) {
                     notifyDevices(data2.json);
-                    notifyControllers();
+                    if(isLive) {
+                        notifyControllers();
+                    }
                 }
             });
         }
@@ -831,7 +837,7 @@ function setDns(obj, archerID, doSet) {
                     "deviceId": $(obj).closest('div.resTarget').attr('dev'),
                 }
                 $.get('Devices-action.php', form, (data2) => {
-                    if (!data2.error) {
+                    if (!data2.error && isLive) {
                         notifyControllers();
                     }
                 });
@@ -862,7 +868,7 @@ function setDnf(obj, archerID, doSet) {
                     "deviceId": $(obj).closest('div.resTarget').attr('dev'),
                 }
                 $.get('Devices-action.php', form, (data2) => {
-                    if (!data2.error) {
+                    if (!data2.error && isLive) {
                         notifyControllers();
                     }
                 });
diff --git a/src/Api/ISK-NG/config.php b/src/Api/ISK-NG/config.php
index e5bdf18a..4fe1991f 100644
--- a/src/Api/ISK-NG/config.php
+++ b/src/Api/ISK-NG/config.php
@@ -5,6 +5,11 @@
 require_once('Common/Lib/CommonLib.php');
 require_once(__DIR__.'/config_defines.php');
 
+const reqAppVersion = '1.4.1';
+
+define('NG_DEBUG_LOG', ($CFG->DEBUG??false) and is_dir(__DIR__.'/log') and is_writable(__DIR__.'/log'));
+define('NG_DEBUG_LOGFILE', __DIR__.'/log/messages-'.date('Y-m-d').'.log');
+
 function getQrConfig($DEVICE, $cachedData=false, $Lightmode=false, $Force=false) {
 	if(!$cachedData) {
 		// rebuild and stores the specific configuration for this device
diff --git a/src/Api/ISK-NG/index.php b/src/Api/ISK-NG/index.php
index a47c0566..50b5c9e2 100644
--- a/src/Api/ISK-NG/index.php
+++ b/src/Api/ISK-NG/index.php
@@ -1,6 +1,6 @@
 <?php
 $SKIP_AUTH=true;
-require_once(dirname(__FILE__) . '/config.php');
+require_once(__DIR__ . '/config.php');
 const MAX_API_VERSION = 1;
 
 $Json=array('error'=>true);
@@ -25,13 +25,10 @@
 // This is in case we have several responses to manage as the result of a single call!
 $MultipleRes=[];
 
-if($CFG->DEBUG??false) {
-	if(is_dir(__DIR__.'/log') and is_writable(__DIR__.'/log')) {
-		$ErrorLog=__DIR__.'/log/messages-'.date('Y-m-d').'.log';
-		error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'GET', 'data' => $data])."\n", 3, $ErrorLog);
-		error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'HEADERS', 'data' => apache_request_headers()])."\n", 3, $ErrorLog);
-		chmod($ErrorLog, 0666);
-	}
+if(NG_DEBUG_LOG) {
+    error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'GET', 'data' => $data])."\n", 3, NG_DEBUG_LOGFILE);
+    error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'HEADERS', 'data' => apache_request_headers()])."\n", 3, NG_DEBUG_LOGFILE);
+    chmod(NG_DEBUG_LOGFILE, 0666);
 }
 
 try {
@@ -98,29 +95,23 @@
         $Json['responses'][] = $altRes;
     }
 } catch(Throwable $exception) {
-	if($CFG->DEBUG??false) {
-		if(is_dir(__DIR__.'/log') and is_writable(__DIR__.'/log')) {
-			error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'ERROR', 'data' => $exception->getMessage()])."\n", 3, $ErrorLog);
-		}
+	if(NG_DEBUG_LOG) {
+        error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'ERROR', 'data' => $exception->getMessage()])."\n", 3, NG_DEBUG_LOGFILE);
 	}
 
 	$Json['error'] = true;
 	$Json['errorMsg'] = 'Throwable error!';
 } catch(Error $exception) {
-	if($CFG->DEBUG??false) {
-		if(is_dir(__DIR__.'/log') and is_writable(__DIR__.'/log')) {
-			error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'ERROR', 'data' => $exception->getMessage()])."\n", 3, $ErrorLog);
-		}
+	if(NG_DEBUG_LOG) {
+        error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'ERROR', 'data' => $exception->getMessage()])."\n", 3, NG_DEBUG_LOGFILE);
 	}
 
 	$Json['error'] = true;
 	$Json['errorMsg'] = 'Fatal error!';
 }
 
-if($CFG->DEBUG??false) {
-	if(is_dir(__DIR__.'/log') and is_writable(__DIR__.'/log')) {
-		error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'SEND', 'data' => $Json])."\n", 3, $ErrorLog);
-	}
+if(NG_DEBUG_LOG) {
+    error_log(json_encode(['time'=>date('Y-m-d H:i:s'), 'mode'=>'SEND', 'data' => $Json])."\n", 3, NG_DEBUG_LOGFILE);
 }
 
 safe_close();
diff --git a/src/Api/ISK-NG/isk.css b/src/Api/ISK-NG/isk.css
index 68d6c38b..38615cab 100644
--- a/src/Api/ISK-NG/isk.css
+++ b/src/Api/ISK-NG/isk.css
@@ -73,7 +73,7 @@ input[type=button] {margin: 0.2rem}
 .charging {background-color: lightgreen;}
 .fullCharged {font-weight: bold; color: darkgreen; font-size: 125%}
 .charging.fullCharged {font-weight: bold; background-color: darkgreen; color: white; font-size: 125%}
-.emptyBattery {background-color: orange;}
+.emptyBattery, .versionTooLow {background-color: orange;}
 
 /** Socket **/
 #ctrConnStatus {
diff --git a/src/Api/ISK-NG/menu.php b/src/Api/ISK-NG/menu.php
index ff47a484..ee5f8ef0 100644
--- a/src/Api/ISK-NG/menu.php
+++ b/src/Api/ISK-NG/menu.php
@@ -12,6 +12,9 @@
         $ret['API'][] = MENU_DIVIDER;
     }
     $ret['API'][] = get_text('ISK-AppQrCode', 'Api') . '|' . $CFG->ROOT_DIR . 'Api/ISK-NG/QRcodes.php|||QrCode';
+    if ($_SESSION['UseApi'] == ISK_NG_LIVE_CODE and module_exists('ISK-NG_Live')) {
+        $ret['API'][] = get_text('ISK-GetQRData') . '|' . $CFG->ROOT_DIR . 'Api/ISK-NG/ManualDataDownload.php';
+    }
     if($_SESSION['UseApi']!=ISK_NG_LITE_CODE and getModuleParameter('ISK-NG', 'UsePersonalDevices')) {
         $ret['API'][] = get_text('TargetRequests-Printout', 'Api') . '|' . $CFG->ROOT_DIR . 'Api/ISK-NG/TargetRequests.php';
     } else if ($_SESSION['UseApi']==ISK_NG_LITE_CODE) {
diff --git a/src/Api/ISK-NG/v1/ping.php b/src/Api/ISK-NG/v1/ping.php
index a6c1a148..c414a798 100644
--- a/src/Api/ISK-NG/v1/ping.php
+++ b/src/Api/ISK-NG/v1/ping.php
@@ -1,5 +1,7 @@
 <?php
-if($req->device == 'ngSocket') {
+if(!isset($req->device)) {
+    $res = 'pong';
+} elseif ($req->device == 'ngSocket') {
     $res['ianseo'] = array(
         'UUID' => GetParameter('UUID2'),
         'Version' => ProgramVersion,
diff --git a/src/Api/ISK/AjaxAddGroup.php b/src/Api/ISK/AjaxAddGroup.php
deleted file mode 100644
index fd4e8b50..00000000
--- a/src/Api/ISK/AjaxAddGroup.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-
-CheckTourSession(true);
-
-$Session='';
-$SesType='Q';
-$Phase=0;
-
-$Group='';
-foreach($_REQUEST['tgt'] as $SType => $Phases) {
-	$SesType=$SType;
-	foreach($Phases as $SPhase => $Targets) {
-		$Phase=$SPhase;
-		foreach($Targets as $tgt => $group) {
-			$group=preg_replace('/[^0-9a-z_ -]/sim', '', $group);
-			if(!$Session) $Session=substr($tgt,0,1);
-			if(!$Group) $Group=$group;
-			if(isset($_REQUEST['del'])) {
-				safe_w_sql("delete from TargetGroups
-					where TgTournament={$_SESSION['TourId']} and TgTargetNo='$tgt'");
-			} else {
-				safe_w_sql("insert into TargetGroups
-					set TgTournament={$_SESSION['TourId']},
-					TgSession=".substr($tgt,0,1).",
-					TgSesType='".$SesType.($SPhase ? $SPhase : '')."',
-					TgTargetNo='$tgt',
-					TgGroup=".StrSafe_DB($group)."
-					on duplicate key update
-					TgGroup=".StrSafe_DB($group)."
-							");
-			}
-		}
-	}
-}
-
-
-header('Content-Type: text/xml');
-
-print '<response>' . "\n";
-print '<error>0</error>' . "\n";
-
-if(isset($_REQUEST['new'])) {
-	require_once('../lib.php');
-
-	switch($SesType) {
-		case 'Q':
-			$q=safe_r_sql(getSesSQL('Q', $Session));
-			$SesRow=safe_fetch($q);
-			$SesRow->Range=Range($SesRow->SesFirstTarget, $SesRow->SesTar4Session+$SesRow->SesFirstTarget-1);
-			break;
-		case 'E':
-			$q=safe_r_sql(getSesSQL('E', $Session, $Phase));
-			$SesRow=safe_fetch($q);
-			$SesRow->Range=explode(',', $SesRow->SesTar4Session);
-			break;
-	}
-
-	$ret=BuildGroups($SesType, $Session, $Phase, $SesRow->Range, $Group);
-
-	echo "<row><![CDATA[$ret]]></row>";
-}
-
-print '</response>' . "\n";
-
diff --git a/src/Api/ISK/AjaxDeleteRow.php b/src/Api/ISK/AjaxDeleteRow.php
deleted file mode 100644
index 59192ff8..00000000
--- a/src/Api/ISK/AjaxDeleteRow.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-
-CheckTourSession(true);
-
-$Group=(empty($_REQUEST['Group'])? '-' : $_REQUEST['Group']);
-
-list($SesType, $Session, $Groups)=explode('-', $Group, 3);
-
-safe_w_sql("delete from TargetGroups
-	where TgTournament={$_SESSION['TourId']}
-	and TgSession=$Session
-	and TgSesType='$SesType'
-	and TgGroup=".StrSafe_DB($Groups));
-
-header('Content-Type: text/xml');
-
-print '<response>';
-print '<error>0</error>';
-echo '</response>';
\ No newline at end of file
diff --git a/src/Api/ISK/Anomalies.php b/src/Api/ISK/Anomalies.php
deleted file mode 100644
index dd80d1d3..00000000
--- a/src/Api/ISK/Anomalies.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)).'/config.php');
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadOnly);
-
-require_once('Common/Lib/CommonLib.php');
-require_once('Common/Lib/Fun_Modules.php');
-
-$PAGE_TITLE=get_text('ISK-Anomalies', 'Api');
-$JS_SCRIPT=array(
-	phpVars2js(array('msgAreYouSure' => get_text('MsgAreYouSure'), 'Anomalies' => 1)),
-    '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/js/jquery-3.2.1.min.js"></script>',
-	'<script type="text/javascript" src="./index.js"></script>',
-	'<script type="text/javascript" src="./Results.js"></script>',
-	'<link href="ISK.css" rel="stylesheet" type="text/css">',
-);
-
-$ONLOAD=' onload="ResultsInit()"'; // onunload="SetAutoImport(true)"';
-
-include('Common/Templates/head.php');
-
-echo '<table class="Tabella">';
-echo '<tr><th class="Title" colspan="6">' . get_text('ISK-Anomalies', 'Api') . '</th></tr>';
-echo '<tr>';
-	echo '<th nowrap="nowrap">' . get_text('Session') . '</th>';
-	echo '<th nowrap="nowrap">' . get_text('Distance', 'Tournament') . '</th>';
-	echo '<th nowrap="nowrap">' . get_text('Volee', 'HTT') . '</th>';
-	echo '<th >&nbsp;</th>';
-	echo '<th nowrap="nowrap">' . get_text('AutoImport', 'Api') . '</th>';
-	echo '<th nowrap="nowrap">' . get_text('LockToEnds', 'Api') . '</th>';
-echo '</tr>';
-echo '<tr>';
-	echo '<td nowrap="nowrap">
-		<select name="x_Session" id="x_Session" onChange="loadComboDistanceEnd(); LoadTablets();"></select><br>
-		<input type="checkbox" value="1" id="x_onlyToday" onClick="loadComboSchedule();">' . get_text('OnlyToday', 'Tournament') . '
-		</td>';
-	echo '<td nowrap="nowrap"><select name="x_Distance" id="x_Distance" onchange="adjustMaxEnd(); UpdateTablets()"></select></td>';
-	echo '<td nowrap="nowrap"><input type="number" name="x_End" id="x_End" min="0" max="12" value="0" onchange="UpdateTablets()"></td>';
-	echo '<td nowrap="nowrap" align="center" style="padding:0 2em;"><input type="button" id="setCurrent" value="' . get_text('CmdOk') . '" onClick="LoadTablets();"></td>';
-	echo '<td nowrap="nowrap" align="center" style="padding:0 2em;">
-		<input type="checkbox" id="AutoImport" onClick="SetAutoImport(this.checked)"'.(getModuleParameter('ISK', 'StopAutoImport') ? '' : ' checked="checked"').'>
-		<input type="button" id="cmdImport" class="' . (getModuleParameter('ISK', 'StopAutoImport') ? '':'hidden'). '" value="' . get_text('CmdImport','Api') . '" onClick="dataImport();">
-		</td>';
-	echo '<td nowrap="nowrap" align="center" style="padding:0 2em;" id="StickyEnds"></td>';
-echo '</tr>';
-echo '<tr class="divider"><td colspan="6"></td></tr>';
-echo '<tr>';
-	echo '<td id="ISK-ses"></td>';
-	echo '<td id="ISK-dis"></td>';
-	echo '<td id="ISK-end"></td>';
-	echo '<td></td>';
-	echo '<td></td>';
-	echo '<td id="ISK-sticky"></td>';
-echo '</tr>';
-echo '<tr>';
-	echo '<td id="Errors" colspan="6"></td>';
-echo '</tr>';
-
-echo '</table>';
-
-// gets all the
-
-echo '<div id="TabletInfo"></div>';
-
-echo '<div class="Legend">';
-foreach(array('G', 'R', 'O', 'B', 'C', 'Z', 'Y') as $Let) {
-	echo '<div><span class="Let-'.$Let.'">&nbsp;&nbsp;&nbsp;&nbsp;</span> '.get_text('Desc-Let-'.$Let, 'Api').'</div>';
-}
-echo '</div>';
-echo '<div id="PopUp" class="PopUp">
-	<div class="TargetTitle"><img class="PopUpCloseImg ClickableDiv" onClick="closeTarget()"><span id="PopUpTitle"></span></div>
-	<div id="PopUpContent"></div>
-	<div id="PopUpCmd">
-		<input type="button" class="ClickableDiv" id="PopupRemove" value="'.get_text('CmdDelete', 'Api').'" onclick="popupRemove(this)">
-		<input type="button" class="ClickableDiv" id="PopupImport" value="'.get_text('CmdImport', 'Api').'" onclick="popupImport(this)">
-		<input type="button" class="ClickableDiv" value="'.get_text('Close').'" onclick="closeTarget()">
-	</div>
-	</div>';
-include('Common/Templates/tail.php');
diff --git a/src/Api/ISK/ApiConfig.php b/src/Api/ISK/ApiConfig.php
deleted file mode 100644
index 42a8f0c6..00000000
--- a/src/Api/ISK/ApiConfig.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-// this code-bit goes into the Tournament/index.php
-$ISKServerUrl=getModuleParameter('ISK', 'ServerUrl', '');
-
-$ConfigHtml='';
-if(!empty($_REQUEST['api'])) {
-    $ConfigHtml.='<tr>
-        <th class="TitleLeft" width="25%">'.get_text('ISK-ServerUrl','Api').'</th>
-        <td width="75%">
-        <input type="text" style="width:100%" name="Module[ISK][ServerUrl]" value="'.$ISKServerUrl.'">
-        </td>
-        </tr>';
-    $ISKServerUrlPIN=getModuleParameter('ISK', 'ServerUrlPin', '');
-    $ConfigHtml.='<tr>
-        <th class="TitleLeft" width="25%">'.get_text('ISK-ServerUrlPin','Api').'</th>
-        <td width="75%">
-        <input type="text" size="7" maxlength="4" name="Module[ISK][ServerUrlPin]" value="'.$ISKServerUrlPIN.'">
-        '.get_text('ISK-ServerUrlPin','Help',$_SESSION["TourCode"].'|'.(empty($ISKServerUrlPIN) ? '____':$ISKServerUrlPIN)).'
-        </td>
-        </tr>';
-    if ($_REQUEST['api']=='pro') {
-        $ISKLicenseNumber=getModuleParameter('ISK', 'LicenseNumber', '');
-        $ConfigHtml.='<tr>
-            <th class="TitleLeft" width="15%">'.get_text('ISK-LicenseNumber','Api').'</th>
-            <td width="75%">
-            <input type="text" style="width:100%" name="Module[ISK][LicenseNumber]" value="'.$ISKLicenseNumber.'">
-            </td>
-            </tr>';
-        /*
-        if(!$ISKLicenseNumber) {
-            $ISKLicenseVoucher=getModuleParameter('ISK', 'LicenseVoucher', '');
-            $ConfigHtml.='<tr>
-                <th class="TitleLeft" width="15%"><div>'.get_text('ISK-LicenseVoucher','Api').'</div>
-                    <div>'.get_text('ISK-LicenseVoucherTip', 'Api').'</div>
-                </th>
-                <td width="75%">
-                <input type="text" style="width:100%" name="Module[ISK][LicenseVoucher]" value="'.$ISKLicenseVoucher.'">
-                </td>
-                </tr>';
-
-        }
-        */
-    }
-}
diff --git a/src/Api/ISK/ApiGrouping.js b/src/Api/ISK/ApiGrouping.js
deleted file mode 100644
index 80fbf0a0..00000000
--- a/src/Api/ISK/ApiGrouping.js
+++ /dev/null
@@ -1,177 +0,0 @@
-function AddGroup(obj) {
-	var Row=obj.parentNode.parentNode;
-	var Gruppo=document.getElementById('GrName').value;
-	if(Gruppo=='') return;
-	
-	var fields='';
-	for(var n=2; n<Row.childElementCount; n++) {
-		var radio=Row.childNodes[n].childNodes[0];
-		if(radio.checked) fields=fields+'&'+radio.name+'='+Gruppo;
-	}
-	if(fields=='') return;
-	fields='?new=1'+fields;
-	
-	ManageFields(fields);
-}
-
-function UpdateGroup(obj, remove) {
-	var fields='';
-	fields='?'+obj.name+'='+obj.value;
-	if(remove) fields=fields+'&del=1';
-	
-	ManageFields(fields);
-}
-
-function ManageFields(fields) {
-	var XMLHttp=CreateXMLHttpRequestObject();
-	if (XMLHttp) {
-		try {
-			if ((XMLHttp.readyState==XHS_COMPLETE || XMLHttp.readyState==XHS_UNINIT)) {
-				XMLHttp.open("GET","AjaxAddGroup.php"+fields, true);
-				XMLHttp.onreadystatechange=function() {
-					if (XMLHttp.readyState!=XHS_COMPLETE) return;
-					if (XMLHttp.status!=200) return;
-					try {
-						var XMLResp=XMLHttp.responseXML;
-						// intercetto gli errori di IE e Opera
-						if (!XMLResp || !XMLResp.documentElement) throw(XMLResp.responseText);
-
-						// Intercetto gli errori di Firefox
-						var XMLRoot;
-						if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") throw("ParseError");
-
-						XMLRoot = XMLResp.documentElement;
-
-						var Error = XMLRoot.getElementsByTagName('error').item(0).firstChild.data;
-						var Data = XMLRoot.getElementsByTagName('row').item(0).firstChild.data;
-
-						if (Error==0) {
-							if(Data) {
-								var tabella=document.getElementById('Groups');
-								var riga=tabella.insertRow(tabella.rows.length-1);
-								riga.innerHTML=Data;
-							}
-							document.getElementById('GrName').value='';
-						} else {
-							// SetStyle(Which,'error');
-						}
-
-					} catch(e) {
-						//document.getElementById('idOutput').innerHTML='Errore: ' + e.toString();
-					}
-
-				};
-				XMLHttp.send();
-			}
-		} catch (e) {
-			//document.getElementById('idOutput').innerHTML='Errore: ' + e.toString();
-		}
-	}	
-}
-
-function DeleteGroup(obj) {
-	if(!confirm(ConfirmDeleteRow)) return;
-	
-	var XMLHttp=CreateXMLHttpRequestObject();
-	if (XMLHttp) {
-		try {
-			if ((XMLHttp.readyState==XHS_COMPLETE || XMLHttp.readyState==XHS_UNINIT)) {
-				XMLHttp.open("GET","AjaxDeleteRow.php?Group="+obj.id,true);
-				XMLHttp.onreadystatechange=function() {
-					if (XMLHttp.readyState!=XHS_COMPLETE) return;
-					if (XMLHttp.status!=200) return;
-					try {
-						var XMLResp=XMLHttp.responseXML;
-						// intercetto gli errori di IE e Opera
-						if (!XMLResp || !XMLResp.documentElement) throw(XMLResp.responseText);
-
-						// Intercetto gli errori di Firefox
-						var XMLRoot;
-						if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") throw("ParseError");
-
-						XMLRoot = XMLResp.documentElement;
-
-						var Error = XMLRoot.getElementsByTagName('error').item(0).firstChild.data;
-
-						if (Error==0) {
-							var Row=obj.parentNode.parentNode;
-							Row.parentNode.deleteRow(Row.rowIndex);
-						} else {
-							// SetStyle(Which,'error');
-						}
-
-					} catch(e) {
-						//document.getElementById('idOutput').innerHTML='Errore: ' + e.toString();
-					}
-
-				};
-				XMLHttp.send();
-			}
-		} catch (e) {
-			//document.getElementById('idOutput').innerHTML='Errore: ' + e.toString();
-		}
-	}
-}
-
-function getModuli(Cell, id, action) {
-	var XMLHttp=CreateXMLHttpRequestObject();
-	if (XMLHttp) {
-		try {
-			if ((XMLHttp.readyState==XHS_COMPLETE || XMLHttp.readyState==XHS_UNINIT)) {
-				XMLHttp.open("GET","getModuli.php"+(id ? '?id='+id : ''),true);
-				XMLHttp.onreadystatechange=function() {
-					if (XMLHttp.readyState!=XHS_COMPLETE) return;
-					if (XMLHttp.status!=200) return;
-					try {
-						var XMLResp=XMLHttp.responseXML;
-						// intercetto gli errori di IE e Opera
-						if (!XMLResp || !XMLResp.documentElement) throw(XMLResp.responseText);
-
-						// Intercetto gli errori di Firefox
-						var XMLRoot;
-						if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") throw("ParseError");
-
-						XMLRoot = XMLResp.documentElement;
-
-						var Error = XMLRoot.getElementsByTagName('error').item(0).firstChild.data;
-						var Data = XMLRoot.getElementsByTagName('data');
-
-						if (Error==0) {
-							var CatSelect=document.getElementById(Cell);
-							var option=document.createElement('option');
-							option.text='==> Seleziona';
-							option.value=0;
-							try {
-								// for IE earlier than version 8
-								CatSelect.add(option,CatSelect.options[null]);
-							} catch (e) {
-								CatSelect.add(option,null);
-							}
-							for(n=0; n<Data.length; n++) {
-								var option=document.createElement('option');
-								option.text=Data.item(n).firstChild.data;
-								option.value=Data.item(n).getAttribute('value');
-								try {
-									// for IE earlier than version 8
-									CatSelect.add(option,CatSelect.options[null]);
-								} catch (e) {
-									CatSelect.add(option,null);
-								}
-
-							}
-						} else {
-							// SetStyle(Which,'error');
-						}
-
-					} catch(e) {
-						//document.getElementById('idOutput').innerHTML='Errore: ' + e.toString();
-					}
-
-				};
-				XMLHttp.send();
-			}
-		} catch (e) {
-			//document.getElementById('idOutput').innerHTML='Errore: ' + e.toString();
-		}
-	}
-}
diff --git a/src/Api/ISK/ApiGrouping.php b/src/Api/ISK/ApiGrouping.php
deleted file mode 100644
index 1e84adb4..00000000
--- a/src/Api/ISK/ApiGrouping.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadWrite);
-
-require_once('Common/Lib/CommonLib.php');
-
-$Session=(empty($_REQUEST['Session']) ? '0' : $_REQUEST['Session']);
-$SesType=(empty($_REQUEST['SesType']) ? 'Q' : $_REQUEST['SesType']);
-$ElPhase=(empty($_REQUEST['ElPhase']) ? '0' : $_REQUEST['ElPhase']);
-$SesRow='';
-$tgt=$Session.'%03s';
-
-$PAGE_TITLE=get_text('API-TargetGrouping', 'Api');
-$JS_SCRIPT=array(
-		phpVars2js(array('ConfirmDeleteRow'=> get_text('API-ConfirmDeleteRow', 'Api'))),
-		'<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/ajax/ObjXMLHttpRequest.js"></script>',
-	'<script type="text/javascript" src="ApiGrouping.js"></script>',
-	);
-
-require_once('../lib.php');
-
-include('Common/Templates/head.php');
-
-echo '<select name="Session" onchange="if(this.value) {window.location.href=this.value;}">';
-
-// fetch the Qualification sessions
-echo '<option value="">==> '.get_text('QualRound').'</option>';
-
-$q=safe_r_sql(getSesSQL('Q'));
-while($r=safe_fetch($q)) {
-	echo '<option value="?SesType=Q&Session='.$r->SesOrder.'"'.($SesType=='Q' && $r->SesOrder==$Session ? ' selected="selected"' : '').'>'.($r->SesName ? $r->SesName : get_text('Session').' '.$r->SesOrder).'</option>';
-	if($r->SesOrder==$Session and $SesType=='Q') {
-		$SesRow=$r;
-		$SesRow->Range=Range($r->SesFirstTarget, $r->SesTar4Session+$r->SesFirstTarget-1);
-	}
-}
-
-// If Eliminations
-if($_SESSION['MenuElimDo']) {
-	$OldPhase='';
-	$SQL=getSesSQL('E');
-	$q=safe_r_SQL($SQL);
-	while($r=safe_fetch($q)) {
-		if($OldPhase!=$r->Phase) {
-			echo '<option value="">==> '.get_text('Eliminations_'.$r->Phase).'</option>';
-			$OldPhase=$r->Phase;
-		}
-		echo '<option value="?SesType=E&ElPhase='.$r->Phase.'&Session='.$r->SesOrder.'"'.($SesType=='E' && $ElPhase==$r->Phase && $r->SesOrder==$Session ? ' selected="selected"' : '').'>'.($r->SesName ? $r->SesName : get_text('Session').' '.$r->SesOrder).'</option>';
-		if($r->SesOrder==$Session and $SesType=='E' and $ElPhase==$r->Phase) {
-			$SesRow=$r;
-			$SesRow->Range=explode(',', $r->SesTar4Session);
-		}
-	}
-}
-
-$Sessions=array();
-if($_SESSION['MenuFinIDo']) $Sessions['I']=true;
-if($_SESSION['MenuFinTDo']) $Sessions['T']=true;
-
-echo '</select>';
-
-if($SesRow) {
-	echo '<table id="Groups" class="Tabella">';
-	echo '<tr>
-		<th class="Title" rowspan="2" colspan="2">'.get_text('API-Group', 'Api').'</th>
-		<th class="Title" colspan="'.count($SesRow->Range).'">'.get_text('API-Targets', 'Api').'</th>
-		</tr>';
-	echo '<tr>';
-	foreach($SesRow->Range as $Target) echo '<th class="Title">'.($Target).'</th>';
-	echo '</tr>';
-
-	echo buildGroups($SesType, $Session, $ElPhase, $SesRow->Range);
-
-	echo '<tr>';
-	echo '<th><img title="'.get_text('CmdAdd', 'Tournament').'" alt="add" src="'.$CFG->ROOT_DIR.'Common/Images/Enabled1.png" height="20" alt="add" onclick="AddGroup(this)"></th>';
-	echo '<th><input type="text" id="GrName"></th>';
-	foreach($SesRow->Range as $Target) {
-		$tgtno=sprintf($tgt, $Target);
-		echo '<td><input type="radio" onclick="UpdateGroup(this, \'delete\')" name="tgt['.$SesType.']['.$ElPhase.']['.$tgtno.']" value="***Group***"></td>';
-	}
-	echo '</tr>';
-	echo '</table>';
-}
-
-include('Common/Templates/tail.php');
\ No newline at end of file
diff --git a/src/Api/ISK/ConfigOptions.php b/src/Api/ISK/ConfigOptions.php
deleted file mode 100644
index 6ccb3ae0..00000000
--- a/src/Api/ISK/ConfigOptions.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$IskType['lite']=get_text('ISK-Name', 'Api');
-$IskType['pro']=get_text('ISK-Pro-Name', 'Api');
-
diff --git a/src/Api/ISK/DrawQRCode.php b/src/Api/ISK/DrawQRCode.php
deleted file mode 100644
index 50a93c20..00000000
--- a/src/Api/ISK/DrawQRCode.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
-
-The name of this function in the other modules MUST BE
-DrawQRCode_[Api Directory]
-
-*/
-function DrawQRCode_ISK_Lite(&$pdf, $X, $Y, $Session=0, $Distance=0, $Target='', $Phase='', $Stage='Q', $Individual=false, $DistName='', $small=false) {
-	DrawQRCode_ISK($pdf, $X, $Y, $Session, $Distance, $Target, $Phase, $Stage, $Individual, $DistName, $small);
-}
-
-function DrawQRCode_ISK(TCPDF &$pdf, $X, $Y, $Session=0, $Distance=0, $Target='', $Phase='', $Stage='Q', $Individual=false, $DistName='', $small=false) {
-	global $CFG;
-	static 	$OptsU, $OptsC;
-
-
-	$Width = ($small ? 15 : 25);
-	$Height = ($small ? 15 : 25);
-	if(!$X) {
-		$X=($pdf->getPageWidth()-$Width)/2;
-	}
-	if(!$Y) {
-		$Y=($pdf->getPageHeight()-$Height-3)/2;
-	}
-
-	$pdf->SetFontSize(10);
-
-	require_once('Common/Lib/Fun_Modules.php');
-
-	if(is_null($OptsU)) {
-		$OptsU=getModuleParameter('ISK', 'ServerUrl').$CFG->ROOT_DIR; // .'Api/ISK-Lite/';
-		$OptsC=$_SESSION['TourCode'];
-	    $tmpPin = getModuleParameter('ISK', 'ServerUrlPin');
-	    if(!empty($tmpPin)) {
-		    $OptsC .= '|'.$tmpPin;
-	    }
-	}
-
-	$Opts=array('u' => $OptsU, 'c' => $OptsC);
-	if($Session) $Opts['s']=$Session;
-	if($Distance || ($Stage=="MI" || $Stage=="MT")) $Opts['d']=(int)$Distance;
-    if($Stage=="MI" || $Stage=="MT") {
-        $Opts['t']=$Target;
-    } else if($Target) {
-        $Opts['t'] = str_pad($Target, 3, '0', STR_PAD_LEFT);
-    }
-	if($Phase) $Opts['p']=$Phase;
-	if($Stage) $Opts['st']=$Stage;
-
-	$text=json_encode($Opts);
-
-	$Oldx=$pdf->getX();
-	$Oldy=$pdf->getY();
-
-	require_once('Common/tcpdf/tcpdf_barcodes_2d.php');
-	// create new barcode object
-	$barcodeobj = new TCPDF2DBarcode($text, 'QRCODE,L');
-	$img=$barcodeobj->getBarcodePngData();
-
-	if($Individual and $Stage=='Q' and $Distance) {
-		// draws a white background square
-		$pdf->Rect($X, $Y, $Width, $Height, 'FD', array('all'=>array('color'=>100)), array(255));
-		$pdf->Image('@'.$img, $X+($small? 1 : 2.5), $Y+($small? 1 : 2.5), $Width-($small? 2 : 5), $Height-($small? 2 : 5), 'PNG');
-
-		$pdf->SetFont($pdf->FontStd,'',8);
-		$pdf->StartTransform();
-		// Rotate 20 degrees counter-clockwise centered by (70,110) which is the lower left corner of the rectangle
-		$pdf->setXY($X+$Width, $Y+$Height);
-		$pdf->Rotate(90, $X+$Width, $Y+$Height);
-		$pdf->MultiCell($Width, $Height, get_text('FlashCodeDistance','Api', ($DistName? $DistName : get_text('DistanceNum','Api', $Distance))), '', 'C');
-		// Stop Transformation
-		$pdf->StopTransform();
-		//$pdf->
-		//$pdf->MultiCell($Text, 4, , '','L', false,1, '', '', true, 0, true);
-	} else {
-		// draws a white background square
-		$pdf->Rect($X, $Y, $Width, $Height, 'FD', array('all'=>array('color'=>100)), array(255));
-		$pdf->Image('@'.$img, $X+($small? 1 : 2.5), $Y+($small? 1 : 2.5), $Width-($small? 2 : 5), $Height-($small? 2 : 5), 'PNG');
-	}
-
-	$pdf->setXY($Oldx, $Oldy);
-}
-
diff --git a/src/Api/ISK/GetArchersInfo.php b/src/Api/ISK/GetArchersInfo.php
deleted file mode 100644
index 8d551f5e..00000000
--- a/src/Api/ISK/GetArchersInfo.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-if(!defined('IN_IANSEO')) {
-	require_once(dirname(__FILE__) . '/config.php');
-}
-
-require_once('Common/Lib/Fun_Phases.inc.php');
-require_once('Common/Lib/Obj_RankFactory.php');
-require_once('Common/Lib/ArrTargets.inc.php');
-
-$json_array = array();
-$json_array['distances']=array();
-$json_array['targettypes']=array();
-$json_array['archers']=array();
-
-if(!empty($_GET['matchid'])) {
-	/***** MATCHES *****/
-
-	list($Event,$EventType,$MatchNo) = explode("|",$_GET['matchid']);
-	$EventType=($EventType=='T' ? 1 : 0);
-	$Phase=0;
-
-	//Get the phase related to the matchno
-	$SQL="select GrPhase from Grids where GrMatchNo=$MatchNo";
-	$Rs=safe_r_sql($SQL);
-	if($r=safe_fetch($Rs))
-		$Phase = $r->GrPhase;
-
-	// get the distances
-	$objParam=getEventArrowsParams($Event,$Phase,$EventType,$CompId);
-	$json_array['distances'][]=array('num' => 1, 'desc' => '', 'arrows' => (int)$objParam->arrows, 'ends' => (int)$objParam->ends, 'shootoff' => (int)$objParam->so, 'matchtype' => ($objParam->EvMatchMode ? "S":"C"));
-
-	//get the archers
-	$options['tournament']=$CompId;
-	$options['events']=array();
-	$options['events'][] =  $Event . '@' . $Phase;
-	$rank=null;
-	if($EventType)
-		$rank=Obj_RankFactory::create('GridTeam',$options);
-	else
-		$rank=Obj_RankFactory::create('GridInd',$options);
-
-	$rank->read();
-	$Data=$rank->getData();
-
-	foreach($Data['sections'] as $kSec=>$vSec) {
-		$tmp=array('id' => $vSec['meta']['targetTypeId'], 'name' => get_text($vSec['meta']['targetType']), 'arrowstringvalues' => GetGoodLettersFromTgtId($vSec['meta']['targetTypeId']));
-		if(!in_array($tmp, $json_array['targettypes'])) {
-			$json_array['targettypes'][]=$tmp;
-		}
-		foreach($vSec['phases'] as $kPh=>$vPh) {
-			foreach($vPh['items'] as $kItem=>$vItem) {
-				if($vItem['matchNo']==$MatchNo) {
-					$row_array=array();
-					$row_array["matchid"] = $kSec . "|" . ($EventType ? "T" : "I") . "|" . $vItem['matchNo'];
-					$row_array["name"] = ($EventType ? $vItem['countryName'] : $vItem['athlete']);
-					$row_array["placement"] = ltrim($vItem['target'],'0');
-					$row_array["info1"] = $vItem['countryCode']. ', ' . $vItem['countryName'];
-					$row_array["info2"] =$vSec['meta']['eventName'];
-					$row_array["distances"] = array($vSec['meta']['targetTypeId']);
-					$row_array["arrowstrings"] = array($vItem['arrowstring']);
-					$json_array['archers'][]=$row_array;
-
-					$row_array=array();
-					$row_array["matchid"] = $kSec . "|" . ($EventType ? "T" : "I") . "|" . $vItem['oppMatchNo'];
-					$row_array["name"] = ($EventType ? $vItem['oppCountryName'] : $vItem['oppAthlete']);
-					$row_array["placement"] = ltrim($vItem['oppTarget'],'0');
-					$row_array["info1"] = $vItem['oppCountryCode']. ', ' . $vItem['oppCountryName'];
-					$row_array["info2"] =$vSec['meta']['eventName'];
-					$row_array["distances"] = array($vSec['meta']['targetTypeId']);
-					$row_array["arrowstrings"] = array($vItem['oppArrowstring']);
-					$json_array['archers'][]=$row_array;
-				}
-			}
-		}
-	}
-
-} else {
-	$json_array['targettypes']=array();
-	$json_array['distances']=array();
-	$json_array['archers'] = Array();
-
-	// Check to see if we are in an Elimination stage (Field+3D)
-	$tmp=explode('|', (isset($_GET['sesstarget']) ? $_GET['sesstarget'] : ''));
-	if(count($tmp)==3) {
-		/***** ELIMINATIONS OLD STYLE *****/
-		// need to get all archers
-		$TargetNo=str_pad($tmp[2], 3, '0', STR_PAD_LEFT);
-
-		// Prepare the select used to retrieve competitor information
-		$Select = "SELECT EnId,EnCode,EnName,EnFirstName,EnSex,EnDivision,DivDescription,EnClass,ClDescription,
-			CoCode,CoName, concat('{$tmp[0]}|{$tmp[1]}|',ElTargetNo) as QuTargetNo, ElTargetNo AS TargetNo, ElArrowString as ArStr1,
-			TfT1, TfT2, TfT3, TfT4, TfT5, TfT6, TfT7, TfT8, EvElimEnds, EvElimArrows, EvElimSO, TarId, TarDescr
-			FROM Entries
-			INNER JOIN Eliminations ON EnId=ElId and ElElimPhase=".($tmp[0]=='E1' ? 0 : 1)." and ElEventCode='".$tmp[1]."'
-			inner join Events on EvCode=ElEventCode and EvTeamEvent=0 and EvTournament=ElTournament
-			INNER JOIN Countries ON EnCountry=CoId AND EnTournament=CoTournament
-			INNER JOIN Classes ON EnClass=ClId AND EnTournament=ClTournament
-			INNER JOIN Divisions ON EnDivision=DivId AND EnTournament=DivTournament
-			INNER JOIN TargetFaces ON EnTargetFace=TfId AND EnTournament=TfTournament
-			INNER JOIN Targets ON TfT1=TarId
-			WHERE EnTournament=$CompId
-				AND EnAthlete=1
-				AND EnStatus <= 1
-				AND left(ElTargetNo,3) in ('".$TargetNo."')
-			ORDER BY ElTargetNo ";
-		$q=safe_r_sql($Select);
-		while($r=safe_fetch($q)) {
-			$tmp=array('id' => $r->TarId, 'name' => get_text($r->TarDescr), 'arrowstringvalues' => GetGoodLettersFromTgtId($r->TarId));
-			if(!in_array($tmp, $json_array['targettypes'])) $json_array['targettypes'][]=$tmp;
-
-			$tmp=array(
-				'num' => 1,
-				'desc' => '1',
-				'arrows' => (int)$r->EvElimArrows,
-				'ends' => (int)$r->EvElimEnds);
-			if(!in_array($tmp, $json_array['distances'])) $json_array['distances'][]=$tmp;
-		}
-
-	} else {
-		// THIS IS THE QUALIFICATION PART
-		// Retrieve the parameters sent in the call
-		$Session = (empty($_GET['session']) ? '' : $_GET['session']);
-		$Target = sprintf("%03s", (isset($_GET['sesstarget']) ? $_GET['sesstarget'] : ''));  // Add leading zeroes because the app doesn't send them
-		$Filter="left(QuTargetNo,4) in ('".getGroupedTargets($Session.$Target, $Session)."')";
-
-		// get the targettypes
-		$sql=array();
-		for($n=1; $n<=8; $n++) {
-			$sql[]="select TarId, TarDescr from Targets
-				inner join TargetFaces on TfT{$n}=TarId and TfTournament=$CompId
-				inner join Entries on EnTournament=$CompId and EnTargetFace=TfId
-				inner join Qualifications on EnId=QuId and $Filter AND EnStatus <= 1 AND EnAthlete=1";
-		}
-		$SQL="(".implode(') UNION (', $sql).")";
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$tmp=array('id' => $r->TarId, 'name' => get_text($r->TarDescr), 'arrowstringvalues' => GetGoodLettersFromTgtId($r->TarId));
-			if(!in_array($tmp, $json_array['targettypes'])) $json_array['targettypes'][]=$tmp;
-		}
-
-		// get the distances
-		$sql=array();
-		for($n=1; $n<=8; $n++) {
-			$sql[]="select group_concat(DISTINCT Td{$n} ORDER BY Td{$n} ASC SEPARATOR ',') DiName, DiEnds, DiArrows, DiDistance
-				from Entries
-				INNER JOIN Tournament ON ToId=$CompId
-				inner join Qualifications on EnId=QuId and $Filter
-				INNER JOIN DistanceInformation ON EnTournament=DiTournament and DiSession=QuSession and DiDistance=$n and DiType='Q'
-				INNER JOIN TournamentDistances ON ToType=TdType and TdTournament=ToId AND CONCAT(TRIM(EnDivision),TRIM(EnClass)) LIKE TdClasses
-				where EnTournament=$CompId
-					AND EnStatus <= 1
-					AND EnAthlete=1
-				group by DiEnds, DiArrows, DiDistance
-					";
-		}
-		$SQL="(".implode(') UNION (', $sql).") order by DiDistance";
-
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			if(!$r->DiDistance)
-				continue;
-			$tmp=array(
-				'num' => (int)$r->DiDistance,
-				'desc' => $r->DiName,
-				'arrows' => (int)$r->DiArrows,
-				'ends' => (int)$r->DiEnds);
-			if(!in_array($tmp, $json_array['distances'])) $json_array['distances'][]=$tmp;
-		}
-
-		// Prepare the select used to retrieve competitor information
-		$Select = "SELECT EnId,EnCode,EnName,EnFirstName,EnSex,EnDivision,DivDescription,EnClass,ClDescription,
-				CoCode,CoName, QuTargetNo, SUBSTRING(QuTargetNo,2) AS TargetNo,
-	            TfT1, TfT2, TfT3, TfT4, TfT5, TfT6, TfT7, TfT8, 
-                QuD1Arrowstring as ArStr1, QuD2Arrowstring as ArStr2, QuD3Arrowstring as ArStr3, QuD4Arrowstring as ArStr4, QuD5Arrowstring as ArStr5, QuD6Arrowstring as ArStr6, QuD7Arrowstring as ArStr7, QuD8Arrowstring as ArStr8
-			FROM Entries
-			INNER JOIN Qualifications ON EnId=QuId
-			INNER JOIN Countries ON EnCountry=CoId AND EnTournament=CoTournament
-			INNER JOIN Classes ON EnClass=ClId AND EnTournament=ClTournament
-			INNER JOIN Divisions ON EnDivision=DivId AND EnTournament=DivTournament
-			INNER JOIN TargetFaces ON EnTargetFace=TfId AND EnTournament=TfTournament
-			WHERE EnTournament=$CompId
-				AND EnAthlete=1
-				AND EnStatus <= 1
-				AND $Filter
-			ORDER BY QuTargetNo ";
-	}
-
-	// Retrieve the competitor info
-	$Rs=safe_r_sql($Select);
-
-	while ($MyRow=safe_fetch($Rs)) {
-		// Now load the json array with the info we need
-		$row_array=array();
-		$row_array["id"] = $MyRow->EnId;
-		$row_array["name"] = $MyRow->EnName . ' ' . $MyRow->EnFirstName;
-		$row_array["placement"] = ltrim($MyRow->TargetNo, '0');
-		$row_array["info1"] = $MyRow->CoCode . ', ' . $MyRow->CoName;
-		$row_array["info2"] = $MyRow->EnDivision . $MyRow->EnClass . "-" . $MyRow->DivDescription . "," . $MyRow->ClDescription;
-		$row_array["qutarget"] = $MyRow->QuTargetNo;
-		$row_array["arrowstrings"] = array();
-
-		if($json_array['distances']) {
-			$distance_array = Array();
-
-			foreach(range(1, count($json_array['distances'])) as $i) {
-				$row_array["distances"][]=($json_array['distances'][$i-1]['desc']=='-' ? 0 : (int)$MyRow->{'TfT'.$i});
-				$row_array["arrowstrings"][] = str_pad($MyRow->{'ArStr'.$i}, $json_array['distances'][$i-1]['arrows']*$json_array['distances'][$i-1]['ends'], ' ', STR_PAD_RIGHT);
-
-			}
-		}
-		$json_array['archers'][]=$row_array;
-	}
-}
-
-// Return the json structure with the callback function that is needed by the app
-SendResult($json_array);
-
diff --git a/src/Api/ISK/GetCompInfo.php b/src/Api/ISK/GetCompInfo.php
deleted file mode 100644
index 8d6a5c1c..00000000
--- a/src/Api/ISK/GetCompInfo.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . '/config.php');
-require_once('Common/Fun_FormatText.inc.php');
-require_once('Common/Fun_Sessions.inc.php');
-
-// Is the
-
-	$TourRow=NULL;
-	$json_array=array();
-
-	$Select	= "SELECT ToId,ToType,ToCode,ToName,ToCommitee,ToComDescr,ToWhere, "
-		    . "       DATE_FORMAT(ToWhenFrom,'" . get_text('DateFmtDB') . "') AS DtFrom, "
-		    . "       DATE_FORMAT(ToWhenTo,'" . get_text('DateFmtDB') . "') AS DtTo, "
-		    . "       ToNumSession, ToTypeName, ToNumDist, ToNumEnds, ToCategory "
-		    . "  FROM Tournament  "
-		    . " WHERE ToId=$CompId";
-
-	// Retrieve the Tournament info
-	$Rs=safe_r_sql($Select);
-
-	if($TourRow=safe_fetch($Rs)) {
-		// Now load the json array with the info we need
-		// FIRST LOOK IF IT IS A PRO+PRO configuration!
-		if($iskModePro and $iskAppPro) {
-			// check the state of the app
-			$q=safe_r_sql("SELECT IskDvState FROM IskDevices WHERE IskDvDevice='{$DeviceId}' and IskDvState=3");
-			if(!safe_num_rows($q)) {
-				// the code has not been sent...
-				// is there a sequence defined?
-				$Sequence = getModuleParameter('ISK', 'Sequence', array("type"=>'', "session"=>'', "distance"=>'',  "maxdist"=>'', "end"=>''), $CompId);
-				if(!$Sequence['type']) {
-					$StickyEnds=getModuleParameter('ISK', 'StickyEnds', array('SeqCode'=>'', 'Distance'=>'', 'Ends'=>array()), $CompId);
-					if($StickyEnds['SeqCode']) {
-						// reset the app to the "request code"
-						SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-					}
-				} else {
-					// reset the app to the "request code"
-					SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-				}
-			}
-		}
-
-		$json_array["compcode"] = $TourRow->ToCode . (empty($CompPin) ? '' : '|'.$CompPin);
-		$json_array["compname"] = $TourRow->ToName;
-		$json_array["compdesc1"] = $TourRow->ToCommitee . ' - ' . $TourRow->ToComDescr;
-		$json_array["compdesc2"] = $TourRow->ToWhere . ", " . $TourRow->DtFrom . " - " . $TourRow->DtTo;
-		$json_array["compdesc3"] = ManageHTML(get_text($TourRow->ToTypeName, 'Tournament')) . ", " . $TourRow->ToNumDist . " " . get_text($TourRow->ToNumDist==1?'Distance':'Distances','Tournament');
-		$json_array["compcategory"] = (int)$TourRow->ToCategory;
-		$json_array["email"] = $iskModePro ? getModuleParameter('ISK', 'LicenseEmail', '', $CompId) : '';
-		$json_array["id"] = $iskModePro ? getModuleParameter('ISK', 'LicenseNumber', '', $CompId) : '';
-		$json_array["numdist"] = (int)$TourRow->ToNumDist;
-		$json_array["numsession"] = (int)$TourRow->ToNumSession;
-		$json_array["distances"] = array();
-		//Retrieve all the stages
-		$tmp_stage = Array();
-		$tmp_stage[] = "Q";
-		$Select = "SELECT DISTINCTROW EvTeamEvent, EvElim1, EvElim2 FROM Events WHERE EvTournament=$CompId AND EvFinalFirstPhase!=0 order by EvTeamEvent, EvElim1=0, EvElim2=0, EvProgr";
-		$Rs=safe_r_sql($Select);
-		while($StageRow=safe_fetch($Rs)) {
-			if($StageRow->EvElim1 > 0 && !in_array("E1",$tmp_stage))
-				$tmp_stage[]="E1";
-			if($StageRow->EvElim2 > 0 && !in_array("E2",$tmp_stage))
-				$tmp_stage[]="E2";
-			if($StageRow->EvTeamEvent==0 && !in_array("MI",$tmp_stage))
-				$tmp_stage[]="MI";
-			if($StageRow->EvTeamEvent==1 && !in_array("MT",$tmp_stage))
-				$tmp_stage[]="MT";
-		}
-		$json_array["stages"] = $tmp_stage;
-
-		// Retrieve all the sessions that have been defined for the tournament
-		// and create a sessions array in the json data
-		$sessions=GetSessions('Q',false,null,$TourRow->ToId);
-		$session_array = Array();
-		foreach ($sessions as $s) {
-			$row_array=array();
-			$row_array["sessdesc"] = $s->Descr;
-			$row_array["sesstype"] = $s->SesType;
-			$row_array["sessnumtargets"] = (int)$s->SesTar4Session;
-			$row_array["sessfirsttarget"] = (int)$s->SesFirstTarget;
-			$json_array["sessions"][]= $row_array;
-		}
-// 		$json_array["sessions"] = $session_array;
-
-		// Retrieve all the distances for the tournament and create
-		// an array to be appended to the json data
-		$Select = "SELECT Td1, Td2, Td3, Td4, Td5, Td6, Td7, Td8 "
-			    . "  FROM TournamentDistances "
-			    . " WHERE TdTournament=" . $TourRow->ToId;
-
-		$Rs=safe_r_sql($Select);
-
-		if (safe_num_rows($Rs) == 1) {
-			$distance_array = Array();
-			$DistRow=safe_fetch($Rs);
-			for($i=1; $i <= $TourRow->ToNumDist; $i++) {
-				$dist_array["distnum"] = $i;
-				$dist_array["distdesc"] = $DistRow->{'Td'.$i};
-				$dist_array["arrowsperend"] = '3';
-				$dist_array["numends"] = (int)$TourRow->ToNumEnds;
-				array_push($distance_array, $dist_array);
-			}
-			$json_array["distances"] = $distance_array;
-		}
-	}
-
-	// Return the json structure with the callback function that is needed by the app
-	SendResult($json_array);
-
diff --git a/src/Api/ISK/GetEndScore.php b/src/Api/ISK/GetEndScore.php
deleted file mode 100644
index 146053a0..00000000
--- a/src/Api/ISK/GetEndScore.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/config.php');
-require_once('Common/Lib/ArrTargets.inc.php');
-require_once('Common/Lib/Fun_Phases.inc.php');
-
-$Device = (!empty($_GET['devid']) ? $_GET['devid'] : '');
-$DistanceNum = (!empty($_GET['distnum']) ? intval($_GET['distnum']) : 1);
-$EndNum = (!empty($_GET['endnum']) ? $_GET['endnum'] : 1);
-$TargetNo= (!empty($_GET['qutarget']) ? $_GET['qutarget'] : 0);
-list($Event,$EventTypeLetter,$MatchNo) = explode("|",(!empty($_GET['matchid']) ? $_GET['matchid'] : "0|I|0"));
-$EventType=($EventTypeLetter=='T' ? 1 : 0);
-
-$ScoreRow=NULL;
-$json_array=array(
-	'distnum' => $DistanceNum,
-	'endnum' => $EndNum,
-	'prevendscored' => false,
-	'curendscore' => '',
-	'curscoreatend' => '',
-	'scoreatend' => '',
-	'arrowvalues' => array(),
-	'locked' => false
-	);
-
-$StickyEnds=getModuleParameter('ISK', 'StickyEnds', array('SeqCode'=>'', 'Distance'=>'', 'Ends'=>array()), $CompId);
-$LockedSessions=getModuleParameter('ISK', 'LockedSessions', array(), $CompId);
-
-
-if($TargetNo) {
-	$tmp=explode('|', $TargetNo);
-	$json_array['qutarget']= $TargetNo;
-	if(count($tmp)==3) {
-		// ELIMINATION
-		$LockKey='E|'.($tmp[0][1]-1).'|'.$tmp[1];
-		$Select	= "SELECT ElArrowString AS ArrowString, if(ElElimPhase=0, EvE1Arrows, EvE2Arrows) DiArrows
-			FROM Eliminations
-			INNER JOIN Events on ElEventCode=EvCode and ElTournament=EvTournament and EvTeamEvent=0
-			WHERE ElTargetNo=" . StrSafe_DB($tmp[2]) . "
-				AND ElEventCode='{$tmp[1]}'
-				AND ElElimPhase=".($tmp[0][1]-1)."
-				AND ElTournament=$CompId";
-
-		// Retrieve the score info
-		$Rs=safe_r_sql($Select);
-
-		if (safe_num_rows($Rs) == 1) {
-			// Now load the json array with the info we need
-			$ScoreRow=safe_fetch($Rs);
-
-
-			$StartPos = (empty($ScoreRow->isSO) ? ($EndNum-1) * $ScoreRow->DiArrows : 0);
-			$CurEnd=str_replace(' ', '', substr($ScoreRow->ArrowString, $StartPos, $ScoreRow->DiArrows));
-			if($CurEnd) $json_array["curendscore"] = ValutaArrowString($CurEnd);
-
-			$arrow_array = Array();
-			for($j=0; $j < $ScoreRow->DiArrows; $j++) {
-				array_push($arrow_array, DecodeFromLetter(substr($ScoreRow->ArrowString, $StartPos+$j, 1)) );
-			}
-			$json_array["arrowvalues"] = $arrow_array;
-			$json_array["prevendscored"] = (
-					($EndNum==1 and ($DistanceNum==1 or trim(substr($ScoreRow->PrevArrowString, ($ScoreRow->PrevEnds-1)*$ScoreRow->PrevArrows, $ScoreRow->PrevArrows)))
-						 or (trim(substr($ScoreRow->ArrowString, $StartPos-$ScoreRow->DiArrows, $ScoreRow->DiArrows)))));
-		}
-		// check sticky ends
-		// get the sequence this match belongs to
-		if($StickyEnds['SeqCode'] and $StickyEnds['SeqCode'][0]=='E' and $StickyEnds['SeqCode'][2]==$TargetNo[0]) {
-			$json_array['locked']=true;
-			if(in_array($EndNum, $StickyEnds['Ends']) and $DistanceNum==$StickyEnds['Distance']) {
-				$json_array['locked']=false;
-			}
-		}
-	} else {
-		// Qualification
-		$LockKey='Q|'.$TargetNo[0].'|'.$DistanceNum;
-		$SQL="SELECT QuId, QuTargetNo, QuTarget, DIDistance, QuD{$DistanceNum}Arrowstring as Arrowstring, DIEnds, DIArrows, 
-                IF(TfGoldsChars{$DistanceNum}='',IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars),TfGoldsChars{$DistanceNum}) as GoldsChars, 
-                IF(TfXNineChars{$DistanceNum}='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars{$DistanceNum}) as XNineChars,          
-                ToCategory&12 as IsField3D, ToNumEnds from Qualifications
-			INNER JOIN Entries ON QuId=EnId
-			INNER JOIN Tournament ON ToId=EnTournament
-            INNER JOIN TargetFaces on TfId=EnTargetFace and TfTournament=EnTournament
-			INNER JOIN DistanceInformation ON DITournament=EnTournament AND DISession=QuSession AND DIDistance=".StrSafe_DB($DistanceNum)." AND DIType='Q'
-			WHERE EnTournament=$CompId and QuTargetNo=".StrSafe_DB($TargetNo);
-		$q=safe_r_SQL($SQL);
-		$ArrowSearch=safe_fetch($q);
-		if($ArrowSearch) {
-			$tmp = getQualificationTotals($ArrowSearch->QuId, $ArrowSearch->DIDistance, $EndNum, $ArrowSearch->DIArrows, $ArrowSearch->DIEnds, $ArrowSearch->GoldsChars, $ArrowSearch->XNineChars, $ArrowSearch->IsField3D ? $ArrowSearch->QuTarget : null);
-			$json_array['curendscore']   = $tmp['curendscore'];
-			$json_array['curscoreatend'] = $tmp['curscoreatend'];
-			$json_array['scoreatend']    = $tmp['scoreatend'];
-			$json_array['prevendscored'] = $tmp['prevendscored'];
-			for($i=0; $i<$ArrowSearch->DIArrows; $i++) {
-				$json_array["arrowvalues"][] = DecodeFromLetter($tmp['curendarrstr'][$i]);
-			}
-		}
-
-		// check sticky ends
-		// get the sequence this match belongs to
-		if($StickyEnds['SeqCode'] and $StickyEnds['SeqCode'][0]=='Q' and $StickyEnds['SeqCode'][2]==$TargetNo[0]) {
-			$json_array['locked']=true;
-			if(in_array($EndNum, $StickyEnds['Ends']) and $DistanceNum==$StickyEnds['Distance']) {
-				$json_array['locked']=false;
-			}
-		}
-	}
-} else {
-	$LockKey=($EventType==0 ? 'I':'T').'|'.getPhase($MatchNo).'|'.$Event;
-
-	$json_array['matchid']= $Event."|".($EventType==0 ? 'I':'T')."|".$MatchNo;
-
-	$obj=getEventArrowsParams($Event,getPhase($MatchNo),$EventType,$CompId);
-	$tmp = getMatchTotals($Event, $MatchNo, $EventType, $EndNum, $obj->arrows, $obj->ends, $obj->so);
-	$json_array['curendscore']   = $tmp['curendscore'];
-	$json_array['curscoreatend'] = $tmp['curscoreatend'];
-	$json_array['scoreatend']    = $tmp['scoreatend'];
-	$json_array['prevendscored'] = ($EndNum==1 || $EndNum==$obj->ends+1 || (trim(substr($tmp['tilendarrstr'],-2*$obj->arrows)) !=''));
-	for($i=0; $i<($EndNum==$obj->ends+1 ? $obj->so:$obj->arrows); $i++) {
-		$json_array["arrowvalues"][] = DecodeFromLetter($tmp['curendarrstr'][$i]);
-	}
-
-	// check sticky ends
-	// get the sequence this match belongs to
-	$q=safe_r_sql("select concat('".($EventType==0 ? 'I':'T')."', FsScheduledDate, FsScheduledTime) as EventKey from FinSchedule where FsTournament=$CompId and FsTeamEvent=$EventType and FsEvent='$Event' and FsMatchNo=$MatchNo");
-	if($r=safe_fetch($q) and $r->EventKey==$StickyEnds['SeqCode']) {
-		$json_array['locked']=true;
-		if(in_array($EndNum, $StickyEnds['Ends'])) {
-			$json_array['locked']=false;
-		}
-	}
-}
-
-if(in_array($LockKey, $LockedSessions)) {
-	$json_array['locked']=true;
-}
-
-// Return the json structure with the callback function that is needed by the app
-SendResult($json_array);
diff --git a/src/Api/ISK/GetEndSummary.php b/src/Api/ISK/GetEndSummary.php
deleted file mode 100644
index b22dcd1e..00000000
--- a/src/Api/ISK/GetEndSummary.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/config.php');
-
-if(empty($_GET['distnum']) and empty($_GET['sesstarget']) and empty($_GET['endnum'])) die();
-
-require_once('Common/Lib/ArrTargets.inc.php');
-
-$TargetNo=getGroupedTargets((!empty($_GET['sesstarget']) ? $_GET['sesstarget'] : 0));
-$Distance = (!empty($_GET['distnum']) ? $_GET['distnum'] : 1);
-$End = (!empty($_GET['endnum']) ? $_GET['endnum'] : 1);
-
-$json_array=array();
-
-
-$tmp=explode('|', $TargetNo);
-if(count($tmp)==3) {
-	// ELIMINATION
-	$SQL="select
-			'E' as Type,
-			ElTargetNo as TargetNo,
-			ElScore DistScore,
-			ElGold DistGold,
-			ElXnine DistXnine,
-			if(ElElimPhase=0, EvE1Arrows, EvE2Arrows) as ArrowsNo, 
-			if(ElElimPhase=0, EvE1Ends, EvE2Ends) EvElimEnds, if(ElElimPhase=0, EvE1Arrows, EvE2Arrows) EvElimArrows
-			substr(ElArrowstring, 1+(if(ElElimPhase=0, EvE1Arrows, EvE2Arrows)*($End-1)), if(ElElimPhase=0, EvE1Arrows, EvE2Arrows)) as Arrowstring,
-			ElScore QuScore, ElGold QuGold, ElXnine QuXnine, concat('{$tmp['0']}|{$tmp['1']}|', ElTargetNo) as QuTargetNo,
-			IF(EvGoldsChars='',ToGoldsChars,EvGoldsChars) as GoldsChars, IF(EvXNineChars='',ToXNineChars,EvXNineChars) as XNineChars
-		 from Eliminations
-		 inner join Events on ElEventCode=EvCode and ElTournament=EvTournament and EvTeamEvent=0
-		 inner join Tournament on ElTournament=ToId
-		 where
-		 	left(ElTargetNo, 3) in ('{$tmp[2]}')
-		 	and ElEventCode='{$tmp[1]}'
-		 	AND ElElimPhase=".($tmp[0][1]-1)."
-		 	and ElTournament=$CompId
-		 order by ElTargetNo
-		";
-	$q=safe_r_sql($SQL);
-	while($r=safe_fetch($q)) {
-		$Score='';
-		$Golds='';
-		$Xnine='';
-		if(!empty($r->Arrowstring)) {
-			$ArrowString = $r->Arrowstring;
-			$SQL = "SELECT IskDtEndNo, IskDtArrowstring
-				FROM IskData
-				WHERE IskDtTournament={$CompId} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='{$r->Type}' AND IskDtTargetNo='{$r->TargetNo}' AND IskDtDistance={$Distance} AND IskDtEndNo={$End}
-				ORDER BY IskDtEndNo";
-			$q2 = safe_r_SQL($SQL);
-			if($r2 = safe_fetch($q2)){
-				for($i=0; $i<$r->ArrowsNo; $i++){
-					if($r2->IskDtArrowstring[$i]!=' '){
-						$ArrowString[$i]=$r2->IskDtArrowstring[$i];
-					}
-				}
-			}
-			list($Score, $Golds, $Xnine) = ValutaArrowStringGX($ArrowString, $r->GoldsChars, $r->XNineChars);
-		}
-		$json_array[]=array(
-			'qutarget' => $r->QuTargetNo,
-			'endscore' => $Score,
-			'endgolds' => $Golds,
-			'endxnine' => $Xnine,
-			'curscore' => $r->DistScore,
-			'curgolds' => $r->DistGold,
-			'curxnine' => $r->DistXnine,
-			'score' => $r->QuScore,
-			'golds' => $r->QuGold,
-			'xnine' => $r->QuXnine,
-		);
-	}
-} else {
-	// QUALIFICATION
-	$Filter="left(QuTargetNo,4) in ('".$TargetNo."')";
-
-	$SQL="SELECT QuId, QuSession, QuTargetNo, QuTarget, DIDistance, DIEnds, DIArrows, 
-            IF(TfGoldsChars{$Distance}='',IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars),TfGoldsChars{$Distance}) as GoldsChars, 
-            IF(TfXNineChars{$Distance}='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars{$Distance}) as XNineChars,         
-            ToCategory&12 as IsField3D 
-        from Qualifications
-        INNER JOIN Entries ON QuId=EnId
-        INNER JOIN Tournament ON ToId=EnTournament
-        INNER JOIN TargetFaces on TfId=EnTargetFace and TfTournament=EnTournament
-        INNER JOIN DistanceInformation ON DITournament=EnTournament AND DISession=QuSession AND DIDistance=".StrSafe_DB($Distance)." AND DIType='Q'
-        WHERE EnTournament=$CompId and $Filter 
-        ORDER BY QuTargetNo";
-	$q=safe_r_sql($SQL);
-	while($r=safe_fetch($q)) {
-		$tmp = getQualificationTotals($r->QuId, $r->DIDistance, $End, $r->DIArrows, $r->DIEnds, $r->GoldsChars, $r->XNineChars, $r->IsField3D ? $r->QuTarget : null);
-		$json_array[]=array(
-			'qutarget' => $r->QuTargetNo,
-			'endscore' => $tmp['curendscore'],
-			'curscore' => $tmp['curscore'],
-			'curgolds' => $tmp['curgold'],
-			'curxnine' => $tmp['curxnine'],
-			'score' => $tmp['score'],
-			'golds' => $tmp['gold'],
-			'xnine' => $tmp['xnine'],
-			'curendscore' => $tmp['curendscore'],
-			'curscoreatend' => $tmp['curscoreatend'],
-			'scoreatend' => $tmp['scoreatend'],
-		);
-	}
-}
-
-
-
-
-// Return the json structure with the callback function that is needed by the app
-SendResult($json_array);
diff --git a/src/Api/ISK/GetEventInfo.php b/src/Api/ISK/GetEventInfo.php
deleted file mode 100644
index f7ec0194..00000000
--- a/src/Api/ISK/GetEventInfo.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-	require_once(dirname(__FILE__) . '/config.php');
-	require_once('Common/Lib/Fun_Phases.inc.php');
-
-	$json_array=array();
-
-	$Types=array('I','T','E1','E2');
-
-	$EventType=(!empty($_GET['type']) && in_array($_GET['type'],$Types) ? $_GET['type'] : ' ');
-
-	switch($EventType) {
-		case 'T':
-			$SQL="SELECT EvCode, EvEventName, EvFinalFirstPhase, EvElimType, EvElimEnds, EvElimArrows, EvElimSO, EvFinEnds, EvFinArrows, EvFinSO FROM Events WHERE EvTournament=$CompId AND EvTeamEvent=1 AND EvFinalFirstPhase!=0 order by EvProgr";
-			break;
-		case 'E1':
-			$SQL="SELECT EvCode, EvEventName, EvFinalFirstPhase, EvElimType, EvElimEnds, EvElimArrows, EvElimSO, EvFinEnds, EvFinArrows, EvFinSO FROM Events WHERE EvTournament=$CompId AND EvTeamEvent=0 and EvElim1>0 AND EvFinalFirstPhase!=0 order by EvProgr";
-			break;
-		case 'E2':
-			$SQL="SELECT EvCode, EvEventName, EvFinalFirstPhase, EvElimType, EvElimEnds, EvElimArrows, EvElimSO, EvFinEnds, EvFinArrows, EvFinSO FROM Events WHERE EvTournament=$CompId AND EvTeamEvent=0 and EvElim2>0 AND EvFinalFirstPhase!=0 order by EvProgr";
-			break;
-		default:
-			$SQL="SELECT EvCode, EvEventName, EvFinalFirstPhase, EvElimType, EvElimEnds, EvElimArrows, EvElimSO, EvFinEnds, EvFinArrows, EvFinSO FROM Events WHERE EvTournament=$CompId AND EvTeamEvent=0 AND EvFinalFirstPhase!=0 order by EvProgr";
-	}
-
-	// Retrieve the Event List
-	$q=safe_r_sql($SQL);
-	while($r=safe_fetch($q)) {
-		$tmpPhases = Array();
-		if($EventType[0]=='E') {
-			$t=safe_r_sql("select distinct left(ElTargetNo, 3) TargetNo
-				from Eliminations
-				where ElTournament=$CompId
-					and ElElimPhase=".($EventType[1]-1)."
-					and ElEventCode='$r->EvCode'
-					and ElTargetNo>''
-				order by TargetNo");
-			while($u=safe_fetch($t)) {
-				$tmpPhases[]=Array("code"=>"{$EventType}|{$r->EvCode}|{$u->TargetNo}", "name"=>(int)$u->TargetNo);
-			}
-		} else {
-			$phases = getPhasesId($r->EvFinalFirstPhase);
-            if($EventType=='I' AND $r->EvElimType==4) {
-                $poolMatches = getPoolMatchesHeadersWA();
-                foreach ($poolMatches as $kPM=>$vPM) {
-                    $tmpPhases[]=Array("code"=>strval($kPM), "name"=>$vPM);
-                }
-            }
-			foreach ($phases as $ph) {
-				$tmpPhases[]=Array("code"=>bitwisePhaseId($ph), "name"=>$ph."_Phase");
-			}
-
-		}
-		$json_array[] = Array("code"=>$r->EvCode, "name"=>$r->EvEventName, 'ends'=>$r->EvElimEnds, 'arrows'=>$r->EvElimArrows, "phases"=>$tmpPhases);
-	}
-
-
-	// Return the json structure with the callback function that is needed by the app
-	SendResult($json_array);
-
diff --git a/src/Api/ISK/GetLanguages.php b/src/Api/ISK/GetLanguages.php
deleted file mode 100644
index 433a4465..00000000
--- a/src/Api/ISK/GetLanguages.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . '/config.php');
-require_once('Common/GlobalsLanguage.inc.php');
-require_once('Common/Lib/CommonLib.php');
-require_once('Common/Lib/Fun_Modules.php');
-
-$json_array=array();
-
-if(empty($_REQUEST['lang'])) {
-	$ServerUrl=getModuleParameter('ISK', 'ServerUrl', '', $CompId);
-	foreach($Lingue as $lang => $text) {
-		if(!file_exists($CFG->LANGUAGE_PATH . $lang . '/ISK.php')) continue;
-		$json_array[]=array(
-			'id' => $lang,
-			'name'=>$text,
-			'md5'=> md5_file($CFG->LANGUAGE_PATH . $lang . '/ISK.php'),
-			'urlFlag' => $ServerUrl.$CFG->ROOT_DIR.'Common/Languages/'.$lang.'/'.$lang.'.png',
-			'urlFile' => $ServerUrl.$CFG->ROOT_DIR.'Api/ISK/'.basename(__FILE__).'?lang='.$lang,
-		);
-	}
-
-} elseif(preg_match('/^[a-z_0-9-]+$/sim', $_REQUEST['lang'])) {
-	$json_array=getArrayLang($CFG->LANGUAGE_PATH . $_REQUEST['lang'] . '/ISK.php');
-	$json_array['MD5']=md5_file($CFG->LANGUAGE_PATH . $_REQUEST['lang'] . '/ISK.php');
-	$json_array['LanguageName']=$Lingue[ $_REQUEST['lang'] ];
-}
-
-// Return the json structure with the callback function that is needed by the app
-SendResult($json_array);
-
-function getArrayLang($file) {
-	$lang=array();
-	include($file);
-	return $lang;
-}
diff --git a/src/Api/ISK/GetMatchInfo.php b/src/Api/ISK/GetMatchInfo.php
deleted file mode 100644
index de2ae9c2..00000000
--- a/src/Api/ISK/GetMatchInfo.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-	require_once(dirname(__FILE__) . '/config.php');
-	require_once('Common/Lib/Obj_RankFactory.php');
-
-	$json_array=array();
-
-	$Event=(isset($_GET['event']) ? $_GET['event'] : '');
-	$EventType=(!empty($_GET['type']) && $_GET['type']=='T' ? 1 : 0);
-	$EventPhase=(isset($_GET['phase']) ? $_GET['phase'] : 0);
-
-	$options['tournament']=$CompId;
-	$options['events']=array();
-	$options['events'][] =  $Event . '@' . $EventPhase;
-
-	$nameField = ($EventType ? 'countryName' : 'familyName');
-	$oppNameField = ($EventType ? 'oppCountryName' : 'oppFamilyName');
-
-	$rank=null;
-	if($EventType)
-		$rank=Obj_RankFactory::create('GridTeam',$options);
-	else
-		$rank=Obj_RankFactory::create('GridInd',$options);
-
-	$rank->read();
-	$Data=$rank->getData();
-	foreach($Data['sections'] as $kSec=>$vSec) {
-		foreach($vSec['phases'] as $kPh=>$vPh) {
-			foreach($vPh['items'] as $kItem=>$vItem) {
-				$json_array[] = Array("code"=>$vItem['matchNo'], "name"=>$vItem[$nameField]."/".$vItem[$oppNameField]);
-			}
-		}
-	}
-
-	// Return the json structure with the callback function that is needed by the app
-	SendResult($json_array);
-
diff --git a/src/Api/ISK/GetMatchSummary.php b/src/Api/ISK/GetMatchSummary.php
deleted file mode 100644
index e0deac9f..00000000
--- a/src/Api/ISK/GetMatchSummary.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-	require_once(dirname(__FILE__) . '/config.php');
-	require_once('Common/Lib/Obj_RankFactory.php');
-	require_once('Common/Lib/Fun_Phases.inc.php');
-
-	list($Event,$EventTypeLetter,$MatchNo) = explode("|",(!empty($_GET['matchid']) ? $_GET['matchid'] : "0|0|0"));
-	$EventType=($EventTypeLetter=='T' ? 1 : 0);
-	$Phase=getPhase($MatchNo);
-
-	$JsonResult=array();
-
-	$options['tournament']=$CompId;
-	$options['events']=array();
-	$options['matchno']=$MatchNo;
-	$options['events'][] =  $Event . '@' . $Phase;
-
-	$rank=null;
-	if($EventType)
-		$rank=Obj_RankFactory::create('GridTeam',$options);
-	else
-		$rank=Obj_RankFactory::create('GridInd',$options);
-
-	$rank->read();
-	$Data=$rank->getData();
-	foreach($Data['sections'] as $kSec=>$vSec) {
-		$json_array=array();
-		$json_array['matchtype'] = ($vSec['meta']['matchMode'] ? "S":"C");
-		$json_array['matchover'] = false;
-		foreach($vSec['phases'] as $kPh=>$vPh) {
-			$objParam=getEventArrowsParams($Event,$kPh,$EventType,$CompId);
-			foreach($vPh['items'] as $kItem=>$vItem) {
-				if($vItem['matchNo']!=$MatchNo && $vItem['oppMatchNo']!=$MatchNo)
-					continue;
-
-				// only for pro!
-				if($iskModePro) {
-					$firstTmpEnd = 0;
-					$SQL = "SELECT *
-						FROM IskData
-						WHERE IskDtTournament={$CompId} AND IskDtMatchNo IN (".$vItem['matchNo'].",".$vItem['oppMatchNo'].") AND IskDtEvent='{$Event}' AND IskDtTeamInd={$EventType} AND IskDtType='{$EventTypeLetter}' AND IskDtTargetNo='' AND IskDtDistance=0
-						ORDER BY IskDtEndNo ASC";
-					$q=safe_r_SQL($SQL);
-					while($r=safe_fetch($q)) {
-						if($IsSO=($r->IskDtEndNo > $objParam->ends)) {
-							// tie break
-							$fld = ($r->IskDtMatchNo == $vItem['matchNo'] ? 'tiebreak' : 'oppTiebreak');
-							$vItem[$fld]=str_repeat(' ', strlen($r->IskDtArrowstring));
-							$idx = 0;
-						} else {
-							// normal scoring
-							$fld = ($r->IskDtMatchNo == $vItem['matchNo'] ? 'arrowstring' : 'oppArrowstring');
-							$idx = ($r->IskDtEndNo-1)*$objParam->arrows;
-							$vItem[$fld]=str_pad($vItem[$fld], $idx+1, ' ', STR_PAD_RIGHT);
-						}
-						for($i=0; $i<strlen($r->IskDtArrowstring); $i++) {
-							$vItem[$fld][$idx++] = $r->IskDtArrowstring[$i];
-						}
-					}
-					if(strlen(trim($vItem['tiebreak']))==strlen(trim($vItem['oppTiebreak'])) and strlen(trim($vItem['tiebreak']))>0) {
-						//we have a closest to center and a winner here!
-						if($vItem['oppTiebreak']!=strtoupper($vItem['oppTiebreak'])) {
-							$vItem['oppClosest']='1';
-							$vItem['oppWinner']='1';
-							$vItem['oppTiebreak']=strtoupper($vItem['oppTiebreak']);
-						} elseif($vItem['tiebreak']!=strtoupper($vItem['tiebreak'])) {
-							$vItem['closest']='1';
-							$vItem['winner']='1';
-							$vItem['tiebreak']=strtoupper($vItem['tiebreak']);
-						}
-					}
-				}
-
-				$end = array();
-				$oppEnd = array();
-				// rebuild points
-				$chunks0=str_split(rtrim($vItem['arrowstring']), $objParam->arrows);
-				$chunks1=str_split(rtrim($vItem['oppArrowstring']), $objParam->arrows);
-				$Tot0=0;
-				$Tot1=0;
-				foreach($chunks0 as $End => $Arrows) {
-					if(!$Arrows and !$chunks1[$End]) continue;
-					$pts0=ValutaArrowString($Arrows);
-					$pts1=ValutaArrowString($chunks1[$End]);
-
-					if($vSec['meta']['matchMode']) {
-						$endtot0 = ($pts0==$pts1 ? 1 : ($pts0>$pts1 ? 2 : 0));
-						$endtot1 = ($pts0==$pts1 ? 1 : ($pts0<$pts1 ? 2 : 0));
-                        $Tot0+=$endtot0;
-                        $Tot1+=$endtot1;
-					} else {
-						$endtot0 += $pts0;
-						$endtot1 += $pts1;
-                        $Tot0+=$pts0;
-                        $Tot1+=$pts1;
-					}
-					$end[]=array('endnum'=>$End+1, 'endscore'=>$pts0, 'points'=>$endtot0);
-					$oppEnd[]=array('endnum'=>$End+1, 'endscore'=>$pts1, 'points'=>$endtot1);
-				}
-
-				// check tiebreak
-				$SO=false;
-				if(strlen(trim($vItem['tiebreak']))==strlen(trim($vItem['oppTiebreak'])) and strlen(trim($vItem['tiebreak']))>0) {
-					$SO=true;
-					// now we have a closest to centre but if the SO comes from the stored values of the device we need to hack the "*" into a closest!!
-					$pts0=ValutaArrowString($vItem['tiebreak']);
-					$pts1=ValutaArrowString($vItem['oppTiebreak']);
-
-					if($vSec['meta']['matchMode']) {
-						$endtot0=0;
-						$endtot1=0;
-						if($vItem['winner'] or $pts0>$pts1 or $vItem['closest']) {
-							$endtot0=1;
-							$Tot0+=1;
-						}
-						if($vItem['oppWinner'] or $pts0<$pts1 or $vItem['oppClosest']) {
-							$endtot1=1;
-							$Tot1+=1;
-						}
-					} else {
-                        $endtot0 = '-';
-                        $endtot1 = '-';
-					}
-					$end[]=array('endnum'=>'S.O.', 'endscore'=>$pts0, 'points'=>$endtot0);
-					$oppEnd[]=array('endnum'=>'S.O.', 'endscore'=>$pts1, 'points'=>$endtot1);
-				}
-
-				// check winner if no winners and pro mode
-				if($iskModePro and !$vItem['winner']
-						and !$vItem['oppWinner']
-						and ($objParam->EvMatchMode ? ($Tot0>$objParam->ends or $Tot1>$objParam->ends) : (strlen(rtrim($vItem['arrowstring']))==$objParam->ends*$objParam->arrows and strlen(rtrim($vItem['oppArrowstring']))==$objParam->ends*$objParam->arrows))) {
-					if($objParam->EvMatchMode) {
-						if($Tot0>$objParam->ends) {
-							$vItem['winner']=1;
-						} else {
-							$vItem['oppWinner']=1;
-						}
-					} else {
-						if($Tot0>$Tot1) {
-							$vItem['winner']=1;
-						} elseif($Tot0<$Tot1) {
-							$vItem['oppWinner']=1;
-						} elseif($SO) {
-							if($pts0>$pts1) {
-								$vItem['winner']=1;
-							} elseif($pts0<$pts1) {
-								$vItem['oppWinner']=1;
-							} else {
-								// check star?
-							}
-
-						}
-					}
-				}
-
-				$json_array['matchover'] = ($vItem['winner'] or $vItem['oppWinner']);
-
-				// sends summary
-				$json_array['competitors'] = Array();
-				$json_array['competitors'][] = Array('winner'=>(int)$vItem['winner'], 'matchid'=>$kSec . "|" . ($EventType ? "T" : "I") . "|" . $vItem['matchNo'], 'score'=>$Tot0, 'ends'=>$end);
-				$json_array['competitors'][] = Array('winner'=>(int)$vItem['oppWinner'], 'matchid'=>$kSec . "|" . ($EventType ? "T" : "I") . "|" . $vItem['oppMatchNo'], 'score'=>$Tot1, 'ends'=>$oppEnd);
-
-				$JsonResult[] = $json_array;
-			}
-		}
-	}
-	// Return the json structure with the callback function that is needed by the app
-	SendResult($JsonResult);
-
diff --git a/src/Api/ISK/GetQRData.php b/src/Api/ISK/GetQRData.php
deleted file mode 100644
index 8d2e088c..00000000
--- a/src/Api/ISK/GetQRData.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)).'/config.php');
-require_once('Common/Lib/ArrTargets.inc.php');
-
-require_once('Common/Lib/CommonLib.php');
-require_once('Common/Lib/Fun_Modules.php');
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadWrite);
-
-$PAGE_TITLE=get_text('ISK-GetQRData');
-
-include('Common/Templates/head-min.php');
-
-if(!isset($_REQUEST["Data"])) {
-	echo '<form>';
-	echo '<table class="Tabella">';
-	echo '<tr><th>'.get_text('ISK-GetQRData').'</th></tr>';
-	echo '<tr><td class="Center">';
-	echo '<textarea name="Data" cols="70" rows="15"></textarea>';
-	echo '</td></tr>';
-	echo '<tr><td class="Center"><input type="submit" value="'.get_text("CmdSend","Tournament").'"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-} else {
-	$data = json_decode($_REQUEST["Data"]);
-	if(is_null($data)) {
-		echo "invalid data";
-	} else {
-		$CompId=getIdFromCode($data->compcode);
-		foreach($data->ends as $end) {
-			$qValue = explode("|",$end->q);
-			if(count($qValue)==1) {	//Qualification
-				$dist = $end->d;
-				$endNum=($end->e+1);
-				$tgt = $qValue[0];
-
-				$SQL="SELECT QuId, QuSession, QuTargetNo, DIDistance, DIEnds, DIArrows, QuConfirm & ".pow(2, $dist).">0 as StopImport 
-					from Qualifications
-					INNER JOIN Entries ON QuId=EnId
-					INNER JOIN Tournament ON ToId=EnTournament
-					INNER JOIN DistanceInformation ON DITournament=EnTournament AND DISession=QuSession AND DIDistance=".StrSafe_DB($dist)." AND DIType='Q'
-					WHERE EnTournament=$CompId and QuTargetNo=".StrSafe_DB($tgt);
-				$q=safe_r_SQL($SQL);
-				$ArrowSearch=safe_fetch($q);
-
-				if($ArrowSearch->StopImport) {
-					continue;
-				}
-
-				$arrString = str_repeat(" ",$ArrowSearch->DIArrows);
-				$SQL = "SELECT IskDtArrowstring
-					FROM IskData
-					WHERE IskDtTournament={$CompId} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q'
-					AND IskDtTargetNo='{$ArrowSearch->QuTargetNo}' AND IskDtDistance={$ArrowSearch->DIDistance} AND IskDtEndNo={$endNum}";
-				$q=safe_r_SQL($SQL);
-				if($r=safe_fetch($q)) {
-					$arrString=$r->IskDtArrowstring;
-				}
-				for($i=0; $i<count($end->s); $i++) {
-					if($end->s[$i]!=-1) {
-						$arrString[$i] = GetLetterFromPrint($end->s[$i],$ArrowSearch->QuId,$ArrowSearch->DIDistance);
-					}
-				}
-				$SQL = "INSERT INTO IskData (IskDtTournament, IskDtMatchNo, IskDtEvent, IskDtTeamInd, IskDtType, IskDtTargetNo, IskDtDistance, IskDtEndNo, IskDtArrowstring, IskDtUpdate, IskDtDevice)
-					VALUES ({$CompId}, 0, '', 0, 'Q', '{$ArrowSearch->QuTargetNo}', {$ArrowSearch->DIDistance}, {$endNum}, '{$arrString}', '".date('Y-m-d H:i:s')."', '')
-					ON DUPLICATE KEY UPDATE IskDtArrowstring='{$arrString}', IskDtUpdate='".date('Y-m-d H:i:s')."', IskDtDevice= ''";
-				safe_w_SQL($SQL);
-			} else {	//Matches
-
-			}
-
-		}
-
-	}
-}
-
-include('Common/Templates/tail-min.php');
\ No newline at end of file
diff --git a/src/Api/ISK/GetScoreCard.php b/src/Api/ISK/GetScoreCard.php
deleted file mode 100644
index 0400b80d..00000000
--- a/src/Api/ISK/GetScoreCard.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/config.php');
-require_once('Common/Lib/ArrTargets.inc.php');
-
-$QuTarget=$_REQUEST['qutarget'];
-$json_array = Array();
-
-$tmp=explode('|', $QuTarget);
-if(count($tmp)==3) {
-	// ELIMINATION
-	$SQL="select 'E' as Type, ElTargetNo+0 as Target, ToCategory&12 as IsField3D, ElArrowString DiArrowstring, '0' DiDistance, if(ElElimPhase=0, EvE1Ends, EvE2Ends) DiEnds, if(ElElimPhase=0, EvE1Arrows, EvE2Arrows) DiArrows, '' DiName, 
-       IF(EvGoldsChars='',ToGoldsChars,EvGoldsChars) as GoldsChars, IF(EvXNineChars='',ToXNineChars,EvXNineChars) as XNineChars, IF(EvGolds='',ToGolds,EvGolds) as Golds, IF(EvXNine='',ToXNine,EvXNine) as XNines
-		FROM Eliminations
-		INNER JOIN Entries on EnId = ElId and EnTournament=$CompId
-		INNER JOIN Tournament ON ToId=$CompId
-		INNER JOIN Events ON ElTournament=EvTournament and ElEventCode=EvCode and EvTeamEvent=0
-		WHERE ElElimPhase=".($tmp[0][1]-1)." and ElEventCode=".StrSafe_DB($tmp[1])." and ElTargetNo=" . StrSafe_DB($tmp[2]);
-} else {
-	// QUALIFICATION
-	$Sql=array();
-	for($n=1;$n<=8;$n++) {
-		$Sql[]="SELECT 'Q' as Type, QuTarget as Target, ToCategory&12 as IsField3D, QuD{$n}ArrowString DiArrowstring, DiDistance, DiEnds, DiArrows, Td{$n} DiName, 
-            IF(TfGoldsChars{$n}='',IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars),TfGoldsChars{$n}) as GoldsChars, 
-            IF(TfXNineChars{$n}='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars{$n}) as XNineChars, 
-            IF(TfGolds='',ToGolds,TfGolds) as Golds, IF(TfXNine='',ToXNine,TfXNine) as XNine
-		FROM Qualifications
-		INNER JOIN Entries on EnId = Quid and EnTournament=$CompId
-		INNER JOIN Tournament ON ToId=$CompId
-        INNER JOIN TargetFaces on TfId=EnTargetFace and TfTournament=EnTournament
-		INNER join DistanceInformation on DiTournament=$CompId and DiSession=QuSession and DiDistance=$n and DiType='Q'
-		INNER JOIN TournamentDistances ON ToType=TdType and TdTournament=$CompId AND CONCAT(TRIM(EnDivision),TRIM(EnClass)) LIKE TdClasses
-		WHERE QuTargetNo=" . StrSafe_DB($QuTarget);
-	}
-
-	$SQL='('.implode(') UNION (', $Sql).') order by DiDistance';
-}
-
-// Retrieve the score info
-$Rs=safe_r_sql($SQL);
-
-while($r=safe_fetch($Rs)) {
-	$Arrows=$r->DiArrows;
-	$Ends=$r->DiEnds;
-	$ArrowString=str_pad(rtrim($r->DiArrowstring), $Arrows*$Ends);
-
-	$SQL = "SELECT IskDtEndNo, IskDtArrowstring
-		FROM IskData
-		WHERE IskDtTournament={$CompId} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='{$r->Type}' AND IskDtTargetNo='{$QuTarget}' AND IskDtDistance={$r->DiDistance}
-		ORDER BY IskDtEndNo";
-	$q = safe_r_SQL($SQL);
-	while($r2 = safe_fetch($q)){
-		for($i=0; $i<$Arrows; $i++){
-			if($r2->IskDtArrowstring[$i]!=' '){
-				$ArrowString[($r2->IskDtEndNo-1)*$Arrows+$i]=$r2->IskDtArrowstring[$i];
-			}
-		}
-	}
-
-	$RealEnds=array();
-	while(strlen($ArrowString)) {
-		$RealEnds[]=substr($ArrowString, 0, $Arrows);
-		$ArrowString=substr($ArrowString, $Arrows);
-	}
-
-	if($Arrows>3 and $Arrows%3) {
-		// arrows per end are more than 6 and not multiple of 3
-		// so ends will be reduced to max 6 arrows
-		$tmp=ceil($Arrows/6);
-		$Arrows=ceil($Arrows/$tmp);
-	} else {
-		$tmp=ceil($Arrows/3);
-		$Arrows=ceil($Arrows/$tmp);
-	}
-	$Distance=array(
-		'distancename' => $r->DiName,
-		'goldschar' => $r->Golds,
-		'xninechar' => $r->XNine,
-		'endarrows' => $Arrows,
-		'endscores' => array()
-	);
-	$EndNum=1;
-	$GrandTotal=0;
-	foreach($RealEnds as $RealEnd) {
-		$RealEnd=str_pad($RealEnd, $Arrows);
-		while(strlen($RealEnd)) {
-			$End=substr($RealEnd, 0, $Arrows);
-			$EndArray=array(
-				'endnum' => $EndNum,
-				'arrowscores' => array(),
-				'endtotal' => 0,
-				'endgolds' => 0,
-				'endxnine' => 0);
-			foreach(range(0, $Arrows-1) as $Arrow) {
-				$EndArray['arrowscores'][]=DecodeFromLetter(substr($End, $Arrow, 1));
-			}
-			list($EndArray['endtotal'],$EndArray['endgolds'],$EndArray['endxnine']) = ValutaArrowStringGX($End, $r->GoldsChars, $r->XNineChars);
-			$GrandTotal+=$EndArray['endtotal'];
-			$EndArray['runtotal']=$GrandTotal;
-			$EndNum++;
-			$Distance['endscores'][]=$EndArray;
-			$RealEnd=substr($RealEnd, $Arrows);
-		}
-	}
-	// if it is a field/3d needs to detach
-	if($r->IsField3D) {
-		$Target=($r->Target%$r->DiEnds)-1;
-		$Distance['endscores']=array_merge(array_slice($Distance['endscores'], $Target), array_slice($Distance['endscores'], 0, $Target));
-	}
-	$json_array[]=$Distance;
-}
-
-
-
-// Return the json structure with the callback function that is needed by the app
-SendResult($json_array);
-
diff --git a/src/Api/ISK/ISK.css b/src/Api/ISK/ISK.css
deleted file mode 100644
index 0e1b8ab9..00000000
--- a/src/Api/ISK/ISK.css
+++ /dev/null
@@ -1,83 +0,0 @@
-@CHARSET "UTF-8";
-
-.TargetContainer {float:left; margin:1em; border:1px solid gray; border-radius: 3px; border-collapse: collapse; min-width:100px; height:110px; box-shadow: 1px 1px 1px #888888;}
-.TargetTitle {font-weight:bold; text-align:center; border-bottom:1px solid gray; border-top-left-radius: 3px; border-top-right-radius: 3px; background-color:#dddddd; padding:0.2em}
-.TargetDevices {margin-top: 0.25em; margin-left: 0.25em;}
-.TargetLetters {text-align:center;}
-.TargetLetters span {display:inline-block; padding:0.25em; font-weight:bold; border:1px solid gray; margin:0.5em; }
-.TargetMessage {min-height:2.5em;}
-.TargetInfoImg { content:url("../../Common/Images/isk-info.svg"); height: 1.2em; width: 1.2em; float: right}
-.Let-B {background-color:#3333ff; color: #ffffff; } /* scored (Blue) */
-.Let-C {background-color:#33ffff; color: #000000; } /* missing (Cyan) */
-.Let-Y {background-color:#dddd00; color: #000000; } /* scoring (Yellow) */
-.Let-O {background-color:#ffaa33; color: #000000; } /* scoring different end (Orange) */
-.Let-G {background-color:#000000; color: #000000; } /* dimmed (Gray) */
-.Let-R {background-color:#dd0000; color: #000000; } /* scoring different distance/session (Red) */
-.Let-Z {background-color:#00A000; color: #ffffff; } /* scoring in progress (green) */
-.Let-F {background-color:#cccccc; color: #ffffff; } /* Match Over (darker Gray) */
-
-.Spurious span {padding:0 3px; background-color:#d0d0d0; }
-
-.TargetLetters span.Anomaly {border: 3px solid red;}
-
-.TargetAssigned{font-weight:bold; text-align:center; background-color:#33ffff;}
-.TargetRequested, .BarcodeRequested {font-weight:bold; text-align:center; background-color:#dddddd;}
-.ToBeEnabled {font-weight:bold; text-align:center; background-color:#ffaa33;}
-.hidden {display: none;}
-.Legend {clear: both; padding: 10px;}
-.TgtImport {display: none;}
-
-.PopUp {
-    display:none;
-    position:fixed;
-    min-width:260px;
-    min-height:250px;
-    max-width:500px;
-    max-height:30%;
-    margin:auto;
-    top:0;bottom:0;left:0;right:0;
-    background-color:white;
-    border:1px solid gray;
-    font-size: 120%;
-    border-radius: 3px;
-    box-shadow: 2px 2px 1px #888888;
-}
-
-.PopUp .Let-G {background-color: #ffff00; color:#000000; }
-
-select {
-    max-width:20em;
-}
-
-.PopUpEvent {text-align:center;padding:0.1em;margin-bottom:0.5em;}
-
-.PopUpSpot {padding:0.2em; clear: both; line-height: 2.5em; display:flex; flex-direction:row; box-sizing:border-box; justify-content: space-between;}
-
-.PopUpSpot .Let-Z,
-.PopUpSpot .Let-B,
-.PopUpSpot .Let-S,
-.PopUpSpot .Let-O,
-.PopUpSpot .Let-G {flex:1 1 5%; box-sizing:border-box; text-align:center; font-size:1.2rem; font-weight:bold; border:1px solid gray; line-height:1.5rem; margin-left:0.5rem; padding:0.25rem 0;}
-.PopUpSpot .Let-G {flex: 0 0 6%;margin-left:0;}
-.PopUpSpot .Let-S {border:none;}
-.PopUpSpot .Let-B {font-size:80%}
-.PopUpSpot .SpanName {flex:2 0 15%; box-sizing:border-box; overflow:hidden; white-space:nowrap; line-height:2.2rem;  margin-left:0.5rem; }
-.PopUpSpot .Let-Z + .Let-B,
-.PopUpSpot .Let-Z + .Let-O,
-.PopUpSpot .Let-Z + .Let-S,
-.PopUpSpot .Let-S + .Let-B {margin-left:0;}
-.PopUpCloseImg { content:url("../../Common/Images/isk-close.svg"); height: 1.2em; width: 1.2em; float: right}
-
-.DisableSelection { -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; outline: 0; }
-
-.ClickableDiv { cursor: pointer; -webkit-user-select: none;/* Chrome/Safari */  -moz-user-select: none;/* Firefox */  -ms-user-select: none;/* IE10+ */ /* Not implemented yet */ -o-user-select: none; user-select: none;}
-.ContextMenuDiv { cursor: context-menu; -webkit-user-select: none;/* Chrome/Safari */  -moz-user-select: none;/* Firefox */  -ms-user-select: none;/* IE10+ */ /* Not implemented yet */ -o-user-select: none; user-select: none;}
-
-#PopUpCmd {bottom:0;width:100%; position:absolute; text-align:center; padding-bottom: 3px;}
-#PopUpContent { padding: 5px; }
-
-th[id$=Order][ordertype=ordasc]:after {content: url('../../Common/Images/isk-arrow-up.png');margin-left:0.7em;}
-th[id$=Order][ordertype=orddesc]:after {content: url('../../Common/Images/isk-arrow-down.png');margin-left:0.7em;}
-th[id$=Order] {text-decoration: underline;cursor: pointer;}
-
-.LiteIndex .Button {margin-top:0.5em;margin-bottom: 0.5em;}
diff --git a/src/Api/ISK/Ind-GetComboSchedule.php b/src/Api/ISK/Ind-GetComboSchedule.php
deleted file mode 100644
index 338b1427..00000000
--- a/src/Api/ISK/Ind-GetComboSchedule.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once('Common/Lib/Fun_Modules.php');
-require_once('Common/Lib/CommonLib.php');
-if (!CheckTourSession()) {
-    exit;
-}
-checkACL(AclISKServer, AclReadOnly,false);
-
-$xml='';
-$error=0;
-
-$IskSequence=getModuleParameter('ISK', 'Sequence', array('type' => '', 'session'=>'', 'distance'=>0, 'maxdist'=>0, 'end'=>0));
-
-foreach(getApiScheduledSessions(['TourId' => $_SESSION['TourId'], 'OnlyToday' => !empty($_REQUEST["onlyToday"])]) as $myRow) {
-    // skip elimination for now
-    //if($myRow->keyValue[0]=='E') continue;
-    $MaxEnds=$myRow->MaxEnds;
-    $desc='';
-    $selected=0;
-    if(array_key_exists('type',$IskSequence) and array_key_exists('maxdist',$IskSequence) and array_key_exists('session',$IskSequence)) {
-        $selected=($myRow->keyValue==$IskSequence['type'].$IskSequence['maxdist'].$IskSequence['session'] ? '1' : '0');
-    }
-    $active='0';
-    $xml.='<schedule>
-            <val selected="'.$selected.'" active="'.$active.'" maxends="'.($MaxEnds).'">' . $myRow->keyValue . '</val>
-            <display><![CDATA[' . $myRow->Description . ']]></display>
-        </schedule>';
-}
-
-header('Content-Type: text/xml');
-print '<response error="' . $error . '" distance="'.(array_key_exists('distance',$IskSequence) ? $IskSequence['distance']:'0').'" end="'.(array_key_exists('end',$IskSequence) ? $IskSequence['end']:'0').'">';
-print $xml;
-print '</response>';
diff --git a/src/Api/ISK/Ind-GetTabletOnline.php b/src/Api/ISK/Ind-GetTabletOnline.php
deleted file mode 100644
index 2d8c7d1d..00000000
--- a/src/Api/ISK/Ind-GetTabletOnline.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-
-$Img=$CFG->DOCUMENT_PATH.'Common/Images/status-couldshoot.gif';
-
-if (CheckTourSession()) {
-	$Img=$CFG->DOCUMENT_PATH.'Common/Images/status-noshoot.gif';
-	$Select
-		= "SELECT *
-			FROM IskDevices where IskDvCode=".StrSafe_DB($_REQUEST['device']);
-	$Rs=safe_r_sql($Select);
-	if ($myRow=safe_fetch($Rs) and checkOnline($myRow->IskDvIpAddress)) {
-		$Img=$CFG->DOCUMENT_PATH.'Common/Images/status-ok.gif';
-	}
-
-}
-
-
-
-header('Content-Type: image/gif');
-readfile($Img);
-
-function checkOnline($IP) {
-	unset($Output);
-	unset($RetVal);
-	$fp = @stream_socket_client("tcp://{$IP}:80", $errno, $errstr, 0.5);
-	if (!$fp) {
-		if($errno==111) {
-			// connection REFUSED, so device is online
-			return 1;
-		}
-	} else {
-		fclose($fp);
-		return 1;
-	}
-	return 0;
-}
\ No newline at end of file
diff --git a/src/Api/ISK/Ind-GetTabletsInfo.php b/src/Api/ISK/Ind-GetTabletsInfo.php
deleted file mode 100644
index bb1ce495..00000000
--- a/src/Api/ISK/Ind-GetTabletsInfo.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-	require_once(dirname(dirname(__FILE__)) . '/config.php');
-
-	if (!CheckTourSession()) {
-        exit;
-    }
-    checkACL(AclISKServer, AclReadWrite,false);
-
-	$error=0;
-	$order=0;
-	$xml='';
-
-	$OrderBy='IskDvTarget+0, IskDvTargetReq, IskDvCode';
-	$ord=($_REQUEST['ord']=='orddesc' ? 'DESC' : '');
-	if(!empty($_REQUEST['field'])) {
-		switch($_REQUEST['field']) {
-			case 'tgtOrder':
-				$OrderBy="IskDvTarget+0 $ord, IskDvTargetReq, IskDvCode";
-				break;
-			case 'idOrder':
-				$OrderBy="IskDvDevice $ord, IskDvTarget+0 , IskDvTargetReq, IskDvCode";
-				break;
-			case 'codeOrder':
-				$OrderBy="IskDvVersion $ord, IskDvCode $ord, IskDvTarget+0 , IskDvTargetReq, IskDvCode";
-				break;
-			case 'batteryOrder':
-				$OrderBy="abs(IskDvBattery) $ord, IskDvTarget+0 , IskDvTargetReq, IskDvCode";
-				break;
-			default:
-				$OrderBy='IskDvTarget+0, IskDvTargetReq, IskDvCode';
-		}
-	}
-
-	$Colors=array('#FFFFFF', '#FFCCCC', '#FF7777', '#FF0000');
-
-	$Select
-		= "SELECT IskDevices.*, if(IskDvState=1, least(3, round((time_to_sec(utc_timestamp())-time_to_sec(IskDvLastSeen))/65)), 0) as Difference, time_to_sec(utc_timestamp())-time_to_sec(IskDvLastSeen) as Seconds
-			FROM IskDevices ORDER BY IskDvTournament={$_SESSION['TourId']} desc, $OrderBy";
-	$Rs=safe_r_sql($Select);
-	if ($Rs && safe_num_rows($Rs)>0) {
-		while ($myRow=safe_fetch($Rs)) {
-			$xml.='<tablet '.
-				'order="'.$order++.'" '.
-				'device="' . $myRow->IskDvDevice . '" ' .
-				'tournament="' . $myRow->IskDvTournament . '" ' .
-				'code="' . $myRow->IskDvCode . '" ' .
-				'target="' . $myRow->IskDvTarget . '" ' .
-				'reqtarget="' . $myRow->IskDvTargetReq . '" ' .
-				'state="' . $myRow->IskDvState . '" ' .
-				'appversion="' . $myRow->IskDvVersion . '" ' .
-				'appdevversion="' . $myRow->IskDvAppVersion . '" ' .
-				'battery="' . abs($myRow->IskDvBattery) . ($myRow->IskDvBattery < 0 ? '+' : '') . '" ' .
-				'authrequest="' . $myRow->IskDvAuthRequest . '" ' .
-				'ip="' . $myRow->IskDvIpAddress . '" ' .
-				'online="' . $Colors[$myRow->Difference] . '" ' .
-				'seconds="' . ($myRow->IskDvTournament==$_SESSION['TourId'] ? $myRow->Seconds : '') . '" ' .
-				'lastseen="' . $myRow->IskDvLastSeen . '"/>';
-		}
-	}
-
-
-	header('Content-Type: text/xml');
-	print '<response error="' . $error . '">';
-	print $xml;
-	print '</response>';
diff --git a/src/Api/ISK/Ind-SetDeviceInfo.php b/src/Api/ISK/Ind-SetDeviceInfo.php
deleted file mode 100644
index 44ca512b..00000000
--- a/src/Api/ISK/Ind-SetDeviceInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-
-if (!CheckTourSession()) {
-    exit;
-}
-checkACL(AclISKServer, AclReadWrite,false);
-
-$devId = (isset($_REQUEST["device"]) ? $_REQUEST["device"] : '');
-$tourid = (!empty($_REQUEST["setCompetition"]) && $_REQUEST["setCompetition"]=='true' ? $_SESSION["TourId"] : 0);
-$tgtno = (!empty($_REQUEST["setTarget"]) && is_numeric($_REQUEST["setTarget"]) ? $_REQUEST["setTarget"] : 0);
-$status = (isset($_REQUEST["setStatus"]) ? intval($_REQUEST["setStatus"]) : 0);
-
-$error = 1;
-$Sql = "";
-if(isset($_REQUEST["setCompetition"])) {
-    $Sql = "UPDATE IskDevices SET `IskDvTournament`='{$tourid}', IskDvState=0 WHERE IskDvDevice=" . StrSafe_DB($devId);
-} elseif(!empty($tgtno)) {
-    $Sql = "UPDATE IskDevices SET `IskDvTarget`='{$tgtno}' WHERE IskDvDevice=" . StrSafe_DB($devId);
-} elseif(isset($_REQUEST["setStatus"])) {
-    $Sql = "UPDATE IskDevices SET `IskDvState`='{$status}' WHERE IskDvDevice=" . StrSafe_DB($devId);
-}
-
-
-if(strlen($Sql)) {
-    $Rs=safe_w_SQL($Sql);
-    if(safe_w_affected_rows()!=0)
-        $error=0;
-}
-header('Content-Type: text/xml');
-print '<response error="' . $error . '" />';
\ No newline at end of file
diff --git a/src/Api/ISK/Ind-UpdateSequence.php b/src/Api/ISK/Ind-UpdateSequence.php
deleted file mode 100644
index fbfa360c..00000000
--- a/src/Api/ISK/Ind-UpdateSequence.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once('Common/Fun_Modules.php');
-
-$JSON=array('error' => 1);
-
-if (!CheckTourSession()) {
-	JsonOut($JSON);
-}
-checkACL(AclISKServer, AclReadWrite,false);
-
-$ses = (!empty($_REQUEST["session"]) ? $_REQUEST["session"] : "");
-$dist = (!empty($_REQUEST["distance"]) ? $_REQUEST["distance"] : 0);
-$end = (!empty($_REQUEST["end"]) ? $_REQUEST["end"] : 0);
-$type = 0;
-$maxDist = '';
-if($ses != "") {
-	$type = substr($ses,0,1);
-	if($type=='Q' || $type=='E') {
-		$maxDist = substr($ses,1,1);
-		$ses = substr($ses,2);
-	} else {
-		$ses = substr($ses,1);
-	}
-	$NewSession=array("type"=>$type, "session"=>$ses, "distance"=>$dist, "maxdist"=>$maxDist, "end"=>$end);
-	$tmp = getModuleParameter('ISK', 'Sequence', array("type"=>'', "session"=>'', "distance"=>'',  "maxdist"=>'', "end"=>''));
-	// force all devices to reload themselves!
-	if($tmp!=$NewSession) {
-		safe_w_sql("update IskDevices set IskDvState=3 where IskDvTournament={$_SESSION["TourId"]}");
-	}
-	setModuleParameter('ISK', 'Sequence', $NewSession);
-	delModuleParameter('ISK', 'StickyEnds');
-	safe_w_SQL("UPDATE IskDevices SET `IskDvState`=2 WHERE IskDvTournament=" . StrSafe_DB($_SESSION["TourId"]) . " AND `IskDvState`=1 ");
-}
-
-$tmp = getModuleParameter('ISK', 'Sequence', array("type"=>'', "session"=>'', "distance"=>'',  "maxdist"=>'', "end"=>''), $_SESSION["TourId"], true);
-
-$JSON['error']=0;
-$JSON['type']=$tmp['type'];
-$JSON['session']=$tmp['session'];
-$JSON['distance']=$tmp['distance'];
-$JSON['maxdist']=$tmp['maxdist'];
-$JSON['end']=$tmp['end'];
-
-JsonOut($JSON);
diff --git a/src/Api/ISK/Lib.php b/src/Api/ISK/Lib.php
deleted file mode 100644
index 0fdc874f..00000000
--- a/src/Api/ISK/Lib.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-function getGroupedTargets($TargetNo, $Session=0, $SesType='Q', $SesPhase='', $returnArray=false) {
-	global $CompId;
-	// get all targets associated/grouped together with the target requested
-	if(empty($CompId)) {
-		if(empty($_SESSION['TourId'])) return $TargetNo;
-
-		$CompId=$_SESSION['TourId'];
-	}
-
-	$TargetToQuery=$TargetNo;
-	if($returnArray and $SesType=='Q') {
-		$TargetToQuery=$Session.str_pad($TargetNo, 3, '0', STR_PAD_LEFT);
-	}
-
-	$SubSelect="select TgGroup, TgSession, TgSesType
-		from TargetGroups
-		where TgTournament=$CompId
-		and TgTargetNo='$TargetToQuery'";
-	if($SesType!='Q') {
-		$SubSelect.=" and TgSesType='{$SesType}{$SesPhase}'";
-	}
-	$Tmp=array();
-	$q=safe_r_sql("Select TgTargetNo
-		from TargetGroups
-		where TgTournament=$CompId
-		and (TgGroup, TgSession, TgSesType)=($SubSelect) order by TgTargetNo");
-	while($r=safe_fetch($q)) {
-		if($returnArray and $SesType=='Q') {
-			$Tmp[]=intval(substr($r->TgTargetNo,1));
-		} else {
-			$Tmp[]=$r->TgTargetNo;
-		}
-	}
-	if($Tmp and !$returnArray) {
-		$TargetNo=implode("','", $Tmp);
-	}
-
-	if($returnArray) {
-		if($Tmp) {
-			return $Tmp;
-		} else {
-			return array($TargetNo);
-		}
-	}
-	return $TargetNo;
-}
-
-function GetLockableSessions() {
-	$SQL=array();
-
-// QUALIFICATIONS
-	$SQL[]="select 
-       concat_ws('|','Q', QuSession, DiDistance) as LockKey,
-       'Q' as SesType,
-       SesName as Description,
-       DiDistance as Distance,
-       0 as FirstPhase,
-       0 as Order1, SesOrder as Order2, DiDistance as Order3
-	from Qualifications
-	inner join Entries on EnId=QuId and EnTournament={$_SESSION['TourId']}
-	inner join DistanceInformation on DiTournament=EnTournament and DiSession=QuSession and DiType='Q'
-	left join Session on SesTournament=EnTournament and SesType='Q' and SesOrder=QuSession
-	where QuSession>0
-	group by QuSession, DiDistance";
-
-// ELIMINATIONS
-	$SQL[]="select 
-       concat_ws('|','E', ElElimPhase, ElEventCode) as LockKey,
-       'E' as SesType,
-       concat(SesName, ' - ', ElEventCode) as Description,
-       1 as Distance,
-       0 as FirstPhase,
-       1 as Order1, ElElimPhase as Order2, EvProgr as Order3
-	from Eliminations
-	inner join Events on EvCode=ElEventCode and EvTeamEvent=0 and EvTournament=ElTournament
-	left join Session on SesTournament=ElTournament and SesType='E' and SesOrder=ElSession
-	where ElTournament={$_SESSION['TourId']}
-	group by ElEventCode, ElElimPhase";
-
-// Individual Matches
-	$SQL[]="select 
-       concat_ws('|','I',GrPhase,FinEvent) as LockKey, 
-       'I' as SesType,
-       EvEventName as Description,
-       GrPhase as Distance,
-       EvFinalFirstPhase as FirstPhase,
-       3 as Order1, EvProgr as Order2, 128-GrPhase as Order3
-	from Finals
-	inner join Events on EvCode=FinEvent and EvTeamEvent=0 and EvTournament=FinTournament and EvFinalFirstPhase>0
-	inner join Grids on GrMatchNo=FinMatchNo
-	where FinTournament={$_SESSION['TourId']}
-	group by GrPhase, FinEvent";
-
-// Team Matches
-	$SQL[]="select 
-       concat_ws('|','T',GrPhase,TfEvent) as LockKey, 
-       'T' as SesType,
-       EvEventName as Description,
-       GrPhase as Distance,
-       EvFinalFirstPhase as FirstPhase,
-       4 as Order1, EvProgr as Order2, 128-GrPhase as Order3
-	from TeamFinals
-	inner join Events on EvCode=TfEvent and EvTeamEvent=1 and EvTournament=TfTournament and EvFinalFirstPhase>0
-	inner join Grids on GrMatchNo=TfMatchNo
-	where TfTournament={$_SESSION['TourId']}
-	group by GrPhase, TfEvent";
-
-	return "(".implode(') UNION (', $SQL).") order by Order1, Order2, Order3";
-}
diff --git a/src/Api/ISK/Lite-Action.php b/src/Api/ISK/Lite-Action.php
deleted file mode 100644
index 129c8756..00000000
--- a/src/Api/ISK/Lite-Action.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/*
-THIS FILE IS ESSENTIAL TO MAKE THE APIS TO GET RECOGNIZED BY IANSEO
-
-* HOW IT WORKS
-the "codename" of the API will be used in ianseo. The codename is the name of the directory containing the Api.
-The essentials are:
-
-* ApiConfig.php
-this file gets included in the Competition Setup (Tournament/index.php)
-* DrawQRCode.php
-this file is used by the ScoreCard printout routines.
- */
-
-require_once(__DIR__.'/config-ianseo.php');
-
-$JSON=array('error'=>1,'msg'=>get_text('ErrGenericError', 'Errors'));
-
-if(ISK_PRO or !CheckTourSession() or checkACL(AclISKServer, AclReadWrite, false)!=AclReadWrite or empty($_REQUEST['act'])) {
-	JsonOut($JSON);
-}
-
-require_once('Common/Lib/CommonLib.php');
-require_once('Common/Lib/ArrTargets.inc.php');
-require_once('Common/Lib/Obj_RankFactory.php');
-require_once('Common/Lib/Fun_Phases.inc.php');
-require_once('Qualification/Fun_Qualification.local.inc.php');
-
-$JSON['error']=0;
-$JSON['msg']='';
-
-switch($_REQUEST['act']) {
-	case 'ImportType':
-		if(isset($_REQUEST['val'])) {
-			setModuleParameter('ISK', 'ImportType', intval($_REQUEST['val']));
-		} else {
-			$JSON['msg']=get_text('WAToolbox-MissingParams', 'Api');
-			$JSON['error']=1;
-		}
-		break;
-    case 'CalcClDivInd':
-    case 'CalcClDivTeam':
-    case 'CalcFinInd':
-    case 'CalcFinTeam':
-		if(isset($_REQUEST['val'])) {
-			setModuleParameter('ISK', $_REQUEST['act'], intval($_REQUEST['val']));
-		} else {
-			$JSON['msg']=get_text('WAToolbox-MissingParams', 'Api');
-			$JSON['error']=1;
-		}
-		break;
-	case 'ImportQualNow':
-		if(IsBlocked(BIT_BLOCK_QUAL)) {
-			$JSON['msg']=get_text('BlockedPhase', 'Tournament');
-			$JSON['error']=1;
-		} else {
-
-                // we import EVERYTHING related to this competition...
-			$SQL="SELECT Qualifications.*, IskDtArrowstring, IskDtDistance, IskDtEndNo, DIDistance, DIEnds, DIArrows, IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars) as GoldsChars, IF(TfXNineChars='',ToXNineChars,TfXNineChars) as XNineChars,
-                    `TfGoldsChars1`, `TfXNineChars1`, `TfGoldsChars2`, `TfXNineChars2`, `TfGoldsChars3`, `TfXNineChars3`, `TfGoldsChars4`, `TfXNineChars4`, `TfGoldsChars5`, `TfXNineChars5`, `TfGoldsChars6`, `TfXNineChars6`, `TfGoldsChars7`, `TfXNineChars7`, `TfGoldsChars8`, `TfXNineChars8`,
-                    ToElabTeam!=127 as MakeTeams
-				from Qualifications
-				INNER JOIN Entries ON QuId=EnId
-				INNER JOIN Tournament ON ToId=EnTournament
-                INNER JOIN TargetFaces on TfId=EnTargetFace and TfTournament=EnTournament
-				INNER JOIN DistanceInformation ON DITournament=EnTournament AND DISession=QuSession AND DIType='Q'
-				INNER JOIN IskData ON iskDtTournament=EnTournament AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q' AND IskDtTargetNo=QuTargetNo AND IskDtDistance=DIDistance
-				WHERE EnTournament={$_SESSION['TourId']}";
-			$updated=array();
-			$q=safe_r_sql($SQL);
-			while($r=safe_fetch($q)) {
-				$Dist=$r->IskDtDistance;
-				$arrowString = str_pad($r->{'QuD'.$Dist.'Arrowstring'},$r->DIArrows*$r->DIEnds);
-				for($i=0; $i<$r->DIArrows; $i++){
-					if($r->IskDtArrowstring[$i]!=' '){
-						$arrowString[($r->IskDtEndNo-1)*$r->DIArrows+$i]=$r->IskDtArrowstring[$i];
-					}
-				}
-				$Score=0;
-				$Gold=0;
-				$XNine=0;
-				list($Score,$Gold,$XNine)=ValutaArrowStringGX($arrowString,(empty($r->{"TfGoldsChars".$Dist}) ? $r->GoldsChars : $r->{"TfGoldsChars".$Dist}), (empty($r->{"TfXNineChars".$Dist}) ? $r->XNineChars : $r->{"TfXNineChars".$Dist}));
-				$Hits=strlen(str_replace(' ', '', $arrowString));
-
-				$Update = "UPDATE Qualifications SET
-						QuD{$Dist}Score={$Score}, QuD{$Dist}Gold={$Gold}, QuD{$Dist}Xnine={$XNine}, QuD{$Dist}ArrowString='{$arrowString}', QuD{$Dist}Hits={$Hits},
-						QuScore=QuD1Score+QuD2Score+QuD3Score+QuD4Score+QuD5Score+QuD6Score+QuD7Score+QuD8Score,
-						QuGold=QuD1Gold+QuD2Gold+QuD3Gold+QuD4Gold+QuD5Gold+QuD6Gold+QuD7Gold+QuD8Gold,
-						QuXnine=QuD1Xnine+QuD2Xnine+QuD3Xnine+QuD4Xnine+QuD5Xnine+QuD6Xnine+QuD7Xnine+QuD8Xnine,
-						QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits,
-						QuTimestamp=" . StrSafe_DB(date('Y-m-d H:i:s')) . "
-						WHERE QuId={$r->QuId}";
-				safe_w_SQL($Update);
-				if(safe_w_affected_rows()) {
-					$updated[$Dist][] = $r->QuId;
-				}
-				$Update = "DELETE FROM IskData
-						WHERE IskDtTournament={$_SESSION['TourId']} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q'
-						AND IskDtTargetNo='{$r->QuTargetNo}' AND IskDtDistance={$Dist} AND IskDtEndNo={$r->IskDtEndNo} AND IskDtArrowstring='{$r->IskDtArrowstring}'";
-				safe_w_SQL($Update);
-
-				// calculate snapshot if any
-				if(getModuleParameter('ISK', 'Snapshot')) {
-					useArrowsSnapshotTarget($Dist, $r->QuTargetNo, strlen(rtrim($arrowString)));
-				}
-			}
-			foreach($updated as $Dist => $upd) {
-				$EnIds=implode(",",$upd);
-				$SQL = "SELECT DISTINCT EnClass, EnDivision, MAX(EnIndClEvent) as IndCl, Max(EnTeamClEvent) as TeamCl
-						FROM Entries
-						WHERE EnTournament={$_SESSION['TourId']} AND EnId IN ($EnIds)
-						group by EnClass, EnDivision";
-				$q=safe_r_sql($SQL);
-				while($r=safe_fetch($q)) {
-					if ($r->IndCl != 0) {
-						Obj_RankFactory::create('DivClass', array('tournament' => $_SESSION['TourId'], 'events' => $r->EnDivision . $r->EnClass, 'dist' => $Dist))->calculate();
-						Obj_RankFactory::create('DivClass', array('tournament' => $_SESSION['TourId'], 'events' => $r->EnDivision . $r->EnClass, 'dist' => 0))->calculate();
-					}
-					if ($r->MakeTeams and $r->TeamCl != 0) {
-						MakeTeams(NULL, $r->EnDivision . $r->EnClass, $_SESSION['TourId']);
-					}
-				}
-				// Abs recalculation
-				$SQL="select distinct IndEvent 
-						from Individuals 
-						inner join Entries on EnId=IndId and EnTournament=IndTournament and EnIndFEvent=1
-						where IndId in ($EnIds) and IndTournament={$_SESSION['TourId']}";
-				$q=safe_r_sql($SQL);
-				while($r=safe_fetch($q)) {
-					Obj_RankFactory::create('Abs', array('tournament' => $_SESSION['TourId'], 'events' => $r->IndEvent, 'dist' => $Dist))->calculate();
-					Obj_RankFactory::create('Abs', array('tournament' => $_SESSION['TourId'], 'events' => $r->IndEvent, 'dist' => 0))->calculate();
-					ResetShootoff($r->IndEvent, 0, 0, $_SESSION['TourId']);
-				}
-
-				// Abs Team recalc
-                if($r->MakeTeams) {
-
-                    $SQL = "SELECT DISTINCT EvCode, EnDivision, EnClass
-						FROM Events
-						INNER JOIN EventClass ON EvCode=EcCode AND EcTeamEvent>0 AND EvTournament=EcTournament
-						inner join Entries on EnId in ($EnIds) and EnTournament=EvTournament and EnDivision=EcDivision and EnClass=EcClass and if(EcSubClass='', true, EnSubClass=EcSubClass) and EnTeamFEvent+EnTeamMixEvent>0
-						WHERE EvTournament={$_SESSION['TourId']} and EvTeamEvent=1
-						";
-                    $q=safe_r_sql($SQL);
-                    while($r=safe_fetch($q)) {
-                        MakeTeamsAbs(NULL, $r->EnDivision, $r->EnClass, $_SESSION['TourId']);
-                    }
-                }
-			}
-			if($updated) {
-				$JSON['msg']=get_text('ImportDoneQual', 'ISK');
-			} else {
-				$JSON['msg']=get_text('ImportDoneEmpty', 'ISK');
-			}
-		}
-		break;
-	case 'ImportMatchNow':
-		if(IsBlocked(BIT_BLOCK_IND) or IsBlocked(BIT_BLOCK_TEAM)) {
-			$JSON['msg']=get_text('BlockedPhase', 'Tournament');
-			$JSON['error']=1;
-		} else {
-			$SQL=array("SELECT FSEvent, FSMatchNo, FSTeamEvent, FinArrowstring as Arrowstring, FinTiebreak as TieBreak, IskDtArrowstring, IskDtEndNo, GrPhase, IskDtEndNo, IskDtType
-					FROM FinSchedule
-					INNER JOIN Grids ON FSMatchNo=GrMatchNo
-					INNER JOIN IskData ON IskDtTournament=FsTournament AND IskDtMatchNo=FsMatchNo AND IskDtEvent=FSEvent AND IskDtTeamInd=FsTeamEvent AND IskDtType='I' AND IskDtTargetNo='' AND IskDtDistance=0
-					INNER JOIN Finals ON FsTournament=FinTournament AND FsMatchNo=FinMatchNo AND FSEvent=FinEvent
-					WHERE FSTournament={$_SESSION['TourId']} AND FsTeamEvent=0");
-			$SQL[]="SELECT FSEvent, FSMatchNo, FSTeamEvent, TfArrowstring as Arrowstring, TfTiebreak as TieBreak, IskDtArrowstring, IskDtEndNo, GrPhase, IskDtEndNo, IskDtType
-					FROM FinSchedule
-					INNER JOIN Grids ON FSMatchNo=GrMatchNo
-					INNER JOIN IskData ON IskDtTournament=FsTournament AND IskDtMatchNo=FsMatchNo AND IskDtEvent=FSEvent AND IskDtTeamInd=FsTeamEvent AND IskDtType='T' AND IskDtTargetNo='' AND IskDtDistance=0
-					INNER JOIN TeamFinals ON FsTournament=TfTournament AND FsMatchNo=TfMatchNo AND FSEvent=TfEvent
-					WHERE FSTournament={$_SESSION['TourId']} AND FsTeamEvent=1";
-			$q=safe_r_SQL('('.implode(') UNION (', $SQL).')');
-			if(safe_num_rows($q)) {
-				$JSON['msg']=get_text('ImportDoneMatches', 'ISK');
-			} else {
-				$JSON['msg']=get_text('ImportDoneEmpty', 'ISK');
-			}
-			while($r=safe_fetch($q)){
-				$obj=getEventArrowsParams($r->FSEvent,$r->GrPhase,$r->FSTeamEvent,$_SESSION['TourId']);
-				$isSO = ($End > $obj->ends);
-
-				$arrowString = ($isSO ? str_pad($r->TieBreak,$obj->so) : str_pad($r->Arrowstring,$obj->arrows));
-				for($i=0; $i<($isSO ? $obj->so : $obj->arrows); $i++){
-					if($r->IskDtArrowstring[$i]!=' '){
-						$arrowString[($isSO ? 0 : ($r->IskDtEndNo-1)*$obj->arrows)+$i]=$r->IskDtArrowstring[$i];
-					}
-				}
-				$startPos = (($isSO ? ($obj->arrows*$obj->ends) : 0) +1);
-				UpdateArrowString($r->FSMatchNo, $r->FSEvent, $r->FSTeamEvent, $arrowString, $startPos, ($startPos+($isSO ? $obj->so : $obj->arrows*$obj->ends)-1), $_SESSION['TourId']);
-
-				$Update = "DELETE FROM IskData
-						WHERE IskDtTournament={$_SESSION['TourId']} AND IskDtMatchNo={$r->FSMatchNo} AND IskDtEvent='{$r->FSEvent}' AND IskDtTeamInd={$r->FSTeamEvent} AND IskDtType='{$r->IskDtType}}'
-						AND IskDtTargetNo='' AND IskDtDistance=0 AND IskDtEndNo={$r->IskDtEndNo} AND IskDtArrowstring='{$r->IskDtArrowstring}'";
-				safe_w_SQL($Update);
-			}
-		}
-		break;
-    case 'doCalcClDivInd':
-        if(!IsBlocked(BIT_BLOCK_QUAL)) {
-            $qDist = safe_r_SQL("SELECT ToNumDist from Tournament WHERE ToId={$_SESSION['TourId']}");
-            if ($rDist = safe_fetch($qDist)) {
-                for ($i = 0; $i <= $rDist->ToNumDist; $i++) {
-                    Obj_RankFactory::create('DivClass', array('tournament' => $_SESSION['TourId'], 'dist' => $i))->calculate();
-                }
-            }
-            Obj_RankFactory::create('DivClass', array('tournament' => $_SESSION['TourId'], 'dist' => 0))->calculate();
-            $JSON['msg']=get_text('CalculateNowDone', 'ISK');
-        } else {
-            $JSON['msg']=get_text('BlockedPhase', 'Tournament');
-        }
-        break;
-    case 'doCalcClDivTeam':
-        if(!IsBlocked(BIT_BLOCK_QUAL))	{
-            $JSON['error']=intval(MakeTeams(NULL, NULL));
-            if($JSON['error']) {
-                $JSON['msg']=get_text('MakeTeamsError', 'Tournament');
-            } else {
-                $JSON['msg']=get_text('CalculateNowDone', 'ISK');
-            }
-        } else {
-            $JSON['msg']=get_text('BlockedPhase', 'Tournament');
-        }
-        break;
-    case 'doCalcFinInd':
-        if(!IsBlocked(BIT_BLOCK_QUAL)) {
-            $qDist = safe_r_SQL("SELECT ToNumDist from Tournament WHERE ToId={$_SESSION['TourId']}");
-            if ($rDist = safe_fetch($qDist)) {
-                for ($i = 0; $i <= $rDist->ToNumDist; $i++) {
-                    Obj_RankFactory::create('Abs', array('tournament' => $_SESSION['TourId'], 'dist' => $i))->calculate();
-                }
-            }
-            Obj_RankFactory::create('Abs', array('tournament' => $_SESSION['TourId'], 'dist' => 0))->calculate();
-            $JSON['msg']=get_text('CalculateNowDone', 'ISK');
-        } else {
-            $JSON['msg']=get_text('BlockedPhase', 'Tournament');
-        }
-        break;
-        break;
-    case 'doCalcFinTeam':
-		if(!IsBlocked(BIT_BLOCK_QUAL))	{
-			$JSON['error']=intval(MakeTeamsAbs(NULL,null,null));
-			if($JSON['error']) {
-				$JSON['msg']=get_text('MakeTeamsError', 'Tournament');
-			} else {
-				$JSON['msg']=get_text('CalculateNowDone', 'ISK');
-			}
-		} else {
-			$JSON['msg']=get_text('BlockedPhase', 'Tournament');
-		}
-		break;
-	case 'DeleteDataQual':
-		// removes all data from the temp table related to this competition
-		safe_w_sql("delete from IskData where iskDtTournament={$_SESSION['TourId']} AND IskDtType='Q'");
-		break;
-	case 'DeleteDataMatch':
-		// removes all data from the temp table related to this competition
-		safe_w_sql("delete from IskData where iskDtTournament={$_SESSION['TourId']} AND IskDtType in ('I','T')");
-		break;
-	default:
-		$JSON['error']=1;
-		JsonOut($JSON);
-}
-
-JsonOut($JSON);
diff --git a/src/Api/ISK/Lite.js b/src/Api/ISK/Lite.js
deleted file mode 100644
index d6c700b1..00000000
--- a/src/Api/ISK/Lite.js
+++ /dev/null
@@ -1,51 +0,0 @@
-$(function() {
-	if(ImportType==0) {
-		$('.Cl-ImportType').hide();
-	}
-	if(CalcDivClI==0) {
-		$("#doCalcClDivInd").hide();
-	}
-	if(CalcDivClT==0) {
-		$("#doCalcClDivTeam").hide();
-	}
-	if(CalcFinI==0) {
-		$("#doCalcFinInd").hide();
-	}
-	if(CalcFinT==0) {
-		$("#doCalcFinTeam").hide();
-	}
-});
-
-function LiteAction(obj) {
-	$.getJSON('Lite-Action.php', {'act':obj.name, 'val':obj.value}, function(data) {
-		if(data.error==0) {
-			if(obj.value==0) {
-				if(obj.name.indexOf('Calc')===0) {
-					LiteButton($("#do" + obj.name)[0]);
-					$("#do" + obj.name).hide();
-				} else {
-					$(".Cl-" + obj.name).hide();
-				}
-			} else {
-				if(obj.name.indexOf('Calc')===0) {
-					$("#do" + obj.name).show();
-				} else {
-					$(".Cl-" + obj.name).show();
-				}
-			}
-		}
-	});
-}
-function LiteButton(obj) {
-	$.getJSON('Lite-Action.php', {'act':obj.id}, function(data) {
-		if(data.msg!='') {
-			alert(data.msg);
-		}
-	});
-}
-
-function LiteDelete(obj) {
-	if(confirm(MsgConfirm)) {
-		LiteButton(obj);
-	}
-}
diff --git a/src/Api/ISK/Lite.php b/src/Api/ISK/Lite.php
deleted file mode 100644
index e6d7a294..00000000
--- a/src/Api/ISK/Lite.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*
-THIS FILE IS ESSENTIAL TO MAKE THE APIS TO GET RECOGNIZED BY IANSEO
-
-* HOW IT WORKS
-the "codename" of the API will be used in ianseo. The codename is the name of the directory containing the Api.
-The essentials are:
-
-* ApiConfig.php
-this file gets included in the Competition Setup (Tournament/index.php)
-* DrawQRCode.php
-this file is used by the ScoreCard printout routines.
- */
-
-require_once(__DIR__.'/config-ianseo.php');
-
-if(ISK_PRO) {
-	CD_redirect('./');
-}
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadWrite);
-
-
-if(!empty($_REQUEST['remove'])) {
-	safe_w_sql("delete from IskData where IskDtDevice=".StrSafe_DB($_REQUEST['remove']));
-	safe_w_sql("delete from IskDevices where IskDvDevice=".StrSafe_DB($_REQUEST['remove']));
-	cd_redirect('./');
-}
-
-require_once('Common/Lib/CommonLib.php');
-
-$ImportType=getModuleParameter('ISK', 'ImportType', 0, 0, true);
-$ClDivIndCalc=getModuleParameter('ISK','CalcClDivInd',0, 0, true);
-$ClDivTeamCalc=getModuleParameter('ISK','CalcClDivTeam',0, 0, true);
-$FinIndCalc=getModuleParameter('ISK','CalcFinInd',0, 0, true);
-$FinTeamCalc=getModuleParameter('ISK','CalcFinTeam',0, 0, true);
-
-$PAGE_TITLE=get_text('AutoImportSettings', 'ISK');
-$JS_SCRIPT=array(
-	phpVars2js(array(
-		'MsgConfirm'=>htmlspecialchars(get_text('MsgAreYouSure')),
-		'ImportType'=>$ImportType,
-        'CalcDivClI'=>$ClDivIndCalc,
-        'CalcDivClT'=>$ClDivTeamCalc,
-        'CalcFinI'=>$FinIndCalc,
-        'CalcFinT'=>$FinTeamCalc,
-    )),
-	'<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/js/jquery-3.2.1.min.js"></script>',
-	'<script type="text/javascript" src="./Lite.js"></script>',
-	'<link href="ISK.css" rel="stylesheet" type="text/css">',
-);
-
-
-include('Common/Templates/head.php');
-
-echo '<table class="Tabella LiteIndex">';
-echo '<tr><th class="Main" colspan="6">' . get_text('AutoImportSettings', 'ISK') . '</th></tr>';
-echo '<tr>'.
-        '<th class="Title"></th>'.
-        '<th class="Title">' . get_text('AfterEachArrow', 'ISK') . '</th>'.
-        '<th class="Title">' . get_text('AfterEachEnd', 'ISK') . '</th>'.
-        '<th class="Title">' . get_text('Manually', 'ISK') . '</th>'.
-        '<th class="Title" colspan="2">&nbsp;</th>'.
-    '</tr>';
-echo '<tr>';
-echo '<th class="Left">'.get_text('ImportType', 'ISK').'</th>';
-echo '<td class="Center"><input type="radio" onclick="LiteAction(this)" name="ImportType" value="0"'.($ImportType==0 ? ' checked="checked"' : '').'></td>';
-echo '<td class="Center"><input type="radio" onclick="LiteAction(this)" name="ImportType" value="1"'.($ImportType==1 ? ' checked="checked"' : '').'></td>';
-echo '<td class="Center"><input type="radio" onclick="LiteAction(this)" name="ImportType" value="2"'.($ImportType==2 ? ' checked="checked"' : '').'></td>';
-echo '<td class="Center"><div class="Button Cl-ImportType" onclick="LiteButton(this)" id="ImportQualNow">'.get_text('ImportNow','ISK').'</div>
-	<br/><div class="Button Cl-ImportType" onclick="LiteButton(this)" id="ImportMatchNow">'.get_text('ImportNowMatches','ISK').'</div></td>
-	<td class="Center"><div class="Button Cl-ImportType" onclick="LiteDelete(this)" id="DeleteDataQual">'.get_text('TruncateQual','ISK').'</div>
-	<br/><div class="Button Cl-ImportType" onclick="LiteDelete(this)" id="DeleteDataMatch">'.get_text('TruncateMatches','ISK').'</div></td>';
-echo '</tr>';
-echo '<tr class"divider"><td colspan="6"></td></tr>';
-echo '<tr>'.
-        '<th class="Title"></th>'.
-        '<th class="Title" colspan="2">' . get_text('AfterEachImport', 'ISK') . '</th>'.
-        '<th class="Title">' . get_text('Manually', 'ISK') . '</th>'.
-        '<th class="Title" colspan="2">&nbsp;</th>'.
-    '</tr>';
-echo '<tr class="warning"><td colspan="6" class="">'.get_text('AutoImportSettings', 'Help').'</td></tr>';
-echo '<tr>'.
-        '<th class="Left">'.get_text('CalcClDivInd', 'ISK').'</th>'.
-        '<td class="Center" colspan="2"><input type="radio" onclick="LiteAction(this)" name="CalcClDivInd" value="0"'.($ClDivIndCalc==0 ? ' checked="checked"' : '').'></td>'.
-        '<td class="Center"><input type="radio" onclick="LiteAction(this)" name="CalcClDivInd" value="1"'.($ClDivIndCalc==1 ? ' checked="checked"' : '').'></td>'.
-        '<td class="Center"><div class="Button" onclick="LiteButton(this)" id="doCalcClDivInd">'.get_text('CalculateNow','ISK').'</div></td>'.
-        '<td class="Center"></td>'.
-    '</tr>';
-echo '<tr>'.
-        '<th class="Left">'.get_text('CalcFinInd', 'ISK').'</th>'.
-        '<td class="Center" colspan="2"><input type="radio" onclick="LiteAction(this)" name="CalcFinInd" value="0"'.($FinIndCalc==0 ? ' checked="checked"' : '').'></td>'.
-        '<td class="Center"><input type="radio" onclick="LiteAction(this)" name="CalcFinInd" value="1"'.($FinIndCalc==1 ? ' checked="checked"' : '').'></td>'.
-        '<td class="Center"><div class="Button" onclick="LiteButton(this)" id="doCalcFinInd">'.get_text('CalculateNow','ISK').'</div></td>'.
-        '<td class="Center"></td>'.
-    '</tr>';
-echo '<tr class"divider"><td colspan="6"></td></tr>';
-echo '<tr>'.
-        '<th class="Left">'.get_text('CalcClDivTeam', 'ISK').'</th>'.
-        '<td class="Center" colspan="2"><input type="radio" onclick="LiteAction(this)" name="CalcClDivTeam" value="0"'.($ClDivTeamCalc==0 ? ' checked="checked"' : '').'></td>'.
-        '<td class="Center"><input type="radio" onclick="LiteAction(this)" name="CalcClDivTeam" value="1"'.($ClDivTeamCalc==1 ? ' checked="checked"' : '').'></td>'.
-        '<td class="Center"><div class="Button" onclick="LiteButton(this)" id="doCalcClDivTeam">'.get_text('CalculateNow','ISK').'</div></td>'.
-        '<td class="Center"></td>'.
-    '</tr>';
-echo '<tr>'.
-        '<th class="Left">'.get_text('CalcFinTeam', 'ISK').'</th>'.
-        '<td class="Center" colspan="2"><input type="radio" onclick="LiteAction(this)" name="CalcFinTeam" value="0"'.($FinTeamCalc==0 ? ' checked="checked"' : '').'></td>'.
-        '<td class="Center"><input type="radio" onclick="LiteAction(this)" name="CalcFinTeam" value="1"'.($FinTeamCalc==1 ? ' checked="checked"' : '').'></td>'.
-        '<td class="Center"><div class="Button" onclick="LiteButton(this)" id="doCalcFinTeam">'.get_text('CalculateNow','ISK').'</div></td>'.
-        '<td class="Center"></td>'.
-    '</tr>';
-echo '</table>';
-
-include('Common/Templates/tail.php');
diff --git a/src/Api/ISK/PdfCheck.php b/src/Api/ISK/PdfCheck.php
deleted file mode 100644
index bdac0e06..00000000
--- a/src/Api/ISK/PdfCheck.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)).'/config.php');
-// Include the main TCPDF library (search for installation path).
-require_once('Common/pdf/ResultPDF.inc.php');
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadWrite);
-
-$Results=array();
-
-$Session=-1;
-if(!empty($_REQUEST['ses'])) {
-	$tmp=explode('|',$_REQUEST['ses']);
-	if($tmp[0]!='Q') {
-		die('<html><script>window.close()</script></html>');
-	}
-
-	$Session=intval($tmp[1]);
-}
-
-$SubTitle='';
-if($Session==-1) {
-	// general PDF, so all numbers are per session
-	$TotSql="select QuSession, count(*) as Total, ifnull(SesName, concat('Session ',QuSession)) as Session
-		from Qualifications 
-	    inner join Entries on EnId=QuId and EnTournament={$_SESSION['TourId']} 
-		left join Session on SesType='Q' and SesTournament=EnTournament and SesOrder=QuSession
-		group by QuSession
-		order by QuSession";
-
-	$SQL="select QuSession, count(*) as Total, greatest(QuIrmType, IndIrmType) as QualStatus, IrmType, QuHits as Arrows
-		from Qualifications
-		inner join Entries on QuId=EnId
-		left join Individuals on IndId=QuId
-		left join IrmTypes on IrmId=greatest(QuIrmType, IndIrmType)
-		where EnTournament={$_SESSION['TourId']}
-		group by QuSession, Arrows, IrmType
-		order by QualStatus=0, QualStatus, Arrows, QuSession";
-} else {
-	// Session PDF, all numbers are per event
-	$TotSql="select concat(EnDivision,EnClass) as QuSession, count(*) as Total, concat(ifnull(DivDescription, ''), ' ', ifnull(ClDescription, '')) as Session
-		from Qualifications 
-	    inner join Entries on EnId=QuId and EnTournament={$_SESSION['TourId']}
-		left join Divisions on DivTournament=EnTournament and DivId=EnDivision
-		left join Classes on ClTournament=EnTournament and ClId=EnClass
-		where QuSession=$Session
-		group by concat(EnDivision,EnClass)
-		order by DivViewOrder,ClViewOrder";
-
-	$SQL="select concat(EnDivision,EnClass) as QuSession, count(*) as Total, greatest(QuIrmType, IndIrmType) as QualStatus, IrmType, QuHits as Arrows
-		from Qualifications
-	    inner join Entries on EnId=QuId  
-		left join Individuals on IndId=QuId
-		left join Divisions on DivTournament=EnTournament and DivId=EnDivision
-		left join Classes on ClTournament=EnTournament and ClId=EnClass
-		left join IrmTypes on IrmId=greatest(QuIrmType, IndIrmType)
-		where EnTournament={$_SESSION['TourId']} and QuSession=$Session
-		group by concat(EnDivision,EnClass), Arrows, IrmType
-		order by QualStatus=0, QualStatus, Arrows, concat(EnDivision,EnClass)";
-
-	$q=safe_r_sql("select SesName from Session where SesOrder=$Session and SesType='Q' and SesTournament={$_SESSION['TourId']}");
-	if($r=safe_fetch($q)) {
-		$SubTitle=$r->SesName;
-	} else {
-		$SubTitle=get_text('PopupStatusSession', 'Api', $Session);
-	}
-}
-
-// FIRST STEP getting gross totals
-$q=safe_r_sql($TotSql);
-while($r=safe_fetch($q)) {
-	$Results[$r->QuSession]=array(
-		'Total' => $r->Total,
-		'Name'=>$r->Session,
-		'Arrows'=>array(),
-		'IrmTypes'=>array(),
-	);
-}
-
-$q=safe_r_sql($SQL);
-$Arrows=array();
-$IrmTypes=array();
-while($r=safe_fetch($q)) {
-	if($r->IrmType) {
-		$IrmTypes[$r->QualStatus]=$r->IrmType;
-		if(empty($Results[$r->QuSession]['IrmTypes'][$r->QualStatus])) {
-			$Results[$r->QuSession]['IrmTypes'][$r->QualStatus]=0;
-		}
-		$Results[$r->QuSession]['IrmTypes'][$r->QualStatus]+=$r->Total;
-	} else {
-		$Arrows[$r->Arrows]=1;
-		if(empty($Results[$r->QuSession]['Arrows'][$r->Arrows])) {
-			$Results[$r->QuSession]['Arrows'][$r->Arrows]=0;
-		}
-		$Results[$r->QuSession]['Arrows'][$r->Arrows]+=$r->Total;
-	}
-}
-
-$Totals=array();
-// create new PDF document
-$pdf = new ResultPDF('Control Page', false);//TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
-
-$pdf->SetFont('', 'B', 18);
-$pdf->Cell(0, 0, 'Competition Arrow Status', 0, 1, 'C');
-if($SubTitle) {
-	$pdf->ln(4);
-	$pdf->SetFont('', 'B', 14);
-	$pdf->Cell(0, 0, $SubTitle, 0, 1, 'C');
-}
-
-$wCell=min(11, ($pdf->getPageWidth()-80)/(count($Arrows)+count($IrmTypes)+3));
-$hCell=7;
-$FontSize=9;
-
-// HEADER
-$pdf->dy(10);
-$pdf->SetFont('', 'B', 10);
-$pdf->Cell(60, $hCell+2,'', 1, 0, 'L', 1);
-$pdf->Cell($wCell,$hCell+2, 'Entries',1,0,'C',1);
-$Totals['g']=0;
-$Totals['c']=0;
-foreach($Arrows as $Num => $dummy) {
-	$pdf->Cell($wCell,$hCell+2,$Num,1,0,'C',1);
-	$Totals['a'.$Num]=0;
-}
-foreach($IrmTypes as $Num => $dummy) {
-	$pdf->Cell($wCell,$hCell+2,$dummy,1,0,'C',1);
-	$Totals['i'.$Num]=0;
-}
-$pdf->Cell($wCell,$hCell+2, 'Total',1,0,'C',1);
-$pdf->Ln();
-
-foreach($Results as $Id => $Session) {
-	$pdf->SetFont('', 'B', $FontSize);
-	$pdf->Cell(10, $hCell, $Id, 'TBL',0,'C');
-	$pdf->Cell(50, $hCell, $Session['Name'], 'TBR');
-	$pdf->SetFont('', '', $FontSize);
-
-	$pdf->Cell($wCell,$hCell, number_format($Session['Total'], 0,'.','.'),1,0,'R');
-	$Totals['g']+=$Session['Total'];
-	foreach($Arrows as $Num => $dummy) {
-		if(isset($Session['Arrows'][$Num])) {
-			$pdf->Cell($wCell,$hCell,number_format($Session['Arrows'][$Num], 0,'.','.'),1,0,'R');
-			$Totals['a'.$Num]+=$Session['Arrows'][$Num];
-		} else {
-			$pdf->Cell($wCell,$hCell,'',1,0,'R');
-		}
-	}
-	foreach($IrmTypes as $Num => $dummy) {
-		if(isset($Session['IrmTypes'][$Num])) {
-			$pdf->Cell($wCell,$hCell,number_format($Session['IrmTypes'][$Num], 0,'.','.'),1,0,'R');
-			$Totals['i'.$Num]+=$Session['IrmTypes'][$Num];
-		} else {
-			$pdf->Cell($wCell,$hCell,'',1,0,'R');
-		}
-	}
-
-	$Tot=array_sum($Session['Arrows'])+array_sum($Session['IrmTypes']);
-	$Totals['c']+=$Session['Total'];
-	$pdf->SetFont('', 'B', $FontSize);
-	$pdf->Cell($wCell,$hCell,number_format($Tot, 0,'.','.'),1,0,'R');
-	if($Tot!=$Session['Total']) {
-		$pdf->Cell($wCell,$hCell,'*',1,0,'R');
-	}
-	$pdf->Ln();
-	$pdf->SetFont('', '', $FontSize);
-}
-
-$pdf->SetFont('', 'B', $FontSize);
-$pdf->Cell(60, $hCell+2,'', 0, 0, 'L');
-$pdf->Cell($wCell,$hCell+2, number_format($Totals['g'], 0,'.','.'),1,0,'R');
-foreach($Arrows as $Num => $dummy) {
-	$pdf->Cell($wCell,$hCell+2,number_format($Totals['a'.$Num], 0,'.','.'),1,0,'R');
-}
-foreach($IrmTypes as $Num => $dummy) {
-	$pdf->Cell($wCell,$hCell+2,number_format($Totals['i'.$Num], 0,'.','.'),1,0,'R');
-}
-$pdf->Cell($wCell,$hCell+2, number_format($Totals['c'], 0,'.','.'),1,0,'R');
-
-// -------------------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('ControlPage.pdf', 'I');
-
diff --git a/src/Api/ISK/Ping.php b/src/Api/ISK/Ping.php
deleted file mode 100644
index b703cd96..00000000
--- a/src/Api/ISK/Ping.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-	header('Access-Control-Allow-Origin: *');
-	header('Content-Type: text/plain; charset=utf-8');
-
-	echo 'ping';
diff --git a/src/Api/ISK/ProConfirmQrCode.php b/src/Api/ISK/ProConfirmQrCode.php
deleted file mode 100644
index 348b0d88..00000000
--- a/src/Api/ISK/ProConfirmQrCode.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-
-$SkipCompCode=true;
-require_once(dirname(__FILE__) . '/config.php');
-
-$qrcode = (empty($_REQUEST['qrcode']) ? "" : $_REQUEST['qrcode']);
-$JsonResponse=array("error"=>1);
-
-$OrgQrCode=getQrCode();
-$ChkQrCode=urldecode($qrcode);
-if($ChkQrCode) $ChkQrCode=json_decode($ChkQrCode);
-
-$Resp=array();
-
-if($OrgQrCode and $ChkQrCode) {
-	$JsonResponse["error"]=0;
-	foreach($OrgQrCode as $k=>$v) {
-		// check the exact match of each element of the original QrCode against the equivalent element of the received QrCode
-		if(!isset($ChkQrCode->{$k}) or $ChkQrCode->{$k}!=$v) {
-			$JsonResponse["error"]=1;
-			$Resp['sent'][$k]=$v;
-		} else {
-			unset($ChkQrCode->{$k}); // this to ensure the resulting ChkQrCode is empty if everything is OK
-		}
-	}
-	$tmp=get_object_vars($ChkQrCode);
-	if(!empty($tmp)) {
-		// there were other elements that should not have been there!
-		$JsonResponse["error"]=1;
-		$Resp['received']=$ChkQrCode;
-	}
-	if(!$JsonResponse["error"]) {
-		safe_w_SQL("UPDATE IskDevices SET IskDvState='1' WHERE IskDvDevice='{$DeviceId}' AND  IskDvState='3'");
-	}
-} elseif($OrgQrCode==$ChkQrCode or !$OrgQrCode) {
-	$JsonResponse["error"]=0;
-}
-
-SendResult($JsonResponse);
\ No newline at end of file
diff --git a/src/Api/ISK/ProGetQrCode.php b/src/Api/ISK/ProGetQrCode.php
deleted file mode 100644
index c7a4c61c..00000000
--- a/src/Api/ISK/ProGetQrCode.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-$SkipCompCode=true;
-require_once(dirname(__FILE__) . '/config.php');
-
-$battLevel = 0;
-if(!empty($_REQUEST['batt'])) {
-	$tmp = explode("-",$_REQUEST['batt']);
-	$battLevel = intval($tmp[0]) * ($tmp[1] ? -1 : 1);
-}
-$tgtReq = (empty($_REQUEST['tar']) ? 0 : $_REQUEST['tar']);
-
-$JsonResponse=array("error"=>0,"qrcode"=>"", "msg"=>"");
-
-safe_w_SQL("UPDATE IskDevices SET
-	IskDvBattery='{$battLevel}'
-	WHERE IskDvDevice='{$DeviceId}'");
-
-$q=safe_r_sql("SELECT IskDvState, IskDvTournament FROM IskDevices WHERE IskDvDevice='{$DeviceId}'");
-if(safe_num_rows($q)==1) {
-	$r = safe_fetch($q);
-	// updates all the status of the devices that requested authorization and were already authorized to 2 (code to be sent)
-	safe_w_sql("update IskDevices set IskDvState=2, IskDvAuthRequest=0 where IskDvTournament=$r->IskDvTournament and IskDvAuthRequest=1 and IskDvState=1");
-	if($r->IskDvState==0) {
-		$JsonResponse["error"] = 1;
-	} else {
-		if($tmp=getQrCode('2,3')) { // asks for a code to be sent or already sent
-			$JsonResponse["qrcode"] = $tmp;
-			// device goes in "qrcode sent, waiting for confirmation" state
-			$q=safe_r_sql("update IskDevices set IskDvState=3, IskDvAuthRequest=0, IskDvRunningConf=".StrSafe_DB(json_encode($tmp))."  WHERE IskDvDevice='{$DeviceId}'");
-		}
-	}
-}
-
-SendResult($JsonResponse);
diff --git a/src/Api/ISK/ProRequestAuth.php b/src/Api/ISK/ProRequestAuth.php
deleted file mode 100644
index c99c1233..00000000
--- a/src/Api/ISK/ProRequestAuth.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-$SkipDeviceCheck=true;
-$SkipCompCode=true;
-require_once(dirname(__FILE__) . '/config.php');
-
-$JsonResponse=array("auth"=>"NO", "code"=>"", 'isk' => 'NO');
-// search if there is a QRcode passed along
-$QR='';
-if(!empty($_REQUEST['qr'])) {
-	$QR=json_decode($_REQUEST['qr']);
-	$CompCode=$QR->c;
-    if(($sepPosition = strpos($CompCode,'|'))!==false) {
-        $CompPin=substr($CompCode,$sepPosition+1);
-        $CompCode=substr($CompCode,0,$sepPosition);
-    }
-	$CompId=getIdFromCode($CompCode);
-	if(!$CompId) {
-		$CompId=0;
-	}
-}
-
-if($CompId) {
-	// get the ISK-status of the competition...
-	$q=safe_r_sql("select ToOptions from Tournament where ToId=$CompId");
-	$r=safe_fetch($q);
-	if(!empty($r->ToOptions)) {
-		$tmp=unserialize($r->ToOptions);
-		if(isset($tmp['UseApi'])) {
-            $tmpPin = getModuleParameter('ISK', 'ServerUrlPin', '', $CompId);
-            if(empty($tmpPin) OR $CompPin == $tmpPin) {
-                switch($tmp['UseApi']) {
-                    case '1':
-                        $JsonResponse['isk']='LITE';
-                        break;
-                    case '2':
-                        $JsonResponse['isk']='PRO';
-                        break;
-                    case '3':
-                        $JsonResponse['isk']='LIVE';
-                        SendResult($JsonResponse);
-                        die();
-                        break;
-                }
-            } else {
-                // not valid so stops here
-                SendResult($JsonResponse);
-            }
-		}
-	}
-}
-
-$checkTgtInPro= -1;
-$SQL=array(
-	"IskDvDevice='{$DeviceId}'",
-	"IskDvAppVersion=1",
-	"IskDvIpAddress='{$_SERVER['REMOTE_ADDR']}'",
-	"IskDvLastSeen=".StrSafe_DB(date('Y-m-d H:i:s')),
-	"IskDvAuthRequest=1",
-	);
-
-// check if some more info is there...
-if(!empty($QR->st) and isset($QR->s) and isset($QR->t)) {
-	// a complete scorecard QRcode has been requested, so we can already "prepare"" things on the device
-	switch($QR->st) {
-		case 'Q': // Qualifications
-			$SQL[]="IskDvTargetReq=".intval($QR->t);
-			break;
-		case 'E1': // Eliminations
-		case 'E2': // Eliminations
-			$items=explode('|', $QR->t);
-			$SQL[]="IskDvTargetReq=".intval($items[2]);
-			break;
-		case 'MI': // Individual matches
-		case 'MT': // Team matches
-			if(!isset($QR->d)) {
-				break;
-			}
-			$q=safe_r_sql("select FsTarget from FinSchedule 
-				where FsTournament=$CompId 
-				and FSTeamEvent=".($QR->st=='MI' ? 0 : 1)."
-				and FsEvent=".StrSafe_DB($QR->s)."
-				and FsMatchNo=".intval($QR->d));
-			if($r=safe_fetch($q)) {
-				$SQL[]="IskDvTargetReq=".intval($r->FsTarget);
-                $SQL[]="IskDvTarget=IF((IskDvTarget!=0 AND IskDvTournament={$CompId}),".intval($r->FsTarget).",IskDvTarget)";
-                $checkTgtInPro = intval($r->FsTarget);
-			}
-			break;
-	}
-}
-
-
-$q=safe_r_sql("SELECT * FROM IskDevices WHERE IskDvDevice='{$DeviceId}'");
-if($r=safe_fetch($q)) {
-	if($CompId) {
-	    if(!($JsonResponse['isk']=='PRO' AND $checkTgtInPro != -1 AND $r->IskDvTarget!=$checkTgtInPro AND $r->IskDvTournament!=$CompId)) {
-            $SQL[]="IskDvTournament={$CompId}";
-        }
-	} elseif($JsonResponse['isk']=='PRO' and $r->IskDvTournament!=$CompId) {
-		$SQL[]='IskDvTournament=0';
-	}
-	// check the scanned code with what we have set in the device
-	if(!$r->IskDvRunningConf) {
-		$r->IskDvState=2;
-		$SQL[] = "IskDvState=2";
-	} else {
-		$RunningConf=@json_decode($r->IskDvRunningConf);
-		if($RunningConf!=$QR) {
-			$SQL[] = "IskDvState=2";
-			$SQL[] = "IskDvRunningConf=''";
-			$r->IskDvState=2;
-		}
-	}
-	safe_w_SQL("UPDATE IskDevices SET ".implode(',', $SQL)." WHERE IskDvDevice='{$DeviceId}'");
-	$JsonResponse["code"] = $r->IskDvCode;
-	if($r->IskDvState!=0) {
-		$JsonResponse["auth"] = "OK";
-	}
-} else {
-	$iskCode="0001";
-	$q=safe_r_sql("SELECT IskDvCode FROM IskDevices ORDER BY IskDvCode DESC");
-	if(safe_num_rows($q)) {
-		$r=safe_fetch($q);
-        $iskCode = str_pad(base_convert(base_convert($r->IskDvCode,36,10)+1,10,36),4,'0',STR_PAD_LEFT);
-	}
-
-	$SQL[]="IskDvCode='{$iskCode}'";
-	$SQL[]="IskDvTournament={$CompId}";
-	$SQL[]="IskDvState=0";
-
-	safe_w_SQL("INSERT INTO IskDevices set ".implode(',', $SQL));
-	$JsonResponse["code"] = $iskCode;
-}
-$JsonResponse['SQL']=$SQL;
-SendResult($JsonResponse);
diff --git a/src/Api/ISK/QRcodes.php b/src/Api/ISK/QRcodes.php
deleted file mode 100644
index a801f874..00000000
--- a/src/Api/ISK/QRcodes.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)).'/config.php');
-require_once('Common/Lib/Fun_Modules.php');
-
-// Include the main TCPDF library (search for installation path).
-require_once('Common/pdf/ResultPDF.inc.php');
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadWrite);
-
-// create new PDF document
-$pdf = new ResultPDF('QrCode');//TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
-
-// set style for barcode
-$style = array(
-		'border' => 2,
-		'vpadding' => 'auto',
-		'hpadding' => 'auto',
-		'fgcolor' => array(0,0,0),
-		'bgcolor' => false, //array(255,255,255)
-		'module_width' => 1, // width of a single module in points
-		'module_height' => 1 // height of a single module in points
-);
-
-$Opts=array();
-$Opts['u']=getModuleParameter('ISK', 'ServerUrl').$CFG->ROOT_DIR;
-$Opts['c']=$_SESSION['TourCode'];
-$tmpPin = getModuleParameter('ISK', 'ServerUrlPin');
-if(!empty($tmpPin)) {
-	$Opts['c'] .= '|'.$tmpPin;
-}
-
-$Code=json_encode($Opts);
-
-$Y=35;
-$VBlock=($pdf->getPageHeight()-$Y-30);
-$Size=min(60, $VBlock-12);
-$X=($pdf->getPageWidth()-$Size)/2;
-
-$ActY=$Y + ($VBlock - $Size)/2;
-$pdf->SetFontSize(12);
-
-$pdf->SetY($ActY-6);
-$pdf->SetFont('', 'B', 18);
-$pdf->Cell(0, 6, 'ISK-Pro Setup', 0, 1, 'C');
-$pdf->SetFont('', '', 12);
-$pdf->Cell(0, 6, $Code, 0, 1, 'C');
-$pdf->write2DBarcode($Code, 'QRCODE,L', $X, $ActY+12, $Size, $Size, $style, 'N');
-$ActY+= $VBlock;
-
-// -------------------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('QrCode.pdf', 'I');
-
diff --git a/src/Api/ISK/README.php b/src/Api/ISK/README.php
deleted file mode 100644
index 14f89e5b..00000000
--- a/src/Api/ISK/README.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
-
-************************
-** BASE CONFIGURATION **
-************************
-File ApiConfig.php gets included in the competition details page
-sets up 2 module variables:
-- ServerUrl
-- Mode
-
-
-IskDvState will hold the following numbers and explanations
-0 => device not used
-1 => device is OK and configured
-2 => device is waiting to send code
-3 => code has been sent, waiting for the confirmation
-
-
-*****************
-** Results.php **
-*****************
-AUTOIMPORT
-Stops the autoimport facility, when page is closed reactivates it automagically
-the flag is defined in getModuleParameter('ISK', 'StopAutoImport').
-if not present or false (default), the autoimport is ON
-If true, the autoimport features is OFF (only manual import is aloud)
-
-STICKY ENDS
-While the page is loaded the operator can stick users to score only in certain ends:
-getModuleParameter('ISK', 'StickyEnds', array('SeqCode'=>$Sequence, 'Distance'=>$Dist, 'Ends'=>array()));
-
-Ends is an array 1-based of ends to stick to.
-If the parameter is not there or Ends is an empty array then no sticky ends at all, otherwise ONLY the ends of that distance and that session
-
-
-TODO: sistemare il conteggio delle frecce tra elim e fin basando sul ln(2) della fase... cercare dove è stato già usato
-
-*/
\ No newline at end of file
diff --git a/src/Api/ISK/Res-AutoImport.php b/src/Api/ISK/Res-AutoImport.php
deleted file mode 100644
index 708ef83e..00000000
--- a/src/Api/ISK/Res-AutoImport.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)).'/config.php');
-$Error=1;
-
-if(!CheckTourSession()) {
-	header('Content-Type: text/xml');
-	die('<response error="'.$Error.'"/>');
-}
-checkACL(AclISKServer, AclReadWrite,false);
-
-require_once('Common/Lib/Fun_Modules.php');
-
-if(empty($_REQUEST['stop'])) {
-	delModuleParameter('ISK', 'StopAutoImport');
-} else {
-	setModuleParameter('ISK', 'StopAutoImport', 1);
-}
-$Error=0;
-
-header('Content-Type: text/xml');
-echo '<response error="'.$Error.'">';
-echo '</response>';
diff --git a/src/Api/ISK/Res-DataImport.php b/src/Api/ISK/Res-DataImport.php
deleted file mode 100644
index bb76ac9a..00000000
--- a/src/Api/ISK/Res-DataImport.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)).'/config.php');
-require_once(dirname(__FILE__).'/Res-ImportCommon.php');
-$Error=1;
-
-if(!CheckTourSession()) {
-	header('Content-Type: text/xml');
-	die('<response error="'.$Error.'"/>');
-}
-checkACL(AclISKServer, AclReadWrite,false);
-
-$Error=DoImportData();
-
-
-header('Content-Type: text/xml');
-die('<response error="'.$Error.'"/>');
diff --git a/src/Api/ISK/Res-ImportCommon.php b/src/Api/ISK/Res-ImportCommon.php
deleted file mode 100644
index 4955e8c5..00000000
--- a/src/Api/ISK/Res-ImportCommon.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-
-function DoImportData($ALL=false) {
-	require_once(dirname(dirname(__FILE__)).'/config.php');
-	require_once('Qualification/Fun_Qualification.local.inc.php');
-	require_once('Final/Fun_MatchTotal.inc.php');
-
-	$Error=1;
-
-	if(!CheckTourSession()) {
-		header('Content-Type: text/xml');
-		die('<response error="'.$Error.'"/>');
-	}
-
-	$CompId = $_SESSION["TourId"];
-	$Sequence=$_REQUEST['ses'];
-	$Dist=intval($_REQUEST['dist']);
-	$End=intval($_REQUEST['end']);
-	$Filtre='';
-	if(!empty($_REQUEST['target'])) {
-		$Filtre=' AND substr(IskDtTargetNo, -4, 3)+0 = ' . intval($_REQUEST['target']);
-	}
-	if(isset($_REQUEST['event']) or isset($_REQUEST['matchno'])) {
-		$Filtre=" AND IskDtEvent = '{$_REQUEST['event']}' and IskDtMatchNo in ({$_REQUEST['matchno']}) and IskDtTeamInd=".($Sequence[0]=='T' ? 1 : 0);
-	}
-	switch($Sequence[0]) {
-		case 'Q':
-			$qSes=substr($Sequence,2);
-			$SQL="SELECT QuId, QuSession, QuTargetNo, QuD{$Dist}Arrowstring as Arrowstring, IskDtArrowstring, IskDtEndNo, DIDistance, DIEnds, DIArrows, 
-                IF(TfGoldsChars{$Dist}='',IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars),TfGoldsChars{$Dist}) as GoldsChars, 
-                IF(TfXNineChars{$Dist}='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars{$Dist}) as XNineChars               
-                FROM Qualifications
-				INNER JOIN Entries ON QuId=EnId
-				INNER JOIN Tournament ON ToId=EnTournament
-                INNER JOIN TargetFaces on TfId=EnTargetFace and TfTournament=EnTournament
-				INNER JOIN DistanceInformation ON DITournament=EnTournament AND DISession=QuSession AND DIDistance={$Dist} AND DIType='Q'
-				INNER JOIN IskData ON iskDtTournament=EnTournament AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q' AND IskDtTargetNo=QuTargetNo AND IskDtDistance={$Dist} AND IskDtEndNo={$End}
-					$Filtre
-				WHERE EnTournament={$CompId} and QuSession={$qSes}";
-			$updated=array();
-			$q=safe_r_sql($SQL);
-			while($r=safe_fetch($q)) {
-				$arrowString = str_pad($r->Arrowstring,$r->DIArrows*$r->DIEnds);
-				for($i=0; $i<$r->DIArrows; $i++){
-					if($r->IskDtArrowstring[$i]!=' '){
-						$arrowString[($r->IskDtEndNo-1)*$r->DIArrows+$i]=$r->IskDtArrowstring[$i];
-					}
-				}
-				list($Score,$Gold,$XNine)=ValutaArrowStringGX($arrowString,$r->GoldsChars,$r->XNineChars);
-				$Hits=strlen(str_replace(' ', '', $arrowString));
-
-				$Update = "UPDATE Qualifications SET
-					QuD{$Dist}Score={$Score}, QuD{$Dist}Gold={$Gold}, QuD{$Dist}Xnine={$XNine}, QuD{$Dist}ArrowString='{$arrowString}', QuD{$Dist}Hits={$Hits},
-					QuScore=QuD1Score+QuD2Score+QuD3Score+QuD4Score+QuD5Score+QuD6Score+QuD7Score+QuD8Score,
-					QuGold=QuD1Gold+QuD2Gold+QuD3Gold+QuD4Gold+QuD5Gold+QuD6Gold+QuD7Gold+QuD8Gold,
-					QuXnine=QuD1Xnine+QuD2Xnine+QuD3Xnine+QuD4Xnine+QuD5Xnine+QuD6Xnine+QuD7Xnine+QuD8Xnine,
-					QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits,
-					QuTimestamp=" . StrSafe_DB(date('Y-m-d H:i:s')) . "
-					WHERE QuId={$r->QuId}";
-				safe_w_SQL($Update);
-				if(safe_w_affected_rows()) {
-					$updated[] = $r->QuId;
-				}
-				$Update = "DELETE FROM IskData
-					WHERE IskDtTournament={$CompId} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q'
-					AND IskDtTargetNo='{$r->QuTargetNo}' AND IskDtDistance={$Dist} AND IskDtEndNo={$End} AND IskDtArrowstring='{$r->IskDtArrowstring}'";
-				safe_w_SQL($Update);
-
-				// calculate snapshot if any
-				if(getModuleParameter('ISK', 'Snapshot')) {
-					useArrowsSnapshotTarget($Dist, $r->QuTargetNo, strlen(rtrim($arrowString)));
-				}
-			}
-			if(count($updated)) {
-				$EnIds=implode(",",$updated);
-				$SQL = "SELECT DISTINCT EnClass, EnDivision, MAX(EnIndClEvent) as IndCl, Max(EnTeamClEvent) as TeamCl
-					FROM Entries
-					WHERE EnTournament={$CompId} AND EnId IN ($EnIds)
-					group by EnClass, EnDivision";
-				$q=safe_r_sql($SQL);
-				while($r=safe_fetch($q)) {
-					if ($r->IndCl != 0) {
-						Obj_RankFactory::create('DivClass', array('tournament' => $CompId, 'events' => $r->EnDivision . $r->EnClass, 'dist' => $Dist))->calculate();
-						Obj_RankFactory::create('DivClass', array('tournament' => $CompId, 'events' => $r->EnDivision . $r->EnClass, 'dist' => 0))->calculate();
-					}
-					if ($r->TeamCl != 0) {
-						MakeTeams(NULL, $r->EnDivision . $r->EnClass, $CompId);
-					}
-				}
-				// Abs recalculation
-				$SQL="select distinct IndEvent 
-					from Individuals 
-					inner join Entries on EnId=IndId and EnTournament=IndTournament and EnIndFEvent=1
-					where IndId in ($EnIds) and IndTournament={$CompId}";
-				$q=safe_r_sql($SQL);
-				while($r=safe_fetch($q)) {
-					Obj_RankFactory::create('Abs', array('tournament' => $CompId, 'events' => $r->IndEvent, 'dist' => $Dist))->calculate();
-					Obj_RankFactory::create('Abs', array('tournament' => $CompId, 'events' => $r->IndEvent, 'dist' => 0))->calculate();
-					ResetShootoff($r->IndEvent, 0, 0, $CompId);
-				}
-
-				// Abs Team recalc
-				$SQL = "SELECT DISTINCT EvCode, EnDivision, EnClass
-					FROM Events
-					INNER JOIN EventClass ON EvCode=EcCode AND EcTeamEvent>0 AND EvTournament=EcTournament
-					inner join Entries on EnId in ($EnIds) and EnTournament=EvTournament and EnDivision=EcDivision and EnClass=EcClass and if(EcSubClass='', true, EnSubClass=EcSubClass) and EnTeamFEvent+EnTeamMixEvent>0
-					WHERE EvTournament={$CompId} and EvTeamEvent=1
-					";
-				$q=safe_r_sql($SQL);
-				while($r=safe_fetch($q)) {
-					MakeTeamsAbs(NULL, $r->EnDivision, $r->EnClass, $CompId);
-				}
-			}
-			$Error=0;
-			break;
-		case 'I':
-		case 'T':
-			$fSes=substr($Sequence,1);
-			$IndTeam = ($Sequence[0]=='I' ? 0:1);
-			$tblHead = ($IndTeam==0 ? 'Fin' : 'Tf');
-
-			$SQL="SELECT FSEvent, FSMatchNo, FSTeamEvent, {$tblHead}Arrowstring as Arrowstring, {$tblHead}Tiebreak as TieBreak, IskDtArrowstring, IskDtEndNo, GrPhase
-				FROM FinSchedule
-				INNER JOIN Grids ON FSMatchNo=GrMatchNo
-				INNER JOIN IskData ON IskDtTournament=FsTournament AND IskDtMatchNo=FsMatchNo AND IskDtEvent=FSEvent AND IskDtTeamInd=FsTeamEvent AND IskDtType='" . ($IndTeam==0 ? 'I':'T') . "' AND IskDtTargetNo='' AND IskDtDistance=0 AND IskDtEndNo={$End}
-					$Filtre
-				INNER JOIN " . ($IndTeam==0 ? 'Finals' : 'TeamFinals') . " ON FsTournament={$tblHead}Tournament AND FsMatchNo={$tblHead}MatchNo AND FSEvent={$tblHead}Event
-				WHERE FSTournament={$CompId} AND FsTeamEvent={$IndTeam}
-				AND CONCAT(FSScheduledDate,FSScheduledTime)=" . StrSafe_DB($fSes);
-			$q=safe_r_SQL($SQL);
-			while($r=safe_fetch($q)){
-				$obj=getEventArrowsParams($r->FSEvent,$r->GrPhase,$r->FSTeamEvent,$CompId);
-				$isSO = ($End > $obj->ends);
-
-				$arrowString = ($isSO ? str_pad($r->TieBreak,$obj->so) : str_pad($r->Arrowstring,$obj->arrows));
-				for($i=0; $i<($isSO ? $obj->so : $obj->arrows); $i++){
-					if($r->IskDtArrowstring[$i]!=' '){
-						$arrowString[($isSO ? 0 : ($r->IskDtEndNo-1)*$obj->arrows)+$i]=$r->IskDtArrowstring[$i];
-					}
-				}
-				$startPos = (($isSO ? ($obj->arrows*$obj->ends) : 0) +1);
-
-				$Closest=0;
-				if($isSO) {
-					$Closest=intval($arrowString!=strtoupper($arrowString));
-					$arrowString=strtoupper($arrowString);
-				}
-				UpdateArrowString($r->FSMatchNo, $r->FSEvent, $IndTeam, $arrowString, $startPos, ($startPos+($isSO ? $obj->so : $obj->arrows*$obj->ends)-1), $CompId, $Closest);
-
-				$Update = "DELETE FROM IskData
-					WHERE IskDtTournament={$CompId} AND IskDtMatchNo={$r->FSMatchNo} AND IskDtEvent='{$r->FSEvent}' AND IskDtTeamInd={$IndTeam} AND IskDtType='" . ($IndTeam==0 ? 'I':'T') . "'
-					AND IskDtTargetNo='' AND IskDtDistance=0 AND IskDtEndNo={$r->IskDtEndNo} AND IskDtArrowstring='{$r->IskDtArrowstring}'";
-				safe_w_SQL($Update);
-			}
-			$Error=0;
-			break;
-	}
-	return $Error;
-}
diff --git a/src/Api/ISK/Res-ImportEnd.php b/src/Api/ISK/Res-ImportEnd.php
deleted file mode 100644
index b57680f3..00000000
--- a/src/Api/ISK/Res-ImportEnd.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-require_once(dirname(dirname(__FILE__)).'/config.php');
-require_once('Qualification/Fun_Qualification.local.inc.php');
-require_once(dirname(__FILE__).'/Res-ImportCommon.php');
-
-if(!CheckTourSession()) {
-	header('Content-Type: text/xml');
-	die('<response error="1"/>');
-}
-checkACL(AclISKServer, AclReadWrite,false);
-
-$Error=false;
-$Calls=array();
-if(isset($_REQUEST['data'])) {
-	foreach($_REQUEST['data'] as $data) {
-		$MatchNo=key($data);    $tmp=current($data);
-		$Event=key($tmp); 	    $tmp=current($tmp);
-		$Team=key($tmp);		$tmp=current($tmp);
-		$Type=key($tmp);		$tmp=current($tmp);
-		$Target=key($tmp);  	$tmp=current($tmp);
-		$Distance=key($tmp);	$tmp=current($tmp);
-		$End=key($tmp);
-		$Arrowstring=current($tmp);
-		//$tmp=each($data);
-		//$MatchNo=$tmp['key'];	$tmp=each($tmp['value']);
-		//$Event=$tmp['key']; 	$tmp=each($tmp['value']);
-		//$Team=$tmp['key'];		$tmp=each($tmp['value']);
-		//$Type=$tmp['key'];		$tmp=each($tmp['value']);
-		//$Target=$tmp['key'];	$tmp=each($tmp['value']);
-		//$Distance=$tmp['key'];	$tmp=each($tmp['value']);
-		//$End=$tmp['key'];
-		//$Arrowstring=$tmp['value'];
-
-		if($Event==':::') $Event='';
-		if($Target==':::') $Target='';
-
-		$SQL='';
-		switch($Type) {
-			case 'Q' :
-			case 'E' :
-				$SQL="select DISTINCT CONCAT('$Type',ToNumDist,{$Target[0]}) as keyValue, substr(IskDtTargetNo, -4, 3)+0 as Target
-					from IskData
-					inner join Tournament on IskDtTournament=ToId
-					where IskDtTournament={$_SESSION['TourId']}
-						and IskDtMatchNo=$MatchNo
-						and IskDtEvent='$Event'
-						and IskDtTeamInd=$Team
-						and IskDtType='$Type'
-						and IskDtTargetNo='$Target'
-						and IskDtDistance=$Distance
-						and IskDtEndNo=$End
-						and IskDtArrowstring='$Arrowstring'
-						";
-				$q=safe_r_sql($SQL);
-				while($r=safe_fetch($q)) {
-					$Calls[$r->Target]=array(
-						'ses'  => $r->keyValue,
-						'dist' => $Distance,
-						'end'  => $End,
-						'target' => $r->Target,
-					);
-				}
-				break;
-			case 'I':
-			case 'T':
-				$SQL="select DISTINCT CONCAT('$Type', FSScheduledDate, FSScheduledTime) as keyValue, FsMatchNo
-					from IskData
-					inner join FinSchedule on FsTournament=IskDtTournament and FsMatchNo=IskDtMatchNo and FsEvent=IskDtEvent and FsTeamEvent=IskDtTeamInd
-					where IskDtTournament={$_SESSION['TourId']}
-						and IskDtMatchNo=$MatchNo
-						and IskDtEvent='$Event'
-						and IskDtTeamInd=$Team
-						and IskDtType='$Type'
-						and IskDtTargetNo='$Target'
-						and IskDtDistance=$Distance
-						and IskDtEndNo=$End
-						and IskDtArrowstring='$Arrowstring'
-						";
-				$q=safe_r_sql($SQL);
-				while($r=safe_fetch($q)) {
-					if(isset($Calls["$Event-$Team"])) {
-						$Calls["$Event-$Team"]['matchno'].= ','.$MatchNo;
-					} else {
-						$Calls["$Event-$Team"]=array(
-							'ses'     => $r->keyValue,
-							'dist'    => $Distance,
-							'end'     => $End,
-							'event'   => $Event,
-							'matchno' => $MatchNo,
-						);
-					}
-				}
-				break;
-		}
-	}
-}
-
-foreach ($Calls as $Call) {
-	unset($_REQUEST['data']);
-	foreach($Call as $k=>$v) {
-		$_REQUEST[$k]=$v;
-	}
-	$Error=($Error or DoImportData());
-}
-
-header('Content-Type: text/xml');
-die('<response error="'.intval($Error).'"/>');
-
diff --git a/src/Api/ISK/Res-LoadTablets.php b/src/Api/ISK/Res-LoadTablets.php
deleted file mode 100644
index e5506c39..00000000
--- a/src/Api/ISK/Res-LoadTablets.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)).'/config.php');
-$Error=1;
-
-if(!CheckTourSession()) {
-	header('Content-Type: text/xml');
-	die('<response error="'.$Error.'"/>');
-}
-checkACL(AclISKServer, AclReadOnly,false);
-
-require_once('Common/Lib/Fun_Modules.php');
-
-$Sequence=$_REQUEST['ses'];
-$Dist=intval($_REQUEST['dist']);
-$End=intval($_REQUEST['end']);
-
-// fetches an array of alla available ends
-$EndsStatus=array();
-$TgtsStatus=array();
-$Targets=array();
-$Messages=array();
-$Payloads=array();
-$Out='';
-$AssignedDevices=array();
-switch($Sequence[0]) {
-	case 'Q':
-		// gets the targets
-		$SqlTargets="select distinct QuTarget Target from Entries inner join Qualifications on EnId=QuId and QuSession={$Sequence[2]} where EnTournament={$_SESSION['TourId']} order by Target";
-		$q=safe_r_sql($SqlTargets);
-		while($r=safe_Fetch($q)) {
-			$Targets[]=$r->Target;
-			$TgtsStatus[$r->Target]='';
-		}
-		// prepares an array with all the available ends and the values if any
-		$SQL="select AtTarget Target, AtLetter Letter, AtTargetNo
-			from AvailableTarget
-			left join (select QuTargetNo, EnTournament
-					from Qualifications
-					inner join Entries on EnId=QuId and EnTournament={$_SESSION['TourId']}
-			  		where QuSession={$Sequence[2]}
-					) Quals on AtTargetNo=QuTargetNo and AtTournament=EnTournament
-			where AtTournament={$_SESSION['TourId']} and AtSession={$Sequence[2]} and AtTarget in (".implode(',', $Targets).")
-			order by AtTargetNo";
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$Ends[$r->Target][$r->Letter]='';
-			$Payloads[$r->Target]='ses='.$Sequence.'&dist='.$Dist.'&end='.$End.'&target='.$r->Target;
-		}
-		$Error=0;
-		break;
-	case 'E':
-		// gets the targets
-		$Phase=$Sequence[1]-1;
-		$FieldEnds=($Phase ? 'EvE2Ends' : 'EvE1Ends');
-		$Session=$Sequence[2];
-
-		// gets all the targets
-		$SQL="select distinct ElTargetNo+0 as TargetNum, right(ElTargetNo, 1) Letter
-			from Eliminations
-			inner join Events on EvCode=ElEventCode and EvTournament=ElTournament and EvTeamEvent=0
-			where ElTournament={$_SESSION['TourId']} and ElElimPhase=$Phase and ElSession=$Session and ElTargetNo>''
-			order by (TargetNum-1)%$FieldEnds, ElTargetNo";
-
-		$q=safe_r_sql($SQL);
-		while($r=safe_Fetch($q)) {
-			$Ends[$r->TargetNum][$r->Letter]='';
-			$Payloads[$r->TargetNum]='ses='.$Sequence.'&dist='.$Sequence[2].'&end='.$End.'&target='.$r->TargetNum;
-		}
-		$Error=0;
-		break;
-	case 'I':
-		$Date=substr($Sequence, 1, 10);
-		$Time=substr($Sequence, 11);
-		$SQL="select *
-			from (select FsTarget+0 Target1, substr(FsLetter, length(FsTarget)+1, 1) Letter1, FsLetter FsLetter1, FsMatchNo FsMatchNo1, FsEvent FsEvent1
-				from FinSchedule
-				inner join Finals on FsEvent=FinEvent and FsTournament=FinTournament and FsMatchNo=FinMatchNo
-				left join Entries on FinAthlete=EnId
-				where FsTournament={$_SESSION['TourId']} and FsTarget>'' and FsTeamEvent=0 and FsScheduledDate='$Date' and FsScheduledTime='$Time' and FsMatchNo%2=0) tgt1
-			inner join (select FsTarget+0 Target2, substr(FsLetter, length(FsTarget)+1, 1) Letter2, FsLetter FsLetter2, FsMatchNo FsMatchNo2, FsEvent FsEvent2
-				from FinSchedule
-				inner join Finals on FsEvent=FinEvent and FsTournament=FinTournament and FsMatchNo=FinMatchNo
-				left join Entries on FinAthlete=EnId
-				where FsTournament={$_SESSION['TourId']} and FsTarget>'' and FsTeamEvent=0 and FsScheduledDate='$Date' and FsScheduledTime='$Time') tgt2
-				on FsEvent1=FsEvent2 and FsMatchNo2=FsMatchNo1+1
-			order by FsLetter1, Target1";
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$Tgt=($r->Target1==$r->Target2 ? $r->Target1 : "{$r->Target1}-{$r->Target2}");
-			$Ends[$Tgt][$r->Letter1 ? $r->Letter1 : 'A']='';
-			$Ends[$Tgt][$r->Letter2 ? $r->Letter2 : 'B']='';
-			$Payloads[$Tgt]='ses='.$Sequence.'&dist='.$Dist.'&end='.$End.'&event='.$r->FsEvent1.'&matchno='.$r->FsMatchNo1.','.$r->FsMatchNo2;
-		}
-		$Error=0;
-		break;
-	case 'T':
-		$Date=substr($Sequence, 1, 10);
-		$Time=substr($Sequence, 11);
-		$SQL="select *
-			from (select FsTarget+0 Target1, substr(FsLetter, length(FsTarget)+1, 1) Letter1, FsLetter FsLetter1, FsMatchNo FsMatchNo1, FsEvent FsEvent1
-				from FinSchedule
-				inner join TeamFinals on FsEvent=TfEvent and FsTournament=TfTournament and FsMatchNo=TfMatchNo
-				left join Countries on TfTeam=CoId and CoTournament=FsTournament
-				where FsTournament={$_SESSION['TourId']} and FsTarget>'' and FsTeamEvent=1 and FsScheduledDate='$Date' and FsScheduledTime='$Time' and FsMatchNo%2=0) tgt1
-			inner join (select FsTarget+0 Target2, substr(FsLetter, length(FsTarget)+1, 1) Letter2, FsLetter FsLetter2, FsMatchNo FsMatchNo2, FsEvent FsEvent2
-				from FinSchedule
-				inner join TeamFinals on FsEvent=TfEvent and FsTournament=TfTournament and FsMatchNo=TfMatchNo
-				left join Countries on TfTeam=CoId and CoTournament=FsTournament
-				where FsTournament={$_SESSION['TourId']} and FsTarget>'' and FsTeamEvent=1 and FsScheduledDate='$Date' and FsScheduledTime='$Time') tgt2
-				on FsEvent1=FsEvent2 and FsMatchNo2=FsMatchNo1+1
-			order by FsLetter1, Target1";
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$Tgt=($r->Target1==$r->Target2 ? $r->Target1 : "{$r->Target1}-{$r->Target2}");
-			$Ends[$Tgt][$r->Letter1 ? $r->Letter1 : 'A']='';
-			$Ends[$Tgt][$r->Letter2 && $r->Letter2!='A' ? $r->Letter2 : 'B']='';
-			$Payloads[$Tgt]='ses='.$Sequence.'&dist='.$Dist.'&end='.$End.'&event='.$r->FsEvent1.'&matchno='.$r->FsMatchNo1.','.$r->FsMatchNo2;
-		}
-		$Error=0;
-		break;
-	default:
-		header('Content-Type: text/xml');
-		die('<response error="'.$Error.'"/>');
-}
-
-// archers class, t= target class, d= devices assigned
-foreach($Ends as $Tgt => $Let) {
-	$Out.='<div class="TargetContainer"><div class="TargetTitle" value="'.$Payloads[$Tgt].'" id="t-'.$Tgt.'" title="'.get_text('IskTargetTitle', 'Api', $Tgt).'" ondblclick="seeTarget(this)"><span class="DisableSelection">'.get_text('IskTargetTitle', 'Api', $Tgt).'</span><img class="TargetInfoImg ContextMenuDiv" onClick="seeTarget(parentNode)"/></div>';
-	$Out.='<div class="TargetDevices">'.get_text('IskDeviceAssigned', 'Api').': <span id="d-'.$Tgt.'"></span></div>';
-	$Out.='<div class="TargetLetters">';
-	foreach($Let as $k => $v) {
-		$Out.='<span id="l-'.$Tgt.'-'.$k.'">'.$k.'</span>';
-	}
-	$Out.='</div>';
-	$Out.='<div class="TargetMessage" id="m-'.$Tgt.'"></div>';
-	$Out.='<div align="center"><input class="TgtImport ClickableDiv" id="i-'.$Tgt.'" type="button" onclick="dataImport(this)" value="'.get_text('CmdImport', 'Api').'"></div>';
-	$Out.='</div>';
-}
-
-$m='';
-$Locked=getModuleParameter('ISK', 'StickyEnds', array('SeqCode'=>$Sequence, 'Distance'=>$Dist, 'Ends'=>array()));
-
-if(!($Locked['SeqCode']==$Sequence and $Locked['Distance']==$Dist)) {
-	$m= get_text('StickyAlreadySet', 'Api');
-}
-
-header('Content-Type: text/xml');
-echo '<response error="'.$Error.'">';
-echo '<html><![CDATA['.$Out.']]></html>';
-echo '<sticky><![CDATA[';
-foreach(range(1, $_REQUEST['maxend']) as $i) {
-	echo $i.'<input onclick="toggleSticky(this)" type="checkbox" id="sticky['.$i.']"'.(($Locked['SeqCode']==$Sequence and $Locked['Distance']==$Dist and in_array($i, $Locked['Ends'])) ? ' checked="checked"' : '').'>&nbsp;&nbsp;';
-}
-
-echo ']]></sticky>';
-echo '<sm><![CDATA['.$m.']]></sm>';
-if(!empty($_SESSION['debug'])) {
-	echo '<debug><![CDATA['.$SQL.']]></debug>';
-}
-echo '</response>';
diff --git a/src/Api/ISK/Res-RemoveEnd.php b/src/Api/ISK/Res-RemoveEnd.php
deleted file mode 100644
index 39a420ad..00000000
--- a/src/Api/ISK/Res-RemoveEnd.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)).'/config.php');
-$Error=1;
-
-if(!CheckTourSession()) {
-	header('Content-Type: text/xml');
-	die('<response error="'.$Error.'"/>');
-}
-checkACL(AclISKServer, AclReadWrite,false);
-
-// data[23][RW][0][I][010B][0][6]=J
-// $popId="data[$r->IskDtMatchNo][$r->IskDtEvent][$r->IskDtTeamInd][$r->IskDtType][$r->IskDtTargetNo][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-
-if(isset($_REQUEST['data'])) {
-	foreach($_REQUEST['data'] as $data) {
-		//$tmp=each($data);
-		//$MatchNo=$tmp['key'];	$tmp=each($tmp['value']);
-		//$Event=$tmp['key']; 	$tmp=each($tmp['value']);
-		//$Team=$tmp['key'];		$tmp=each($tmp['value']);
-		//$Type=$tmp['key'];		$tmp=each($tmp['value']);
-		//$Target=$tmp['key'];	$tmp=each($tmp['value']);
-		//$Distance=$tmp['key'];	$tmp=each($tmp['value']);
-		//$End=$tmp['key'];
-		//$Arrowstring=$tmp['value'];
-		$MatchNo=key($data);    $tmp=current($data);
-		$Event=key($tmp); 	    $tmp=current($tmp);
-		$Team=key($tmp);		$tmp=current($tmp);
-		$Type=key($tmp);		$tmp=current($tmp);
-		$Target=key($tmp);  	$tmp=current($tmp);
-		$Distance=key($tmp);	$tmp=current($tmp);
-		$End=key($tmp);
-		$Arrowstring=current($tmp);
-
-		if($Event==':::') $Event='';
-		if($Target==':::') $Target='';
-
-		safe_w_sql("delete from IskData
-			where IskDtTournament={$_SESSION['TourId']}
-				and IskDtMatchNo=$MatchNo
-				and IskDtEvent='$Event'
-				and IskDtTeamInd=$Team
-				and IskDtType='$Type'
-				and IskDtTargetNo='$Target'
-				and IskDtDistance=$Distance
-				and IskDtEndNo=$End
-				and IskDtArrowstring='$Arrowstring'");
-	}
-	$Error=0;
-}
-
-header('Content-Type: text/xml');
-echo '<response error="'.$Error.'">';
-echo '</response>';
diff --git a/src/Api/ISK/Res-SeeTarget.php b/src/Api/ISK/Res-SeeTarget.php
deleted file mode 100644
index a527887b..00000000
--- a/src/Api/ISK/Res-SeeTarget.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)).'/config.php');
-$Error=1;
-$Out='';
-
-if(!CheckTourSession()) {
-	header('Content-Type: text/xml');
-	die('<response error="'.$Error.'"/>');
-}
-checkACL(AclISKServer, AclReadOnly,false);
-
-require_once('Common/Lib/Fun_Modules.php');
-require_once('Common/Lib/ArrTargets.inc.php');
-require_once('Common/Fun_Sessions.inc.php');
-
-// data[23][RW][0][I][010B][0][6]=J
-// $popId="data[$r->IskDtMatchNo][$r->IskDtEvent][$r->IskDtTeamInd][$r->IskDtType][$r->IskDtTargetNo][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-
-$MatchNo    = (isset($_REQUEST['matchno']) ? intval($_REQUEST['matchno']) : '0');
-$Event      = (isset($_REQUEST['event']) ? $_REQUEST['event'] : '');
-$Team       = (isset($_REQUEST['ses']) ? intval($_REQUEST['ses'][0]=='T') : '0');
-$Type       = (isset($_REQUEST['ses']) ? $_REQUEST['ses'][0] : '0');
-$Target     = (isset($_REQUEST['target']) ? $_REQUEST['ses'][2].str_pad($_REQUEST['target'], 3, '0', STR_PAD_LEFT) : '');
-$Distance   = (isset($_REQUEST['dist']) ? $_REQUEST['dist'] : '0');
-$End        = (isset($_REQUEST['end']) ? $_REQUEST['end'] : '0');
-$Arrowstring='';
-
-
-if(isset($_REQUEST['data'])) {
-	$SQL='';
-	//$tmp=each($_REQUEST['data']);
-	//$MatchNo=$tmp['key'];	$tmp=each($tmp['value']);
-	//$Event=$tmp['key']; 	$tmp=each($tmp['value']);
-	//$Team=$tmp['key'];		$tmp=each($tmp['value']);
-	//$Type=$tmp['key'];		$tmp=each($tmp['value']);
-	//$Target=$tmp['key'];	$tmp=each($tmp['value']);
-	//$Distance=$tmp['key'];	$tmp=each($tmp['value']);
-	//$End=$tmp['key'];
-	//$Arrowstring=$tmp['value'];
-	$MatchNo=key($data);    $tmp=current($data);
-	$Event=key($tmp); 	    $tmp=current($tmp);
-	$Team=key($tmp);		$tmp=current($tmp);
-	$Type=key($tmp);		$tmp=current($tmp);
-	$Target=key($tmp);  	$tmp=current($tmp);
-	$Distance=key($tmp);	$tmp=current($tmp);
-	$End=key($tmp);
-	$Arrowstring=current($tmp);
-
-	if($Event==':::') $Event='';
-	if($Target==':::') $Target='';
-}
-
-switch($Type) {
-	case 'Q':
-		// fetches all the scorings of the target for that end, distance and session
-		$Session=substr($Target, 0, 1);
-		$Obj=getArrowEnds($Session, $Distance, $_SESSION['TourId']);
-		$SQL="select IskData.*, EnFirstName, substring(AtTargetNo, -4, 3)+0 Target, right(AtTargetNo, 1) Letter, AtTargetNo, IskDtArrowstring, Arrowstring
-			from AvailableTarget
-			left join IskData on IskDtTargetNo=AtTargetNo and IskDtTournament={$_SESSION['TourId']} and IskDtType='Q' and IskDtDistance=$Distance and IskDtEndNo=$End
-			left join (select EnFirstName, QuTargetNo, QuD{$Distance}Arrowstring Arrowstring from Qualifications inner join Entries on EnId=QuId and EnTournament={$_SESSION['TourId']}) Ent on AtTargetNo=QuTargetNo
-			where AtTournament={$_SESSION['TourId']} and AtTargetNo+0=".intval($Target)."
-			order by AtTargetNo
-			";
-		$q=safe_r_sql($SQL);
-		if($r=safe_fetch($q)) {
-			$popId='';
-			$SpanArrows='';
-			$QuEnds=str_split($r->Arrowstring, $Obj[$Distance]['arrows']);
-			$arrows=array();
-			$QuArrows=DecodeFromString(rtrim($QuEnds[$End-1]), false, true);
-			if($r->IskDtEndNo) {
-				$popId="data[][$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-				$arrows=DecodeFromString($r->IskDtArrowstring, false, true);
-				if(!is_array($arrows)) $arrows=array($arrows);
-			}
-			for($i=0; $i<$Obj[$Distance]['arrows']; $i++) {
-				if(isset($arrows[$i])) {
-					$SpanArrows.='<div class="Let-Z">'.$arrows[$i].'</div>';
-				} else {
-					$SpanArrows.='<div class="Let-S"> </div>';
-				}
-				if(isset($QuArrows[$i])) {
-					$SpanArrows.='<div class="Let-B">'.$QuArrows[$i].'</div>';
-				} else {
-					$SpanArrows.='<div class="Let-S"> </div>';
-				}
-			}
-			$Out.='<div class="PopUpEvent">'.get_text('PopupStatusSession', 'Api', '<b>'.$Session.'</b>')
-				.' - '.get_text('PopupStatusDistance', 'Api', '<b>'.$Distance.'</b>')
-				.' - '.get_text('PopupStatusEnd', 'Api', '<b>'.$End.'</b>')
-				.'</div>';
-			$Out.='<div class="PopUpSpot" value="'.$popId.'"><div class="Let-G">'.$r->Letter.'</div><div class="SpanName">'.$r->EnFirstName.'</div> '.$SpanArrows.'</div>';
-			while($r=safe_fetch($q)) {
-				$popId='';
-				$SpanArrows='';
-				$QuEnds=str_split($r->Arrowstring, $Obj[$Distance]['arrows']);
-				$arrows=array();
-				$QuArrows=DecodeFromString(rtrim($QuEnds[$End-1]), false, true);
-				if($r->IskDtEndNo) {
-					$popId="data[][$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-					$arrows=DecodeFromString($r->IskDtArrowstring, false, true);
-					if(!is_array($arrows)) $arrows=array($arrows);
-				}
-				for($i=0; $i<$Obj[$Distance]['arrows']; $i++) {
-					if(isset($arrows[$i])) {
-						$SpanArrows.='<div class="Let-Z">'.$arrows[$i].'</div>';
-					} else {
-						$SpanArrows.='<div class="Let-S"> </div>';
-					}
-					if(isset($QuArrows[$i])) {
-						$SpanArrows.='<div class="Let-B">'.$QuArrows[$i].'</div>';
-					} else {
-						$SpanArrows.='<div class="Let-S"> </div>';
-					}
-				}
-				$Out.='<div class="PopUpSpot" value="'.$popId.'"><div class="Let-G">'.$r->Letter.'</div><div class="SpanName">'.$r->EnFirstName.'</div> '.$SpanArrows.'</div>';
-			}
-			$Error=0;
-		}
-		break;
-	case 'E':
-		$Phase=$_REQUEST['ses'][1]-1;
-		$Session=$_REQUEST['ses'][2];
-		$Target=$_REQUEST['target'];
-		$EndsField=($Phase==0 ? 'EvE1Ends' : 'EvE2Ends');
-		$ArrowsField=($Phase==0 ? 'EvE1Arrows' : 'EvE2Arrows');
-		// fetches all the scorings of the target for that end, distance and session
-		$SQL="select IskData.*, EnFirstName, ElTargetNo+0 Target, right(ElTargetNo, 1) Letter, ElTargetNo, $EndsField as Ends, $ArrowsField as Arrows, IskDtArrowstring, rpad(ElArrowstring, $EndsField*$ArrowsField, ' ') as Arrowstring
-			from Eliminations
-			inner join Events on EvCode=ElEventCode and EvTournament=ElTournament and EvTeamEvent=0
-			left join Entries on EnId=ElId and EnTournament=ElTournament
-			left join IskData on IskDtTargetNo=ElTargetNo and IskDtTournament={$_SESSION['TourId']} and IskDtType='E' and IskDtDistance=$Distance and IskDtEndNo=$End
-			where ElTournament={$_SESSION['TourId']} and ElTargetNo+0=".intval($Target)." and ElSession=$Session and ElElimPhase=$Phase
-			order by ElTargetNo
-			";
-		$q=safe_r_sql($SQL);
-		if($r=safe_fetch($q)) {
-			$popId='';
-			$SpanArrows='';
-			$QuEnds=str_split($r->Arrowstring, $r->Arrows);
-			$arrows=array();
-			$QuArrows=DecodeFromString(rtrim($QuEnds[$End-1]), false, true);
-			if($r->IskDtEndNo) {
-				$popId="data[][$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-				$arrows=DecodeFromString($r->IskDtArrowstring, false, true);
-				if(!is_array($arrows)) $arrows=array($arrows);
-			}
-			for($i=0; $i<$r->Arrows; $i++) {
-				if(isset($arrows[$i])) {
-					$SpanArrows.='<div class="Let-Z">'.$arrows[$i].'</div>';
-				} else {
-					$SpanArrows.='<div class="Let-S"> </div>';
-				}
-				if(isset($QuArrows[$i])) {
-					$SpanArrows.='<div class="Let-B">'.$QuArrows[$i].'</div>';
-				} else {
-					$SpanArrows.='<div class="Let-S"> </div>';
-				}
-			}
-			$Out.='<div class="PopUpEvent">'.get_text('PopupStatusSession', 'Api', '<b>'.$Session.'</b>')
-				.' - '.get_text('PopupStatusDistance', 'Api', '<b>'.$Distance.'</b>')
-				.' - '.get_text('PopupStatusEnd', 'Api', '<b>'.$End.'</b>')
-				.'</div>';
-			$Out.='<div class="PopUpSpot" value="'.$popId.'"><div class="Let-G">'.$r->Letter.'</div><div class="SpanName">'.$r->EnFirstName.'</div> '.$SpanArrows.'</div>';
-			while($r=safe_fetch($q)) {
-				$popId='';
-				$SpanArrows='';
-				$QuEnds=str_split($r->Arrowstring, $r->Arrows);
-				$arrows=array();
-				$QuArrows=DecodeFromString(rtrim($QuEnds[$End-1]), false, true);
-				if($r->IskDtEndNo) {
-					$popId="data[][$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-					$arrows=DecodeFromString($r->IskDtArrowstring, false, true);
-					if(!is_array($arrows)) $arrows=array($arrows);
-				}
-				for($i=0; $i<$r->Arrows; $i++) {
-					if(isset($arrows[$i])) {
-						$SpanArrows.='<div class="Let-Z">'.$arrows[$i].'</div>';
-					} else {
-						$SpanArrows.='<div class="Let-S"> </div>';
-					}
-					if(isset($QuArrows[$i])) {
-						$SpanArrows.='<div class="Let-B">'.$QuArrows[$i].'</div>';
-					} else {
-						$SpanArrows.='<div class="Let-S"> </div>';
-					}
-				}
-				$Out.='<div class="PopUpSpot" value="'.$popId.'"><div class="Let-G">'.$r->Letter.'</div><div class="SpanName">'.$r->EnFirstName.'</div> '.$SpanArrows.'</div>';
-			}
-			$Error=0;
-		}
-		break;
-	case 'I':
-		// fetches all the scorings regarding that event and matchno and teamevent and end
-		$m=$MatchNo.','.($MatchNo%2 ? $MatchNo-1 : $MatchNo+1);
-		$SQL="select IskData.*, EnFirstName, GrPhase, FsTarget+0 Target, substr(FsLetter, length(FsTarget)+1, 1) Letter, FinArrowstring ArrowString, EvFinalFirstPhase, EvCode
-			from FinSchedule
-			inner join Events on FsEvent=EvCode and FsTournament=EvTournament and EvTeamEvent=0
-			left join IskData on IskDtEvent=FsEvent and IskDtTournament=FsTournament and IskDtType='I' and IskDtMatchNo=FsMatchNo and IskDtEndNo=$End
-			left join Finals on FsEvent=FinEvent and FinMatchNo=FsMatchNo and FinTournament={$_SESSION['TourId']}
-			left join Entries on FinAthlete=EnId
-			left join Grids on FsMatchNo=GrMatchNo
-			where FsTournament={$_SESSION['TourId']} and FsEvent='$Event' and FsTeamEvent=$Team and FsMatchNo in ($m)
-			order by FsMatchNo";
-		$q=safe_r_sql($SQL);
-		if($r=safe_fetch($q)) {
-			$Obj=getEventArrowsParams($Event, $r->GrPhase, 0, $_SESSION['TourId']);
-
-			$popId='';
-			if($r->IskDtEndNo) {
-				$popId="data[][$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-			}
-			$SpanArrows='';
-			if($End) {
-				$DBarrows=DecodeFromString(rtrim(substr($r->ArrowString,($End-1)*$Obj->arrows, $Obj->arrows)), false, true);
-				$arrows=DecodeFromString($r->IskDtArrowstring, false, true);
-
-				for($k=0; $k<$Obj->arrows; $k++) {
-					$Cl='B';
-					if(isset($arrows[$k])) {
-						$SpanArrows.='<div class="Let-Z">'.$arrows[$k].'</div>';
-					} else {
-						$SpanArrows.='<div class="Let-S"> </div>';
-					}
-					if(isset($DBarrows[$k])) {
-						if(isset($arrows[$k]) and $arrows[$k]!=$DBarrows[$k]) {
-							$Cl='B';
-						}
-						$SpanArrows.='<div class="Let-'.$Cl.'">'.$DBarrows[$k].'</div>';
-					} else {
-						$SpanArrows.='<div class="Let-S"> </div>';
-					}
-				}
-			}
-			$Out.='<div class="PopUpEvent">'.get_text('PopupStatusEvent', 'Api', '<b>'.$Event.'</b>')
-				.' - '.get_text('PopupStatusPhase', 'Api', '<b>'.get_text(namePhase($r->EvFinalFirstPhase,$r->GrPhase).'_Phase').'</b>')
-				.' - '.get_text('PopupStatusEnd', 'Api', '<b>'.$End.'</b>')
-				.'</div>';
-			$Let='A';
-			$Out.='<div class="PopUpSpot" value="'.$popId.'"><div class="Let-G">'.($Let++).'</div><div class="SpanName">'.$r->EnFirstName.'</div> '.$SpanArrows.'</div>';
-			while($r=safe_fetch($q)) {
-				$SpanArrows='';
-				$popId='';
-				if($r->IskDtEndNo) {
-					$popId="data[][$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-				}
-				if($End) {
-					$DBarrows=DecodeFromString(rtrim(substr($r->ArrowString,($End-1)*$Obj->arrows, $Obj->arrows)), false, true);
-					$arrows=DecodeFromString($r->IskDtArrowstring, false, true);
-
-					for($k=0; $k<$Obj->arrows; $k++) {
-						$Cl='B';
-						if(isset($arrows[$k])) {
-							$SpanArrows.='<div class="Let-Z">'.$arrows[$k].'</div>';
-						} else {
-							$SpanArrows.='<div class="Let-S"> </div>';
-						}
-						if(isset($DBarrows[$k])) {
-							if(isset($arrows[$k]) and $arrows[$k]!=$DBarrows[$k]) {
-								$Cl='B';
-							}
-							$SpanArrows.='<div class="Let-'.$Cl.'">'.$DBarrows[$k].'</div>';
-						} else {
-							$SpanArrows.='<div class="Let-S"> </div>';
-						}
-					}
-				}
-				$Out.='<div class="PopUpSpot" value="'.$popId.'"><div class="Let-G">'.($Let++).'</div><div class="SpanName">'.$r->EnFirstName.'</div> '.$SpanArrows.'</div>';
-			}
-			$Error=0;
-		}
-		break;
-	case 'T':
-		$m=$MatchNo.','.($MatchNo%2 ? $MatchNo-1 : $MatchNo+1);
-		$SQL="select IskData.*, concat(CoCode,'-',CoName) Country, GrPhase, FsTarget+0 Target, substr(FsLetter, length(FsTarget)+1, 1) Letter, TfArrowstring ArrowString, EvFinalFirstPhase, EvCode
-
-			from FinSchedule
-			inner join Events on FsEvent=EvCode and FsTournament=EvTournament and EvTeamEvent=1
-			left join IskData on IskDtEvent=FsEvent and IskDtTournament=FsTournament and IskDtType='T' and IskDtMatchNo=FsMatchNo and IskDtEndNo=$End
-			left join TeamFinals on FsEvent=TfEvent and TfMatchNo=FsMatchNo and TfTournament={$_SESSION['TourId']}
-			left join Countries on TfTeam=CoId and COTournament={$_SESSION['TourId']}
-			left join Grids on FsMatchNo=GrMatchNo
-			where FsTournament={$_SESSION['TourId']} and FsEvent='$Event' and FsTeamEvent=$Team and FsMatchNo in ($m)
-			order by FsMatchNo";
-		$q=safe_r_sql($SQL);
-		if($r=safe_fetch($q)) {
-			$Obj=getEventArrowsParams($Event, $r->GrPhase, 1, $_SESSION['TourId']);
-
-			$popId='';
-			if($r->IskDtEndNo) {
-				$popId="data[][$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-			}
-			$SpanArrows='';
-			if($End) {
-				$DBarrows=DecodeFromString(rtrim(substr($r->ArrowString,($End-1)*$Obj->arrows, $Obj->arrows)), false, true);
-				$arrows=DecodeFromString($r->IskDtArrowstring);
-				if(!is_array($arrows)) $arrows=array($arrows);
-
-				for($k=0; $k<$Obj->arrows; $k++) {
-					$Cl='B';
-					if(isset($arrows[$k])) {
-						$SpanArrows.='<div class="Let-Z">'.$arrows[$k].'</div>';
-					} else {
-						$SpanArrows.='<div class="Let-S"></div>';
-					}
-					if(isset($DBarrows[$k])) {
-						if(isset($arrows[$k]) and $arrows[$k]!=$DBarrows[$k]) {
-							$Cl='B';
-						}
-						$SpanArrows.='<div class="Let-'.$Cl.'">'.$DBarrows[$k].'</div>';
-					} else {
-						$SpanArrows.='<div class="Let-S"></div>';
-					}
-				}
-			}
-
-			$Out.='<div class="PopUpEvent">'.get_text('PopupStatusEvent', 'Api', '<b>'.$Event.'</b>')
-				.' - '.get_text('PopupStatusPhase', 'Api', '<b>'.get_text($r->GrPhase.'_Phase').'</b>')
-				.' - '.get_text('PopupStatusEnd', 'Api', '<b>'.$End.'</b>')
-				.'</div>';
-			$Let='A';
-			$Out.='<div class="PopUpSpot" value="'.$popId.'"><div class="Let-G">'.($Let++).'</div><div class="SpanName">'.$r->Country.'</div> '.$SpanArrows.'</div>';
-			while($r=safe_fetch($q)) {
-				$popId='';
-				if($r->IskDtEndNo) {
-					$popId="data[][$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-				}
-				$SpanArrows='';
-				if($End) {
-					$DBarrows=DecodeFromString(rtrim(substr($r->ArrowString,($End-1)*$Obj->arrows, $Obj->arrows)), false, true);
-					$arrows=DecodeFromString($r->IskDtArrowstring, false, true);
-
-					for($k=0; $k<$Obj->arrows; $k++) {
-						$Cl='B';
-						if(isset($arrows[$k])) {
-							$SpanArrows.='<div class="Let-Z">'.$arrows[$k].'</div>';
-						} else {
-							$SpanArrows.='<div class="Let-S"></div>';
-						}
-						if(isset($DBarrows[$k])) {
-							if(isset($arrows[$k]) and $arrows[$k]!=$DBarrows[$k]) {
-								$Cl='B';
-							}
-							$SpanArrows.='<div class="Let-'.$Cl.'">'.$DBarrows[$k].'</div>';
-						} else {
-							$SpanArrows.='<div class="Let-S"></div>';
-						}
-					}
-				}
-				$Out.='<div class="PopUpSpot" value="'.$popId.'"><div class="Let-G">'.($Let++).'</div><div class="SpanName">'.$r->Country.'</div> '.$SpanArrows.'</div>';
-			}
-			$Error=0;
-		}
-		break;
-}
-
-
-header('Content-Type: text/xml');
-echo '<response error="0">';
-echo '<html><![CDATA['.$Out.']]></html>';
-echo '</response>';
diff --git a/src/Api/ISK/Res-ToggleSticky.php b/src/Api/ISK/Res-ToggleSticky.php
deleted file mode 100644
index ddbe7d9d..00000000
--- a/src/Api/ISK/Res-ToggleSticky.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)).'/config.php');
-$Error=1;
-
-if(!CheckTourSession()) {
-	header('Content-Type: text/xml');
-	die('<response error="'.$Error.'"/>');
-}
-checkACL(AclISKServer, AclReadWrite,false);
-
-require_once('Common/Lib/Fun_Modules.php');
-
-$Out='';
-
-$Sequence=$_REQUEST['ses'];
-$Dist=intval($_REQUEST['dist']);
-$StickyFieldKey=key($_REQUEST['sticky']);
-$StickyFieldValue=current($_REQUEST['sticky']);
-
-$Sticky=getModuleParameter('ISK', 'StickyEnds', array('SeqCode'=>$Sequence, 'Distance'=>$Dist, 'Ends'=>array()));
-
-// can only modify sticky ends in the current session and distance
-if($Sticky['SeqCode']==$Sequence and $Sticky['Distance']==$Dist) {
-	if($StickyFieldValue and !in_array($StickyFieldKey, $Sticky['Ends'])) {
-		$Sticky['Ends'][]=$StickyFieldKey;
-	} elseif(in_array($StickyFieldKey, $Sticky['Ends'])) {
-		unset($Sticky['Ends'][array_search($StickyFieldKey, $Sticky['Ends'])]);
-	}
-	if(empty($Sticky['Ends'])) {
-		delModuleParameter('ISK', 'StickyEnds');
-	} else {
-		setModuleParameter('ISK', 'StickyEnds', $Sticky);
-	}
-	$Out.='<sm><![CDATA[]]></sm>';
-	$Error=0;
-} else {
-	$Out.='<sm><![CDATA['.get_text('StickyAlreadySet', 'Api').']]></sm>';
-}
-
-header('Content-Type: text/xml');
-echo '<response error="'.$Error.'">';
-echo $Out;
-echo '</response>';
diff --git a/src/Api/ISK/Res-UpdateTablets.php b/src/Api/ISK/Res-UpdateTablets.php
deleted file mode 100644
index 16ccdc8f..00000000
--- a/src/Api/ISK/Res-UpdateTablets.php
+++ /dev/null
@@ -1,792 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)).'/config.php');
-require_once(dirname(__FILE__).'/Lib.php');
-$Error=1;
-
-if(!CheckTourSession()) {
-	header('Content-Type: text/xml');
-	die('<response error="'.$Error.'"/>');
-}
-checkACL(AclISKServer, AclReadOnly,false);
-
-require_once('Common/Lib/Fun_Modules.php');
-
-$Sequence=$_REQUEST['ses'];
-$Dist=intval($_REQUEST['dist']);
-$End=intval($_REQUEST['end']);
-
-// fetches an array of all available ends
-$Ends=array();
-$EndsStatus=array();
-$TgtsStatus=array();
-$Targets=array();
-$Messages=array();
-$Payloads=array();
-$Out='';
-$Msg='';
-$AssignedDevices=array();
-$MatchOvers=array();
-$ShowImport=array();
-$Anomalies=array();
-
-
-switch($Sequence[0]) {
-	case 'Q':
-		// gets the targets
-		$SQL="select distinct AtTarget Target, AtLetter Letter, AtTargetNo
-			from Entries 
-			inner join Qualifications on QuId=EnId and QuSession={$Sequence[2]} and QuTarget>0
-			inner join AvailableTarget on QuTarget=AtTarget and QuSession=AtSession and AtTournament=EnTournament
-			where EnTournament={$_SESSION['TourId']}
-			order by AtTargetNo";
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$Ends[$r->Target][$r->Letter]='G';
-			$TgtsStatus[$r->Target]='';
-		}
-
-		$SQL="select distinct QuTarget Target, QuLetter Letter, QuTargetNo, QuD{$Dist}ArrowString as Arrowstring, DiArrows, concat(EnDivision, EnClass) as Category
-			from Entries
-			inner join Qualifications on QuId=EnId and QuSession=$Sequence[2] and QuTarget>0
-			left join DistanceInformation on DiType='Q' and DiDistance=$Dist and DiSession={$Sequence[2]} and DiTournament={$_SESSION['TourId']}
-			where EnStatus<=1 and EnTournament={$_SESSION['TourId']}
-			order by QuTargetNo";
-
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$Ends[$r->Target][$r->Letter]='';
-			$Payloads[$r->Target]='ses='.$Sequence.'&dist='.$Dist.'&end='.$End.'&target='.$r->Target;
-			$arrows=strlen(str_replace(' ', '', substr($r->Arrowstring, ($End-1)*$r->DiArrows, $r->DiArrows)));
-			if(is_null($r->Arrowstring)) {
-				$Ends[$r->Target][$r->Letter]='G'; // Gray, not used
-			} elseif($arrows==$r->DiArrows) {
-				$Ends[$r->Target][$r->Letter]='B'; // Blue, OK
-				if($TgtsStatus[$r->Target]!='C') $TgtsStatus[$r->Target]='B';
-			} elseif($arrows) {
-				$Ends[$r->Target][$r->Letter]='C'; // Cyan, missing arrows
-				$TgtsStatus[$r->Target]='C';
-			}
-			$Anomalies[$r->Target][$r->Letter]=preg_match('/ /sim', rtrim($r->Arrowstring));
-		}
-
-		// check which device should be attached to which target
-		$SQL="Select IskDvCode, IskDvTarget+0 IntTarget from IskDevices where IskDvTournament={$_SESSION['TourId']} and IskDvState>0";
-// 		$Out.='<q><![CDATA['.$SQL.']]></q>';
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			if(!isset($TgtsStatus[$r->IntTarget])) {
-				// device is not involved on this...
-				continue;
-			}
-			if(empty($AssignedDevices[$r->IntTarget]) or !in_array($r->IskDvCode, $AssignedDevices[$r->IntTarget])) {
-				$AssignedDevices[$r->IntTarget][]=$r->IskDvCode;
-			}
-		}
-
-		// check if the devices have sent something to the targets
-		$SQL="Select IskData.*, FsTarget+0 FsTarget, concat(FsScheduledDate, ' ', FsScheduledTime) Scheduled, DiArrows, substring(IskDtTargetNo, -4, 3)+0 Target, right(IskDtTargetNo, 1) Letter, trim(IskDtArrowstring) Arrowstring, IskDvCode, (IskDtType='Q' and left(IskDtTargetNo,1)={$Sequence[2]} and IskDtDistance=$Dist) CorrectSession, IskDvTarget
-				from IskData
-				left join FinSchedule on FsTournament={$_SESSION['TourId']} and FsMatchNo=IskDtMatchNo and FsEvent=IskDtEvent and FsTeamEvent=0
-				left join DistanceInformation on DiType='Q' and DiDistance=$Dist and DiSession={$Sequence[2]} and DiTournament={$_SESSION['TourId']}
-				left join IskDevices on IskDvTournament=IskDtTournament and IskDvState>0 and IskDvDevice=IskDtDevice
-				where IskDtTournament={$_SESSION['TourId']}
-				order by IskDtTargetNo, IskDtEndNo
-				";
-// 		$Out.='<q><![CDATA['.$SQL.']]></q>';
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$SkipRest=false;
-			$popId="data[$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? substr($r->IskDtTargetNo, 0, 4) : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=1";
-			// check the correct code of device
-			$r->IskDvCode=($r->IskDvCode ? $r->IskDvCode : 'Unknown');
-			$GroupTargets=getGroupedTargets($r->IskDvTarget, $Sequence[2], 'Q', '', true);
-
-
-			// readdress the correct target for matches
-			if($r->IskDtType!='Q' and $r->IskDtType!='E') {
-				$r->Target=intval($r->IskDtTargetNo);
-			}
-			if(!$r->IskDvCode) {
-				// device is not known...
-				$Msg.='<div>'.get_text('IskUnknownDevice', 'Api', $r->Target ? $r->Target : $r->FsTarget).'</div>';
-			}
-			if(!isset($TgtsStatus[$r->Target]) and !in_array($r->Target, $GroupTargets)) {
-				// device is not involved on this... but is sending scores
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target ? $r->Target : $r->FsTarget).'" value="'.$popId.'">'.get_text('IskSpuriousDevice', 'Api', array($r->IskDvCode, $r->Target ? $r->Target : $r->FsTarget)).'</div>';
-				$SkipRest=true;
-			}
-			if(!$r->CorrectSession) {
-				// device is not sending Qualification scores
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target ? $r->Target : $r->FsTarget).'" value="'.$popId.'">'.get_text('IskSpuriousScore-Device', 'Api', array($r->IskDvCode, $r->Target ? $r->Target : $r->FsTarget, $r->IskDtType . ' '.(strstr('EQ', $r->IskDtType) ? ($r->IskDtTargetNo[0] . ' ' . $r->IskDtDistance) : $r->IskDtEvent . ' '. $r->IskDtMatchNo. ' ('.$r->Scheduled.')'))).'</div>';
-				$SkipRest=true;
-			}
-			if($SkipRest) {
-				continue;
-			}
-// 			if($r->Arrowstring) {
-				// actually scoring something
-				switch(true) {
-					case ($Ends[$r->Target][$r->Letter]=='G'): // this Position should not score at all!!!
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->Letter . '</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['Empty']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['Empty'])) $Messages[$r->Target][$r->IskDvCode]['Empty'][]=$span;
-						$TgtsStatus[$r->Target]='R';
-						break;
-					case ($r->IskDtEvent): // scoring on another session!
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtEvent . '</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['Match']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['Match'])) $Messages[$r->Target][$r->IskDvCode]['Match'][]=$span;
-						$Ends[$r->Target][$r->Letter]='R'; // Red, error condition
-						$TgtsStatus[$r->Target]='R';
-						break;
-					case ($r->IskDtDistance!=$Dist): // scoring on a different distance
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtDistance . '</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['Distance']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['Distance'])) $Messages[$r->Target][$r->IskDvCode]['Distance'][]=$span;
-						$Ends[$r->Target][$r->Letter]='R'; // Red, error condition
-						$TgtsStatus[$r->Target]='R';
-						break;
-					case ($r->IskDtEndNo!=$End):
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtEndNo . '</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['End']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['End'])) {
-							$Messages[$r->Target][$r->IskDvCode]['End'][]=$span;
-						}
-// 						$Ends[$r->Target][$r->Letter]='O'; // Orange, error condition
-						if($TgtsStatus[$r->Target]!='R') $TgtsStatus[$r->Target]='O';
-						break;
-					case ($r->IskDvTarget!=$r->Target and !in_array($r->Target, $GroupTargets)):
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtEndNo . '</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['End']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['End'])) {
-							$Messages[$r->Target][$r->IskDvCode]['End'][]=$span;
-						}
-// 						$Ends[$r->Target][$r->Letter]='O'; // Orange, error condition
-						if($TgtsStatus[$r->Target]!='R') $TgtsStatus[$r->Target]='O';
-						break;
-					case (strlen(str_replace(' ', '', $r->Arrowstring))!=$r->DiArrows):
-						$Ends[$r->Target][$r->Letter]='Z'; // Yellow, score in progress
-						$ShowImport[$r->Target]=true;
-						if($TgtsStatus[$r->Target]!='R' and $TgtsStatus[$r->Target]!='O') {
-							$TgtsStatus[$r->Target]='Z';
-						}
-						break;
-					default:
-						$Ends[$r->Target][$r->Letter]='Y'; // Yellow, score finished
-						$ShowImport[$r->Target]=true;
-						if(!$TgtsStatus[$r->Target] or $TgtsStatus[$r->Target]=='C' or $TgtsStatus[$r->Target]=='B') {
-							$TgtsStatus[$r->Target]='Y';
-						}
-				}
-// 			}
-		}
-		foreach($Ends as $t => $l) {
-			if(empty($ShowImport[$t]) or $TgtsStatus[$t]!='Y') continue;
-			$status=true;
-			foreach($l as $l1) {
-				$status=($status and ($l1=='Y' or $l1=='G'));
-			}
-			if(!$status) $TgtsStatus[$t]='Z';
-		}
-		$Error=0;
-		break;
-	case 'E':
-		$Error=0;
-		$Phase=$Sequence[1]-1;
-		$Session=$Sequence[2];
-
-		// gets all the targets
-		$SqlTargets="select distinct ElId, ElTargetNo+0 as Target, right(ElTargetNo, 1) Letter, ElTargetNo, ElArrowstring as Arrowstring, if(ElElimPhase=0, EvE1Ends, EvE2Ends) as Ends, if(ElElimPhase=0, EvE1Arrows, EvE2Arrows) as Arrows, EvCode Category
-			from Eliminations
-			inner join Events on EvCode=ElEventCode and EvTournament=ElTournament and EvTeamEvent=0
-			where ElTournament={$_SESSION['TourId']} and ElElimPhase=$Phase and ElSession=$Session and ElTargetNo>''
-			order by (Target-1)%if(ElElimPhase=0, EvE1Ends, EvE2Ends)";
-		$q=safe_r_sql($SqlTargets);
-		$Open=safe_num_rows($q);
-		$Total=0;
-		while($r=safe_Fetch($q)) {
-			if(!isset($TgtsStatus[$r->Target])) $TgtsStatus[$r->Target]='';
-
-			if(empty($ImportableCategories[$r->Category])) $ImportableCategories[$r->Category]=0;
-			$ImportableCategories[$r->Category]++;
-			$Ends[$r->Target][$r->Letter]='B';
-			$Payloads[$r->Target]='ses='.$Sequence.'&dist='.$Dist.'&end='.$End.'&target='.$r->Target;
-			//$Payloads[$r->Target]='group=group_'.$Group.'&end='.$End.'&target='.$r->Target;
-			$arrows=strlen(str_replace(' ', '', substr($r->Arrowstring, ($End-1)*$r->Arrows, $r->Arrows)));
-			if(!$r->ElId) {
-				$Ends[$r->Target][$r->Letter]='G'; // black, not used
-				$Open--;
-			} elseif(strlen(str_replace(' ', '', $r->Arrowstring))==$r->Arrows*$r->Ends) {
-				$Ends[$r->Target][$r->Letter]='F'; // Grayed out, finished the scoring
-				$Total++;
-			} elseif($End) {
-				if($arrows==$r->Arrows) {
-					$Ends[$r->Target][$r->Letter]='B'; // Blue, OK
-					$ImportableCategories[$r->Category]--;
-					$Total++;
-					if($TgtsStatus[$r->Target]!='C') $TgtsStatus[$r->Target]='B';
-				} elseif($arrows) {
-					$Ends[$r->Target][$r->Letter]='C'; // Cyan, missing arrows
-					$TgtsStatus[$r->Target]='C';
-				}
-			}
-			// no anomalies as in field everybody scores at any distance in the same time!
-// 			$Anomalies[$r->Target][$r->Letter]=preg_match('/ /sim', rtrim($r->Arrowstring));
-		}
-
-		// check which device should be attached to which target
-		$SQL="Select IskDvCode, IskDvDevice, IskDvTarget+0 IntTarget from IskDevices where IskDvTournament={$_SESSION['TourId']} and IskDvProActive>0 and IskDvSchedKey=".StrSafe_DB($Sequence);
-// 		$Out.='<q><![CDATA['.$SQL.']]></q>';
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			if(!isset($TgtsStatus[$r->IntTarget])) {
-				// device is not involved on this...
-				continue;
-			}
-
-			$span='<span device="'.$r->IskDvDevice.'" group="'.$Group.'">'.$r->IskDvCode.'</span>';
-			if(empty($AssignedDevices[$r->IntTarget]) or !in_array($span, $AssignedDevices[$r->IntTarget])) {
-				$AssignedDevices[$r->IntTarget][]=$span;
-			}
-		}
-
-		//// check if the devices have sent something to the targets in the correct session!
-		//$SQL="select IskData.*, IskDvCode,
-		//			IskDtTargetNo+0 as Target,
-		//			right(IskDtTargetNo, 1) as Letter,
-		//			trim(IskDtArrowstring) Arrowstring,
-		//			if(ElElimPhase=0, EvE1Arrows, EvE2Arrows) as DiArrows,
-		//			EvCode as Category
-		//		from IskData
-		//		inner join IskDevices on IskDvTournament=IskDtTournament and IskDvProActive>0 and IskDvDevice=IskDtDevice and IskDvSchedKey=".StrSafe_DB($Sequence)." and IskDvGroup=$Group
-		//		inner join Eliminations on ElTournament=IskDtTournament and ElSession=$Session and ElElimPhase=$Phase and ElTargetNo=IskDtTargetNo
-		//		inner join Events on EvTournament=IskDtTournament and EvCode=ElEventCode and EvTeamEvent=0
-		//		where IskDtTournament={$_SESSION['TourId']} and IskDtEndNo={$End} and IskDtSession=$Session and IskDtType='E{$IskSequence['maxdist']}'
-		//		";
-		//$JSON['sql'][]=$SQL;
-		//$q=safe_r_sql($SQL);
-		//while($r=safe_fetch($q)) {
-		//	$popId="data[$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? intval($r->IskDtTargetNo) : ':::')."][$r->IskDtDistance][$r->IskDtEndNo][$Session]=1";
-		//	// scoring in the correct place
-		//	switch(true) {
-		//		case ($Ends[$r->Target][$r->Letter]=='G'): // this Position should not score at all!!!
-		//			$Messages[$r->Target][$r->IskDvCode]['Empty'][]='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->Letter . '</span>';
-		//			$TgtsStatus[$r->Target]='R';
-		//			break;
-		//		case (strlen(str_replace(' ', '', $r->Arrowstring))!=$r->DiArrows):
-		//			$Ends[$r->Target][$r->Letter]='Z'; // Yellow, score in progress
-		//			$ShowImport[$r->Target]=true;
-		//			if($TgtsStatus[$r->Target]!='R' and $TgtsStatus[$r->Target]!='O') {
-		//				$TgtsStatus[$r->Target]='Z';
-		//			}
-		//			break;
-		//		default:
-		//			$Ends[$r->Target][$r->Letter]='Y'; // Yellow, score finished
-		//			$Total++;
-		//			$Categories2Import[$r->Category]=true;
-		//			$ImportableCategories[$r->Category]--;
-		//			$ShowImport[$r->Target]=true;
-		//			if(!$TgtsStatus[$r->Target] or $TgtsStatus[$r->Target]=='C' or $TgtsStatus[$r->Target]=='B') {
-		//				$TgtsStatus[$r->Target]='Y';
-		//			}
-		//	}
-		//}
-
-		//// check if something strange is sent from the devices suppose to score this group
-		//$SQL="select IskData.*, IskDvCode, IskDvTarget, (IskDvSchedKey=".StrSafe_DB($Sequence).") as CorrectSession,
-		//			IskDtTargetNo+0 as Target,
-		//			right(IskDtTargetNo, 1) as Letter,
-		//			trim(IskDtArrowstring) Arrowstring,
-		//			if(ElElimPhase=0, EvE1Arrows, EvE2Arrows) as DiArrows,
-		//			EvCode as Category,
-		//			concat(FsScheduledDate, ' ', FsScheduledTime) Scheduled,
-		//			FsTarget+0 FsTarget
-		//		from IskData
-		//		inner join IskDevices on IskDvTournament=IskDtTournament and IskDvProActive>0 and IskDvDevice=IskDtDevice and IskDvGroup=$Group
-		//		inner join Eliminations on ElTournament=IskDtTournament and ElSession=$Session and ElElimPhase=$Phase and ElTargetNo=IskDtTargetNo
-		//		inner join Events on EvTournament=IskDtTournament and EvCode=ElEventCode and EvTeamEvent=0
-		//		left join FinSchedule on FsTournament={$_SESSION['TourId']} and FsMatchNo=IskDtMatchNo and FsEvent=IskDtEvent and FsTeamEvent=0
-		//		where IskDtTournament={$_SESSION['TourId']} and not (IskDtEndNo={$End} and IskDtSession=$Session and IskDtType='E{$IskSequence['maxdist']}')
-		//		";
-		//
-		//$JSON['sql'][]=$SQL;
-		//$q=safe_r_sql($SQL);
-		//while($r=safe_fetch($q)) {
-		//	$SkipRest=false;
-		//	$popId="data[$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? intval($r->IskDtTargetNo) : ':::')."][$r->IskDtDistance][$r->IskDtEndNo][$Session]=1";
-		//	// check the correct code of device
-		//	$r->IskDvCode=($r->IskDvCode ? $r->IskDvCode : 'Unknown');
-		//
-		//	// readdress the correct target for matches
-		//	if($r->IskDtType!='Q' and $r->IskDtType[0]!='E') {
-		//		$r->Target=intval($r->IskDtTargetNo);
-		//	}
-		//	if(!$r->IskDvCode) {
-		//		// device is not known...
-		//		$Msg.='<div>'.get_text('IskUnknownDevice', 'Api', $r->Target ? $r->Target : $r->FsTarget).'</div>';
-		//	}
-		//	if(!isset($TgtsStatus[$r->Target])) {
-		//		// device is not involved on this... but is sending scores
-		//		$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target ? $r->Target : $r->FsTarget).'" value="'.$popId.'">'.get_text('IskSpuriousDevice', 'Api', array($r->IskDvCode, $r->Target ? $r->Target : $r->FsTarget)).'</div>';
-		//		$SkipRest=true;
-		//	}
-		//	if(!$r->CorrectSession) {
-		//		// device is not sending Elimination scores of this phase and session
-		//		$Msg.='<div ondblclick="seeTarget(this)" title="'
-		//			.get_text('IskTargetTitle', 'Api', $r->Target ? $r->Target : $r->FsTarget).'" value="'.$popId.'">'
-		//			.get_text('IskSpuriousScore-Device', 'Api', array($r->IskDvCode, $r->Target ? $r->Target : $r->FsTarget, $r->IskDtType . ' '
-		//				.(strstr('EQ', $r->IskDtType) ? ($r->IskDtTargetNo[0] . ' ' . $r->IskDtDistance) : $r->IskDtEvent . ' '. $r->IskDtMatchNo. ' ('.$r->Scheduled.')')))
-		//			.'</div>';
-		//		$SkipRest=true;
-		//	}
-		//	if($SkipRest) {
-		//		continue;
-		//	}
-		//	switch(true) {
-		//		case ($Ends[$r->Target][$r->Letter]=='G'): // this Position should not score at all!!!
-		//			$Messages[$r->Target][$r->IskDvCode]['Empty'][]='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->Letter . '</span>';
-		//			$TgtsStatus[$r->Target]='R';
-		//			break;
-		//		case ($r->IskDtEvent): // scoring on another session!
-		//			$Messages[$r->Target][$r->IskDvCode]['Match'][]='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtEvent . '</span>';
-		//			$Ends[$r->Target][$r->Letter]='R'; // Red, error condition
-		//			$TgtsStatus[$r->Target]='R';
-		//			break;
-		//		case ($r->IskDtDistance!=$IskSequence['distance']): // scoring on a different distance
-		//			$Messages[$r->Target][$r->IskDvCode]['Distance'][]='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtDistance . '</span>';
-		//			$Ends[$r->Target][$r->Letter]='R'; // Red, error condition
-		//			$TgtsStatus[$r->Target]='R';
-		//			break;
-		//		case ($r->IskDtEndNo!=$End):
-		//			$tmp='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtEndNo . '</span>';
-		//			if(empty($Messages[$r->Target][$r->IskDvCode]['End']) or !in_array($tmp, $Messages[$r->Target][$r->IskDvCode]['End'])) {
-		//				$Messages[$r->Target][$r->IskDvCode]['End'][]=$tmp;
-		//			}
-		//			if($TgtsStatus[$r->Target]!='R') $TgtsStatus[$r->Target]='O';
-		//			break;
-		//		case ($r->IskDvTarget!=$r->Target):
-		//			$Messages[$r->Target][$r->IskDvCode]['End'][]='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtEndNo . '</span>';
-		//			if($TgtsStatus[$r->Target]!='R') $TgtsStatus[$r->Target]='O';
-		//			break;
-		//	}
-		//}
-		foreach($Ends as $t => $l) {
-			if(empty($ShowImport[$t]) or $TgtsStatus[$t]!='Y') continue;
-			$status=true;
-			foreach($l as $l1) {
-				$status=($status and ($l1=='Y' or $l1=='G' or $l1=='F'));
-			}
-			if(!$status) $TgtsStatus[$t]='Z';
-		}
-		$Error=0;
-		break;
-	case 'I':
-		$MatchTarget=array();
-		$TargetsInvolved=array();
-		$Date=substr($Sequence, 1, 10);
-		$Time=substr($Sequence, 11);
-		// Gets the targets involved
-		$SQL="select tgt1.*, tgt2.*,
-				if(GrPhase1 & EvMatchArrowsNo, EvElimArrows, EvFinArrows) Arrows, if(GrPhase1 & EvMatchArrowsNo, EvElimEnds, EvFinEnds) Ends, if(GrPhase1 & EvMatchArrowsNo, EvElimSO, EvFinSO) SO
-			from (select GrPhase as GrPhase1, FinAthlete Entry1, FinArrowstring Arrowstring1, FinTieBreak TieBreak1, FsTarget+0 Target1, substr(FsLetter, length(FsTarget)+1, 1) Letter1, FsLetter FsLetter1, FsMatchNo FsMatchNo1, FsEvent FsEvent1, FinWinLose as Win1
-				from FinSchedule
-				inner join Grids on FsMatchNo=GrMatchno
-				inner join Finals on FsEvent=FinEvent and FinTournament={$_SESSION['TourId']} and FsMatchNo=FinMatchNo
-				where FsTournament={$_SESSION['TourId']} and FsTarget>'' and FsTeamEvent=0 and FsScheduledDate='$Date' and FsScheduledTime='$Time' and FsMatchNo%2=0) tgt1
-			inner join (select FinAthlete Entry2, FinArrowstring Arrowstring2, FinTieBreak TieBreak2, FsTarget+0 Target2, substr(FsLetter, length(FsTarget)+1, 1) Letter2, FsLetter FsLetter2, FsMatchNo FsMatchNo2, FsEvent FsEvent2, FinWinLose as Win2
-				from FinSchedule
-				inner join Finals on FsEvent=FinEvent and FsTournament=FinTournament and FsMatchNo=FinMatchNo
-				where FsTournament={$_SESSION['TourId']} and FsTarget>'' and FsTeamEvent=0 and FsScheduledDate='$Date' and FsScheduledTime='$Time') tgt2
-				on FsEvent1=FsEvent2 and FsMatchNo2=FsMatchNo1+1
-			inner join Events on FsEvent1=EvCode and EvTeamEvent=0 and EvTournament={$_SESSION['TourId']}
-			order by FsLetter1";
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$Tgt=($r->Target1==$r->Target2 ? $r->Target1 : "{$r->Target1}-{$r->Target2}");
-			if($r->Win1 or $r->Win2) $MatchOvers[]=$Tgt;
-			$Let1=($r->Letter1 ? $r->Letter1 : 'A');
-			$Let2=($r->Letter2 && $r->Letter2!='A' ? $r->Letter2 : 'B');
-			$Ends[$Tgt][$Let1]='';
-			$Ends[$Tgt][$Let2]='';
-			$MatchTarget[$r->FsEvent1][$r->FsMatchNo1]=array($Tgt, $Let1);
-			$MatchTarget[$r->FsEvent1][$r->FsMatchNo2]=array($Tgt, $Let2);
-			$TargetsInvolved[$r->Target1]=$Tgt;
-			$TargetsInvolved[$r->Target2]=$Tgt;
-			if(empty($TgtsStatus[$Tgt])) $TgtsStatus[$Tgt]='';
-
-			$arrows1=strlen(trim(substr($r->Arrowstring1, ($End-1)*$r->Arrows, $r->Arrows)));
-			$arrows2=strlen(trim(substr($r->Arrowstring2, ($End-1)*$r->Arrows, $r->Arrows)));
-			if($End > $r->Ends) {
-				$arrows1=strlen(trim($r->TieBreak1));
-				$arrows2=strlen(trim($r->TieBreak2));
-				$r->Arrows=$r->SO;
-			}
-			// Letter 1
-			if(!$r->Entry1) {
-				$Ends[$Tgt][$Let1]='G'; // Gray, not used
-			} elseif($arrows1==$r->Arrows) {
-				$Ends[$Tgt][$Let1]='B'; // Blue, OK
-				if($TgtsStatus[$Tgt]!='C') $TgtsStatus[$Tgt]='B';
-			} elseif($arrows1) {
-				$Ends[$Tgt][$Let1]='C'; // Cyan, missing arrows
-				$TgtsStatus[$Tgt]='C';
-			}
-			$Anomalies[$Tgt][$Let1]=preg_match('/ /sim', rtrim($r->Arrowstring1));
-
-			// Letter 2
-			if(!$r->Entry2) {
-				$Ends[$Tgt][$Let2]='G'; // Gray, not used
-			} elseif($arrows2==$r->Arrows) {
-				$Ends[$Tgt][$Let2]='B'; // Blue, OK
-				if($TgtsStatus[$Tgt]!='C') $TgtsStatus[$Tgt]='B';
-			} elseif($arrows2) {
-				$Ends[$Tgt][$Let2]='C'; // Cyan, missing arrows
-				$TgtsStatus[$Tgt]='C';
-			}
-			$Anomalies[$Tgt][$Let2]=preg_match('/ /sim', rtrim($r->Arrowstring2));
-
-			$Payloads[$Tgt]='ses='.$Sequence.'&dist='.$Dist.'&end='.$End.'&event='.$r->FsEvent1.'&matchno='.$r->FsMatchNo1.','.$r->FsMatchNo2;
-		}
-
-		// check which device should be attached to which target
-		$SQL="Select IskDvCode, IskDvTarget+0 IntTarget from IskDevices where IskDvTournament={$_SESSION['TourId']} and IskDvState>0";
-		$Out.='<q><![CDATA['.$SQL.']]></q>';
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			if(empty($TargetsInvolved[$r->IntTarget]) or !isset($TgtsStatus[$TargetsInvolved[$r->IntTarget]])) {
-				// device is not involved on this...
-				continue;
-			}
-			if(empty($AssignedDevices[$TargetsInvolved[$r->IntTarget]]) or !in_array($r->IskDvCode, $AssignedDevices[$TargetsInvolved[$r->IntTarget]])) {
-				$AssignedDevices[$TargetsInvolved[$r->IntTarget]][]=$r->IskDvCode;
-			}
-		}
-
-		// check if the devices have sent something to the targets
-		$SQL="Select IskData.*, concat(FsScheduledDate, ' ', FsScheduledTime) Scheduled, FsTarget+0 Target, substr(FsLetter, length(FsTarget)+1, 1) Letter,
-				trim(IskDtArrowstring) Arrowstring, IskDvCode, IskDtType='I' CorrectSession, IskDvTarget,
-				if(EvMatchArrowsNo & GrPhase, EvElimArrows, EvFinArrows) Arrows, if(EvMatchArrowsNo & GrPhase, EvElimEnds, EvFinEnds) Ends, if(EvMatchArrowsNo & GrPhase, EvElimSO, EvFinSO) SO
-			from IskData
-			inner join FinSchedule on FsTournament={$_SESSION['TourId']} and FsMatchNo=IskDtMatchNo and FsEvent=IskDtEvent and FsTeamEvent=0
-			inner join Grids on FsMatchNo=GrMatchno
-			inner join IskDevices on IskDvTournament=IskDtTournament and IskDvState>0 and IskDvDevice=IskDtDevice
-			inner join Events on IskDtEvent=EvCode and EvTeamEvent=0 and EvTournament={$_SESSION['TourId']}
-			where IskDtTournament={$_SESSION['TourId']}
-			order by IskDvTarget, IskDtEndNo
-			";
-		$Out.='<q><![CDATA['.$SQL.']]></q>';
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$SkipRest=false;
-			$popId="data[$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-			// check the correct code of device
-			$r->IskDvCode=($r->IskDvCode ? $r->IskDvCode : 'Unknown');
-
-			// readdress the correct target for matches
-			if(strstr('EQ', $r->IskDtType)) {
-				$r->Target=intval(substr($r->IskDtTargetNo, 1));
-			}
-			if(!$r->IskDvCode) {
-				// device is not known...
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskUnknownDevice', 'Api', $r->Target).'</div>';
-			}
-			if(empty($TargetsInvolved[$r->Target]) or !isset($TgtsStatus[$TargetsInvolved[$r->Target]])) {
-				// device is not involved on this... but is sending scores
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskSpuriousDevice', 'Api', array($r->IskDvCode, $r->Target)).'</div>';
-				$SkipRest=true;
-			}
-			if(!$r->CorrectSession) {
-				// device is not sending Qualification scores
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskSpuriousScore-Device', 'Api', array($r->IskDvCode, $r->Target, $r->IskDtType . ' '.(strstr('EQ', $r->IskDtType) ? $r->IskDtTargetNo[0] : $r->IskDtEvent . ' '.$r->IskDtMatchNo. ' ('.$r->Scheduled.')'))).'</div>';
-				$SkipRest=true;
-			}
-			if(empty($MatchTarget[$r->IskDtEvent][$r->IskDtMatchNo])) {
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskSpuriousScore-Match', 'Api', array($r->IskDvCode, $r->IskDtEvent . ' ' . $r->IskDtMatchNo. ' ('.$r->Scheduled.')')).'</div>';
-				$SkipRest=true;
-			}
-			if($SkipRest) {
-				continue;
-			}
-
-			$Tgt=$MatchTarget[$r->IskDtEvent][$r->IskDtMatchNo][0];
-			$Let=$MatchTarget[$r->IskDtEvent][$r->IskDtMatchNo][1];
-
-
-			if($r->Arrowstring) {
-				// actually scoring something
-				switch(true) {
-					case ($Ends[$Tgt][$Let]=='G'): // this Position should not score at all!!!
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.$Tgt.'</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['Empty']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['Empty'])) $Messages[$r->Target][$r->IskDvCode]['Empty'][]=$span;
-						$TgtsStatus[$Tgt]='R';
-						break;
-					case ($r->IskDtDistance!=$Dist): // scoring on a different distance
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.$r->IskDtDistance.'</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['Distance']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['Distance'])) $Messages[$r->Target][$r->IskDvCode]['Distance'][]=$span;
-						$Ends[$Tgt][$Let]='R'; // Red, error condition
-						$TgtsStatus[$Tgt]='R';
-						break;
-					case ($Tgt!=$TargetsInvolved[$r->Target]):
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtEndNo .'</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['End']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['End'])) $Messages[$r->Target][$r->IskDvCode]['End'][]=$span;
-						if(empty($TgtsStatus[$r->Target]) or $TgtsStatus[$r->Target]!='R') $TgtsStatus[$r->Target]='O';
-						break;
-					case ($r->IskDtEndNo!=$End):
-						$span='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">' . $r->IskDtEndNo .'</span>';
-						if(empty($Messages[$r->Target][$r->IskDvCode]['End']) or !in_array($span, $Messages[$r->Target][$r->IskDvCode]['End'])) $Messages[$r->Target][$r->IskDvCode]['End'][]=$span;
-						$Ends[$Tgt][$Let]='O'; // Orange, error condition
-						if($TgtsStatus[$Tgt]!='R') $TgtsStatus[$Tgt]='O';
-						break;
-					default:
-						if(empty($AssignedDevices[$Tgt]) or !in_array($r->IskDvCode, $AssignedDevices[$Tgt])) {
-							$span='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskScoringDevice', 'Api', $r->IskDvCode).'</div>';
-							if(empty($Messages[$Tgt][$r->IskDvCode]['IskScoringDevice']) or !in_array($span, $Messages[$Tgt][$r->IskDvCode]['IskScoringDevice'])) $Messages[$Tgt][$r->IskDvCode]['IskScoringDevice'][]=$span;
-						}
-						if(strlen(str_replace(' ', '', $r->Arrowstring))!=($End>$r->Ends ? $r->SO : $r->Arrows) ) {
-							$Ends[$Tgt][$Let]='Z'; // Yellow, score in progress
-							$ShowImport[$Tgt]=true;
-							if($TgtsStatus[$Tgt]!='R' and $TgtsStatus[$Tgt]!='O') {
-								$TgtsStatus[$Tgt]='Z';
-							}
-						} else {
-							$Ends[$Tgt][$Let]='Y'; // Yellow, score in progress
-							$ShowImport[$Tgt]=true;
-							if(!$TgtsStatus[$Tgt] or strstr('BCZ', $TgtsStatus[$Tgt])) {
-								$Clear=true;
-								foreach($Ends[$Tgt] as $col) {
-									if($col!='Y') $Clear=false;
-								}
-								if($Clear) {
-									$TgtsStatus[$Tgt]='Y';
-								} else {
-									$TgtsStatus[$Tgt]='Z';
-								}
-							}
-						}
-				}
-			}
-		}
-		$Error=0;
-		break;
-	case 'T':
-		$MatchTarget=array();
-		$TargetsInvolved=array();
-		$Date=substr($Sequence, 1, 10);
-		$Time=substr($Sequence, 11);
-		// Gets the targets involved
-		$SQL="select tgt1.*, tgt2.*,
-				@ArBit:=(EvMatchArrowsNo & pow(2, if(FsMatchNo1=0, 0, floor(LOG(2, FsMatchNo1))))),
-				if(@ArBit=0, EvFinArrows, EvElimArrows) Arrows, if(@ArBit=0, EvFinEnds, EvElimEnds) Ends, if(@ArBit=0, EvFinSO, EvElimSO) SO
-			from (select TfTeam Entry1, TfArrowstring Arrowstring1, TfTieBreak TieBreak1, FsTarget+0 Target1, substr(FsLetter, length(FsTarget)+1, 1) Letter1, FsLetter FsLetter1, FsMatchNo FsMatchNo1, FsEvent FsEvent1, TfWinLose as Win1
-				from FinSchedule
-				inner join TeamFinals on FsEvent=TfEvent and TfTournament={$_SESSION['TourId']} and FsMatchNo=TfMatchNo
-				where FsTournament={$_SESSION['TourId']} and FsTarget>'' and FsTeamEvent=1 and FsScheduledDate='$Date' and FsScheduledTime='$Time' and FsMatchNo%2=0) tgt1
-			inner join (select TfTeam Entry2, TfArrowstring Arrowstring2, TfTieBreak TieBreak2, FsTarget+0 Target2, substr(FsLetter, length(FsTarget)+1, 1) Letter2, FsLetter FsLetter2, FsMatchNo FsMatchNo2, FsEvent FsEvent2, TfWinLose as Win2
-				from FinSchedule
-				inner join TeamFinals on FsEvent=TfEvent and TfTournament={$_SESSION['TourId']} and FsMatchNo=TfMatchNo
-				where FsTournament={$_SESSION['TourId']} and FsTarget>'' and FsTeamEvent=1 and FsScheduledDate='$Date' and FsScheduledTime='$Time') tgt2
-				on FsEvent1=FsEvent2 and FsMatchNo2=FsMatchNo1+1
-			inner join Events on FsEvent1=EvCode and EvTeamEvent=1 and EvTournament={$_SESSION['TourId']}
-			order by FsLetter1, Target1";
-// 		$Out.='<q><![CDATA['.$SQL.']]></q>';
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$Tgt=($r->Target1==$r->Target2 ? $r->Target1 : "{$r->Target1}-{$r->Target2}");
-			if($r->Win1 or $r->Win2) $MatchOvers[]=$Tgt;
-			$Let1=($r->Letter1 ? $r->Letter1 : 'A');
-			$Let2=($r->Letter2 && $r->Letter2!='A' ? $r->Letter2 : 'B');
-			$Ends[$Tgt][$Let1]='';
-			$Ends[$Tgt][$Let2]='';
-			$MatchTarget[$r->FsEvent1][$r->FsMatchNo1]=array($Tgt, $Let1);
-			$MatchTarget[$r->FsEvent1][$r->FsMatchNo2]=array($Tgt, $Let2);
-			$TargetsInvolved[$r->Target1]=$Tgt;
-			$TargetsInvolved[$r->Target2]=$Tgt;
-			if(empty($TgtsStatus[$Tgt])) {
-				$TgtsStatus[$Tgt]='';
-			}
-
-			$arrows1=strlen(trim(substr($r->Arrowstring1, ($End-1)*$r->Arrows, $r->Arrows)));
-			$arrows2=strlen(trim(substr($r->Arrowstring2, ($End-1)*$r->Arrows, $r->Arrows)));
-			if($End > $r->Ends) {
-				$arrows1=strlen(trim($r->TieBreak1));
-				$arrows2=strlen(trim($r->TieBreak2));
-				$r->Arrows=$r->SO;
-			}
-			// Letter 1
-			if(!$r->Entry1) {
-				$Ends[$Tgt][$Let1]='G'; // Gray, not used
-			} elseif($arrows1==$r->Arrows) {
-				$Ends[$Tgt][$Let1]='B'; // Blue, OK
-				if($TgtsStatus[$Tgt]!='C') $TgtsStatus[$Tgt]='B';
-			} elseif($arrows1) {
-				$Ends[$Tgt][$Let1]='C'; // Cyan, missing arrows
-				$TgtsStatus[$Tgt]='C';
-			}
-			$Anomalies[$Tgt][$Let1]=preg_match('/ /sim', rtrim($r->Arrowstring1));
-			// Letter 2
-			if(!$r->Entry2) {
-				$Ends[$Tgt][$Let2]='G'; // Gray, not used
-			} elseif($arrows2==$r->Arrows) {
-				$Ends[$Tgt][$Let2]='B'; // Blue, OK
-				if($TgtsStatus[$Tgt]!='C') $TgtsStatus[$Tgt]='B';
-			} elseif($arrows2) {
-				$Ends[$Tgt][$Let2]='C'; // Cyan, missing arrows
-				$TgtsStatus[$Tgt]='C';
-			}
-			$Anomalies[$Tgt][$Let2]=preg_match('/ /sim', rtrim($r->Arrowstring2));
-			$Payloads[$Tgt]='ses='.$Sequence.'&dist='.$Dist.'&end='.$End.'&event='.$r->FsEvent1.'&matchno='.$r->FsMatchNo1.','.$r->FsMatchNo2;
-		}
-
-		// check which device should be attached to which target
-		$SQL="Select IskDvCode, IskDvTarget+0 IntTarget from IskDevices where IskDvTournament={$_SESSION['TourId']} and IskDvState>0";
-// 		$Out.='<q><![CDATA['.$SQL.']]></q>';
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			if(empty($TargetsInvolved[$r->IntTarget]) or !isset($TgtsStatus[$TargetsInvolved[$r->IntTarget]])) {
-				// device is not involved on this...
-				continue;
-			}
-			if(empty($AssignedDevices[$TargetsInvolved[$r->IntTarget]]) or !in_array($r->IskDvCode, $AssignedDevices[$TargetsInvolved[$r->IntTarget]])) {
-				$AssignedDevices[$TargetsInvolved[$r->IntTarget]][]=$r->IskDvCode;
-			}
-		}
-
-		// check if the devices have sent something to the targets
-		$SQL="Select IskData.*, concat(FsScheduledDate, ' ', FsScheduledTime) Scheduled, FsTarget+0 Target, substr(FsLetter, length(FsTarget)+1, 1) Letter,
-				trim(IskDtArrowstring) Arrowstring, IskDvCode, IskDtType='T' CorrectSession, IskDvTarget,
-				@ArBit:=(EvMatchArrowsNo & pow(2, if(IskDtMatchNo=0, 0, floor(LOG(2, IskDtMatchNo))))),
-				if(@ArBit=0, EvFinArrows, EvElimArrows) Arrows, if(@ArBit=0, EvFinEnds, EvElimEnds) Ends, if(@ArBit=0, EvFinSO, EvElimSO) SO
-			from IskData
-			left join FinSchedule on FsTournament={$_SESSION['TourId']} and FsMatchNo=IskDtMatchNo and FsEvent=IskDtEvent and FsTeamEvent=1
-			left join IskDevices on IskDvTournament=IskDtTournament and IskDvState>0 and IskDvDevice=IskDtDevice
-			left join Events on IskDtEvent=EvCode and EvTeamEvent=1 and EvTournament={$_SESSION['TourId']}
-			where IskDtTournament={$_SESSION['TourId']}
-			order by IskDvTarget, IskDtEndNo";
-// 		$Out.='<q><![CDATA['.$SQL.']]></q>';
-		$q=safe_r_sql($SQL);
-		while($r=safe_fetch($q)) {
-			$SkipRest=false;
-			$popId="data[$r->IskDtMatchNo][".($r->IskDtEvent ? $r->IskDtEvent : ':::')."][$r->IskDtTeamInd][$r->IskDtType][".($r->IskDtTargetNo ? $r->IskDtTargetNo : ':::')."][$r->IskDtDistance][$r->IskDtEndNo]=$r->IskDtArrowstring";
-			// check the correct code of device
-			$r->IskDvCode=($r->IskDvCode ? $r->IskDvCode : 'Unknown');
-
-			// readdress the correct target for matches
-			if(strstr('EQ', $r->IskDtType)) {
-				$r->Target=intval(substr($r->IskDtTargetNo, 1));
-			}
-			if(!$r->IskDvCode) {
-				// device is not known...
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskUnknownDevice', 'Api', $r->Target).'</div>';
-			}
-			if(empty($TargetsInvolved[$r->Target]) or !isset($TgtsStatus[$TargetsInvolved[$r->Target]])) {
-				// device is not involved on this... but is sending scores
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskSpuriousDevice', 'Api', array($r->IskDvCode, $r->Target)).'</div>';
-				$SkipRest=true;
-			}
-			if(!$r->CorrectSession) {
-				// device is not sending Match scores
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskSpuriousScore-Device', 'Api', array($r->IskDvCode, $r->Target, $r->IskDtType . ' '.(strstr('EQ', $r->IskDtType) ? $r->IskDtTargetNo[0] : $r->IskDtEvent . ' '.$r->IskDtMatchNo. ' ('.$r->Scheduled.')'))).'</div>';
-				$SkipRest=true;
-			}
-			if(empty($MatchTarget[$r->IskDtEvent][$r->IskDtMatchNo])) {
-				$Msg.='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskSpuriousScore-Match', 'Api', array($r->IskDvCode, $r->IskDtEvent . ' ' . $r->IskDtMatchNo. ' ('.$r->Scheduled.')')).'</div>';
-				$SkipRest=true;
-			}
-			if($SkipRest) {
-				continue;
-			}
-
-			$Tgt=$MatchTarget[$r->IskDtEvent][$r->IskDtMatchNo][0];
-			$Let=$MatchTarget[$r->IskDtEvent][$r->IskDtMatchNo][1];
-
-			if($r->Arrowstring) {
-				// actually scoring something
-				switch(true) {
-					case ($Ends[$Tgt][$Let]=='G'): // this Position should not score at all!!!
-						$Messages[$Tgt][$r->IskDvCode]['Empty'][]='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'. $Tgt.'</span>';
-						$TgtsStatus[$Tgt]='R';
-						break;
-					case ($r->IskDtDistance!=$Dist): // scoring on a different distance
-						$Messages[$Tgt][$r->IskDvCode]['Distance'][]='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'. $r->IskDtDistance.'</span>';
-						$Ends[$Tgt][$Let]='R'; // Red, error condition
-						$TgtsStatus[$Tgt]='R';
-						break;
-// 					case ($r->IskDvTarget!=$r->Target):
-// 						$Messages[$r->Target][$r->IskDtEndNo]='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('IskSpuriousScore-End', 'Api', array($r->IskDvCode, $r->IskDtEndNo)).'</div>';
-// 						if($TgtsStatus[$r->Target]!='R') $TgtsStatus[$r->Target]='O';
-// 						break;
-					case ($r->IskDtEndNo!=$End):
-						$Messages[$Tgt][$r->IskDvCode]['End'][]='<span ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'. $r->IskDtEndNo.'</span>';
-						$Ends[$Tgt][$Let]='O'; // Orange, error condition
-						if($TgtsStatus[$Tgt]!='R') $TgtsStatus[$Tgt]='O';
-						break;
-					default:
-						if(empty($AssignedDevices[$Tgt]) or !in_array($r->IskDvCode, $AssignedDevices[$Tgt])) {
-							$Messages[$Tgt][$r->IskDvCode]['IskScoringDevice']='<div ondblclick="seeTarget(this)" title="'.get_text('IskTargetTitle', 'Api', $r->Target).'" value="'.$popId.'">'.get_text('', 'Api', $r->IskDvCode).'</div>';
-						}
-						if(strlen(str_replace(' ', '', $r->Arrowstring))!=($End>$r->Ends ? $r->SO : $r->Arrows) ) {
-							$Ends[$Tgt][$Let]='Z'; // Yellow, score in progress
-							$ShowImport[$Tgt]=true;
-							if($TgtsStatus[$Tgt]!='R' and $TgtsStatus[$Tgt]!='O') {
-								$TgtsStatus[$Tgt]='Z';
-							}
-						} else {
-							$Ends[$Tgt][$Let]='Y'; // Yellow, score in progress
-							$ShowImport[$Tgt]=true;
-							if(!$TgtsStatus[$Tgt] or $TgtsStatus[$Tgt]=='C' or $TgtsStatus[$Tgt]=='B') {
-								$TgtsStatus[$Tgt]='Y';
-							}
-						}
-				}
-			}
-		}
-		$Error=0;
-		break;
-	default:
-		header('Content-Type: text/xml');
-		die('<response error="'.$Error.'"/>');
-}
-
-// archers class, t= target class, d= devices assigned a= anomalies
-foreach($Ends as $Tgt => $Let) {
-	foreach($Let as $k => $v) {
-		$Out.='<a id="'.$Tgt.'-'.$k.'" v="'.$v.'" '.(!empty($Anomalies[$Tgt][$k]) ? 'a="1"' : 'a="0"').'/>';
-	}
-}
-
-// Target status and target messages
-foreach($TgtsStatus as $Tgt => $status) {
-	// target as a whole is in "currently scoring" if at least one is still scoring...
-	if(!empty($Ends[$Tgt]) and in_array('Z', $Ends[$Tgt])) $status='Z';
-	$Out.='<t id="'.$Tgt.'" a="'.(empty($Anomalies[$Tgt]) ? '0' : array_sum($Anomalies[$Tgt])).'" v="'.$status.'" d="'.(empty($AssignedDevices[$Tgt]) ? '' : implode(', ', $AssignedDevices[$Tgt])).'" o="'.(in_array($Tgt, $MatchOvers) ? 1 : 0).'" i="'.intval(!empty($ShowImport[$Tgt])).'"><![CDATA[';
-	if(!empty($Messages[$Tgt])) {
-		foreach($Messages[$Tgt] as $dv => $msgs) {
-			foreach($msgs as $type => $letters) {
-				if($type=='IskScoringDevice') {
-					$Out.=$letters;
-				} else {
-					$Out.= '<div class="Spurious">' . get_text('IskSpuriousScore-'.$type, 'Api', array($dv, implode(', ', $letters)));
-				}
-			}
-		}
-		// G =
-	}
-	$Out.=']]></t>';
-}
-
-// Target payloads
-foreach($Payloads as $Tgt => $status) {
-	$Out.='<pl id="'.$Tgt.'"><![CDATA[' . $status . ']]></pl>';
-}
-
-$Locked=getModuleParameter('ISK', 'StickyEnds', array('SeqCode'=>$Sequence, 'Distance'=>$Dist, 'Ends'=>array()));
-foreach(range(1, $_REQUEST['maxend']) as $i) {
-	$Out.='<st id="sticky['.$i.']" checked="'.(($Locked['SeqCode']==$Sequence and $Locked['Distance']==$Dist and in_array($i, $Locked['Ends'])) ? '1' : '0').'" />';
-}
-if($Locked['SeqCode']==$Sequence and $Locked['Distance']==$Dist) {
-	$Out.='<sm><![CDATA['.implode(', ', $Locked['Ends']).']]></sm>';
-} else {
-	$Out.='<sm><![CDATA['.get_text('StickyAlreadySet', 'Api').']]></sm>';
-}
-
-header('Content-Type: text/xml');
-echo '<response error="'.$Error.'" ses="'.$Sequence.'" dis="'.$Dist.'" end="'.$End.'">';
-echo $Out;
-echo '<msg><![CDATA['.$Msg.']]></msg>';
-echo '</response>';
diff --git a/src/Api/ISK/Results.js b/src/Api/ISK/Results.js
deleted file mode 100644
index b220c60d..00000000
--- a/src/Api/ISK/Results.js
+++ /dev/null
@@ -1,361 +0,0 @@
-var timeout=100;
-var ResTimer;
-
-
-function ResultsInit() {
-	loadComboSchedule();
-	LoadTablets();
-
-//	window.onbeforeunload=function() {SetAutoImport(true);};
-//	window.onunload=function() {SetAutoImport(true);};
-}
-
-function LoadTablets(obj) {
-	if(ComboScheduleLoaded==false) ResTimer = setTimeout(function() {LoadTablets(this)}, timeout);
-
-	// fills in the locked ends
-	var session=document.getElementById('x_Session').value;
-	var distance=document.getElementById('x_Distance').value;
-	var end=document.getElementById('x_End').value;
-	if(session=='' || (session[0]=='Q' && distance==0) || end==0) {
-		document.getElementById('TabletInfo').innerHTML='';
-		return;
-	}
-
-	// Clears timeout
-	clearTimeout(ResTimer);
-
-	$.get('Res-LoadTablets.php?ses='+session+'&dist='+distance+'&end='+end+'&maxend='+document.getElementById('x_End').max, function(XMLResp) {
-					// intercetto gli errori di IE e Opera
-					if (!XMLResp || !XMLResp.documentElement) {
-						throw("XML not valid:\n"+XMLResp.responseText);
-					}
-
-					// Intercetto gli errori di Firefox
-					var XMLRoot;
-					if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-						throw("XML not valid:\n");
-					}
-
-					XMLRoot = XMLResp.documentElement;
-
-					if (XMLRoot.getAttribute('error')==0) {
-						// retrieves the html
-						var html=XMLRoot.getElementsByTagName('html')[0].firstChild.data;
-						document.getElementById('TabletInfo').innerHTML=html;
-
-						// retrieves the ends to lock
-						var sticky=XMLRoot.getElementsByTagName('sticky')[0].firstChild.data;
-						document.getElementById('StickyEnds').innerHTML=sticky;
-
-						// retrieves the message
-						document.getElementById('ISK-sticky').innerHTML=XMLRoot.getElementsByTagName('sm')[0].firstChild.data;
-
-						ComboScheduleLoaded=true;
-						UpdateTablets();
-					} else {
-					}
-    });
-}
-
-function UpdateTablets() {
-	var session=document.getElementById('x_Session').value;
-	var distance=document.getElementById('x_Distance').value;
-	var end=document.getElementById('x_End').value;
-
-	// Clears timer
-	clearTimeout(ResTimer);
-
-	if(session=='' || (session[0]=='Q' && distance==0) || end==0 || document.getElementById('TabletInfo').innerHTML=='') {
-		ComboScheduleLoaded=false;
-		document.getElementById('TabletInfo').innerHTML='';
-		timeout=1000;
-		LoadTablets();
-		return;
-	}
-
-	$.get('Res-UpdateTablets.php?ses='+session+'&dist='+distance+'&end='+end+'&maxend='+document.getElementById('x_End').max, function(XMLResp) {
-        // intercetto gli errori di IE e Opera
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Intercetto gli errori di Firefox
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            // assigns the return values of sequence
-            document.getElementById('ISK-ses').innerHTML=XMLRoot.getAttribute('ses');
-            document.getElementById('ISK-dis').innerHTML=XMLRoot.getAttribute('dis');
-            document.getElementById('ISK-end').innerHTML=XMLRoot.getAttribute('end');
-            document.getElementById('ISK-sticky').innerHTML=XMLRoot.getElementsByTagName('sm')[0].firstChild.data;
-
-            // assigns the sticky ends if any
-            var data=XMLRoot.getElementsByTagName('st');
-            for(var i=0; i<data.length; i++) {
-                document.getElementById(data[i].getAttribute('id')).checked=(data[i].getAttribute('checked')=='1' ? true : false);
-            }
-
-
-            // assigns the letters colors
-            var data=XMLRoot.getElementsByTagName('a');
-            for(var i=0; i<data.length; i++) {
-                var elem=document.getElementById('l-'+data[i].getAttribute('id'));
-                elem.className='Let-'+data[i].getAttribute('v');
-                if(data[i].getAttribute('a')==1) {
-                    elem.className+=' Anomaly';
-                }
-            }
-            // assign the target color, device id and message
-            var data=XMLRoot.getElementsByTagName('t');
-            var autoImport=document.getElementById('AutoImport').checked;
-            for(var i=0; i<data.length; i++) {
-                var lt=data[i].getAttribute('v');
-                var id=data[i].getAttribute('id');
-                var over=data[i].getAttribute('o');
-                var anomaly=data[i].getAttribute('a');
-                document.getElementById('t-'+id).className='TargetTitle Let-'+lt;
-                document.getElementById('d-'+id).innerHTML=data[i].getAttribute('d');
-                document.getElementById('m-'+id).innerHTML=data[i].firstChild.data;
-                document.getElementById('i-'+id).disabled=(lt!='Y' && lt!='Z' && lt!='O');
-                document.getElementById('i-'+id).style.display=((autoImport && !data[i].getAttribute('i')) ? 'none' : 'inline-block');
-                if(over==1) {
-                    document.getElementById('t-'+id).parentNode.className="TargetContainer Let-F";
-                }
-                if((typeof Anomalies !== 'undefined') && (lt=='B' || over==1) && anomaly==0) {
-                    document.getElementById('t-'+id).parentNode.style.display='none';
-                } else {
-                    document.getElementById('t-'+id).parentNode.style.display='block';
-                }
-            }
-
-            // assign the device payload
-            var data=XMLRoot.getElementsByTagName('pl');
-            for(var i=0; i<data.length; i++) {
-                var id=data[i].getAttribute('id');
-                document.getElementById('t-'+id).setAttribute('value', data[i].firstChild.data);
-            }
-
-
-            // check if there are messages
-            var data=XMLRoot.getElementsByTagName('msg');
-            if(data.length==1) {
-                document.getElementById('Errors').innerHTML=data[0].firstChild.data;
-            } else {
-                document.getElementById('Errors').innerHTML='';
-            }
-
-            //updates the popup if any
-            if(ActiveTarget!='') {
-                seeTarget(ActiveTarget);
-            }
-        } else {
-        }
-        ResTimer=setTimeout(function() {UpdateTablets()}, 1000);
-    });
-}
-
-function SetAutoImport(action) {
-	if(!action && !confirm(msgAreYouSure)) {
-		document.getElementById('AutoImport').checked=(!document.getElementById('AutoImport').checked);
-		return;
-	}
-	document.getElementById('cmdImport').className = (document.getElementById('AutoImport').checked ? 'hidden':'');
-	var targets=document.querySelectorAll('input.TgtImport');
-	for(i=0; i<targets.length; i++) {
-		targets[i].style.display=(document.getElementById('AutoImport').checked ? 'none' : 'inline-block');
-	}
-
-	$.get('Res-AutoImport.php?stop='+(action ? '0' : '1'), function(XMLResp) {
-        // IE & Opera error
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Firefox Errors
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            // modify the pannel
-        } else {
-            // error condition
-        }
-    });
-}
-
-function toggleSticky(obj) {
-	var session=document.getElementById('x_Session').value;
-	var distance=document.getElementById('x_Distance').value;
-	$.get('Res-ToggleSticky.php?ses='+session+'&dist='+distance+'&'+obj.id+'='+(obj.checked ? '1' : '0'), function(XMLResp) {
-        // IE & Opera error
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Firefox Errors
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            // modify the pannel
-        } else {
-            // error condition
-            document.getElementById('ISK-sticky').innerHTML=XMLRoot.getElementsByTagName('sm')[0].firstChild.data;
-        }
-    });
-}
-
-function dataImport(Tgt) {
-	var session=document.getElementById('x_Session').value;
-	var distance=document.getElementById('x_Distance').value;
-	var end=document.getElementById('x_End').value;
-	var qry='ses='+session+'&dist='+distance+'&end='+end;
-	if(Tgt!=null) {
-		qry=document.getElementById('t-'+Tgt.id.substr(2)).getAttribute('value');
-	}
-
-	$.get('Res-DataImport.php?'+qry, function(XMLResp) {
-        // IE & Opera error
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Firefox Errors
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            // modify the pannel
-        } else {
-            // error condition
-        }
-    });
-}
-
-var ActiveTarget='';
-
-function seeTarget(obj) {
-	var y=Math.max(obj.offsetTop-20, 50);
-	var d = document.getElementById('PopUp');
-//	d.style.top=y+'px';
-	ActiveTarget = obj;
-	var tit=document.getElementById('PopUpTitle')
-	tit.innerHTML=obj.getAttribute('title');
-	tit.className.parentNode=obj.className;
-
-	d.style.display="block";
-
-	// let's get the content...
-    $.get('Res-SeeTarget.php?'+obj.getAttribute('value'), function(XMLResp) {
-        // IE & Opera error
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Firefox Errors
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            // modify the pannel
-            document.getElementById('PopUpContent').innerHTML=XMLRoot.getElementsByTagName('html')[0].firstChild.data;
-            var Arrows=document.getElementById('PopUpContent').querySelectorAll('div.Let-Z');
-            document.getElementById('PopupRemove').disabled=(Arrows.length==0);
-            document.getElementById('PopupImport').disabled=(Arrows.length==0);
-        } else {
-            // error condition
-        }
-    });
-}
-
-function closeTarget() {
-	document.getElementById('PopUpContent').innerHTML='';
-	document.getElementById('PopUp').style.display='none';
-	ActiveTarget='';
-}
-
-function popupRemove(obj) {
-	if(!confirm(msgAreYouSure)) return;
-
-    var payloads=document.querySelectorAll('#PopUpContent .PopUpSpot');
-    var qry='';
-    for(var i=0; i<payloads.length; i++) {
-        if(payloads[i].getAttribute('value')!='') qry+='&'+payloads[i].getAttribute('value');
-    }
-	$.get('Res-RemoveEnd.php?'+qry.substring(1), function(XMLResp) {
-        // IE & Opera error
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Firefox Errors
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            // modify the pannel
-            closeTarget();
-        } else {
-            // error condition
-        }
-    });
-}
-
-function popupImport(obj) {
-	if(!confirm(msgAreYouSure)) return;
-
-    var payloads=document.querySelectorAll('#PopUpContent .PopUpSpot');
-    var qry='';
-    for(var i=0; i<payloads.length; i++) {
-        if(payloads[i].getAttribute('value')!='') qry+='&'+payloads[i].getAttribute('value');
-    }
-
-    $.get('Res-ImportEnd.php?'+qry.substring(1), function(XMLResp) {
-        // IE & Opera error
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Firefox Errors
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            // modify the pannel
-            closeTarget();
-        } else {
-            // error condition
-        }
-    });
-}
-
diff --git a/src/Api/ISK/Results.php b/src/Api/ISK/Results.php
deleted file mode 100644
index 22ce333f..00000000
--- a/src/Api/ISK/Results.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__, 2) .'/config.php');
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadWrite);
-
-require_once('Common/Lib/CommonLib.php');
-require_once('Common/Lib/Fun_Modules.php');
-
-if(!empty($_REQUEST['truncate'])) {
-	switch($_REQUEST['truncate']) {
-		case 1:
-			$IskSequence=getModuleParameter('ISK', 'Sequence', array('type' => '', 'session'=>'', 'distance'=>0, 'maxdist'=>0, 'end'=>0));
-			safe_w_sql("delete from IskData where IskDtTournament='{$_SESSION['TourId']}' and IskDtType!='{$IskSequence['type']}'");
-			break;
-		case 2:
-			$IskSequence=getModuleParameter('ISK', 'Sequence', array('type' => '', 'session'=>'', 'distance'=>0, 'maxdist'=>0, 'end'=>0));
-			safe_w_sql("delete from IskData where IskDtTournament='{$_SESSION['TourId']}' and IskDtType='{$IskSequence['type']}'");
-			break;
-		case 3:
-			safe_w_sql("delete from IskData where IskDtTournament='{$_SESSION['TourId']}'");
-			break;
-	}
-	CD_redirect('Results.php');
-}
-
-$PAGE_TITLE=get_text('ISK-Results');
-$JS_SCRIPT=array(
-	phpVars2js(array('msgAreYouSure' => get_text('MsgAreYouSure'))),
-	'<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/js/jquery-3.2.1.min.js"></script>',
-	'<script type="text/javascript" src="./index.js"></script>',
-	'<script type="text/javascript" src="./Results.js"></script>',
-	'<link href="ISK.css" rel="stylesheet" type="text/css">',
-);
-
-$ONLOAD=' onload="ResultsInit()"'; // onunload="SetAutoImport(true)"';
-
-include('Common/Templates/head.php');
-
-echo '<table class="Tabella">';
-echo '<tr><th class="Title" colspan="7">' . get_text('ISK-Results') . '</th></tr>';
-echo '<tr>';
-	echo '<th nowrap="nowrap">' . get_text('Session') . '</th>';
-	echo '<th nowrap="nowrap">' . get_text('Distance', 'Tournament') . '</th>';
-	echo '<th nowrap="nowrap">' . get_text('Volee', 'HTT') . '</th>';
-	echo '<th >&nbsp;</th>';
-	echo '<th nowrap="nowrap">' . get_text('AutoImport', 'Api') . '</th>';
-	echo '<th nowrap="nowrap">' . get_text('LockToEnds', 'Api') . '</th>';
-	echo '<th >&nbsp;</th>';
-echo '</tr>';
-echo '<tr>';
-	echo '<td nowrap="nowrap">
-		<select name="x_Session" id="x_Session" onChange="loadComboDistanceEnd(); LoadTablets();"></select><br>
-		<input type="checkbox" value="1" id="x_onlyToday" onClick="loadComboSchedule();">' . get_text('OnlyToday', 'Tournament') . '
-		</td>';
-	echo '<td nowrap="nowrap"><select name="x_Distance" id="x_Distance" onchange="adjustMaxEnd(); UpdateTablets()"></select></td>';
-	echo '<td nowrap="nowrap"><input type="number" name="x_End" id="x_End" min="0" max="12" value="0" onchange="UpdateTablets()"></td>';
-	echo '<td nowrap="nowrap" align="center" style="padding:0 2em;"><input type="button" id="setCurrent" value="' . get_text('CmdOk') . '" onClick="LoadTablets();"></td>';
-	echo '<td nowrap="nowrap" align="center" style="padding:0 2em;">
-		<input type="checkbox" id="AutoImport" onClick="SetAutoImport(this.checked)"'.(getModuleParameter('ISK', 'StopAutoImport') ? '' : ' checked="checked"').'>
-		<input type="button" id="cmdImport" class="' . (getModuleParameter('ISK', 'StopAutoImport') ? '':'hidden'). '" value="' . get_text('CmdImport','Api') . '" onClick="dataImport();">
-		</td>';
-	echo '<td nowrap="nowrap" align="center" style="padding:0 2em;" id="StickyEnds"></td>';
-	echo '<td><input type="button" value="'.htmlspecialchars(get_text('CmdTruncateMyHTTData', 'HTT')).'" onclick="window.location.href=\'?truncate=2\'">
-		<input type="button" value="'.htmlspecialchars(get_text('ISK-TruncateTable', 'Api')).'" onclick="window.location.href=\'?truncate=1\'">
-		<input type="button" value="'.htmlspecialchars(get_text('ISK-TruncateTableAll', 'Api')).'" onclick="window.location.href=\'?truncate=3\'"></td>';
-echo '</tr>';
-echo '<tr class="divider"><td colspan="7"></td></tr>';
-echo '<tr>';
-	echo '<td id="ISK-ses"></td>';
-	echo '<td id="ISK-dis"></td>';
-	echo '<td id="ISK-end"></td>';
-	echo '<td></td>';
-	echo '<td></td>';
-	echo '<td id="ISK-sticky"></td>';
-	echo '<td></td>';
-echo '</tr>';
-echo '<tr>';
-	echo '<td id="Errors" colspan="7"></td>';
-echo '</tr>';
-
-echo '</table>';
-
-// gets all the
-
-echo '<div id="TabletInfo"></div>';
-
-echo '<div class="Legend">';
-foreach(array('G', 'Z', 'Y', 'B', 'C', 'R', 'O') as $Let) {
-	echo '<div><span class="Let-'.$Let.'">&nbsp;&nbsp;&nbsp;&nbsp;</span> '.get_text('Desc-Let-'.$Let, 'Api').'</div>';
-}
-echo '</div>';
-echo '<div id="PopUp" class="PopUp">
-	<div class="TargetTitle"><img class="PopUpCloseImg ClickableDiv" onClick="closeTarget()"><span id="PopUpTitle"></span></div>
-	<div id="PopUpContent"></div>
-	<div id="PopUpCmd">
-		<input type="button" class="ClickableDiv" id="PopupRemove" value="'.get_text('CmdDelete', 'Api').'" onclick="popupRemove(this)">
-		<input type="button" class="ClickableDiv" id="PopupImport" value="'.get_text('CmdImport', 'Api').'" onclick="popupImport(this)">
-		<input type="button" class="ClickableDiv" value="'.get_text('Close').'" onclick="closeTarget()">
-	</div>
-	</div>';
-include('Common/Templates/tail.php');
diff --git a/src/Api/ISK/Sessions-Toggle.php b/src/Api/ISK/Sessions-Toggle.php
deleted file mode 100644
index f9ef04cc..00000000
--- a/src/Api/ISK/Sessions-Toggle.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-require_once(__DIR__.'/config-ianseo.php');
-
-$JSON=array('error'=>1, 'msg'=>get_text('Error'), 'status'=>array());
-
-if(!CheckTourSession() or checkACL(AclISKServer, AclReadWrite, false)!=AclReadWrite or empty($_REQUEST['key'])) {
-	JsonOut($JSON);
-}
-
-require_once(__DIR__.'/Lib.php');
-$LockSessions=getModuleParameter('ISK', 'LockedSessions', array());
-
-if($_REQUEST['key']=='lockall') {
-	$q=safe_r_sql(GetLockableSessions());
-	$LockSessions=array();
-	while($r=safe_fetch($q)) {
-		$LockSessions[]=$r->LockKey;
-		$JSON['status'][$r->LockKey]=1;
-	}
-} elseif($_REQUEST['key']=='unlockall') {
-	$q=safe_r_sql(GetLockableSessions());
-	$LockSessions=array();
-	while($r=safe_fetch($q)) {
-		$JSON['status'][$r->LockKey]=0;
-	}
-} else {
-	if(in_array($_REQUEST['key'], $LockSessions)) {
-		unset($LockSessions[array_search($_REQUEST['key'], $LockSessions)]);
-		$JSON['status'][$_REQUEST['key']]=0;
-	} else {
-		$LockSessions[]=$_REQUEST['key'];
-		$JSON['status'][$_REQUEST['key']]=1;
-	}
-}
-$JSON['error']=0;
-
-setModuleParameter('ISK', 'LockedSessions', $LockSessions);
-
-JsonOut($JSON);
diff --git a/src/Api/ISK/Sessions.css b/src/Api/ISK/Sessions.css
deleted file mode 100644
index 563f92b7..00000000
--- a/src/Api/ISK/Sessions.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.locked {color:red; background-color: transparent;}
-.unlocked {color:green;}
-.Legend {padding: 0.75em 0.75em !important;}
-.separation {padding: 0.5em;}
-
-[onclick] {cursor: pointer;}
diff --git a/src/Api/ISK/Sessions.js b/src/Api/ISK/Sessions.js
deleted file mode 100644
index d14947d5..00000000
--- a/src/Api/ISK/Sessions.js
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-function toggleLock(obj) {
-	$.getJSON('Sessions-Toggle.php?key='+$(obj).attr('ref'), function(data) {
-		if(data.error==0) {
-			$.each(data.status, function(idx) {
-				$('[ref="'+idx+'"]')
-					.toggleClass('locked fa-times-circle', this==1)
-					.toggleClass('unlocked fa-check-circle', this==0);
-			});
-		} else {
-			alert(data.msg);
-		}
-	});
-}
diff --git a/src/Api/ISK/Sessions.php b/src/Api/ISK/Sessions.php
deleted file mode 100644
index 80ef73c6..00000000
--- a/src/Api/ISK/Sessions.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-require_once(__DIR__.'/config-ianseo.php');
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadWrite);
-
-require_once(__DIR__.'/Lib.php');
-require_once('Common/Lib/Fun_Phases.inc.php');
-
-$LockSessions=getModuleParameter('ISK', 'LockedSessions', array());
-
-// gets all the qualification, Elimination, Individual and team matches
-/* Fields of the key are:
-IskDtMatchNo
-IskDtEvent
-IskDtTeamInd
-IskDtType
-IskDtTargetNo (just first digit as it is the session
-IskDtDistance
-*/
-
-$SQL=GetLockableSessions();
-$q=safe_r_sql($SQL);
-$Sessions=array();
-$Cols=0;
-$SesCols=array('Q'=>0,'E'=>0,'I'=>0,'T'=>0);
-$Headers=array();
-while($r=safe_fetch($q)) {
-	$Sessions[$r->SesType][($r->SesType == 'Q' ? $r->Order2 . '. ' : '') . $r->Description][$r->Distance]=$r;
-	$Cols=max($Cols, count($Sessions[$r->SesType][($r->SesType == 'Q' ? $r->Order2 . '. ' : '') . $r->Description]));
-	$SesCols[$r->SesType]=max($SesCols[$r->SesType], count($Sessions[$r->SesType][($r->SesType == 'Q' ? $r->Order2 . '. ' : '') . $r->Description]));
-}
-
-foreach($Sessions as $Type => $Events) {
-	foreach($Events as $k => $v) {
-		if(count($v)==$SesCols[$Type]) {
-			// same number of columns...
-			$Headers[$Type]=array_keys($v);
-		}
-	}
-}
-
-$IncludeFA = true;
-$PAGE_TITLE=get_text('ManageLockedSessions', 'ISK');
-$JS_SCRIPT=array(
-	'<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/js/jquery-3.2.1.min.js"></script>',
-	'<script type="text/javascript" src="./Sessions.js"></script>',
-	'<link href="./Sessions.css" rel="stylesheet" type="text/css">',
-);
-
-require_once('Common/Templates/head.php');
-
-echo '<table class="Tabella freeWidth">';
-echo '<tr><th colspan="'.($Cols+2).'" class="Main">'.get_text('ManageLockedSessions', 'ISK').'</th></tr>';
-echo '<tr class="divider"><td colspan="'.($Cols+2).'"></td></tr>';
-echo '<tr><td colspan="'.($Cols+2).'" class="Left Legend"><i class="fa fa-2x fa-times-circle locked" style="vertical-align:-0.2em;margin-right:0.5em;" onclick="toggleLock(this)" ref="lockall"></i>'.get_text('LockAll', 'ISK').'</td></tr>'.
-	'<tr><td colspan="'.($Cols+2).'" class="Left Legend"><i class="fa fa-2x fa-check-circle unlocked" style="vertical-align:-0.2em;margin-right:0.5em;" onclick="toggleLock(this)" ref="unlockall"></i>'.get_text('UnlockAll', 'ISK').'</td></tr>';
-
-foreach($Sessions as $Type => $Events) {
-	echo '<tr class="divider"><td colspan="'.($Cols+2).'"></td></tr>';
-	$First=true;
-	foreach($Events as $Event => $Items) {
-		$colsEvent=count($Items);
-		if($First) {
-			echo '<tr><th class="Title NoWrap">'.get_text($Type.'-Session', 'Tournament').'</th>';
-			foreach($Headers[$Type] as $k) {
-				if($Type=='Q' or $Type=='E') {
-					$tit=get_text('PopupStatusDistance', 'Api', $k);
-				} else {
-					$tit=get_text($k.'_Phase');
-				}
-				echo '<th class="Title" width="10%">'.$tit.'</th>';
-			}
-			// blank columns go after
-			if($SesCols[$Type]<$Cols) {
-				echo '<th class="Title" colspan="'.($Cols-$SesCols[$Type]).'"></th>';
-			}
-			echo '<th class="Title" style="padding:0.5rem;"><i class="far fa-lg fa-file-pdf" onclick="window.open(\'PdfCheck.php\')"></i></th>';
-			echo '</tr>';
-		}
-		echo '<tr><th class="NoWrap Right">'.$Event.'</th>';
-		if($Type=='I' or $Type=='T') {
-			// blank columns go first
-			if($colsEvent<$SesCols[$Type]) {
-				echo '<td colspan="'.($SesCols[$Type]-$colsEvent).'"></td>';
-			}
-		}
-		foreach($Items as $k => $item) {
-			$active= (in_array($item->LockKey, $LockSessions) ? 'fa-times-circle locked' : 'fa-check-circle unlocked');
-			echo '<td class="Center"><i class="fa fa-2x '.$active.'" onclick="toggleLock(this)" ref="'.$item->LockKey.'"></i></td>';
-		}
-		// blank columns go after
-		if($SesCols[$Type]<$Cols) {
-			echo '<td colspan="'.($Cols-$SesCols[$Type]).'"></td>';
-		}
-		echo '<td class="Center"><i class="far fa-2x fa-file-pdf" onclick="window.open(\'PdfCheck.php?ses='.$item->LockKey.'\')"></i></td>';
-		echo '</tr>';
-		$First=false;
-	}
-}
-echo '<tr><td colspan="'.($Cols+2).'" class="Left Legend">'.get_text('ISK-LockedSessionHelp', 'Help', '<i class="fa fa-2x fa-check-circle unlocked" style="vertical-align:-0.2em; margin-right: 0.25em;></i>/<i class="fa fa-2x fa-times-circle locked" style="vertical-align:-0.2em; margin-right: 0.25em;"></i>').'</td></tr>';
-echo '</table>';
-
-require_once('Common/Templates/tail.php');
diff --git a/src/Api/ISK/SetArrowValue.php b/src/Api/ISK/SetArrowValue.php
deleted file mode 100644
index 412f2af7..00000000
--- a/src/Api/ISK/SetArrowValue.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/config.php');
-require_once('Common/Lib/Fun_Modules.php');
-
-$TargetNo=!empty($_GET['qutarget']) ? $_GET['qutarget'] : 0;
-list($Event,$EventTypeLetter,$MatchNo) = explode("|",(!empty($_GET['matchid']) ? $_GET['matchid'] : "0|I|0"));
-$EventType=($EventTypeLetter=='T' ? 1 : 0);
-$JsonResult=array();
-
-$Error=1;
-
-/*
--- compcode: code of the competition
--- qutarget: complete QuTargetNo
--- distance: distance
--- index: index of the arrow in the arrowstring
--- arrowsymbol: not the points, but the symbol (X, M, etc)
-
-The page will return
-$JsonResult['error']    = 1 if error, 0 if none
-$JsonResult['qutarget'] = targetno
-$JsonResult['dist']     = distance
-$JsonResult['index']    = index of the arrow
-$JsonResult['curscore'] = distance score
-$JsonResult['curgold']  = distance golds
-$JsonResult['curxnine'] = distance X/9
-$JsonResult['score']    = total score
-$JsonResult['gold']     = total golds
-$JsonResult['xnine']    = total X/9
-
-*/
-
-$CanScore=true;
-$CheckSequence=false;
-$StopAutoImport=false;
-// If competition is set to pro
-
-if($iskModePro) {
-	$CanScore=false;
-	// ONLY PRO APP CAN SCORE!!!!
-	if($iskAppPro) {
-		// is there a sequence?
-		if($QrCode=getQrCode()) {
-			// device associated... check if the type is correct (ignore other types)
-			if($TargetNo) {
-				// Qualification and perhaps Eliminations (need to revise the code...)
-				if(!in_array($QrCode['st'], array('Q', 'E1', 'E2'))) {
-					SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-				}
-			} else {
-				// should be match then!
-				if($EventTypeLetter!=substr($QrCode['st'], 1)) {
-					SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-				}
-			}
-			// device should be OK... checks the sticky ends
-			$StickyEnds=getModuleParameter('ISK', 'StickyEnds', array('SeqCode'=>'', 'Distance'=>'', 'Ends'=>array()), $CompId);
-			if(empty($QrCode['st']) and empty($StickyEnds['SeqCode'])) {
-				$CanScore=true;
-			} else {
-				// now check if the ends
-				$CheckSequence=true;
-			}
-		} else {
-			// no qrcode at all ... pro not associated in the DB... resets state AND competition to be safe
-			safe_w_sql("UPDATE IskDevices SET
-				IskDvTournament=0, IskDvState=0, IskDvLastSeen='".date('Y-m-d H:i:s')."'
-				WHERE IskDvDevice='{$DeviceId}'");
-
-			// cannot score so sends back
-			SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-		}
-	} else {
-		// lite app should not be allowed to arrive here... removes association in the DB and resets state
-		safe_w_sql("UPDATE IskDevices SET
-			IskDvTournament=0, IskDvState=0, IskDvLastSeen='".date('Y-m-d H:i:s')."'
-			WHERE IskDvDevice='{$DeviceId}'");
-
-		// lite app cannot score so sends back
-		SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-	}
-}
-
-$LockedSessions=getModuleParameter('ISK', 'LockedSessions', array(), $CompId);
-
-if($TargetNo) {
-	$tmp=explode('|', $TargetNo);
-	if(count($tmp)==3) {
-		// need to implement this one. elimination rounds!
-		CreateTourSession($CompId);
-
-		$arrIndex = $_REQUEST['arrowindex'];
-		$arrValue = $_REQUEST['arrowsymbol'];
-
-		$JsonResult['arrowsymbol']= $_REQUEST['arrowsymbol'];
-		$JsonResult['curendscore']   = 0 ;
-		$JsonResult['curscore']   = 0 ;
-		$JsonResult['curgold']    = 0 ;
-		$JsonResult['curxnine']   = 0;
-		$JsonResult['score']      = 0 ;
-		$JsonResult['gold']       = 0 ;
-		$JsonResult['xnine']      = 0;
-
-		// Elimination
-		require_once('Elimination/Fun_Eliminations.local.inc.php');
-
-		$JsonResult = SetElimArrowValue($tmp[0], $tmp[1], $tmp[2], $_REQUEST['arrowindex'], $_REQUEST['arrowsymbol'], 'JSON', $CompId);
-		$Error=$JsonResult['error'];
-	} else {
-		//Qualification
-		$dist = $_REQUEST['distnum'];
-		$arrIndex = $_REQUEST['arrowindex'];
-		$arrValue = $_REQUEST['arrowsymbol'];
-		$tgt = $_REQUEST['qutarget'];
-
-		$SQL="SELECT QuId, QuSession, QuTargetNo, QuTarget, DIDistance, DIEnds, DIArrows, 
-		        IF(TfGoldsChars{$dist}='',IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars),TfGoldsChars{$dist}) as GoldsChars, 
-		        IF(TfXNineChars{$dist}='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars{$dist}) as XNineChars, 
-		        QuConfirm & ".pow(2, $dist).">0 as StopImport, ToCategory&12 as IsField3D, ToNumEnds 
-			from Qualifications
-			INNER JOIN Entries ON QuId=EnId
-			INNER JOIN Tournament ON ToId=EnTournament
-			INNER JOIN TargetFaces on TfId=EnTargetFace and TfTournament=EnTournament
-			INNER JOIN DistanceInformation ON DITournament=EnTournament AND DISession=QuSession AND DIDistance=".StrSafe_DB($dist)." AND DIType='Q'
-			WHERE EnTournament=$CompId and QuTargetNo=".StrSafe_DB($tgt);
-
-		$q=safe_r_SQL($SQL);
-		$ArrowSearch=safe_fetch($q);
-
-		if($ArrowSearch->StopImport) {
-			// Scorecard has been verified/confirmed so the app CAN NEVER score on this distance...
-			SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-		}
-
-		$endNum=intval($arrIndex/$ArrowSearch->DIArrows);
-		$arrNum=$arrIndex-($endNum*$ArrowSearch->DIArrows);
-		$endNum++;
-
-		// check if the app is allowed to score here
-		if(!$CanScore) {
-			// check if it is not allowed YET because need to check end/distance/session
-			if($CheckSequence) {
-				$CanScore=true;
-				// check if it is allowed based on sticky ends
-				if($StickyEnds['SeqCode']) {
-					if($StickyEnds['SeqCode'][0]!='Q' //sticky set on another stage!!
-							or $StickyEnds['SeqCode'][2]!=$tgt[0] // sticky on Q but different session
-							or $StickyEnds['Distance']!=$dist) { // sticky on a different distance
-						$CanScore=false;
-					}
-					$StopAutoImport=(!in_array($endNum, $StickyEnds['Ends']) or $DEVICE->IskDvTarget!=intval(substr($tgt,1)));
-					if($CanScore and !in_array($endNum, $StickyEnds['Ends'])) {
-						$Error=2;
-					}
-				}
-
-				// check if it can score based on sequence
-				if(!$StopAutoImport and $CanScore and $QrCode['st']) {
-					if($QrCode['st']!='Q'
-							or $QrCode['s']!=$tgt[0]
-							or $QrCode['d']!=$dist) {
-						$CanScore=false;
-					}
-					// check if there is a target group
-					$StopAutoImport=!in_array($DEVICE->IskDvTarget, getGroupedTargets($RealTarget=intval(substr($tgt,1)), $tgt[0], 'Q', '', true));
-				}
-			}
-
-			if(!$CanScore) {
-				// cannot score this end for various reasons... resets to "ask for code" only if the devices is in OK state
-				safe_w_sql("UPDATE IskDevices SET IskDvState=2, IskDvLastSeen='".date('Y-m-d H:i:s')."' WHERE IskDvDevice='{$DeviceId}' and IskDvState=1");
-
-				// cannot score so sends back
-				SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-			}
-		}
-
-		if($Error!=2) {
-			$arrString = str_repeat(' ',$ArrowSearch->DIArrows);
-			$SQL = "SELECT QuD{$ArrowSearch->DIDistance}Arrowstring as Arrowstring 
-                FROM Qualifications INNER JOIN Entries ON QuId=EnId
-                WHERE EnTournament={$CompId} AND QuTargetNo='{$ArrowSearch->QuTargetNo}' ";
-            $q=safe_r_SQL($SQL);
-            if($r=safe_fetch($q)) {
-                $arrString=str_pad(substr($r->Arrowstring,($endNum-1)*$ArrowSearch->DIArrows,$ArrowSearch->DIArrows),$ArrowSearch->DIArrows, ' ', STR_PAD_RIGHT);
-            }
-			$SQL = "SELECT IskDtArrowstring
-				FROM IskData
-				WHERE IskDtTournament={$CompId} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q'
-				AND IskDtTargetNo='{$ArrowSearch->QuTargetNo}' AND IskDtDistance={$ArrowSearch->DIDistance} AND IskDtEndNo={$endNum}";
-			$q=safe_r_SQL($SQL);
-			if($r=safe_fetch($q)) {
-                for($i=0; $i<$ArrowSearch->DIArrows; $i++){
-                    if($r->IskDtArrowstring[$i]!=' '){
-                        $arrString[$i]=$r->IskDtArrowstring[$i];
-                    }
-                }
-			}
-			// check if the "key" of the session is allowed to score
-			$LockKey='Q|'.$ArrowSearch->QuTargetNo[0].'|'.intval($ArrowSearch->DIDistance);
-			if(in_array($LockKey, $LockedSessions)) {
-				$StopAutoImport = true;
-				$Error=2;
-			} else {
-				$arrString[$arrNum] = GetLetterFromPrint($arrValue,$ArrowSearch->QuId,$ArrowSearch->DIDistance);
-				$SQL = "INSERT INTO IskData (IskDtTournament, IskDtMatchNo, IskDtEvent, IskDtTeamInd, IskDtType, IskDtTargetNo, IskDtDistance, IskDtEndNo, IskDtArrowstring, IskDtUpdate, IskDtDevice)
-						VALUES ({$CompId}, 0, '', 0, 'Q', '{$ArrowSearch->QuTargetNo}', {$ArrowSearch->DIDistance}, {$endNum}, '{$arrString}', '".date('Y-m-d H:i:s')."', '{$DeviceId}')
-						ON DUPLICATE KEY UPDATE IskDtArrowstring='{$arrString}', IskDtUpdate='".date('Y-m-d H:i:s')."', IskDtDevice= '{$DeviceId}'";
-				safe_w_SQL($SQL);
-
-				// check if the import needs to be done after all arrows of the end are in
-				if(defined('IMPORT_TYPE') and IMPORT_TYPE) {
-					$iskStopAutoImport=(IMPORT_TYPE==2 or strlen(trim($arrString))!=$ArrowSearch->DIArrows);
-				}
-				$Error=0;
-			}
-		}
-
-		if(!$iskStopAutoImport and !$StopAutoImport) {
-			importQualifications($ArrowSearch->QuId, $ArrowSearch->DIDistance, $endNum) ;
-		}
-
-		$tmp = getQualificationTotals($ArrowSearch->QuId, $ArrowSearch->DIDistance, $endNum, $ArrowSearch->DIArrows, $ArrowSearch->DIEnds, $ArrowSearch->GoldsChars, $ArrowSearch->XNineChars, $ArrowSearch->IsField3D ? $ArrowSearch->QuTarget : null);
-
-		$JsonResult=array();
-		$JsonResult['qutarget']      = $ArrowSearch->QuTargetNo;
-		$JsonResult['distnum']       = (string) $ArrowSearch->DIDistance;
-		$JsonResult['arrowindex']    = (string) $arrIndex;
-		$JsonResult['arrowsymbol']   = DecodeFromLetter($tmp['curendarrstr'][$arrNum]);
-		$JsonResult['curendscore']   = $tmp['curendscore'];
-		$JsonResult['curscore']      = $tmp['curscore'];
-		$JsonResult['curscoreatend'] = $tmp['curscoreatend'];
-		$JsonResult['curgold']       = $tmp['curgold'];
-		$JsonResult['curxnine']      = $tmp['curxnine'];
-		$JsonResult['score']         = $tmp['score'];
-		$JsonResult['scoreatend']    = $tmp['scoreatend'];
-		$JsonResult['gold']          = $tmp['gold'];
-		$JsonResult['xnine']         = $tmp['xnine'];
-		//$JsonResult['arrowstring']   = $tmp['arrowstring'];
-		$JsonResult['arrowstrings']  = $tmp['arrowstrings'];
-
-	}
-} else {
-	$JsonResult=array();
-	$arrIndex = $_REQUEST['arrowindex'];
-	$arrValue = $_REQUEST['arrowsymbol'];
-	$obj=getEventArrowsParams($Event,getPhase($MatchNo),$EventType,$CompId);
-	$tmpArrowString='';
-	$tgtType=0;
-	$Error = 1;
-	$SQL = "SELECT EvFinalTargetType FROM Events WHERE EvCode='{$Event}' AND EvTeamEvent={$EventType} AND EvTournament={$CompId}";
-	$q=safe_r_sql($SQL);
-	if($r=safe_fetch($q)) {
-		$tgtType = $r->EvFinalTargetType;
-		$Error = 0;
-	}
-
-	if(empty($arrValue)) {
-		$tmpArrowString = ' ';
-	} else {
-		$tmpArrowString=GetLetterFromPrint($arrValue, 'T', $tgtType);
-		if($tmpArrowString==' ')
-			$Error = 1;
-	}
-	if($arrIndex>=($obj->arrows*$obj->ends)+$obj->so) {
-		$Error = 1;
-	}
-
-	if(!$Error) {
-		$isSo = ($arrIndex >= ($obj->ends*$obj->arrows));
-		$endNum=($isSo ? ($obj->ends) : intval($arrIndex/$obj->arrows));
-		$arrNum=($isSo ? $arrIndex-($obj->ends*$obj->arrows) : $arrIndex-($endNum*$obj->arrows));
-		$endNum++;
-
-		// check if the app is allowed to score here
-		if(!$CanScore) {
-			// check if it is not allowed YET because need to check end/distance/session
-			if($CheckSequence) {
-				$MatchNo2=($MatchNo%2 ? $MatchNo-1 : $MatchNo+1);
-				$Select = "SELECT DISTINCT CONCAT(IF(FSTeamEvent=0,'I','T'), FSScheduledDate, FSScheduledTime) AS keyValue, max($DEVICE->IskDvTarget = FsTarget+0) as Target
-						FROM FinSchedule
-						WHERE FSTournament={$CompId} and FSScheduledDate>0 and FsTeamEvent={$EventType} and FsEvent='{$Event}' and FsMatchNo in ({$MatchNo}, $MatchNo2)
-						group by FsTeamEvent, FsEvent";
-				$chkQ=safe_r_sql($Select);
-				$chkR=safe_fetch($chkQ);
-
-				$CanScore=$chkR;
-				// check if it is allowed based on sticky ends
-				if($CanScore and $StickyEnds['SeqCode']) {
-					if($StickyEnds['SeqCode']!=$chkR->keyValue) {
-						$CanScore=false;
-					}
-					$StopAutoImport=(!in_array($endNum, $StickyEnds['Ends']) or !$chkR->Target);
-					if($CanScore and !in_array($endNum, $StickyEnds['Ends'])) {
-						$Error=2;
-					}
-				}
-
-				// check if it can score based on sequence
-				if($CanScore and $QrCode['st']) {
-					if($QrCode['st']!='M'.$EventTypeLetter) {
-						$CanScore=false;
-					}
-					$StopAutoImport=(!$chkR->Target);
-				}
-			}
-			if(!$CanScore) {
-				// cannot score this end for various reasons... resets to "ask for code" only if the devices is in OK state
-				safe_w_sql("UPDATE IskDevices SET IskDvState=2, IskDvLastSeen='".date('Y-m-d H:i:s')."' WHERE IskDvDevice='{$DeviceId}' and IskDvState=1");
-
-				// cannot score so sends back
-				SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-			}
-		}
-
-		if($Error!=2) {
-			// check if the score is confirmed
-			$prefix=($EventType ? 'Tf' : 'Fin');
-			$SQL= "select * from ".($EventType ? 'Team' : '')."Finals
-				where {$prefix}Confirmed=1
-				/* and {$prefix}Status=1 */
-				and {$prefix}Tournament={$CompId}
-				and {$prefix}Event='{$Event}'
-				and {$prefix}Matchno={$MatchNo}";
-
-			$q=safe_r_sql($SQL);
-			if(safe_num_rows($q)) {
-				// arrow arrived on a confirmed score, so RESET the device...
-				SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-			}
-
-			$arrString = str_repeat(" ",($isSo ? $obj->so : $obj->arrows));
-			$SQL = "SELECT IskDtArrowstring
-				FROM IskData
-				WHERE IskDtTournament={$CompId} AND IskDtMatchNo={$MatchNo} AND IskDtEvent='{$Event}' AND IskDtTeamInd={$EventType} AND IskDtType='{$EventTypeLetter}'
-				AND IskDtTargetNo='' AND IskDtDistance=0 AND IskDtEndNo={$endNum}";
-			$q=safe_r_SQL($SQL);
-			if($r=safe_fetch($q)) {
-				$arrString=$r->IskDtArrowstring;
-			}
-			// check if the "key" of the session is allowed to score
-			$LockKey=($EventType==0 ? 'I':'T').'|'.getPhase($MatchNo).'|'.$Event;
-			if(in_array($LockKey, $LockedSessions)) {
-				$StopAutoImport = true;
-				$Error=2;
-			} else {
-				$arrString[$arrNum] = $tmpArrowString;
-				$SQL = "INSERT INTO IskData (IskDtTournament, IskDtMatchNo, IskDtEvent, IskDtTeamInd, IskDtType, IskDtTargetNo, IskDtDistance, IskDtEndNo, IskDtArrowstring, IskDtUpdate, IskDtDevice)
-						VALUES ({$CompId}, {$MatchNo}, '{$Event}', {$EventType}, '{$EventTypeLetter}', '', 0, {$endNum}, '{$arrString}', '".date('Y-m-d H:i:s')."', '{$DeviceId}')
-				ON DUPLICATE KEY UPDATE IskDtArrowstring='{$arrString}', IskDtUpdate='".date('Y-m-d H:i:s')."', IskDtDevice= '{$DeviceId}'";
-				safe_w_SQL($SQL);
-				$Error=0;
-
-				// check if the import needs to be done after all arrows of the end are in
-				if(defined('IMPORT_TYPE') and IMPORT_TYPE) {
-					$iskStopAutoImport=(IMPORT_TYPE==2 or strlen(trim($arrString))!=($isSo ? $obj->so : $obj->arrows));
-				}
-			}
-
-			if(!$iskStopAutoImport and !$StopAutoImport) {
-				importMatches($Event, $MatchNo, $EventType, $endNum, $obj->arrows, $obj->ends, $obj->so, $arrNum);
-			}
-
-		}
-
-		$tmp = getMatchTotals($Event, $MatchNo, $EventType, $endNum, $obj->arrows, $obj->ends, $obj->so);
-
-		$JsonResult['matchid']       = $Event."|".($EventType==0 ? 'I':'T')."|".$MatchNo;
-		$JsonResult['distnum']       = "1";
-		$JsonResult['arrowindex']    = (string) $arrIndex;
-		$JsonResult['arrowsymbol']   = DecodeFromLetter($isSo ? $tmp['arrowstring'][$arrNum] : $tmp['arrowstring'][$arrIndex]);
-		$JsonResult['curendscore']   = $tmp['curendscore'];
-		$JsonResult['curscore']      = $tmp['curscore'];
-		$JsonResult['curscoreatend'] = $tmp['curscoreatend'];
-		$JsonResult['curgold']       = $tmp['curgold'];
-		$JsonResult['curxnine']      = $tmp['curxnine'];
-		$JsonResult['score']         = $tmp['score'];
-		$JsonResult['scoreatend']    = $tmp['scoreatend'];
-		$JsonResult['gold']          = $tmp['gold'];
-		$JsonResult['xnine']         = $tmp['xnine'];
-		$JsonResult['arrowstrings']  = array($tmp['arrowstring']);
-	}
-}
-$JsonResult['error'] = $Error;
-
-SendResult($JsonResult);
diff --git a/src/Api/ISK/VerifyVersion.php b/src/Api/ISK/VerifyVersion.php
deleted file mode 100644
index 75298a14..00000000
--- a/src/Api/ISK/VerifyVersion.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-$SkipCompCode=true;
-require_once(dirname(__FILE__) . '/config.php');
-
-$JsonResponse=array(
-	'compatible' => true,
-	'ianseoversion' => ProgramVersion,
-	'minappversion' => $AppMinVersion,
-	'maxappversion' => $AppMaxVersion
-	);
-
-if(empty($_REQUEST['version'])) {
-	$JsonResponse['compatible']=false;
-} else {
-	$AppMinVersion=explode('.', $AppMinVersion);
-	$AppMinVersion=sprintf('%03s-%03s-%04s-', $AppMinVersion[0], $AppMinVersion[1], $AppMinVersion[2]);
-	$AppMaxVersion=explode('.', $AppMaxVersion);
-	$AppMaxVersion=sprintf('%03s-%03s-%04s-', $AppMaxVersion[0], $AppMaxVersion[1], $AppMaxVersion[2]);
-	$AppVersion=explode('.', $_REQUEST['version']);
-	while(count($AppVersion)<3) $AppVersion[]=0;
-	$AppVersion=sprintf('%03s-%03s-%04s-', $AppVersion[0], $AppVersion[1], $AppVersion[2]);
-
-	if($AppVersion<$AppMinVersion or $AppVersion>$AppMaxVersion) {
-		$JsonResponse['compatible']=false;
-	}
-}
-
-SendResult($JsonResponse);
\ No newline at end of file
diff --git a/src/Api/ISK/config-ianseo.php b/src/Api/ISK/config-ianseo.php
deleted file mode 100644
index 7e61aa18..00000000
--- a/src/Api/ISK/config-ianseo.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once('Common/Lib/Fun_Modules.php');
-
-// check if it is a pro
-define('ISK_PRO', getModuleParameter('ISK', 'Mode')=='pro');
diff --git a/src/Api/ISK/config.php b/src/Api/ISK/config.php
deleted file mode 100644
index 6912e63e..00000000
--- a/src/Api/ISK/config.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-
-$AppMinVersion='0.8.5';
-$AppMaxVersion='2.99.99';
-$SKIP_AUTH=true;
-
-/*
- * Flags meaning for IskDvState
- * 0: unknown/unauthorized
- * 1: authorized and running
- * 2: authorized and new barcode to be sent
- * 3: authorized and barconde sent, waiting for confirmation
- * 4: authorized and new msg to be sent
- */
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once('Common/Lib/Fun_Modules.php');
-require_once('Common/Lib/ArrTargets.inc.php');
-require_once('Common/Lib/Obj_RankFactory.php');
-require_once('Final/Fun_MatchTotal.inc.php');
-require_once(dirname(__FILE__).'/Lib.php');
-
-$CompId = 0;
-$CompCode = (empty($_REQUEST['compcode']) ? '' : $_REQUEST['compcode']);
-$CompPin = '';
-$DeviceId = (empty($_REQUEST['devid']) ? '' : $_REQUEST['devid']);
-$DEVICE=''; // will contain all data from IskDevices!
-
-// if there is no callback no need to go further...
-if(!defined('IN_IANSEO') and empty($_REQUEST["callback"])) die();
-
-
-// should it be worth to send back an error to the device?
-if(!$CompCode) {
-	if(empty($SkipCompCode)) SendResult(array('error' => get_text('ISK-NoCompCode', 'Api')));
-} else {
-    if(($sepPosition = strpos($CompCode,'|'))!==false) {
-        $CompPin=substr($CompCode,$sepPosition+1);
-        $CompCode=substr($CompCode,0,$sepPosition);
-    }
-	$CompId=getIdFromCode($CompCode);
-	if(!$CompId) SendResult(array('error' => get_text('ISK-BadCompCode', 'Api')));
-}
-
-$iskModePro = false; // competition mode
-$iskAppPro=false; // device type
-$iskStopAutoImport = 0;
-$iskStickyEnds = array();
-if(empty($SkipCompCode)) {
-    //Check PIN
-    $tmpPin = getModuleParameter('ISK', 'ServerUrlPin', '', $CompId);
-    if(!empty($tmpPin) AND $CompPin != $tmpPin) {
-        die();
-    }
-	//Get Isk Options
-	if($tmp=getModuleParameter('ISK', 'Mode', '', $CompId)) {
-		if($tmp=='pro') {
-            $iskModePro = true;
-        }
-	} else {
-		die();
-	}
-	$iskStopAutoImport=getModuleParameter('ISK', 'StopAutoImport', 0, $CompId);
-	$iskStickyEnds=getModuleParameter('ISK', 'StickyEnds', array(), $CompId);
-	define('IMPORT_TYPE', $iskModePro ? 0 : getModuleParameter('ISK', 'ImportType', 0, $CompId));
-    define('RKCALC_DivClI', $iskModePro ? 0 : getModuleParameter('ISK','CalcClDivInd',0, $CompId));
-    define('RKCALC_DivClT', $iskModePro ? 0 : getModuleParameter('ISK','CalcClDivTeam',0, $CompId));
-    define('RKCALC_FinI', $iskModePro ? 0 : getModuleParameter('ISK','CalcFinInd',0, $CompId));
-    define('RKCALC_FinT', $iskModePro ? 0 : getModuleParameter('ISK','CalcFinTeam',0, $CompId));
-}
-
-if(empty($SkipDeviceCheck) and !defined('IN_IANSEO') and !checkDeviceApp(empty($SkipCompCode))) die();
-
-function SendResult($Result) {
-	if(defined('IN_IANSEO')) return($Result);
-	UpdateLastSeen();
-	JsonOut($Result, 'callback');
-}
-
-function SendResetIsk($DevCode, $Version, $IsPro) {
-	global $DEVICE;
-	// resets the status of the device to "wait for QrCode"
-	safe_w_sql("update IskDevices set IskDvState=2 where IskDvCode='$DevCode'");
-
-	$DefAnswer=array('onlypro'=>true, 'devicecode'=>$DevCode, 'error' => get_text('ISK-OnlyProAloud', 'Api'));
-	if(!$IsPro) {
-		$v=explode('.', $Version);
-		for($n=count($v); $n<3; $n++) {
-			$v[]=0;
-		}
-
-		if(sprintf("%03s-%03s-%04s", $v[0], $v[1], $v[2])<"001-001-0000" and !$IsPro) {
-			// old lite version...
-			$DefAnswer='';
-		}
-
-	}
-
-	JsonOut($DefAnswer, 'callback');
-}
-
-
-
-/**
- * Given a device ID returns the associated QRcode
- * @param string $States The states to ask for, defaults to OK, to send and send
- */
-function getQrCode($States = '1,2,3') {
-	global $DeviceId,$CFG;
-	$Opts=array();
-	$q=safe_r_sql("select IskDevices.*, ToCode from IskDevices inner join Tournament on IskDvTournament=ToId where (IskDvState in ($States) or (IskDvAuthRequest=1 and IskDvState=1)) and IskDvDevice=".StrSafe_DB($DeviceId));
-	if($r=safe_fetch($q)) {
-		// Check the competition actually is set up to use with the app!
-		if(!getModuleParameter('ISK', 'Mode', '', $r->IskDvTournament)) {
-			return "";
-		}
-
-		// Get the sequence if any...
-		$tmp = getModuleParameter('ISK', 'Sequence', array("type"=>'', "session"=>'', "distance"=>'',  "maxdist"=>'', "end"=>''),$r->IskDvTournament);
-		if(!isset($tmp["type"])) {
-			delModuleParameter('ISK', 'Sequence', $r->IskDvTournament);
-			$tmp = getModuleParameter('ISK', 'Sequence', array("type"=>'', "session"=>'', "distance"=>'',  "maxdist"=>'', "end"=>''),$r->IskDvTournament);
-		}
-
-		// check if the device has a target assigned
-		if(!($r->IskDvTarget and $tmp["type"])) {
-			// reset the device!
-			SendResetIsk($r->IskDvCode, $r->IskDvVersion, $r->IskDvAppVersion);
-		}
-
-		// gets infos from device
-        $tmpPin=getModuleParameter('ISK', 'ServerUrlPin', '', $r->IskDvTournament);
-		$Opts['u']=getModuleParameter('ISK', 'ServerUrl', '', $r->IskDvTournament).$CFG->ROOT_DIR; // .'Api/ISK-Lite/';
-		$Opts['c']=$r->ToCode . (empty($tmpPin) ? '' : '|'.$tmpPin);
-
-		switch ($tmp["type"]) {
-			case 'Q':
-				// check if there is a target assigned to that target...
-				$q=safe_r_sql("select QuId from Qualifications inner join Entries on QuId=EnId and EnTournament={$r->IskDvTournament} where QuSession='{$tmp["session"]}' and substr(QuTargetNo, -4,3)+0= $r->IskDvTarget");
-				if(!safe_num_rows($q)) {
-					// no available targets !
-					SendResetIsk($r->IskDvCode, $r->IskDvVersion, $r->IskDvAppVersion);
-				}
-				$Opts['st'] = 'Q';
-				$Opts['s'] = (string) $tmp["session"];
-				$Opts['d'] = (string) $tmp["distance"];
-				$Opts['t'] = str_pad($r->IskDvTarget,3,"0",STR_PAD_LEFT);
-				if(intval($tmp["end"]))
-					$Opts['e'] = (string) $tmp["end"];
-				break;
-			case 'E':
-				// check if there is a target assigned to that target...
-				$q=safe_r_sql("select ElId, ElEventCode 
-					from Eliminations 
-					where ElTournament={$r->IskDvTournament} and ElSession='{$tmp["session"]}' and ElElimPhase={$tmp['distance']} and substr(ElTargetNo, -4,3)+0= $r->IskDvTarget");
-				if(!safe_num_rows($q)) {
-					// no available targets !
-					SendResetIsk($r->IskDvCode, $r->IskDvVersion, $r->IskDvAppVersion);
-				}
-				$r2=safe_fetch($q);
-				$Opts['st'] = 'E'.($tmp['distance']+1);
-				$Opts['s'] = (string) $r2->ElEventCode;
-				$Opts['d'] = '1';
-				$Opts['t'] = 'E'.($tmp['distance']+1).'|'.$r2->ElEventCode.'|'.str_pad($r->IskDvTarget,3,"0",STR_PAD_LEFT);
-				if(intval($tmp["end"]))
-					$Opts['e'] = (string) $tmp["end"];
-				break;
-			case 'I':
-			case 'T':
-				$Opts['st'] = 'M'.$tmp["type"];
-				$q=safe_r_SQL("SELECT FSEvent, FSMatchNo, GrPhase
-					FROM FinSchedule
-					INNER JOIN Grids ON FSMatchNo=GrMatchNo
-					WHERE FSTournament=" . $r->IskDvTournament . " AND FsTeamEvent=" . ($tmp["type"]=='I' ? "0":"1") . "
-					AND CONCAT(FSScheduledDate,FSScheduledTime)=" . StrSafe_DB($tmp["session"]) . " AND FSTarget=" . StrSafe_DB(str_pad($r->IskDvTarget,3,"0",STR_PAD_LEFT))."
-					order by FsMatchNo");
-				if($r2=safe_fetch($q) and $r2->FSMatchNo%2==0) {
-					$Opts['s'] = $r2->FSEvent;
-					$Opts['d'] = (string) $r2->FSMatchNo;
-					$Opts['t'] = (string) $r2->GrPhase;
-					if(intval($tmp["end"])) {
-						$Opts['e'] = (string) $tmp["end"];
-					}
-				} else {
-					SendResetIsk($r->IskDvCode, $r->IskDvVersion, $r->IskDvAppVersion);
-				}
-				break;
-		}
-	}
-	if(count($Opts))
-		return $Opts;
-	else
-		return "";
-}
-
-function checkDeviceApp($chkCompetition) {
-	global $DeviceId, $CompId, $iskModePro, $CFG, $iskAppPro, $DEVICE;
-	$q=safe_r_sql("SELECT * FROM IskDevices WHERE IskDvDevice='{$DeviceId}'");
-	if(safe_num_rows($q)==0) {
-		$Version=(empty($_REQUEST['version']) ? '' : preg_replace('/[^a-z0-9.-]/sim', '', $_REQUEST['version']));
-		$AppVersion=(empty($_REQUEST['t']) || $_REQUEST['t']!='p' ? 0 : 1);
-		if($AppVersion) $iskAppPro=true;
-		$iskCode="0001";
-		$q=safe_r_sql("SELECT IskDvCode FROM IskDevices where length(IskDvCode)=4 ORDER BY IskDvCode DESC");
-		if($r=safe_fetch($q)) {
-			$iskCode = str_pad(base_convert(base_convert($r->IskDvCode,36,10)+1,10,36),4,'0',STR_PAD_LEFT);
-		}
-		safe_w_SQL("INSERT INTO IskDevices
-			(IskDvTournament, IskDvDevice, IskDvCode, IskDvVersion, IskDvAppVersion, IskDvState, IskDvIpAddress, IskDvLastSeen) VALUES
-			('{$CompId}', '{$DeviceId}', '{$iskCode}', '{$Version}', {$AppVersion}, 0, '" . $_SERVER["REMOTE_ADDR"] . "', '".date('Y-m-d H:i:s')."')");
-
-		$q=safe_r_sql("SELECT * FROM IskDevices WHERE IskDvDevice='{$DeviceId}'");
-		$DEVICE=safe_fetch($q);
-		if($iskModePro) {
-			SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-		} else {
-			return true;
-		}
-	} else {
-		$Version='';
-		$AppVersion='';
-		$NewCode='';
-		$DEVICE=safe_fetch($q);
-		if(strlen($DEVICE->IskDvCode)!=4) {
-			$DEVICE->IskDvCode=str_pad($DEVICE->IskDvCode,4,'0',STR_PAD_LEFT);
-			$NewCode=", IskDvCode='{$DEVICE->IskDvCode}'";
-		}
-		$iskAppPro=$DEVICE->IskDvAppVersion;
-		if($DeviceId) {
-			if(!empty($_REQUEST['version'])) {
-				$Version=", IskDvVersion='".preg_replace('/[^a-z0-9.-]/sim', '', $_REQUEST['version'])."'";
-			}
-			if(!empty($_REQUEST['t']) and $_REQUEST['t']=='p') {
-				$AppVersion=', IskDvAppVersion=1';
-				$iskAppPro=true;
-			}
-		}
-		safe_w_SQL("UPDATE IskDevices SET
-			IskDvIpAddress='" . $_SERVER["REMOTE_ADDR"] . "', IskDvLastSeen='".date('Y-m-d H:i:s')."' $AppVersion $Version $NewCode
-			WHERE IskDvDevice='{$DeviceId}'");
-		if($iskModePro && $chkCompetition && $DEVICE->IskDvTournament != $CompId) {
-			SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-		}
-		if(!$iskModePro || ($DEVICE->IskDvAppVersion==1 && $DEVICE->IskDvState!=0)) {
-			return true;
-		} else {
-			// IskPro for sure!
-			SendResetIsk($DEVICE->IskDvCode, $DEVICE->IskDvVersion, $DEVICE->IskDvAppVersion);
-		}
-	}
-}
-
-function UpdateLastSeen() {
-	global $DeviceId;
-	if(!$DeviceId) return;
-	safe_w_SQL("UPDATE IskDevices SET
-		IskDvLastSeen='".date('Y-m-d H:i:s')."'
-		WHERE IskDvDevice='{$DeviceId}'");
-}
-
-function getQualificationTotals($EnId, $dist, $end, $arr4End, $end4Dist, $G, $X9, $StartTarget=null) {
-	global $CompId;
-	$res=array('curendscore'=>0,'curscore'=>0,'curscoreatend'=>0,'curgold'=>0,'curxnine'=>0,'score'=>0,'scoreatend'=>0,'gold'=>0,'xnine'=>0);
-	$SQL = "SELECT QuTargetNo, QuScore, QuGold, QuXnine, QuD{$dist}Score as dScore, QuD{$dist}Gold as dGold, QuD{$dist}Xnine as dXnine, QuD{$dist}Arrowstring as dArrowstring, (";
-	for($i=1;$i<$dist;$i++)
-		$SQL .= "QuD{$i}Score+";
-	$SQL .= "0) as prevScore, max(DiDistance) as MaxDistance, group_concat(DiEnds*DiArrows order by DiDistance separator '|') as PadArrows,
-       		QuD1Arrowstring, QuD2Arrowstring, QuD3Arrowstring, QuD4Arrowstring, QuD5Arrowstring, QuD6Arrowstring, QuD7Arrowstring, QuD8Arrowstring
-       		FROM Qualifications 
-       		innser join DistanceInformation on DiTournament=$CompId and DiType='Q' and DiSession=QuSession
-       		WHERE QuId={$EnId}
-       		group by QuId";
-	$q=safe_r_sql($SQL);
-	if($r=safe_fetch($q)) {
-		$curArrowString=str_repeat(" ", $arr4End * $end4Dist);
-		$SQL = "SELECT IskDtEndNo, IskDtArrowstring
-			FROM IskData
-			WHERE IskDtTournament={$CompId} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q' AND IskDtTargetNo='{$r->QuTargetNo}' AND IskDtDistance={$dist}
-			ORDER BY IskDtEndNo";
-		$q=safe_r_sql($SQL);
-		while($r2=safe_fetch($q)){
-			$curArrowString = substr_replace($curArrowString, $r2->IskDtArrowstring, ($r2->IskDtEndNo-1)*$arr4End, $arr4End);
-		}
-		for($i=0; $i<($arr4End * $end4Dist); $i++) {
-			if($curArrowString[$i]==' ' && isset($r->dArrowstring[$i])) {
-				$curArrowString[$i]=$r->dArrowstring[$i];
-			}
-		}
-
-		$tmp = ValutaArrowStringGX($curArrowString, $G, $X9);
-		$res['curendarrstr']  = substr($curArrowString,($end-1)*$arr4End, $arr4End);
-		$res['tilendarrstr']  = substr($curArrowString, 0, $end*$arr4End);
-		$res['arrowstring']   = $curArrowString;
-		$res['curendscore']   = ValutaArrowString($res['curendarrstr']);
-		$res['curscore']      = $tmp[0];
-		$res['curscoreatend'] = ValutaArrowString($res['tilendarrstr']);
-		$res['curgold']       = $tmp[1];
-		$res['curxnine']      = $tmp[2];
-		$res['score']         = $r->QuScore-$r->dScore+$res['curscore'];
-		$res['scoreatend']    = $r->prevScore+$res['curscoreatend'];
-		$res['gold']          = $r->QuGold-$r->dGold+$res['curgold'];
-		$res['xnine']         = $r->QuXnine-$r->dXnine+$res['curxnine'];
-		$res['prevendscored'] = ($end==1 || (trim(substr($curArrowString, $arr4End*($end-2), $arr4End)) !=''));
-
-		$res['arrowstrings']  = array();
-		$PadArrows=explode('|', $r->PadArrows);
-		foreach(range(1,$r->MaxDistance) as $d) {
-			if($d==$dist) {
-				$res['arrowstrings'][]=str_pad($curArrowString, $PadArrows[$d-1], ' ', STR_PAD_RIGHT);
-			} else {
-				$res['arrowstrings'][]=str_pad($r->{'QuD'.$d.'Arrowstring'}, $PadArrows[$d-1], ' ', STR_PAD_RIGHT);
-			}
-		}
-
-		if(!is_null($StartTarget)) {
-			// Field/3d, so we need to "circle" the arrowstring and the endnum to have the correct "alignment" with target archery
-			$StartTarget=(($StartTarget-1)%$end4Dist)+1;
-			$NewArrowstring=substr($curArrowString, $arr4End*($StartTarget-1)).substr($curArrowString, 0,$arr4End*($StartTarget-1));
-			$NewEndNum=(($end+$end4Dist-$StartTarget)%$end4Dist)+1;
-
-			$PrevTotal=ValutaArrowString(substr($NewArrowstring, 0, $NewEndNum*$arr4End));
-			// Field or 3D, "circular" scorecard so need to adjust scores adding the already scored ends
-			//$res['tilendarrstr']  = substr($curArrowString, 0, $end*$arr4End).$res['tilendarrstr'];
-			$res['curscoreatend'] =$PrevTotal;
-			$res['scoreatend']    =$r->prevScore+$PrevTotal;
-			$res['prevendscored'] = ($end==1 || (trim(substr($res['tilendarrstr'],-2*$arr4End)) !=''));
-			$res['prevendscored'] = ($NewEndNum==1 || (trim(substr($NewArrowstring, $arr4End*($NewEndNum-2), $arr4End)) !=''));
-		}
-	}
-	return $res;
-}
-
-function importQualifications($EnId, $dist=1, $end=1) {
-	global $CompId;
-	$amended=array();
-	$SQL="SELECT QuId, EnDivision, EnClass, EnSubClass, EnCountry, EnCountry2, EnCountry3, IF(EnCountry2=0,EnCountry,EnCountry2) as TeamCode, EnIndClEvent, EnTeamClEvent, EnIndFEvent, (EnTeamFEvent+EnTeamMixEvent) as EnTeamFEvent,
-			QuTargetNo, QuD{$dist}Arrowstring as Arrowstring, IskDtArrowstring, IskDtEndNo, DIDistance, DIEnds, DIArrows, 
-            IF(TfGoldsChars{$dist}='',IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars),TfGoldsChars{$dist}) as GoldsChars, 
-            IF(TfXNineChars{$dist}='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars{$dist}) as XNineChars,
-            ToElabTeam!=127 as MakeTeams
-		from Qualifications
-		INNER JOIN Entries ON QuId=EnId
-		INNER JOIN Tournament ON ToId=EnTournament
-        INNER JOIN TargetFaces on TfId=EnTargetFace and TfTournament=EnTournament
-		INNER JOIN DistanceInformation ON DITournament=EnTournament AND DISession=QuSession AND DIDistance=".StrSafe_DB($dist)." AND DIType='Q'
-		INNER JOIN IskData ON iskDtTournament=EnTournament AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q' AND IskDtTargetNo=QuTargetNo AND IskDtDistance={$dist} AND IskDtEndNo={$end}
-		WHERE EnTournament=$CompId and QuId={$EnId}";
-	$q=safe_r_sql($SQL);
-	while($r=safe_fetch($q)) {
-		$arrowString = str_pad($r->Arrowstring,$r->DIArrows*$r->DIEnds);
-		for($i=0; $i<$r->DIArrows; $i++){
-			if($r->IskDtArrowstring[$i]!=' '){
-				$arrowString[($r->IskDtEndNo-1)*$r->DIArrows+$i]=$r->IskDtArrowstring[$i];
-			}
-		}
-		$Score=0;
-		$Gold=0;
-		$XNine=0;
-		list($Score,$Gold,$XNine)=ValutaArrowStringGX($arrowString,$r->GoldsChars,$r->XNineChars);
-
-		// Remove spaces from arrowstring and calc the hits using the actual # of arrows
-		$trimmedArrowString = preg_replace("/[^a-zA-Z0-9]+/", "", $arrowString);
-		$hits = strlen($trimmedArrowString);
-
-		$Update = "UPDATE Qualifications SET
-			QuD{$dist}Score={$Score}, QuD{$dist}Gold={$Gold}, QuD{$dist}Xnine={$XNine}, QuD{$dist}ArrowString='{$arrowString}', QuD{$dist}Hits=$hits,
-			QuScore=QuD1Score+QuD2Score+QuD3Score+QuD4Score+QuD5Score+QuD6Score+QuD7Score+QuD8Score,
-			QuGold=QuD1Gold+QuD2Gold+QuD3Gold+QuD4Gold+QuD5Gold+QuD6Gold+QuD7Gold+QuD8Gold,
-			QuXnine=QuD1Xnine+QuD2Xnine+QuD3Xnine+QuD4Xnine+QuD5Xnine+QuD6Xnine+QuD7Xnine+QuD8Xnine,
-			QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits,
-			QuTimestamp=" . StrSafe_DB(date('Y-m-d H:i:s')) . "
-			WHERE QuId={$r->QuId}";
-		safe_w_SQL($Update);
-
-		$Update = "DELETE FROM IskData
-			WHERE IskDtTournament={$CompId} AND IskDtMatchNo=0 AND IskDtEvent='' AND IskDtTeamInd=0 AND IskDtType='Q'
-			AND IskDtTargetNo='{$r->QuTargetNo}' AND IskDtDistance={$dist} AND IskDtEndNo={$end} AND IskDtArrowstring='{$r->IskDtArrowstring}'";
-		safe_w_SQL($Update);
-
-		require_once('Qualification/Fun_Qualification.local.inc.php');
-		$oldSes = (!empty($_SESSION["TourId"]) ? $_SESSION["TourId"] : 0);
-		$_SESSION["TourId"]=$CompId;
-
-        if(defined('RKCALC_DivClI') AND RKCALC_DivClI==0 AND $r->EnIndClEvent != 0) {
-            Obj_RankFactory::create('DivClass', array('tournament' => $CompId, 'events' => $r->EnDivision . $r->EnClass, 'dist' => $dist))->calculate();
-            Obj_RankFactory::create('DivClass', array('tournament' => $CompId, 'events' => $r->EnDivision . $r->EnClass, 'dist' => 0))->calculate();
-        }
-        if($r->MakeTeams and defined('RKCALC_DivClT') AND RKCALC_DivClI==0 AND $r->EnTeamClEvent != 0) {
-            MakeTeams($r->TeamCode, $r->EnDivision.$r->EnClass, $CompId);
-        }
-
-        if((defined('RKCALC_FinI') AND RKCALC_FinI==0) OR (defined('RKCALC_FinT') AND RKCALC_FinT==0)) {
-			$SQL = "SELECT DISTINCT EvCode, EvTeamEvent, EvTeamCreationMode
-				FROM Events
-				INNER JOIN EventClass ON EvCode=EcCode AND EvTeamEvent=if(EcTeamEvent=0, 0, 1) AND EvTournament=EcTournament
-				WHERE EvTournament={$CompId} AND EcClass='{$r->EnClass}' AND EcDivision='{$r->EnDivision}' and if(EcSubClass='', true, EcSubClass='{$r->EnSubClass}')
-				ORDER BY EvTeamEvent, EvCode";
-			$q2=safe_r_sql($SQL);
-			while($r2=safe_fetch($q2)) {
-				if(defined('RKCALC_FinI') AND RKCALC_FinI==0 AND $r2->EvTeamEvent==0 AND $r->EnIndFEvent!=0) {
-					Obj_RankFactory::create('Abs',array('tournament'=>$CompId,'events'=>$r2->EvCode,'dist'=>$dist))->calculate();
-					Obj_RankFactory::create('Abs',array('tournament'=>$CompId,'events'=>$r2->EvCode,'dist'=>0))->calculate();
-					ResetShootoff($r2->EvCode,0,0, $CompId);
-				}
-                if($r->MakeTeams and defined('RKCALC_FinT') AND RKCALC_FinT==0 AND $r2->EvTeamEvent==1 AND $r->EnTeamFEvent!=0) {
-                    $calculateTeam=$r->TeamCode;
-                    if($r2->EvTeamCreationMode==1) {
-                        $calculateTeam=$r->EnCountry;
-                    } elseif($r2->EvTeamCreationMode==2) {
-                        $calculateTeam=$r->EnCountry2;
-                    } elseif($r2->EvTeamCreationMode==3) {
-                        $calculateTeam=$r->EnCountry3;
-                    }
-                    MakeTeamsAbs($calculateTeam, $r->EnDivision, $r->EnClass, $CompId);
-				}
-			}
-		}
-		if($oldSes!=0) {
-			$_SESSION["TourId"] = $oldSes;
-		}else {
-			unset($_SESSION["TourId"]);
-		}
-	}
-}
-
-function getMatchTotals($Event, $MatchNo, $IndTeam, $end, $arr4End, $end4Match, $arr4So) {
-	global $CompId;
-	$isSO = ($end>$end4Match);
-	$res=array('curendscore'=>0,'curscore'=>0,'curscoreatend'=>0,'curgold'=>0,'curxnine'=>0,'score'=>0,'scoreatend'=>0,'gold'=>0,'xnine'=>0);
-	$tblHead = ($IndTeam==0 ? 'Fin' : 'Tf');
-	$SQL = "SELECT {$tblHead}Arrowstring as arrowString, {$tblHead}Tiebreak as tieBreak
-		FROM " . ($IndTeam==0 ? 'Finals' : 'TeamFinals') . "
-		WHERE {$tblHead}Event='{$Event}' AND {$tblHead}MatchNo='{$MatchNo}' AND {$tblHead}Tournament={$CompId}";
-	$q=safe_r_sql($SQL);
-	if($r=safe_fetch($q)) {
-		$curArrowString=str_repeat(" ", $arr4End * $end4Match);
-		$curSoString=str_repeat(" ", $arr4So);
-		$SQL = "SELECT IskDtEndNo, IskDtArrowstring
-			FROM IskData
-			WHERE IskDtTournament={$CompId} AND IskDtMatchNo={$MatchNo} AND IskDtEvent='{$Event}' AND IskDtTeamInd={$IndTeam} AND IskDtType='" . ($IndTeam==0 ? 'I':'T') . "' AND IskDtTargetNo='' AND IskDtDistance=0
-			ORDER BY IskDtEndNo";
-		$q=safe_r_sql($SQL);
-		while($r2=safe_fetch($q)){
-			if($r2->IskDtEndNo<=$end4Match)
-				$curArrowString = substr_replace($curArrowString, $r2->IskDtArrowstring, ($r2->IskDtEndNo-1)*$arr4End, $arr4End);
-			else
-				$curSoString = substr_replace($curSoString, $r2->IskDtArrowstring, 0, $arr4So);
-		}
-		for($i=0; $i<($arr4End * $end4Match); $i++) {
-			if($curArrowString[$i]==' ' && isset($r->arrowString[$i])) {
-				$curArrowString[$i]=$r->arrowString[$i];
-			}
-		}
-		for($i=0; $i<$arr4So; $i++) {
-			if($curSoString[$i]==' ' && isset($r->tieBreak[$i])) {
-				$curSoString[$i]=$r->tieBreak[$i];
-			}
-		}
-
-		$tmpArr = ValutaArrowString($curArrowString);
-		$tmpSo = ValutaArrowString($curSoString);
-		$res['curendarrstr']  = $isSO ? $curSoString : substr($curArrowString,($end-1)*$arr4End, $arr4End);
-		$res['tilendarrstr']  = $isSO ? $curSoString : substr($curArrowString, 0, $end*$arr4End);
-		$res['arrowstring']   = $isSO ? $curSoString : $curArrowString;
-		$res['curendscore']   = ValutaArrowString($res['curendarrstr']);
-		$res['curscore']      = $isSO ? $tmpSo : $tmpArr;
-		$res['curscoreatend'] = ValutaArrowString($res['tilendarrstr']);
-		$res['curgold']       = 0;
-		$res['curxnine']      = 0;
-		$res['score']         = $res['curscore'];
-		$res['scoreatend']    = $res['curscoreatend'];
-		$res['gold']          = 0;
-		$res['xnine']         = 0;
-	}
-	return $res;
-}
-
-function importMatches ($Event, $MatchNo, $IndTeam, $end, $arr4End, $end4Match, $arr4So, $ArrIndex=-1) {
-	global $CompId, $iskModePro;
-	$isSO = ($end>$end4Match);
-	$tblHead = ($IndTeam==0 ? 'Fin' : 'Tf');
-	$SQL = "SELECT {$tblHead}Arrowstring as Arrowstring, {$tblHead}Tiebreak as TieBreak, IskDtArrowstring, IskDtEndNo
-		FROM " . ($IndTeam==0 ? 'Finals' : 'TeamFinals') . "
-		INNER JOIN IskData ON IskDtTournament={$tblHead}Tournament AND IskDtMatchNo={$tblHead}MatchNo AND IskDtEvent={$tblHead}Event AND IskDtTeamInd={$IndTeam} AND IskDtType='" . ($IndTeam==0 ? 'I':'T') . "' AND IskDtTargetNo='' AND IskDtDistance=0
-		WHERE {$tblHead}Event='{$Event}' AND {$tblHead}MatchNo='{$MatchNo}' AND {$tblHead}Tournament={$CompId} AND IskDtEndNo={$end}";
-	$q=safe_r_sql($SQL);
-	while($r=safe_fetch($q)) {
-		$arrowString = ($isSO ? str_pad($r->TieBreak,$arr4So) : str_pad($r->Arrowstring,$arr4End));
-		for($i=0; $i<($isSO ? $arr4So : $arr4End); $i++){
-			if($i==$ArrIndex or $r->IskDtArrowstring[$i]!=' '){
-				$arrowString[($isSO ? 0 : ($r->IskDtEndNo-1)*$arr4End)+$i]=$r->IskDtArrowstring[$i];
-			}
-		}
-		$startPos = (($isSO ? ($arr4End*$end4Match) : 0) +1);
-
-		// manage the closest to center
-		$Closest=0;
-		if($isSO) {
-			$Closest=intval($arrowString!=strtoupper($arrowString));
-			$arrowString=strtoupper($arrowString);
-		}
-		UpdateArrowString($MatchNo, $Event, $IndTeam, $arrowString, $startPos, ($startPos+($isSO ? $arr4So : $arr4End*$end4Match)-1), $CompId, $Closest);
-
-		$Update = "DELETE FROM IskData
-			WHERE IskDtTournament={$CompId} AND IskDtMatchNo={$MatchNo} AND IskDtEvent='{$Event}' AND IskDtTeamInd={$IndTeam} AND IskDtType='" . ($IndTeam==0 ? 'I':'T') . "'
-			AND IskDtTargetNo='' AND IskDtDistance=0 AND IskDtEndNo={$end} AND IskDtArrowstring='{$r->IskDtArrowstring}'";
-		safe_w_SQL($Update);
-	}
-}
diff --git a/src/Api/ISK/index.js b/src/Api/ISK/index.js
deleted file mode 100644
index 81ad5ad8..00000000
--- a/src/Api/ISK/index.js
+++ /dev/null
@@ -1,453 +0,0 @@
-var ComboScheduleLoaded=false;
-var timerReference;
-
-function saveSequence(save) {
-	var curSession = $('#x_Session').val();
-	var curDistance = $('#x_Distance').val();
-	var curEnd = $('#x_End').val();
-	$.getJSON('Ind-UpdateSequence.php'+(save ? '?session='+curSession+'&distance='+curDistance+'&end='+curEnd : ''), function(data) {
-        if (data.error==0) {
-            $('#x_Session').val(data.type+data.maxdist+data.session);
-            loadComboDistanceEnd();
-            $('#x_Distance').val(data.distance);
-            $('#x_End').val(data.end);
-            loadDevices();
-        }
-    });
-}
-
-function loadDevicesOrdered(obj) {
-    var oldOrd=$(obj).attr('ordertype');
-    var newOrd='ordasc';
-    $('[ordertype^=ord]').attr('ordertype','');
-    if(oldOrd=='ordasc') {
-        newOrd='orddesc';
-    }
-    $(obj).attr('ordertype', newOrd);
-
-    loadDevices();
-}
-
-function loadComboDistanceEnd(distance) {
-	var curSession = $('#x_Session').val();
-	var MaxEnds=$('#x_Session option:selected')[0].maxEnds
-	var Combo = $('#x_Distance')[0];
-	for(i=Combo.length-1; i>=0; --i) {
-		Combo.remove(i);
-	}
-	if(curSession.charAt(0)=='Q') {
-		for(i=0; i<curSession.charAt(1); i++) {
-			Combo.options[i] = new Option(i+1,i+1);
-			if(distance && distance==i+1) {
-				Combo.options[i].selected=true;
-			}
-		}
-		var Ends=MaxEnds.split(',');
-		var End=Ends[0]*1;
-	} else {
-		Combo.options[0] = new Option("--","");
-		var End=MaxEnds*1;
-	}
-	$('#x_End')[0].max=End+(curSession.charAt(0)=='Q' ? 0 : 1);
-	$('#x_End').val(0);
-}
-
-function adjustMaxEnd() {
-	var curSession = document.getElementById('x_Session').value;
-	var MaxEnds=document.getElementById('x_Session').options[document.getElementById('x_Session').selectedIndex].maxEnds
-	var curDistance=document.getElementById('x_Distance').value;
-	if(curDistance>0) {
-		var Ends=MaxEnds.split(',');
-		var End=Ends[curDistance-1];
-	} else {
-		var End=MaxEnds;
-	}
-	document.getElementById('x_End').max=End;
-	document.getElementById('x_End').value=0;
-}
-
-function loadComboSchedule() {
-	var onlyToday = (document.getElementById('x_onlyToday').checked==true ? 1:0);
-
-	$.get('Ind-GetComboSchedule.php?onlyToday='+onlyToday, function(XMLResp) {
-        // intercetto gli errori di IE e Opera
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Intercetto gli errori di Firefox
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            var Combo = document.getElementById('x_Session');
-
-            var Arr_Code = XMLRoot.getElementsByTagName('val');
-            var Arr_Name = XMLRoot.getElementsByTagName('display');
-
-            for(var i=Combo.length-1; i>=0; --i) {
-                Combo.remove(i);
-            }
-
-            Combo.options[0] = new Option("--","");
-            for (var i=0;i<Arr_Code.length;++i) {
-                Combo.options[i+1] = new Option(Arr_Name.item(i).firstChild.data,Arr_Code.item(i).firstChild.data);
-
-                // adding maxEnds support
-                var MaxEnds=Arr_Code.item(i).getAttribute('maxends');
-                Combo.options[i+1].maxEnds=MaxEnds;
-
-                if(Arr_Code.item(i).getAttribute('selected')=='1') {
-                    Combo.options[i+1].selected=true;
-                    var Ends=MaxEnds.split(',');
-                    var End=Ends[0];
-                    if(XMLRoot.getAttribute('end')>0) {
-                        End=Ends[XMLRoot.getAttribute('end')-1];
-                    }
-                    document.getElementById('x_End').max=End;
-                }
-            }
-            loadComboDistanceEnd(XMLRoot.getAttribute('distance'));
-            document.getElementById('x_End').value=XMLRoot.getAttribute('end');
-
-            ComboScheduleLoaded=true;
-        } else {
-        }
-    });
-}
-
-function loadDevices() {
-    clearTimeout(timerReference);
-
-    Query='?field='+$('[ordertype^=ord]').attr('id')+'&ord='+$('[ordertype^=ord]').attr('ordertype');
-
-    $.get('Ind-GetTabletsInfo.php'+Query, function(XMLResp) {
-        // intercetto gli errori di IE e Opera
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Intercetto gli errori di Firefox
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-
-        if (XMLRoot.getAttribute('error')==0) {
-            var Arr_Tablets = XMLRoot.getElementsByTagName('tablet');
-            var objTbody = document.getElementById('tablets');
-            var arrTablets=new Array();
-            for(var i=objTbody.rows.length-1; i>=0; --i) {
-                arrTablets[i]=1;
-//							objTbody.deleteRow(i);
-            }
-            var row;
-            for(var i=0; i<Arr_Tablets.length; i++) {
-                var device = Arr_Tablets.item(i).getAttribute('device');
-                if(row=document.getElementById('row_'+device)) {
-                    $(row).attr('order', Arr_Tablets.item(i).getAttribute('order'))
-                    // TargetNo
-                    var TgtRequested=Arr_Tablets.item(i).getAttribute('reqtarget');
-                    var TgtAssigned=Arr_Tablets.item(i).getAttribute('target');
-                    var tmp = row.cells[0];
-                    tmp.innerHTML = Arr_Tablets.item(i).getAttribute('target')
-                    if(Arr_Tablets.item(i).getAttribute('reqtarget') != '0'){
-                        tmp.innerHTML += '&nbsp;(<span>'+Arr_Tablets.item(i).getAttribute('reqtarget')+'</span>)';
-                        tmp.className = "TargetRequested";
-                    } else {
-                        tmp.className = "TargetAssigned";
-                    }
-                    row.cells[0].style.backgroundColor = Arr_Tablets.item(i).getAttribute('online');
-
-                    // auth request
-                    tmp=row.cells[1];
-                    tmp.innerHTML = (Arr_Tablets.item(i).getAttribute('authrequest')==1 ? '<img src="'+imgPath+'isk-exclamation.png" title="'+msgIskRequiresApproval+'">' : '');
-
-                    // tournament
-                    tmp = row.cells[2];
-                    tmp.innerHTML = '<img class="ClickableDiv" src="'+imgPath+'isk-status-'+(Arr_Tablets.item(i).getAttribute('tournament')==TourId ? 'ok':'noshoot')+'.png" onClick="setCompetitionDevice(\''+device+'\','+(Arr_Tablets.item(i).getAttribute('tournament')==TourId ? 'false':'true')+')">';
-
-                    //Application Pro/Lite and device Code
-                    row.cells[3].innerHTML = Arr_Tablets.item(i).getAttribute('code');
-                    row.cells[4].innerHTML = (Arr_Tablets.item(i).getAttribute('appdevversion')==1 ? Pro : Lite);
-                    row.cells[5].innerHTML = Arr_Tablets.item(i).getAttribute('appversion');
-
-                    //Device ID
-                    row.cells[6].innerHTML = device;
-
-/* SE LA RIACCENDI ANCORA SENZA MIA AUTORIZZAZIONE TI TOLGO I PRIVILEGI DI SCRITTURA - Teo
-* 								//Device Alive
-                    if(Arr_Tablets.item(i).getAttribute('tournament')==TourId) {
-                        if(row.cells[7].childElementCount>0) {
-                            row.cells[7].firstChild.src='Ind-GetTabletOnline.php?device='+Arr_Tablets.item(i).getAttribute('code');
-                        } else {
-                            row.cells[7].innerHTML='<img src="Ind-GetTabletOnline.php?device='+Arr_Tablets.item(i).getAttribute('code')+'" height="16" width="16">';
-                        }
-                    }
-*/
-                    row.cells[7].innerHTML=Arr_Tablets.item(i).getAttribute('seconds');
-
-                    //Device Status
-                    tmp = row.cells[8];
-                    if(Arr_Tablets.item(i).getAttribute('tournament')==TourId) {
-                        switch(Arr_Tablets.item(i).getAttribute('state')) {
-                        case "0":
-                            tmp.innerHTML = '<img src="'+imgPath+'isk-status-noshoot.png" title="'+msgIskStatusNoShoot+'">';
-                            tmp.className = "ToBeEnabled";
-                            break;
-                        case "1":
-                            tmp.innerHTML = '<img src="'+imgPath+'isk-status-ok.png" title="'+msgIskStatusOK+'">';
-                            tmp.className = "Center";
-                            break;
-                        case "2":
-                            tmp.innerHTML = '<img src="'+imgPath+'isk-status-unknown.png" title="'+msgIskStatusReloading+'">';
-                            tmp.className = "BarcodeRequested";
-                            break;
-                        case "3":
-                            tmp.innerHTML = '<img src="'+imgPath+'isk-status-ok-gray.png" title="'+msgIskStatusWaitConfirm+'">';
-                            tmp.className = "BarcodeRequested";
-                            break;
-                        }
-                    }
-
-                    // Change status bar
-                    tmp = row.cells[9];
-                    if(Arr_Tablets.item(i).getAttribute('tournament')==TourId) {
-                        tmp.innerHTML = '<img class="ClickableDiv" src="'+imgPath+'isk-status-noshoot.png" onClick="setStatusDevice(\''+device+'\',0)" title="'+msgIskDenyAccess+'">';
-                        tmp.innerHTML += '&nbsp;&nbsp;&nbsp;<img class="ClickableDiv" src="'+imgPath+'isk-status-unknown.png" onClick="setStatusDevice(\''+device+'\',2)" title="'+msgIskReloadConfig+'">';
-                        tmp.innerHTML += '&nbsp;&nbsp;&nbsp;<img class="ClickableDiv" src="'+imgPath+'isk-status-ok-gray.png" onClick="setStatusDevice(\''+device+'\',3)" title="'+msgIskForceConfirm+'">';
-                        tmp.innerHTML += '&nbsp;&nbsp;&nbsp;<img class="ClickableDiv" src="'+imgPath+'isk-status-ok.png" onClick="setStatusDevice(\''+device+'\',1)" title="'+msgIskApproveConfig+'">';
-                    }
-
-                    //Battery
-                    row.cells[10].innerHTML = Arr_Tablets.item(i).getAttribute('battery');
-
-                    //Ip Address
-                    row.cells[11].innerHTML = Arr_Tablets.item(i).getAttribute('ip');
-
-                    //Last Seen
-                    row.cells[12].innerHTML = Arr_Tablets.item(i).getAttribute('lastseen');
-                    row.cells[12].style.backgroundColor = Arr_Tablets.item(i).getAttribute('online');
-
-                    // remove is already set...
-                } else {
-                    var row = objTbody.insertRow(i);
-                    row.id='row_'+device;
-                    row.setAttribute('order', Arr_Tablets.item(i).getAttribute('order'))
-                    //TargetNo
-                    var cellIndex=0;
-                    var tmp = row.insertCell(cellIndex++);
-                    var TgtRequested=Arr_Tablets.item(i).getAttribute('reqtarget');
-                    var TgtAssigned=Arr_Tablets.item(i).getAttribute('target');
-                    var Group=0;
-                    tmp.id = 'tgt_'+device;
-                    // tmp.setAttribute('onClick', 'manageTargetNo(\''+device+'\',0'+(TgtAssigned!=TgtRequested && TgtRequested!=0 ? TgtRequested : TgtAssigned)+');');
-                    tmp.setAttribute('onClick', 'manageTargetGroup(\''+device+'\','+Group+');');
-                    tmp.innerHTML = TgtAssigned;
-                    if(TgtRequested != '0'){
-                        tmp.innerHTML += '&nbsp;(<span>'+TgtRequested+'</span>)';
-                        tmp.className = "TargetRequested";
-                    } else {
-                        tmp.className = "TargetAssigned";
-                    }
-	                tmp.style.backgroundColor = Arr_Tablets.item(i).getAttribute('online');
-
-	                // auth request
-                    tmp = row.insertCell(cellIndex++);
-                    tmp.innerHTML = (Arr_Tablets.item(i).getAttribute('authrequest')==1 ? '<img src="'+imgPath+'isk-exclamation.png" title="'+msgIskRequiresApproval+'">' : '');
-                    tmp.className = "Center";
-
-                    // tournament
-                    tmp = row.insertCell(cellIndex++);
-                    tmp.innerHTML = '<img class="ClickableDiv" src="'+imgPath+'isk-status-'+(Arr_Tablets.item(i).getAttribute('tournament')==TourId ? 'ok':'noshoot')+'.png" onClick="setCompetitionDevice(\''+device+'\','+(Arr_Tablets.item(i).getAttribute('tournament')==TourId ? 'false':'true')+')">';
-                    tmp.className = "Center";
-                    //Application Pro/Lite and device Code
-                    (row.insertCell(cellIndex++)).innerHTML = Arr_Tablets.item(i).getAttribute('code');
-                    (row.insertCell(cellIndex++)).innerHTML = (Arr_Tablets.item(i).getAttribute('appdevversion')==1 ? Pro : Lite);
-                    (row.insertCell(cellIndex++)).innerHTML = Arr_Tablets.item(i).getAttribute('appversion');
-                    //Device ID
-                    (row.insertCell(cellIndex++)).innerHTML = device;
-                    //Device Alive
-                    tmp = row.insertCell(cellIndex++);
-                    tmp.className = "Center";
-//							if(Arr_Tablets.item(i).getAttribute('tournament')==TourId) {
-//								tmp.innerHTML = '<img src="Ind-GetTabletOnline.php?device='+Arr_Tablets.item(i).getAttribute('code')+'" height="16" width="16">';
-//							}
-                    //Device Status
-                    tmp = row.insertCell(cellIndex++);
-                    tmp.className = "Center";
-                    if(Arr_Tablets.item(i).getAttribute('tournament')==TourId) {
-                        switch(Arr_Tablets.item(i).getAttribute('state')) {
-                        case "0":
-                            tmp.innerHTML = '<img src="'+imgPath+'isk-status-noshoot.png" title="'+msgIskStatusNoShoot+'">';
-                            tmp.className = "ToBeEnabled";
-                            break;
-                        case "1":
-                            tmp.innerHTML = '<img src="'+imgPath+'isk-status-ok.png" title="'+msgIskStatusOK+'">';
-                            break;
-                        case "2":
-                            tmp.innerHTML = '<img src="'+imgPath+'isk-status-unknown.png" title="'+msgIskStatusReloading+'">';
-                            tmp.className = "BarcodeRequested";
-                            break;
-                        case "3":
-                            tmp.innerHTML = '<img src="'+imgPath+'isk-status-ok-gray.png" title="'+msgIskStatusWaitConfirm+'">';
-                            tmp.className = "BarcodeRequested";
-                            break;
-                        }
-                    }
-                    // Change status bar
-                    tmp = row.insertCell(cellIndex++);
-                    tmp.className = "Center";
-                    tmp.style.whiteSpace='nowrap';
-                    if(Arr_Tablets.item(i).getAttribute('tournament')==TourId) {
-                        tmp.innerHTML = '<img class="ClickableDiv" src="'+imgPath+'isk-status-noshoot.png" onClick="setStatusDevice(\''+device+'\',0)" title="'+msgIskDenyAccess+'">';
-                        tmp.innerHTML += '&nbsp;&nbsp;&nbsp;<img class="ClickableDiv" src="'+imgPath+'isk-status-unknown.png" onClick="setStatusDevice(\''+device+'\',2)" title="'+msgIskReloadConfig+'">';
-                        tmp.innerHTML += '&nbsp;&nbsp;&nbsp;<img class="ClickableDiv" src="'+imgPath+'isk-status-ok-gray.png" onClick="setStatusDevice(\''+device+'\',3)" title="'+msgIskForceConfirm+'">';
-                        tmp.innerHTML += '&nbsp;&nbsp;&nbsp;<img class="ClickableDiv" src="'+imgPath+'isk-status-ok.png" onClick="setStatusDevice(\''+device+'\',1)" title="'+msgIskApproveConfig+'">';
-                    }
-                    //Battery
-                    (row.insertCell(cellIndex++)).innerHTML = Arr_Tablets.item(i).getAttribute('battery');
-                    //Ip Address
-                    tmp = row.insertCell(cellIndex++);
-                    tmp.innerHTML = Arr_Tablets.item(i).getAttribute('ip');
-                    tmp.className = "Right";
-                    //Last Seen
-                    tmp = row.insertCell(cellIndex++);
-                    tmp.innerHTML = Arr_Tablets.item(i).getAttribute('lastseen');
-                    tmp.className = "Right";
-                    tmp.style.backgroundColor = Arr_Tablets.item(i).getAttribute('online');
-
-                    // remove device from DB
-                    tmp = row.insertCell(cellIndex++);
-                    tmp.innerHTML = '<input type="button" class="ClickableDiv" value="'+msgRemove+'" onclick="if(confirm(\''+MsgConfirm+'\')) {window.location.href=\'?remove='+device+'\'}">';
-                    tmp.style.textAlign = "center";
-                }
-            }
-
-
-            var rows = $(objTbody).find('tr[order]').get();
-            rows.sort(function(a, b) {
-                var keyA = parseInt($(a).attr('order'));
-                var keyB = parseInt($(b).attr('order'));
-                if (keyA < keyB) return -1;
-                if (keyA > keyB) return 1;
-                return 0;
-            });
-            $.each(rows, function(index, row) {
-                $(objTbody).append(row);
-            });
-
-        } else {
-        }
-        timerReference = setTimeout(function(){ loadDevices(); }, 5000);
-    });
-}
-
-function manageTargetGroup(device, Group) {
-    var d = document.getElementById('PopUp');
-
-    $('#PopDevice').html(device);
-    $('#PopGroup').html(String.fromCharCode(65+Group));
-    var tgt=$('#tgt_'+device);
-    var req=$(tgt).find('span').html();
-    var tgt=tgt.html();
-
-    if(parseInt(req)>0) {
-        tgt+=' <input type="button" value="Accept" onclick="AcceptRequest('+req+')">';
-    }
-
-    $('#PopTarget').html(tgt);
-
-    $('#NewTarget').val($('#tgt_'+device).html());
-    $('#NewGroup').val(Group);
-    $('#PopUp').show();
-
-}
-
-function AcceptRequest(tgt) {
-    $('#NewTarget').val(tgt);
-    AssignGroupTarget();
-}
-
-function AssignGroupTarget() {
-    var device=$('#PopDevice').html();
-    $.get('Ind-SetDeviceInfo.php?device='+device+'&setTarget='+$('#NewTarget').val(), function(XMLResp) {
-        // intercetto gli errori di IE e Opera
-        if (!XMLResp || !XMLResp.documentElement) {
-            throw("XML not valid:\n"+XMLResp.responseText);
-        }
-
-        // Intercetto gli errori di Firefox
-        var XMLRoot;
-        if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-            throw("XML not valid:\n");
-        }
-
-        XMLRoot = XMLResp.documentElement;
-        // document.getElementById('tgt_'+device).setAttribute('onClick','manageTargetNo(\''+device+'\','+(objText.value)+');');
-
-        closePopup();
-    });
-}
-
-function setStatusDevice(device, newStatus) {
-	if(newStatus==0 || confirm(MsgConfirm) ) {
-		clearTimeout(timerReference);
-		$.get('Ind-SetDeviceInfo.php?device='+device+'&setStatus='+newStatus, function(XMLResp) {
-
-            // intercetto gli errori di IE e Opera
-            if (!XMLResp || !XMLResp.documentElement) {
-                throw("XML not valid:\n"+XMLResp.responseText);
-            }
-
-            // Intercetto gli errori di Firefox
-            var XMLRoot;
-            if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-                throw("XML not valid:\n");
-            }
-
-            XMLRoot = XMLResp.documentElement;
-            if (XMLRoot.getAttribute('error')==0) {
-                loadDevices();
-            } else {
-                timerReference = setTimeout(function(){ loadDevices(); }, 5000)
-            }
-        });
-	}
-}
-
-function setCompetitionDevice(device,enable) {
-	if(enable || confirm(MsgConfirm) ) {
-		clearTimeout(timerReference);
-		$.get('Ind-SetDeviceInfo.php?device='+device+'&setCompetition='+enable, function(XMLResp) {
-            // intercetto gli errori di IE e Opera
-            if (!XMLResp || !XMLResp.documentElement) {
-                throw("XML not valid:\n"+XMLResp.responseText);
-            }
-
-            // Intercetto gli errori di Firefox
-            var XMLRoot;
-            if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror") {
-                throw("XML not valid:\n");
-            }
-
-            XMLRoot = XMLResp.documentElement;
-            if (XMLRoot.getAttribute('error')==0) {
-                loadDevices();
-            } else {
-                timerReference = setTimeout(function(){ loadDevices(); }, 5000)
-            }
-        });
-	}
-}
-
-function closePopup() {
-    $('#PopUp').hide();
-}
-
diff --git a/src/Api/ISK/index.php b/src/Api/ISK/index.php
deleted file mode 100644
index 45f880fa..00000000
--- a/src/Api/ISK/index.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/*
-THIS FILE IS ESSENTIAL TO MAKE THE APIS TO GET RECOGNIZED BY IANSEO
-
-* HOW IT WORKS
-the "codename" of the API will be used in ianseo. The codename is the name of the directory containing the Api.
-The essentials are:
-
-* ApiConfig.php
-this file gets included in the Competition Setup (Tournament/index.php)
-* DrawQRCode.php
-this file is used by the ScoreCard printout routines.
- */
-
-require_once(__DIR__.'/config-ianseo.php');
-
-if(!ISK_PRO) {
-	CD_redirect('./Lite.php');
-}
-
-CheckTourSession(true);
-checkACL(AclISKServer, AclReadWrite);
-
-
-if(!empty($_REQUEST['remove'])) {
-	safe_w_sql("delete from IskData where IskDtDevice=".StrSafe_DB($_REQUEST['remove']));
-	safe_w_sql("delete from IskDevices where IskDvDevice=".StrSafe_DB($_REQUEST['remove']));
-	cd_redirect('./');
-}
-
-require_once('Common/Lib/CommonLib.php');
-
-$PAGE_TITLE=get_text('ISK-Configuration');
-$JS_SCRIPT=array(
-	phpVars2js(array(
-		'TourId'=>$_SESSION["TourId"],
-		'MsgConfirm'=>htmlspecialchars(get_text('MsgAreYouSure')),
-		'MsgOk'=>get_text('CmdOk'),
-		'msgRemove'=>htmlspecialchars(get_text('ISK-Remove', 'Api')),
-		'Lite'=>get_text('ISK-Lite-Name', 'Api'),
-		'Pro'=>get_text('ISK-Pro-Name', 'Api'),
-		'msgIskRequiresApproval'=>htmlspecialchars(get_text('ISK-RequiresApproval', 'Api')),
-		'msgIskDenyAccess'=>htmlspecialchars(get_text('ISK-DenyAccess', 'Api')),
-		'msgIskReloadConfig'=>htmlspecialchars(get_text('ISK-ReloadConfig', 'Api')),
-		'msgIskForceConfirm'=>htmlspecialchars(get_text('ISK-ForceConfirm', 'Api')),
-		'msgIskApproveConfig'=>htmlspecialchars(get_text('ISK-ApproveConfig', 'Api')),
-		'msgIskStatusNoShoot'=>htmlspecialchars(get_text('ISK-StatusNoShoot', 'Api')),
-		'msgIskStatusReloading'=>htmlspecialchars(get_text('ISK-StatusReloading', 'Api')),
-		'msgIskStatusWaitConfirm'=>htmlspecialchars(get_text('ISK-StatusWaitConfirm', 'Api')),
-		'msgIskStatusOK'=>htmlspecialchars(get_text('ISK-StatusOK', 'Api')),
-		'imgPath'=>$CFG->ROOT_DIR.'Common/Images/',
-		)),
-	'<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/js/jquery-3.2.1.min.js"></script>',
-	'<script type="text/javascript" src="./index.js"></script>',
-	'<link href="ISK.css" rel="stylesheet" type="text/css">',
-);
-
-$ONLOAD=' onload="loadDevices()"';
-
-include('Common/Templates/head.php');
-
-echo '<table class="Tabella">';
-echo '<tr><th class="Title" colspan="14">' . get_text('ISK-Configuration') . '</th></tr>';
-echo '<tr>';
-echo '<th colspan="11">' . get_text('Session') . '</th>';
-// echo '<th colspan="3" width="5%">' . get_text('ISK-CheckAlive', 'Api') . '</th>';
-echo '<th>' . get_text('Distance', 'Tournament') . '</th>';
-echo '<th>' . get_text('Volee', 'HTT') . '</th>';
-echo '<th>&nbsp;</th>';
-echo '</tr>';
-echo '<tr>';
-echo '<td colspan="11">
-	<select name="x_Session" id="x_Session" onChange="loadComboDistanceEnd();"></select><br>
-	<input type="checkbox" value="1" id="x_onlyToday" onClick="loadComboSchedule();">' . get_text('OnlyToday', 'Tournament') . '
-	<script>loadComboSchedule();</script>
-	</td>';
-// echo '<td colspan="3" align="center"><input type="button" value="' . get_text('ISK-CheckAlive', 'Api') . '" onClick="CheckTablets();"></td>';
-echo '<td><select name="x_Distance" id="x_Distance" onChange="adjustMaxEnd();"></select></td>';
-echo '<td><input type="number" name="x_End" id="x_End" min="0" max="12" value="0"></select></td>';
-echo '<td>
-	<input type="button" id="setCurrent" value="' . get_text('CmdSave') . '" onClick="saveSequence(true);">
-	<input type="button" id="refreshCurrent" value="' . get_text('CmdCancel') . '" onClick="saveSequence(false);">
-	</td>';
-echo '</tr>';
-
-echo '<tr class="divider"><td colspan="12"></td></tr>';
-
-echo '<tr>';
-echo '<th width="7%" id="tgtOrder" onclick="loadDevicesOrdered(this)" ordertype="ordasc">' . get_text('Target') . '</th>';
-echo '<th width="7%">' . get_text('ISK-AuthRequest', 'Api') . '</th>';
-echo '<th width="8%">' . get_text('Tournament', 'Tournament') . '</th>';
-echo '<th colspan="3" widht="10%" id="codeOrder" onclick="loadDevicesOrdered(this)">' . get_text('ISK-AppInfo', 'Api') . '</th>';
-echo '<th id="idOrder" onclick="loadDevicesOrdered(this)">' . get_text('ISK-DeviceId', 'Api') . '</th>';
-echo '<th>' . get_text('ISK-DeviceAlive', 'Api') . '</th>';
-echo '<th>' . get_text('ISK-DeviceStatus', 'Api') . '</th>';
-echo '<th>' . get_text('ISK-DeviceStatusWanted', 'Api') . '</th>';
-echo '<th id="batteryOrder" onclick="loadDevicesOrdered(this)">' . get_text('ISK-DeviceBattery', 'Api') . '</th>';
-echo '<th>' . get_text('ISK-DeviceIpAddress', 'Api') . '</th>';
-echo '<th>' . get_text('ISK-DeviceLastSeen', 'Api') . '</th>';
-echo '<th>' . get_text('ISK-Remove', 'Api') . '</th>';
-echo '</tr>';
-echo '<tbody id="tablets">';
-echo '</tbody>';
-echo '</table>';
-
-$tmp='';
-foreach(range('A','Z') as $k) {
-	$tmp.='<option value="'.(ord($k)-65).'">'.$k.'</option>';
-}
-echo '<div id="PopUp" class="PopUp">
-	<div class="TargetTitle"><img align="right" src="'.$CFG->ROOT_DIR.'Common/Images/status-noshoot.gif" onClick="closePopup()">'.get_text('ManageGroupTarget', 'Api').'</div>
-	<table align="center">
-		<tr>
-			<td>Device</td>
-			<td id="PopDevice"></td>
-		</tr>
-		<tr>
-			<td>Group</td>
-			<td id="PopGroup"></td>
-		</tr>
-		<tr>
-			<td>Target</td>
-			<td id="PopTarget"></td>
-		</tr>';
-//echo '<tr>
-//			<th>New Group</th>
-//			<td><select id="NewGroup">'.$tmp.'</select></td>
-//		</tr>';
-echo '<tr>
-			<th>New Target</th>
-			<td><input type="number" id="NewTarget" min="1" max="255"></td>
-		</tr>
-	</table>
-	<div id="PopUpCmd"><input type="button" id="PopupImport" value="'.get_text('CmdOk').'" onclick="AssignGroupTarget()">
-			<input type="button" value="'.get_text('Close').'" onclick="closePopup()">
-					</div>
-	</div>';
-
-include('Common/Templates/tail.php');
diff --git a/src/Api/ISK/menu.php b/src/Api/ISK/menu.php
deleted file mode 100644
index 3165968e..00000000
--- a/src/Api/ISK/menu.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-if($_SESSION['UseApi']==2) {
-    if ($acl[AclISKServer] == AclReadWrite) {
-		$ret['API'][] = get_text('ISK-Configuration') . '|' . $CFG->ROOT_DIR . 'Api/ISK/';
-        $ret['API'][] = get_text('ISK-Results') . '|' . $CFG->ROOT_DIR . 'Api/ISK/Results.php';
-    }
-    if ($acl[AclISKServer] >= AclReadOnly) {
-        $ret['API'][] = get_text('ISK-Anomalies', 'Api') . '|' . $CFG->ROOT_DIR . 'Api/ISK/Anomalies.php';
-    }
-    if ($acl[AclISKServer] == AclReadWrite) {
-        $ret['API'][] = MENU_DIVIDER;
-        $ret['API'][] = get_text('MenuLM_QrCodes') . '|' . $CFG->ROOT_DIR . 'Api/ISK/QRcodes.php';
-        $ret['API'][] = get_text('ISK-GetQRData') . '|' . $CFG->ROOT_DIR . 'Api/ISK/GetQRData.php';
-        $ret['API'][] = MENU_DIVIDER;
-    }
-}
-if ($acl[AclISKServer] >= AclReadWrite) {
-    $ret['API'][] = get_text('ManageLockedSessions', 'ISK') . '|' . $CFG->ROOT_DIR . 'Api/ISK/Sessions.php';
-    if($_SESSION['UseApi']==1) {
-        $ret['API'][] = get_text('AutoImportSettings', 'ISK') . '|' . $CFG->ROOT_DIR . 'Api/ISK/';
-    }
-    $ret['API'][] = get_text('API-TargetGrouping', 'Api') . '|' . $CFG->ROOT_DIR . 'Api/ISK/ApiGrouping.php';
-}
diff --git a/src/Api/JSON/MatchSummary.php b/src/Api/JSON/MatchSummary.php
index 61de566f..a22963c1 100644
--- a/src/Api/JSON/MatchSummary.php
+++ b/src/Api/JSON/MatchSummary.php
@@ -558,7 +558,7 @@
                                         // check the correct value of $ToWin
                                         if(!in_array($ToWin, $vSec['meta']['targetTypeValues'])) {
                                             foreach(array_reverse($vSec['meta']['targetTypeValues']) as $v) {
-                                                if($v>$ToWin) {
+                                                if(intval($v)>$ToWin) {
                                                     $ToWin=$v;
                                                     break;
                                                 }
@@ -606,7 +606,7 @@
                                     // check the correct value of $ToWin
                                     if(!in_array($ToWin, $vSec['meta']['targetTypeValues'])) {
                                         foreach(array_reverse($vSec['meta']['targetTypeValues']) as $v) {
-                                            if($v>$ToWin) {
+                                            if(intval($v)>$ToWin) {
                                                 $ToWin=$v;
                                                 break;
                                             }
@@ -1126,7 +1126,7 @@
                                     // check the correct value of $ToWin
                                     if(!in_array($ToWin, $vSec['meta']['targetTypeValues'])) {
                                         foreach(array_reverse($vSec['meta']['targetTypeValues']) as $v) {
-                                            if($v>$ToWin) {
+                                            if(intval($v)>$ToWin) {
                                                 $ToWin=$v;
                                                 break;
                                             }
@@ -1174,7 +1174,7 @@
                                 // check the correct value of $ToWin
                                 if(!in_array($ToWin, $vSec['meta']['targetTypeValues'])) {
                                     foreach(array_reverse($vSec['meta']['targetTypeValues']) as $v) {
-                                        if($v>$ToWin) {
+                                        if(intval($v)>$ToWin) {
                                             $ToWin=$v;
                                             break;
                                         }
diff --git a/src/Api/JSON/RegisterPushService.php b/src/Api/JSON/RegisterPushService.php
index f03ffb49..22b26cb1 100644
--- a/src/Api/JSON/RegisterPushService.php
+++ b/src/Api/JSON/RegisterPushService.php
@@ -38,6 +38,7 @@
 	registerJack("FinArrUpdate", "API-JSON", dirname(__FILE__).'/JackInclude.php', 'JackRunUpdate_MatchUpdate(\'@Event\', @Team, @MatchNo, @TourId);',$TourId);
 	registerJack("FinLiveUpdate", "API-JSON", dirname(__FILE__).'/JackInclude.php', 'JackRunUpdate_LiveUpdate(\'@Event\', @Team, @MatchNo, @TourId);',$TourId);
 	registerJack("FinConfirmEnd", "API-JSON", dirname(__FILE__).'/JackInclude.php', 'JackRunUpdate_MatchUpdate(\'@Event\', @Team, @MatchNo, @TourId);',$TourId);
+    registerJack("MatchFinished", "API-JSON", dirname(__FILE__).'/JackInclude.php', 'JackRunUpdate_MatchUpdate(\'@Event\', @Team, @MatchNo, @TourId);',$TourId);
 	registerJack("FinShootingFirst", "API-JSON", dirname(__FILE__).'/JackInclude.php', 'JackRunUpdate_MatchUpdate(\'@Event\', @Team, @MatchNo, @TourId);',$TourId);
 	registerJack("FinRankUpdate", "API-JSON", dirname(__FILE__).'/JackInclude.php', 'JackRunUpdate_RankUpdate(\'@Event\', @Team, @TourId);',$TourId);
     registerJack("QRRankUpdate", "API-JSON", dirname(__FILE__).'/JackInclude.php', 'JackRunUpdate_QRRankUpdate(\'@Event\', @Team, @TourId);',$TourId);
diff --git a/src/Common/BlockDefines.php b/src/Common/BlockDefines.php
index da300c6b..52f2a295 100644
--- a/src/Common/BlockDefines.php
+++ b/src/Common/BlockDefines.php
@@ -37,23 +37,21 @@
 
 define ('AclRoot', 0);
 define ('AclCompetition', 1);
-define ('AclParticipants', 2);
-define ('AclQualification', 3);
-define ('AclEliminations', 4);
-define ('AclIndividuals', 5);
-define ('AclTeams', 6);
-define ('AclAccreditation', 7);
-define ('AclModules', 8);
-define ('AclInternetPublish', 9);
-define ('AclAPI', 10);
-define ('AclISKClient', 11);
-define ('AclISKServer', 12);
-define ('AclSpeaker', 13);
-define ('AclOutput', 14);
-define ('AclOdf', 15);
-define ('AclRobin', 16);
-define ('AclRunArchery', 16);
-
+define ('AclInternetPublish', 2);
+define ('AclParticipants', 3);
+define ('AclAccreditation', 4);
+define ('AclQualification', 5);
+define ('AclEliminations', 6);
+define ('AclRobin', 7);
+define ('AclIndividuals', 8);
+define ('AclTeams', 9);
+define ('AclSpeaker', 10);
+define ('AclOutput', 11);
+define ('AclISKClient', 12);
+define ('AclISKServer', 13);
+define ('AclModules', 14);
+define ('AclAPI', 15);
+define ('AclOdf', 16);
 
 $limitedACL = array(
     AclRoot => AclReadWrite,
@@ -67,23 +65,34 @@
 $listACL = array(
     AclRoot => 'AclRoot',
     AclCompetition => 'AclCompetition',
+    AclInternetPublish => 'AclInternet',
     AclParticipants => 'AclParticipants',
+    AclAccreditation => 'AclAccreditation',
     AclQualification => 'AclQualification',
     AclEliminations => 'AclEliminations',
+    AclRobin => 'AclRobin',
     AclIndividuals => 'AclIndividuals',
     AclTeams => 'AclTeams',
-    AclAccreditation => 'AclAccreditation',
-    AclModules => 'AclModules',
-    AclInternetPublish => 'AclInternet',
-    AclAPI => 'AclAPI',
-    AclISKClient => 'AclISKClient',
-    AclISKServer => 'AclISKServer',
     AclSpeaker => 'AclSpeaker',
     AclOutput => 'AclOutput',
-    AclOdf => 'AclOdf',
-    AclRobin => 'AclRobin',
+    AclISKClient => 'AclISKClient',
+    AclISKServer => 'AclISKServer',
+    AclModules => 'AclModules',
+    AclAPI => 'AclAPI'
 );
+if(!empty($CFG->ODF)) {
+    $listACL[AclOdf] = 'AclOdf';
+}
 
+if($CFG->USERAUTH) {
+    require_once('Modules/Authentication/BlockFunction.php');
+    define ('AuthModule', true);
+} else {
+    define ('AuthModule', false);
+    function isAuthEnabled() {return array(0,1);}
+    function authActualACL($authEnabled, &$acl) {}
+    function authHasACL($authEnabled, $feature, $level, $toCode) {return null;}
+}
 /*
  * La chiave rappresenta il bit di cui si è chiesto l'unset
  * Il vecchio valore nel db viene posto in AND con il valore corrispondente alla chiave
@@ -127,15 +136,19 @@ function getBlocksToSet() {
 function actualACL() {
     global $listACL, $CFG;
     $lockEnabled = getModuleParameter("ACL", "AclEnable", "00");
+    list($authEnabled, $checkCompAcl) = isAuthEnabled();
     $ip = $_SERVER["REMOTE_ADDR"];
-    if($ip == '127.0.0.1' OR $ip == '::1' OR in_array($ip,$CFG->ACLExcluded) OR $lockEnabled[0] == "0") {
+    if($ip == '127.0.0.1' OR $ip == '::1' OR in_array($ip,$CFG->ACLExcluded) OR ($lockEnabled[0] == "0" and $authEnabled == 0)) {
         $acl = array_fill(0, count($listACL), AclReadWrite);
     } else {
         $acl = array_fill(0, count($listACL), AclNoAccess);
-        $Sql = "SELECT AclDtFeature, AclDtLevel FROM AclDetails WHERE AclDtTournament=" . intval($_SESSION['TourId']) . " AND AclDtIP='{$ip}'";
-        $q = safe_r_SQL($Sql);
-        while($r=safe_fetch($q)) {
-            $acl[$r->AclDtFeature] = $r->AclDtLevel;
+        authActualACL($authEnabled, $acl);
+        if($lockEnabled and $checkCompAcl) {
+            $Sql = "SELECT AclDtFeature, AclDtLevel FROM AclDetails WHERE AclDtTournament=" . intval($_SESSION['TourId']) . " AND AclDtIP='{$ip}'";
+            $q = safe_r_SQL($Sql);
+            while ($r = safe_fetch($q)) {
+                $acl[$r->AclDtFeature] = $r->AclDtLevel;
+            }
         }
     }
     return $acl;
@@ -151,7 +164,6 @@ function panicACL() {
             setModuleParameter("ACL","AclEnable","00",$TourId);
             die();
         }
-
     }
 }
 
@@ -167,23 +179,32 @@ function hasACL($feature, $level, $TourId=0) {
     if ($TourId == 0 AND !empty($_SESSION['TourId'])) {
         $TourId = intval($_SESSION['TourId']);
     }
+    $TourCode = getCodeFromId($TourId);
     $lockEnabled = getModuleParameter("ACL", "AclEnable", "00", $TourId, true);
     if($lockEnabled[0] == "1") {
         $INFO->ACLEnabled = true;
     }
+    list($authEnabled, $checkCompAcl) = isAuthEnabled();
+    if($authEnabled == 1) {
+        $INFO->ACLEnabled = true;
+    }
     $ip = $_SERVER["REMOTE_ADDR"];
     if($ip == '127.0.0.1' OR $ip == '::1' OR in_array($ip,$CFG->ACLExcluded)) {
         return true;
     } else {
-        if ($lockEnabled[0] == "1") {
-            $Sql = "SELECT AclDtLevel FROM AclDetails WHERE AclDtTournament={$TourId} AND AclDtIP='{$ip}' && AclDtFeature IN (" . implode(',', $feature) . ") ORDER BY AclDtLevel ASC";
-            $q = safe_r_SQL($Sql);
-            if ($r = safe_fetch($q) and $level <= $r->AclDtLevel) {
-                return true;
-            } else if($level==AclNoAccess) {
-                return false;
+        if($INFO->ACLEnabled) {
+            if(!is_null($tmpReturn = authHasACL($authEnabled, $feature, $level, $TourCode))) {
+                return $tmpReturn;
+            }
+            if ($lockEnabled[0] == "1" and $checkCompAcl) {
+                $Sql = "SELECT AclDtLevel FROM AclDetails WHERE AclDtTournament={$TourId} AND AclDtIP='{$ip}' && AclDtFeature IN (" . implode(',', $feature) . ") ORDER BY AclDtLevel ASC";
+                $q = safe_r_SQL($Sql);
+                if ($r = safe_fetch($q) and $level <= $r->AclDtLevel) {
+                    return true;
+                } else if ($level == AclNoAccess) {
+                    return false;
+                }
             }
-
         } else {
             return true;
         }
@@ -193,68 +214,72 @@ function hasACL($feature, $level, $TourId=0) {
 }
 
 function checkACL($feature, $level, $redirect=true, $TourId=0) {
-    global $INFO, $CFG;
+    global $INFO, $CFG, $listACL;
     if(!is_array($feature)) {
         $feature = array($feature);
     }
     $INFO->ACLReqfeatures = $feature;
     $INFO->ACLReqlevel = $level;
     $INFO->ACLEnabled = false;
-
     if ($TourId == 0 AND !empty($_SESSION['TourId'])) {
         $TourId = intval($_SESSION['TourId']);
     }
+    $TourCode = getCodeFromId($TourId);
     $lockEnabled = getModuleParameter("ACL", "AclEnable", "00", $TourId, true);
     if($lockEnabled[0] == "1") {
         $INFO->ACLEnabled = true;
     }
-
+    list($authEnabled, $checkCompAcl) = isAuthEnabled();
+    if($authEnabled == 1) {
+        $INFO->ACLEnabled = true;
+    }
     $ip = $_SERVER["REMOTE_ADDR"];
     if($ip == '127.0.0.1' OR $ip == '::1' OR in_array($ip,$CFG->ACLExcluded)) {
         return AclReadWrite;
     } else {
-        //record New Ips
+        //record New Ips - Match against template if needed
         if($lockEnabled[1] == "1") {
-            $Sql="SELECT AclIP FROM ACL WHERE AclTournament={$TourId} AND AclIP='{$ip}'";
+            $Sql="SELECT `AclIP` FROM `ACL` WHERE `AclTournament`={$TourId} AND `AclIP`='{$ip}'";
             $q = safe_r_SQL($Sql);
             if(safe_num_rows($q)==0) {
-                $Sql = "SELECT AclIP FROM ACL WHERE AclTournament={$TourId} AND '{$ip}' LIKE REPLACE(AclIp,'*','%')";
+                $Sql = "SELECT `AclTeFeatures`, `AclTePattern`, ('{$ip}' LIKE REPLACE(`AclTePattern`,'*','%')) as isMatch FROM `AclTemplates` WHERE `AclTeTournament`={$TourId} ORDER BY '{$ip}' LIKE REPLACE(`AclTePattern`,'*','%')";
                 $q = safe_r_SQL($Sql);
-                if(safe_num_rows($q)!=0) {
-                    $ruleRs=safe_fetch($q);
-                    $Sql = "SELECT * FROM `AclDetails` WHERE `AclDtTournament` = {$TourId} and AclDtIP='{$ruleRs->AclIP}'";
-                    $q = safe_r_SQL($Sql);
-                    while($r = safe_fetch($q)) {
-                        safe_w_SQL("INSERT INTO `AclDetails` (`AclDtTournament`, `AclDtIP`, `AclDtFeature`, `AclDtLevel`) VALUES ({$TourId}, '{$ip}', {$r->AclDtFeature}, {$r->AclDtLevel});");
-                    }
-                } else {
-                    $Sql = "SELECT `AclIP`, `AclNick` FROM `ACL` WHERE `AclTournament`=$TourId AND `AclIP` LIKE '0.0.0.%' ORDER BY `AclIP`";
-                    $q = safe_r_SQL($Sql);
-                    while($ruleRs=safe_fetch($q)) {
-                        if(preg_match('/'.$ruleRs->AclNick.'/',$ip)) {
-                            $Sql = "SELECT * FROM `AclDetails` WHERE `AclDtTournament` = {$TourId} and AclDtIP='{$ruleRs->AclIP}'";
-                            $q = safe_r_SQL($Sql);
-                            while($r = safe_fetch($q)) {
-                                safe_w_SQL("INSERT INTO `AclDetails` (`AclDtTournament`, `AclDtIP`, `AclDtFeature`, `AclDtLevel`) VALUES ({$TourId}, '{$ip}', {$r->AclDtFeature}, {$r->AclDtLevel});");
-                            }
-                            break;
+                while($r=safe_fetch($q)) {
+                    if(($r->isMatch OR preg_match('/'.$r->AclTePattern.'/',$ip)) and $r->AclTeFeatures) {
+                        foreach (explode('#', $r->AclTeFeatures) as $ft) {
+                            $tmp = explode("|", $ft);
+                            safe_w_SQL("INSERT INTO `AclDetails` (`AclDtTournament`, `AclDtIP`, `AclDtFeature`, `AclDtSubFeature`, `AclDtLevel`) 
+                                VALUES ($TourId, '$ip', $tmp[0], $tmp[1], $tmp[2])
+                                ON DUPLICATE KEY UPDATE `AclDtFeature`=$tmp[0], `AclDtSubFeature`=$tmp[1], `AclDtLevel`=$tmp[2]");
                         }
                     }
                 }
-                safe_w_SQL("INSERT INTO ACL (AclTournament, AclIP, AclNick, AclEnabled) VALUES ({$TourId},'{$ip}',NOW(),1)");
+                safe_w_SQL("INSERT IGNORE INTO ACL (AclTournament, AclIP, AclNick, AclEnabled) VALUES ({$TourId},'{$ip}',NOW(),1)");
             }
         }
         //Check Valid
-        if ($lockEnabled[0] == "1") {
-            $Sql = "SELECT AclDtLevel FROM AclDetails WHERE AclDtTournament={$TourId} AND AclDtIP='{$ip}' && AclDtFeature IN (" . implode(',', $feature) . ") ORDER BY AclDtLevel ASC";
-            $q = safe_r_SQL($Sql);
-            if ($r = safe_fetch($q) and $level <= $r->AclDtLevel) {
-                return intval($r->AclDtLevel);
-            } else if($level==AclNoAccess) {
-                return AclNoAccess;
-            } else {
+        if($INFO->ACLEnabled) {
+            if ($lockEnabled[0] == "1" and $checkCompAcl) {
+                $Sql = "SELECT `AclDtLevel` FROM `AclDetails` WHERE AclDtTournament={$TourId} AND AclDtIP='{$ip}' && AclDtFeature IN (" . implode(',', $feature) . ") ORDER BY AclDtLevel ASC";
+                $q = safe_r_SQL($Sql);
+                if ($r = safe_fetch($q) and $level <= $r->AclDtLevel) {
+                    return intval($r->AclDtLevel);
+                } else if ($level == AclNoAccess) {
+                    return AclNoAccess;
+                } else {
+                    if ($redirect) {
+                        CD_redirect($CFG->ROOT_DIR . 'noAccess.php');
+                    } else {
+                        http_response_code(404);
+                    }
+                    die();
+                }
+            }
+            if(!is_null($tmpReturn = authCheckACL($authEnabled, $checkCompAcl, $feature, $level, $TourCode)) and $tmpReturn !== false) {
+                return $tmpReturn;
+            } else if($tmpReturn === false) {
                 if ($redirect) {
-                    CD_redirect($CFG->ROOT_DIR.'noAccess.php');
+                    CD_redirect($CFG->ROOT_DIR . 'noAccess.php');
                 } else {
                     http_response_code(404);
                 }
diff --git a/src/Common/DebugOverrides.php b/src/Common/DebugOverrides.php
deleted file mode 100644
index 71bd372d..00000000
--- a/src/Common/DebugOverrides.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-ini_set('display_errors', true);
-$CFG->TRACE_QUERRIES = false;
-
-//$CFG->IanseoServer='http://ianseonet/';
-/*
-$CFG->WaWrapper='http://wa-api.hippo/';
-$CFG->ExtranetWrapper='http://wa.hippo/';
-$CFG->InfoSystem='http://info.hippo/';
-*/
- //$CFG->DB_NAME = 'ianseo_IS';
-
-// $CFG->R_HOST = '24.111.81.72';
-// $CFG->W_HOST = '24.111.81.72';
-
-$CFG->ODF=true;
-//$CFG->USERAUTH = true;
-$CFG->ACLExcluded=array(
-    '192.168.42.40',
-    '192.168.42.46',
-    '192.168.42.47'
-);
diff --git a/src/Common/Fun_Export.php b/src/Common/Fun_Export.php
index 1e78003b..b4ed54ed 100644
--- a/src/Common/Fun_Export.php
+++ b/src/Common/Fun_Export.php
@@ -1,398 +1,2 @@
 <?php
-
-function export_tournament($TourId, $Complete=false, $InfoSystem='') {
-	$Gara=array();
-	// Inizia prendendo il torneo...
-	$Select = "SELECT * FROM Tournament WHERE ToId=" . StrSafe_DB($TourId) . " ";
-	$Rs=safe_r_sql($Select);
-
-	if (!$Rs || safe_num_rows($Rs)!=1)
-	{
-		print get_text('CrackError');
-		exit;
-	}
-
-	$Gara['Tournament']=safe_fetch_assoc($Rs);
-
-	// prendo le Countries
-	$Select = "SELECT * FROM Countries WHERE CoTournament=" . StrSafe_DB($TourId) . " ";
-	$Rs=safe_r_sql($Select);
-	while($MyRow=safe_fetch_assoc($Rs)){
-		$Gara['Countries'][$MyRow['CoId']]=$MyRow;
-	}
-
-	// prendo le entries
-	$Select = "SELECT * FROM Entries WHERE EnTournament=" . StrSafe_DB($TourId) . " ";
-	$Rs=safe_r_sql($Select);
-	while($MyRow=safe_fetch_assoc($Rs)){
-		$Gara['Entries'][$MyRow['EnId']]=$MyRow;
-	}
-
-	// define which keys are not to be exported!
-	$NotExportableKeys=array();
-	$NotExportableKeys['ModulesParameters'][]="!(MpModule='Mailing' and MpParameter='SmtpServer')";
-	$NotExportableKeys['ModulesParameters'][]="!(MpModule='SendToIanseo' and MpParameter='Credentials')";
-
-	$tabs=array(
-		'AccColors' => 'Ac',
-		'AccEntries' => 'AE',
-		'AccPrice' => 'AP',
-		'ACL' => 'Acl',
-		'AclDetails' => 'AclDt',
-		'AvailableTarget' => 'At',
-		'Awards' => 'Aw',
-		'Awarded' => 'Aw',
-		'BackNumber' => 'Bn',
-		'CasScore' => 'CaS',
-		'CasTeam' => 'Ca',
-		'CasTeamFinal' => 'CTF',
-		'CasTeamTarget' => 'CTT',
-		'Classes' => 'Cl',
-		'ClassWaEquivalents' => 'ClWaEq',
-		'ClubTeam' => 'CT',
-		'ClubTeamScore' => 'CTS',
-		'Divisions' => 'Div',
-		'DistanceInformation' => 'Di',
-		'DocumentVersions' => 'Dv',
-		'Eliminations' => 'El',
-		'Emails' => 'Em',
-		'EventClass' => 'Ec',
-		'Events' => 'Ev',
-		'FinalReportA' => 'Fra',
-		'Finals' => 'Fin',
-		'FinOdfTiming' => 'FinOdf',
-		'FinSchedule' => 'FS',
-		'FinWarmup' => 'Fw',
-        'GateLog' => 'GL',
-		'HeartBeat'=>'Hb',
-		'HhtData' => 'Hd',
-		'HhtEvents' => 'He',
-		'HhtSetup' => 'Hs',
-		'IdCardElements' => 'Ice',
-		'IdCards' => 'Ic',
-		'Images' => 'Im',
-        'IskData' => 'IskDt',
-		'Individuals' => 'Ind',
-		'Logs' => 'Log',
-		'ModulesParameters' => 'Mp',
-// 		'OnLineIds' => 'Oli', // This table is rewritten everytime so no need to export/import it
-		'OdfDocuments' => 'OdfDoc',
-		'OdfTranslations' => 'OdfTr',
-		'OdfMessageStatus' => 'Oms',
-		'Rankings' => 'Rank',
-		'RecBroken' => 'RecBro',
-		'RecTournament' => 'Rt',
-		'Reviews' => 'Rev',
-		"RoundRobinGrids" => "RrGrid",
-		"RoundRobinGroup" => "RrGr",
-		"RoundRobinLevel" => "RrLev",
-		"RoundRobinMatches" => "RrMatch",
-		"RoundRobinParticipants" => "RrPart",
-		'RunArchery' => 'Ra',
-		'RunArcheryRank' => 'Rar',
-		'RunArcheryParticipants' => 'Rap',
-		'Scheduler'=>'Sch',
-		'Session'=>'Ses',
-		'SubClass' => 'Sc',
-		'TargetFaces' => 'Tf',
-		'TargetGroups' => 'Tg',
-		'TeamComponent' => 'Tc',
-		'TeamDavis' => 'TeDa',
-		'TeamFinals' => 'Tf',
-		'TeamFinComponent' => 'Tfc',
-        'TeamFinComponentLog' => 'Tfcl',
-		'Teams' => 'Te',
-		'TournamentDistances' => 'Td',
-		'TournamentInvolved' => 'Ti',
-		'TourRecords' => 'Tr',
-		'TVContents' => 'TVC',
-		'TVParams' => 'TVP',
-		'TVRules' => 'TVR',
-		'TVSequence' => 'TVS',
-		'VegasAwards'=>'Va',
-	);
-
-	//if(!$InfoSystem) {
-// 		$tabs['']='';
-//	}
-
-	// Tabs where there is an EnID
-	$tabsEnId=array(
-			'AccEntries' => 'AEId',
-			'Awarded' => 'AwEntry',
-			'ElabQualifications' => 'EqId',
-			'Eliminations' => 'ElId',
-			'ExtraData' => 'EdId',
-			'Finals' => array('FinAthlete','FinCoach'),
-            'GateLog' => 'GLEntry',
-			'HhtData' => 'HdEnId',
-			'Individuals' => 'IndId',
-			'Logs' => 'LogEntry',
-			'Photos' => 'PhEnId',
-			'Qualifications' => 'QuId',
-			'RecBroken' => 'RecBroAthlete',
-			'RunArchery'=>'RaArcher',
-			'TeamComponent' => 'TcId',
-			'TeamFinals' => 'TfCoach',
-			'TeamFinComponent' => 'TfcId',
-            'TeamFinComponentLog' => array('TfclIdPrev','TfclIdNext'),
-			'Vegas'=>'VeId',
-	);
-
-	// Tabs where there is an CoID
-	$tabsCoId=array(
-			'CasTeam' => 'CaTeam',
-			'ClubTeam' => 'CTTeam',
-			'ExtraDataCountries' => 'EdcId',
-			'RecBroken' => 'RecBroTeam',
-			'TeamComponent' => 'TcCoId',
-			'TeamFinComponent' => 'TfcCoId',
-            'TeamFinComponentLog' => 'TfclCoId',
-			'TeamFinals' => 'TfTeam',
-			'Teams' => 'TeCoId',
-			'TournamentInvolved' => 'TiCountry',
-	);
-
-	$RoundRobins=[
-		"RoundRobinMatches" => ['RrMatchTeam', 'RrMatchAthlete'],
-		"RoundRobinParticipants" => ['RrPartTeam', 'RrPartParticipant'],
-		"RunArchery" => ['RaTeam', 'RaEntry'],
-		"RunArcheryRank" => ['RarTeam', 'RarEntry'],
-		"RunArcheryParticipants" => ['RapTeam', 'RapEntry'],
-	];
-
-	$Gara['Photos']=array();
-	$Gara['Flags']=array();
-
-	// check if there are local Records NOT maintained from WA
-	$Gara['RecAreas']=array();
-	$q=safe_r_sql("select RecAreas.* from RecAreas inner join TourRecords on TrRecCode=ReArCode and TrTournament={$TourId} where ReArWaMaintenance=0");
-	while($r=safe_fetch($q)) {
-		$Gara['RecAreas'][]=$r;
-	}
-
-	if($Complete) {
-		// Adds localized Flags
-		$Select
-			= "SELECT distinct Flags.* FROM Entries
-					inner join Countries on EnCountry=CoId
-					inner join Flags on CoCode=FlCode and FlTournament = {$TourId}
-					WHERE EnTournament={$TourId}
-					ORDER BY FlCode, FlTournament DESC";
-		$Rs=safe_r_sql($Select);
-		$oldCode='';
-		while($MyRow=safe_fetch_assoc($Rs)){
-			if($oldCode!=$MyRow["FlCode"])
-				$Gara['Flags'][]=$MyRow;
-			$oldCode=$MyRow["FlCode"];
-		}
-
-		// and Pictures
-		$Select
-			= "SELECT Photos.* FROM Photos inner join Entries on Entries.EnId=Photos.PhEnId WHERE Entries.EnTournament=" . StrSafe_DB($TourId) . " ";
-		$Rs=safe_r_sql($Select);
-		while($MyRow=safe_fetch_assoc($Rs)){
-			$Gara['Photos'][]=$MyRow;
-		}
-	}
-
-	$noIds=array(
-		'AccPrice' => 'APId',
-		);
-
-	// prendo le Tabelle definite nell'array che si estraggono sul Tournament
-	foreach($tabs as $tab=>$code) {
-		$Gara[$tab]=array();
-		$Select = "SELECT * FROM $tab WHERE {$code}Tournament=" . StrSafe_DB($TourId) . " ";
-		if(!empty($NotExportableKeys[$tab])) {
-			$Select.= " and ".implode(' AND ', $NotExportableKeys[$tab]);
-		}
-		$Rs=safe_r_sql($Select);
-		while($MyRow=safe_fetch_assoc($Rs)){
-			if(isset($noIds[$tab])) unset($MyRow[$noIds[$tab]]);
-			$Gara[$tab][]=$MyRow;
-		}
-	}
-
-	// ExtraData
-	$Gara['ExtraData']=array();
-	$Select
-	= "SELECT ExtraData.* FROM ExtraData inner join Entries on Entries.EnId=ExtraData.EdId WHERE Entries.EnTournament=" . StrSafe_DB($TourId) . " ";
-	$Rs=safe_r_sql($Select);
-	while($MyRow=safe_fetch_assoc($Rs)){
-		$Gara['ExtraData'][]=$MyRow;
-	}
-
-	// ExtraDataCountries
-	$Gara['ExtraDataCountries']=array();
-	$Select
-	= "SELECT ExtraDataCountries.* FROM ExtraDataCountries inner join Countries on CoId=EdcId WHERE CoTournament=" . StrSafe_DB($TourId) . " ";
-	$Rs=safe_r_sql($Select);
-	while($MyRow=safe_fetch_assoc($Rs)){
-		$Gara['ExtraDataCountries'][]=$MyRow;
-	}
-
-	// ElabQualifications
-	$Gara['ElabQualifications']=array();
-	$Select
-		= "SELECT ElabQualifications.* FROM ElabQualifications inner join Entries on Entries.EnId=ElabQualifications.EqId WHERE Entries.EnTournament=" . StrSafe_DB($TourId) . " ";
-	$Rs=safe_r_sql($Select);
-	while($MyRow=safe_fetch_assoc($Rs)){
-		$Gara['ElabQualifications'][]=$MyRow;
-	}
-
-	// Qualifications
-	$Gara['Qualifications']=array();
-	$Select
-		= "SELECT Qualifications.* FROM Qualifications inner join Entries on Entries.EnId=Qualifications.QuId WHERE Entries.EnTournament=" . StrSafe_DB($TourId) . " ";
-	$Rs=safe_r_sql($Select);
-	while($MyRow=safe_fetch_assoc($Rs)){
-		$Gara['Qualifications'][]=$MyRow;
-	}
-
-	// Vegas
-	$Gara['Vegas']=array();
-	$Select
-		= "SELECT Vegas.* FROM Vegas inner join Entries on EnId=VeId WHERE EnTournament=" . StrSafe_DB($TourId) . " ";
-	$Rs=safe_r_sql($Select);
-	while($MyRow=safe_fetch_assoc($Rs)){
-		$Gara['Vegas'][]=$MyRow;
-	}
-
-	if($InfoSystem) {
-		// protects Tournament images
-		$Gara['Tournament']['ToImgL']=' '.bin2hex($Gara['Tournament']['ToImgL']);
-		$Gara['Tournament']['ToImgR']=' '.bin2hex($Gara['Tournament']['ToImgR']);
-		$Gara['Tournament']['ToImgB']=' '.bin2hex($Gara['Tournament']['ToImgB']);
-		// gets all data in an array
-		$switches=array();
-		$q=safe_r_SQL("Select * from OnLineIds where OliServer='$InfoSystem' and OliTournament={$_SESSION['TourId']}");
-		while($r=safe_fetch($q)) {
-			$switches[$r->OliType][$r->OliId]=$r->OliOnlineId;
-		}
-
-		// removes not defined entries/countries
-		//adjust Entries
-		$NewEntries=array();
-		foreach($Gara['Entries'] as $Id => $Entry) {
-			if(empty($switches['E'][$Id])
-					or empty($switches['C'][$Entry['EnCountry']])
-					or (empty($switches['C'][$Entry['EnCountry2']]) and $Entry['EnCountry2'])
-					or (empty($switches['C'][$Entry['EnCountry3']]) and $Entry['EnCountry3'])
-					) {
-				unset($switches['E'][$Id]); // missing entry, deletes the entry
-				continue; // skip the new entries
-			}
-			$Entry['EnId']=$switches['E'][$Id];
-			$Entry['EnOnlineId']=$switches['E'][$Id];
-			$Entry['EnTournament']=$switches['T'][$_SESSION['TourId']];
-			$Entry['EnCountry']=$switches['C'][$Entry['EnCountry']];
-			if($Entry['EnCountry2']) $Entry['EnCountry2']=$switches['C'][$Entry['EnCountry2']];
-			if($Entry['EnCountry3']) $Entry['EnCountry3']=$switches['C'][$Entry['EnCountry3']];
-			$NewEntries[$Entry['EnId']]=$Entry;
-		}
-		$Gara['Entries']=$NewEntries;
-
-		// adjust Countries
-		$NewEntries=array();
-		foreach($Gara['Countries'] as $Id => $Entry) {
-			if(empty($switches['C'][$Id])) {
-				unset($switches['C'][$Id]); // missing country, deletes the entry
-				continue; // skip the new entries
-			}
-			$Entry['CoId']=$switches['C'][$Id];
-			$Entry['CoOnlineId']=$switches['C'][$Id];
-			$Entry['CoTournament']=$switches['T'][$_SESSION['TourId']];
-			$NewEntries[$Entry['CoId']]=$Entry;
-		}
-		$Gara['Countries']=$NewEntries;
-
-		// adjust EnId
-		foreach($tabsEnId as $tab => $Ids) {
-			if(is_array($Ids)) {
-				foreach($Ids as $Id) {
-					foreach($Gara[$tab] as $k=>$v) {
-						if($v[$Id] and !empty($switches['E'][$v[$Id]])) {
-							// the user has an Online ID
-							$Gara[$tab][$k][$Id]=$switches['E'][$v[$Id]];
-						} elseif($tab!='Finals') {
-							// unset the record... will be send later on the next cycle
-							unset($Gara[$tab][$k]);
-						}
-					}
-				}
-			} else {
-				foreach($Gara[$tab] as $k=>$v) {
-					if($v[$Ids] and !empty($switches['E'][$v[$Ids]])) {
-						// the user has an Online ID
-						$Gara[$tab][$k][$Ids]=$switches['E'][$v[$Ids]];
-					} elseif($tab!='Finals' and $tab!='Eliminations' and $tab!='TeamFinals') {
-						// unset the record... will be send later on the next cycle
-						unset($Gara[$tab][$k]);
-					}
-				}
-			}
-		}
-
-		// adjust CoId
-		foreach($tabsCoId as $tab => $Id) {
-			foreach($Gara[$tab] as $k=>$v) {
-				if($v[$Id] and !empty($switches['C'][$v[$Id]])) {
-					// the user has an Online ID
-					$Gara[$tab][$k][$Id]=$switches['C'][$v[$Id]];
-				} elseif($tab!='TeamFinals') {
-					// unset the record... will be send later on the next cycle
-					unset($Gara[$tab][$k]);
-				}
-			}
-		}
-
-		// Adjust mixed tables
-		foreach($RoundRobins as $tab => $flags) {
-			foreach($Gara[$tab] as $k=>$v) {
-				if($v[$flags[0]]) {
-					// it is a team ID
-					if($v[$flags[1]] and !empty($switches['C'][$v[$flags[1]]])) {
-						// the user has an Online ID
-						$Gara[$tab][$k][$flags[1]]=$switches['C'][$v[$flags[1]]];
-//					} elseif($tab!='TeamFinals') {
-//						// unset the record... will be send later on the next cycle
-//						unset($Gara[$tab][$k]);
-					}
-				} else {
-					// it is an entry ID
-					if($v[$flags[1]] and !empty($switches['E'][$v[$flags[1]]])) {
-						// the user has an Online ID
-						$Gara[$tab][$k][$flags[1]]=$switches['E'][$v[$flags[1]]];
-//					} elseif($tab!='Finals' and $tab!='Eliminations') {
-//						// unset the record... will be send later on the next cycle
-//						unset($Gara[$tab][$k]);
-					}
-				}
-			}
-		}
-
-        // adjust the array-based IDs
-        foreach($Gara['TeamFinals'] as $k=>$line) {
-            if($line['TfShootingArchers']) {
-                $newArchers=[];
-                foreach(json_decode($line['TfShootingArchers']) as $a=>$b) {
-                    if(!empty($switches['E'][$b])) {
-                        $newArchers["$a"]=$switches['E'][$b];
-                    }
-                }
-                $Gara['TeamFinals'][$k]['TfShootingArchers']=json_encode($newArchers);
-            }
-        }
-
-		// adjust ToId
-		if($Complete) $tabs['Flags']='Fl';
-		foreach($tabs as $tab => $Id) {
-			foreach($Gara[$tab] as $k=>$v) {
-				$Gara[$tab][$k][$Id.'Tournament']=$switches['T'][$_SESSION['TourId']];
-			}
-		}
-	}
-
-	return $Gara;
-}
+require_once('Common/Lib/Fun_Export.php');
diff --git a/src/Common/Fun_TourDelete.php b/src/Common/Fun_TourDelete.php
index 7c8bca91..8288e552 100644
--- a/src/Common/Fun_TourDelete.php
+++ b/src/Common/Fun_TourDelete.php
@@ -9,6 +9,7 @@ function tour_delete($TourId) {
 		"AccEntries" => "AETournament",
 		"AccPrice" => "APTournament",
 		"AclDetails" => 'AclDtTournament',
+        "AclTemplates" => 'AclTeTournament ',
 		"AvailableTarget" => "AtTournament",
 		"Awarded" => "AwTournament",
 		"Awards" => "AwTournament",
@@ -138,6 +139,7 @@ function tour_import($filename, $isString=false) {
 		'AccPrice' => 'AP',
 		'ACL' => 'Acl',
 		'AclDetails' => 'AclDt',
+        'AclTemplates' => 'AclTe',
 		'AvailableTarget' => 'At',
 		'Awards' => 'Aw',
 		'Awarded' => 'Aw',
@@ -267,6 +269,7 @@ function tour_import($filename, $isString=false) {
 		'AccColors',
 		'AccPrice',
 		'ACL',
+        'AclTemplates',
 		'AclDetails',
 		'AvailableTarget',
 		'Awards',
@@ -310,7 +313,6 @@ function tour_import($filename, $isString=false) {
 		'TargetGroups',
 		'TeamDavis',
 		'TournamentDistances',
-        //'TournamentInvolved',
 		'TourRecords' ,
 		'TVContents',
 		'TVParams',
@@ -345,7 +347,7 @@ function tour_import($filename, $isString=false) {
 	$Gara=UpdateTournament($Gara);
 
 	// CONTROLLA SE C'E' UN TORNEO CON LO STESSO CODICE E LO SEGA!
-	$q=safe_r_sql("select ToId from Tournament where ToCode=" . strsafe_db($Gara['Tournament']['ToCode']));
+	$q=safe_r_sql("select `ToId` from `Tournament` where `ToCode`=" . strsafe_db($Gara['Tournament']['ToCode']));
 	if($r=safe_fetch($q) ){
 		// esiste un tournament con lo stesso codice... ranzo tutto!
 		tour_delete($r->ToId);
@@ -355,13 +357,17 @@ function tour_import($filename, $isString=false) {
 	RemoveMedia($Gara['Tournament']['ToCode']);
 
 	// Insert competition
-	$quer=array();
+    $query=array();
 	foreach($Gara['Tournament'] as $key=>$val) {
 		if($key!='ToId'){
-			$quer[]="$key=" . strsafe_db($val);
+            if(!is_null($val)) {
+                $query[] = "`$key` = " . strsafe_db($val);
+            } else {
+                $query[] = "`$key` = NULL";
+            }
 		}
 	}
-	safe_w_sql("Insert into Tournament set ".implode(', ', $quer));
+	safe_w_sql("Insert into `Tournament` set ".implode(', ', $query));
 	$TourId=safe_w_last_id();
 
 	// adjust ToId in all arrays...
@@ -379,9 +385,13 @@ function tour_import($filename, $isString=false) {
 			foreach($Gara[$tab] as $record) {
 				$query=array();
 				foreach($record as $key=>$val) {
-					$query[]="$key = " . strsafe_db($val) ;
+                    if(!is_null($val)) {
+                        $query[] = "`$key` = " . strsafe_db($val);
+                    } else {
+                        $query[] = "`$key` = NULL";
+                    }
 				}
-				safe_w_sql("insert into $tab set ". implode(', ', $query). " on duplicate key update ". implode(', ', $query));
+				safe_w_sql("insert into `$tab` set ". implode(', ', $query). " on duplicate key update ". implode(', ', $query));
 			}
 		}
 	}
@@ -393,27 +403,31 @@ function tour_import($filename, $isString=false) {
 			$query=array();
 			foreach($record as $key=>$val) {
 				if($key!='CoId' and $key!='CoFlag' and $key!='CoMail' and $key!='CoNoPrint'){
-					$query[]="$key = " . strsafe_db($val) ;
+                    if(!is_null($val)) {
+                        $query[] = "`$key` = " . strsafe_db($val);
+                    } else {
+                        $query[] = "`$key` = NULL";
+                    }
 				}
 			}
-			safe_w_sql("insert into Countries set ". implode(', ', $query));
+			safe_w_sql("insert into `Countries` set ". implode(', ', $query));
 			$Countries[$record['CoId']]=safe_w_last_id();
 		}
 	}
 	//aggiorna CoParent1 della Countries stessa
-	$tmpSql = "SELECT DISTINCT CoParent1 FROM Countries WHERE CoTournament=" . $TourId . " AND CoParent1!=0";
+	$tmpSql = "SELECT DISTINCT `CoParent1` FROM `Countries` WHERE `CoTournament`=" . $TourId . " AND CoParent1!=0";
 	$tmpRs = safe_r_sql($tmpSql);
 	if(safe_num_rows($tmpRs)!=0) {
 		while($tmpRow=safe_fetch($tmpRs))
-			safe_w_sql("UPDATE Countries SET CoParent1=". $Countries[$tmpRow->CoParent1] . " WHERE CoParent1=" . $tmpRow->CoParent1 . " AND CoTournament=" . $TourId);
+			safe_w_sql("UPDATE `Countries` SET `CoParent1`=". $Countries[$tmpRow->CoParent1] . " WHERE `CoParent1`=" . $tmpRow->CoParent1 . " AND `CoTournament`=" . $TourId);
 		safe_free_result($tmpRs);
 	}
 	//aggiorna CoParent2 della Countries stessa
-	$tmpSql = "SELECT DISTINCT CoParent2 FROM Countries WHERE CoTournament=" . $TourId . " AND CoParent2!=0";
+	$tmpSql = "SELECT DISTINCT `CoParent2` FROM `Countries` WHERE `CoTournament`=" . $TourId . " AND CoParent2!=0";
 	$tmpRs = safe_r_sql($tmpSql);
 	if(safe_num_rows($tmpRs)!=0) {
 		while($tmpRow=safe_fetch($tmpRs))
-		safe_w_sql("UPDATE Countries SET CoParent2=". $Countries[$tmpRow->CoParent2] . " WHERE CoParent2=" . $tmpRow->CoParent2 . " AND CoTournament=" . $TourId);
+		safe_w_sql("UPDATE `Countries` SET `CoParent2`=". $Countries[$tmpRow->CoParent2] . " WHERE `CoParent2`=" . $tmpRow->CoParent2 . " AND `CoTournament`=" . $TourId);
 		safe_free_result($tmpRs);
 	}
 
@@ -442,10 +456,14 @@ function tour_import($filename, $isString=false) {
                 $query = array();
                 foreach ($record as $key => $val) {
                     if ($key != 'TiId') {
-                        $query[] = "$key = " . strsafe_db($val);
+                        if(!is_null($val)) {
+                            $query[] = "`$key` = " . strsafe_db($val);
+                        } else {
+                            $query[] = "`$key` = NULL";
+                        }
                     }
                 }
-                safe_w_sql("insert into TournamentInvolved set " . implode(', ', $query));
+                safe_w_sql("insert into `TournamentInvolved` set " . implode(', ', $query));
                 $TiEntries[$record['TiId']] = safe_w_last_id();
             }
         }
@@ -476,10 +494,14 @@ function tour_import($filename, $isString=false) {
 			$query=array();
 			foreach($record as $key=>$val) {
 				if($key!='EnId' and $key!='EnWorldRank'){
-					$query[]="$key = " . strsafe_db($val) ;
+                    if(!is_null($val)) {
+                        $query[] = "`$key` = " . strsafe_db($val);
+                    } else {
+                        $query[] = "`$key` = NULL";
+                    }
 				}
 			}
-			safe_w_sql("insert into Entries set ". implode(', ', $query));
+			safe_w_sql("insert into `Entries` set ". implode(', ', $query));
 			$Entries[$record['EnId']]=safe_w_last_id();
 		}
 	}
@@ -545,13 +567,17 @@ function tour_import($filename, $isString=false) {
 			foreach($Gara[$tab] as $record) {
 				$query=array();
 				foreach($record as $key=>$val) {
-					$query[]="$key = " . strsafe_db($val) ;
+                    if(!is_null($val)) {
+                        $query[] = "`$key` = " . strsafe_db($val);
+                    } else {
+                        $query[] = "`$key` = NULL";
+                    }
 				}
 
 				// attenzione: questa query era "commentata" per non far apparirer errori:
 				// se questo comportamento è desiderato, chiamare la funzione safe_w_sql passando
 				// come terzo parametro un array con gli errori numerici ammessi
-				safe_w_sql("REPLACE INTO $tab set ". implode(', ', $query));
+				safe_w_sql("REPLACE INTO `$tab` set ". implode(', ', $query));
 			}
 		}
 	}
@@ -563,9 +589,13 @@ function tour_import($filename, $isString=false) {
 				$record['FlTournament']=$TourId;
 			$query=array();
 			foreach($record as $key=>$val) {
-				$query[]="$key = " . strsafe_db($val) ;
+                if(!is_null($val)) {
+                    $query[] = "`$key` = " . strsafe_db($val);
+                } else {
+                    $query[] = "`$key` = NULL";
+                }
 			}
-			safe_w_sql("insert into Flags set ". implode(', ', $query). " on duplicate key update ". implode(', ', $query));
+			safe_w_sql("insert into `Flags` set ". implode(', ', $query). " on duplicate key update ". implode(', ', $query));
 		}
 	}
 
@@ -574,9 +604,13 @@ function tour_import($filename, $isString=false) {
 		foreach($Gara['RecAreas'] as $record) {
 			$query=array();
 			foreach($record as $key=>$val) {
-				$query[]="$key = " . strsafe_db($val) ;
+                if(!is_null($val)) {
+                    $query[] = "`$key` = " . strsafe_db($val);
+                } else {
+                    $query[] = "`$key` = NULL";
+                }
 			}
-			safe_w_sql("insert into RecAreas set ". implode(', ', $query). " on duplicate key update ". implode(', ', $query));
+			safe_w_sql("insert into `RecAreas` set ". implode(', ', $query). " on duplicate key update ". implode(', ', $query));
 		}
 	}
 
@@ -591,7 +625,7 @@ function tour_import($filename, $isString=false) {
 
 	// if for accreditation, inserts all the LocCodes!
 	if(!empty($_REQUEST['Accreditation'])) {
-		safe_w_sql("insert ignore into ExtraData (select EnId, 'Z', '', concat(EnCode, '-', EnIocCode, '-', EnDivision) from Entries where EnTournament=$TourId)");
+		safe_w_sql("insert ignore into `ExtraData` (select `EnId`, 'Z', '', concat(`EnCode`, '-', `EnIocCode`, '-', `EnDivision`) from `Entries` where `EnTournament`=$TourId)");
 	}
 
 	// RECREATES ALL MEDIA
@@ -603,7 +637,7 @@ function tour_import($filename, $isString=false) {
 		// delete all the log files of this competition...
 		deleteAccLogs($Gara['Tournament']['ToCode']);
 		// track info for this competition in all servers ready to track
-		$q=safe_r_sql("select distinct SsApi, SsName from ianseo_Accreditation.SyncServers where SsStatus=1");
+		$q=safe_r_sql("select distinct `SsApi`, `SsName` from `ianseo_Accreditation`.`SyncServers` where SsStatus=1");
 		while ($r=safe_fetch($q)) {
 			startAccTrack($Gara['Tournament']['ToCode'], $r->SsName, $r->SsApi);
 		}
diff --git a/src/Common/Globals.inc.php b/src/Common/Globals.inc.php
index 2596839a..0280d4a2 100644
--- a/src/Common/Globals.inc.php
+++ b/src/Common/Globals.inc.php
@@ -15,7 +15,7 @@
 
 
 define ("ProgramName","Ianseo");	// Nome del programma
-define ("ProgramVersion","2023-01-10"); // "Remembering Er Salustro. Ciao Giggi 💔"
+define ("ProgramVersion","2024-12-08"); // "Experience is the teacher of all things (Gaius Iulius Caesar)"
 
 define ("TargetNoPadding",3);		// Padding del targetno
 
@@ -89,8 +89,8 @@
 
 session_start();
 
-if(empty($_SESSION['WINHEIGHT'])) $_SESSION['WINHEIGHT'] = '';
-if(empty($_SESSION['WINWIDTH']))  $_SESSION['WINWIDTH']  = '';
+if(empty($_SESSION['WINHEIGHT'])) $_SESSION['WINHEIGHT'] = 0;
+if(empty($_SESSION['WINWIDTH']))  $_SESSION['WINWIDTH'] = 0;
 if(empty($_SESSION['COLLATION'])) set_collation();
 
 /*
@@ -117,6 +117,13 @@
 		header("Location: " . $_SERVER['PHP_SELF'] . go_get('SetLanguage','',true));
 	}
 
+function getToday($Date='now', $Format='Y-m-d') {
+    $Today=new DateTimeImmutable($Date);
+    if(!empty($_SESSION['TourTimezone'])){
+        $Today=new DateTimeImmutable($Date, new DateTimeZone($_SESSION['TourTimezone']));
+    }
+    return $Today->format($Format);
+}
 // funzione per l'internazionalizzazione
 function get_text($text, $module='Common', $a=null, $translate=false, $force=false, $ForceLang='', $Verbose=true) {
 	static $_LANG;
@@ -318,6 +325,11 @@ function define_session_flags($ConstToStore=array()) {
 	foreach($ConstToStore as $k => $v) {
 		$_SESSION[$k]=$v;
 	}
+    // adjust the timezone of the database to the timezone of the competition.
+    if(!empty($_SESSION['TourTimezone'])) {
+        safe_r_SQL( "SET session time_zone = '".$_SESSION['TourTimezone']."'");
+        safe_w_SQL( "SET session time_zone = '".$_SESSION['TourTimezone']."'");
+    }
 }
 
 /**
@@ -438,9 +450,10 @@ function InfoTournament()
  * @return true se ci riesce e false altrimenti
  */
 function CreateTourSession($TourId) {
+    global $CFG;
 	require_once('Common/CheckPictures.php');
 	$TourId=intval($TourId);
-	$Select = "SELECT Tournament.*, ElimTypes, TeamEvents,
+	$Select = "SELECT Tournament.*, ElimTypes, TeamEvents,ToTimeZone,
 		UNIX_TIMESTAMP(ToWhenFrom) AS ToWhenFromUTS, DATE_FORMAT(ToWhenFrom,'" . get_text('DateFmtDB') . "') AS DtFrom, UNIX_TIMESTAMP(ToWhenTo) AS ToWhenToUTS, 
 		DATE_FORMAT(ToWhenTo,'" . get_text('DateFmtDB') . "') AS DtTo, ToTypeName AS TtName, ToElimination AS TtElimination
 		FROM Tournament
@@ -452,13 +465,22 @@ function CreateTourSession($TourId) {
 	{
 		$debug = $_SESSION['debug'];
 		$debmode= (!empty($_SESSION['debug-mode']) ? $_SESSION['debug-mode'] : '');
+        $tmpAuthUser = (!empty($_SESSION['AUTH_User']) ? $_SESSION['AUTH_User'] : null);
+        $tmpAuthPwd = (!empty($_SESSION['AUTH_Pwd']) ? $_SESSION['AUTH_Pwd'] : null);
 
 		$_SESSION=Array();
 
 		$_SESSION['debug'] = $debug;
 		$_SESSION['debug-mode'] = $debmode;
+        if($CFG->USERAUTH and !is_null($tmpAuthUser) ) {
+            $_SESSION['AUTH_User'] = $tmpAuthUser;
+            $_SESSION['AUTH_Pwd'] = $tmpAuthPwd;
+        }
 
 		$MyRow=safe_fetch($Rs);
+        $dateTimeZone = new DateTimeZone($MyRow->ToTimeZone);
+        $dateTimeZone->getOffset(new DateTime("now", new DateTimeZone('UTC')));
+
 		$_SESSION['TourId']=$MyRow->ToId;
 		$_SESSION['TourPrintLang']=$MyRow->ToPrintLang;
 		$_SESSION['TourType']=$MyRow->ToType;
@@ -467,15 +489,17 @@ function CreateTourSession($TourId) {
 		$_SESSION['TourField3D']=($MyRow->ToElabTeam==1 ? 'FIELD' : ($MyRow->ToElabTeam==2 ? '3D' : ''));
 		$_SESSION['TourCode']=$MyRow->ToCode;
 		$_SESSION['TourCodeSafe']=preg_replace('/[^a-z0-9_.-]+/sim', '', $MyRow->ToCode);
-		$_SESSION['TourCollation']=$MyRow->ToCollation;
+//		$_SESSION['TourCollation']=$MyRow->ToCollation;
+		$_SESSION['TourCollation']='';
 		$_SESSION['TourName']=$MyRow->ToName;
 		$_SESSION['TourWhere']=$MyRow->ToWhere;
 		$_SESSION['TourRealWhenFrom']=$MyRow->ToWhenFrom;
 		$_SESSION['TourRealWhenTo']=$MyRow->ToWhenTo;
 		$_SESSION['TourWhenFrom']=$MyRow->DtFrom;
 		$_SESSION['TourWhenTo']=$MyRow->DtTo;
-		$_SESSION['ToWhenFromUTS']=$MyRow->ToWhenFromUTS;
-		$_SESSION['ToWhenToUTS']=$MyRow->ToWhenToUTS;
+		$_SESSION['TourTimezone']=$MyRow->ToTimeZone;
+		$_SESSION['ToWhenFromUTS']=$MyRow->ToWhenFromUTS+$dateTimeZone->getOffset(new DateTime("now", new DateTimeZone('UTC')));
+		$_SESSION['ToWhenToUTS']=$MyRow->ToWhenToUTS+$dateTimeZone->getOffset(new DateTime("now", new DateTimeZone('UTC')));
 		$_SESSION['ToPaper']=$MyRow->ToPrintPaper;
 		// RoundRobinEvents...
 		$_SESSION['HasRobin']=(strstr($MyRow->ElimTypes??'', '5') ? 1 : 0);
@@ -488,9 +512,10 @@ function CreateTourSession($TourId) {
 		$_SESSION['TargetPadding']=2;
 
 		// sets the collation for the tournament
-		set_collation($MyRow->ToCollation);
+//		set_collation($MyRow->ToCollation);
 		// if a collation is set for a tournament, this will be the default whatever language is chosen
-		$_SESSION['COLLATION-LOCK']=($MyRow->ToCollation!='');
+//		$_SESSION['COLLATION-LOCK']=($MyRow->ToCollation!='');
+		$_SESSION['COLLATION-LOCK']=false;
 
 		// Defines if a tournament is ORIS compliant or not
 		$_SESSION['ISORIS']=$MyRow->ToIsORIS;
@@ -554,8 +579,22 @@ function CreateTourSession($TourId) {
 	Distrugge la sessione per il torneo attivo
 */
 function EraseTourSession() {
-	$_SESSION=array();
-	$_SESSION['TourId']=-1;
+    global $CFG;
+    $debug = $_SESSION['debug'];
+    $debmode= (!empty($_SESSION['debug-mode']) ? $_SESSION['debug-mode'] : '');
+    $tmpAuthUser = (!empty($_SESSION['AUTH_User']) ? $_SESSION['AUTH_User'] : null);
+    $tmpAuthPwd = (!empty($_SESSION['AUTH_Pwd']) ? $_SESSION['AUTH_Pwd'] : null);
+
+    $_SESSION=Array();
+
+    $_SESSION['debug'] = $debug;
+    $_SESSION['debug-mode'] = $debmode;
+    if($CFG->USERAUTH and !is_null($tmpAuthUser) ) {
+        $_SESSION['AUTH_User'] = $tmpAuthUser;
+        $_SESSION['AUTH_Pwd'] = $tmpAuthPwd;
+    }
+
+    $_SESSION['TourId']=-1;
 	$_SESSION['TourCode']='';
 	$_SESSION['TourName']='';
 	$_SESSION['TourWhere']='';
@@ -820,6 +859,8 @@ function CheckHelp() {
 }
 
 function set_collation($Col='') {
+    // removed until solved for multiple database versions
+    return;
 	static $Collations=array(
 		'czech',
 		'danish',
@@ -1019,3 +1060,242 @@ function insertLog($Type, $Message, $Title='', $Entry=0, $TourId=0) {
 		LogTimestamp='".date('Y-m-d H:i:s.u')."',
 		LogIP='".$_SERVER['REMOTE_ADDR']."'");
 }
+
+function checkCompetitionAnomalies() {
+    global $CFG;
+    $Ret=[
+        'EC'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('EntriesNoCountry', 'Errors'),
+            'Lnk'=>$CFG->ROOT_DIR.'Partecipants/',
+        ],
+        'ED'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('EntriesNoCategory', 'Errors'),
+            'Lnk'=>$CFG->ROOT_DIR.'Partecipants/',
+        ],
+        'ES'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('CategoresNotDefined', 'Errors'),
+            'Lnk'=>$CFG->ROOT_DIR.'Tournament/ManDivClass.php',
+        ],
+        'D0'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('NoDistancesSet', 'Errors'),
+            'Lnk'=>$CFG->ROOT_DIR.'Tournament/ManDistances.php',
+        ],
+        'D1'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('TooManyDistancesMatch', 'Errors'),
+            'Lnk'=>$CFG->ROOT_DIR.'Tournament/ManDistances.php',
+        ],
+        'Tgt'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('NoTargetSet', 'Errors'),
+            'Lnk'=>$CFG->ROOT_DIR.'Tournament/ManTargets.php',
+        ],
+        'Id'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('EventIncompleteSetting', 'Errors', get_text('IndFinEvent', 'Tournament')),
+            'Lnk'=>$CFG->ROOT_DIR.'Final/Individual/ListEvents.php',
+        ],
+        'Td'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('EventIncompleteSetting', 'Errors', get_text('TeamFinEvent', 'Tournament')),
+            'Lnk'=>$CFG->ROOT_DIR.'Final/Team/ListEvents.php',
+        ],
+        'I'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('EndsArrowsMisMatch', 'Errors', get_text('IndFinEvent', 'Tournament')),
+            'Lnk'=>$CFG->ROOT_DIR.'Final/PhaseDetails.php?act=get&team=0&option=ArrowPhase',
+        ],
+        'T'=>[
+            'Cats'=>[],
+            'Msg'=>get_text('EndsArrowsMisMatch', 'Errors', get_text('TeamFinEvent', 'Tournament')),
+            'Lnk'=>$CFG->ROOT_DIR.'Final/PhaseDetails.php?act=get&team=1&option=ArrowPhase',
+        ],
+    ];
+    // check Missing Countries
+    $q=safe_r_sql("select EnCode
+        from Entries
+        where EnTournament={$_SESSION['TourId']} and EnCountry=0
+        order by EnCode
+        ");
+    while($r=safe_fetch($q)) {
+        $Ret['EC']['Cats'][]=$r->EnCode;
+    }
+
+    // check Category Inconsistency
+    $q=safe_r_sql("select distinct concat(EnDivision, EnClass) as EnCat
+        from Entries
+        left join Divisions on DivId=EnDivision and DivTournament=EnTournament
+        left join Classes on ClId=EnClass and ClTournament=EnTournament and (ClDivisionsAllowed='' or find_in_set(EnDivision, ClDivisionsAllowed))
+        where EnTournament={$_SESSION['TourId']} and EnDivision!='' and EnClass!='' and (DivId is null or ClId is null)
+        order by EnCode
+        ");
+    while($r=safe_fetch($q)) {
+        $Ret['ES']['Cats'][]=$r->EnCat;
+    }
+
+    // check Category Inconsistency
+    $q=safe_r_sql("select distinct EnCode as EnCat
+        from Entries
+        where EnTournament={$_SESSION['TourId']} and (EnDivision='' or EnClass='')
+        order by EnCode
+        ");
+    while($r=safe_fetch($q)) {
+        $Ret['ED']['Cats'][]=$r->EnCat;
+    }
+
+    // check distances anomalies
+    $q=safe_r_sql("select Category, count(*) as Distances, TdTournament is null as NoDistances
+        from (select concat(DivId,ClId) as Category, DivViewOrder, ClViewOrder, ToType
+              from Divisions 
+              inner join Classes on ClTournament=DivTournament and (ClDivisionsAllowed='' or find_in_set(DivId,ClDivisionsAllowed)) and ClAthlete=1
+              inner join Tournament on ToId=DivTournament
+              where DivTournament={$_SESSION['TourId']} and DivAthlete=1) as AllCats
+        left join TournamentDistances on TdTournament={$_SESSION['TourId']} and TdType=ToType and Category like TdClasses
+        group by Category
+        having Distances!=1 or NoDistances=1
+        order by DivViewOrder, ClViewOrder");
+    while($r=safe_fetch($q)) {
+        $Ret[$r->NoDistances ? 'D0' : 'D1']['Cats'][]=$r->Category;
+    }
+
+    // check targets anomalies
+    $q=safe_r_sql("select Category, TfTournament is null as NoTarget
+        from (select concat(DivId,ClId) as Category, DivViewOrder, ClViewOrder
+              from Divisions 
+              inner join Classes on ClTournament=DivTournament and (ClDivisionsAllowed='' or find_in_set(DivId,ClDivisionsAllowed)) and ClAthlete=1
+              where DivTournament={$_SESSION['TourId']} and DivAthlete=1) as AllCats
+        left join TargetFaces on TfTournament={$_SESSION['TourId']} and if(TfRegExp!='', Category regexp TfRegExp, Category like TfClasses)
+        group by Category
+        having NoTarget=1
+        order by DivViewOrder, ClViewOrder
+        ");
+    while($r=safe_fetch($q)) {
+        $Ret['Tgt']['Cats'][]=$r->Category;
+    }
+
+    // check events Setup anomalies
+    $q=safe_r_sql("select EvCode, if(EvTeamEvent=1,'Td','Id') as TeamEvent
+        from Events
+        left join (select if(EcTeamEvent=0,0,1) as EcTeamEvent, EcCode from EventClass where EcTournament={$_SESSION['TourId']} group by if(EcTeamEvent=0,0,1), EcCode) EventClass on EcTeamEvent=EvTeamEvent and EcCode=EvCode
+        where EvTournament={$_SESSION['TourId']} and EvCodeParent='' and EcCode is null
+        order by EvTeamEvent,EvProgr");
+
+    while($r=safe_fetch($q)) {
+        $Ret[$r->TeamEvent]['Cats'][]='<a href="'.$CFG->ROOT_DIR.'Final/Individual/SetEventRules.php?EvCode='.$r->EvCode.'">'.$r->EvCode.'</a>';
+    }
+
+    // check events End/Arrows anomalies
+    $q=safe_r_sql("select EvCode, if(EvTeamEvent=1,'T','I') as TeamEvent
+        from Events
+        where EvTournament={$_SESSION['TourId']} and (EvElimEnds=0 or EvFinEnds=0 or EvElimArrows=0 or EvFinArrows=0) and EvFinalFirstPhase!=0
+        order by EvTeamEvent,EvProgr");
+
+    while($r=safe_fetch($q)) {
+        $Ret[$r->TeamEvent]['Cats'][]=$r->EvCode;
+    }
+
+    $RetResult=[];
+    foreach($Ret as $k=>$v) {
+        if(!$v['Cats']) {
+            continue;
+        }
+        $RetResult[$k]=$v;
+    }
+    return $RetResult;
+}
+
+function checkPhpVersion($complete=false) {
+    $Ret='';
+    if(PHP_MAJOR_VERSION<8) {
+        $Ret = '<div class="alert alert-danger bold">'.get_text('PhpOutdated', 'Errors', '8.0.0').'</div>';
+        if($complete) {
+            $Ret.='<div class="alert alert-warning bold">
+                <div>'.get_text('BackupTournaments', 'Errors').'</div>
+                <div class="Button mt-3" onclick="exportAllCompetitions()">'.get_text('ExportAllComps', 'Install').'</div>
+            </div>';
+        }
+    }
+    return $Ret;
+}
+
+function UpdateToInnoDb($Apply=true) {
+    global $CFG;
+    $Ret=checkPhpVersion();
+    $q1=safe_r_sql("show character SET like 'utf8mb4'");
+    $q2=safe_r_sql("show variables like 'innodb_file_per_table'");
+    if(!safe_num_rows($q1) or !safe_num_rows($q2) or ($r=safe_fetch($q2) and $r->Value!='ON')) {
+        $Ret.= '<div class="alert alert-danger bold">'.get_text('MysqlUpdateNeeded', 'Errors').'</div>';
+    }
+
+    if($Ret) {
+        return $Ret;
+    }
+
+    // start setting all tables to innodb engine
+    $q=safe_r_sql("SELECT  CONCAT('ALTER TABLE ', table_name, ' ENGINE=InnoDB;') AS sql_statements
+        FROM    information_schema.tables AS tb
+        WHERE   table_schema = '{$CFG->DB_NAME}'
+        AND     ENGINE = 'MyISAM'
+        AND     TABLE_TYPE = 'BASE TABLE'
+        ORDER BY table_name DESC;");
+
+    if($Apply) {
+        while($r=safe_fetch($q)) {
+            safe_w_sql($r->sql_statements);
+        }
+    } else {
+        if(safe_num_rows($q)) {
+            return true;
+        }
+    }
+
+    // update all tables to utf8mb4
+    //Check if collection is available and choose which to aplly
+    $newCollation = 'utf8mb4_0900_as_ci';
+    $q=safe_r_sql("SHOW COLLATION WHERE Collation='$newCollation';");
+    if(!safe_num_rows($q)) {
+        $newCollation = 'utf8mb4_general_ci';
+        $q=safe_r_sql("SHOW COLLATION WHERE Collation='$newCollation';");
+        if(!safe_num_rows($q)) {
+            $newCollation = '';
+        }
+    }
+
+    if(!empty($newCollation)) {
+        $SQL = "SELECT 'SET FOREIGN_KEY_CHECKS = 0' AS alter_statement 
+        UNION 
+        SELECT CONCAT('ALTER DATABASE `', SCHEMA_NAME,'` CHARACTER SET utf8mb4 COLLATE $newCollation') AS alter_statement 
+        FROM information_schema.SCHEMATA 
+        WHERE (DEFAULT_CHARACTER_SET_NAME!='utf8mb4' or DEFAULT_COLLATION_NAME!='$newCollation') AND SCHEMA_NAME = '{$CFG->DB_NAME}'
+        UNION 
+        SELECT DISTINCT CONCAT('ALTER TABLE `',TABLE_NAME, '` CONVERT TO CHARACTER SET utf8mb4 COLLATE $newCollation') AS alter_statement 
+        FROM (
+            SELECT TABLE_NAME
+            FROM information_schema.COLUMNS 
+            WHERE TABLE_SCHEMA = '{$CFG->DB_NAME}' AND CHARACTER_SET_NAME IS NOT NULL AND (CHARACTER_SET_NAME!='utf8mb4' or COLLATION_NAME!='$newCollation')
+            UNION 
+            SELECT TABLE_NAME
+            FROM information_schema.TABLES AS T
+            JOIN information_schema.`COLLATION_CHARACTER_SET_APPLICABILITY` AS C ON C.collation_name = T.table_collation
+            WHERE (CHARACTER_SET_NAME!='utf8mb4' or COLLATION_NAME!='$newCollation') AND TABLE_SCHEMA = '{$CFG->DB_NAME}'
+        ) AS TABLE_UPDATES
+        UNION 
+        SELECT 'SET FOREIGN_KEY_CHECKS = 1' AS alter_statement";
+        $q = safe_r_sql($SQL);
+        if ($Apply) {
+            while ($r = safe_fetch($q)) {
+                safe_w_sql($r->alter_statement);
+            }
+        } else {
+            if (safe_num_rows($q) > 2) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
\ No newline at end of file
diff --git a/src/Common/Images/ACL3.png b/src/Common/Images/ACL3.png
new file mode 100644
index 00000000..e1430cbf
Binary files /dev/null and b/src/Common/Images/ACL3.png differ
diff --git a/src/Common/Languages/ar/Api.php b/src/Common/Languages/ar/Api.php
index d25416bf..ff2d415d 100644
--- a/src/Common/Languages/ar/Api.php
+++ b/src/Common/Languages/ar/Api.php
@@ -50,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='حالة الاتصال';
 $lang['ISK-DeleteDevices']='حذف اجهزة';
 $lang['ISK-DenyAccess']='ممنوع الولوج';
+$lang['ISK-Deprecated']='هام: سيتم إزالة تطبيق "Ianseo Score Keeper" تدريجيًا من متاجر Android وApple ولن يتم دعمه بعد الآن، وبالتالي سيتم إزالته من Ianseo في سبتمبر 2024. يرجى التبديل إلى تطبيق "Ianseo Score Keeper NG" الجديد بدلاً من ذلك.';
 $lang['ISK-DeviceAlive']='متصل';
 $lang['ISK-DeviceBattery']='بطارية';
 $lang['ISK-DeviceEnabled']='مفعل';
@@ -79,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='رمز المنافسة مفقود';
 $lang['ISK-Lite-QRCode']='طباعة رمز الاستجابة السريعة لبرنامج النتائج الاصدار المحدود';
 $lang['ISK-Lite-ServerUrl']='عنوان URL للخادم (بما في ذلك البروتوكول والمنفذ إن لم يكن 80)';
+$lang['ISK-Live-Deprecated']='هام: لم يعد تطبيق "Ianseo Score Keeper Live" مدعومًا، وبالتالي سيتم إزالته من Ianseo في سبتمبر 2024. يرجى التبديل إلى تطبيق "Ianseo Score Keeper NG" الجديد بدلاً من ذلك.';
 $lang['ISK-Live-Name']='ايانسيو لادارة النتائج لايف';
 $lang['ISK-lockPortrait']='قفل الجهاز في العرض العمودي';
 $lang['ISK-Name']='إيانسيو لادارة النتائج';
@@ -156,6 +158,7 @@
 $lang['NewGroup']='إعادة تعيين المجموعه';
 $lang['NewTarget']='إعادة تعيين الهدف';
 $lang['PartialImport']='الاستيراد التلقائى للاجزاء';
+$lang['PartialImportAll']='استيراد الكل';
 $lang['PopupStatusDistance']='مسافة: $a';
 $lang['PopupStatusEnd']='نهاية: $a';
 $lang['PopupStatusEvent']='حدث: $a';
diff --git a/src/Common/Languages/ar/Awards.php b/src/Common/Languages/ar/Awards.php
new file mode 100644
index 00000000..3ea5eef1
--- /dev/null
+++ b/src/Common/Languages/ar/Awards.php
@@ -0,0 +1,23 @@
+<?php
+$lang['CM0']='قوس مركب رجال';
+$lang['CM1']='فرق قوس مركب رجال';
+$lang['CustomAward']='جائزة مخصصة';
+$lang['CustomEvent']='اسم الجائزة';
+$lang['CustomNation']='الدولة الحاصلة على الجائزة';
+$lang['CustomPrize']='تقديم الجائزة';
+$lang['CustomWinner']='الشخص الحاصل على الجائزة';
+$lang['CW0']='قوس مركب سيدات';
+$lang['CW1']='فرق قوس مركب سيدات';
+$lang['CX']='فرق مختلط قوس مركب';
+$lang['CX1']='فرق مختلط قوس مركب';
+$lang['EvNameTranslated']='حدث مصحوب بالترجمة';
+$lang['PrecisionPrizeEvent']='جائزة الدقة';
+$lang['PrecPrizePresentation']='الفائز بجائزة الدقة للقوس المركب رجال في المرحلة XXX';
+$lang['RM0']='قوس أوليمبي رجال';
+$lang['RM1']='فرق قوس أوليمبي رجال';
+$lang['RW0']='قوس أوليمبي سيدات';
+$lang['RW1']='فرق قوس أوليمبي سيدات';
+$lang['RX']='فرق مختلط رجال قوس أوليمبي';
+$lang['RX1']='فرق مختلط رجال قوس أوليمبي';
+$lang['WaitAthletes']='انتظر الرياضيين';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ar/BackNumbers.php b/src/Common/Languages/ar/BackNumbers.php
index 14ae9aa4..98ffb2e0 100644
--- a/src/Common/Languages/ar/BackNumbers.php
+++ b/src/Common/Languages/ar/BackNumbers.php
@@ -1,36 +1,192 @@
 <?php
+$lang['A-Badge']='شارة الاعتماد';
+$lang['Access']='مناطق الوصول';
+$lang['AccessGraphics']='منطقة الوصول - الأيقونات';
+$lang['Accomodation']='الإقامة، الوجبات، المواصلات';
+$lang['AccreditationKO']='مشكلة فى الاعتماد... يرجى التوجه إلى المكتب';
+$lang['AccreditationMatches']='هذه الشارة خاصة بالفئات التالية:';
+$lang['AccreditationOK']='تمت عملية الاعتماد بنجاح!';
+$lang['AccreditationTwice']='تم الاعتماد بالفعل.';
 $lang['AlignC']='وسط';
 $lang['AlignL']='يسار';
 $lang['Alignment']='محاذاة';
 $lang['AlignR']='يمين';
 $lang['AllCaps']='حروف كبيرة لاسم العائلة';
+$lang['AthBarCode']='كود الرياضي (الباركود)';
+$lang['AthCode']='كود الرياضي (نص)';
+$lang['Athlete']='اسم الرياضي';
+$lang['AthQrCode']='كود الرياضي (رمز الاستجابة السريعة)';
+$lang['AutoCheckin']='تسجيل الوصول التلقائي';
+$lang['AutoCHK-Camera']='استخدم الكاميرا لقراءة رموز الاستجابة السريعة (QR)';
+$lang['AutoCHK-CanEdit']='تعديل المدخالات';
+$lang['AutoCHK-Code']='رموز المنافسة';
+$lang['AutoCHK-Confirm']='تأكيد تسجيل الوصول';
+$lang['AutoCHK-IP']='أجهزة تسجيل الوصول التلقائي';
+$lang['AutoCHK-IPinfo']='نقاط معلومات الخدمة الذاتية';
+$lang['AutoCHK-IPnoMgm']='أكشاك الخدمة الذاتية';
+$lang['AutoCHK-Names']='التحقق من الأسماء الأولى/العائلية أيضًا';
+$lang['AutoCHK-nobody']='لا يوجد أحد لديه هذا الرمز في قاعدة البيانات في الوقت الحالي... يرجى التوجه إلى المكتب';
+$lang['AutoCHK-Print']='إظهار مربع حوار الطباعة';
+$lang['BackCat']='خلفية الفئة';
+$lang['BackColor']='لون الخلفية';
+$lang['BackNoComplete']='رقم اللاعب النهائى';
+$lang['BackNoConfirmPrinted']='قم بوضع علامة على أرقام الرياضيين كما هي مطبوعة';
 $lang['BackNoEdit']='إعداد رقم اللاعب';
 $lang['BackNoExportLayout']='تصدير تصميم رقم اللاعب';
 $lang['BackNoImportLayout']='استيراد تصميم رقم اللاعب';
 $lang['BackNoPrintEmpty']='طباعة رقم اللاعب فارغاً';
+$lang['BackNoTest']='تجربة طباعة رقم اللاعب ( صفحة واحدة )';
+$lang['BackNumbers']='أرقام اللاعبين';
+$lang['BadgeComplete']='جميع الشارات';
+$lang['BadgeCreate']='إنشاء شارة جديدة';
+$lang['BadgeCustom']='شارة مخصصة';
+$lang['BadgeDelete']='حذف الشارة';
 $lang['BadgeDimention']='أبعاد البادج';
+$lang['BadgeEdit']='تعديل الشارة';
+$lang['BadgeExportLayout']='تصدير تخطيط الشارة';
+$lang['BadgeImportLayout']='استيراد تخطيط الشارة';
+$lang['BadgeName']='اسم الشارة';
+$lang['BadgeSetup']='إعداد الشارة';
+$lang['BadgeTest']='شارة الاختبار';
 $lang['Barcode']='الباركود';
+$lang['BarCodeFields']='<ul> <li><b>فارغ: </b>سيتم طباعة سلسلة مفصولة بواصلة مع رمز الإدخال والقسم والفئة</li> <li><b>{ENCODE}: </b>سيتم ترجمة {ENCODE} إلى رمز الإدخال</li> <li><b>{COUNTRY}: </b>سيتم ترجمة {COUNTRY} إلى رمز الدولة</li> <li><b>{DIVISION}: </b>سيتم ترجمة {DIVISION} إلى رمز القسم</li> <li><b>{CLASS}: </b>سيتم ترجمة {CLASS} إلى رمز الفئة</li> <li><b>{TOURNAMENT}: </b>سيتم ترجمة {TOURNAMENT} إلى رمز المنافسة</li> </ul>';
+$lang['BarcodeSeparator']='فاصل الباركود';
 $lang['BgImage']='صورة الخلفية';
+$lang['BibNumber']='الرقم التعريفى';
+$lang['BlackWhite']='حدود ذات لون واحد (استخدم: لون الخلفية)';
 $lang['Bold']='سميك';
+$lang['Category']='فئة';
 $lang['CharColor']='لون الخط';
+$lang['CharSize']='حجم الحرف <br>(- عامل المسافة)';
 $lang['CharType']='نوع الخط';
+$lang['CheckBarcodeSeparator']='التحقق من فواصل الباركود';
+$lang['Club']='تفاصيل البلد/النادي';
+$lang['Club2']='تفاصيل البلد/النادي الثاني';
+$lang['Club3']='تفاصيل البلد/النادي الثالث';
+$lang['ClubCamel']='اسم النادي';
+$lang['ClubCaps']='اسم النادي';
+$lang['ColoredArea']='كتلة النص';
+$lang['Coloured']='حدود المرحلة الملونة';
+$lang['CompDetails']='تفاصيل البطولة';
+$lang['CompName']='اسم البطولة';
+$lang['Content']='المحتوى';
 $lang['CountryCodeAndLong']='رمز واسم الدولة';
 $lang['CountryCodeOnly']='رمز الدولة فقط';
 $lang['CountryFlagAndLong']='علم واسم الدولة';
+$lang['CountryFlagOnly']='فقط علم الدولة';
 $lang['CountryLongName']='اسم الدولة فقط';
+$lang['Depot']='مستودع';
+$lang['E-Badge']='رقم الرياضي في جولة الإقصاء';
+$lang['EvCode']='كود البطولة';
+$lang['EvCode-EvDescr']='رمز الحدث والوصف';
+$lang['EvDescr']='وصف الحدث';
+$lang['EvDescrUpper']='وصف الحدث';
+$lang['Event']='الحدث';
+$lang['ExportPhotos']='تصدير الصور';
+$lang['ExtraAddOns']='نص الملحقات الإضافية';
+$lang['ExtraAddOnsImage']='صورة الملحقات الإضافية';
+$lang['FamCamel']='اسم العائلة';
+$lang['FamCamel-GAlone']='اسم العائلة';
+$lang['FamCamel-GivCamel']='اسم العائلة الاسم المعطى';
+$lang['FamCaps']='اسم العائلة';
+$lang['FamCaps-GAlone']='اسم العائلة G.';
+$lang['FamCaps-GivCamel']='اسم العائلة الاسم الأول';
+$lang['FamCaps-GivCamel-ClubCamel']='اسم العائلة الاسم الأول، اسم الدولة';
+$lang['FamCaps-GivCamel-ClubCaps']='اسم العائلة الاسم الأول، اسم البلد';
+$lang['FamCaps-GivCaps']='اسم العائلة الاسم المعطى';
+$lang['FamCaps-GivCaps-ClubCaps']='اسم العائلة الاسم الأول، اسم البلد';
+$lang['FinalRanking']='الترتيب النهائي';
+$lang['FinalRankLimit']='حد الترتيب النهائي';
+$lang['FinPosition']='الموقف النهائي';
+$lang['Flag']='علم الدولة/النادي';
+$lang['GAlone-FamCamel']='الاسم المعطى';
+$lang['GAlone-FamCaps']='G. اسم العائلة';
+$lang['GivCamel']='الاسم المعطى';
+$lang['GivCamel-FamCamel']='اسم العائلة المعطى';
+$lang['GivCamel-FamCamel-ClubCamel']='اسم العائلة المحدد، اسم البلد';
+$lang['GivCamel-FamCaps']='الاسم الأول اسم العائلة';
+$lang['GivCamel-FamCaps-ClubCamel']='الاسم الأول اسم العائلة، اسم البلد';
+$lang['GivCamel-FamCaps-ClubCaps']='الاسم الأول اسم العائلة، اسم البلد';
+$lang['GivCaps']='الاسم المعطى';
+$lang['GivCaps-FamCaps']='الاسم المعطى اسم العائلة';
+$lang['GivCaps-FamCaps-ClubCaps']='الاسم المعطى اسم العائلة واسم البلد';
 $lang['GivenNameInitial']='الحرف الأول من الاسم';
+$lang['Heigh']='الارتفاع';
+$lang['HLayout']='افقى';
+$lang['HLine']='الخط الافقى';
+$lang['I-Badge']='رقم الرياضى فى المباريات الفردية';
+$lang['IdCardHor']='بعرض';
 $lang['IdCardNumber']='عدد البادجات في الصفحة';
+$lang['IdCardOffsets']='الإزاحة: 0 إذا كانت هناك بطاقة هوية واحدة فقط في كل صفحة، والإزاحات بالملليمتر مفصولة بعلامة ";" إذا كانت هناك أكثر من بطاقة هوية واحدة';
+$lang['IdCardVer']='بإرتفاع';
 $lang['IdLayout']='اتجاه البادج';
+$lang['IdMarginH']='هامش الارتفاع';
 $lang['IdMarginL']='الهامش الأيسر';
 $lang['IdMarginR']='الهامش الأيمن';
 $lang['IdMarginT']='الهامش العلوي';
 $lang['IdMarginW']='الهامش السفلي';
+$lang['Image']='صورة';
+$lang['Images']='صور';
+$lang['ImageSvg']='صورة بصيغة SVG';
 $lang['IncludeLogo']='إدراج الشعار';
+$lang['IncludeSession']='تضمين الجلسة في النسخة المطبوعة';
 $lang['Italic']='مائل';
 $lang['Landscape']='أفقي';
+$lang['MultiLine']='خطوط متعددة';
+$lang['NameTag']='بطاقة الاسم';
+$lang['NewBadgeName']='اسم الشارة الجديد';
+$lang['NocCaps']='كود النادي';
+$lang['NocCaps-ClubCamel']='كود النادي اسم النادي';
+$lang['NocCaps-ClubCaps']='كود النادي اسم النادي';
+$lang['Offest2nd']='إزاحة رقم الرياضي الثاني (إذا لزم الأمر)';
+$lang['OneLine']='خط واحد';
+$lang['OnlyAthletes']='الرياضيين فقط';
+$lang['OpenPictureScreen']='فتح الشاشة الثانوية';
 $lang['PageDimension']='أبعاد الصفحة';
+$lang['PaperDimention']='أبعاد الورق';
+$lang['PhaseFrom']='من المرحلة';
+$lang['PhaseTo']='إلى المرحلة';
+$lang['Picture']='صورة الرياضى';
 $lang['Portrait']='رأسي';
+$lang['PosX']='(X) الوضع';
+$lang['PosY']='(Y) الوضع';
 $lang['PrintBackNo']='طباعة أرقام اللاعبين';
+$lang['PrintHasPlastic']='حاملي بطاقات Lanyards فقط';
+$lang['PrintSpecificBadges']='الطباعة باستخدام الشارات المطابقة التلقائية';
+$lang['PrintSyncResult']='$a تم تعيين الأرقام الخلفية للطباعة!';
+$lang['Q-Badge']='رقم الرياضي فى الادوار التأهيلية';
+$lang['QrCodeFields']='<ul> <li><b>فارغ: </b>سيتم طباعة سلسلة مفصولة بواصلة مع رمز الإدخال والقسم والفئة</li> <li><b>{ENCODE}: </b>سيتم ترجمة {ENCODE} إلى رمز الإدخال</li> <li><b>{COUNTRY}: </b>سيتم ترجمة {COUNTRY} إلى رمز الدولة</li> <li><b>{DIVISION}: </b>سيتم ترجمة {DIVISION} إلى رمز القسم</li> <li><b>{CLASS}: </b>سيتم ترجمة {CLASS} إلى رمز الفئة</li> <li><b>{TOURNAMENT}: </b>سيتم ترجمة {TOURNAMENT} إلى رمز المنافسة</li> </ul>';
+$lang['QRScore']='نتيجة جولة التصفيات';
+$lang['QualPosition']='موضع جولة التأهيل';
+$lang['RandomImage']='صورة عشوائية';
+$lang['Ranking']='رتبة جولة التأهيل';
+$lang['RankLimit']='حد رتبة جولة التأهيل';
+$lang['ReadSeparator']='قراءة الفاصل';
 $lang['ResetBackNo']='إعادة تصميم رقم اللاعب';
+$lang['ResetBarcodeSeparator']='إعادة تعيين فاصل الباركود';
+$lang['RnkCardinalEN']='منظر أساسي (1، 2، ...، 10)';
+$lang['RnkOrdinal']='عرض ترتيبي (الأول، الثاني، ...، العاشر) - EN';
+$lang['RnkRoman']='الأرقام الرومانية (I، II، ... IV، ... CM)';
+$lang['S-Badge']='ملصقات';
+$lang['Schedule']='البرنامج';
+$lang['Session']='جلسة التأهيل';
+$lang['SessionTarget']='رمز الجلسة والهدف';
+$lang['SetAccreditationMatches']='يمكن تصميم هذه الشارة خصيصًا للفئات التالية:';
+$lang['SkipPrinted']='تخطي أرقام الرياضيين المطبوعة';
+$lang['T-Badge']='مباريات الفريق رقم الرياضي';
+$lang['Target']='هدف';
+$lang['TeamComponents']='مكونات الفريق';
+$lang['TgtSequence']='تسلسل الهدف';
+$lang['ToBottom']='شعار المسابقة (أسفل)';
+$lang['ToLeft']='شعار المسابقة (يسار)';
+$lang['ToRight']='شعار المسابقة (يمين)';
+$lang['TVViewIdCard']='عرض بطاقات الهوية';
+$lang['TVViewIdCardDescr']='في المباريات، يتم سحب بطاقتي هوية من الخصوم بدلاً من الصفوف "القياسية"';
+$lang['VLayout']='رَأسِيّ';
 $lang['Width']='العرض';
+$lang['WRank']='الترتيب الدولى';
+$lang['WRankFields']='لا تظهر بعد مركز WR (0: إظهار الكل)';
+$lang['WRankImage']='صورة التصنيف الدولى';
+$lang['Y-Badge']='دبلومة (فردى)';
+$lang['Z-Badge']='دبلومة (فريق)';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ar/Common.php b/src/Common/Languages/ar/Common.php
index d3f7cdcf..a8060111 100644
--- a/src/Common/Languages/ar/Common.php
+++ b/src/Common/Languages/ar/Common.php
@@ -30,7 +30,9 @@
 $lang['CM']='ناشئين';
 $lang['CmdCancel']='إلغاء';
 $lang['CmdNext']='التالي';
+$lang['CmdOff']='إيقاف';
 $lang['CmdOk']='OK';
+$lang['CmdOn']='تشغيل';
 $lang['CmdSave']='حفظ';
 $lang['CmdSaveContinue']='حفظ واستمرار';
 $lang['CmdUpdate']='تحديث';
@@ -66,6 +68,7 @@
 $lang['MedalBronze']='الميدالية البرونزية';
 $lang['MenuLM_Accreditation']='الاعتماد';
 $lang['MenuLM_Close']='غلق';
+$lang['MenuLM_Data Import']='إستيراد البينات';
 $lang['MenuLM_Final report']='التقرير النهائي';
 $lang['MenuLM_HTT']='HTT';
 $lang['MenuLM_Individual Finals']='نهائيات الفردي';
@@ -88,6 +91,9 @@
 $lang['Month_7']='أغسطس';
 $lang['Month_8']='سبتمبر';
 $lang['Month_9']='أكتوبر';
+$lang['RevMainLang']='اللغة الرئيسية';
 $lang['Target']='هدف';
 $lang['Teams']='الفرق';
+$lang['Winner']='الفائز';
+$lang['Yes']='نعم';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ar/HTT.php b/src/Common/Languages/ar/HTT.php
index ae84e83f..1c427c5e 100644
--- a/src/Common/Languages/ar/HTT.php
+++ b/src/Common/Languages/ar/HTT.php
@@ -3,6 +3,7 @@
 $lang['BadFormat']='صيغة خاطئة';
 $lang['CmdImport']='استيراد';
 $lang['Country']='الدولة';
+$lang['DateTime']='التاريخ/الوقت';
 $lang['Distance']='المسافة';
 $lang['EndReport']='التقرير النهائي';
 $lang['File']='ملف';
diff --git a/src/Common/Languages/ar/IOC_Codes.php b/src/Common/Languages/ar/IOC_Codes.php
index 52f0c582..8370fcea 100644
--- a/src/Common/Languages/ar/IOC_Codes.php
+++ b/src/Common/Languages/ar/IOC_Codes.php
@@ -34,16 +34,12 @@
 $lang['BUL']='بلغاريا';
 $lang['BUR']='بوركينا فاسو';
 $lang['CAF']='وسط أفريقيا';
-$lang['CAM']='كمبوديا';
 $lang['CAN']='كندا';
 $lang['CAY']='جزر كايماند';
 $lang['CGO']='جمهورية الكونغو';
 $lang['CHA']='تشاد';
 $lang['CHI']='تشيلي';
-$lang['CHN']='الصين';
-$lang['CIV']='ساحل العاج';
 $lang['CMR']='الكاميرون';
-$lang['COD']='جمهورية الكونغو الديمقراطية';
 $lang['COK']='جزر كوك';
 $lang['COL']='كولومبيا';
 $lang['COM']='جزر القمر';
@@ -52,7 +48,6 @@
 $lang['CRO']='كرواتيا';
 $lang['CUB']='كوبا';
 $lang['CYP']='قبرص';
-$lang['CZE']='جمهورية التشيك';
 $lang['DEN']='الدنمارك';
 $lang['DJI']='جيبوتي';
 $lang['DMA']='دومينيكا';
@@ -82,17 +77,14 @@
 $lang['GUM']='جوام';
 $lang['GUY']='جيانا';
 $lang['HAI']='هايتي';
-$lang['HKG']='هونج كونج';
 $lang['HON']='هندوراس';
 $lang['HUN']='المجر';
 $lang['INA']='اندونيسيا';
 $lang['IND']='الهند';
-$lang['IRI']='إيران';
 $lang['IRL']='أيرلندا';
 $lang['IRQ']='العراق';
 $lang['ISL']='آيسلاندا';
 $lang['ISR']='إسرائيل';
-$lang['ISV']='جزر فيرجين الأمريكية';
 $lang['ITA']='إيطاليا';
 $lang['IVB']='جزر فيرجين الإنجليزية';
 $lang['JAM']='جامايكا';
@@ -104,9 +96,9 @@
 $lang['KIR']='كيريباتي';
 $lang['KSA']='المملكة السعودية';
 $lang['KUW']='الكويت';
-$lang['LAO']='لاوس';
 $lang['LAT']='لاتفيا';
 $lang['LBA']='ليبيا';
+$lang['LBN']='لبنان';
 $lang['LBR']='ليبيرتا';
 $lang['LCA']='سانت لوسيا';
 $lang['LES']='ليسوتو';
@@ -118,7 +110,6 @@
 $lang['MAR']='المغرب';
 $lang['MAS']='ماليزيا';
 $lang['MAW']='ملاوي';
-$lang['MDA']='مولدوفا';
 $lang['MDV']='جزر الملديف';
 $lang['MEX']='المكسيك';
 $lang['MGL']='منغوليا';
@@ -151,7 +142,6 @@
 $lang['PNG']='بابوا غينيا الجديدة';
 $lang['POL']='بولندا';
 $lang['POR']='البرتغال';
-$lang['PRK']='كوريا الشمالية';
 $lang['PUR']='بورتريكو';
 $lang['QAT']='قطر';
 $lang['ROU']='رومانيا';
@@ -175,13 +165,11 @@
 $lang['SUR']='سورينام';
 $lang['SVK']='سلوفاكيا';
 $lang['SWE']='السويد';
-$lang['SYR']='سوريا';
 $lang['TAN']='تانزانيا';
 $lang['TGA']='تونجا';
 $lang['THA']='تايلاند';
 $lang['TJK']='طاجيكستان';
 $lang['TKM']='تركمنستان';
-$lang['TLS']='تيمور الشرقية';
 $lang['TOG']='توجو';
 $lang['TPE']='تايبي الصينية';
 $lang['TRI']='ترينداد وتوباجو';
diff --git a/src/Common/Languages/ar/ISK.php b/src/Common/Languages/ar/ISK.php
new file mode 100644
index 00000000..ae8cfa53
--- /dev/null
+++ b/src/Common/Languages/ar/ISK.php
@@ -0,0 +1,6 @@
+<?php
+$lang['0_Phase']='الذهبية';
+$lang['UpdateLang']='تحديث اللغات';
+$lang['Winner']='الفائز';
+$lang['Yes']='نعم';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ar/Ianseo.php b/src/Common/Languages/ar/Ianseo.php
index c7a240af..afb4cde6 100644
--- a/src/Common/Languages/ar/Ianseo.php
+++ b/src/Common/Languages/ar/Ianseo.php
@@ -7,4 +7,5 @@
 $lang['Cert-Level4']='كورس الخبير';
 $lang['Cert-Level5']='فريق عمل Ianseo';
 $lang['CertificateManagement']='إدارة الشهادة';
+$lang['GenerateFile']='إنشاء ملف';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ar/InfoSystem.php b/src/Common/Languages/ar/InfoSystem.php
index 3329097e..3446608e 100644
--- a/src/Common/Languages/ar/InfoSystem.php
+++ b/src/Common/Languages/ar/InfoSystem.php
@@ -1,9 +1,11 @@
 <?php
+$lang['AutoUpdate']='تحديث تلقائي';
 $lang['ByClub']='بالدولة/بالنادي';
 $lang['ByName']='بالاسم';
 $lang['ByTarget']='بالهدف';
 $lang['ClassDiv']='فئة';
 $lang['Individual']='الفردي';
+$lang['Live']='بث مباشر';
 $lang['Matches']='المباريات';
 $lang['Record-WR-WA']='رقم عالمي';
 $lang['Teams']='الفرق';
diff --git a/src/Common/Languages/ar/Install.php b/src/Common/Languages/ar/Install.php
index 32c02319..aa28e800 100644
--- a/src/Common/Languages/ar/Install.php
+++ b/src/Common/Languages/ar/Install.php
@@ -1,4 +1,5 @@
 <?php
+$lang['Database name']='إسم قاعدة البيانات';
 $lang['SetKidClass']='مراحل الشباب فقط';
 $lang['SetOneClass']='مرحلة واحدة للجميع';
 $lang['SetOrdinary']='بطولة عادية';
diff --git a/src/Common/Languages/ca/Api.php b/src/Common/Languages/ca/Api.php
index 5e4b355a..168eca88 100644
--- a/src/Common/Languages/ca/Api.php
+++ b/src/Common/Languages/ca/Api.php
@@ -50,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='Estat Connexió';
 $lang['ISK-DeleteDevices']='Suprimir Dispositius';
 $lang['ISK-DenyAccess']='Accés denegat';
+$lang['ISK-Deprecated']='IMPORTANT: l\'aplicació "Ianseo Score Keeper" s\'està eliminant gradualment de les botigues d\'Android i Apple i ja no s\'admet, per la qual cosa s\'eliminarà de Ianseo el setembre de 2024. Si us plau, canvieu a la nova App "Ianseo Score Keeper NG".';
 $lang['ISK-DeviceAlive']='Online';
 $lang['ISK-DeviceBattery']='Bateria';
 $lang['ISK-DeviceEnabled']='Habilitat';
@@ -79,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='Codi competició perdut';
 $lang['ISK-Lite-QRCode']='Imprimir Codi QR per Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='Url Server (incloent el protocol i el port si no 80)';
+$lang['ISK-Live-Deprecated']='IMPORTANT: l\'aplicació "Ianseo Score Keeper Live" ja no és compatible, per la qual cosa s\'eliminarà de Ianseo el setembre de 2024. Si us plau, canvieu a la nova App "Ianseo Score Keeper NG".';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper Live';
 $lang['ISK-lockPortrait']='Bloqueig de dispositiu en retrat vist';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
diff --git a/src/Common/Languages/ca/BackNumbers.php b/src/Common/Languages/ca/BackNumbers.php
index 359514f8..96b8a043 100644
--- a/src/Common/Languages/ca/BackNumbers.php
+++ b/src/Common/Languages/ca/BackNumbers.php
@@ -112,6 +112,7 @@
 $lang['GivCaps-FamCaps-ClubCaps']='NOM COGNOM, NOM DEL PAÍS';
 $lang['GivenNameInitial']='1ª lletra del nom de pila';
 $lang['Heigh']='Alçada';
+$lang['HLayout']='Horitzontal';
 $lang['HLine']='Línia horitzontal';
 $lang['I-Badge']='Dorsal Encontres Individual';
 $lang['IdCardHor']='en amplada';
@@ -143,6 +144,8 @@
 $lang['OpenPictureScreen']='Obre Pantalla Secundària';
 $lang['PageDimension']='Dimensió full';
 $lang['PaperDimention']='Dimensió del paper';
+$lang['PhaseFrom']='Des de la Fase';
+$lang['PhaseTo']='A la Fase';
 $lang['Picture']='Foto atleta';
 $lang['Portrait']='Vertical';
 $lang['PosX']='Posició (X)';
@@ -163,6 +166,7 @@
 $lang['ResetBarcodeSeparator']='Reiniciar separador codi de barres';
 $lang['RnkCardinalEN']='Visualització cardinal (1, 2, ..., 10)';
 $lang['RnkOrdinal']='Visualització ordinal (1a, 2a, ..., 10a)';
+$lang['S-Badge']='Adhesius';
 $lang['Schedule']='Horari';
 $lang['Session']='Sessió classificació';
 $lang['SessionTarget']='Codi sessió i diana';
@@ -177,6 +181,7 @@
 $lang['ToRight']='Logo competició (dreta)';
 $lang['TVViewIdCard']='Mostra ID Cards';
 $lang['TVViewIdCardDescr']='En encontres treure 2 ID Cards del contrari en lloc de les files "estàndard"';
+$lang['VLayout']='Vertical';
 $lang['Width']='Amplària';
 $lang['WRank']='Rànquing mundial';
 $lang['WRankFields']='No mostrar després posició WR (0: mostra-ho tot)';
diff --git a/src/Common/Languages/ca/Common.php b/src/Common/Languages/ca/Common.php
index 7964d6ad..c02bfb88 100644
--- a/src/Common/Languages/ca/Common.php
+++ b/src/Common/Languages/ca/Common.php
@@ -70,6 +70,7 @@
 $lang['CmdOk']='Ok';
 $lang['CmdOn']='On';
 $lang['CmdPostUpdate']='Actualització diferida (no en temps real)';
+$lang['CmdRefresh']='Actualitza';
 $lang['CmdSave']='Guardar';
 $lang['CmdSaveContinue']='Guardar i Continuar';
 $lang['CmdSet2All']='Estableix a tots';
@@ -147,6 +148,10 @@
 $lang['Finish']='Finalitzar';
 $lang['FirstPhase']='Primera Fase';
 $lang['FopSetup']='Distribució del Camp de Tir';
+$lang['Gender0']='Home';
+$lang['Gender1']='Dona';
+$lang['GenderShort0']='H';
+$lang['GenderShort1']='D';
 $lang['GF']='Dones Joves';
 $lang['GM']='Homes Joves';
 $lang['HELP']='AJUDA!';
@@ -206,6 +211,8 @@
 $lang['MatchMode_0']='Acumulatiu';
 $lang['MatchMode_1']='Sistema a sets';
 $lang['MatchNo']='Encontre nº';
+$lang['MatchWinShot']='Tir Guanyador Enfrontament';
+$lang['MatchWinShotHelp']='[Nombre tirs amb èxit del guanyador de l\'enfrontament] - [Nombre tirs fallits del guanyador de l\'enfrontament] %=Percentatge d\'èxit quan una fletxa és un potencial de guanyar l\'enfrontament';
 $lang['Medal']='Medalla';
 $lang['MedalBronze']='Bronze';
 $lang['MedalGold']='Or';
@@ -216,6 +223,7 @@
 $lang['MenuLMRemoveNoShows']='Elimina No Presents';
 $lang['MenuLM_Accreditation']='Acreditació';
 $lang['MenuLM_Accreditation colors management']='Gestió dels colors de l\'acreditació';
+$lang['MenuLM_AdvancedFeatures']='Funcions Avançades';
 $lang['MenuLM_AdvLabels']='Etiquetes avançades d\'impressió';
 $lang['MenuLM_Archers on Targets']='Arquers per diana';
 $lang['MenuLM_Arr4Set']='Fletxes per set';
@@ -229,6 +237,7 @@
 $lang['MenuLM_Athlets fees status']='Estat de la inscripció de l\'arquer';
 $lang['MenuLM_Authentication']='Autenticació Usuaris';
 $lang['MenuLM_AutoCheckinSetup']='Auto Check-In de configuració';
+$lang['MenuLM_Automator']='Automatitzador';
 $lang['MenuLM_Back Number Printout']='Impressió dorsals';
 $lang['MenuLM_Boinx']='Configuració de capes de Boinx';
 $lang['MenuLM_BoinxMeteo']='Dades de la capa Meteo de Boinx';
@@ -239,9 +248,11 @@
 $lang['MenuLM_Category Result List']='Llista resultats per categoria';
 $lang['MenuLM_Change Components']='Canvi de Components';
 $lang['MenuLM_ChangeNationsNames']='Canviar noms d\'Associacions/Clubs';
+$lang['MenuLM_ChangePassword']='Canvia Contrasenya';
 $lang['MenuLM_Check Data Update']='Consulta actualització de dades';
 $lang['MenuLM_Check shoot-off before eliminations']='Consulta empats abans de les eliminatòries';
 $lang['MenuLM_Check shoot-off before final phases']='Consulta empats abans de la fase final';
+$lang['MenuLM_Check shoot-off before Rank']='Comproveu desempat abans Impressió Rànquing';
 $lang['MenuLM_CheckAwards']='Comprovi Traduccions Premis';
 $lang['MenuLM_CheckList']='Imprimeix llista de verificació';
 $lang['MenuLM_CIS']='CIS';
@@ -295,6 +306,7 @@
 $lang['MenuLM_FinalFOPChoose']='Camp de competició final ampliat';
 $lang['MenuLM_FlightsAwardManagement']='Gestió de Premis Trams';
 $lang['MenuLM_FlightsManagement']='Gestió Trams';
+$lang['MenuLM_FontManagement']='Gestió Tipus de Lletra';
 $lang['MenuLM_GateControl']='Porta d\'Accés Panell de Control';
 $lang['MenuLM_GateSituation']='Situació Entrada';
 $lang['MenuLM_Get Info']='Obtenir informació';
@@ -337,6 +349,7 @@
 $lang['MenuLM_Modules']='Mòduls';
 $lang['MenuLM_MoveSession']='Canvieu sessió assignada';
 $lang['MenuLM_MoveTarget']='Moveu diana assignada';
+$lang['MenuLM_N62']='Informació N62A/B ORIS';
 $lang['MenuLM_New']='Nou';
 $lang['MenuLM_NewBacknumbers']='Dorsal';
 $lang['MenuLM_OdsExport']='Exporta full de càlcul (.ods)';
@@ -442,6 +455,7 @@
 $lang['MsgImportOk']='Importació Completada!';
 $lang['MsgInitFinalGridsError']='Advertiment: els enfrontament ja s\'han creat per a aquest esdeveniment. Vols continuar?';
 $lang['MsgInitFinalGridsOk']='Inicialització amb èxit!';
+$lang['MsgInitFinalGridsRunningError']='No es permet l\'operació quan l\'Esdeveniment està en Mode Execució';
 $lang['MsgMakeFinReset']='Quadres d\'enfrontaments de finals reinicialitzats!<br>Refer tota l\'operació preliminar abans d\'inserir noves dades!';
 $lang['MsgNeedInitGrids']='Error!<br>Quadres d\'enfrontaments no inicialitzats!';
 $lang['MsgNeedShootOff']='Error!<br>En primer lloc heu de gestionar els empats!';
@@ -498,6 +512,7 @@
 $lang['Score1Page1Match']='Puntuacions d\'arquers en un encontre';
 $lang['ScoreDrawing']='Sols esquema puntuació (full únic)';
 $lang['ScoreFilled']='Impressió del full de puntuació omplert amb tots els valors individuals de les fletxes';
+$lang['ScoreIncAllNames']='Inclou tots els possibles Oponents';
 $lang['ScoreIncEmpty']='Imprimir encontres malgrat no hagi oponent';
 $lang['Scorer']='Anotador';
 $lang['SearchOrphanTexts']='Cercar Textos Orfes';
@@ -506,9 +521,12 @@
 $lang['SelectAll']='Selecciona Tot';
 $lang['SelTour']='Competició Seleccionada';
 $lang['Session']='Torn';
+$lang['SetWinShot']='Tir Guanyador Set';
+$lang['SetWinShotHelp']='[Nombre tirs amb èxit del guanyador del set] - [Nombre tirs fallits del guanyador del set] %=Percentatge d\'èxit quan una fletxa és un potencial de guanyar el set';
 $lang['SF']='Sènior Dones';
 $lang['ShootOff4Elim']='Consulta empats abans de les eliminatòries';
 $lang['ShootOff4Final']='Consulta empats abans de la fase final';
+$lang['ShootOff4Rank']='Comproveu desempat abans Impressió Rànquing';
 $lang['SM']='Sènior Homes';
 $lang['SnapshotConf']='Configuració resum';
 $lang['SortBy']='Ordenat per';
diff --git a/src/Common/Languages/ca/Errors.php b/src/Common/Languages/ca/Errors.php
index f6462259..d7d74717 100644
--- a/src/Common/Languages/ca/Errors.php
+++ b/src/Common/Languages/ca/Errors.php
@@ -2,11 +2,14 @@
 $lang['AllFieldsMandatory']='Tots els camps són obligatoris';
 $lang['AllMailsRedirect']='Tots els missatges s\'enviaran a';
 $lang['Anomalies']='Anomalies';
+$lang['BackupTournaments']='Si us plau, recordeu desar totes les vostres competicions abans d\'actualitzar o reinstal·lar ianseo!';
 $lang['BarCodeSession']='Hi ha un error a la configuració: proveu de configurar una sessió!';
 $lang['BarCodeSettings']='Hi ha un error a la configuració';
+$lang['CategoresNotDefined']='Falten definicions Categories';
 $lang['ClassFromToError']='De i A han de ser valors numèrics';
 $lang['ClubNotFound']='Codi Club no trobat als clubs existents. Si us plau, actualitzeu la base de dades primer!';
 $lang['ConflictingCategories']='La definició del filtre se solapa amb els filtres anteriors per a aquestes categories: $a!';
+$lang['DecodeError']='Error Descodificació';
 $lang['DiameterMandatory']='El diàmetre de la diana és obligatori!';
 $lang['DirectoryNotWriteable']='El directori $a no es pot escriure pel servidor web. Si us plau canvia els permisos per a ser modificable per qualsevol persona.';
 $lang['DistanceOutRange']='La distància està fora de rang!';
@@ -15,6 +18,9 @@
 $lang['EmptyFrom']='Correu electrònic buit o introduït incorrectament: aquest camp és obligatori!';
 $lang['EmptySubject']='Assumpte buit: aquest camp és obligatori!';
 $lang['EmptyTitle']='Títol buit: aquest camp és obligatori!';
+$lang['EndsArrowsMisMatch']='$a amb configuració incorrecta tandes/fletxes';
+$lang['EntriesNoCategory']='Inscripcions sense Categoria';
+$lang['EntriesNoCountry']='Inscripcions sense Associació';
 $lang['ErrCodeExists']='Codi ja existent!';
 $lang['ErrCommitteeError']='Codi o descripció comitè no vàlid';
 $lang['ErrConnection']='No hi ha connexió amb el servidor $a';
@@ -32,6 +38,7 @@
 $lang['ErrRedCard']='El comitè té targeta vermella i no pot demanar competicions que s\'allotgen a ianseo. Contacteu per a més explicacions a codes@ianseo.net .';
 $lang['ErrUnknownNation']='Nació desconeguda';
 $lang['ErrYellowCard']='El comitè té targeta groga perquè no han pujat resultats de competició. Contacteu per a més explicacions a codes@ianseo.net .';
+$lang['EventIncompleteSetting']='$a amb configuració categories permeses que falten';
 $lang['FilterAlreadyExists']='Aquest filtre ja existeix';
 $lang['FilterNotEmpty']='Cal definir un filtre.';
 $lang['IllegalTarget']='La diana seleccionada no es troba a la base de dades';
@@ -39,7 +46,9 @@
 $lang['ImageFetchError']='Error en obtenir Imatge';
 $lang['ImageSaveError']='Imatge no desada';
 $lang['IncompleteSettings']='Configuracions Incompletes';
+$lang['InvalidCharacters']='El camp conté caràcters no vàlids. Els caràcters vàlids són $a';
 $lang['InvalidEmail']='Correu electrònic no vàlid: comproveu el correu electrònic abans de desar-lo';
+$lang['InvalidLogin']='Inici Sessió no vàlid';
 $lang['LockedProcedure']='Aquest procediment està BLOQUEJAT';
 $lang['MailingAlreadyExists']='Ja existeix un correu electrònic amb el mateix títol ({$a}), canvieu el títol o seleccioneu el correu electrònic que voleu modificar al selector.';
 $lang['MailingDeleteText']='Confirmeu que voleu suprimir definitivament aquest correu electrònic!';
@@ -51,21 +60,34 @@
 $lang['MissingAccreditation']='Falta acreditació en línia!';
 $lang['MissingData']='Dades que falten';
 $lang['MissingPhpIntlModule']='Es pot fer la transcripció instal·lant o activant el mòdul php-intl';
+$lang['MysqlInnoDbProcess']='Ianseo actualitzarà la base de dades per millorar-ne el rendiment. Això pot trigar algun temps.';
+$lang['MysqlUpdateNeeded']='Esteu utilitzant un Servidor Mysql molt antic. Actualitzeu el vostre servidor, XAMP, WAMP o LAMP a una versió més recent o torneu a instal·lar Ianseo des de zero.';
 $lang['NameNotEmpty']='El nom no pot estar buit!';
+$lang['NoCountryInsert']='Sense Inserció País';
+$lang['NoData']='No s\'han proporcionat Dades';
+$lang['NoDistancesSet']='Categories sense configuració de distància';
 $lang['NoDNSRecord']='El nom del servidor no és correcte o no està en línia: tingueu en compte que heu d\'estar connectat a Internet per configurar aquesta opció.';
+$lang['NoEntryInsert']='Inscripció No Introduïda';
 $lang['NoMailingTemplate']='No hi ha cap plantilla de correu electrònic seleccionada/disponible!';
 $lang['NoMailRecipients']='Ningú a qui enviar el correu! Reviseu les opcions de filtre.';
 $lang['NoPrivilege']='Privilegis insuficients: no teniu autorització per operar en aquesta pàgina!';
 $lang['NoSameOrders']='El valor del nou ordre no es pot duplicar.';
 $lang['NoSmtpServerSet']='Si us plau, configureu el servidor SMTP abans d\'enviar correus electrònics!';
+$lang['NoTargetSet']='Categories sense configuració de diana';
+$lang['PhpOutdated']='La vostra versió de PHP està obsoleta. Ianseo pot funcionar, però algunes funcionalitats necessitaran com a mínim la versió {$a}.<br/>Actualitzeu la instal·lació tan aviat com sigui possible per admetre PHP {$a} o més recent.';
 $lang['RegExp']='Per utilitzar RegExp (expressions regulars), consulteu $a';
+$lang['ResetSyncData']='Restableix Dades Sincronització';
+$lang['ServiceNotAvailable']='Servei No Disponible';
 $lang['SetupNotFinished']='No podeu accedir a aquesta pàgina: primer ompliu {$a}!';
 $lang['SpecialFilterDiscrepancy']='S\'ha establert un filtre especial però no està actiu!';
 $lang['SqlJolly']='En una instrucció SQL, el percentatge "%" actua com un comodí (representa zero, un o més caràcters), mentre que el guió baix "_" representa un i només un caràcter. Per exemple, "R%M" coincidirà amb tots Recorbats Homes: "RCM" així com "RMM", "RM", etc, però no amb "RMC". Mentre que "R_M" coincidirà amb "RSM", "RJM", etc., però no amb "RM".';
+$lang['SyncNotAvailable']='Sincronització no disponible';
 $lang['TargetNumberMismatch']='El Nombre de Diana només pot tenir la forma [TargetNumber][TargetLetter], per exemple: 129C';
 $lang['TargetRangeMismatch']='Els Intervals de Dianes han de ser de 2 nombres de diana (sense lletres) separats per un guió (signe menys), el primer nombre inferior al segon, per exemple: 23-44';
 $lang['TextSmtpDelete']='Confirmeu que voleu desestablir la configuració SMTP en aquesta instal·lació d\'Ianseo';
 $lang['TooManyArrows']='Massa fletxes totals: el màxim és $a';
+$lang['TooManyDistancesMatch']='Categories amb configuració de distàncies múltiples';
 $lang['TooManyElimQualified']='Les rondes del tipus $a[0] només poden acceptar fins a $a[1] arquers';
+$lang['WrongData']='Dades proporcionades incorrectament';
 $lang['WrongPort']='Aquest port no és compatible!';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ca/Help.php b/src/Common/Languages/ca/Help.php
index 46ce4b86..16c64dd4 100644
--- a/src/Common/Languages/ca/Help.php
+++ b/src/Common/Languages/ca/Help.php
@@ -1,4 +1,5 @@
 <?php
+$lang['AuthTourCode']='Llista codis torneigs separats per comes que l\'usuari pot gestionar.<br>Commodin permés: "%"';
 $lang['AutoCheckinAlreadyDone']='Ja us heu registrat<br>Si necessiteu canviar qualsevol informació, aneu al taulell d\'acreditació';
 $lang['AutoCheckinConfirm']='Si totes les dades són correctes, premeu CONFIRMAR CHECK-IN<br> En cas contrari, premeu CANCEL·LAR i aneu a la TAULA d\'acreditació';
 $lang['AutoCheckinSearch']='Escaneja el codi QR que has rebut o escriviu el vostre nom';
@@ -12,6 +13,11 @@
 $lang['ChangeComponents']='<p>Per continuar amb un canvi de component, primer traieu l\'atleta que ja no forma part de l\'equip perquè es puguin activar les opcions de substitució.</p> &#9654&nbsp; Puntuacions incloses en el total de l\'equip a la ronda classificatòria<br>  &#9655&nbsp; Puntuació no inclosa en el total de l\'equip a la ronda classifictòria';
 $lang['CombiCompList']='Llista de Codis de Competició, separats per comes';
 $lang['FlightsManagement']='<b>A les categories flight</b> <ul> <li>Seleccioneu en quines Tandes - Total Distàncies - Total Complert calculeu els flights;</li> <li>Seleccioneu la mida inicial de tall de flight per categoria. El sistema precarrega la taula flight estàndard de la NFAA quan la competència ho permet;</li> <li>La vista prèvia d\'Agrupació de Flights calcularà TOTES LES CATEGORIES, premeu el botó de recarrega lateral de la mida del tall de flight per forçar el càlcul d\'una sola categoria; </li> <li>Flights marcats en taronja són només un indicador de la diferència entre el flight previsualitzat i la taula de regles. NO afecta la divisió flight.</li> <li>Utilitzeu les ordres deixar anar - dividir - fusionar per ajustar la informació dels flights. Tingueu en compte que, després d\'executar una vista prèvia completa o una actualització de categoria, es perden tots els canvis del flight.</li> </ul> <b>Notes</b> <ul> <li>S\'exclouen categories amb massa pocs participants flights. Flighting es pot forçar indicant la quantitat de tall flight;</li> <li>Si  una categoria es considera que està flight, utilitzeu "-1" com a tall per excloure explícitament del flighting</li> <li>Professional i/o Campionats com a exclòs del fligting i atenuat</li> </ul>';
+$lang['FontFamily']='Nom del tipus de lletra a utilitzar al CSS';
+$lang['FontFile']='Ubicació del fitxer al disc';
+$lang['FontName']='Nom real del tipus de lletra';
+$lang['FontStyle']='Estil del tipus de lletra en CSS';
+$lang['FontWeight']='Pes del tipus de lletra en CSS';
 $lang['GetBarcodeSeparator']='Després d\'imprimir el full referència de codis de barres, llegiu el «SEPARATOR» de codi de barres per tal d\'activar els elements lectors correctes.';
 $lang['HomePage']='Aquesta és la pàgina on es pot seleccionar o crear un torneig.';
 $lang['ISK-LockedSessionHelp']='{$a}La icona indica si l\'APP pot introduir puntuacions a la sessió o no';
@@ -26,5 +32,7 @@
 $lang['TV-RotEdit']='<Div>Una pàgina de presentació està feta d\'almenys d\'una pàgina de contingut.</ div> <div>Les pàgines de contingut seran mostrades una rere l\'altre i començant de nou.</div> <div><b>NOTA:</b> en els motors de versió regular i bàsic, el primer contingut es mostra de nou com últim, el que és aconsellable per a inserir-la com a primer contingut d\'una imatge (logo de la competició, per exemple).</div> <div> El text pot ser ja sigui basat en la competició (distribució participants, classificatòria, encontres) o "multimèdia" (imatges, missatges, HTML, ...). </ div>';
 $lang['TV-RotEdit-DB']='<H2>Gestió CSS3 (motor avançat)</h2> <h3>Unitats de longitud</h3> <ul> <li><b>rem:</b>alçada del caràcter</li> <li>< b>em:</b>alçada del caràcter actual</li> <li><b>ex:</b>alçada de la minúscula "x"</li> <li><b>ch:</b>ample del nombre "0"</li> <li><b>vh:</b> 1/100 de l\'alçada de la pantalla</li> <li><b>vw:</b>1/100 de l\'amplada de la pantalla</li> <li><b>vmin:</b> 1/100 del valor mínim entre l\'alçada i l\'amplada de la pantalla</li> <li><b>vmax:</b> 1/100 del valor màxim entre l\'alçada i l\'amplada de la pantalla</li></ul> <h3> Mòduls flexibles </h3> <li><b>flex A B C:</b> <ul> <li><b>A</b>: si 0 vol dir que el mòdul no pot expandir-se; si>1 significa que el mòdul pot expandir-se en aquesta "velocitat" en comparació amb altres mòduls (si el mòdul 1 té 2 i el mòdul 2 té 3, el mòdul 2 s\'expandirà 1,5 més que mòdul 1 que al seu torn expandirà el doble tant com un mòdul amb aquest valor s\'establert en 1)</li> <li><b>B:</b> si és 0 el mòdul no pot encongir; si mòdul 1 pot encongir</li> <li><b>C:</b> dimensió inicial del mòdul</li> </ul> </ li> <h3>referència CSS</h3> <a href="https://developer.mozilla.org/en-US/docs/Web/CSS/Reference">https://developer.mozilla.org/en-US/docs/Web/CSS/Reference</a>';
 $lang['TV-RotList']='<Div> Aquesta és la llista de les pàgines de presentació disponibles per enviar a videowall, monitors o emissió.</div> <div>es proporcionen 3 motors diferents, feu clic a l\'enllaç per activar:</div> <ul> <li>un motor regular compatible amb la majoria de navegadors</li> <li> un motor versió lleugera compatible amb la majoria de navegadors, però que fa servir menys recursos</li> <li>una versió avançada que utilitza navegadors moderns capacitats d\'HTML5</li> </ul> <div> Per crear un nou contingut, introdueixi un nom per a ell i premi el botó.</div>';
+$lang['UserName']='Han de ser únics en el sistema. Extensió mínima: 6 caràcters';
+$lang['UserPassword']='Deixa en blanc per mantenir la contrasenya actual';
 $lang['ZeroBased']='Número base zero';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ca/IOC_Codes.php b/src/Common/Languages/ca/IOC_Codes.php
index 620c69ff..8d8dbd66 100644
--- a/src/Common/Languages/ca/IOC_Codes.php
+++ b/src/Common/Languages/ca/IOC_Codes.php
@@ -12,8 +12,8 @@
 $lang['ASA']='Samoa Americana';
 $lang['AUS']='Austràlia';
 $lang['AUT']='Àustria';
-$lang['Award-Anthem']='Senyores i Senyors: Si us plau, posin drets per l\'himne nacional de';
-$lang['Award-Anthem-TPE']='Senyores i senyors, si us plau posar-se dempeus per a l\'himne de';
+$lang['Award-Anthem']='Senyores i senyors, per a aquells que puguin, si us plau, posin drets per l\'Himne Nacional de';
+$lang['Award-Anthem-TPE']='Senyores i senyors, per a aquells que puguin, si us plau, posin drets per l\'Himne de';
 $lang['Award-Applause']='Senyores i senyors, si us plau donin un calorós aplaudiment al(s) nostre(s) atleta (s)';
 $lang['Award-Intro']='Senyores i Senyors, cerimònia de premis de {$a}';
 $lang['Award-MedalGiver']='Les medalles seran entregades per $a';
@@ -59,8 +59,9 @@
 $lang['CRC']='Costa Rica';
 $lang['CRO']='Croàcia';
 $lang['CUB']='Cuba';
+$lang['CUW']='Curaçao';
 $lang['CYP']='Xipre';
-$lang['CZE']='República Txeca';
+$lang['CZE']='Txèquia';
 $lang['DEN']='Dinamarca';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -74,7 +75,10 @@
 $lang['ETH']='Etiòpia';
 $lang['FIJ']='Fiji';
 $lang['FIN']='Finlàndia';
+$lang['FLK']='Illes Falkland (Malvines)';
+$lang['FPO']='Tahití';
 $lang['FRA']='França';
+$lang['FRO']='Fèroe';
 $lang['FSM']='Micronèsia';
 $lang['GAB']='Gabon';
 $lang['GAM']='Gàmbia';
@@ -84,6 +88,7 @@
 $lang['GEQ']='Guinea Equatorial';
 $lang['GER']='Alemanya';
 $lang['GHA']='Ghana';
+$lang['GLP']='Guadalupe';
 $lang['GRE']='Grècia';
 $lang['GRN']='Grenada';
 $lang['GUA']='Guatemala';
@@ -91,7 +96,7 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haití';
-$lang['HKG']='Hong Kong';
+$lang['HKG']='Hong Kong, Xina';
 $lang['HON']='Hondures';
 $lang['HUN']='Hongria';
 $lang['INA']='Indonèsia';
@@ -101,7 +106,7 @@
 $lang['IRQ']='Iraq';
 $lang['ISL']='Islàndia';
 $lang['ISR']='Israel';
-$lang['ISV']='Illes Verges Americanes';
+$lang['ISV']='Illes Verges dels Estats Units';
 $lang['ITA']='Itàlia';
 $lang['IVB']='Illes Verges Britàniques';
 $lang['JAM']='Jamaica';
@@ -112,11 +117,13 @@
 $lang['KGZ']='Kirguizistan';
 $lang['KIR']='Kiribati';
 $lang['KOR']='República de Corea';
+$lang['KOS']='Kosovo';
 $lang['KSA']='Aràbia Saudita';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
+$lang['LAO']='Lao';
 $lang['LAT']='Letònia';
 $lang['LBA']='Líbia';
+$lang['LBN']='Líban';
 $lang['LBR']='Libèria';
 $lang['LCA']='Saint Lucia';
 $lang['LES']='Lesotho';
@@ -124,6 +131,7 @@
 $lang['LIE']='Liechtenstein';
 $lang['LTU']='Lituània';
 $lang['LUX']='Luxemburg';
+$lang['MAC']='Macao, Xina';
 $lang['MAD']='Madagascar';
 $lang['MAR']='Marroc';
 $lang['MAS']='Malàisia';
@@ -145,13 +153,18 @@
 $lang['MOZ']='Moçambic';
 $lang['MRI']='Maurici';
 $lang['MTN']='Mauritània';
+$lang['MTQ']='Martinica';
 $lang['MYA']='Myanmar';
 $lang['NAM']='Namíbia';
 $lang['NCA']='Nicaragua';
+$lang['NCL']='Nova Caledònia';
 $lang['NED']='Països Baixos';
 $lang['NEP']='Nepal';
+$lang['NFK']='Illa Norfolk';
 $lang['NGR']='Nigèria';
 $lang['NIG']='Níger';
+$lang['NIU']='Niue';
+$lang['NMI']='Illes Marianes del Nord';
 $lang['NOR']='Noruega';
 $lang['NRU']='Nauru';
 $lang['NZL']='Nova Zelanda';
@@ -199,10 +212,11 @@
 $lang['THA']='Tailàndia';
 $lang['TJK']='Tadjikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Timor Oriental';
+$lang['TLS']='Timor-Leste';
 $lang['TOG']='Togo';
 $lang['TPE']='Xina Taipei';
 $lang['TRI']='Trinitat i Tobago';
+$lang['TTO']='Trinidad i Tobago';
 $lang['TUN']='Tunísia';
 $lang['TUR']='Turquia';
 $lang['TUV']='Tuvalu';
diff --git a/src/Common/Languages/ca/Install.php b/src/Common/Languages/ca/Install.php
index 5df99b1c..1b915218 100644
--- a/src/Common/Languages/ca/Install.php
+++ b/src/Common/Languages/ca/Install.php
@@ -35,6 +35,7 @@
 $lang['Email']='Correu electrònic';
 $lang['Email not in DB']='El correu electrònic no està a la nostra base de dades';
 $lang['EventWillBeReset']='ADVERTÈNCIA: un canvi en el "$a[0]", "$a[1]" o "$a[2]", es restabliran tots els paràmetres als seus valors predeterminats del tipus de torneig seleccionat.';
+$lang['ExportAllComps']='Exporta totes les competicions';
 $lang['Failed']='HA FALLAT!';
 $lang['Failing install']='Si us plau actualitzi la seva instal·lació de PHP abans d\'obrir de nou el programa IANSEO.';
 $lang['Field24Normal']='Camp 24 Dianes';
@@ -87,7 +88,7 @@
 $lang['Parameter']='Paràmetre';
 $lang['Password']='Contrasenya';
 $lang['PHP settings']='Configuracions PHP';
-$lang['PHP too old']='La seva instal·lació de PHP és massa antiga. El número de versió mínima per a IANSEO és 5.0';
+$lang['PHP too old']='La seva instal·lació de PHP és massa antiga. El número de versió mínima per a IANSEO és 8.0';
 $lang['PHP version']='Versió PHP';
 $lang['php.ini file']='Arxiu php.ini';
 $lang['Prepare']='Preparació de les dades per a l\'actualització.';
@@ -251,7 +252,7 @@
 $lang['Value']='Valor (matrius indexades clau1::valor1|clau2::valor2)';
 $lang['WhatIanseoDoes01']='<b>Reglaments de la World Archery </ b> Ianseo està sempre actualitzat amb les normes de la World Archery. Els programadors estan disponibles per adaptar-se als reglaments particulars o formats específics de competicions tambè!';
 $lang['WhatIanseoDoes02']='b> Ajuda i suport: </ b> si necessita ajudes, envieu un correu electrònic a $a: rebrà una resposta directament dels programadors principals de Ianseo!';
-$lang['WhatIanseoDoes03']='<b>Cursos i formació in situ:</ b> Ianseo està disponible per a la impartició de cursos. Dos nivells: sense i amb els dispositius electrònics. El primer està destinat a conèixer tots els aspectes de Ianseo en gestió i programació de la competició fins la publicació en línia i distribució dels resultats. La segona, dirigida a l\'adquisició de tots els coneixements específics per executar un concurs "fletxa a fletxa".';
+$lang['WhatIanseoDoes03']='<b>Formació i cursos in situ:</b> Ianseo està disponible per gestionar cursos específics a la ubicació. Dos nivells: sense i amb l\'aplicació Ianseo Scorekeeper NG. El primer té com a objectiu conèixer tots els aspectes del Ianseo, des de la preparació i programació de competicions fins a la publicació en línia i la distribució local dels resultats. El segon té com a objectiu l\'adquisició de tots els coneixements específics per dur a terme una competició "fletxa a fletxa".';
 $lang['WhatIanseoDoes04']='<b> Donar! </ b> Ianseo és lliure i de codi obert ... si t\'agrada, si us plau, ajudeu-nos a mantenir el programari i el servidor al dia: premeu el botó "Donar" a la pàgina inicial de $a!';
 $lang['WhatIanseoDoes05']='<b> Social Media:</b> Ianseo també {$a}!';
 $lang['WhatIanseoDoesTitle']='Què pot fer Ianseo de la seva competició';
diff --git a/src/Common/Languages/ca/ODF.php b/src/Common/Languages/ca/ODF.php
index c28d4dab..bf7cfb3c 100644
--- a/src/Common/Languages/ca/ODF.php
+++ b/src/Common/Languages/ca/ODF.php
@@ -53,8 +53,10 @@
 $lang['OdfCommonCodeVersion']='Versió de Codi Comú';
 $lang['OdfCompetition']='Codi competició ODF';
 $lang['OdfEventCode']='Codi Esdeveniments ODF';
+$lang['OdfGeneralCodeVersion']='Versió Diccionari Dades Generals';
 $lang['OdfReceiverOn']='Receptor actiu';
 $lang['OdfReceiverSetup']='Configuració Receptor ODF';
+$lang['OdfSportCodeVersion']='Versió Diccionari Dades Esportives';
 $lang['OdfUploadFileText']='Seleccioneu un fitxer XML per penjar ...';
 $lang['Production']='Producció';
 $lang['Receiver']='Receptor';
@@ -87,6 +89,7 @@
 $lang['TMMeeting']='Reunió Capitans Equip';
 $lang['Transmitter']='Emissor';
 $lang['TypCODE']='Codi document sufix';
+$lang['TypDISCIPLINE']='Disciplina (ref Sports CC@Discipline)';
 $lang['TypEVENT']='Descripció esdeveniment';
 $lang['TypNAME']='Descripció';
 $lang['TypPHASE']='Descripció fase';
diff --git a/src/Common/Languages/ca/Tournament.php b/src/Common/Languages/ca/Tournament.php
index 9e422173..1869d394 100644
--- a/src/Common/Languages/ca/Tournament.php
+++ b/src/Common/Languages/ca/Tournament.php
@@ -27,7 +27,7 @@
 $lang['AclISKServer']='Gestió ISK';
 $lang['AclModules']='Mòduls';
 $lang['ACLNoAccess']='Sense accès';
-$lang['AclNotes']='<b>Notes sobre Seguretat de la Xarxa</b><ul><li>les restriccions estan "basades en competència" i no en "basades en servidors"</li><li>localhost (127.0.0.1 o ::1) no es pot restringir</li><li>Les Polítiques es poden desactivar trucant des del propi servidor<b>{$a}</b></ul><ul><li>Quan les polítiques estan habilitades, el comportament predeterminat per als clients que no figuren a la llista és "Sense accés"</li><li>És possible afegir * com a darrer grup de l\'adreça IP (192.168.0.* o 172.16.*) per afegir un grup predeterminat, limitat a polítiques de només lectura</li>< li>IP en el rang 0.0.0.[1-254] no es consideraran IP reals i el sistema utilitzarà el contingut de la descripció com a RegExp per coincidir amb l\'adreça IP. RegExps avaluaran en l\'ordre en què es mostren i permeten polítiques R/W</li></ul>';
+$lang['AclNotes']='<b>Notes sobre Seguretat de la Xarxa</b><ul><li>Aquestes restriccions estan "basades en competència" i no en "basades en servidors"</li><li>localhost (127.0.0.1 o ::1) no es pot restringir</li><li>Les Polítiques es poden desactivar trucant des del propi servidor<b>{$a}</b></li></ul><ul><li>Quan les polítiques estan habilitades, el comportament predeterminat per als clients que no figuren a la llista és "Sense accés"</li><li>És possible afegir * com a darrer grup de l\'adreça IP (192.168.0.* o 172.16.*) per afegir un grup predeterminat</li><li>És possible utilitzar RegExp per fer coincidir l\'adreça IP. Les expressions regulars s\'avaluaran en l\'ordre en què es mostren i permeten polítiques R/W </ul>';
 $lang['AclOdf']='Gestió ODF';
 $lang['AclOutput']='Outputs/Producció';
 $lang['AclParticipants']='Participants';
@@ -52,6 +52,7 @@
 $lang['AllDistances']='Tots';
 $lang['AllEntries']='Totes les Inscripcions';
 $lang['AllEvents']='Tots els Esdeveniments';
+$lang['AllowCompetitionACL']='Permetre Polítiques Accés a la Xarxa Competició';
 $lang['AllRound']='Totes les Rondes';
 $lang['AllSessions']='Tots els torns';
 $lang['AllsF']='Totes';
@@ -98,6 +99,7 @@
 $lang['AuthCodeA2A']='Codi d\'autorització de Fletxa a Fletxa';
 $lang['AutoCoinToss']='Assignacions automàtiques amb llançament de moneda';
 $lang['AutoEdits']='Auto Edició';
+$lang['AutomatorAccPrint']='Paràmetres Impressió Acreditació';
 $lang['AutoMoveNext']='Mou Automàticament a la Fletxa Següent';
 $lang['AutoRefresh']='Actualització automàtica';
 $lang['AutoTargetAssignment']='Assignació Automàtica de Dianes - Sorteig';
@@ -128,7 +130,7 @@
 $lang['BadgeIncludePhoto']='Incloure fotografies en l\'acreditació?';
 $lang['BadgeNames']='Nom complet (no es va imprimir per primera vegada)';
 $lang['BadgeNoData']='No hi ha dades per imprimir';
-$lang['BadgeOnlyNotPrinted']='NOMÉS acreditacions que no s\'han imprès?';
+$lang['BadgeOnlyNotPrinted']='Només NO Imprès';
 $lang['BadgeOnlyPrintAccredited']='NOMÉS acreditacions dels participants acreditats?';
 $lang['BadgeOnlyPrintPhoto']='NOMÉS acreditacions amb foto?';
 $lang['BadgeOptions']='Opcions';
@@ -158,6 +160,9 @@
 $lang['Block_IP']='Accés IP (v4)';
 $lang['Block_Manage']='Polítiques d\'accés a la xarxa';
 $lang['Block_Nick']='Accés sobrenom';
+$lang['Block_TemplateIP']='Plantilles IP';
+$lang['Block_TemplateName']='Descripció';
+$lang['Block_TemplatePattern']='Patró';
 $lang['BoldIsDefault']='En negreta es valor predeterminat';
 $lang['Bonus']='Bonus';
 $lang['ByeMovedToPhase']='Atleta traslladat a la següent Fase';
@@ -192,7 +197,7 @@
 $lang['CatJury']='Jurat d\'Apel·lació';
 $lang['CatOC']='Comitè Organitzador';
 $lang['ChairmanJudge']='President dels Jutges';
-$lang['ChairmanJudgeDeputy']='Adjunt del President dels Jutges';
+$lang['ChairmanJudgeDeputy']='Adjunt President dels Jutges';
 $lang['ChairmanJury']='President del Jurat d\'Apel·lació';
 $lang['ChangeLookUpTable']='Canvi taula de cerca';
 $lang['ChangeNationsNames']='Canviar noms d\'Assoc./Clubs';
@@ -205,6 +210,7 @@
 $lang['CheckXNinesInMatch']='Comprova XNous en Empats';
 $lang['Classes']='Classes';
 $lang['ClearField']='Buidar Camp Competició';
+$lang['ClickMovesPosition']='Actualitza Només Posicions de la Fletxa';
 $lang['ClickToMailRequest']='Feu clic per obrir un correu electrònic precarregat';
 $lang['ClickToRequestCode']='Feu clic per sol·licitar codi';
 $lang['Clone']='Clona';
@@ -273,6 +279,7 @@
 $lang['CtrlCodeShort']='Crtl. Codi';
 $lang['Currency']='€';
 $lang['CurrentCompCode']='Codi Competició Actual: $a';
+$lang['CustomAclDetails']='Detalls Personalitzats ACL';
 $lang['D1AllInOne']='Tots els Encontres en una sola Competició';
 $lang['DailySchedule']='Programa diari';
 $lang['DATABASE NOT REACHABLE']='BASE DE DADES EN LINIA NO ACCESSIBLE';
@@ -287,6 +294,8 @@
 $lang['DefaultLocRule']='FITA';
 $lang['DefaultVI']='Defecte VI';
 $lang['Delayed']='Posposat (-1 per restablir)';
+$lang['DeleteAclRule']='Suprimeix regla ACL';
+$lang['DeleteAclUser']='Suprimeix usuari ACL';
 $lang['DeleteAwarded']='Suprimeix Premiat';
 $lang['DeleteChannel']='Elimina el canal. Això eliminarà totes les particions del canal i del canal mateix.';
 $lang['DeletePreviousArchers']='Elimineu inscripcions que no apareixen a la llista';
@@ -353,7 +362,7 @@
 $lang['EmailScorecardShort']='Resum Puntuacions';
 $lang['EmailsToSend']='Correu electrònic per enviar';
 $lang['EmailSuccessfull']='El correu electrònic s\'ha enviat correctament a $a';
-$lang['EnableAccess']='Habilitar/ Desactivar política';
+$lang['EnableAccess']='Activa/Desactiva Polítiques Accés';
 $lang['EnableAddOns']='Activa/Desactiva Complements';
 $lang['Ends']='Tandes';
 $lang['EndsOffset']='Desplaçament de la Tanda';
@@ -462,6 +471,13 @@
 $lang['FlightsTotals']='Totals';
 $lang['FlightsUpdateSetup']='Actualització de la situació';
 $lang['FollowHHT']='Mostra programa de HTT habilitat';
+$lang['FontFamily']='Família Tipus de Lletra CSS';
+$lang['FontFile']='Fitxer Tipus de Lletra';
+$lang['FontName']='Nom Tipus de Lletra';
+$lang['FontSample']='Mostra Tipus de Lletra';
+$lang['FontStyle']='Estil Tipus de Lletra CSS';
+$lang['FontWarning']='Només admet Tipus de Lletra TTF';
+$lang['FontWeight']='Pes Tipus de Lletra CSS';
 $lang['FOP-ODS']='Camp de competició (ODS)';
 $lang['ForceAccreditation']='Forçar acreditació';
 $lang['ForceOldPhotos']='Inclou imatges antigues';
@@ -565,6 +581,7 @@
 $lang['LocRuleDefaultNo']='Per defecte';
 $lang['LocRuleModifiedNo']='Modificat';
 $lang['LocRuleValidNo']='No modificat';
+$lang['Login']='Inici de Sessió';
 $lang['LogisticResp']='Responsable Logística Transport';
 $lang['LogMessage']='Missatge de registre';
 $lang['LogoB']='Imatge inferior (la proporció d\'amplada completa és 19:1 per a A4, 20:1 per a letter)';
@@ -577,6 +594,7 @@
 $lang['LUE-CAN']='Canadà';
 $lang['LUE-FITA']='World Archery';
 $lang['LUE-FRA']='França';
+$lang['LUE-GBR']='Archery GB';
 $lang['LUE-ITA']='Itàlia';
 $lang['LUE-ITA_e']='Itàlia (novells)';
 $lang['LUE-ITA_i']='Itàlia (indoor)';
@@ -618,6 +636,7 @@
 $lang['ManageByes']='Gestiona Byes';
 $lang['ManAthStatus']='Gestió estat dels arquers';
 $lang['ManColors']='Gestionar Colors';
+$lang['MandatoryLoginACL']='Força sol·licitud Inici Sessió per a una Adreça IP no registrada';
 $lang['ManDistances']='Gestionar Distàncies';
 $lang['ManDivClass']='Gestionar Divisions/Classes';
 $lang['ManMatchArr4Phase']='Gestionar Fase de fletxes per set';
@@ -686,6 +705,7 @@
 $lang['Name']='Nom';
 $lang['NameOrder']='Ordre Nom';
 $lang['NameOrderHint']='Aquests països canvien Noms i Cognoms: CHN - TPE - HKG - KOR - PRK';
+$lang['Nameplates']='Plaques identificatives';
 $lang['NationShort']='Nom curt';
 $lang['Natl-Nation']='Nació';
 $lang['New']='Nou';
@@ -764,10 +784,14 @@
 $lang['OrisScorecards']='Fulls Puntuacions (C73D)';
 $lang['OrisScorecardsAverage']='Puntuació mitjana de fletxa';
 $lang['OrisScorecardsTeam']='Fulls Puntuacions (C73E)';
+$lang['OrisStatsIndividual']='Estadístiques (C85A)';
+$lang['OrisStatsTeam']='Estadístiques (C85B+C)';
 $lang['OrisTeamList']='Llista Equip O.R.I.S.';
+$lang['OtherCountriesCoachingToo']='Inclou Inscripcions d\'altres països a la selecció d\'Entrenadors';
 $lang['OtherTourCategory']='Altre';
 $lang['OutdoorTourCategory']='Torneig d\'Aire Lliure';
 $lang['OverwritePreviousArchers']='Sobreescriure Arquers Anteriors';
+$lang['OvrBioAchievements']='Assoliments dels Atletes';
 $lang['OvrMatchesMessages']='OVR Senyals Enfrontaments';
 $lang['OvrRefresh']='Actualitzar la pàgina (no enviar)';
 $lang['OvrSendSerial']='Enviar a OVR (Serial)';
@@ -853,6 +877,8 @@
 $lang['PrintNames']='Impressió noms';
 $lang['PrintNormal']='Normal (caràcters llatins)';
 $lang['PrintScore']='Imprimir puntuacions';
+$lang['PrintScoreInd']='Imprimeix Fulls Puntuació Individuals';
+$lang['PrintScoreTeam']='Imprimeix Fulls Puntuació Equips';
 $lang['PrintText']='Text de la capçalera';
 $lang['PrintTextTitle']='Començar per impressió de resultats';
 $lang['Privacy-1']='Ianseo no conté dades personals, tret que l\'usuari doni permís. El programari Ianseo pot utilitzar-se per conservar dades personals si el controlador té un interès legítim en aquestes dades.';
@@ -1172,7 +1198,7 @@
 $lang['TeamCreationMode_2']='Sempre 2n equip';
 $lang['TeamCreationMode_3']='Sempre 3r equip';
 $lang['TeamFin']='Equips - Ronda Elim. i Final';
-$lang['TeamFinEvent']='Final d\'equips';
+$lang['TeamFinEvent']='Esdeveniments Equip';
 $lang['TeamLoaded']='Encontres Equip Carregats per l\'horari {$a}';
 $lang['TeamManagerSignature']='Signatura capità equip';
 $lang['TeamPlace']='Marcadors de Posició d\'Equips';
@@ -1297,6 +1323,7 @@
 $lang['TVCss3RankNone']='Cap rànquing';
 $lang['TVCss3RankOld']='Rànquing edat';
 $lang['TVCss3RankUp']='Rànquing dalt';
+$lang['TVCss3Schedule']='Horari';
 $lang['TVCss3Score']='Puntuació';
 $lang['TVCss3Session']='Sessió';
 $lang['TVCss3SpecificSettings']='Aquesta pàgina especifica configuracions. Utilitzeu la sintaxi CSS3 per a l\'element';
@@ -1392,6 +1419,7 @@
 $lang['TVViewNationNameDescr']='Activa o desactiva la visualització de l\'Assoc./Club de l\'arquer';
 $lang['TVViewPartials']='Veure Puntuacions de les Distàncies';
 $lang['TVViewPartialsDescr']='Activa o desactiva la visualització de les puntuacions de totes les distàncies';
+$lang['TvViewSCHED']='Mostra Horari';
 $lang['TvViewTEAM']='Veure Columna Equip';
 $lang['TvViewTIT2ROWS']='Títol en 2 files';
 $lang['TvViewTOT']='Veure Gran Total';
@@ -1464,7 +1492,9 @@
 $lang['UserDetails']='Detalls Usuari';
 $lang['UserEnabled']='Capacitat';
 $lang['UserName']='Nom d\'usuari';
-$lang['UserPassword']='Contrasenya';
+$lang['UserPassword']='Nova Contrasenya';
+$lang['UserPasswordOld']='Antiga Contrasenya';
+$lang['UserPasswordRetype']='Torna a escriure Nova Contrasenya';
 $lang['UseSubClasses']='Aplicar a subclasses específiques';
 $lang['ValidClass']='Classes Admeses';
 $lang['ValidDivisions']='Div. Permeses (buit per a tots)';
diff --git a/src/Common/Languages/credits.php b/src/Common/Languages/credits.php
index 2b07e6ba..5759c182 100644
--- a/src/Common/Languages/credits.php
+++ b/src/Common/Languages/credits.php
@@ -1 +1 @@
-<tr><th class="SubTitle" rowspan="46" nowrap="nowrap"><?php echo get_text('Credits-Translators', 'Install') ?></th><th class="SubTitle" width="2%"><img src="Common/Languages/en/en.png" alt="English" Title="English" /></th><td><b>Ianseo Team</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ar/ar.png" alt="العربية - Arabic" title="العربية - Arabic" /></th><td><b>Osama&nbsp;El Gemezy&nbsp;- Ismail&nbsp;ELALAOUI&nbsp;- Khaled Sofiane&nbsp;Lamandé</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/bg/bg.png" alt="български език - Bulgarian" title="български език - Bulgarian" /></th><td><b>&nbsp;&nbsp;- Atamas&nbsp;Temelkov</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ca/ca.png" alt="Català - Catalan" title="Català - Catalan" /></th><td><b>David&nbsp;Catalan</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/cs/cs.png" alt="Česky - Czech" title="Česky - Czech" /></th><td><b>Lubos&nbsp;Duchek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/de/de.png" alt="Deutsch - German" title="Deutsch - German" /></th><td><b>Ramon&nbsp;Keller&nbsp;- Andreas&nbsp;Lorenz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/dk/dk.png" alt="Dansk - Danish" title="Dansk - Danish" /></th><td><b>Kasper&nbsp;Hovgaard&nbsp;- Jakob Ruud&nbsp;Poulsen&nbsp;- Karsten&nbsp;Weikop</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ee/ee.png" alt="Eesti - Estonian" title="Eesti - Estonian" /></th><td><b>Tanel&nbsp;Kaasik&nbsp;- Siret&nbsp;Luik&nbsp;- Rait&nbsp;Ots&nbsp;- Kristi &nbsp;Rillo</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/el/el.png" alt="Ελληνικά - Greek" title="Ελληνικά - Greek" /></th><td><b>Nick&nbsp;Bouras&nbsp;- Ioannou&nbsp;Ioannou&nbsp;- Nick&nbsp;Raptis</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/en/en.png" alt="English - English" title="English - English" /></th><td><b>Ken&nbsp;Sentell</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/en-ca/en-ca.png" alt="Canadian English - Canadian English" title="Canadian English - Canadian English" /></th><td><b>Jarrod&nbsp;Ball</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/es/es.png" alt="Español - Spanish" title="Español - Spanish" /></th><td><b>Dajana&nbsp;Piccolo&nbsp;- Pedro&nbsp;Sanz Laboa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/es-ar/es-ar.png" alt="Español Argentino - Argentinian" title="Español Argentino - Argentinian" /></th><td><b>Pablo&nbsp;Navarro</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fa/fa.png" alt="انگليسي - Farsi" title="انگليسي - Farsi" /></th><td><b>Shahrzad&nbsp;Allahyari&nbsp;- Hasan&nbsp;Malekpour</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fi/fi.png" alt="Suomi - Finnish" title="Suomi - Finnish" /></th><td><b>Kimmo&nbsp;Hujanen&nbsp;- Jaakko&nbsp;Setälä&nbsp;- Asko&nbsp;Lötjönen</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fr/fr.png" alt="Français - French" title="Français - French" /></th><td><b>Dominique&nbsp;Delvigne&nbsp;- Xavier&nbsp;Veray&nbsp;- Alexandre&nbsp;Garot&nbsp;- Lisa&nbsp;Gentile&nbsp;- Franck&nbsp;Lucas&nbsp;- Pierre-Adrien&nbsp;Nicolas&nbsp;- Laurent&nbsp;Terrier</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fr-ca/fr-ca.png" alt="Français Canadien - Canadian French" title="Français Canadien - Canadian French" /></th><td><b>Jarrod&nbsp;Ball&nbsp;- Gabriela&nbsp;Cosovan&nbsp;- Denis&nbsp;Rousseau</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/he/he.png" alt="עברית - Hebrew" title="עברית - Hebrew" /></th><td><b>Adi&nbsp;Ravid</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/hr/hr.png" alt="Hrvatski - Croatian" title="Hrvatski - Croatian" /></th><td><b>Igor&nbsp;Sabljak</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/hu/hu.png" alt="Magyar - Hungarian" title="Magyar - Hungarian" /></th><td><b>Laszlo&nbsp;Valicsek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/id/id.png" alt="Bahasa Indonesia - Indonesian" title="Bahasa Indonesia - Indonesian" /></th><td><b>Mahmud&nbsp;Rosid</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/is/is.png" alt="íslenska - Icelandic" title="íslenska - Icelandic" /></th><td><b>Guðmundur&nbsp;Guðjónsson</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/it/it.png" alt="Italiano - Italian" title="Italiano - Italian" /></th><td><b>Paolo&nbsp;Della Rossa&nbsp;- Andrea&nbsp;Gabardi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/it-rm/it-rm.png" alt="Romanesco - IT-Romanesco" title="Romanesco - IT-Romanesco" /></th><td><b>Giggi&nbsp;Cartoni</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ja/ja.png" alt="日本語 - Japanese" title="日本語 - Japanese" /></th><td><b>Yuko&nbsp;Okura&nbsp;- Junji&nbsp;Ozawa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ko/ko.png" alt="한국어 - Korean" title="한국어 - Korean" /></th><td><b>In sun&nbsp;Song</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/lv/lv.png" alt="Latviešu - Latvian" title="Latviešu - Latvian" /></th><td><b>Krišjānis&nbsp;Liepa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/mn/mn.png" alt="Монгол хэл - Mongolian" title="Монгол хэл - Mongolian" /></th><td><b>Gantumur&nbsp;ZOLJARGAL</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ms/ms.png" alt="Malay - Malaysian" title="Malay - Malaysian" /></th><td><b>Norazman&nbsp;Ab Aziz&nbsp;- Muhammad Zul Izzi&nbsp;Ab Manaff&nbsp;- Mukhriz&nbsp;Mohamed&nbsp;- Faiz&nbsp;Mokhtar Lopi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/nl/nl.png" alt="Nederlands - Dutch" title="Nederlands - Dutch" /></th><td><b>Jose&nbsp;Bruntink&nbsp;- Gerrit&nbsp;Buitenhuis&nbsp;- &nbsp;</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/no/no.png" alt="Norsk - Norwegian" title="Norsk - Norwegian" /></th><td><b>Roar&nbsp;Jystad&nbsp;- Jon-Arne&nbsp;Storelv</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pl/pl.png" alt="Polski - Polish" title="Polski - Polish" /></th><td><b>Tomasz&nbsp;Chalupka&nbsp;- Maciej&nbsp;Laba&nbsp;- Krzysztof&nbsp;Markiewicz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pt/pt.png" alt="Portugues - Portuguese" title="Portugues - Portuguese" /></th><td><b>Paulo&nbsp;Santos</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pt-br/pt-br.png" alt="Português Brasileiro - Portuguese (Brazil)" title="Português Brasileiro - Portuguese (Brazil)" /></th><td><b>Alex&nbsp;Vecchio</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ro/ro.png" alt="Română - Romanian" title="Română - Romanian" /></th><td><b>Aurelian Florin&nbsp;Bacinschi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ru/ru.png" alt="Pусский - Russian" title="Pусский - Russian" /></th><td><b>Vladimir&nbsp;Matheev&nbsp;- Ivan&nbsp;Moroz&nbsp;- Rebecca&nbsp;Rabozzi&nbsp;- Natalia&nbsp;Salukvadze</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sk/sk.png" alt="Slovenský - Slovakian" title="Slovenský - Slovakian" /></th><td><b>Vlado&nbsp;Buzek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sl/sl.png" alt="Slovenščina - Slovenian" title="Slovenščina - Slovenian" /></th><td><b>Luka&nbsp;Gjurin&nbsp;- Irena&nbsp;Rosa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sr/sr.png" alt="Srpski - Serbian" title="Srpski - Serbian" /></th><td><b>Nikola&nbsp;Prodanović</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sv/sv.png" alt="Svenska - Swedish" title="Svenska - Swedish" /></th><td><b>Cenneth&nbsp;Åhlund&nbsp;- Eskil&nbsp;Rönér&nbsp;- Ken&nbsp;Sentell</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/th/th.png" alt="คนไทย - Thai" title="คนไทย - Thai" /></th><td><b>Pokpong&nbsp;Pattaweekongka&nbsp;- Chadin&nbsp;Wankumlue&nbsp;- Pheradet&nbsp;Pratumsuwan</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/tlh/tlh.png" alt=" - Klingon" title=" - Klingon" /></th><td><b>Alessandra&nbsp;Pandolfi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/tr/tr.png" alt="Türkçe - Turkish" title="Türkçe - Turkish" /></th><td><b>Goktug&nbsp;Ergin&nbsp;- Burak&nbsp;Kahyaoglu&nbsp;- Oguzhan&nbsp;Ulucan&nbsp;- Recep&nbsp;Yilmaz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/uk/uk.png" alt="Українська - Ukrainian" title="Українська - Ukrainian" /></th><td><b>Yevhen&nbsp;Rudenchyk</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/zh-cn/zh-cn.png" alt="简体中文 - Chinese (simplified)" title="简体中文 - Chinese (simplified)" /></th><td><b>Sonny&nbsp;宋宁</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/zh-tw/zh-tw.png" alt="繁體中文 - Chinese (traditional)" title="繁體中文 - Chinese (traditional)" /></th><td><b>Ting-Ni&nbsp;Chen</b></td></TR>
\ No newline at end of file
+<tr><th class="SubTitle" rowspan="45" nowrap="nowrap"><?php echo get_text('Credits-Translators', 'Install') ?></th><th class="SubTitle" width="2%"><img src="Common/Languages/en/en.png" alt="English" Title="English" /></th><td><b>Ianseo Team</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ar/ar.png" alt="العربية - Arabic" title="العربية - Arabic" /></th><td><b>Osama&nbsp;El Gemezy&nbsp;- Ismail&nbsp;ELALAOUI&nbsp;- Khaled Sofiane&nbsp;Lamandé</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/bg/bg.png" alt="български език - Bulgarian" title="български език - Bulgarian" /></th><td><b>&nbsp;&nbsp;- Atamas&nbsp;Temelkov</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ca/ca.png" alt="Català - Catalan" title="Català - Catalan" /></th><td><b>David&nbsp;Catalan</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/cs/cs.png" alt="Česky - Czech" title="Česky - Czech" /></th><td><b>Lubos&nbsp;Duchek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/de/de.png" alt="Deutsch - German" title="Deutsch - German" /></th><td><b>Ramon&nbsp;Keller&nbsp;- Andreas&nbsp;Lorenz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/dk/dk.png" alt="Dansk - Danish" title="Dansk - Danish" /></th><td><b>Kasper&nbsp;Hovgaard&nbsp;- Jakob Ruud&nbsp;Poulsen&nbsp;- Karsten&nbsp;Weikop</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ee/ee.png" alt="Eesti - Estonian" title="Eesti - Estonian" /></th><td><b>Tanel&nbsp;Kaasik&nbsp;- Siret&nbsp;Luik&nbsp;- Rait&nbsp;Ots&nbsp;- Kristi &nbsp;Rillo</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/el/el.png" alt="Ελληνικά - Greek" title="Ελληνικά - Greek" /></th><td><b>Nick&nbsp;Bouras&nbsp;- Ioannou&nbsp;Ioannou&nbsp;- Nick&nbsp;Raptis</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/en/en.png" alt="English - English" title="English - English" /></th><td><b>Ken&nbsp;Sentell</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/en-ca/en-ca.png" alt="Canadian English - Canadian English" title="Canadian English - Canadian English" /></th><td><b>Jarrod&nbsp;Ball</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/es/es.png" alt="Español - Spanish" title="Español - Spanish" /></th><td><b>Dajana&nbsp;Piccolo&nbsp;- Pedro&nbsp;Sanz Laboa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/es-ar/es-ar.png" alt="Español Argentino - Argentinian" title="Español Argentino - Argentinian" /></th><td><b>Pablo&nbsp;Navarro</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fa/fa.png" alt="انگليسي - Farsi" title="انگليسي - Farsi" /></th><td><b>Shahrzad&nbsp;Allahyari&nbsp;- Hasan&nbsp;Malekpour</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fi/fi.png" alt="Suomi - Finnish" title="Suomi - Finnish" /></th><td><b>Kimmo&nbsp;Hujanen&nbsp;- Jaakko&nbsp;Setälä&nbsp;- Asko&nbsp;Lötjönen</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fr/fr.png" alt="Français - French" title="Français - French" /></th><td><b>Dominique&nbsp;Delvigne&nbsp;- Xavier&nbsp;Veray&nbsp;- Alexandre&nbsp;Garot&nbsp;- Lisa&nbsp;Gentile&nbsp;- Franck&nbsp;Lucas&nbsp;- Pierre-Adrien&nbsp;Nicolas&nbsp;- Laurent&nbsp;Terrier</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fr-ca/fr-ca.png" alt="Français Canadien - Canadian French" title="Français Canadien - Canadian French" /></th><td><b>Jarrod&nbsp;Ball&nbsp;- Gabriela&nbsp;Cosovan&nbsp;- Denis&nbsp;Rousseau</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/he/he.png" alt="עברית - Hebrew" title="עברית - Hebrew" /></th><td><b>Adi&nbsp;Ravid</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/hr/hr.png" alt="Hrvatski - Croatian" title="Hrvatski - Croatian" /></th><td><b>Martin&nbsp;Oborovecki&nbsp;- Igor&nbsp;Sabljak</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/hu/hu.png" alt="Magyar - Hungarian" title="Magyar - Hungarian" /></th><td><b>Laszlo&nbsp;Valicsek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/id/id.png" alt="Bahasa Indonesia - Indonesian" title="Bahasa Indonesia - Indonesian" /></th><td><b>Mahmud&nbsp;Rosid</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/is/is.png" alt="íslenska - Icelandic" title="íslenska - Icelandic" /></th><td><b>Guðmundur&nbsp;Guðjónsson</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/it/it.png" alt="Italiano - Italian" title="Italiano - Italian" /></th><td><b>Paolo&nbsp;Della Rossa&nbsp;- Andrea&nbsp;Gabardi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/it-rm/it-rm.png" alt="Romanesco - IT-Romanesco" title="Romanesco - IT-Romanesco" /></th><td><b>Giggi&nbsp;Cartoni</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ja/ja.png" alt="日本語 - Japanese" title="日本語 - Japanese" /></th><td><b>Nomura&nbsp;Haru&nbsp;- Yuko&nbsp;Okura&nbsp;- Junji&nbsp;Ozawa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ko/ko.png" alt="한국어 - Korean" title="한국어 - Korean" /></th><td><b>In sun&nbsp;Song</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/lv/lv.png" alt="Latviešu - Latvian" title="Latviešu - Latvian" /></th><td><b>Krišjānis&nbsp;Liepa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/mn/mn.png" alt="Монгол хэл - Mongolian" title="Монгол хэл - Mongolian" /></th><td><b>Gantumur&nbsp;ZOLJARGAL</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ms/ms.png" alt="Malay - Malaysian" title="Malay - Malaysian" /></th><td><b>Norazman&nbsp;Ab Aziz&nbsp;- Muhammad Zul Izzi&nbsp;Ab Manaff&nbsp;- Mukhriz&nbsp;Mohamed&nbsp;- Faiz&nbsp;Mokhtar Lopi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/nl/nl.png" alt="Nederlands - Dutch" title="Nederlands - Dutch" /></th><td><b>Jose&nbsp;Bruntink&nbsp;- Gerrit&nbsp;Buitenhuis&nbsp;- &nbsp;&nbsp;- Paul&nbsp;Van Veen</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/no/no.png" alt="Norsk - Norwegian" title="Norsk - Norwegian" /></th><td><b>Roar&nbsp;Jystad&nbsp;- Bjørn-Cato&nbsp;Knutsen&nbsp;- Jon-Arne&nbsp;Storelv</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pl/pl.png" alt="Polski - Polish" title="Polski - Polish" /></th><td><b>Tomasz&nbsp;Chalupka&nbsp;- Maciej&nbsp;Laba&nbsp;- Krzysztof&nbsp;Markiewicz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pt/pt.png" alt="Portugues - Portuguese" title="Portugues - Portuguese" /></th><td><b>Paulo&nbsp;Santos</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pt-br/pt-br.png" alt="Português Brasileiro - Portuguese (Brazil)" title="Português Brasileiro - Portuguese (Brazil)" /></th><td><b>Alex&nbsp;Vecchio</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ro/ro.png" alt="Română - Romanian" title="Română - Romanian" /></th><td><b>Aurelian Florin&nbsp;Bacinschi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ru/ru.png" alt="Pусский - Russian" title="Pусский - Russian" /></th><td><b>Vladimir&nbsp;Matheev&nbsp;- Ivan&nbsp;Moroz&nbsp;- Rebecca&nbsp;Rabozzi&nbsp;- Natalia&nbsp;Salukvadze</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sk/sk.png" alt="Slovenský - Slovakian" title="Slovenský - Slovakian" /></th><td><b>Vlado&nbsp;Buzek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sl/sl.png" alt="Slovenščina - Slovenian" title="Slovenščina - Slovenian" /></th><td><b>Luka&nbsp;Gjurin&nbsp;- Irena&nbsp;Rosa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sr/sr.png" alt="Srpski - Serbian" title="Srpski - Serbian" /></th><td><b>Nikola&nbsp;Prodanović</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sv/sv.png" alt="Svenska - Swedish" title="Svenska - Swedish" /></th><td><b>Cenneth&nbsp;Åhlund&nbsp;- Eskil&nbsp;Rönér&nbsp;- Ken&nbsp;Sentell</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/th/th.png" alt="คนไทย - Thai" title="คนไทย - Thai" /></th><td><b>Pokpong&nbsp;Pattaweekongka&nbsp;- Chadin&nbsp;Wankumlue&nbsp;- Pheradet&nbsp;Pratumsuwan</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/tlh/tlh.png" alt=" - Klingon" title=" - Klingon" /></th><td><b>Alessandra&nbsp;Pandolfi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/tr/tr.png" alt="Türkçe - Turkish" title="Türkçe - Turkish" /></th><td><b>Goktug&nbsp;Ergin&nbsp;- Burak&nbsp;Kahyaoglu&nbsp;- Oguzhan&nbsp;Ulucan&nbsp;- Recep&nbsp;Yilmaz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/uk/uk.png" alt="Українська - Ukrainian" title="Українська - Ukrainian" /></th><td><b>Yevhen&nbsp;Rudenchyk</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/zh-tw/zh-tw.png" alt="繁體中文 - Chinese (traditional)" title="繁體中文 - Chinese (traditional)" /></th><td><b>Ting-Ni&nbsp;Chen</b></td></TR>
\ No newline at end of file
diff --git a/src/Common/Languages/credits.php.old b/src/Common/Languages/credits.php.old
index 2b07e6ba..5759c182 100644
--- a/src/Common/Languages/credits.php.old
+++ b/src/Common/Languages/credits.php.old
@@ -1 +1 @@
-<tr><th class="SubTitle" rowspan="46" nowrap="nowrap"><?php echo get_text('Credits-Translators', 'Install') ?></th><th class="SubTitle" width="2%"><img src="Common/Languages/en/en.png" alt="English" Title="English" /></th><td><b>Ianseo Team</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ar/ar.png" alt="العربية - Arabic" title="العربية - Arabic" /></th><td><b>Osama&nbsp;El Gemezy&nbsp;- Ismail&nbsp;ELALAOUI&nbsp;- Khaled Sofiane&nbsp;Lamandé</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/bg/bg.png" alt="български език - Bulgarian" title="български език - Bulgarian" /></th><td><b>&nbsp;&nbsp;- Atamas&nbsp;Temelkov</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ca/ca.png" alt="Català - Catalan" title="Català - Catalan" /></th><td><b>David&nbsp;Catalan</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/cs/cs.png" alt="Česky - Czech" title="Česky - Czech" /></th><td><b>Lubos&nbsp;Duchek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/de/de.png" alt="Deutsch - German" title="Deutsch - German" /></th><td><b>Ramon&nbsp;Keller&nbsp;- Andreas&nbsp;Lorenz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/dk/dk.png" alt="Dansk - Danish" title="Dansk - Danish" /></th><td><b>Kasper&nbsp;Hovgaard&nbsp;- Jakob Ruud&nbsp;Poulsen&nbsp;- Karsten&nbsp;Weikop</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ee/ee.png" alt="Eesti - Estonian" title="Eesti - Estonian" /></th><td><b>Tanel&nbsp;Kaasik&nbsp;- Siret&nbsp;Luik&nbsp;- Rait&nbsp;Ots&nbsp;- Kristi &nbsp;Rillo</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/el/el.png" alt="Ελληνικά - Greek" title="Ελληνικά - Greek" /></th><td><b>Nick&nbsp;Bouras&nbsp;- Ioannou&nbsp;Ioannou&nbsp;- Nick&nbsp;Raptis</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/en/en.png" alt="English - English" title="English - English" /></th><td><b>Ken&nbsp;Sentell</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/en-ca/en-ca.png" alt="Canadian English - Canadian English" title="Canadian English - Canadian English" /></th><td><b>Jarrod&nbsp;Ball</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/es/es.png" alt="Español - Spanish" title="Español - Spanish" /></th><td><b>Dajana&nbsp;Piccolo&nbsp;- Pedro&nbsp;Sanz Laboa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/es-ar/es-ar.png" alt="Español Argentino - Argentinian" title="Español Argentino - Argentinian" /></th><td><b>Pablo&nbsp;Navarro</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fa/fa.png" alt="انگليسي - Farsi" title="انگليسي - Farsi" /></th><td><b>Shahrzad&nbsp;Allahyari&nbsp;- Hasan&nbsp;Malekpour</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fi/fi.png" alt="Suomi - Finnish" title="Suomi - Finnish" /></th><td><b>Kimmo&nbsp;Hujanen&nbsp;- Jaakko&nbsp;Setälä&nbsp;- Asko&nbsp;Lötjönen</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fr/fr.png" alt="Français - French" title="Français - French" /></th><td><b>Dominique&nbsp;Delvigne&nbsp;- Xavier&nbsp;Veray&nbsp;- Alexandre&nbsp;Garot&nbsp;- Lisa&nbsp;Gentile&nbsp;- Franck&nbsp;Lucas&nbsp;- Pierre-Adrien&nbsp;Nicolas&nbsp;- Laurent&nbsp;Terrier</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fr-ca/fr-ca.png" alt="Français Canadien - Canadian French" title="Français Canadien - Canadian French" /></th><td><b>Jarrod&nbsp;Ball&nbsp;- Gabriela&nbsp;Cosovan&nbsp;- Denis&nbsp;Rousseau</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/he/he.png" alt="עברית - Hebrew" title="עברית - Hebrew" /></th><td><b>Adi&nbsp;Ravid</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/hr/hr.png" alt="Hrvatski - Croatian" title="Hrvatski - Croatian" /></th><td><b>Igor&nbsp;Sabljak</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/hu/hu.png" alt="Magyar - Hungarian" title="Magyar - Hungarian" /></th><td><b>Laszlo&nbsp;Valicsek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/id/id.png" alt="Bahasa Indonesia - Indonesian" title="Bahasa Indonesia - Indonesian" /></th><td><b>Mahmud&nbsp;Rosid</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/is/is.png" alt="íslenska - Icelandic" title="íslenska - Icelandic" /></th><td><b>Guðmundur&nbsp;Guðjónsson</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/it/it.png" alt="Italiano - Italian" title="Italiano - Italian" /></th><td><b>Paolo&nbsp;Della Rossa&nbsp;- Andrea&nbsp;Gabardi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/it-rm/it-rm.png" alt="Romanesco - IT-Romanesco" title="Romanesco - IT-Romanesco" /></th><td><b>Giggi&nbsp;Cartoni</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ja/ja.png" alt="日本語 - Japanese" title="日本語 - Japanese" /></th><td><b>Yuko&nbsp;Okura&nbsp;- Junji&nbsp;Ozawa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ko/ko.png" alt="한국어 - Korean" title="한국어 - Korean" /></th><td><b>In sun&nbsp;Song</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/lv/lv.png" alt="Latviešu - Latvian" title="Latviešu - Latvian" /></th><td><b>Krišjānis&nbsp;Liepa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/mn/mn.png" alt="Монгол хэл - Mongolian" title="Монгол хэл - Mongolian" /></th><td><b>Gantumur&nbsp;ZOLJARGAL</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ms/ms.png" alt="Malay - Malaysian" title="Malay - Malaysian" /></th><td><b>Norazman&nbsp;Ab Aziz&nbsp;- Muhammad Zul Izzi&nbsp;Ab Manaff&nbsp;- Mukhriz&nbsp;Mohamed&nbsp;- Faiz&nbsp;Mokhtar Lopi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/nl/nl.png" alt="Nederlands - Dutch" title="Nederlands - Dutch" /></th><td><b>Jose&nbsp;Bruntink&nbsp;- Gerrit&nbsp;Buitenhuis&nbsp;- &nbsp;</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/no/no.png" alt="Norsk - Norwegian" title="Norsk - Norwegian" /></th><td><b>Roar&nbsp;Jystad&nbsp;- Jon-Arne&nbsp;Storelv</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pl/pl.png" alt="Polski - Polish" title="Polski - Polish" /></th><td><b>Tomasz&nbsp;Chalupka&nbsp;- Maciej&nbsp;Laba&nbsp;- Krzysztof&nbsp;Markiewicz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pt/pt.png" alt="Portugues - Portuguese" title="Portugues - Portuguese" /></th><td><b>Paulo&nbsp;Santos</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pt-br/pt-br.png" alt="Português Brasileiro - Portuguese (Brazil)" title="Português Brasileiro - Portuguese (Brazil)" /></th><td><b>Alex&nbsp;Vecchio</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ro/ro.png" alt="Română - Romanian" title="Română - Romanian" /></th><td><b>Aurelian Florin&nbsp;Bacinschi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ru/ru.png" alt="Pусский - Russian" title="Pусский - Russian" /></th><td><b>Vladimir&nbsp;Matheev&nbsp;- Ivan&nbsp;Moroz&nbsp;- Rebecca&nbsp;Rabozzi&nbsp;- Natalia&nbsp;Salukvadze</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sk/sk.png" alt="Slovenský - Slovakian" title="Slovenský - Slovakian" /></th><td><b>Vlado&nbsp;Buzek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sl/sl.png" alt="Slovenščina - Slovenian" title="Slovenščina - Slovenian" /></th><td><b>Luka&nbsp;Gjurin&nbsp;- Irena&nbsp;Rosa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sr/sr.png" alt="Srpski - Serbian" title="Srpski - Serbian" /></th><td><b>Nikola&nbsp;Prodanović</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sv/sv.png" alt="Svenska - Swedish" title="Svenska - Swedish" /></th><td><b>Cenneth&nbsp;Åhlund&nbsp;- Eskil&nbsp;Rönér&nbsp;- Ken&nbsp;Sentell</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/th/th.png" alt="คนไทย - Thai" title="คนไทย - Thai" /></th><td><b>Pokpong&nbsp;Pattaweekongka&nbsp;- Chadin&nbsp;Wankumlue&nbsp;- Pheradet&nbsp;Pratumsuwan</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/tlh/tlh.png" alt=" - Klingon" title=" - Klingon" /></th><td><b>Alessandra&nbsp;Pandolfi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/tr/tr.png" alt="Türkçe - Turkish" title="Türkçe - Turkish" /></th><td><b>Goktug&nbsp;Ergin&nbsp;- Burak&nbsp;Kahyaoglu&nbsp;- Oguzhan&nbsp;Ulucan&nbsp;- Recep&nbsp;Yilmaz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/uk/uk.png" alt="Українська - Ukrainian" title="Українська - Ukrainian" /></th><td><b>Yevhen&nbsp;Rudenchyk</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/zh-cn/zh-cn.png" alt="简体中文 - Chinese (simplified)" title="简体中文 - Chinese (simplified)" /></th><td><b>Sonny&nbsp;宋宁</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/zh-tw/zh-tw.png" alt="繁體中文 - Chinese (traditional)" title="繁體中文 - Chinese (traditional)" /></th><td><b>Ting-Ni&nbsp;Chen</b></td></TR>
\ No newline at end of file
+<tr><th class="SubTitle" rowspan="45" nowrap="nowrap"><?php echo get_text('Credits-Translators', 'Install') ?></th><th class="SubTitle" width="2%"><img src="Common/Languages/en/en.png" alt="English" Title="English" /></th><td><b>Ianseo Team</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ar/ar.png" alt="العربية - Arabic" title="العربية - Arabic" /></th><td><b>Osama&nbsp;El Gemezy&nbsp;- Ismail&nbsp;ELALAOUI&nbsp;- Khaled Sofiane&nbsp;Lamandé</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/bg/bg.png" alt="български език - Bulgarian" title="български език - Bulgarian" /></th><td><b>&nbsp;&nbsp;- Atamas&nbsp;Temelkov</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ca/ca.png" alt="Català - Catalan" title="Català - Catalan" /></th><td><b>David&nbsp;Catalan</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/cs/cs.png" alt="Česky - Czech" title="Česky - Czech" /></th><td><b>Lubos&nbsp;Duchek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/de/de.png" alt="Deutsch - German" title="Deutsch - German" /></th><td><b>Ramon&nbsp;Keller&nbsp;- Andreas&nbsp;Lorenz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/dk/dk.png" alt="Dansk - Danish" title="Dansk - Danish" /></th><td><b>Kasper&nbsp;Hovgaard&nbsp;- Jakob Ruud&nbsp;Poulsen&nbsp;- Karsten&nbsp;Weikop</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ee/ee.png" alt="Eesti - Estonian" title="Eesti - Estonian" /></th><td><b>Tanel&nbsp;Kaasik&nbsp;- Siret&nbsp;Luik&nbsp;- Rait&nbsp;Ots&nbsp;- Kristi &nbsp;Rillo</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/el/el.png" alt="Ελληνικά - Greek" title="Ελληνικά - Greek" /></th><td><b>Nick&nbsp;Bouras&nbsp;- Ioannou&nbsp;Ioannou&nbsp;- Nick&nbsp;Raptis</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/en/en.png" alt="English - English" title="English - English" /></th><td><b>Ken&nbsp;Sentell</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/en-ca/en-ca.png" alt="Canadian English - Canadian English" title="Canadian English - Canadian English" /></th><td><b>Jarrod&nbsp;Ball</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/es/es.png" alt="Español - Spanish" title="Español - Spanish" /></th><td><b>Dajana&nbsp;Piccolo&nbsp;- Pedro&nbsp;Sanz Laboa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/es-ar/es-ar.png" alt="Español Argentino - Argentinian" title="Español Argentino - Argentinian" /></th><td><b>Pablo&nbsp;Navarro</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fa/fa.png" alt="انگليسي - Farsi" title="انگليسي - Farsi" /></th><td><b>Shahrzad&nbsp;Allahyari&nbsp;- Hasan&nbsp;Malekpour</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fi/fi.png" alt="Suomi - Finnish" title="Suomi - Finnish" /></th><td><b>Kimmo&nbsp;Hujanen&nbsp;- Jaakko&nbsp;Setälä&nbsp;- Asko&nbsp;Lötjönen</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fr/fr.png" alt="Français - French" title="Français - French" /></th><td><b>Dominique&nbsp;Delvigne&nbsp;- Xavier&nbsp;Veray&nbsp;- Alexandre&nbsp;Garot&nbsp;- Lisa&nbsp;Gentile&nbsp;- Franck&nbsp;Lucas&nbsp;- Pierre-Adrien&nbsp;Nicolas&nbsp;- Laurent&nbsp;Terrier</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/fr-ca/fr-ca.png" alt="Français Canadien - Canadian French" title="Français Canadien - Canadian French" /></th><td><b>Jarrod&nbsp;Ball&nbsp;- Gabriela&nbsp;Cosovan&nbsp;- Denis&nbsp;Rousseau</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/he/he.png" alt="עברית - Hebrew" title="עברית - Hebrew" /></th><td><b>Adi&nbsp;Ravid</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/hr/hr.png" alt="Hrvatski - Croatian" title="Hrvatski - Croatian" /></th><td><b>Martin&nbsp;Oborovecki&nbsp;- Igor&nbsp;Sabljak</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/hu/hu.png" alt="Magyar - Hungarian" title="Magyar - Hungarian" /></th><td><b>Laszlo&nbsp;Valicsek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/id/id.png" alt="Bahasa Indonesia - Indonesian" title="Bahasa Indonesia - Indonesian" /></th><td><b>Mahmud&nbsp;Rosid</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/is/is.png" alt="íslenska - Icelandic" title="íslenska - Icelandic" /></th><td><b>Guðmundur&nbsp;Guðjónsson</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/it/it.png" alt="Italiano - Italian" title="Italiano - Italian" /></th><td><b>Paolo&nbsp;Della Rossa&nbsp;- Andrea&nbsp;Gabardi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/it-rm/it-rm.png" alt="Romanesco - IT-Romanesco" title="Romanesco - IT-Romanesco" /></th><td><b>Giggi&nbsp;Cartoni</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ja/ja.png" alt="日本語 - Japanese" title="日本語 - Japanese" /></th><td><b>Nomura&nbsp;Haru&nbsp;- Yuko&nbsp;Okura&nbsp;- Junji&nbsp;Ozawa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ko/ko.png" alt="한국어 - Korean" title="한국어 - Korean" /></th><td><b>In sun&nbsp;Song</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/lv/lv.png" alt="Latviešu - Latvian" title="Latviešu - Latvian" /></th><td><b>Krišjānis&nbsp;Liepa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/mn/mn.png" alt="Монгол хэл - Mongolian" title="Монгол хэл - Mongolian" /></th><td><b>Gantumur&nbsp;ZOLJARGAL</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ms/ms.png" alt="Malay - Malaysian" title="Malay - Malaysian" /></th><td><b>Norazman&nbsp;Ab Aziz&nbsp;- Muhammad Zul Izzi&nbsp;Ab Manaff&nbsp;- Mukhriz&nbsp;Mohamed&nbsp;- Faiz&nbsp;Mokhtar Lopi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/nl/nl.png" alt="Nederlands - Dutch" title="Nederlands - Dutch" /></th><td><b>Jose&nbsp;Bruntink&nbsp;- Gerrit&nbsp;Buitenhuis&nbsp;- &nbsp;&nbsp;- Paul&nbsp;Van Veen</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/no/no.png" alt="Norsk - Norwegian" title="Norsk - Norwegian" /></th><td><b>Roar&nbsp;Jystad&nbsp;- Bjørn-Cato&nbsp;Knutsen&nbsp;- Jon-Arne&nbsp;Storelv</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pl/pl.png" alt="Polski - Polish" title="Polski - Polish" /></th><td><b>Tomasz&nbsp;Chalupka&nbsp;- Maciej&nbsp;Laba&nbsp;- Krzysztof&nbsp;Markiewicz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pt/pt.png" alt="Portugues - Portuguese" title="Portugues - Portuguese" /></th><td><b>Paulo&nbsp;Santos</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/pt-br/pt-br.png" alt="Português Brasileiro - Portuguese (Brazil)" title="Português Brasileiro - Portuguese (Brazil)" /></th><td><b>Alex&nbsp;Vecchio</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ro/ro.png" alt="Română - Romanian" title="Română - Romanian" /></th><td><b>Aurelian Florin&nbsp;Bacinschi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/ru/ru.png" alt="Pусский - Russian" title="Pусский - Russian" /></th><td><b>Vladimir&nbsp;Matheev&nbsp;- Ivan&nbsp;Moroz&nbsp;- Rebecca&nbsp;Rabozzi&nbsp;- Natalia&nbsp;Salukvadze</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sk/sk.png" alt="Slovenský - Slovakian" title="Slovenský - Slovakian" /></th><td><b>Vlado&nbsp;Buzek</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sl/sl.png" alt="Slovenščina - Slovenian" title="Slovenščina - Slovenian" /></th><td><b>Luka&nbsp;Gjurin&nbsp;- Irena&nbsp;Rosa</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sr/sr.png" alt="Srpski - Serbian" title="Srpski - Serbian" /></th><td><b>Nikola&nbsp;Prodanović</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/sv/sv.png" alt="Svenska - Swedish" title="Svenska - Swedish" /></th><td><b>Cenneth&nbsp;Åhlund&nbsp;- Eskil&nbsp;Rönér&nbsp;- Ken&nbsp;Sentell</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/th/th.png" alt="คนไทย - Thai" title="คนไทย - Thai" /></th><td><b>Pokpong&nbsp;Pattaweekongka&nbsp;- Chadin&nbsp;Wankumlue&nbsp;- Pheradet&nbsp;Pratumsuwan</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/tlh/tlh.png" alt=" - Klingon" title=" - Klingon" /></th><td><b>Alessandra&nbsp;Pandolfi</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/tr/tr.png" alt="Türkçe - Turkish" title="Türkçe - Turkish" /></th><td><b>Goktug&nbsp;Ergin&nbsp;- Burak&nbsp;Kahyaoglu&nbsp;- Oguzhan&nbsp;Ulucan&nbsp;- Recep&nbsp;Yilmaz</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/uk/uk.png" alt="Українська - Ukrainian" title="Українська - Ukrainian" /></th><td><b>Yevhen&nbsp;Rudenchyk</b></td></TR><TR><th class="SubTitle" width="2%"><img src="Common/Languages/zh-tw/zh-tw.png" alt="繁體中文 - Chinese (traditional)" title="繁體中文 - Chinese (traditional)" /></th><td><b>Ting-Ni&nbsp;Chen</b></td></TR>
\ No newline at end of file
diff --git a/src/Common/Languages/cs/IOC_Codes.php b/src/Common/Languages/cs/IOC_Codes.php
index 13b8ca69..2280d699 100644
--- a/src/Common/Languages/cs/IOC_Codes.php
+++ b/src/Common/Languages/cs/IOC_Codes.php
@@ -32,16 +32,12 @@
 $lang['BUL']='Bulharsko';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Centrální africká republika';
-$lang['CAM']='Kambodža';
 $lang['CAN']='Kanada';
 $lang['CAY']='Kajmanské ostrovy';
 $lang['CGO']='Republika Kongo';
 $lang['CHA']='Čad';
 $lang['CHI']='Chile';
-$lang['CHN']='Čína';
-$lang['CIV']='Pobřeží slonoviny';
 $lang['CMR']='Kamerun';
-$lang['COD']='Demokratická republika Kongo';
 $lang['COK']='Cookovy ostrovy';
 $lang['COL']='Kolumbie';
 $lang['COM']='Komory';
@@ -50,7 +46,6 @@
 $lang['CRO']='Chorvatsko';
 $lang['CUB']='Kuba';
 $lang['CYP']='Kypr';
-$lang['CZE']='Česká republika';
 $lang['DEN']='Dánsko';
 $lang['DJI']='Džibutsko';
 $lang['DMA']='Dominika';
@@ -80,17 +75,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Maďarsko';
 $lang['INA']='Indonésie';
 $lang['IND']='Indie';
-$lang['IRI']='Írán';
 $lang['IRL']='Irsko';
 $lang['IRQ']='Írák';
 $lang['ISL']='Island';
 $lang['ISR']='Israel';
-$lang['ISV']='Americké Panenské ostrovy';
 $lang['ITA']='Itálie';
 $lang['IVB']='Britské panenské ostrovy';
 $lang['JAM']='Jamajka';
@@ -102,7 +94,6 @@
 $lang['KIR']='Kiribati';
 $lang['KSA']='Saudská Arábie';
 $lang['KUW']='Kuvajt';
-$lang['LAO']='Laos';
 $lang['LAT']='Lotyšsko';
 $lang['LBA']='Líbye';
 $lang['LBR']='Libérie';
@@ -116,7 +107,6 @@
 $lang['MAR']='Maroko';
 $lang['MAS']='Malajsie';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldavsko';
 $lang['MDV']='Maledivy';
 $lang['MEX']='Mexiko';
 $lang['MGL']='Mongolsko';
@@ -149,7 +139,6 @@
 $lang['PNG']='Papua-Nová Guinea';
 $lang['POL']='Polsko';
 $lang['POR']='Portugalsko';
-$lang['PRK']='Severní Korea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Katar';
 $lang['ROU']='Rumunsko';
@@ -173,13 +162,11 @@
 $lang['SUR']='Surinam';
 $lang['SVK']='Slovensko';
 $lang['SWE']='Švédsko';
-$lang['SYR']='Sýrie';
 $lang['TAN']='Tanzanie';
 $lang['TGA']='Tonga';
 $lang['THA']='Thajsko';
 $lang['TJK']='Tádžikistán';
 $lang['TKM']='Turkmenistán';
-$lang['TLS']='Východní Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Tchaj-wan';
 $lang['TRI']='Trinidad a Tobago';
diff --git a/src/Common/Languages/cs/Install.php b/src/Common/Languages/cs/Install.php
index 6ea9124c..be3fa7be 100644
--- a/src/Common/Languages/cs/Install.php
+++ b/src/Common/Languages/cs/Install.php
@@ -48,7 +48,6 @@
 $lang['Parameter']='Parametr';
 $lang['Password']='Heslo';
 $lang['PHP settings']='PHP nastavení';
-$lang['PHP too old']='Vaše PHP instalace je příliš stará. Minimální verze pro IANSEO je 5.0';
 $lang['PHP version']='PHP verze';
 $lang['php.ini file']='php.ini soubor';
 $lang['Prepare']='Příprava dat pro aktualizaci';
diff --git a/src/Common/Languages/cs/Tournament.php b/src/Common/Languages/cs/Tournament.php
index 5c82bc21..0d75ed2f 100644
--- a/src/Common/Languages/cs/Tournament.php
+++ b/src/Common/Languages/cs/Tournament.php
@@ -59,7 +59,6 @@
 $lang['BadgeIncludePhoto']='Vložit foto do vizitky?';
 $lang['BadgeNames']='Celé jméno (netištěno první)';
 $lang['BadgeNoData']='Žádná data k tisku';
-$lang['BadgeOnlyNotPrinted']='POUZE vizitky ještě nevytištěné?';
 $lang['BadgeOnlyPrintAccredited']='POUZE vizitky akreditovaných účastníků?';
 $lang['BadgeOnlyPrintPhoto']='POUZE vizitky s fotem?';
 $lang['BadgeOptions']='Možnosti';
@@ -100,8 +99,6 @@
 $lang['CatJudge']='Rozhodčí';
 $lang['CatJury']='Odvolací komise';
 $lang['CatOC']='Organizační výbor';
-$lang['ChairmanJudge']='Hlavní rozhodčí';
-$lang['ChairmanJury']='Předseda odvolací komise';
 $lang['ChangeNationsNames']='Změna názvu oddílu';
 $lang['CheckRefMail']='Kontrola referenčního E-mailu ...';
 $lang['CheckScorecards']='Kontrola bodovaček';
@@ -556,7 +553,6 @@
 $lang['TeamCreationMode_2']='Vždy 2.tým';
 $lang['TeamCreationMode_3']='Vždy 3.tým';
 $lang['TeamFin']='Družstva - Eliminace a finálové kolo';
-$lang['TeamFinEvent']='Finále družstev';
 $lang['TeamPlace']='Cedule pro týmy';
 $lang['TeamPlaceLocal']='Cedule pro týmy (lokalizované)';
 $lang['TeamQual']='Družstva - Kval.kolo';
diff --git a/src/Common/Languages/de/IOC_Codes.php b/src/Common/Languages/de/IOC_Codes.php
index 7438ccd9..4eb5a906 100644
--- a/src/Common/Languages/de/IOC_Codes.php
+++ b/src/Common/Languages/de/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='Amerikanisch Samoa';
 $lang['AUS']='Australien';
 $lang['AUT']='Österreich';
-$lang['Award-Anthem']='Sehr geehrte Damen und Herren, bitte erheben Sie sich für die Nationalhymne von';
-$lang['Award-Anthem-TPE']='Sehr geehrte Damen und Herren, bitte erheben Sie sich für die Hymne von';
 $lang['Award-Applause']='Sehr geehrte Damen und Herren, bitte geben Sie unseren Athleten einen herzlichen Applaus';
 $lang['Award-Intro']='Sehr geehrte Damen und Herren es folgt die Siegerehrung für {$a}';
 $lang['Award-MedalGiver']='Medaillen werden übergeben von $a';
@@ -42,16 +40,12 @@
 $lang['BUL']='Bulgarien';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Zentralafrikanische Republik';
-$lang['CAM']='Kambodscha';
 $lang['CAN']='Kanada';
 $lang['CAY']='Cayman-Inseln';
 $lang['CGO']='Republik Kongo';
 $lang['CHA']='Tschad';
 $lang['CHI']='Chile';
-$lang['CHN']='Volksrepublik China';
-$lang['CIV']='Elfenbeinküste';
 $lang['CMR']='Kamerun';
-$lang['COD']='Demokratische Republik Kongo';
 $lang['COK']='Cook-Inseln';
 $lang['COL']='Kolumbien';
 $lang['COM']='Komoren';
@@ -60,7 +54,6 @@
 $lang['CRO']='Kroatien';
 $lang['CUB']='Kuba';
 $lang['CYP']='Zypern';
-$lang['CZE']='Tschechische Republik';
 $lang['DEN']='Dänemark';
 $lang['DJI']='Dschibuti';
 $lang['DMA']='Dominica';
@@ -91,17 +84,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Ungarn';
 $lang['INA']='Indonesien';
 $lang['IND']='Indien';
-$lang['IRI']='Iran';
 $lang['IRL']='Irland';
 $lang['IRQ']='Irak';
 $lang['ISL']='Island';
 $lang['ISR']='Israel';
-$lang['ISV']='Britische Jungferninseln';
 $lang['ITA']='Italien';
 $lang['IVB']='Britische Jungferninseln';
 $lang['JAM']='Jamaika';
@@ -114,7 +104,6 @@
 $lang['KOR']='Südkorea';
 $lang['KSA']='Saudi Arabien';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
 $lang['LAT']='Lettland';
 $lang['LBA']='Libyen';
 $lang['LBR']='Liberia';
@@ -128,7 +117,6 @@
 $lang['MAR']='Marokko';
 $lang['MAS']='Malaysien';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldawien';
 $lang['MDV']='Malediven';
 $lang['Medal-1']='Gold Medaille';
 $lang['Medal-2']='Silber Medaille';
@@ -137,7 +125,6 @@
 $lang['MEX']='Mexiko';
 $lang['MGL']='Mongolei';
 $lang['MHL']='Marshall Inseln';
-$lang['MKD']='Mazedonien';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -166,7 +153,6 @@
 $lang['PNG']='Papua Neu Guinea';
 $lang['POL']='Polen';
 $lang['POR']='Portugal';
-$lang['PRK']='Nord Korea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Katar';
 $lang['ROU']='Rumänien';
@@ -193,13 +179,11 @@
 $lang['SVK']='Slowakei';
 $lang['SWE']='Schweden';
 $lang['SWZ']='Swaziland';
-$lang['SYR']='Syrien';
 $lang['TAN']='Tansania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailand';
 $lang['TJK']='Tajikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Ost Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='China Taipei';
 $lang['TRI']='Trinidad und Tobago';
diff --git a/src/Common/Languages/de/Install.php b/src/Common/Languages/de/Install.php
index c3cc3e4c..026e76d1 100644
--- a/src/Common/Languages/de/Install.php
+++ b/src/Common/Languages/de/Install.php
@@ -50,7 +50,7 @@
 $lang['Parameter']='Parameter';
 $lang['Password']='Passwort';
 $lang['PHP settings']='PHP Einstellung';
-$lang['PHP too old']='Ihre PHP Installation ist zu alt. Die minimal erforderliche Version für IANSEO ist 5.0.';
+$lang['PHP too old']='Ihre PHP Installation ist zu alt. Die minimal erforderliche Version für IANSEO ist 8.0.';
 $lang['PHP version']='PHP Version';
 $lang['php.ini file']='php.ini Datei';
 $lang['Prepare']='Daten für Update vorbereiten';
diff --git a/src/Common/Languages/de/Tournament.php b/src/Common/Languages/de/Tournament.php
index ae080fb4..17d0ca3f 100644
--- a/src/Common/Languages/de/Tournament.php
+++ b/src/Common/Languages/de/Tournament.php
@@ -75,7 +75,6 @@
 $lang['BadgeIncludePhoto']='Einfügen des Fotos im Badge?';
 $lang['BadgeNames']='Voller Name (nicht zuerst gedruckt)';
 $lang['BadgeNoData']='Keine Daten zu drucken';
-$lang['BadgeOnlyNotPrinted']='NUR Badges, die nicht bereits gedruckt wurden?';
 $lang['BadgeOnlyPrintAccredited']='NUR Badges von akkreditierten Teilnehmern?';
 $lang['BadgeOnlyPrintPhoto']='NUR Badges mit Foto?';
 $lang['BadgeOptions']='Optionen';
@@ -121,8 +120,6 @@
 $lang['CatJudge']='Kampfrichter';
 $lang['CatJury']='Berufungsrichter';
 $lang['CatOC']='Organisationskomitee';
-$lang['ChairmanJudge']='Oberster Kampfrichter';
-$lang['ChairmanJury']='Vorsitzender Berufungsrichter';
 $lang['ChangeNationsNames']='Ändern der Namen der Nationen';
 $lang['CheckRefMail']='Verizifiere Bezugs E-Mail...';
 $lang['CheckScorecards']='Scorekarten prüfen';
@@ -644,7 +641,6 @@
 $lang['TeamCreationMode_2']='Immer 2. Team';
 $lang['TeamCreationMode_3']='Immer 3. Team';
 $lang['TeamFin']='Mannschaftswertung - Finale';
-$lang['TeamFinEvent']='Finale Mannschaft';
 $lang['TeamQual']='Mannschaftswertung - Qualifikation';
 $lang['TecDelegate']='Technischer Delegierter';
 $lang['Text']='Text';
diff --git a/src/Common/Languages/dk/Api.php b/src/Common/Languages/dk/Api.php
index 8875fe63..b0b76cd5 100644
--- a/src/Common/Languages/dk/Api.php
+++ b/src/Common/Languages/dk/Api.php
@@ -50,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='Forbindelses status';
 $lang['ISK-DeleteDevices']='Slet enheder';
 $lang['ISK-DenyAccess']='Adgang nægtet';
+$lang['ISK-Deprecated']='Vigtigt: "Ianseo Score Keeper" app\'en udfases fra Android og Apple og bliver ikke længere understøttet. Den vil blive fjernet fra Ianseo i september 2024. Brug venligst den nye "Ianseo Score Keepter NG" app istedet';
 $lang['ISK-DeviceAlive']='Online';
 $lang['ISK-DeviceBattery']='Batteri';
 $lang['ISK-DeviceEnabled']='Aktiveret';
@@ -79,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='Manglende konkurrence kode';
 $lang['ISK-Lite-QRCode']='Udskriv QR Code til Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='Server URL';
+$lang['ISK-Live-Deprecated']='Vigtigt: "Ianseo Score Keeper" app\'en er ikke længere understøttet. Den vil blive fjernet fra Ianseo i september 2024. Brug venligst den nye "Ianseo Score Keepter NG" app istedet';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper LIVE';
 $lang['ISK-lockPortrait']='Lås enhed i portræt opsætning';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
diff --git a/src/Common/Languages/dk/BackNumbers.php b/src/Common/Languages/dk/BackNumbers.php
index 71554167..1e137693 100644
--- a/src/Common/Languages/dk/BackNumbers.php
+++ b/src/Common/Languages/dk/BackNumbers.php
@@ -112,6 +112,7 @@
 $lang['GivCaps-FamCaps-ClubCaps']='FORNAVN EFTERNAVN KLUBNAVN';
 $lang['GivenNameInitial']='Første Bogstav I Fornavn';
 $lang['Heigh']='Højde';
+$lang['HLayout']='Horisontalt';
 $lang['HLine']='Horisontal linie';
 $lang['I-Badge']='Registreringsnumre, individuelle finaler';
 $lang['IdCardHor']='Antal kort i bredden';
@@ -143,6 +144,8 @@
 $lang['OpenPictureScreen']='Åben sekundær skærm';
 $lang['PageDimension']='Side størrelse';
 $lang['PaperDimention']='Papir størrelse';
+$lang['PhaseFrom']='Fra fase';
+$lang['PhaseTo']='Til fase';
 $lang['Picture']='Skytte billede';
 $lang['Portrait']='Portræt';
 $lang['PosX']='Position (X)';
@@ -177,6 +180,7 @@
 $lang['ToRight']='Stævne logo (højre)';
 $lang['TVViewIdCard']='Vis ID Kort';
 $lang['TVViewIdCardDescr']='I match visning, vises ID kort for to modstandere i stedet for "standard" rækkerne';
+$lang['VLayout']='Vertikalt';
 $lang['Width']='Bredde';
 $lang['WRank']='World Ranking';
 $lang['WRankFields']='Vis ikke efter WR position (0: Vis alle)';
diff --git a/src/Common/Languages/dk/Boinx.php b/src/Common/Languages/dk/Boinx.php
index 9e557f9f..a757c3fa 100644
--- a/src/Common/Languages/dk/Boinx.php
+++ b/src/Common/Languages/dk/Boinx.php
@@ -22,6 +22,9 @@
 $lang['CssFlexSum']='Nuværende runde blok - fælles';
 $lang['CssFlexTotal']='Total score blok - fælles';
 $lang['CssImage']='Overlay Image';
+$lang['CssImage1']='Css for Image 1';
+$lang['CssImage2']='Css for Image 2';
+$lang['CssImage3']='Css for Image 3';
 $lang['CssImageDiv']='Div box for overlay image';
 $lang['CssLeftFlexArrows']='Pile detaljeblok - venstre';
 $lang['CssLeftFlexName']='Navn og flag blok - venstre';
@@ -49,6 +52,7 @@
 $lang['CssPresentationEvent']='Præsentation stævne - Fælles';
 $lang['CssPresentationNames']='Præsentation navne - Fælles';
 $lang['CssRankCommon']='Placering celle';
+$lang['CssReminder']='Husk at gemme dine ændringer';
 $lang['CssRightFlexArrows']='Pile detaljeblok - højre';
 $lang['CssRightFlexName']='Navn og flag blok - højre';
 $lang['CssRightFlexSum']='Nuværende runde blok - højre';
@@ -73,6 +77,10 @@
 $lang['CssSoSetTitle']='Overskrift - sæt titel';
 $lang['CssSumTitle']='Nuværende runde titel';
 $lang['CssSumTotal']='Nuværende runde værdi';
+$lang['CssText1']='Css for Text 1';
+$lang['CssText2']='Css for Text 2';
+$lang['CssText3']='Css for Text 3';
+$lang['CssText4']='Css for Text 4';
 $lang['CssTitleCommon']='Hoved titel';
 $lang['CssVegasFreeTextRow']='Række';
 $lang['CssVegasFreeTextText']='Tekst';
diff --git a/src/Common/Languages/dk/Common.php b/src/Common/Languages/dk/Common.php
index 4f1d5034..211f5110 100644
--- a/src/Common/Languages/dk/Common.php
+++ b/src/Common/Languages/dk/Common.php
@@ -70,6 +70,7 @@
 $lang['CmdOk']='OK';
 $lang['CmdOn']='Til';
 $lang['CmdPostUpdate']='Post-opdatering';
+$lang['CmdRefresh']='Opdater';
 $lang['CmdSave']='Gem';
 $lang['CmdSaveContinue']='Tilføj ny';
 $lang['CmdSet2All']='Påfør alle';
@@ -147,6 +148,10 @@
 $lang['Finish']='Afslut';
 $lang['FirstPhase']='Første fase';
 $lang['FopSetup']='Bane layout';
+$lang['Gender0']='Herre';
+$lang['Gender1']='Dame';
+$lang['GenderShort0']='H';
+$lang['GenderShort1']='D';
 $lang['GF']='Unge piger';
 $lang['GM']='Unge drenge';
 $lang['HELP']='Hjælp';
@@ -206,6 +211,8 @@
 $lang['MatchMode_0']='Sammentælling';
 $lang['MatchMode_1']='Set System';
 $lang['MatchNo']='Match Nr.';
+$lang['MatchWinShot']='Match vinder pil';
+$lang['MatchWinShotHelp']='[Number of successful match winners shots] - [Number of failed match winners shots] %=Percentage of success when an arrow is a potential match winner';
 $lang['Medal']='Medaljeoversigt';
 $lang['MedalBronze']='Bronze';
 $lang['MedalGold']='Guld';
@@ -216,6 +223,7 @@
 $lang['MenuLMRemoveNoShows']='Fjern ikke fremmødte';
 $lang['MenuLM_Accreditation']='Akkreditering';
 $lang['MenuLM_Accreditation colors management']='Administrer akkreditering farver';
+$lang['MenuLM_AdvancedFeatures']='Avanceret opsætning';
 $lang['MenuLM_AdvLabels']='Avanceret etiket udskrivning';
 $lang['MenuLM_Archers on Targets']='Antal per skive';
 $lang['MenuLM_Arr4Set']='Pile per sæt';
@@ -229,6 +237,7 @@
 $lang['MenuLM_Athlets fees status']='Status for skytters afgift';
 $lang['MenuLM_Authentication']='Bruger godkendelse';
 $lang['MenuLM_AutoCheckinSetup']='Auto Check-In setup';
+$lang['MenuLM_Automator']='Automator';
 $lang['MenuLM_Back Number Printout']='Udskriv registreringsnumre';
 $lang['MenuLM_Boinx']='Boinx Layers opsætning';
 $lang['MenuLM_BoinxMeteo']='Boinx Meteo Layer Data';
@@ -239,9 +248,11 @@
 $lang['MenuLM_Category Result List']='Udskriv resultatliste for kategori';
 $lang['MenuLM_Change Components']='Udskift skytter';
 $lang['MenuLM_ChangeNationsNames']='Skift klubnavne';
+$lang['MenuLM_ChangePassword']='Skift kodeord';
 $lang['MenuLM_Check Data Update']='Check dataopdateringer';
 $lang['MenuLM_Check shoot-off before eliminations']='Check shoot-off før eliminationer';
 $lang['MenuLM_Check shoot-off before final phases']='Check shoot-off før finaler';
+$lang['MenuLM_Check shoot-off before Rank']='Check shott-off før udskrivning';
 $lang['MenuLM_CheckAwards']='Check præmier oversættelser';
 $lang['MenuLM_CheckList']='Udskriv kontrolliste';
 $lang['MenuLM_CIS']='CIS';
@@ -295,6 +306,7 @@
 $lang['MenuLM_FinalFOPChoose']='Finale FOP udvidet';
 $lang['MenuLM_FlightsAwardManagement']='Flights Award Management';
 $lang['MenuLM_FlightsManagement']='Flights Management';
+$lang['MenuLM_FontManagement']='Font opsætning';
 $lang['MenuLM_GateControl']='Gate Access kontrolpanel';
 $lang['MenuLM_GateSituation']='Gate Situation';
 $lang['MenuLM_Get Info']='Indhent info';
@@ -337,6 +349,7 @@
 $lang['MenuLM_Modules']='Moduler';
 $lang['MenuLM_MoveSession']='Ændre tildelt session';
 $lang['MenuLM_MoveTarget']='Flyt tildelte skiver';
+$lang['MenuLM_N62']='N62A/B ORIS Information';
 $lang['MenuLM_New']='Ny turnering';
 $lang['MenuLM_NewBacknumbers']='Registreringsnumre';
 $lang['MenuLM_OdsExport']='Regneark eksport (.ods)';
@@ -441,6 +454,7 @@
 $lang['MsgImportOk']='Import afsluttet!';
 $lang['MsgInitFinalGridsError']='Advarsel: Skemaerne er ikke tomme. Vil du fortsætte?';
 $lang['MsgInitFinalGridsOk']='Initialisering Afsluttet Successfuldt';
+$lang['MsgInitFinalGridsRunningError']='Operation ikke tilladt mens turnering er i "Running Mode"';
 $lang['MsgMakeFinReset']='Finale skemaer re-initialiseret!<br>Rediger alle indledende operationer før indsættelse af ny data!';
 $lang['MsgNeedInitGrids']='Fejl!<br>Skemaerne er ikke initialiseret!';
 $lang['MsgNeedShootOff']='Fejl!<br>Check for shoot-off først!';
@@ -497,6 +511,7 @@
 $lang['Score1Page1Match']='Score til enkelt match';
 $lang['ScoreDrawing']='Kun skema (Enkelt side)';
 $lang['ScoreFilled']='Udskriv skydesedler med værdien fra hver enkelt pil';
+$lang['ScoreIncAllNames']='Inkluder alle modstandere som er mulige';
 $lang['ScoreIncEmpty']='Udskriv matcher selv uden modstander';
 $lang['Scorer']='Markør';
 $lang['SearchOrphanTexts']='Søg \'forældreløse\' tekster';
@@ -505,9 +520,12 @@
 $lang['SelectAll']='Vælg Alt';
 $lang['SelTour']='Aktuel turnering';
 $lang['Session']='Session';
+$lang['SetWinShot']='Sæt pil fra vinder';
+$lang['SetWinShotHelp']='[Number of successful set winners shots] - [Number of failed set winners shots] %=Percentage of success when an arrow is a potential set winner';
 $lang['SF']='Senior Dame';
 $lang['ShootOff4Elim']='Check shoot-off før eliminationer';
 $lang['ShootOff4Final']='Check shoot-off før finaler';
+$lang['ShootOff4Rank']='Check shott-off før udskrivning';
 $lang['SM']='Senior Herre';
 $lang['SnapshotConf']='Snapshot opsætning';
 $lang['SortBy']='Sorteret efter';
@@ -549,12 +567,15 @@
 $lang['Total']='Total';
 $lang['TotaleScore']='Total';
 $lang['Trg3DComplete']='3D Standard';
+$lang['Trg3DReddingEnd']='3D Redding';
 $lang['TrgCOIndComplete']='Indendørs (1-lille 10)';
 $lang['TrgCOIndSmall']='Indendørs (6-lille 10)';
 $lang['TrgCOOutdoor']='Udendørs (5-X)';
 $lang['TrgCOOutdoorSmall']='Udendørs (6-X)';
 $lang['TrgField']='Felt';
 $lang['TrgForestSwe']='Forest (SWE)';
+$lang['TrgFrBeursault']='Beursault';
+$lang['TrgFrBouquet']='Bouquet';
 $lang['TrgHMOutComplete']='Hit-Miss';
 $lang['TrgHunterNor']='Jæger (Norge)';
 $lang['TrgImperial']='Imperial Skive (1-9)';
diff --git a/src/Common/Languages/dk/Errors.php b/src/Common/Languages/dk/Errors.php
index e1f19f0a..549719e7 100644
--- a/src/Common/Languages/dk/Errors.php
+++ b/src/Common/Languages/dk/Errors.php
@@ -4,9 +4,11 @@
 $lang['Anomalies']='Uregelmæssigheder';
 $lang['BarCodeSession']='Der er en fejl i opsætningen: Prøv opsætning for session';
 $lang['BarCodeSettings']='Der er en fejl i opsætningen';
+$lang['CategoresNotDefined']='Manglende definition af kategori';
 $lang['ClassFromToError']='Fra og Til skal være numeriske værdier';
 $lang['ClubNotFound']='Klubkode ikke fundet mellem eksisterende klubkoder. Opdater venligst databasen først!';
 $lang['ConflictingCategories']='Definition af filter overlapper tidligere filtre på disse kategorier: $a!';
+$lang['DecodeError']='Decode fejl';
 $lang['DiameterMandatory']='Diameter på ansigt krævet';
 $lang['DirectoryNotWriteable']='Webserveren kan ikke skrive i biblioteket $a. Venligst ændre rettighederne således at alle kan skrive.';
 $lang['DistanceOutRange']='Afstanden er ugyldig';
@@ -15,6 +17,9 @@
 $lang['EmptyFrom']='Felt e-mail er et krævet felt';
 $lang['EmptySubject']='Feltet Emne er et krævet felt';
 $lang['EmptyTitle']='Feltet Titel er et krævet felt';
+$lang['EndsArrowsMisMatch']='$a with wrong Ends/Arrows setting';
+$lang['EntriesNoCategory']='Tilmeldte uden kategori';
+$lang['EntriesNoCountry']='Tilmeldte uden klub';
 $lang['ErrCodeExists']='Kode findes allerede!';
 $lang['ErrCommitteeError']='Ugyldig Udvalg kode eller beskrivelse';
 $lang['ErrConnection']='Ingen forbindelse til server $a';
@@ -32,6 +37,7 @@
 $lang['ErrRedCard']='Udvalget er tildelt rødt kort og kan derfor ikke bede om stævnekode. der hostes på ianseo.net. Kontakt codes@ianseo.net for yderligere information.';
 $lang['ErrUnknownNation']='Ukendt land';
 $lang['ErrYellowCard']='Udvalget har tildelt gult kort, da ingen resultater er blevet uploadet. Kontakt codes@ianseo.net for yderligere information.';
+$lang['EventIncompleteSetting']='$a with missing allowed categories setting';
 $lang['FilterAlreadyExists']='Dette filter findes allerede';
 $lang['FilterNotEmpty']='Man skal opsætte filter';
 $lang['IllegalTarget']='Valgt ansigt findes ikke i DB';
@@ -39,7 +45,9 @@
 $lang['ImageFetchError']='Fejl ved hent af billede';
 $lang['ImageSaveError']='Billede ikke gemt';
 $lang['IncompleteSettings']='Ufuldstændig opsætning';
+$lang['InvalidCharacters']='Feltet indeholder ugyldige karakterer. Tilladte karakterer er $a';
 $lang['InvalidEmail']='Ugyldig E-mail: Check E-mail en ekstra gang før der gemmes';
+$lang['InvalidLogin']='Ugyldigt login';
 $lang['LockedProcedure']='Denne funktion er LÅST';
 $lang['MailingAlreadyExists']='Email\'en ({$a}) findes allerede, skift navn eller vælg den e-mail, der skal ændres, fra vælgeren.';
 $lang['MailingDeleteText']='Bekræft af denne afsendelse slettes permanent';
@@ -52,20 +60,31 @@
 $lang['MissingData']='Manglende data';
 $lang['MissingPhpIntlModule']='Skift af sprog kan gøres ved at installere eller aktivere php-intl module';
 $lang['NameNotEmpty']='Navn kan ikke være blankt';
+$lang['NoCountryInsert']='Ingen klub indsat';
+$lang['NoData']='Ingen data fundet';
+$lang['NoDistancesSet']='Kategorier uden afstand opsætning';
 $lang['NoDNSRecord']='Navnet på serveren er ikke korrekt eller er ikke online - bemærk man skal være forbundet til internettet for at anvendes denne mulighed';
+$lang['NoEntryInsert']='Intet element indsat';
 $lang['NoMailingTemplate']='Ingen E-mail skabelon valgt/mulig!';
 $lang['NoMailRecipients']='Ingen at sende t8il. Check filter indstillinger';
 $lang['NoPrivilege']='Utilstrækkelige tilladelser: Ikke tilladelse til at håndtere denne side';
 $lang['NoSameOrders']='Værdi af Sortering findes allerede';
 $lang['NoSmtpServerSet']='Angiv SMTP server før mail afsendelse er mulig';
+$lang['NoTargetSet']='Kategorier uden ansigt opsætning';
+$lang['PhpOutdated']='Den version af PHP er gammel. Ianseo kan virke men dele kræver mindst version  {$a}.<br/>Opdater din installation hurtigst muligt til at understøtte PHP {$a} eller nyere.';
 $lang['RegExp']='For at anvende RegExp (Regular Expressions), venligst se $a';
+$lang['ResetSyncData']='Nulstil Sync data';
+$lang['ServiceNotAvailable']='Service ikke tilgængelig';
 $lang['SetupNotFinished']='Der er ikke adgang til denne side: Udfyld først {$a}';
 $lang['SpecialFilterDiscrepancy']='Et specielt filter er sat men er ikke aktivt';
 $lang['SqlJolly']='In a SQL statement a "%" acts as a jolly, a "_" replaces a single letter. "R%M" for example will match "RM" as well as "RCM", "RMM" but not "RMC". "R_M" will match "RSM", "RJM" but not "RM".';
+$lang['SyncNotAvailable']='Sync ikke tilgængelig';
 $lang['TargetNumberMismatch']='Skive nummer kan kun være i formaet [Skivenummer][Skivebogstav], f.eks. 129C';
 $lang['TargetRangeMismatch']='Skive afstand skal være mindst 2 skivenumre (ingen bogstaver) anskilt af bindestreg (minus tegnet), hvor det første skal være mindst, f.eks. 23-44';
 $lang['TextSmtpDelete']='Bekræft at SMTP opsætningen fjernes på denne installation af IANSEO';
 $lang['TooManyArrows']='For mange pile - maksimum er $a';
+$lang['TooManyDistancesMatch']='Kategorier med flere afstande opsætning';
 $lang['TooManyElimQualified']='Runde af typen $a[0] kan kun acceptere op til $a[1] skytter';
+$lang['WrongData']='Ugyldigt data angivet';
 $lang['WrongPort']='Denne port er ikke understøttet';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/dk/Help.php b/src/Common/Languages/dk/Help.php
index a248880e..1f76965f 100644
--- a/src/Common/Languages/dk/Help.php
+++ b/src/Common/Languages/dk/Help.php
@@ -1,4 +1,5 @@
 <?php
+$lang['AuthTourCode']='Kommasepareret liste af turneringskoder som kan håndteres af brugeren.<br>Man kan bruge "%" som wildcard.';
 $lang['AutoCheckinAlreadyDone']='Du er allerede indchecket<br>Hvis du vil ændre data, så henvend dig ved indcheckning';
 $lang['AutoCheckinConfirm']='Hvis al information er korrekt, så tryk BEKRÆFT CHECK-IN<br> Ellers tryk AFBRYD og henvend dig ved indcheckning';
 $lang['AutoCheckinSearch']='Skan den modtagne QR koden eller indtast navn';
@@ -12,6 +13,11 @@
 $lang['ChangeComponents']='<p>For at fortsætte med ændringen, skal man først fjerne skytten som ikke længere skal være på holdet for herefter at vælge alternativ skytte.</p> &#9654&nbsp;Score inkluderet i holdtotal efter kvalifikationsrunden<br> &#9655&nbsp;Score ikke inkluderet i holdtotal efter kvalifikationsrunden';
 $lang['CombiCompList']='Liste af konkurrence koder, adskilt af komma';
 $lang['FlightsManagement']='<b>To flight categories</b> <ul> <li>Select on which Ends - Distances Total - Full Total calculate the flights;</li> <li>Select the initial flight cut size by category. The system preloads the standard NFAA flighting table when competition allows it;</li> <li>Flight Grouping preview will calculate ALL CATEGORIES, press the reload button side of the flight cut size to force calculation of a single category; </li> <li>Flights marked orange are just an indicator of a difference between the previewed flight and the rule table. It does NOT affect the flight division.</li> <li>Use drop - split - merge commands to adjust flights info. Please note, after running a full preview or a category refresh all the changes to the flight are lost.</li> </ul> <b>Notes</b> <ul> <li>Categories with too few participants are excluded from flighting. Flighting can be forced indicating the flight cut quantity;</li> <li>If a category is considered to be flighted, use \'-1\' as cut to explicitly exclude from flighting</li> <li>Professional and/or Championships as excluded from flighting and greyed out</li> </ul>';
+$lang['FontFamily']='Navn på fonten brugt i CSS';
+$lang['FontFile']='Placering af filen på disk';
+$lang['FontName']='Aktuelt navn for font';
+$lang['FontStyle']='Style for fonten i CSS';
+$lang['FontWeight']='Vægt for fonten i CSS';
 $lang['GetBarcodeSeparator']='Efter udskrivning af stregkode reference arket, læs venligst «SEPARATOR» stregkoden for at aktivere de korrekte læse emner.';
 $lang['HomePage']='Dette er siden hvor du kan vælge eller oprette en turnering.';
 $lang['ISK-LockedSessionHelp']='{$a} ikonet viser om app\'en kan score eller ej i denne session';
@@ -19,11 +25,14 @@
 $lang['QrCodeLandscape']='en enkelt eller dobbelt "<" vil skrive en venstre pil, en enkelte eller dobbelt ">" vil skrive en højre pil, en enkelt eller dobbelt "^" vil skrive en op-pil mens en enkelt eller dobbelt "v" vil skrive en ned-pil';
 $lang['QrCodePortrait']='feltet er HTML-egnet Hvis man indsætter noget omringet af &lt;qrcode&gt;...&lt;/qrcode&gt; så vil indholdet blive ændret til en QR kode';
 $lang['ScoreBarCodeShortcuts']='Indlæs stregkoden som er udskrevet på skydesedlen.<br/>Ved manuelt at indsætte et # efterfulgt af navnet på skytten gennemsøges databasen for at finde skytten. <br/>Ved at indsættes et @ efterfuldt af skivenummeret søges efter banen. Afstand SKAL være sat. Session skal være specificeret (første ciffer) og skive skal være foranstillet med \'0\' til 3 cifre.';
+$lang['ScoreboardFreetext-Texts']='Insert {{date}} to insert the date in english format (ie: january 4, 2024).<br> Insert {{date-lang}} to insert a date in local language (ie: {{date-de}} to have 4. Januar 2024)<br> Insert {{time}} to have the ticking time in ISO format (ie: 15:03:23)<br> Insert {{time-am}} to have ticking time in AM/PM format (ie: 3:03:23 PM)<br> Insert {{counter-datetime}} to have a full date countdown (ie: [[[days:]hours:]minutes:]seconds layout, where datetime is the time to reach in ISO format 2024-12-04T09:00:00 for local time)<br> There can only be one of these fields in a text';
 $lang['TargetRequests-Printout']='Prints the QrCodes of the requested targets to allow personal devices to quickly be reassigned to the correct target.<br> Select which group(s) of devices you want to print and the range of target butts:<br/> 1-10 prints QrCOde from target 1 to 10<br/> 1,7,12-15 prints QrCOde of targets 1, 7 and from 12 to 15';
 $lang['TargetScoring-Printout']='Prints the QrCodes of the requested targets to score in the required Session-Target-Distance with ISK NG Lite. It is the same QR code that you can find in the scorecards<br> Select which session(s) you want to print and the range of target butts:<br> 1-10 prints QrCOde from target 1 to 10<br> 1,7,12-15 prints QrCOde of targets 1, 7 and from 12 to 15';
 $lang['TV-ChannelSetup']='= Channels Setup = After setting up your channels as desired, connect the browser of the device you want to link to a channel to <code>http://IP.OF.IANSEO/tv.php?id=CHANNEL</code> where \'\'\'IP.OF.IANSEO\'\'\' is the IP where ianseo is running (including the directory if any) and \'\'\'CHANNEL\'\'\' is the ID of the channel';
 $lang['TV-RotEdit']='<div>A presentation page is made of at least one content page.</div> <div>The content pages will then be shown one after the other and start over again.</div> <div><b>NOTE:</b> in regular and light version engines, the first content is again shown as last, so it is wise to insert as first content an image (logo of the competition for example).</div> <div>Contents can be either competition-based (start list, qualification, matches...) or "multimedia" (images, HTML messages,...).</div>';
 $lang['TV-RotEdit-DB']='<h2>CSS3 management (Advanced engine)</h2> <h3>Length Units</h3> <ul> <li><b>rem:</b> heigth of the root character</li> <li><b>em:</b> heigth of the current character</li> <li><b>ex:</b> heigth of the lowercase "x"</li> <li><b>ch:</b> width of the number "0"</li> <li><b>vh:</b> 1/100th of the height of the screen</li> <li><b>vw:</b> 1/100th of the width of the screen</li> <li><b>vmin:</b> 1/100th of the minimum value between the height and the width of the screen</li> <li><b>vmax:</b> 1/100th of the maximum value between the height and the width of the screen</li> </ul> <h3>Flexible Boxes</h3> <li><b>flex A B C:</b> <ul> <li><b>A</b>: if 0 means the box can not expand; if >1 means the box can expand at that "speed" compared to other boxes (if box 1 has 2 and box 2 has 3, box 2 will expand 1.5 more than box 1 which in turn will expan double as much as a box with this value set to 1)</li> <li><b>B:</b> if 0 the box cannot shrink; if 1 box can shrink</li> <li><b>C:</b> initial dimention of the box</li> </ul> </li> <h3>CSS reference</h3> <a href="https://developer.mozilla.org/en-US/docs/Web/CSS/Reference">https://developer.mozilla.org/en-US/docs/Web/CSS/Reference</a>';
 $lang['TV-RotList']='<div>This is the list of available presentation pages to send to videowall, moitors or broadcast.</div> <div>3 different engines are provided, click on the link to activate:</div> <ul> <li>a regular engine compatible with most browsers</li> <li>a light version engine compatible with most browsers but uses less resources</li> <li>an advanced version that uses modern browsers HTML5 capabilities</li> </ul> <div>To create a new content, enter a name for it and press the button.</div>';
+$lang['UserName']='Skal være entydig i systemet. Minimums længde: 6 karakterer';
+$lang['UserPassword']='Lad være blank for at beholde nuværende kodeord';
 $lang['ZeroBased']='Nul baseret nummer';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/dk/IOC_Codes.php b/src/Common/Languages/dk/IOC_Codes.php
index b5ca3c49..1c952f1d 100644
--- a/src/Common/Languages/dk/IOC_Codes.php
+++ b/src/Common/Languages/dk/IOC_Codes.php
@@ -42,16 +42,13 @@
 $lang['BUL']='Bulgarien';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Central African Republic';
-$lang['CAM']='Cambodia';
 $lang['CAN']='Canada';
 $lang['CAY']='Caymand Islands';
 $lang['CGO']='Republic of Congo';
 $lang['CHA']='Chad';
 $lang['CHI']='Chile';
-$lang['CHN']='Kina';
 $lang['CIV']='Elfenbenskysten';
 $lang['CMR']='Cameron';
-$lang['COD']='Democratic Republic of Congo';
 $lang['COK']='Cook Islands';
 $lang['COL']='Columbia';
 $lang['COM']='Comoros';
@@ -60,7 +57,6 @@
 $lang['CRO']='Kroatien';
 $lang['CUB']='Cuba';
 $lang['CYP']='Cypern';
-$lang['CZE']='Tjekkiet';
 $lang['DEN']='Danmark';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -91,17 +87,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Ungarn';
 $lang['INA']='Indonesien';
 $lang['IND']='Indien';
-$lang['IRI']='Iran';
 $lang['IRL']='Irland';
 $lang['IRQ']='Irak';
 $lang['ISL']='Island';
 $lang['ISR']='Israel';
-$lang['ISV']='USA jomfruøerne';
 $lang['ITA']='Italien';
 $lang['IVB']='Britisk jomfruøerne';
 $lang['JAM']='Jamaica';
@@ -114,7 +107,6 @@
 $lang['KOR']='Sydkorea';
 $lang['KSA']='Saudi Arabien';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
 $lang['LAT']='Letland';
 $lang['LBA']='Libien';
 $lang['LBR']='Liberia';
@@ -128,7 +120,6 @@
 $lang['MAR']='Marokko';
 $lang['MAS']='Malaysia';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldova';
 $lang['MDV']='Maldiverne';
 $lang['Medal-1']='Guld medalje';
 $lang['Medal-2']='Sølv medalje';
@@ -137,7 +128,6 @@
 $lang['MEX']='Mexico';
 $lang['MGL']='Mongoliet';
 $lang['MHL']='Marshall øerne';
-$lang['MKD']='Makedonien';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -166,7 +156,6 @@
 $lang['PNG']='Papua New Guinea';
 $lang['POL']='Polen';
 $lang['POR']='Portugal';
-$lang['PRK']='Nord Korea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Romænien';
@@ -193,13 +182,11 @@
 $lang['SVK']='Slovakiet';
 $lang['SWE']='Sverige';
 $lang['SWZ']='Swaziland';
-$lang['SYR']='Syrien';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailand';
 $lang['TJK']='Tajikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Øst Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Chinese Taipei';
 $lang['TRI']='Trinidad and Tobago';
diff --git a/src/Common/Languages/dk/Ianseo.php b/src/Common/Languages/dk/Ianseo.php
index 1e781866..3cab3432 100644
--- a/src/Common/Languages/dk/Ianseo.php
+++ b/src/Common/Languages/dk/Ianseo.php
@@ -7,4 +7,9 @@
 $lang['Cert-Level4']='Master kursus';
 $lang['Cert-Level5']='Ianseo mandskab';
 $lang['CertificateManagement']='Certifikat styring';
+$lang['GenerateFile']='Dan fil';
+$lang['ResetItems']='Reset Items.<br/>This action will not ask for confirmation and cannot be undone!<br/>Resetting qualifications will reset all subsequent events too!';
+$lang['ResetResult']='Den ønskede session er nulstillet';
+$lang['ResetSessions']='Bekræft Nulstil';
+$lang['ShuffleResults']='Bland resultater';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/dk/Install.php b/src/Common/Languages/dk/Install.php
index 3f62e08c..19fa13e1 100644
--- a/src/Common/Languages/dk/Install.php
+++ b/src/Common/Languages/dk/Install.php
@@ -44,7 +44,7 @@
 $lang['FieldPegWhite']='Hvid pind';
 $lang['FieldPegYellow']='Gul pind';
 $lang['File permission error']='Du skal checke alle tilladelser af IANSEO installations mapper: den skal ikke være skrivebeskyttet af brugeren.';
-$lang['FreeOnlineResults']='<b>Gratis online udgivelse</b> - med en Internet forbindelse kan du vise verdenen hvad der sker under konkurrencen. Det er gratis, så hvorfor vente? Når turneringen først er oprettet, så bed om en turneringskode under menu punktet «{$a}».';
+$lang['FreeOnlineResults']='<b>Gratis online udgivelse</b>. Via nettet kan du vise verdenen hvad der sker under konkurrencen. Det er gratis, så hvorfor vente? Når turneringen først er oprettet, så bed om en turneringskode under menu punktet «{$a}».';
 $lang['Host']='Host';
 $lang['Install-0']='KRITISK FEJL';
 $lang['Install-0 Title']='GPL3 License Agreement';
@@ -87,7 +87,7 @@
 $lang['Parameter']='Paremetre';
 $lang['Password']='Kodeord';
 $lang['PHP settings']='PHP opsætning';
-$lang['PHP too old']='Din PHP installation er for gammel. Minimums versionen for IANSEO er 5.0.';
+$lang['PHP too old']='Din PHP installation er for gammel. Minimums versionen for IANSEO er 8.0.';
 $lang['PHP version']='PHP version';
 $lang['php.ini file']='php.ini file';
 $lang['Prepare']='Forbereder data til opdatering';
@@ -139,9 +139,12 @@
 $lang['SetCompound70m']='Compound - 70m';
 $lang['SetCR']='Reginalt mesterskab (en eliminationsrunde)';
 $lang['SetDKShortDistances']='Kort afstand (Langbue og Barbue)';
+$lang['SetFrBeursault']='Beursault';
+$lang['SetFrBouquet']='Bouquet';
 $lang['SetFRChampionshipElite']='Championnats Elite';
 $lang['SetFRChampionshipJun']='Mesterskabs ungdom';
 $lang['SetFRChampionshipSen']='Mesterskabs voksne';
+$lang['SetFRChampJunTeams']='Championnat de France Jeune Equipe';
 $lang['SetFRChampsD1DNAP']='Davis-Like Team Matches';
 $lang['SetFRChampsFederal']='Championnat Fédéral';
 $lang['SetFRChampsScratchC']='Mesterskabs Compound Single Event';
@@ -150,8 +153,13 @@
 $lang['SetFRChampsVet']='Championships Masters';
 $lang['SetFRCoupeFrance']='French Cup';
 $lang['SetFRD12023']='Championnat D1 / 2023';
+$lang['SetFRFinalsD2']='Finales France D2';
 $lang['SetFRFinDRD2']='Finales DR/D2';
+$lang['SetFrSelectif']='Selectif';
+$lang['SetFrSelectifPara']='Selectif + Para';
 $lang['SetFRTAE']='French TAE Championships';
+$lang['SetFRTAE-Para']='Selectif TAE + Para';
+$lang['SetFRTAE-Valides']='Selectif TAE';
 $lang['SetIndoor']='Indendørs';
 $lang['SetIPCandWA']='IPC og WA kategorier';
 $lang['SetJ-CClass']='Junior og Kadet';
@@ -242,9 +250,9 @@
 $lang['User']='Brugernavn';
 $lang['Value']='Værdi (indexed arrays items: key1::value1|key2::value2)';
 $lang['WhatIanseoDoes01']='<b>Følger World Archery</b> - Ianseo er altid opdateret i forhold til World Archery reglerne. Hvis der ønskes tilpasning for at følge nationale regler eller turneringsregler, så kontakt udviklerne som kan hjælpe med tilpasninger!';
-$lang['WhatIanseoDoes02']='<b>Hjælp og støtte</b> Hvis du har brug for hjælp, så send en email til $a - her vil du vil få svar direkte fra udviklerne af Ianseo';
-$lang['WhatIanseoDoes03']='<b>On site training and courses:</b> Ianseo is available to manage specific on location courses. Two levels: without and with the electronic devices. The first is aimed to know all aspects of ianseo from competition preparation and schedule up to online publication and local distribution of results. The second is aimed on acquiring all the specific knowledge to run an "arrow by arrow" competition.';
-$lang['WhatIanseoDoes04']='<b>Doner</b> Ianseo er gratis og Open Source.... Hjælp til at holde programmer og servere opdateret - tryk på \'Doner\' på $a';
+$lang['WhatIanseoDoes02']='<b>Brug for hjælp?</B> Så send en email til $a, hvor du skriver direkte med udviklerne af Ianseo';
+$lang['WhatIanseoDoes03']='<b>Træning og kurser</b> Ianseo kan tilbyde at kurser hos jer på to niveauer: Uden og med Ianseo Scorekeeper NG app. Den første har til formål at kende alle aspekter af ianseo fra konkurrenceforberedelse og tidsplan til online offentliggørelse. Del to er rettet mod at erhverve al den specifikke viden til at køre en "pil for pil" konkurrence.';
+$lang['WhatIanseoDoes04']='<b>Doner</b> Ianseo er gratis og Open Source. Ved <t donere via $a hjælper du med at holde programmer og servere opdateret';
 $lang['WhatIanseoDoes05']='<b>Social Media:</b> Ianseo findes også på $a!';
 $lang['WhatIanseoDoesTitle']='Hvad kan Ianseo gøre for din turnering';
 $lang['Write connection failed']='Forbindelsen med serveren mislykkedes - enten har du ikke indtastet root kodeord eller også er login data ikke korrekt!';
diff --git a/src/Common/Languages/dk/ODF.php b/src/Common/Languages/dk/ODF.php
index 24d5c5c5..b286bd9c 100644
--- a/src/Common/Languages/dk/ODF.php
+++ b/src/Common/Languages/dk/ODF.php
@@ -53,8 +53,10 @@
 $lang['OdfCommonCodeVersion']='Common Code Version';
 $lang['OdfCompetition']='ODF Competition Code';
 $lang['OdfEventCode']='ODF begivenhedskode';
+$lang['OdfGeneralCodeVersion']='General Data Dictionary Version';
 $lang['OdfReceiverOn']='Modtager aktiv';
 $lang['OdfReceiverSetup']='ODF modtager opsætning';
+$lang['OdfSportCodeVersion']='Sport Data Dictionary Version';
 $lang['OdfUploadFileText']='Vælg venligst en XML for upload...';
 $lang['Production']='Produktion';
 $lang['Receiver']='Modtager';
@@ -87,6 +89,7 @@
 $lang['TMMeeting']='Team Manager\'s Meeting';
 $lang['Transmitter']='Sender';
 $lang['TypCODE']='Document Code suffix';
+$lang['TypDISCIPLINE']='Discipline (ref Sports CC@Discipline)';
 $lang['TypEVENT']='Event Description';
 $lang['TypNAME']='Beskrivelse';
 $lang['TypPHASE']='Phase Description';
diff --git a/src/Common/Languages/dk/Tournament.php b/src/Common/Languages/dk/Tournament.php
index cee80df3..666396f8 100644
--- a/src/Common/Languages/dk/Tournament.php
+++ b/src/Common/Languages/dk/Tournament.php
@@ -27,7 +27,7 @@
 $lang['AclISKServer']='ISK styring';
 $lang['AclModules']='Moduler';
 $lang['ACLNoAccess']='Ingen adgang';
-$lang['AclNotes']='<b>Notes about Network Security</b> <ul> <li>restriction are "competition based" and not "server based"</li> <li>when policies are enable, default behavior for not-listed clients is "No Access"</li> <li>localhost (127.0.0.1 or ::1) cannot be restricted</li> <li>Policies can be disabled calling from the server itself <b>{$a}</b> </ul>';
+$lang['AclNotes']='<b>Notes about Network Security</b> <ul> <li>These restriction are "competition based" and not "server based"</li> <li>localhost (127.0.0.1 or ::1) cannot be restricted</li> <li>Policies can be disabled calling from the server itself <b>{$a}</b> </li></ul><ul> <li>When policies are enabled, default behavior for not-listed clients is "No Access"</li> <li>It is possible to add * as last group of the IP Address (192.168.0.* or 172.16.*) to add a default group</li> <li>It is possible to use RegExp to match the IP address. RegExps will be evaluated in the order they are shown and allows R/W policies</li> </ul>';
 $lang['AclOdf']='ODF Management';
 $lang['AclOutput']='Output';
 $lang['AclParticipants']='Deltagere';
@@ -52,6 +52,7 @@
 $lang['AllDistances']='Alle';
 $lang['AllEntries']='Alle poster';
 $lang['AllEvents']='Alle grupper';
+$lang['AllowCompetitionACL']='Allow Competition Network Access Policies';
 $lang['AllRound']='Alle runder';
 $lang['AllSessions']='Alle sessioner';
 $lang['AllsF']='Alle';
@@ -98,6 +99,7 @@
 $lang['AuthCodeA2A']='Pil for pil kodeord';
 $lang['AutoCoinToss']='Automatisk møntkast';
 $lang['AutoEdits']='Auto redigering';
+$lang['AutomatorAccPrint']='Akkreditering udskrift opsætning';
 $lang['AutoMoveNext']='Automatisk flyt til næste pil';
 $lang['AutoRefresh']='Automatisk opdatering';
 $lang['AutoTargetAssignment']='Automatisk skivetildeling';
@@ -158,6 +160,9 @@
 $lang['Block_IP']='Access IP (v4)';
 $lang['Block_Manage']='Adgangskontrol styring';
 $lang['Block_Nick']='Tildel kaldenavn';
+$lang['Block_TemplateIP']='IP templates';
+$lang['Block_TemplateName']='Beskrivelse';
+$lang['Block_TemplatePattern']='Mønster';
 $lang['BoldIsDefault']='Standard er market med Fed';
 $lang['Bonus']='Bonus';
 $lang['ByeMovedToPhase']='Skytte flyttet til næste fase';
@@ -205,6 +210,7 @@
 $lang['CheckXNinesInMatch']='Check X-9 ved ties';
 $lang['Classes']='Klasser';
 $lang['ClearField']='Ryd felt';
+$lang['ClickMovesPosition']='Opdater kun pile position';
 $lang['ClickToMailRequest']='Klik for at åbne en forudfyldt mail';
 $lang['ClickToRequestCode']='Klik for at få Kode';
 $lang['Clone']='Klon';
@@ -273,6 +279,7 @@
 $lang['CtrlCodeShort']='Ktrl. Code';
 $lang['Currency']='DKK';
 $lang['CurrentCompCode']='Nuværende turneringkode: $a';
+$lang['CustomAclDetails']='Brugerdefineret ACL detaljer';
 $lang['D1AllInOne']='Alle matches i en enkelt turnering';
 $lang['DailySchedule']='Detaljeret tidsplan';
 $lang['DATABASE NOT REACHABLE']='Online databasen er ikke tilgængelig';
@@ -287,6 +294,8 @@
 $lang['DefaultLocRule']='World Archery';
 $lang['DefaultVI']='Default VI';
 $lang['Delayed']='Forsinket';
+$lang['DeleteAclRule']='Slet ACL regel';
+$lang['DeleteAclUser']='Slet ACL bruger';
 $lang['DeleteAwarded']='Slet tildelt';
 $lang['DeleteChannel']='Fjerne Kanal. Dette vil fjerne alle split for kanalen og kanelen selv';
 $lang['DeletePreviousArchers']='Slet information som ikke er sendt';
@@ -380,6 +389,8 @@
 $lang['Events']='Grupper';
 $lang['EventStartPosition']='Placering for første skytter/hold som vælges';
 $lang['EventStillTie']='BEMÆRK:\nDe(n) følgende stævne(r) skal stadig kontrolleres:\n\n$a';
+$lang['EventsToAdd']='Turneringer som tilføjes:';
+$lang['EventsToDelete']='Turneringer som slettes:';
 $lang['EventWillNotRecreated']='(Hvis der ændres i turneringstypen, vil klasser/divisioner og alle andre standarder vil ikke blive regenereret)';
 $lang['EventWinnerFinalRank']='Turneringens vindere endelige placering';
 $lang['EvNameTranslated']='Oversat gruppe';
@@ -390,6 +401,7 @@
 $lang['ExportInstructions']='For at eksportere data og sende dem automatisk, skal du udfylde følgende formular.';
 $lang['ExportNotes']='Notat';
 $lang['ExportRefEMail']='Reference e-mail';
+$lang['ExportSocketData']='Eksporter socket data';
 $lang['ExportWinners']='Eksporter vindere';
 $lang['ExtraAddOns']='Extra Add-Os';
 $lang['FamilyName']='Efternavn';
@@ -459,6 +471,13 @@
 $lang['FlightsTotals']='Totaler';
 $lang['FlightsUpdateSetup']='Opdater opsætning';
 $lang['FollowHHT']='Vis HHT aktiveret tidsplan';
+$lang['FontFamily']='CSS font familie';
+$lang['FontFile']='Font fil';
+$lang['FontName']='Font navn';
+$lang['FontSample']='Font samle';
+$lang['FontStyle']='CSS font style';
+$lang['FontWarning']='Kun TTF font er understøttet';
+$lang['FontWeight']='CSS font vægt';
 $lang['FOP-ODS']='Baneudlægning';
 $lang['ForceAccreditation']='Gennemtving akkreditering';
 $lang['ForceOldPhotos']='Indsæt gamle billeder';
@@ -562,6 +581,7 @@
 $lang['LocRuleDefaultNo']='Default';
 $lang['LocRuleModifiedNo']='Ændret';
 $lang['LocRuleValidNo']='Ikke ændret';
+$lang['Login']='Login';
 $lang['LogisticResp']='Ansvarlig for Logistik';
 $lang['LogMessage']='Log besked';
 $lang['LogoB']='Bund billede (ratio 19:1 for A4)';
@@ -574,6 +594,7 @@
 $lang['LUE-CAN']='Canada';
 $lang['LUE-FITA']='World Archery';
 $lang['LUE-FRA']='Frankrig';
+$lang['LUE-GBR']='Archery GB';
 $lang['LUE-ITA']='Italien';
 $lang['LUE-ITA_e']='Italien (esordienti)';
 $lang['LUE-ITA_i']='Italien (indendørs)';
@@ -615,6 +636,7 @@
 $lang['ManageByes']='Håndter Byes';
 $lang['ManAthStatus']='Skytters Status Styring';
 $lang['ManColors']='Indstilling af farver';
+$lang['MandatoryLoginACL']='Tving login anmodning for ikke-registreret IP-adresse';
 $lang['ManDistances']='Indstilling af afstande';
 $lang['ManDivClass']='Indstilling af divisioner/klasser';
 $lang['ManMatchArr4Phase']='Administrer faser og pile per sæt';
@@ -683,6 +705,7 @@
 $lang['Name']='Navn';
 $lang['NameOrder']='Navne sortering';
 $lang['NameOrderHint']='Disse lande bytter om på for- og efternavn: CHN - TPE - HKG - KOR - PRK';
+$lang['Nameplates']='Navneskilte';
 $lang['NationShort']='Langt klubnavn';
 $lang['Natl-Nation']='Nation';
 $lang['New']='Ny';
@@ -761,10 +784,14 @@
 $lang['OrisScorecards']='Skydesedler (C73D)';
 $lang['OrisScorecardsAverage']='Gennemsnit pile score';
 $lang['OrisScorecardsTeam']='Skydeseddel (C73E)';
+$lang['OrisStatsIndividual']='Statistik (C85A)';
+$lang['OrisStatsTeam']='Statistik (C85B+C)';
 $lang['OrisTeamList']='Oris hold liste';
+$lang['OtherCountriesCoachingToo']='Inkluder elementer fra andre klubber i valg af træner';
 $lang['OtherTourCategory']='Andre';
 $lang['OutdoorTourCategory']='Udendørs turnering';
 $lang['OverwritePreviousArchers']='Overskriv forrige skytter';
+$lang['OvrBioAchievements']='Skytte præstationer';
 $lang['OvrMatchesMessages']='OVR Match signal';
 $lang['OvrRefresh']='Genopfrisk side (ingen send)';
 $lang['OvrSendSerial']='Send til OVR (Serial)';
@@ -850,6 +877,8 @@
 $lang['PrintNames']='Udskriv navne';
 $lang['PrintNormal']='Normal (Latin)';
 $lang['PrintScore']='Udskriv skydesedler';
+$lang['PrintScoreInd']='Udskriv individuelle skydesedler';
+$lang['PrintScoreTeam']='Udskriv hold skydesedler';
 $lang['PrintText']='Tekst til sidehovede';
 $lang['PrintTextTitle']='Sidehovede for resultat udskrivninger';
 $lang['Privacy-1']='Ianseo gemmer ikke personlige data undtages hvis tilladelse er givet af bruger. Ianseo software må bruges til at opbevare personlige data hvis stævneansvarlige har lovlig brug for disse data.';
@@ -983,6 +1012,7 @@
 $lang['SelectedClub-1']='Vis 2. landenavn';
 $lang['SelectedClub-2']='Vis 3. landenavn';
 $lang['SelectFirstN']='Første $a resultater';
+$lang['SelectMulti']='Vælg mindst et element. Tryk på CTRL+klik for at vælge flere elementer';
 $lang['SelectSession']='Vælg Session';
 $lang['Send2Ianseo']='Send data til www.ianseo.net';
 $lang['SendAll']='Send til alle';
@@ -1294,6 +1324,7 @@
 $lang['TVCss3RankNone']='Placering ingen';
 $lang['TVCss3RankOld']='Placering oprindelig';
 $lang['TVCss3RankUp']='Placering op';
+$lang['TVCss3Schedule']='Tidsplan';
 $lang['TVCss3Score']='Score';
 $lang['TVCss3Session']='Session';
 $lang['TVCss3SpecificSettings']='Specifik opsætning for denne side. Brug CSS3 syntaks for dette element';
@@ -1389,6 +1420,7 @@
 $lang['TVViewNationNameDescr']='On: Vis Klubs fulde navn<br>Off: Vis kun klubkoden.';
 $lang['TVViewPartials']='Vis resultater for alle afstandene';
 $lang['TVViewPartialsDescr']='Ændrer om der skal vises scorer for alle afstandene eller blot slut resultater';
+$lang['TvViewSCHED']='Vis tidsplan';
 $lang['TvViewTEAM']='Vis hold kolonne';
 $lang['TvViewTIT2ROWS']='Titel på 2 rækker';
 $lang['TvViewTOT']='Vis samlet score';
@@ -1416,6 +1448,7 @@
 $lang['Type_FITA']='1440 runde';
 $lang['Type_FITA 72']='Halv 1440 runde (4x18 pile)';
 $lang['Type_FITA+50']='1440 runde + 50m runde';
+$lang['Type_FR_Beursault']='Beursault';
 $lang['Type_FR_Kyudo']='Comité National de Kyudo (FRA)';
 $lang['Type_GiochiGioventu']='Youth Games';
 $lang['Type_GiochiGioventuW']='Vinter Youth Games';
@@ -1461,6 +1494,8 @@
 $lang['UserEnabled']='Aktiveret';
 $lang['UserName']='Brugernavn';
 $lang['UserPassword']='Kodeord';
+$lang['UserPasswordOld']='Gammelt kodeord';
+$lang['UserPasswordRetype']='Gentag nyt kodeord';
 $lang['UseSubClasses']='Sæt på specifikke skydeklasser';
 $lang['ValidClass']='Godkendte klasser';
 $lang['ValidDivisions']='Tilladte Divisioner. Tom hvis alle';
diff --git a/src/Common/Languages/ee/Install.php b/src/Common/Languages/ee/Install.php
index 010b9a90..57bb4b15 100644
--- a/src/Common/Languages/ee/Install.php
+++ b/src/Common/Languages/ee/Install.php
@@ -17,7 +17,6 @@
 $lang['Parameter']='Parameeter';
 $lang['Password']='Salasõna';
 $lang['PHP settings']='PHP seaded';
-$lang['PHP too old']='Teie PHP versioon on liiga vana. Minimaalne versioon IANSEO kasutamiseks on 5.0';
 $lang['SetSE_WaDist']='WA Distantsid';
 $lang['Status']='Staatus';
 $lang['stdValue']='Väärtus';
diff --git a/src/Common/Languages/ee/Tournament.php b/src/Common/Languages/ee/Tournament.php
index 230a917b..ff7ceea7 100644
--- a/src/Common/Languages/ee/Tournament.php
+++ b/src/Common/Languages/ee/Tournament.php
@@ -32,7 +32,6 @@
 $lang['CannotDelete']='Seda ei ole võimalik kustutada';
 $lang['CatDos']='Vilekohtunik';
 $lang['CatJudge']='Kohtunikud';
-$lang['ChairmanJudge']='Peakohtunik';
 $lang['CheckScorecards']='Kontrolli arvestuskaarte';
 $lang['Classes']='Vanuseklassid';
 $lang['ClickToMailRequest']='Kliki, et avada eeltäidetud e-kiri';
diff --git a/src/Common/Languages/el/Api.php b/src/Common/Languages/el/Api.php
index 366c0462..eef38379 100644
--- a/src/Common/Languages/el/Api.php
+++ b/src/Common/Languages/el/Api.php
@@ -4,6 +4,8 @@
 $lang['API-Group']='Ομάδα';
 $lang['API-TargetGrouping']='Ομαδοποίηση στόχων';
 $lang['API-Targets']='Στόχοι';
+$lang['AskSignature-0']='Όχι';
+$lang['AskSignature-1']='Σκανάρισμα Ταυτότητας Αθλητή';
 $lang['AutoImport']='Αυτόματη εισαγωγή';
 $lang['CmdDelete']='Αφαίρεση';
 $lang['CmdImport']='Εισαγωγή';
diff --git a/src/Common/Languages/en/Api.php b/src/Common/Languages/en/Api.php
index e772d984..fb4404f4 100644
--- a/src/Common/Languages/en/Api.php
+++ b/src/Common/Languages/en/Api.php
@@ -50,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='Connection Status';
 $lang['ISK-DeleteDevices']='Delete Devices';
 $lang['ISK-DenyAccess']='Deny access';
+$lang['ISK-Deprecated']='IMPORTANT: the "Ianseo Score Keeper" App is being phased out from the Android and Apple stores and is not supported anymore, thus it will be removed from Ianseo in September 2024. Please switch to the new "Ianseo Score Keeper NG" App instead.';
 $lang['ISK-DeviceAlive']='Online';
 $lang['ISK-DeviceBattery']='Battery';
 $lang['ISK-DeviceEnabled']='Enabled';
@@ -79,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='Missing Competition Code';
 $lang['ISK-Lite-QRCode']='Print QR Code for Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='Server Url (including protocol and port if not 80)';
+$lang['ISK-Live-Deprecated']='IMPORTANT: the "Ianseo Score Keeper Live" App is not supported anymore, thus it will be removed from Ianseo in September 2024. Please switch to the new "Ianseo Score Keeper NG" App instead.';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper LIVE';
 $lang['ISK-lockPortrait']='Lock device in portrait view';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
diff --git a/src/Common/Languages/en/BackNumbers.php b/src/Common/Languages/en/BackNumbers.php
index 5a0b4e83..ab03fac1 100644
--- a/src/Common/Languages/en/BackNumbers.php
+++ b/src/Common/Languages/en/BackNumbers.php
@@ -180,6 +180,8 @@
 $lang['ResetBarcodeSeparator']='Reset Barcode Separator';
 $lang['RnkCardinalEN']='Cardinal view (1, 2, ..., 10)';
 $lang['RnkOrdinal']='Ordinal view (1st, 2nd, ..., 10th) - EN';
+$lang['RnkRoman']='Roman Numbers (I, II, ... IV, ... CM)';
+$lang['S-Badge']='Stickers';
 $lang['Schedule']='Schedule';
 $lang['Session']='Qualification Session';
 $lang['SessionTarget']='Sesssion Code and Target';
diff --git a/src/Common/Languages/en/Common.php b/src/Common/Languages/en/Common.php
index 4623769f..9c6227e2 100644
--- a/src/Common/Languages/en/Common.php
+++ b/src/Common/Languages/en/Common.php
@@ -149,6 +149,10 @@
 $lang['Finish']='Finish';
 $lang['FirstPhase']='First Phase';
 $lang['FopSetup']='Field of Play Layout';
+$lang['Gender0']='Male';
+$lang['Gender1']='Female';
+$lang['GenderShort0']='M';
+$lang['GenderShort1']='F';
 $lang['GF']='Young Girls';
 $lang['GM']='Young Boy';
 $lang['HELP']='HELP!';
@@ -221,6 +225,7 @@
 $lang['MenuLMRemoveNoShows']='Remove No-Shows';
 $lang['MenuLM_Accreditation']='Accreditation';
 $lang['MenuLM_Accreditation colors management']='Accreditation colors management';
+$lang['MenuLM_AdvancedFeatures']='Advanced Features';
 $lang['MenuLM_AdvLabels']='Advanced Label Printout';
 $lang['MenuLM_Archers on Targets']='Archers on Targets';
 $lang['MenuLM_Arr4Set']='Arrows per Set';
@@ -234,6 +239,7 @@
 $lang['MenuLM_Athlets fees status']='Athlets fees status';
 $lang['MenuLM_Authentication']='Users Authentication';
 $lang['MenuLM_AutoCheckinSetup']='Auto Check-In Setup';
+$lang['MenuLM_Automator']='Automator';
 $lang['MenuLM_Back Number Printout']='Back Number Printout';
 $lang['MenuLM_Boinx']='Boinx Layers Setup';
 $lang['MenuLM_BoinxMeteo']='Boinx Meteo Layer Data';
@@ -244,9 +250,11 @@
 $lang['MenuLM_Category Result List']='Class and Division Result Lists';
 $lang['MenuLM_Change Components']='Change Components';
 $lang['MenuLM_ChangeNationsNames']='Change Nations Names';
+$lang['MenuLM_ChangePassword']='Change Password';
 $lang['MenuLM_Check Data Update']='Check Data Update';
 $lang['MenuLM_Check shoot-off before eliminations']='Check shoot-off before eliminations';
 $lang['MenuLM_Check shoot-off before final phases']='Check shoot-off before final phases';
+$lang['MenuLM_Check shoot-off before Rank']='Check shoot-off before Rank Printout';
 $lang['MenuLM_CheckAwards']='Check Awards Translations';
 $lang['MenuLM_CheckList']='Print Checklist';
 $lang['MenuLM_CIS']='CIS';
@@ -267,6 +275,9 @@
 $lang['MenuLM_Delete']='Delete';
 $lang['MenuLM_DeleteTarget']='Delete Target Assignment';
 $lang['MenuLM_Distances']='Manage Distances';
+$lang['MenuLM_DistrCompExport']='Local Competition Data Export';
+$lang['MenuLM_DistrCompImport']='Remote Competition Data Import';
+$lang['MenuLM_DistributedCompetition']='Distributed Competition';
 $lang['MenuLM_Div/Class Result List']='Div/Class Result List';
 $lang['MenuLM_Divisions and Classes']='Divisions and Classes';
 $lang['MenuLM_Draw']='Draw';
@@ -300,6 +311,7 @@
 $lang['MenuLM_FinalFOPChoose']='Final FOP Extended';
 $lang['MenuLM_FlightsAwardManagement']='Payout Award Management';
 $lang['MenuLM_FlightsManagement']='Flights Management';
+$lang['MenuLM_FontManagement']='Font Management';
 $lang['MenuLM_GateControl']='Gate Access Control Panel';
 $lang['MenuLM_GateSituation']='Gate Situation';
 $lang['MenuLM_Get Info']='Get Info';
@@ -342,6 +354,7 @@
 $lang['MenuLM_Modules']='Modules';
 $lang['MenuLM_MoveSession']='Change Assigned Session';
 $lang['MenuLM_MoveTarget']='Move Target Assigned';
+$lang['MenuLM_N62']='N62A/B ORIS Information';
 $lang['MenuLM_New']='New';
 $lang['MenuLM_NewBacknumbers']='Athlete Numbers';
 $lang['MenuLM_OdsExport']='SpreadSheet export (.ods)';
@@ -446,6 +459,7 @@
 $lang['MsgImportOk']='Import Completed!';
 $lang['MsgInitFinalGridsError']='Warning: brackets are already initialized for this event. Do you want to proceed?';
 $lang['MsgInitFinalGridsOk']='Initialization Succesfully!';
+$lang['MsgInitFinalGridsRunningError']='Operation not allowed when the Event is in Running Mode';
 $lang['MsgMakeFinReset']='Final Brackets Re-Initialized!<br>Redo all the preliminary operation before insert new data!';
 $lang['MsgNeedInitGrids']='Error!<br>Brackets not initialized!';
 $lang['MsgNeedShootOff']='Error!<br>First you have to check shoot-off!';
@@ -502,6 +516,7 @@
 $lang['Score1Page1Match']='Score for single match';
 $lang['ScoreDrawing']='Only Drawings (Single Page)';
 $lang['ScoreFilled']='Print Scorecards filled in with all the value from single arrows';
+$lang['ScoreIncAllNames']='Include all possible Opponents';
 $lang['ScoreIncEmpty']='Print matches even if without opponent';
 $lang['Scorer']='Scorer';
 $lang['SearchOrphanTexts']='Search Orphan Texts';
@@ -516,11 +531,12 @@
 $lang['SF']='Senior Women';
 $lang['ShootOff4Elim']='Check shoot-off before eliminations';
 $lang['ShootOff4Final']='Check shoot-off before final phases';
+$lang['ShootOff4Rank']='Check shoot-off before Rank Printout';
 $lang['SM']='Senior Men';
 $lang['SnapshotConf']='Snapshot Configuration';
 $lang['SortBy']='Sort By';
 $lang['Source']='Source Target';
-$lang['SourceSession']='To Session';
+$lang['SourceSession']='From Session';
 $lang['Spot']='Spot';
 $lang['SpottingInd']='Individual Spot';
 $lang['SpottingTeam']='Team Spot';
diff --git a/src/Common/Languages/en/Errors.php b/src/Common/Languages/en/Errors.php
index 809f4e3d..5ab97fd9 100644
--- a/src/Common/Languages/en/Errors.php
+++ b/src/Common/Languages/en/Errors.php
@@ -2,11 +2,14 @@
 $lang['AllFieldsMandatory']='All fields are mandatory';
 $lang['AllMailsRedirect']='All messages will be send to';
 $lang['Anomalies']='Anomalies';
+$lang['BackupTournaments']='Please remember to save all your competitions before updating or reinstalling ianseo!';
 $lang['BarCodeSession']='There is an error in the settings: try setting a session!';
 $lang['BarCodeSettings']='There is an error in the settings';
+$lang['CategoresNotDefined']='Missing Category definitions';
 $lang['ClassFromToError']='From and To must be numeric values';
 $lang['ClubNotFound']='Club Code not found in the existing clubs. Please update the database first!';
 $lang['ConflictingCategories']='Filter definition overlaps with previous filters for these categories: $a!';
+$lang['DecodeError']='Decode Error';
 $lang['DiameterMandatory']='Diameter of target face is mandatory';
 $lang['DirectoryNotWriteable']='The directory $a is not writeable by the web server. Please change its permissions to be writeable by anyone.';
 $lang['DistanceOutRange']='Distance is out of range';
@@ -15,6 +18,9 @@
 $lang['EmptyFrom']='Empty Email: this field is mandatory!';
 $lang['EmptySubject']='Empty Subject: this field is mandatory!';
 $lang['EmptyTitle']='Empty Title: this field is mandatory!';
+$lang['EndsArrowsMisMatch']='$a with wrong Ends/Arrows setting';
+$lang['EntriesNoCategory']='Entries without Category';
+$lang['EntriesNoCountry']='Entries without Country/Club';
 $lang['ErrCodeExists']='Code already exists!';
 $lang['ErrCommitteeError']='Invalid Committee code or description';
 $lang['ErrConnection']='No connection to server $a';
@@ -32,6 +38,7 @@
 $lang['ErrRedCard']='The committee undergone red card and cannot ask for competitions to be hosted on ianseo. Contact codes@ianseo.net for further explanations.';
 $lang['ErrUnknownNation']='Unknown Nation';
 $lang['ErrYellowCard']='The Committee undergone a Yellow Card because no competition results have been uploaded. Contact codes@ianseo.net for further explanations.';
+$lang['EventIncompleteSetting']='$a with missing allowed categories setting';
 $lang['FilterAlreadyExists']='This filter already exists';
 $lang['FilterNotEmpty']='You need to define a filter';
 $lang['IllegalTarget']='Selected target face is not in DB';
@@ -39,7 +46,9 @@
 $lang['ImageFetchError']='Error fetching Image';
 $lang['ImageSaveError']='Image not saved';
 $lang['IncompleteSettings']='Incomplete Settings';
+$lang['InvalidCharacters']='The field contains invalid characters. Valid characters are $a';
 $lang['InvalidEmail']='Invalid Email: please double check the email before saving';
+$lang['InvalidLogin']='Invalid Login';
 $lang['LockedProcedure']='This Procedure is LOCKED';
 $lang['MailingAlreadyExists']='An Email with the same title ({$a}) already exists, please change title or select the email to amend from the selector.';
 $lang['MailingDeleteText']='Please confirm you want to permanently delete this mailing';
@@ -51,23 +60,37 @@
 $lang['MissingAccreditation']='Missing online accreditation';
 $lang['MissingData']='Missing Data';
 $lang['MissingPhpIntlModule']='Translitteration can be done installing or activating the php-intl module';
+$lang['MissingZipExtension']='Install/Enable ZIP extension in PHP to have the possibility to download all the competition at once.';
+$lang['MysqlInnoDbProcess']='Ianseo will update the database for better performance. This might take some time.';
+$lang['MysqlUpdateNeeded']='You are using a very old Mysql Server. Please update your server, XAMP, WAMP or LAMP to a newer version or reinstall Ianseo from scratch.';
 $lang['NameNotEmpty']='Name can not be empty';
+$lang['NoCountryInsert']='No Country Insert';
+$lang['NoData']='No Data provided';
+$lang['NoDistancesSet']='Categories without distance setting';
 $lang['NoDNSRecord']='The Server Name is incorrect or not online: please note you must be connected to Internet to set this option.';
+$lang['NoEntryInsert']='No Entry Insert';
 $lang['NoMailingTemplate']='No Email Template selected/available!';
 $lang['NoMailRecipients']='Nobody to send the mailing to! Please review your filter options.';
 $lang['NoPrivilege']='Insufficient Privilege: you are not allowed to operate on this page';
 $lang['NoSameOrders']='The new Order value cannot be duplicate.';
 $lang['NoSmtpServerSet']='Please set the SMTP server before sending emails!';
+$lang['NoTargetSet']='Categories without target setting';
+$lang['PhpOutdated']='Your PHP version is outdated. Ianseo might work but some functionalities will need at least version {$a}.<br/>Please upgrade your installation as soon as possible to support PHP {$a} or newer.';
 $lang['RegExp']='To use RegExp (Regular Expressions), please refer to $a';
+$lang['ResetSyncData']='Reset Sync Data';
+$lang['ServiceNotAvailable']='Service Not Available';
 $lang['SetupNotFinished']='You cannot access this page: please first complete {$a}';
 $lang['SpecialFilterDiscrepancy']='A special filter has been set but is not active!';
 $lang['SqlJolly']='In a SQL statement a "%" acts as a jolly, a "_" replaces a single letter. 
 "R%M" for example will match "RM" as well as "RCM", "RMM" but not "RMC".
 "R_M" will match "RSM", "RJM" but not "RM".';
+$lang['SyncNotAvailable']='Sync not available';
 $lang['TargetNumberMismatch']='Target Number can only be of the form [TargetNumber][TargetLetter], as in 129C';
 $lang['TargetRangeMismatch']='Target Ranges must be 2 target numbers (no letters) separated by a dash (minus sign), the first being lower than the second, as in 23-44';
 $lang['TextSmtpDelete']='Please confirm you want to unset the SMTP settings on this installation of Ianseo';
 $lang['TooManyArrows']='Too many total arrows: the maximum is $a';
+$lang['TooManyDistancesMatch']='Categories with multiple distances setting';
 $lang['TooManyElimQualified']='Rounds of type $a[0] can only accept up to $a[1] archers';
+$lang['WrongData']='Wrong data provided';
 $lang['WrongPort']='This port is not supported!';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/en/Help.php b/src/Common/Languages/en/Help.php
index fa66e530..a0518aaf 100644
--- a/src/Common/Languages/en/Help.php
+++ b/src/Common/Languages/en/Help.php
@@ -1,4 +1,5 @@
 <?php
+$lang['AuthTourCode']='Comma separated list of tournaments codes that can be managed by the user.<br>Allowed wildchar: "%"';
 $lang['AutoCheckinAlreadyDone']='You are already checked in<br>If you need to change any information proceed to the accreditation desk';
 $lang['AutoCheckinConfirm']='If all the details are correct press CONFIRM CHECK-IN<br> 
 Otherwise press CANCEL and proceed to the accreditation desk';
@@ -19,6 +20,11 @@
 &#9654&nbsp;Score included in the total of team qualification round<br>
 &#9655&nbsp;Score not included in the total of team qualification round';
 $lang['CombiCompList']='List of Competitions Codes, comma separated';
+$lang['ExportAdvanced']='Also exports Entry and Country data to create if missing at the endpoint';
+$lang['ExportCategories']='Choose which categories/events to export (no selection means all)';
+$lang['ExportDistances']='Select which distance(s) to export (no selection means all distances)';
+$lang['ExportSchedule']='Select from the schedule which session to export';
+$lang['ExportScheduleToday']='Shows only the scheduled sessions for today';
 $lang['FlightsManagement']='<b>To flight categories</b>
 <ul>
 <li>Select on which Ends - Distances Total - Full Total calculate the flights;</li>
@@ -33,6 +39,11 @@
 <li>If a category is considered to be flighted, use \'-1\' as cut to explicitly exclude from flighting</li>
 <li>Professional and/or Championships as excluded from flighting and greyed out</li>
 </ul>';
+$lang['FontFamily']='Name of the font to use in the CSS';
+$lang['FontFile']='Location of the file on disk';
+$lang['FontName']='Actual name of the font';
+$lang['FontStyle']='Style of the font in CSS';
+$lang['FontWeight']='Weight of the font in CSS';
 $lang['GetBarcodeSeparator']='After printing the barcodes reference sheet, read the «SEPARATOR» barcode in order to activate the correct reader items.';
 $lang['HomePage']='This is the page where you can select or create a tournament.';
 $lang['ISK-LockedSessionHelp']='{$a} icons show if the app can score or not in that session.';
@@ -98,5 +109,7 @@
 <li>an advanced version that uses modern browsers HTML5 capabilities</li>
 </ul>
 <div>To create a new content, enter a name for it and press the button.</div>';
+$lang['UserName']='Must be unique in the system. Minimal length: 6 characters';
+$lang['UserPassword']='Leave blank to keep current password';
 $lang['ZeroBased']='Zero based number';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/en/IOC_Codes.php b/src/Common/Languages/en/IOC_Codes.php
index 2828155d..feb01dfc 100644
--- a/src/Common/Languages/en/IOC_Codes.php
+++ b/src/Common/Languages/en/IOC_Codes.php
@@ -12,8 +12,8 @@
 $lang['ASA']='American Samoa';
 $lang['AUS']='Australia';
 $lang['AUT']='Austria';
-$lang['Award-Anthem']='Ladies and Gentlemen, please stand for the National Anthem of';
-$lang['Award-Anthem-TPE']='Ladies and Gentlemen, please stand for the Anthem of';
+$lang['Award-Anthem']='Ladies and Gentlemen, for those who can, please stand for the National Anthem of';
+$lang['Award-Anthem-TPE']='Ladies and Gentlemen, for those who can, please stand for the Anthem of';
 $lang['Award-Applause']='Ladies and Gentlemen, please give a warm round of applause to our Athlete(s)';
 $lang['Award-Intro']='Ladies and Gentlemen the Victory Ceremony for the {$a}';
 $lang['Award-MedalGiver']='Medals will be presented by $a';
@@ -42,16 +42,16 @@
 $lang['BUL']='Bulgaria';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Central African Republic';
-$lang['CAM']='Cambodgia';
+$lang['CAM']='Cambodia';
 $lang['CAN']='Canada';
 $lang['CAY']='Caymand Islands';
 $lang['CGO']='Republic of Congo';
 $lang['CHA']='Chad';
 $lang['CHI']='Chile';
-$lang['CHN']='China';
-$lang['CIV']='Cote d\'Ivoire';
+$lang['CHN']='People\'s Republic of China';
+$lang['CIV']='Côte d\'Ivoire';
 $lang['CMR']='Cameroon';
-$lang['COD']='Democratic Republic of Congo';
+$lang['COD']='Democratic Republic of the Congo';
 $lang['COK']='Cook Islands';
 $lang['COL']='Colombia';
 $lang['COM']='Comoros';
@@ -59,8 +59,9 @@
 $lang['CRC']='Costa Rica';
 $lang['CRO']='Croatia';
 $lang['CUB']='Cuba';
+$lang['CUW']='Curacao';
 $lang['CYP']='Cyprus';
-$lang['CZE']='Czech Republic';
+$lang['CZE']='Czechia';
 $lang['DEN']='Denmark';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -74,7 +75,10 @@
 $lang['ETH']='Ethiopia';
 $lang['FIJ']='Fiji';
 $lang['FIN']='Finland';
+$lang['FLK']='Falkland Island';
+$lang['FPO']='Tahiti';
 $lang['FRA']='France';
+$lang['FRO']='Faroe Islands';
 $lang['FSM']='Micronesia';
 $lang['GAB']='Gabon';
 $lang['GAM']='Gambia';
@@ -84,6 +88,7 @@
 $lang['GEQ']='Equatorial Guinea';
 $lang['GER']='Germany';
 $lang['GHA']='Ghana';
+$lang['GLP']='Guadalupe';
 $lang['GRE']='Greece';
 $lang['GRN']='Grenada';
 $lang['GUA']='Guatemala';
@@ -91,17 +96,17 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
+$lang['HKG']='Hong Kong, China';
 $lang['HON']='Honduras';
 $lang['HUN']='Hungary';
 $lang['INA']='Indonesia';
 $lang['IND']='India';
-$lang['IRI']='Iran';
+$lang['IRI']='Islamic Republic of Iran';
 $lang['IRL']='Ireland';
 $lang['IRQ']='Iraq';
 $lang['ISL']='Iceland';
 $lang['ISR']='Israel';
-$lang['ISV']='United States Virgin Islands';
+$lang['ISV']='Virgin Islands, US';
 $lang['ITA']='Italy';
 $lang['IVB']='British Virgin Islands';
 $lang['JAM']='Jamaica';
@@ -112,11 +117,13 @@
 $lang['KGZ']='Kyrgyzstan';
 $lang['KIR']='Kiribati';
 $lang['KOR']='Republic of Korea';
+$lang['KOS']='Kosovo';
 $lang['KSA']='Saudi Arabia';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
+$lang['LAO']='Lao People\'s Democratic Republic';
 $lang['LAT']='Latvia';
 $lang['LBA']='Libya';
+$lang['LBN']='Lebanon';
 $lang['LBR']='Liberia';
 $lang['LCA']='Saint Lucia';
 $lang['LES']='Lesotho';
@@ -124,11 +131,12 @@
 $lang['LIE']='Liechtenstein';
 $lang['LTU']='Lithuania';
 $lang['LUX']='Luxembourg';
+$lang['MAC']='Macau, China';
 $lang['MAD']='Madagascar';
 $lang['MAR']='Morocco';
 $lang['MAS']='Malaysia';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldova';
+$lang['MDA']='Republic of Moldova';
 $lang['MDV']='Maldives';
 $lang['Medal-1']='Gold Medal';
 $lang['Medal-2']='Silver Medal';
@@ -137,7 +145,7 @@
 $lang['MEX']='Mexico';
 $lang['MGL']='Mongolia';
 $lang['MHL']='Marshall Islands';
-$lang['MKD']='North Macedonia';
+$lang['MKD']='Republic of North Macedonia';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -145,13 +153,18 @@
 $lang['MOZ']='Mozambique';
 $lang['MRI']='Mauritius';
 $lang['MTN']='Mauritania';
+$lang['MTQ']='Martinique';
 $lang['MYA']='Myanmar';
 $lang['NAM']='Namibia';
 $lang['NCA']='Nicaragua';
+$lang['NCL']='New Caledonia';
 $lang['NED']='Netherlands';
 $lang['NEP']='Nepal';
+$lang['NFK']='Norfolk Island';
 $lang['NGR']='Nigeria';
 $lang['NIG']='Niger';
+$lang['NIU']='Niue';
+$lang['NMI']='Northern Mariana Islands';
 $lang['NOR']='Norway';
 $lang['NRU']='Nauru';
 $lang['NZL']='New Zealand';
@@ -166,7 +179,7 @@
 $lang['PNG']='Papua New Guinea';
 $lang['POL']='Poland';
 $lang['POR']='Portugal';
-$lang['PRK']='North Korea';
+$lang['PRK']='Democratic People\'s Republic of Korea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Romania';
@@ -193,16 +206,17 @@
 $lang['SVK']='Slovakia';
 $lang['SWE']='Sweden';
 $lang['SWZ']='eSwatini';
-$lang['SYR']='Syria';
+$lang['SYR']='Syrian Arab Republic';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailand';
 $lang['TJK']='Tajikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='East Timor';
+$lang['TLS']='Timor Leste';
 $lang['TOG']='Togo';
 $lang['TPE']='Chinese Taipei';
 $lang['TRI']='Trinidad and Tobago';
+$lang['TTO']='Trinidad and Tobago';
 $lang['TUN']='Tunisia';
 $lang['TUR']='Türkiye';
 $lang['TUV']='Tuvalu';
diff --git a/src/Common/Languages/en/Install.php b/src/Common/Languages/en/Install.php
index 26eea0ed..c0ab1ffb 100644
--- a/src/Common/Languages/en/Install.php
+++ b/src/Common/Languages/en/Install.php
@@ -35,6 +35,7 @@
 $lang['Email']='Email';
 $lang['Email not in DB']='The e-mail is not in our DB';
 $lang['EventWillBeReset']='WARNING: a change in "$a[0]", "$a[1]" or "$a[2]" will reset all tournament parameters to the default specified by the rules and tournament type selected.';
+$lang['ExportAllComps']='Export All Competitions';
 $lang['Failed']='FAILED!';
 $lang['Failing install']='Please update your PHP installation before running IANSEO again.';
 $lang['Field24Normal']='Field 24 targets';
@@ -87,7 +88,7 @@
 $lang['Parameter']='Parameter';
 $lang['Password']='Password';
 $lang['PHP settings']='PHP settings';
-$lang['PHP too old']='Your PHP installation is too old. The minimum version number for IANSEO is 5.0.';
+$lang['PHP too old']='Your PHP installation is too old. The minimum PHP version number for IANSEO is 8.0.';
 $lang['PHP version']='PHP version';
 $lang['php.ini file']='php.ini file';
 $lang['Prepare']='Preparing data for the update';
@@ -251,7 +252,7 @@
 $lang['Value']='Value';
 $lang['WhatIanseoDoes01']='<b>World Archery Rules compliant:</b> Ianseo is always up to date with World Archery rules. Developers are available for customizations to fit National and Competition Specific Rules too!';
 $lang['WhatIanseoDoes02']='<b>Help and support:</b> if you need some help, send an email to $a: you will get an answer directly from the core developers of Ianseo!';
-$lang['WhatIanseoDoes03']='<b>On site training and courses:</b> Ianseo is available to manage specific on location courses. Two levels: without and with the electronic devices. The first is aimed to know all aspects of ianseo from competition preparation and schedule up to online publication and local distribution of results. The second is aimed on acquiring all the specific knowledge to run an "arrow by arrow" competition.';
+$lang['WhatIanseoDoes03']='<b>On site training and courses:</b> Ianseo is available to manage specific on location courses. Two levels: without and with Ianseo Scorekeeper NG app. The first is aimed to know all aspects of ianseo from competition preparation and schedule up to online publication and local distribution of results. The second is aimed on acquiring all the specific knowledge to run an "arrow by arrow" competition.';
 $lang['WhatIanseoDoes04']='<b>Donate!</b> Ianseo is free and open source... if you like it please help us keeping software and server up to date: press the "Donate" button on the home page of $a!';
 $lang['WhatIanseoDoes05']='<b>Social Media:</b> Ianseo is also on $a!';
 $lang['WhatIanseoDoesTitle']='What can Ianseo do for your competition';
diff --git a/src/Common/Languages/en/ODF.php b/src/Common/Languages/en/ODF.php
index 961ffa94..da963d1a 100644
--- a/src/Common/Languages/en/ODF.php
+++ b/src/Common/Languages/en/ODF.php
@@ -54,8 +54,10 @@
 $lang['OdfCommonCodeVersion']='Common Code Version';
 $lang['OdfCompetition']='ODF Competition Code';
 $lang['OdfEventCode']='ODF Event Code';
+$lang['OdfGeneralCodeVersion']='General Data Dictionary Version';
 $lang['OdfReceiverOn']='Receiver Active';
 $lang['OdfReceiverSetup']='ODF Receiver Setup';
+$lang['OdfSportCodeVersion']='Sport Data Dictionary Version';
 $lang['OdfUploadFileText']='Please select an XML file to upload...';
 $lang['Production']='Production';
 $lang['Receiver']='Receiver';
@@ -88,6 +90,7 @@
 $lang['TMMeeting']='Team Manager\'s Meeting';
 $lang['Transmitter']='Transmitter';
 $lang['TypCODE']='Document Code suffix';
+$lang['TypDISCIPLINE']='Discipline (ref Sports CC@Discipline)';
 $lang['TypEVENT']='Event Description';
 $lang['TypNAME']='Description';
 $lang['TypPHASE']='Phase Description';
diff --git a/src/Common/Languages/en/Tournament.php b/src/Common/Languages/en/Tournament.php
index 5a491ca8..b84e908e 100644
--- a/src/Common/Languages/en/Tournament.php
+++ b/src/Common/Languages/en/Tournament.php
@@ -29,13 +29,13 @@
 $lang['ACLNoAccess']='No Access';
 $lang['AclNotes']='<b>Notes about Network Security</b>
 <ul>
-<li>restriction are "competition based" and not "server based"</li>
+<li>These restriction are "competition based" and not "server based"</li>
 <li>localhost (127.0.0.1 or ::1) cannot be restricted</li>
 <li>Policies can be disabled calling from the server itself <b>{$a}</b>
-</ul><ul>
+</li></ul><ul>
 <li>When policies are enabled, default behavior for not-listed clients is "No Access"</li>
-<li>It is possible to add * as last group of the IP Address (192.168.0.* or 172.16.*) to add a default group, limited to read only policies</li>
-<li>IP in the range 0.0.0.[1-254] will not be considered real IPs and the system will use the description content as RegExp to match the IP address. RegExps will be evaluated in the order they are shown and allows R/W policies</li>
+<li>It is possible to add * as last group of the IP Address (192.168.0.* or 172.16.*) to add a default group</li>
+<li>It is possible to use RegExp to match the IP address. RegExps will be evaluated in the order they are shown and allows R/W policies</li>
 </ul>';
 $lang['AclOdf']='ODF Management';
 $lang['AclOutput']='Outputs';
@@ -61,6 +61,7 @@
 $lang['AllDistances']='All';
 $lang['AllEntries']='All Entries';
 $lang['AllEvents']='All Events';
+$lang['AllowCompetitionACL']='Allow Competition Network Access Policies';
 $lang['AllRound']='All Rounds';
 $lang['AllSessions']='All Sessions';
 $lang['AllsF']='All';
@@ -107,6 +108,7 @@
 $lang['AuthCodeA2A']='Arrow by Arrow Authorization Code';
 $lang['AutoCoinToss']='Automatic Coin Toss  Assignments';
 $lang['AutoEdits']='Auto Edit';
+$lang['AutomatorAccPrint']='Accreditation Print Settings';
 $lang['AutoMoveNext']='Auto Move to Next Arrow';
 $lang['AutoRefresh']='Auto Refresh';
 $lang['AutoTargetAssignment']='Automatic Target Assignment - Draw';
@@ -127,6 +129,7 @@
 $lang['AwardSecondLanguage']='Second Language';
 $lang['AwardShowPoints']='Show Points';
 $lang['BackBarCodeCheck']='Back to Barcode Checkup';
+$lang['BackFromHome']='Un-forfeit';
 $lang['BadEntries']='Entries NOT imported';
 $lang['Badge1PerPage']='1 Badge per page';
 $lang['Badge2PerPage']='2 Badges per page';
@@ -137,7 +140,7 @@
 $lang['BadgeIncludePhoto']='Include Photos in Badge?';
 $lang['BadgeNames']='Full Name (Not printed first)';
 $lang['BadgeNoData']='No data to print';
-$lang['BadgeOnlyNotPrinted']='ONLY Badges not already printed?';
+$lang['BadgeOnlyNotPrinted']='Only NOT Printed';
 $lang['BadgeOnlyPrintAccredited']='ONLY Badges of accredited participants?';
 $lang['BadgeOnlyPrintPhoto']='ONLY Badges with Photo?';
 $lang['BadgeOptions']='Options';
@@ -168,6 +171,9 @@
 $lang['Block_IP']='Access IP (v4)';
 $lang['Block_Manage']='Network Access Policies';
 $lang['Block_Nick']='Access Nickname';
+$lang['Block_TemplateIP']='IP Templates';
+$lang['Block_TemplateName']='Description';
+$lang['Block_TemplatePattern']='Pattern';
 $lang['BoldIsDefault']='Bold is default';
 $lang['Bonus']='Bonus';
 $lang['ByeMovedToPhase']='Athlete moved to next Phase';
@@ -211,12 +217,13 @@
 $lang['CannotDelete']='This item can not be deleted';
 $lang['Cash']='Total Bill';
 $lang['CatDos']='Director of Shooting';
+$lang['CategoriesEvents']='Categories/Events';
 $lang['CatJudge']='Judges';
 $lang['CatJury']='Jury of Appeal';
 $lang['CatOC']='Organizing Committee';
-$lang['ChairmanJudge']='Chairman of Judges';
-$lang['ChairmanJudgeDeputy']='Deputy Chairman of Judges';
-$lang['ChairmanJury']='Chairman of the Jury of Appeal';
+$lang['ChairmanJudge']='Chairperson of Judges';
+$lang['ChairmanJudgeDeputy']='Deputy Chairperson of Judges';
+$lang['ChairmanJury']='Chairperson of the Jury of Appeal';
 $lang['ChangeLookUpTable']='Change Lookup Table';
 $lang['ChangeNationsNames']='Change Nations Names';
 $lang['Channel']='Channel';
@@ -228,6 +235,7 @@
 $lang['CheckXNinesInMatch']='Check XNine in Ties';
 $lang['Classes']='Classes';
 $lang['ClearField']='Empty Competition Field';
+$lang['ClickMovesPosition']='Update Arrow Positions Only';
 $lang['ClickToMailRequest']='Click to open a prefilled email';
 $lang['ClickToRequestCode']='Click to request Code';
 $lang['Clone']='Clone';
@@ -296,6 +304,7 @@
 $lang['CtrlCodeShort']='Ctrl. Code';
 $lang['Currency']='€';
 $lang['CurrentCompCode']='Current Competition Code: $a';
+$lang['CustomAclDetails']='Custom ACL Details';
 $lang['D1AllInOne']='All Matches in a single Competition';
 $lang['DailySchedule']='Daily Schedule';
 $lang['DATABASE NOT REACHABLE']='ONLINE DATABASE NOT REACHABLE';
@@ -310,6 +319,8 @@
 $lang['DefaultLocRule']='FITA';
 $lang['DefaultVI']='Default VI';
 $lang['Delayed']='Delayed (-1 to reset)';
+$lang['DeleteAclRule']='Delete ACL rule';
+$lang['DeleteAclUser']='Delete ACL user';
 $lang['DeleteAwarded']='Delete Awarded';
 $lang['DeleteChannel']='Remove Channel. This will remove all splits from the channel and the channel itself.';
 $lang['DeletePreviousArchers']='Delete existing entries that are not in the list';
@@ -376,7 +387,7 @@
 $lang['EmailScorecardShort']='Scorecard summary';
 $lang['EmailsToSend']='Emails to send';
 $lang['EmailSuccessfull']='Email has been sent successfully to $a';
-$lang['EnableAccess']='Enable/Disable Policies';
+$lang['EnableAccess']='Enable/Disable Access Policies';
 $lang['EnableAddOns']='Enable/Disable Add-Ons';
 $lang['Ends']='Ends';
 $lang['EndsOffset']='Ends Offset';
@@ -410,6 +421,7 @@
 $lang['EvNameTranslated']='Translated Event';
 $lang['Export2Fitarco']='Export as EXP file';
 $lang['ExportAndSend']='Export Data & Send';
+$lang['ExportEndpoint']='Endpoint URL (I@nseo base url)';
 $lang['ExportEntries']='Export Entries';
 $lang['ExportICS']='Export iCal file (.ics)';
 $lang['ExportInstructions']='In order to export data and send them automatically, you need to complete the following form.';
@@ -487,6 +499,13 @@
 $lang['FlightsTotals']='Totals';
 $lang['FlightsUpdateSetup']='Update Setup';
 $lang['FollowHHT']='Show HHT enabled schedule';
+$lang['FontFamily']='CSS Font Family';
+$lang['FontFile']='Font File';
+$lang['FontName']='Font Name';
+$lang['FontSample']='Font Sample';
+$lang['FontStyle']='CSS Font Style';
+$lang['FontWarning']='Only supports TTF fonts';
+$lang['FontWeight']='CSS Font Weight';
 $lang['FOP-ODS']='Field of Play (ODS)';
 $lang['ForceAccreditation']='Force accreditation';
 $lang['ForceOldPhotos']='Include Old Pictures';
@@ -531,12 +550,12 @@
 $lang['ImportedTour']='Tournament imported';
 $lang['ImportNames']='Import Names';
 $lang['IncompatibleVersions']='Could not import tournament as it is more recent than Ianseo.<br/>Upgrade Ianseo to the latest release from $a.';
-$lang['IndClEvent']='Ind. Qual.';
+$lang['IndClEvent']='Ind. Div./Class';
 $lang['IndFin']='Individual - Elim. & Final Round';
-$lang['IndFinEvent']='Ind. Final';
+$lang['IndFinEvent']='Ind. Events';
 $lang['IndividualLoaded']='Individual Matches Loaded for schedule {$a}';
 $lang['IndoorTourCategory']='Indoor Tournament';
-$lang['IndQual']='Individual - Qual. Round';
+$lang['IndQual']='Individual - Division/Class';
 $lang['InitEliminations']='Initialize Eliminations';
 $lang['InitProcess']='Initializing';
 $lang['InnerTens']='Inner Tens (X)';
@@ -591,6 +610,7 @@
 $lang['LocRuleDefaultNo']='Default';
 $lang['LocRuleModifiedNo']='Modified';
 $lang['LocRuleValidNo']='Not Modified';
+$lang['Login']='Login';
 $lang['LogisticResp']='Logistics Manager';
 $lang['LogMessage']='Log Message';
 $lang['LogoB']='Bottom Image (full width ratio is 19:1 for A4, 20:1 for letter)';
@@ -645,6 +665,7 @@
 $lang['ManageByes']='Manage Byes';
 $lang['ManAthStatus']='Athletes Status Management';
 $lang['ManColors']='Manage Colors';
+$lang['MandatoryLoginACL']='Force Login request for not registered IP Address';
 $lang['ManDistances']='Manage distances';
 $lang['ManDivClass']='Manage Divisions/Classes';
 $lang['ManMatchArr4Phase']='Manage Phase\'s Arrows per Set';
@@ -692,7 +713,7 @@
 $lang['MissingAgileConfig']='Missing Agile Configuration';
 $lang['MissingPhoto']='Missing Photo';
 $lang['MissingScorecards']='Missing scorecards of $a->session, distance $a->distance';
-$lang['MixedTeamFinEvent']='Mixed Team Final';
+$lang['MixedTeamFinEvent']='Mixed Team Events';
 $lang['MoveWinner2NextPhase']='Move Winner to next phase';
 $lang['MoveWinner2PoolA']='Move Winner against winner of Pool A';
 $lang['MoveWinner2PoolB']='Move Winner against winner of Pool B';
@@ -795,9 +816,11 @@
 $lang['OrisStatsIndividual']='Statistics (C85A)';
 $lang['OrisStatsTeam']='Statistics (C85B+C)';
 $lang['OrisTeamList']='Oris Team List';
+$lang['OtherCountriesCoachingToo']='Include Entries from other countries in Coaches selection';
 $lang['OtherTourCategory']='Other';
 $lang['OutdoorTourCategory']='Outdoor Tournament';
 $lang['OverwritePreviousArchers']='Overwrite Previous Archers';
+$lang['OvrBioAchievements']='Athletes Achievements';
 $lang['OvrMatchesMessages']='OVR Matches Signals';
 $lang['OvrRefresh']='Refresh Page (no send)';
 $lang['OvrSendSerial']='Send to OVR (Serial)';
@@ -970,6 +993,7 @@
 $lang['RunningEvents']='Running Events Setup';
 $lang['RunningTotal']='Running Total';
 $lang['RunNumber']='Run $a';
+$lang['SaveSelectionAsFile']='Save Selection as File';
 $lang['SB-Record']='Seasonal Best';
 $lang['ScanAthleteFirst']='Scan Athlete First';
 $lang['SchAddRank']='Add Qual. Rank';
@@ -1201,7 +1225,7 @@
 $lang['TargetShort']='T#';
 $lang['TargetsToHHt']='Send Target assignment instead of Names';
 $lang['TargetTo']='Ending Target';
-$lang['TeamClEvent']='Team Qual.';
+$lang['TeamClEvent']='Team Div./Class';
 $lang['TeamComponentForm']='Team Component Form';
 $lang['TeamComponentsLog']='Team Line-up Changes';
 $lang['TeamComponentsNext']='Revised Line-up';
@@ -1213,12 +1237,12 @@
 $lang['TeamCreationMode_2']='Always 2nd Team';
 $lang['TeamCreationMode_3']='Always 3rd Team';
 $lang['TeamFin']='Team - Elim. & Final Round';
-$lang['TeamFinEvent']='Team Final';
+$lang['TeamFinEvent']='Team Events';
 $lang['TeamLoaded']='Team Matches Loaded for schedule {$a}';
 $lang['TeamManagerSignature']='Team Manager Signature';
 $lang['TeamPlace']='Team place signs';
 $lang['TeamPlaceLocal']='Team place signs (localised)';
-$lang['TeamQual']='Team - Qual. Round';
+$lang['TeamQual']='Team - Division/Class';
 $lang['TeamShootingOrder']='Team Component Shooting Order';
 $lang['TecDelegate']='Technical Delegate';
 $lang['Text']='Text';
@@ -1343,6 +1367,7 @@
 $lang['TVCss3RankNone']='Rank None';
 $lang['TVCss3RankOld']='Rank old';
 $lang['TVCss3RankUp']='Rank Up';
+$lang['TVCss3Schedule']='Schedule';
 $lang['TVCss3Score']='Score';
 $lang['TVCss3Session']='Session';
 $lang['TVCss3SpecificSettings']='This page specific settings. Use the CSS3 syntax for the element';
@@ -1438,6 +1463,7 @@
 $lang['TVViewNationNameDescr']='Toggles the display of the athlete\'s Nation/Club';
 $lang['TVViewPartials']='View Distances\' Scores';
 $lang['TVViewPartialsDescr']='Toggles the display of the scores of all distances';
+$lang['TvViewSCHED']='Show Schedule';
 $lang['TvViewTEAM']='View Team Column';
 $lang['TvViewTIT2ROWS']='Title on 2 rows';
 $lang['TvViewTOT']='View Grand Total';
@@ -1510,7 +1536,9 @@
 $lang['UserDetails']='User Details';
 $lang['UserEnabled']='Enabled';
 $lang['UserName']='Username';
-$lang['UserPassword']='Password';
+$lang['UserPassword']='New Password';
+$lang['UserPasswordOld']='Old Password';
+$lang['UserPasswordRetype']='Re-Type New Password';
 $lang['UseSubClasses']='Apply to specific subclasses';
 $lang['ValidClass']='Assignable Classes';
 $lang['ValidDivisions']='Alllowed Div. (empty for all)';
@@ -1536,6 +1564,7 @@
 $lang['WarmUpMins']='Warm Up (min.)';
 $lang['WarmupTargets']='Warm Up targets';
 $lang['Warning']='Warning!';
+$lang['Went2Home']='Forfeit';
 $lang['WheelChair']='Wheel Chair';
 $lang['WheelchairShort']='W';
 $lang['Wikipedia']='Wikipedia';
diff --git a/src/Common/Languages/es-ar/Api.php b/src/Common/Languages/es-ar/Api.php
index b2010ff9..b7ce0b5d 100644
--- a/src/Common/Languages/es-ar/Api.php
+++ b/src/Common/Languages/es-ar/Api.php
@@ -3,30 +3,53 @@
 $lang['API-Group']='Grupo';
 $lang['API-TargetGrouping']='Agrupación de Contenciones';
 $lang['API-Targets']='Contenciones';
+$lang['AskSignature-0']='No';
+$lang['AskSignature-1']='Escanear ID Arquero';
 $lang['CmdDelete']='Eliminar';
 $lang['CmdImport']='Importar';
+$lang['Controller']='Controlador';
+$lang['DataRefresh']='Refrescar Datos';
+$lang['Desc-Let-4']='Puntuación en proceso';
 $lang['Desc-Let-G']='Lugar vacío';
-$lang['Desc-Let-Y']='Tanda lista para importar';
+$lang['Desc-Let-Y']='Ronda lista para importar';
 $lang['Desc-Let-Z']='Puntuación en progreso';
+$lang['DevConnected']='Conectado';
+$lang['DevDisconnected']='Desconectado';
+$lang['DistanceNum']='distancia $a';
+$lang['FieldMonitor']='Monitor de Campo';
+$lang['FlashCodeDistance']='Escanear éste código con la App para puntuar la serie $a';
 $lang['ISK-Anomalies']='Anomalias';
+$lang['ISK-AppInfo']='Información de la Aplicación';
+$lang['ISK-AppQrCode']='Imprimir Códigos QR para Instalación';
 $lang['ISK-ApproveConfig']='Aprobar configuración';
 $lang['ISK-AuthRequest']='Solicitud de Autorización';
 $lang['ISK-BadCompCode']='Código de Competencia Incorrecto';
 $lang['ISK-CheckAlive']='Verifique Dispositivo';
 $lang['ISK-checkCompeting']='Solo Arqueros en Competencia';
 $lang['ISK-checkGate']='Comprobar Flujo (Entrada/Salida)';
+$lang['ISK-ConnectionStatus']='Estado de la Conexión';
+$lang['ISK-DeleteDevices']='Eliminar Dispositivos';
 $lang['ISK-DenyAccess']='Acceso Denegado';
+$lang['ISK-Deprecated']='IMPORTANTE: la aplicación "Ianseo Score Keeper" se eliminará gradualmente de las tiendas de Android y Apple y ya no es compatible, por lo que se eliminará de Ianseo en septiembre de 2024. Cambie a la nueva aplicación "Ianseo Score Keeper NG".';
+$lang['ISK-DeviceAlive']='En línea';
 $lang['ISK-DeviceBattery']='Batería';
+$lang['ISK-DeviceEnabled']='Hablitado';
 $lang['ISK-DeviceId']='ID Dispositivo';
 $lang['ISK-DeviceIpAddress']='Dirección IP';
 $lang['ISK-DeviceLastSeen']='Ultimo Visto';
 $lang['ISK-DeviceStatus']='Estado';
+$lang['ISK-DeviceStatusWanted']='Forzar nuevo Estado';
+$lang['ISK-DeviceUsed']='En uso';
 $lang['ISK-enableGPS']='Enviar Ubicación Dispositivo';
 $lang['ISK-EnableScore']='Habilitar Ianseo ScoreKeeper';
 $lang['ISK-enableTotals']='Habilitar Vista Total en Dispositivos';
+$lang['ISK-enableWIFIManagement']='Autorizar ISK para gestionar dispositivo Wi-Fi';
+$lang['ISK-ExportDevices']='Exportar Dispositivos';
 $lang['ISK-ForceConfirm']='Forzar confirmación dispositivo';
 $lang['ISK-Gps']='Ubicación GPS';
 $lang['ISK-gpsFrequency']='Frecuencia Actualización';
+$lang['ISK-hideTotals']='Ocultar totales';
+$lang['ISK-ImportDevices']='Importar Dispositivos';
 $lang['ISK-LicenseEmail']='Email registrado ISK Pro';
 $lang['ISK-LicenseNumber']='Número de Licencia ISK Pro';
 $lang['ISK-Lite-Name']='Ianseo ScoreKeeper Lite';
@@ -35,6 +58,10 @@
 $lang['ISK-Lite-ServerUrl']='URL Servidor (incluyendo protocolo y puerto si no es 80)';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper LIVE';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
+$lang['ISK-Ng-Name']='Ianseo ScoreKeeper NG';
+$lang['ISK-NG-QRCode']='Imprimir Código QR para Ianseo ScoreKeeper NG';
+$lang['ISK-NgLive-Name']='Ianseo ScoreKeeper NG - Opciones LIVE';
+$lang['ISK-NgPro-Name']='Ianseo Scorekeeper NG - Opciones PRO';
 $lang['ISK-NoCompCode']='Falta Código de Competencia';
 $lang['ISK-onlyAccreditated']='Acreditación Validada';
 $lang['ISK-OnlyProAloud']='Solo aplicaciones Pro están permitidas en esta competencia!';
@@ -44,9 +71,15 @@
 $lang['ISK-ReloadConfig']='Recargar configuración';
 $lang['ISK-Remove']='Eliminar';
 $lang['ISK-RequiresApproval']='Requiere aprobación';
+$lang['ISK-RunInBackground']='Correr en Segundo plano';
 $lang['ISK-SendQrSetup']='Enviar Código QR de Configuración';
 $lang['ISK-ServerUrl']='URL Servidor (incluyendo protocolo y puerto si no es 80)';
+$lang['ISK-ServerUrlPin']='PIN de Seguridad de la Competencia';
 $lang['ISK-SetQRData']='Configurar Dispositivo usando Código QR';
+$lang['ISK-SettingsPIN']='Configurar PIN';
+$lang['ISK-SETUP-11']='Configuración ISK-NG Lite';
+$lang['ISK-SETUP-12']='Configuración ISK-NG Pro';
+$lang['ISK-SETUP-13']='Configuración ISK-NG Live';
 $lang['ISK-showPictures']='Mostrar Imágenes';
 $lang['ISK-SocketAction']='Acción';
 $lang['ISK-SocketIP']='Web Socket IP (para Dispositivos)';
@@ -54,7 +87,10 @@
 $lang['ISK-SocketPort']='Puerto Web Socket';
 $lang['ISK-StatusNoShoot']='Dispositivo no puede puntuar';
 $lang['ISK-StatusOK']='Configuración del dispositivo OK';
+$lang['ISK-StatusReloading']='Cargando configuración';
 $lang['ISK-StatusWaitConfirm']='Esperando confirmación del dispositivo';
+$lang['ISK-UsePersonalDevices']='Usar Dispositivos Personales';
+$lang['ISK-VibrateUpdate']='Vibrar al Actualizar';
 $lang['ISK-WiFi']='Preferencias WiFi';
 $lang['ISK-WifiDELETE']='Eliminar otro Wi-Fi del dispositivo de puntuación';
 $lang['ISK-WifiPWD']='Contraseña Wi-Fi (Solo WPA. WEP no soportado)';
@@ -63,20 +99,32 @@
 $lang['ISK-WifiSwitchLvl']='Nivel Switch WiFi (dBm)';
 $lang['ISK-WifiTargetRange']='Wifi Preferido para contención';
 $lang['IskDeviceAssigned']='Dispositivo(s)';
+$lang['IskScoringDevice']='Dispositivo $a no está autorizado para puntuar en éste turno/competencia!';
 $lang['IskSpuriousScore-Device']='Dispositivo $a[0] enviando puntajes de la contención $a[1] de la fase $a[2]';
 $lang['IskSpuriousScore-Distance']='Dispositivo $a[0] está puntuando en ronda $a[1]';
-$lang['IskSpuriousScore-End']='Dispositivo $a[0] está puntuando en tanda $a[1]';
+$lang['IskSpuriousScore-End']='Dispositivo $a[0] está puntuando en ronda $a[1]';
 $lang['IskTargetTitle']='Contención $a';
+$lang['IskUnknownDevice']='Dispositivo desconocido en contención $a';
+$lang['LockAll']='Bloquear todos los Turnos';
 $lang['Masters']='Maestros';
+$lang['PartialImportAll']='Importar TODO';
 $lang['PopupStatusDistance']='Ronda: $a';
-$lang['PopupStatusEnd']='Tanda: $a';
+$lang['PopupStatusEnd']='Ronda: $a';
 $lang['PopupStatusEvent']='Prueba: $a';
 $lang['PopupStatusPhase']='Fase: $a';
 $lang['PopupStatusSession']='Turno: $a';
+$lang['Preparing']='Preparando Archivo...';
+$lang['QrCodeWidth']='Ancho Código QR';
 $lang['RasIpAddress']='Dirección IP';
 $lang['RasLastSeen']='Ultima conexión';
 $lang['RaspControl']='Control Raspberry';
 $lang['RaspDevice']='Dispositivo';
+$lang['RecalcManually']='Manualmente';
+$lang['ScorerNum']='Planillero $a';
+$lang['ScoringCount']='Puntuando #';
+$lang['UnlockAll']='Desbloquear todos los Turnos';
+$lang['UsePersonalDevices-Granted']='Personal';
 $lang['WAToolbox-MissingParams']='Parámetro Faltante';
 $lang['WAToolbox-NoCompCode']='Falta Código de Competencia';
+$lang['XToWin']='$a para ganar';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/BackNumbers.php b/src/Common/Languages/es-ar/BackNumbers.php
index 297ba179..384ab26a 100644
--- a/src/Common/Languages/es-ar/BackNumbers.php
+++ b/src/Common/Languages/es-ar/BackNumbers.php
@@ -17,9 +17,12 @@
 $lang['AthQrCode']='Código Arquero (Código QR)';
 $lang['AutoCheckin']='Registro Automático';
 $lang['AutoCHK-Camera']='Usar Cámara para leer Códigos QR';
+$lang['AutoCHK-CanEdit']='Editar Entradas';
 $lang['AutoCHK-Code']='Código Competencia';
 $lang['AutoCHK-Confirm']='Confirmar Registro';
 $lang['AutoCHK-IP']='IPs de los Dispositivos de Registro Automático (uno por línea)';
+$lang['AutoCHK-IPinfo']='Puntos de Información';
+$lang['AutoCHK-IPnoMgm']='Locales de Autoservicio';
 $lang['AutoCHK-Names']='Verificar también Nombre/Apellido';
 $lang['AutoCHK-nobody']='Nadie con éste Código se encuentra en la Base de Datos...POR FAVOR, DIRIJASE AL ESCRITORIO';
 $lang['AutoCHK-Print']='Imprimir acreditaciones automáticamente';
@@ -51,6 +54,7 @@
 $lang['Bold']='Negrita';
 $lang['Category']='Categoría';
 $lang['CharColor']='Color Letra';
+$lang['CharSize']='Tamaño Letra <br>(- Factor Espaciado)';
 $lang['CharType']='Tipo de Letra';
 $lang['CheckBarcodeSeparator']='Verificar Separador Código de Barras';
 $lang['Club']='Detalle del País/Club';
@@ -80,17 +84,26 @@
 $lang['FamCaps']='APELLIDO';
 $lang['FamCaps-GAlone']='APELLIDO N.';
 $lang['FamCaps-GivCamel']='APELLIDO Nombre';
+$lang['FamCaps-GivCamel-ClubCamel']='APELLIDO Nombre, País';
+$lang['FamCaps-GivCamel-ClubCaps']='APELLIDO Nombre, PAIS';
 $lang['FamCaps-GivCaps']='APELLIDO NOMBRE';
+$lang['FamCaps-GivCaps-ClubCaps']='APELLIDO NOMBRE, PAIS';
+$lang['FinPosition']='Posición Final';
 $lang['Flag']='Bandera País/Club';
 $lang['GAlone-FamCamel']='N. Apellido';
 $lang['GAlone-FamCaps']='N. APELLIDO';
 $lang['GivCamel']='Nombre';
 $lang['GivCamel-FamCamel']='Nombre Apellido';
+$lang['GivCamel-FamCamel-ClubCamel']='Nombre Apellido, País';
 $lang['GivCamel-FamCaps']='Nombre APELLIDO';
+$lang['GivCamel-FamCaps-ClubCamel']='Nombre APELLIDO, País';
+$lang['GivCamel-FamCaps-ClubCaps']='Nombre APELLIDO, PAIS';
 $lang['GivCaps']='NOMBRE';
 $lang['GivCaps-FamCaps']='NOMBRE APELLIDO';
+$lang['GivCaps-FamCaps-ClubCaps']='NOMBRE APELLIDO, PAIS';
 $lang['GivenNameInitial']='1er Letra del Nombre';
 $lang['Heigh']='Altura';
+$lang['HLayout']='Horizontal';
 $lang['HLine']='Línea Horizontal';
 $lang['I-Badge']='Dorsal para Final Individual';
 $lang['IdCardHor']='de ancho';
@@ -118,14 +131,19 @@
 $lang['Offest2nd']='Segundo Dorsal en espejo (si es necesario)';
 $lang['OneLine']='En Línea';
 $lang['OnlyAthletes']='Solo Arqueros';
+$lang['OpenPictureScreen']='Abrir Pantalla Secundaria';
 $lang['PageDimension']='Tamaño de Página';
 $lang['PaperDimention']='Tamaño de Hoja';
+$lang['PhaseFrom']='Desde Etapa';
+$lang['PhaseTo']='A Etapa';
 $lang['Picture']='Foto Arquero';
 $lang['Portrait']='Retrato';
 $lang['PosX']='Posición (X)';
 $lang['PosY']='Posición (Y)';
 $lang['PrintSpecificBadges']='Imprimir el Diseño Seleccionado';
 $lang['Q-Badge']='Dorsal Para Clasificación';
+$lang['QRScore']='Puntaje Ronda Clasificatoria';
+$lang['QualPosition']='Posición Clasificatoria';
 $lang['RandomImage']='Imagen Aleatoria';
 $lang['Ranking']='Posiciones Clasificación';
 $lang['ReadSeparator']='Leer Separador';
@@ -143,5 +161,8 @@
 $lang['ToRight']='Logo Competencia (Derecha)';
 $lang['TVViewIdCard']='Ver Acreditaciones';
 $lang['TVViewIdCardDescr']='En modo vista de encuentros proporciona la identificación de los 2 oponentes en lugar de las filas "estandar"';
+$lang['VLayout']='Vertical';
 $lang['Width']='Ancho';
+$lang['Y-Badge']='Diploma (Individual)';
+$lang['Z-Badge']='Diploma (Equipo)';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/Boinx.php b/src/Common/Languages/es-ar/Boinx.php
index 3287db58..18d04c41 100644
--- a/src/Common/Languages/es-ar/Boinx.php
+++ b/src/Common/Languages/es-ar/Boinx.php
@@ -1,4 +1,20 @@
 <?php
+$lang['Activate']='Activar';
+$lang['CssArrowCommon']='Flechas';
+$lang['CssLeftPresentation']='Panel de Presentación - Izquierda';
+$lang['CssLeftPresentationCountry']='Línea Presentación País - Izquierda';
+$lang['CssLeftPresentationNames']='Presentación de Nombres - Izquierda';
+$lang['CssReminder']='No olvide guardar los cambios!';
+$lang['CssRightPresentation']='Panel de Presentación - Derecha';
+$lang['CssRightPresentationNames']='Presentación de Nombres - Derecha';
+$lang['CssVegasFreeTextRow']='Fila';
+$lang['CssVegasFreeTextText']='Texto';
+$lang['CssVegasFreeTextTitle']='Título';
+$lang['CssVegasInOutName']='Nombre';
+$lang['CssVegasInOutRow']='Fila';
+$lang['CssVegasSOName']='Nombre';
+$lang['CssVegasSORow']='Fila';
+$lang['CssVegasSOTarget']='Contención';
 $lang['DirNotWriteable']='El directorio no tiene permisos de escritura!';
 $lang['Download']='Descargar';
 $lang['HowToUse']='Como integrar Ianseo y Boinx';
diff --git a/src/Common/Languages/es-ar/Common.php b/src/Common/Languages/es-ar/Common.php
index 36fb3773..1b5997d0 100644
--- a/src/Common/Languages/es-ar/Common.php
+++ b/src/Common/Languages/es-ar/Common.php
@@ -11,16 +11,20 @@
 $lang['32_Phase']='1/32';
 $lang['48_Phase']='1/48';
 $lang['4_Phase']='1/4';
+$lang['50M']='Hombres +50';
+$lang['50W']='+50 Femenino';
 $lang['64_Phase']='1/64';
 $lang['7_Phase']='1/7';
 $lang['8_Phase']='1/8';
 $lang['Advanced']='Avanzado';
+$lang['AdvancedMode']='Modo Avanzado';
 $lang['AF']='Cadete Femenino';
 $lang['AfterXArrows']='Después de $a Flechas';
 $lang['AgeCl']='Cl. por Edad';
 $lang['AI']='Arco Instintivo';
 $lang['AllEvents']='Todas';
 $lang['AllMainReviews']='Comentarios en Idioma Principal';
+$lang['AllowPartialTeams']='Permitir equipos incompletos';
 $lang['AllSecReviews']='Comentarios en Idioma Secundario';
 $lang['All_Phases']='Todas las Fases';
 $lang['AM']='Cadete Masculino';
@@ -58,6 +62,7 @@
 $lang['CmdOk']='OK';
 $lang['CmdOn']='Activado';
 $lang['CmdPostUpdate']='Publicar actualización';
+$lang['CmdRefresh']='Refrescar';
 $lang['CmdSave']='Guardar';
 $lang['CmdSaveContinue']='Guardar y Continuar';
 $lang['CmdSet2All']='Colocar En Todos';
@@ -104,9 +109,9 @@
 $lang['DivisionClass']='Categoría';
 $lang['Elimination']='Eliminatorias';
 $lang['Eliminations']='Serie Elim.';
-$lang['Eliminations_1']='1 Serie Eliminatoria';
-$lang['Eliminations_2']='2 Serie Eliminatoria';
-$lang['End (volee)']='Tanda';
+$lang['Eliminations_1']='1er. Serie Eliminatoria';
+$lang['Eliminations_2']='2da. Serie Eliminatoria';
+$lang['End (volee)']='Ronda';
 $lang['EndScore']='Sum';
 $lang['Error']='Error';
 $lang['EvCode']='Código Prueba';
@@ -115,8 +120,13 @@
 $lang['EvName']='Nombre Prueba';
 $lang['F']='Femenino';
 $lang['FilterRules']='Criterio';
+$lang['Finish']='Finalizar';
 $lang['FirstPhase']='Primera Fase';
 $lang['FopSetup']='Diseño del Campo de Tiro';
+$lang['Gender0']='Masculino';
+$lang['Gender1']='Femenino';
+$lang['GenderShort0']='M';
+$lang['GenderShort1']='F';
 $lang['HELP']='AYUDA!';
 $lang['HELP-Manual-ENG']='Instrucciones en Inglés (En línea)';
 $lang['HELP-Manual-ITA']='Instrucciones en Italiano (En línea)';
@@ -129,6 +139,13 @@
 $lang['IndFinal']='Finales Individuales';
 $lang['IndFinEventWithoutShootOff']='Atención!<br>Las siguientes pruebas deben ser resueltas antes de ser visualizadas!';
 $lang['Individual']='Individual';
+$lang['IndTeam-0']='Individual';
+$lang['IndTeam-1']='Equipos';
+$lang['InitEliminations']='Iniciar Eliminatorias';
+$lang['InitEliminations1']='Iniciar 1er Ronda Eliminatoria';
+$lang['InitEliminations2']='Iniciar 2da Ronda Eliminatoria';
+$lang['InitFinalGrids']='Inicializar Esquemas Individuales';
+$lang['InvalidAction']='Acción Inválida';
 $lang['ISK-Configuration']='Gestionar Dispositivos';
 $lang['ISK-GetQRData']='Obtener Datos de Código QR';
 $lang['ISK-Results']='Resultados';
@@ -138,6 +155,7 @@
 $lang['JM']='Junior Masculino';
 $lang['jrTextArea']='Area de Texto ($a[1] filas x $a[0] colum.)';
 $lang['jrYesNo']='Si / No';
+$lang['JudgeNotes']='Anotaciones del Juez';
 $lang['LB']='Long Bow';
 $lang['M']='Masculino';
 $lang['ManFinAthTargetInd']='Arqueros por Contención para Final Individual';
@@ -158,6 +176,7 @@
 $lang['MedalStanding']='Medallero';
 $lang['MenuLM_Accreditation']='Acreditación';
 $lang['MenuLM_Accreditation colors management']='Gestionar colores de acreditación';
+$lang['MenuLM_AdvancedFeatures']='Opciones Avanzadas';
 $lang['MenuLM_Archers on Targets']='Arqueros por Contención';
 $lang['MenuLM_Arr4Set']='Flechas por Set';
 $lang['MenuLM_Arrow by Arrow (Advanced user)']='Flecha por Flecha (Usuario Avanzado)';
@@ -168,8 +187,11 @@
 $lang['MenuLM_Athletes Sync.']='Sincronizar Archivo de Arqueros';
 $lang['MenuLM_AthletesDiscrepancies']='Discrepancias en Arqueros';
 $lang['MenuLM_Athlets fees status']='Situación inscripción de los arqueros';
+$lang['MenuLM_Authentication']='Autenticación de Usuarios';
 $lang['MenuLM_Category Result List']='Imprimir Resultados por Categoría';
+$lang['MenuLM_Change Components']='Cambiar Componentes';
 $lang['MenuLM_ChangeNationsNames']='Cambiar Nombre de los Paises';
+$lang['MenuLM_ChangePassword']='Cambiar Contraseña';
 $lang['MenuLM_Check Data Update']='Verificar Actualización de Datos';
 $lang['MenuLM_Check shoot-off before eliminations']='Verificar Shoot-off antes de las eliminatorias';
 $lang['MenuLM_Check shoot-off before final phases']='Resolver Desempates antes de las Fases Finales';
@@ -208,6 +230,7 @@
 $lang['MenuLM_Extended Table']='Tabla de Inserción Extendida';
 $lang['MenuLM_ExtraDataEdit']='Editar Datos Adicionales';
 $lang['MenuLM_Fees setup']='Configurar Tarifas de las Inscripciones';
+$lang['MenuLM_Field Crew']='Personal de Campo';
 $lang['MenuLM_Final Field of Play Layout']='Diseño del Campo de Tiro';
 $lang['MenuLM_Final report']='Informe Final';
 $lang['MenuLM_Final Rounds']='Serie Final';
@@ -228,11 +251,13 @@
 $lang['MenuLM_Individual Finals']='Finales Individuales';
 $lang['MenuLM_Input Score']='Introducción de Puntajes';
 $lang['MenuLM_Internet Preview']='Vista Previa Internet';
+$lang['MenuLM_IrmManagement']='Gestionar Situación IRM';
 $lang['MenuLM_LastShootoff']='Último shoot-off';
 $lang['MenuLM_List (Simple)']='Inscripción de participantes (Simple)';
 $lang['MenuLM_ListLoad']='Cargar Lista (Importar Hoja de Cálculo)';
 $lang['MenuLM_Lock manage']='Gestión de Acceso a la Red';
 $lang['MenuLM_Lock setup']='Bloquear edición';
+$lang['MenuLM_Logout']='Salir';
 $lang['MenuLM_LueFill']='Crear Búsqueda desde Archivo';
 $lang['MenuLM_Manage Events']='Definir las Pruebas';
 $lang['MenuLM_ManAwards']='Gestión de la Ceremonia de Premiación';
@@ -285,6 +310,7 @@
 $lang['MenuLM_Standard Table']='Tabla de Inserción Normal';
 $lang['MenuLM_Statistics']='Estadísticas';
 $lang['MenuLM_SubClasses']='Sub Clases';
+$lang['MenuLM_Swaps']='Intercambiar Oponentes';
 $lang['MenuLM_Synchronize']='Sincronizar InfoSystem';
 $lang['MenuLM_Target']='Contención';
 $lang['MenuLM_Target Assignment']='Asignar de Contención';
@@ -294,7 +320,7 @@
 $lang['MenuLM_TargetAssignmentSecond']='Asignación contención segunda fase';
 $lang['MenuLM_TargetAssignmentThird']='Asignación contención tercera fase';
 $lang['MenuLM_TargetFromRank']='Asignar Contención por Clasificación';
-$lang['MenuLM_Targets']='Gestión de Contenciones';
+$lang['MenuLM_Targets']='Gestión de Blancos';
 $lang['MenuLM_Team Final Setup']='Configuración Final por Equipos';
 $lang['MenuLM_Team Finals']='Finales por Equipo';
 $lang['MenuLM_Training']='Programación de calentamiento';
@@ -324,12 +350,16 @@
 $lang['Month_8']='Sep';
 $lang['Month_9']='Oct';
 $lang['MsgAreYouSure']='Está seguro?';
+$lang['MsgAttentionFinReset']='ADVERTENCIA!<br>¡¡¡ESTA OPERACIÓN NO PUEDE SER DESHECHA !!!<br>Todos los datos en los esquemas individual y de equipos serán eliminados.<br>Por lo general, esta operación es necesaria si hubo errores en la ronda de clasificación o en los procedimientos de shoot-off.<br>Continuar?';
 $lang['MsgImportError']='Error!<br>Imposible Importar Datos!';
 $lang['MsgImportOk']='Importación Cancelada!';
+$lang['MsgInitFinalGridsError']='Error!<br>Los esquemas no están vacíos!';
 $lang['MsgInitFinalGridsOk']='Inicialización Satisfactoria!';
+$lang['MsgInitFinalGridsRunningError']='Operación no permitida mientras el evento se está ejecutando';
 $lang['MsgNeedInitGrids']='Error!<br>Esquema no inicializado!';
 $lang['MsgNeedShootOff']='Error!<br>Primero debe verificar los shoot-off!';
-$lang['MsgRowMustBeComplete']='ADVERTENCIA!<br>Debe completar toda la fila antes de continuar!';
+$lang['MsgRowMustBeComplete']='ADVERTENCIA! <br>Debe completar toda la fila antes de continuar!';
+$lang['MW']='Master Femenino';
 $lang['MySqlCollation']='general';
 $lang['Nation']='País/Fed./Club';
 $lang['NextMatchNames']='Nombres para Próx. Fase';
@@ -346,6 +376,7 @@
 $lang['NumberThousandsSeparator']='.';
 $lang['OL']='Arco Recurvo';
 $lang['Open']='Abrir';
+$lang['OpponentsPerTarget']='Oponentes por Contención';
 $lang['Partecipants']='Participantes';
 $lang['Partecipation']='Participación en la Competencia';
 $lang['PartialTeam']='Equipo No Completo';
@@ -359,8 +390,10 @@
 $lang['RankingInd']='Eliminatorias y Serie Final - Posiciones Individuales';
 $lang['Rankings']='Posiciones';
 $lang['RankingSq']='Eliminatorias y Serie Final - Posiciones por Equipos';
+$lang['RankScoreShort']='Clasif.';
 $lang['RB']='Arco Recurvo';
 $lang['RecalcIndTeamsRank']='Clasificación Individual y por Equipos recalculada exitosamente';
+$lang['Review']='Revisar';
 $lang['RevMainLang']='Idioma Principal';
 $lang['RevSecLang']='Idioma Secundario';
 $lang['RoundDefinition']='Definiciones de las Series';
@@ -402,6 +435,7 @@
 $lang['TeamEventList']='Pruebas por Equipos';
 $lang['TeamFinal']='Finales por Equipo';
 $lang['Teams']='Equipos';
+$lang['TecError']='Por razones técnicas no es posible mostrar la página requerida';
 $lang['TF']='Equipo Femenino';
 $lang['TimeFmt']='%H:%i';
 $lang['TM']='Equipo Masculino';
@@ -417,13 +451,22 @@
 $lang['TrgHunterNor']='Cazador (Noruega)';
 $lang['TrgIndComplete']='Salón (1-10 grande)';
 $lang['TrgIndSmall']='Salón (6-10 grande)';
+$lang['TrgLancaster']='Lancaster (1-11)';
+$lang['TrgLancShootUp']='Lancaster (+12)';
 $lang['TrgNfaaInd']='Salón NFAA (1-5/X)';
 $lang['TrgOutdoor']='Aire Libre (1-X)';
 $lang['TrgProAMIndNfaa']='Salón ProAM - Blanco NFAA (1-5/X.6)';
 $lang['TrgProAMIndVegas']='Salón ProAM - Blanco Vegas (1-10/X.11)';
 $lang['TrgProAMIndVegasSmall']='Salón ProAM - Blanco Vegas (6-10/X.11)';
 $lang['U']='Unisex';
+$lang['U18M']='U18 Masculinos';
+$lang['U18W']='U18 Femenino';
+$lang['U21M']='U21 Masculino';
+$lang['U21W']='U21 Femenino';
 $lang['UnexpectedError']='Error Inesperado';
+$lang['VF']='Supermaster Femenino';
+$lang['VM']='Supermaster Masculino';
+$lang['W']='Femenino';
 $lang['Winner']='Ganador';
 $lang['Yes']='Si';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/Errors.php b/src/Common/Languages/es-ar/Errors.php
index f12753f3..c686b951 100644
--- a/src/Common/Languages/es-ar/Errors.php
+++ b/src/Common/Languages/es-ar/Errors.php
@@ -1,4 +1,7 @@
 <?php
+$lang['AllFieldsMandatory']='Todos los campos son obligatorios';
+$lang['AllMailsRedirect']='Los mensajes serán enviados a';
+$lang['Anomalies']='Anomalías';
 $lang['DirectoryNotWriteable']='El directorio $a no tiene permisos de escritura para el servidor web. Por favor modifique los permisos para poder escribir los datos.';
 $lang['ErrCodeExists']='El código ya existe!';
 $lang['ErrConnection']='Sin conexión al servidor $a';
@@ -11,6 +14,12 @@
 $lang['ErrNoLocation']='Falta Ubicación';
 $lang['ErrNoStartDate']='Falta Fecha de Inicio';
 $lang['ErrUnknownNation']='Nacionalidad Desconocida';
+$lang['ImageSaveError']='No se guardó la imagen';
 $lang['LockedProcedure']='Ëste procedimiento está BLOQUEADO';
+$lang['NoData']='Sin Datos Provistos';
+$lang['NoDNSRecord']='Nombre de Servidor Incorrecto o no se encuentra en línea: verifique conexión a Internet para configurar esta opción.';
+$lang['PhpOutdated']='Su versión de PHP se encuentra desactualizada. Ianseo podría funcionar, pero algunas funcionalidades necesitarán al menos la versión {$a}.<br/>Actualice su instalación lo antes posible para que sea compatible con PHP {$a} o superior.';
+$lang['ServiceNotAvailable']='Servicio No Disponible';
 $lang['TooManyElimQualified']='Series de tipo $a[0] solo pueden aceptar hasta $a[1] arqueros';
+$lang['WrongPort']='Puerto no soportado!';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/HTT.php b/src/Common/Languages/es-ar/HTT.php
index c0540b97..b5ccbafe 100644
--- a/src/Common/Languages/es-ar/HTT.php
+++ b/src/Common/Languages/es-ar/HTT.php
@@ -33,13 +33,14 @@
 $lang['Mode']='Modo';
 $lang['Name']='Nombre';
 $lang['OpenFile']='Abrir Archivo';
-$lang['OvrErrSelectSession']='No hay Tanda Seleccionada!';
+$lang['OvrErrSelectSession']='No hay Ronda Seleccionada!';
 $lang['Port']='Puerto';
 $lang['QualSession']='Turno Clasif.';
 $lang['Report']='Informe';
 $lang['Row']='Fila';
 $lang['RowImported']='Fila $a cargada';
 $lang['RowNotImported']='Fila $a NO se ha cargado';
+$lang['ScoreSetup']='Configurar puntaje';
 $lang['SelFile2Imp']='Seleccione Archivo para Importar';
 $lang['SendInitSequence']='Enviar Secuencia de Inicio';
 $lang['SeqSponsor']='Información Comercial';
@@ -49,6 +50,6 @@
 $lang['Terminal']='HTT';
 $lang['TerminalMode']='Modo Terminal';
 $lang['TotaleScore']='Total';
-$lang['Volee']='Tanda';
-$lang['VoleeIsPresent']='Esa TANDA ya existe';
+$lang['Volee']='Ronda';
+$lang['VoleeIsPresent']='Esa RONDA ya existe';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/Help.php b/src/Common/Languages/es-ar/Help.php
index 1685f406..ebf94f5b 100644
--- a/src/Common/Languages/es-ar/Help.php
+++ b/src/Common/Languages/es-ar/Help.php
@@ -1,6 +1,8 @@
 <?php
 $lang['GetBarcodeSeparator']='Después de imprimir la hoja de referencia con los códigos de barra, lea el código de barras <<SEPARATOR>> para activar los lectores.';
 $lang['HomePage']='En esta sección usted puede seleccionar o crear una competencia.';
+$lang['ISK-LockedSessionHelp']='Los íconos {$a} muestran si la aplicación puede puntuar o no en ese turno.';
+$lang['ISK-ServerUrlPin']='<b>NO COMPARTA ESTE NUMERO</b><br>Use un PIN numérico (4 dígitos) para acceder a la competencia.<br> Cualquier dispositivo podrá puntuar en la competencia leyendo el código QR impreso por IANSEO.<br> En caso de ingresar manualmente los puntajes en Ianseo Scorekeeper LITE, el Código a usar será <b>{$a}</b>';
 $lang['ScoreBarCodeShortcuts']='Leer el código de barras impreso en la hoja de puntuación. <br/> Insertando manualmente un # seguido por el nombre del arquero busca en la base de datos el nombre de ese arquero<br/> Insertando un @ seguido por el número de contención busca esa contención. DEBERA establecerse la ronda. Se deberá especificar el turno (primer dígito) y la contención tendrá de 0 a 3 dígitos.';
 $lang['TV-ChannelSetup']='= Configuración de Canales = Después de configurar sus canales, conecte el navegador del dispositivo que quiera utilizar al canal <code>http://IP.OF.IANSEO/tv.php?id=CHANNEL</code> donde "IP.OF.IANSEO" es el IP del servidor donde ejecuta Ianseo (incluyendo directorio si existiera) y "CHANNEL" es el ID del canal.';
 $lang['TV-RotEdit']='<div>Se hace una página de presentación con al menos una página de contenido.</div><div>Las páginas de contenido se mostrarán una después de la otra y comenzarán de nuevo.</div><div><b>NOTA:</b>en versiones regulares y ligeras, el primer contenido vuelve a mostrarse como último, por lo que es aconsejable insertar como primer contenido una imagen (por ejemplo, el logo o flyer de la competencia).</div><div>El contenido puede ser ya sea basado en la competencia (lista de inicio, clasificación, encuentros...) o "Contenido multimedia" (imagenes, mensajes HTML,...).</div>';
diff --git a/src/Common/Languages/es-ar/IOC_Codes.php b/src/Common/Languages/es-ar/IOC_Codes.php
index 8fc1190b..2a057b72 100644
--- a/src/Common/Languages/es-ar/IOC_Codes.php
+++ b/src/Common/Languages/es-ar/IOC_Codes.php
@@ -42,19 +42,15 @@
 $lang['BUL']='Bulgaria';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='República Centroafricana';
-$lang['CAM']='Camboya';
 $lang['CAN']='Canadá';
 $lang['CAY']='Islas Caiman';
 $lang['CGO']='República del Congo';
 $lang['CHI']='Chile';
-$lang['CHN']='China';
 $lang['CMR']='Camerún';
-$lang['COD']='República Democrática del Congo';
 $lang['COL']='Colombia';
 $lang['CRC']='Costa Rica';
 $lang['CRO']='Croacia';
 $lang['CUB']='Cuba';
-$lang['CZE']='República Checa';
 $lang['DEN']='Dinamarca';
 $lang['DMA']='Dominica';
 $lang['DOM']='República Dominicana';
@@ -72,6 +68,8 @@
 $lang['GBR']='Gran Bretaña';
 $lang['INA']='Indonesia';
 $lang['ITA']='Italia';
+$lang['KUW']='Kuwait';
+$lang['MAW']='Malawi';
 $lang['Medal-1']='Medalla Dorada';
 $lang['Medal-2']='Medalla de Plata';
 $lang['Medal-3']='Medalla de Bronce';
@@ -79,7 +77,10 @@
 $lang['MGL']='Mongolia';
 $lang['NOR']='Noruega';
 $lang['NZL']='Nueva Zelanda';
+$lang['PNG']='Papua Nueva Guinea';
+$lang['RWA']='Rwanda';
 $lang['SUI']='Suiza';
 $lang['SWE']='Suecia';
 $lang['TRI']='Trinidad y Tobago';
+$lang['ZIM']='Zimbabwe';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/ISK-App.php b/src/Common/Languages/es-ar/ISK-App.php
new file mode 100644
index 00000000..a7c01889
--- /dev/null
+++ b/src/Common/Languages/es-ar/ISK-App.php
@@ -0,0 +1,181 @@
+<?php
+$lang['0_Phase']='Oro';
+$lang['12_Phase']='1/12';
+$lang['14_Phase']='1/14';
+$lang['16_Phase']='1/16';
+$lang['1_Phase']='Bronce';
+$lang['24_Phase']='1/24';
+$lang['2_Phase']='Semifinales';
+$lang['32_Phase']='1/32';
+$lang['48_Phase']='1/48';
+$lang['4_Phase']='Cuartos de Final';
+$lang['64_Phase']='1/64';
+$lang['7_Phase']='1/7';
+$lang['8_Phase']='1/8';
+$lang['AboutAppDeveloper']='App desarrollada por';
+$lang['AboutPrivacy']='Política de Privacidad de Ianseo';
+$lang['AboutProducer']='Diseñado y desarrollado por';
+$lang['AboutTitle']='Acerca de ScoreKeeper';
+$lang['AboutUX']='UX diseñada en cooperación con';
+$lang['AppPageAbout']='Acerca de';
+$lang['AppPageHelp']='Ayuda';
+$lang['AppPageSettings']='Configuración';
+$lang['AppPageStart']='Página de inicio';
+$lang['AppTitle']='Scorekeeper NG';
+$lang['BarcodeErrorMessage']='Código de barras inválido';
+$lang['BarcodeErrorTitle']='Error Código de Barras';
+$lang['BarcodeScanPrompt']='Centrar el código QR en el lector';
+$lang['DeviceId']='ID Dispositivo';
+$lang['EnterPinCodeInvalidValue']='Código de autorización inválido';
+$lang['EnterPinCodeMessage']='Ingrese el código de autorización para usar ésta función';
+$lang['EnterPinCodeTitle']='Código de autorización requerido';
+$lang['EnterPinCodeValue']='Código';
+$lang['FabReconnect']='Reconectar';
+$lang['GenericCancel']='Cancelar';
+$lang['GenericDelete']='Eliminar';
+$lang['GenericNext']='Próximo';
+$lang['GenericNo']='No';
+$lang['GenericOk']='OK';
+$lang['GenericPrevious']='Anterior';
+$lang['GenericYes']='Si';
+$lang['HelpContactHead']='Contacto';
+$lang['HelpContactText']='Si tiene problemas con la aplicación y necesita asistencia, puede contactarse enviando un email a';
+$lang['HelpIntro13D']='3D';
+$lang['HelpIntro1Field']='Juego de Campo';
+$lang['HelpIntro1Head']='ScoreKeeper NG';
+$lang['HelpIntro1RR']='Todos contra Todos';
+$lang['HelpIntro1TargetIn']='Indoor';
+$lang['HelpIntro1TargetOut']='Aire Libre';
+$lang['HelpIntro1Text']='es la próxima generación de aplicaciones de carga de puntos en tiro con arco! Es una aplicación complementaria del software de tiro con arco Ianseo y permite la carga de puntos en vivo de:';
+$lang['HelpIntro2Elim']='Eliminatorias';
+$lang['HelpIntro2MI']='Individual';
+$lang['HelpIntro2MT']='Por equipos';
+$lang['HelpIntro2Qual']='Clasificación';
+$lang['HelpIntro2Text']='La aplicación permite puntuar todas las facetas de una competencia de arquería, incluyendo:';
+$lang['HelpIntro3Lite']='Lite';
+$lang['HelpIntro3Live']='Live';
+$lang['HelpIntro3Pro']='Pro';
+$lang['HelpIntro3Text']='Scorekeeper NG funciona igual de bien en competencias con versiones Lite, Pro o Live en Ianseo. Dependiendo del tipo de competencia, la aplicación habilitará o deshabilitará la posibilidad de utilizar algunas de las funciones avanzadas.';
+$lang['HelpIntro4Text']='La aplicación posee cinco funciones principales:';
+$lang['HelpMainHead']='Principal';
+$lang['HelpMainText']='Esta es la pantalla principal utilizada por los arqueros una vez que la aplicación está configurada y conectada a Ianseo. Se muestra la información de la competencia, el turno actual y una lista de arqueros que están configurados en las contenciones determinadas. Para cada arquero, se muestran las rondas actuales, tipo de blanco, los valores de cada flecha y los totales. Al seleccionar un arquero se mostrará la pantalla de puntuación. También es posible ir a la hoja de puntuación y ver información de todos los arqueros y series ejecutadas.';
+$lang['HelpScorecardHead']='Planilla de puntos';
+$lang['HelpScoringHead']='Carga de Puntos';
+$lang['HelpSettingsHead']='Configuración';
+$lang['HelpStartHead']='Página de Inicio';
+$lang['MainDistance']='Distancia';
+$lang['MainInvalidKey']='Licencia Inválida';
+$lang['MainNotInUse']='Dispositivo no está en uso';
+$lang['MainSignatureTitle']='Puntuación completada';
+$lang['MainTargets']='Contención(es) asignadas';
+$lang['MainTotal']='Total';
+$lang['MainWinner']='GANADOR';
+$lang['MenuAppVersion']='Versión:';
+$lang['MenuCloseMenu']='Cerrar menú';
+$lang['MenuDeviceId']='ID Dispositivo:';
+$lang['MenuExitApp']='Salir';
+$lang['ScorecardArrows']='Puntajes';
+$lang['ScorecardCompTotal']='Total';
+$lang['ScorecardDistTotal']='Acum';
+$lang['ScorecardEnd']='Ronda';
+$lang['ScorecardEndTotal']='Parcial';
+$lang['ScorecardSetPoints']='Set';
+$lang['ScorecardTarget']='Contenc.';
+$lang['ScoreTotalsCloseButton']='Cerrar';
+$lang['ScoreTotalsConfirmButton']='Confirmar';
+$lang['ScoreTotalsConfirmOrReview']='Uno o más de los totales no coinciden. Cambie los valores y presione Confirmar para verificar nuevamente o presione Cerrar para regresar y verificar sus puntajes.';
+$lang['ScoreTotalsMessage']='Ingrese los resultados desde su planilla de puntuación';
+$lang['ScoreTotalsMissingValues']='Por favor ingrese todos los valores solicitados';
+$lang['ScoreTotalsScore']='Puntaje total';
+$lang['ScoringDeleteArrow']='Eliminar Flecha';
+$lang['ScoringDeleteEnd']='Eliminar Ronda';
+$lang['ScoringDeleteEndConfirmMessage']='Realmente quiere borrar todas las flechas de la ronda seleccionada?';
+$lang['ScoringDistTotal']='Total';
+$lang['ScoringEndTotal']='Parcial';
+$lang['SettingsChooseValue']='Elegir';
+$lang['SettingsCompetitionType']='Tipo de Prueba';
+$lang['SettingsConnectionCategory']='Conexión';
+$lang['SettingsConnectionCompCode']='Código de la Competencia';
+$lang['SettingsConnectionSocketAddress']='Dirección Socket';
+$lang['SettingsConnectionSocketPort']='Puerto Socket';
+$lang['SettingsConnectionUrl']='Url';
+$lang['SettingsCouldNotGetCompInfo']='Imposible obtener información de la competencia';
+$lang['SettingsCouldNotGetEventInfo']='Imposible obtener información del evento';
+$lang['SettingsDeviceNotAllowed']='Dispositivo no permitido para ésta competencia. Verifique la configuración o contáctese con el organizador del evento.';
+$lang['SettingsDeviceUnknownError']='Dispositivo no autorizado por Ianseo por razones desconocidas';
+$lang['SettingsElimFirstTarget']='Primer Contención';
+$lang['SettingsEventSelection']='Seleccionar Evento';
+$lang['SettingsFunctionsCategory']='Otras funciones';
+$lang['SettingsFunctionsResetSettings']='Reiniciar configuración a valores por defecto';
+$lang['SettingsGenerateQr']='Generar';
+$lang['SettingsGpsCategory']='Ubicación GPS';
+$lang['SettingsGpsFrequency']='Frecuencia';
+$lang['SettingsGpsMinute']='minuto';
+$lang['SettingsGpsMinutes']='minutos';
+$lang['SettingsGpsSeconds']='segundos';
+$lang['SettingsGpsSendPosition']='Enviar ubicación del dispositivo';
+$lang['SettingsLanguageCategory']='Idioma';
+$lang['SettingsLanguageCurrent']='Idioma Seleccionado';
+$lang['SettingsLanguageUpdate']='Actualizar Idiomas';
+$lang['SettingsManualAllDistances']='Todas';
+$lang['SettingsManualDistance']='Serie';
+$lang['SettingsManualEvent']='Prueba';
+$lang['SettingsManualMatch']='Oponente';
+$lang['SettingsManualPhase']='Fase';
+$lang['SettingsManualSession']='Turnos';
+$lang['SettingsManualStage']='Etapa';
+$lang['SettingsManualTarget']='Contención';
+$lang['SettingsOtherCategory']='Otras opciones';
+$lang['SettingsOtherSignatureNone']='No';
+$lang['SettingsOtherSignatureScan']='Escanear ID Arquero';
+$lang['SettingsQrCodesCategory']='Códigos QR';
+$lang['SettingsQrCodesDevice']='Dispositivo';
+$lang['SettingsQrCodesScorecard']='Planilla de Puntuación';
+$lang['SettingsReset']='Reiniciar';
+$lang['SettingsSaveConfig']='Guardar';
+$lang['SettingsScanSendQr']='Enviar';
+$lang['SettingsScanSendQrError']='Imposible procesar el código QR';
+$lang['SettingsScanSendQrOk']='Código QR enviado a Ianseo';
+$lang['SettingsShowAdvanced']='Avanzado';
+$lang['SettingsStageMI']='Encuentros - Individual';
+$lang['SettingsStageMT']='Encuentros - Equipos';
+$lang['SettingsStageQ']='Clasificatorias';
+$lang['SettingsStageRI']='Todos contra Todos - Prueba Individual';
+$lang['SettingsStageRT']='Todos contra Todos - Equipos';
+$lang['SettingsTitle']='Configuración';
+$lang['SettingsWifiAdd']='Añadir WiFi';
+$lang['SettingsWifiAddNew']='Añadir nuevo SSID WiFi';
+$lang['SettingsWifiCategory']='WiFi';
+$lang['SettingsWifiEdit']='Editar WiFi';
+$lang['SetupManually']='Configuración Manual';
+$lang['SetupNeedHelp']='Necesita Ayuda?';
+$lang['SetupUsingBarcode']='Configurar usando QR';
+$lang['ShootoffClosestNew']='Nuevo Shoot-Off';
+$lang['SignatureClear']='Limpiar';
+$lang['SignatureIncorrectCodeTitle']='Código de barras incorrecto';
+$lang['SignatureReturnDev']='Devolver dispositivo al equipo de resultados';
+$lang['SignatureSaved']='Guardado!';
+$lang['SignatureSaveSign']='Guardar firma';
+$lang['SignatureSignature']='Firma';
+$lang['SignatureSuccess']='OK';
+$lang['SignatureTextArcher']='Firma Arquero';
+$lang['SignatureTextScorer']='Firma Planillero';
+$lang['SignatureTitle']='Firmar planilla de puntos';
+$lang['SignatureTitleFinished']='Planilla de puntos finalizada';
+$lang['SignatureVerificationFailed']='Imposible verificar el código. Verifique la conexión de red e intente nuevamente.';
+$lang['SignatureVerified']='Verificado!';
+$lang['UpdateLangAdditional']='Idiomas Adicionales';
+$lang['UpdateLangGetAll']='Obteniendo idiomas disponibles...';
+$lang['UpdateLangGetSingle']='Descargando idioma...';
+$lang['UpdateLangInstalled']='Idiomas Instalados';
+$lang['UpdateLangTitle']='Actualizar Idiomas';
+$lang['WiFiCannotAdd']='WIFI: No se puede añadir WiFi {{n}}';
+$lang['WiFiCannotConnect']='WIFI: No se puede conectar a WiFi {{n}}';
+$lang['WiFiConnected']='WIFI: Conectado a WiFi {{n}}';
+$lang['WiFiDeviceEnabled']='WIFI: Dispositivo habilitado';
+$lang['WiFiDeviceNotEnabled']='WIFI: Dispositivo NO habilitado';
+$lang['WifiPassword']='Contraseña';
+$lang['WifiSsid']='SSID';
+$lang['WifiTargetFrom']='Contención desde';
+$lang['WifiTargetTo']='Contención hasta';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/ISK.php b/src/Common/Languages/es-ar/ISK.php
index 075b98c2..6b23275c 100644
--- a/src/Common/Languages/es-ar/ISK.php
+++ b/src/Common/Languages/es-ar/ISK.php
@@ -26,6 +26,8 @@
 $lang['CacheSendNone']='No hay elementos en caché para enviar';
 $lang['CacheSendOK']='Cache enviado exitosamente! __TEXT__ items enviados';
 $lang['CacheToQr']='Crear QR desde caché';
+$lang['CalculateNow']='Calcular Ahora';
+$lang['CalculateNowDone']='Ranking recalculado';
 $lang['Cancel']='Cancelar';
 $lang['CantConfirmQr']='No se pudo realizar la llamada para confirmar el código QR. Intente nuevamente. Error __TEXT__';
 $lang['CantGetAthlete']='No se pudo recuperar la información del arquero. Intente nuevamente. Error __TEXT__';
@@ -73,15 +75,15 @@
 $lang['DistTotal']='Total<br/>Ronda';
 $lang['EditScores']='Editar Puntajes';
 $lang['Elimination']='Eliminatorias';
-$lang['EmptyEndAlert']='La tanda anterior no ha sido puntuada. Está seguro de puntuar ésta flecha en ésta tanda?';
+$lang['EmptyEndAlert']='La ronda anterior no ha sido puntuada. Está seguro de puntuar ésa flecha en ésta ronda?';
 $lang['EmptyResponse']='Sin respuesta del servidor';
-$lang['End']='Tanda';
-$lang['EndLocked']='Esta tanda está bloqueada y no puede ser modificada.';
-$lang['EndSummary']='Resumen de Tanda';
-$lang['EndTotal']='Total<br/>Tanda';
+$lang['End']='Ronda';
+$lang['EndLocked']='Esta ronda está bloqueada y no puede ser modificada.';
+$lang['EndSummary']='Resumen de Rondas';
+$lang['EndTotal']='Total<br>Ronda';
 $lang['EnterCompCode']='Ingrese el código de la competencia e intente nuevamente';
 $lang['EnterServerUrl']='Por favor ingrese URL del servidor e intente nuevamente';
-$lang['EntryEnd']='Seleccione tanda donde quiera ir';
+$lang['EntryEnd']='Seleccione ronda donde quiere ir';
 $lang['EntryTarget']='Ingrese el número de contención';
 $lang['ErrorClearArrows']='No se pudieron eliminar los valores de las flechas. Intente nuevamente. Error __TEXT__';
 $lang['ErrorGetAthlete']='No se pudo recuperar la información del arquero. Error __TEXT__';
@@ -96,15 +98,18 @@
 $lang['ExitConfirm']='Está seguro que desea salir de la aplicación?';
 $lang['Face']='Blanco';
 $lang['FirstTarget']='Primer Contención:';
-$lang['GestureHelp']='Puede desplazarse entre arqueros y/o tandas usando los gestos descritos más abajo.';
+$lang['GestureHelp']='Puede desplazarse entre arqueros y/o rondas usando los gestos descritos más abajo.';
 $lang['Gestures']='Gestos';
 $lang['GoSetupAlert']='Está seguro que desea volver a la pantalla de configuración?';
 $lang['Group']='Grupo #';
 $lang['HasUpdate']='Actualizar';
 $lang['Help']='Ayuda';
+$lang['ImportDoneEmpty']='Nada para importar.';
+$lang['ImportDoneMatches']='Importación finalizada. Recalculado Ranking Final Individual y por Equipos';
+$lang['ImportNow']='Importar Ahora (Clasificación)';
 $lang['IpAddr']='Dirección IP';
-$lang['LastEndDist']='La última tanda de la ronda ha sido completada. Para continuar a la próxima ronda presione OK, sino presione Cancelar para permanecer en la ronda actual.';
-$lang['LastEndSession']='La última tanda para éste turno ha sido completada. No existen más tandas. Puede verificar las Hojas de Puntuación o volver a la Configuración.';
+$lang['LastEndDist']='La última ronda de la serie ha sido completada. Para continuar a la próxima ronda presione OK, sino presione Cancelar para permanecer en la ronda actual.';
+$lang['LastEndSession']='La última ronda para éste turno ha sido completada. No existen más rondas. Puede verificar las Hojas de Puntuación o volver a la Configuración.';
 $lang['LinkSpeed']='Velocidad de Conexión';
 $lang['LRSwipeLabel']='Sensibilidad Desplazamiento Izq./Der.';
 $lang['LRSwipeText']='Longitud de movimiento del dedo al realizar un desplazamiento. Mueva el control deslizante o toque el valor que desea usar. <u>A valor más pequeño es más sensible</u>.';
@@ -122,6 +127,7 @@
 $lang['NoAthletes']='No se encontraron arqueros';
 $lang['NoDist']='No se encontraron rondas';
 $lang['NoLangInfo']='No se puede recuperar información del idioma. __TEXT__';
+$lang['NoLanguages']='Inglés es el único idioma disponible en éste momento. Utilice la función de actualización de idiomas del menú para agregar otros idiomas e intente nuevamente.';
 $lang['NoServerUrl']='Debe escanear código QR o ingresar manualmente URL de Ianseo antes de actualizar los idiomas.';
 $lang['NotAvailIos']='No disponible para iOS';
 $lang['Number']='Cantidad';
@@ -134,12 +140,14 @@
 $lang['Prefs']='Preferencias del Usuario';
 $lang['PrevDistAlert']='Volver a la ronda anterior?';
 $lang['ProDiag']='Diagnosticar';
-$lang['ProEnd']='Elegir Tanda';
+$lang['ProEnd']='Elegir Ronda';
 $lang['ProRecvCode']='Configuración Recibida';
 $lang['proScanQr']='Escanear código QR';
 $lang['ProWaitAuth']='Esperando autorización';
 $lang['ProWaitCode']='Esperando configuración';
 $lang['QrInvalid']='No se puede entender el contenido del código de barras. Intente de nuevo con un código de barras válido para Ianseo.';
+$lang['QrIskLive']='La competición está configurada para utilizar Scorekeeper LIVE. Esta aplicación sólo funcionará con competiciones Lite o Pro.';
+$lang['QrIskNone']='Esta competencia no está configurada para usar ScoreKeeper. Verifique la Configuración.';
 $lang['QrNoCode']='No se encontró el código de la competencia en el código de barras. Ingrese nuevamente con un código de barras válido para Ianseo.';
 $lang['Reset']='Reiniciar';
 $lang['ReuseProQR']='Se encontró un código QR Pro anterior. Usar éste código?';
@@ -154,8 +162,10 @@
 $lang['ScanQRCode']='Escanear código QR';
 $lang['Score']='Puntaje';
 $lang['Scorecard']='Hoja de Puntuación';
+$lang['ScorecardsManagement']='Gestionar Hoja de Puntuación';
 $lang['ScoredPoints']='Puntos Anotados';
 $lang['ScoreHelp']='Ayuda';
+$lang['ScoreHelpDesc']='Esta pantalla permite el ingreso de los puntos de cada flecha disparada. También se muestra información sobre la ronda actual, tipo de contención e información del arquero. Ingrese los valores de las flechas usando el teclado numérico.';
 $lang['ScoringEntry']='Introducción de Puntajes';
 $lang['SelDist']='Por favor seleccione la ronda e intente de nuevo';
 $lang['SelTgtNum']='Por favor seleccione el número de contención e intente de nuevo';
@@ -175,10 +185,10 @@
 $lang['StageQ']='Clasificaciones';
 $lang['Status']='Estado:';
 $lang['Superuser']='Super Usuario';
-$lang['SwipeDown']='<strong>Desplazamiento Abajo</strong><br/>Desplaza hacia la tanda anterior del actual arquero.';
-$lang['SwipeLeft']='<strong>Desplazamiento Izquierda</strong><br/>Desplaza hacia el próximo arquero, de la contención o grupo, dentro de la misma tanda.';
-$lang['SwipeRight']='<strong>Desplazamiento Derecha</strong><br/>Desplaza hacia el arquero anterior, de la contención o grupo, dentro de la misma tanda.';
-$lang['SwipeUp']='<strong>Desplazamiento Arriba</strong></br>Desplaza hacia la próxima tanda del actual arquero.';
+$lang['SwipeDown']='<strong>Desplazamiento Abajo</strong><br>Desplaza hacia la ronda anterior del actual arquero.';
+$lang['SwipeLeft']='<strong>Desplazamiento Izquierda</strong><br>Desplaza hacia el próximo arquero, de la contención o grupo, dentro de la misma ronda.';
+$lang['SwipeRight']='<strong>Desplazamiento Derecha</strong><br>Desplaza hacia el arquero anterior, de la contención o grupo, dentro de la misma ronda.';
+$lang['SwipeUp']='<strong>Desplazamiento Arriba</strong><br>Desplaza hacia la próxima ronda del actual arquero.';
 $lang['TapToScan']='Presione para escanear';
 $lang['Target']='Contención #';
 $lang['TargetEntry']='Ingreso Manual de Puntos';
@@ -186,6 +196,7 @@
 $lang['Tgt']='&nbsp;<br/>Ctc';
 $lang['Total']='Total';
 $lang['Unknown']='Desconocido';
+$lang['UnlockAll']='Desbloquear todo el Turno';
 $lang['Update']='Actualizar';
 $lang['UpdateLang']='Actualizar Idiomas';
 $lang['Url']='URL:';
diff --git a/src/Common/Languages/es-ar/Ianseo.php b/src/Common/Languages/es-ar/Ianseo.php
index c493cc45..bd8298ef 100644
--- a/src/Common/Languages/es-ar/Ianseo.php
+++ b/src/Common/Languages/es-ar/Ianseo.php
@@ -7,4 +7,5 @@
 $lang['Cert-Level4']='Curso de Maestría';
 $lang['Cert-Level5']='Equipo de Ianseo';
 $lang['CertificateManagement']='Gestión de Certificados';
+$lang['GenerateFile']='Crear Archivo';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/InfoSystem.php b/src/Common/Languages/es-ar/InfoSystem.php
index 2c97a7c3..7ad462a3 100644
--- a/src/Common/Languages/es-ar/InfoSystem.php
+++ b/src/Common/Languages/es-ar/InfoSystem.php
@@ -1,4 +1,6 @@
 <?php
+$lang['AutoUpdate']='Actualización Automática';
+$lang['BrokenRecords']='Records Superados';
 $lang['ByClub']='Por país/club';
 $lang['ByEvent']='Por Prueba';
 $lang['ByName']='Por nombre';
@@ -11,6 +13,7 @@
 $lang['Eliminations_2']='2da. Serie Eliminatoria';
 $lang['HomeButton']='Inicio';
 $lang['Individual']='Individual';
+$lang['Live']='Vivo';
 $lang['Matches']='Encuentros';
 $lang['NewContent']='Nuevos datos disponibles';
 $lang['NoDataDisplay']='Sin datos para mostrar';
@@ -26,6 +29,11 @@
 $lang['Record-CR-COPARCO']='Record Americano';
 $lang['Record-CR-EMAU']='Record Europeo';
 $lang['Record-CR-FAA']='Record Africano';
+$lang['Record-CR-WAAf']='Record Africano';
+$lang['Record-CR-WAAM']='Record Americano';
+$lang['Record-CR-WAAs']='Record Asiático';
+$lang['Record-CR-WAE']='Record Europeo';
+$lang['Record-CR-WAO']='Record Oceanía';
 $lang['Record-OR-WA']='Record Olímpico';
 $lang['Record-WR-WA']='Record Mundial';
 $lang['Teams']='Equipos';
diff --git a/src/Common/Languages/es-ar/Install.php b/src/Common/Languages/es-ar/Install.php
index 0e15b638..81330a1f 100644
--- a/src/Common/Languages/es-ar/Install.php
+++ b/src/Common/Languages/es-ar/Install.php
@@ -8,6 +8,7 @@
 $lang['AcceptGPL-ReadTXT']='Leer Licencia';
 $lang['AcceptGPL-Start']='Para Instalar, Actualizar o Usar Ianseo, por favor marque el siguiente casillero:';
 $lang['Changed']='Cambiado';
+$lang['cmdForceUpdate']='Forzar Actualización';
 $lang['Config write failed']='No se pudo escribir el archivo de configuración. Por favor verifique los permisos de escritura en el directorio "Common" del directorio principal de IANSEO.';
 $lang['Create']='Crear usuario y base de datos';
 $lang['CreateStandardCatColors']='Crear acreditación';
@@ -16,12 +17,17 @@
 $lang['Credits-Coordination']='Coordinación del Proyecto IT';
 $lang['Credits-CoreGroup']='IANSEO Core Group';
 $lang['Credits-Credits']='Créditos';
+$lang['Credits-DebugManager']='Departamento Debug';
+$lang['Credits-Development']='Desarrollo y Codificación';
+$lang['Credits-Documentation']='Documentación y Soporte';
 $lang['Credits-FitarcoCredits']='¿Qué es Ianseo? Ianseo es un software para el manejo de los resultados de una competencia de Tiro con Arco; es un Proyecto de Código Abierto desarrollado gracias al soporte financiero de la Federación Italiana de Tiro con Arco, que decidió posteriormente distribuir el programa gratuitamente por toda Europa. Traducido a varios idiomas, Ianseo es el programa más avanzado y actualizado en el Mundo, que integra además todas las reglas de WA. Ha evolucionado para incluir en el mismo una gestión integral de un Torneo de Tiro con Arco: desde las acreditaciones de los arqueros y oficiales hasta la impresión de cualquier tipo de utilidades, desde la integración en redes y online hasta el diseño del campo de tiro.';
 $lang['Credits-HHT']='Integración HHT';
 $lang['Credits-IanseoTeam']='Ianseo y Equipo de Ianseo';
 $lang['Credits-IanseoWorld']='I.A.N.S.E.O. es también el grupo de trabajo más experto en el manejo y organización de Eventos de Tiro con Arco. Las primeras experiencias de algunos componentes de este grupo se retraen hasta comienzos de los noventa, pero en los últimos años (el grupo existe como equipo desde 2006) el Equipo Ianseo ha participado en las mayores competiciones a través del Mundo: Juegos Olímpicos, Campeonatos del Mundo, Campeonatos de Europa, Grandes Premios, Juegos Mundiales, Universidades, Campeonatos Universitarios, Festivales Mundiales de Arquería y varios Campeonatos Nacionales Italianos. Es el Equipo Oficial de Resultados de Fitarco (Federación Italiana de Tiro con Arco), WAE (World Archery Europa) y de Eventos de World Archery.';
 $lang['Credits-ISK']='Desarrollo de ISK';
 $lang['Credits-License']='IANSEO se ofrece bajo LICENCIA PUBLICA GENERAL GNU versión 3 (GPLV3)';
+$lang['Credits-Support']='Soporte (OTRS)';
+$lang['Credits-TranslationCoordination']='Coordinador de Traducciones';
 $lang['Credits-Translators']='Equipo de Traducción de IANSEO';
 $lang['Database name']='Nombre base de datos';
 $lang['Deleting']='Eliminando archivos no utilizados/sospechosos';
@@ -35,6 +41,8 @@
 $lang['FieldPegRed']='Estaca Roja';
 $lang['FieldPegWhite']='Estaca Blanca';
 $lang['FieldPegYellow']='Estaca Amarilla';
+$lang['FreeOnlineResults']='<b>Publique los resultados gratis:</b> con una conexión a Internet, puede mostrar al mundo lo que sucede durante su competencia. Es gratuito. Una vez creada la competencia, solicite el código a través del menú <<{$a}>>.';
+$lang['Host']='Host';
 $lang['Install-0']='ERROR CRITICO';
 $lang['Install-0 Title']='Acuerdo de Licencia GPL3';
 $lang['Install-1 Title']='Licencia GPL';
@@ -56,13 +64,13 @@
 $lang['NoDowngrade']='No es posible degradar su instalación. Si así lo desea, instale una versión nueva de Ianseo <b>SOBRE UNA BASE DE DATOS DIFERENTE</b>.';
 $lang['NoSubRules']='Sin subreglas';
 $lang['NotFound']='No Encontrado';
-$lang['NothingToDo']='Su instalación de Ianseo está actualizada. Verifique cada tanto la existencia de nuevas opciones y corrección de errores.';
+$lang['NothingToDo']='Su instalación de Ianseo está actualizada. Verifique cada tanto la existencia de nuevas versiones y corrección de errores.';
 $lang['NotUpdatable']='La instalación de Ianseo no puede ser actualizada automáticamente. Por favor verifique que el directorio principal de Ianseo ($a) y todos sus sub directorios tienen permiso de escritura en el servidor.';
 $lang['Optimal value']='Valor Óptimo';
 $lang['Parameter']='Parámetro';
 $lang['Password']='Contraseña';
 $lang['PHP settings']='Configuración PHP';
-$lang['PHP too old']='Su instalación de PHP es demasiado antigua. La versión mínima para usar IANSEO es 5.0.';
+$lang['PHP too old']='Su versión de PHP es demasiado antigua. La versión mínima para usar IANSEO es 8.0.';
 $lang['PHP version']='Versión PHP';
 $lang['php.ini file']='archivo php.ini';
 $lang['Prepare']='Preparando los datos para la actualización';
@@ -80,13 +88,13 @@
 $lang['Set1Dist1Arrow']='1 Ronda - 1 Flecha/Tanda';
 $lang['Set1Dist2Arrow']='1 Ronda - 2 Flechas/Tanda';
 $lang['Set1Elim']='1 Serie de Eliminación';
-$lang['Set1x30']='1x30 tandas';
+$lang['Set1x30']='1x30 rondas';
 $lang['Set20']='20 contenciones - 1 Ronda';
 $lang['Set20+20']='20+20 contenciones - 1 Ronda';
 $lang['Set24']='24 contenciones - 1 Ronda';
 $lang['Set24+24']='24+24 contenciones - 2 Rondas';
 $lang['Set28']='28 contenciones - 1 Ronda';
-$lang['Set2x15']='2x15 tandas';
+$lang['Set2x15']='2x15 rondas';
 $lang['Set32']='32 contenciones - 1 Ronda';
 $lang['Set3D']='3D - 1 Ronda';
 $lang['Set3D+3D']='3D - 2 Rondas';
@@ -99,9 +107,11 @@
 $lang['Set3D24']='24 contenciones - 1 Ronda';
 $lang['Set3D24+24']='24+24 contenciones - 2 Rondas';
 $lang['SetAllClass']='Todas las Clases';
+$lang['SetAUAustOpen']='Formato Abierto Australiano';
 $lang['SetChampionship']='Campeonato';
 $lang['SetCompound50m']='Compuesto - 50mt';
 $lang['SetCompound70m']='Compuesto - 70mt';
+$lang['SetIndoor']='Indoor';
 $lang['SetJ-CClass']='Junior y Cadete';
 $lang['SetJ-SClass']='Junior y Senior';
 $lang['SetNZAllClasses']='Todas las Clases';
@@ -110,10 +120,20 @@
 $lang['SetOneClass']='Todos en una Clase';
 $lang['SetOrdinary']='Competencia Común';
 $lang['SetOrdinaryFinals']='Competencia Común con finales';
+$lang['SetOutdoor']='Aire Libre';
+$lang['SetPara']='Para Arquería';
+$lang['SetSE_WaDist']='Distancias WA';
+$lang['SetStandard']='Estándar';
+$lang['SetUK_AME']='Americano';
+$lang['SetUK_NATS']='Nacionales';
+$lang['SetUK_STNIC']='San Nicolás';
 $lang['Setup-ARLEF']='Reglamento Arquería LEF';
 $lang['Setup-CA']='Torneo con Reglamentación de Canadá';
 $lang['Setup-CH']='Torneo con Reglamentación de Suiza';
 $lang['Setup-Default']='Reglas World Archery para la Competencia';
+$lang['Setup-FR']='Reglamentación Francesa';
+$lang['Setup-IT']='Competencia con Reglamentación Italiana - FITARCO';
+$lang['Setup-LANC']='Lancaster';
 $lang['Setup-NFAA']='Torneo con Reglamentación de la NFAA';
 $lang['Setup-NL']='Torneo con Reglamentación de Holanda';
 $lang['Setup-NO']='Torneo noruego (reglas de Norges Bueskytterforbund)';
@@ -121,6 +141,7 @@
 $lang['Setup-PAR']='Competencia Paralímpica (Normas IPC)';
 $lang['Setup-SE']='Torneo con Reglamentación de Suecia';
 $lang['Setup-Select']='Seleccione la reglamentación a utilizar';
+$lang['Setup-SI']='Reglamentación Eslovena';
 $lang['Setup-UK']='Torneo con Reglamentación de Gran Bretaña';
 $lang['Setup-US']='Normas Arquería US';
 $lang['SetVegas-WAF']='World Archery Festival - Las Vegas';
@@ -128,16 +149,20 @@
 $lang['Start Ianseo']='Ir a IANSEO!';
 $lang['Status']='Estado';
 $lang['stdValue']='Valor';
+$lang['Suboptimal']='Aunque su archivo php.ini no está configurado con valores óptimos, <br/> IANSEO debería funcionar correctamente para la mayoría de sus funcionalidades. <br/> Le recomendamos encarecidamente que configure los parámetros con el valor correcto en otro archivo ianseo.ini en el siguiente directorio:';
 $lang['System value']='Valor del sistema';
+$lang['UpdateInProgress']='Una actualización se encuentra en progreso, por favor espere...';
 $lang['UpdatePrepared']='Su instalación será actualizada automáticamente. Recuerde hacer un respaldo de todas las competencias antes de comenzar. El tiempo de actualización puede llevar tiempo, dependiendo de la conexión y los elementos que necesitan actualizarse.
 <br/>Recuerde que se eliminará cualquier archivo que no sea original, aparte del contenido del directorio "Modules/Custom".';
 $lang['Updating']='Actualizando instalación local de Ianseo';
 $lang['UpdatingLanguages']='Actualizando idiomas instalados';
+$lang['UpdatingModulesInfo']='Actualizando Información de los Módulos';
 $lang['UpgradeFinished']='Proceso de actualización finalizado.';
 $lang['User']='Nombre de Usuario';
 $lang['Value']='Valor';
 $lang['WhatIanseoDoes01']='<b>Cumple con las Normas de la World Archery:</b> Ianseo está siempre actualizado con las normas de la World Archery. Los desarrolladores también pueden personalizar y adaptar la aplicación para normativas específicas de su competencia!';
 $lang['WhatIanseoDoes02']='<b>Ayuda y soporte:</b> si necesita ayuda, envíe un correo electrónico a $a: y recibirá una respuesta inmediata de los desarrolladores de Ianseo!';
+$lang['WhatIanseoDoes03']='<b>Cursos y entrenamiento en línea:</b> Ianseo está dispuesto a llevar a cabo cursos en determinados lugares. Constan de dos niveles: sin y con terminales electrónicos. El primero de ellos desarrolla los aspectos de Ianseo desde la preparación de la competición y su programa hasta la publicación y distribución local de los resultados. El segundo tiene por objeto la adquisición de los conocimientos específicos para desarrollar una competición "flecha a flecha".';
 $lang['WhatIanseoDoes04']='<b>Donaciones!</b> Ianseo es gratuito y de código abierto...si te gusta puedes ayudarnos a mantener el software y el servidor actualizados: presiona el botón "Donate" en la página de inicio de $a!';
 $lang['WhatIanseoDoes05']='<b>Redes Sociales:</b> Ianseo también está en $a!';
 $lang['WhatIanseoDoesTitle']='Que puede hacer Ianseo por su competencia';
diff --git a/src/Common/Languages/es-ar/Languages.php b/src/Common/Languages/es-ar/Languages.php
index 1c490232..cf00ffba 100644
--- a/src/Common/Languages/es-ar/Languages.php
+++ b/src/Common/Languages/es-ar/Languages.php
@@ -12,11 +12,13 @@
 $lang['CA-Cl-JW']='Junior Femenino';
 $lang['CA-Cl-M']='Masculino';
 $lang['CA-Cl-MM']='Master Masculino';
+$lang['CA-Cl-MO']='Abierto Masculino';
 $lang['CA-Cl-MW']='Master Femenino';
 $lang['CA-Cl-PM']='Pre-Cub Masculino';
 $lang['CA-Cl-PW']='Pre-Cub Femenino';
 $lang['CA-Cl-W']='Femenino';
 $lang['CA-Cl-WM']='PeeWee Masculino';
+$lang['CA-Cl-WO']='Abierto Femenino';
 $lang['CA-Cl-WW']='PeeWee Femenino';
 $lang['CA-Ev-BCM']='Raso Cadete Masculino';
 $lang['CA-Ev-BCW']='Raso Cadete Femenino';
@@ -97,6 +99,7 @@
 $lang['CA-R']='Recurvo';
 $lang['CA-T']='Tradicional';
 $lang['CA-U']='Compuesto Sin Límites';
+$lang['CA-W1']='W1 (Compuesto/Recurvo)';
 $lang['CA-YC']='Compuesto Juvenil';
 $lang['CmdSearch']='Buscar módulos';
 $lang['Create']='crear';
@@ -119,5 +122,5 @@
 $lang['Separatore']='Separador';
 $lang['Text']='Significado';
 $lang['Translation']='Traducción';
-$lang['Variable']='Variablo';
+$lang['Variable']='Variable';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/ODF.php b/src/Common/Languages/es-ar/ODF.php
new file mode 100644
index 00000000..9afb9e40
--- /dev/null
+++ b/src/Common/Languages/es-ar/ODF.php
@@ -0,0 +1,40 @@
+<?php
+$lang['AssignAndSend']='Asignar y Enviar';
+$lang['BrokenRecords']='Records Superados';
+$lang['DescrCONN']='Comenzar Transmisión / Detener Transmisión / KA';
+$lang['DirNotWriteable']='Imposible escribir en $a. Verifique los Permisos!';
+$lang['DocumentCode']='Código Documento';
+$lang['DocumentLastSent']='Fecha/Hora último envío';
+$lang['DocumentStatus']='Estado Documento';
+$lang['DocumentSubcode']='Subcódigo Documento';
+$lang['DocumentType']='Tipo Documento';
+$lang['DocumentVersion']='Versión';
+$lang['GoodMorning']='BUENOS DIAS';
+$lang['GoodNight']='BUENAS NOCHES';
+$lang['IntCONN']='Conexión (DT_LOCAL_XX)';
+$lang['IntEVENT']='Nombre Evento';
+$lang['IntFUNC']='Función';
+$lang['IntMATCH']='Juegos';
+$lang['IntRES']='Resultados';
+$lang['IntTRANSLATE']='Cadenas Multi Idiomas';
+$lang['LangNotSupported']='Idioma $a no soportado';
+$lang['LogNotWritable']='PRECAUCION: El sistema no puede escribir en el directorio $a. Por favor, cambie los privilegios!';
+$lang['LoserMatchName']='Perdedor del juego $a';
+$lang['MissingFile']='Archivo Faltante';
+$lang['NoDataNothingSent']='Sin datos todavía';
+$lang['Receiver']='Receptor';
+$lang['SendNewMessage']='Enviar Nuevo Mensaje';
+$lang['SendOldMessage']='Re enviar';
+$lang['SendOldMessageHelp']='Re enviar mensajes verificados';
+$lang['SourceCode']='Código Fuente';
+$lang['Test']='Probar';
+$lang['TestMode']='Producción/Modo Prueba';
+$lang['TMMeeting']='Reunión Capitanes de Equipo';
+$lang['Transmitter']='Transmisor';
+$lang['TypEVENT']='Descripción del Evento';
+$lang['TypNAME']='Descripción';
+$lang['TypSCHEDLOC']='Ubicación de la Descripción';
+$lang['TypSCHEDVEN']='Descripción del Lugar';
+$lang['TypSTATUS']='Estado';
+$lang['WinnerMatchName']='Ganador del juego $a';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/Records.php b/src/Common/Languages/es-ar/Records.php
new file mode 100644
index 00000000..0b183692
--- /dev/null
+++ b/src/Common/Languages/es-ar/Records.php
@@ -0,0 +1,16 @@
+<?php
+$lang['Assign']='Asignar';
+$lang['AssignPDF']='Enviar a PDFs';
+$lang['DownloadDate']='Descargar Fecha';
+$lang['EditRecord']='Editar Record';
+$lang['Enabled']='Habilitado';
+$lang['Features']='Opciones';
+$lang['FontURL']='Fuente URL';
+$lang['HeaderCode']='Imprimir Código';
+$lang['LastModified']='Ultima Modificación';
+$lang['MaCode']='Código País';
+$lang['MainCategory']='Categoría Principal';
+$lang['MaxScore']='Puntaje Máximo';
+$lang['Para']='Para/IPC';
+$lang['WA-Rec-TeamEvent']='World Archery Prueba por Equipo';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/RoundRobin.php b/src/Common/Languages/es-ar/RoundRobin.php
new file mode 100644
index 00000000..c9b0e15f
--- /dev/null
+++ b/src/Common/Languages/es-ar/RoundRobin.php
@@ -0,0 +1,4 @@
+<?php
+$lang['RegularBrackets']='Llave Regular';
+$lang['RoundRobinSetup']='Configuración Prueba Todos contra Todos';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/RunArchery.php b/src/Common/Languages/es-ar/RunArchery.php
new file mode 100644
index 00000000..20bba22a
--- /dev/null
+++ b/src/Common/Languages/es-ar/RunArchery.php
@@ -0,0 +1,18 @@
+<?php
+$lang['Accepted']='Aceptado';
+$lang['AdjustedTime']='Ajustes';
+$lang['ImportArrows']='Importar Flechas';
+$lang['MoveToNextPhase']='Mover a próxima fase';
+$lang['PhaseName-1']='Finales';
+$lang['PhaseName-2']='Semifinales';
+$lang['QualifiedFinal']='Clasificado a la Final';
+$lang['QualifiedSemi']='Clasificado a Semifinales';
+$lang['RandomAssign']='Asignar al Azar';
+$lang['ResultsTeam']='Resultados por Equipo';
+$lang['RunningTime']='Tiempo';
+$lang['SemiFinalName']='Semifinal $a';
+$lang['SingleRound']='Sin Final/Semifinales';
+$lang['SpotterName']='Nombre Observador';
+$lang['Start']='Comenzar';
+$lang['UpdateIrmDisclaimer']='Está seguro que desea aplicar ese IRM?';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/ServiceErrors.php b/src/Common/Languages/es-ar/ServiceErrors.php
index eff2ab54..86522310 100644
--- a/src/Common/Languages/es-ar/ServiceErrors.php
+++ b/src/Common/Languages/es-ar/ServiceErrors.php
@@ -1,8 +1,10 @@
 <?php
 $lang['ErrArcherCodeExists']='ID Arquero ya Existe';
+$lang['ErrArcherCodeFree']='ID Arquero Disponible';
 $lang['ErrArcherCodeTooLong']='ID Arquero es Demasiado Largo';
 $lang['ErrArcherDobWrong']='Formato incorrecto Fecha de Nacimiento del Arquero';
 $lang['ErrArcherGivenLong']='Nombre Arquero Demasiado Largo';
+$lang['ErrArcherNoCode']='Arquero Sin Número de ID';
 $lang['ErrArcherNoDob']='Falta fecha de nacimiento del arquero';
 $lang['ErrArcherNoGiven']='Falta Nombre del Arquero';
 $lang['ErrArcherRegDateWrong']='Formato Incorrecto de la Fecha de Registro del Arquero';
@@ -10,6 +12,7 @@
 $lang['ErrClubCodeExists']='Código Club Ya Existe';
 $lang['ErrClubFullNameTooLong']='Nombre del Club Demasiado Largo';
 $lang['ErrClubId']='Club Inválido';
+$lang['ErrClubRegDateWrong']='Formato Fecha de Registro Errónea';
 $lang['ErrClubShortNameTooLong']='Nombre Corto del Club es Demasiado Largo';
 $lang['ErrDate']='Fecha inválida';
 $lang['ErrDivision']='División Incorrecta';
@@ -25,5 +28,6 @@
 $lang['ErrPassToSet']='Ingrese nueva contraseña';
 $lang['ErrSubClass']='Sub Clase inválida';
 $lang['ErrSubClassNotFound']='Subclase No Encontrada';
+$lang['InvalidData']='Información Inválida';
 $lang['WrongType']='Tipo Incorrecto';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es-ar/Tournament.php b/src/Common/Languages/es-ar/Tournament.php
index 13aa1b34..5ad110da 100644
--- a/src/Common/Languages/es-ar/Tournament.php
+++ b/src/Common/Languages/es-ar/Tournament.php
@@ -26,19 +26,25 @@
 $lang['AclISKServer']='Gestionar ISK';
 $lang['AclModules']='Módulos';
 $lang['ACLNoAccess']='Sin Acceso';
+$lang['AclNotes']='<b>Notas referidas a la Seguridad  de la Red</b><ul><li>Las restricciones están "basadas en la competencia" y no están "basadas en el servidor"</li><li>Cuando las políticas de acceso están habilitadas, el comportamiento por defecto para los usuarios sin permisos es "Sin Acceso"</li><li>localhost (127.0.0.1 o ::1) no se puede restringir</li><li>Las políticas de acceso se pueden deshabilitar llamando desde el servidor mismo <b>{$a}</b></li></ul>';
 $lang['AclOutput']='Salidas';
 $lang['AclParticipants']='Participantes';
 $lang['AclQualification']='Clasificación';
 $lang['ACLReadOnly']='Acceso Limitado (Solo Lectura)';
 $lang['ACLReadWrite']='Acceso Completo (Lectura y Escritura)';
+$lang['AclRobin']='Todos contra Todos';
 $lang['AclRoot']='Superusuario';
 $lang['AclSpeaker']='Presentador';
 $lang['AclTeams']='Finales por Equipos';
 $lang['Action']='Acción';
 $lang['ActualFlag']='Bandera Utilizada';
 $lang['AddMaxRows']='Añadir todas las filas disponibles';
+$lang['AddTournament']='Añadir Competencia';
+$lang['ADOfficer']='Anti Doping';
+$lang['AdvancedParams']='Parámetros Avanzados';
 $lang['AfterDistance']='Clasificación DESPUES de la siguiente ronda:';
 $lang['AfterXDistance']='Resultados DESPUES de Ronda $a';
+$lang['AgeClass']='Código Clase';
 $lang['AllDistances']='Todas';
 $lang['AllEvents']='Todas las Pruebas';
 $lang['AllRound']='Todas las Series';
@@ -62,18 +68,23 @@
 $lang['Area_6']='Areas VIP';
 $lang['Area_7']='$a Areas';
 $lang['Arr4Set']='Flechas por Set';
+$lang['ArrowPhaseLegend1']='Rondas/Flechas en Etapa de Eliminatorias';
+$lang['ArrowPhaseLegend2']='Rondas/Flechas en Etapa de Finales';
 $lang['Arrows']='Flechas';
-$lang['Arrows4End']='Flechas/Tanda: $a';
-$lang['ArrowsPerEnd']='Flechas/Tanda';
+$lang['Arrows4End']='Flechas/Rondas: $a';
+$lang['ArrowsPerEnd']='Flechas/Ronda';
 $lang['AssignAwarded']='Asignar Premiado';
 $lang['AtDistance']='Clasificación DE la siguiente ronda:';
 $lang['Ath4Target']='Arqueros por Contención';
+$lang['AthButtLegend1']='Oponentes por Contención';
+$lang['AthButtLegend2']='Encuentros por Contención';
 $lang['AthleteFile']='Cargar Arqueros desde Archivo';
 $lang['AthleteList']='Cargar Arqueros';
 $lang['AthleteSummary']='Resumen del Arquero';
 $lang['AtXDistance']='Resultados para la RONDA $a';
 $lang['AuthCode']='Código de Autorización';
 $lang['AutoEdits']='Autoeditar';
+$lang['AutoMoveNext']='Mover Automáticamente a Próx. Flecha';
 $lang['AutoTargetAssignment']='Asignación Automática de Contenciones - Sorteo';
 $lang['AvailableValues']='Valores Disponibles';
 $lang['Award']='Premio';
@@ -108,6 +119,7 @@
 $lang['BadgeStandard6-bis']='Acreditación Pequeña (6) Vegas';
 $lang['BadgeType']='Tipo de Acreditación';
 $lang['BadParams']='Parámetros Incorrectos!';
+$lang['BarcodeCapture']='Capturar Código de Barras';
 $lang['BarcodeMissing']='Imprimir Códigos de Barras Faltantes';
 $lang['BF_Phase']='Final por el Bronce';
 $lang['BigNames']='Imprimir en página completa';
@@ -121,9 +133,11 @@
 $lang['BlockSet']='Deshabilitar Edición';
 $lang['BlockSetup']='Bloquear Edición en Areas de la Competencia';
 $lang['BlockUnset']='Habilitar Edición';
+$lang['Block_Excluded']='IP Excluida de las restricciones - ACCESO FULL';
 $lang['Block_IP']='Acceso IP (v4)';
 $lang['Block_Manage']='Gestión de Acceso a la Red';
 $lang['Block_Nick']='Nombre de Acceso';
+$lang['Block_TemplateName']='Descripción';
 $lang['BoldIsDefault']='Negrita por defecto';
 $lang['BytesCurrent']='Ultimo';
 $lang['BytesDownload']='Bytes Descargados';
@@ -155,6 +169,7 @@
 $lang['CatJury']='Jurado de Apelación';
 $lang['CatOC']='Comité Organizador';
 $lang['ChairmanJudge']='Presidente de Jueces';
+$lang['ChairmanJudgeDeputy']='Vicepresidente de Jueces';
 $lang['ChairmanJury']='Presidente del Jurado de Apelación';
 $lang['ChangeLookUpTable']='Cambiar Tabla de Búsqueda';
 $lang['ChangeNationsNames']='Cambiar Nombre de los Paises';
@@ -164,32 +179,46 @@
 $lang['CheckTargetUpdate']='Verificar Actualización de Datos';
 $lang['CheckWaIds']='Verificar Identificaciones WA de arqueros coincidentes';
 $lang['Classes']='Clases';
+$lang['ClearField']='Borrar Campo';
 $lang['ClickToRequestCode']='Click para solicitar Código';
 $lang['Close2Center']='Más cerca del centro';
+$lang['Club-Nation']='Club';
 $lang['CmdAdd']='Añadir';
+$lang['CmdChange']='Modificar';
 $lang['CmdCloseBill']='Cerrar Recibo';
 $lang['CmdDelete']='Eliminar';
 $lang['CmdDeleteOnline']='Eliminar archivos en línea';
 $lang['CmdDetailsBill']='Detalles Recibo';
 $lang['CmdExec']='Ejecutar';
 $lang['CmdExport']='Exportar';
+$lang['CmdForgetPwd']='Olvidar Contraseñas';
 $lang['CmdGo']='Ir';
+$lang['CmdImport']='Importar';
 $lang['CmdOpenBill']='Abrir Recibo';
 $lang['CmdPrintBill']='Imprimir Recibo';
 $lang['CmdRemoveFilter']='Quitar Filtro';
 $lang['CmdResetBill']='Reiniciar Recibo';
 $lang['CmdSend']='Enviar';
 $lang['CmdUpload']='Subir';
+$lang['Coach']='Entrenador';
 $lang['Code']='Matrícula';
 $lang['CoinToss']='Lanzamiento de Moneda';
 $lang['CoinTossShort']='CT';
 $lang['Color']='Color';
 $lang['ColouredPhases']='Cuadros de Fase en Color';
+$lang['CombiCompNewRule']='Nueva Regla';
 $lang['ComparedTo']='Comparar c/pos. @ flechas (-1: último disponible)';
+$lang['CompetitionOfficials']='Personal de Campo';
 $lang['CompleteSchedule']='Programación completa';
+$lang['CompManager']='Responsable de la Competencia';
+$lang['CompVenue']='Lugar';
 $lang['Confirm']='Confirmar';
 $lang['ConfirmDescr']='ESTO DESTRUIRÁ LA ASIGNACIÓN ANTERIOR Y NO PUEDE SER DESHECHO!';
+$lang['ConfirmEnd']='Confirmar Ronda';
 $lang['ConfirmMatch']='Confirmar Encuentro';
+$lang['Cont-Nation']='Continente';
+$lang['Contacts']='Contactos';
+$lang['ContAssoc']='Federación';
 $lang['ControlCode']='Código de control';
 $lang['ControlMaterial']='Revisión de Equipo';
 $lang['CountryClubNames']='Nombres País/Club';
@@ -200,28 +229,40 @@
 $lang['Currency']='$';
 $lang['DailySchedule']='Programa Diario';
 $lang['Date']='Fecha';
+$lang['DateTimeSignature']='Fecha y Hora';
 $lang['Days']='Dias';
 $lang['Default']='Por defecto';
 $lang['DefaultCO']='CO por Defecto';
 $lang['DefaultHM']='HM por Defecto';
 $lang['DefaultLocRule']='FITA';
 $lang['DefaultVI']='VI por Defecto';
+$lang['Delayed']='Retraso (-1 para reiniciar)';
+$lang['DeleteAclRule']='Eliminar regla ACL';
+$lang['DeleteAclUser']='Eliminar usuario ACL';
+$lang['DeletePreviousArchers']='Eliminar las inscripciones no cargadas';
 $lang['DeletePreviousTeams']='Eliminar Equipos Anteriores';
 $lang['DeleteTourConfirm']='Por favor, ingrese el siguiente código de control:';
 $lang['DeleteTournament']='Eliminar Competencia';
 $lang['Deleting']='Procesando: borrando archivos en línea...';
+$lang['DescAddress']='Ver código';
+$lang['DescNOC']='Ver código';
 $lang['Descr']='Descripción';
-$lang['Distance']='Ronda';
-$lang['Distances']='Rondas';
+$lang['Distance']='Serie';
+$lang['Distances']='Series';
 $lang['DistanceShort']='Ronda';
 $lang['DistanceTime']='Rondas y Horas (solo las rondas con hora de inicio serán impresas)';
+$lang['Div-B']='Raso';
+$lang['Div-C']='Compuesto';
+$lang['Div-R']='Recurvo';
 $lang['Divisions']='Divisiones';
 $lang['DNF']='No terminó';
 $lang['DNS']='No comenzó';
 $lang['DOB']='Fecha de Nacimiento';
 $lang['Document']='Documento';
 $lang['Dos']='Director de Tiro';
+$lang['DosAssistant']='Ayudante del D. de Tiro';
 $lang['DoubleSpace']='Ballesta';
+$lang['DQB']='Descalificado por conducta antideportiva';
 $lang['DrawField3D']='Sorteo JJCC/3D';
 $lang['DrawNormal']='Sorteo estandar';
 $lang['DrawOris']='Sorteo Oris';
@@ -229,11 +270,14 @@
 $lang['DSQ']='Descalificado';
 $lang['E-Session']='Series Eliminatorias';
 $lang['Edit']='Editar';
+$lang['EditContact']='Editar Contacto';
 $lang['ElabTeamMode']='Modo Elaboración de Equipos';
+$lang['ElimEnds']='Rondas Eliminatorias';
 $lang['EliminationShort']='Elim.';
+$lang['EliminationType']='Tipo de Eliminatoria';
 $lang['Email']='Correo electrónico';
 $lang['EnableAccess']='Habilitar/Deshabilitar Políticas';
-$lang['Ends']='Tandas';
+$lang['Ends']='Rondas';
 $lang['EndUpdate']='Se hicieron todas las actualizaciones';
 $lang['Entries']='Inscriptos';
 $lang['EntriesByCountry']='Inscriptos por País';
@@ -242,7 +286,8 @@
 $lang['ERR_OK']='Sin errores';
 $lang['EventAccess']='Participación de los Arqueros en pruebas Ind/Equipos';
 $lang['EventCodeDeclared']='Código Prueba En línea';
-$lang['EventDetails']='$a[0] Tandas de $a[1] Flechas + $a[2] SO';
+$lang['EventDetails']='$a[0] Rondas de $a[1] Flechas + $a[2] SO';
+$lang['EventDetailsShort']='$a[0] rondas de $a[1] flechas';
 $lang['EventNumQualified']='Numero de Arqueros/Equipos para Seleccionar';
 $lang['EventPhaseResolved']='$a[0] - $a[1] resuelto!';
 $lang['Events']='Pruebas';
@@ -257,6 +302,8 @@
 $lang['FamilyName']='Apellido';
 $lang['FieldCleaned']='Campo Eliminado';
 $lang['FieldElabTeamMode']='Elaboración para JJCC';
+$lang['FieldResp']='Responsable de Campo';
+$lang['FieldScorecard']='Hoja de Puntuación JJCC/3D';
 $lang['FieldTourCategory']='JJCC';
 $lang['FilterOnDivCl']='Filtrar por División/Clase';
 $lang['FinalBracketsInd']='Esquemas para Final Individual';
@@ -271,7 +318,7 @@
 $lang['FinalTarget']='Contención para Finales';
 $lang['FinalTeamLabels']='Etiquetas Finalistas por Equipos';
 $lang['FindArcher']='Buscar Arquero';
-$lang['FinEnds']='Tandas Finales';
+$lang['FinEnds']='Rondas Finales';
 $lang['FirstPhase']='Primera Fase';
 $lang['FirstPhaseInOut']='Clasificado No. (y no)';
 $lang['FirstPhaseMatchesBye']='# de encuentros (y byes)';
@@ -283,7 +330,7 @@
 $lang['FlightsDay']='Día $a';
 $lang['FlightsDescription']='Descripción';
 $lang['FlightsDistTotal']='Total $a';
-$lang['FlightsEnd']='Tanda $a';
+$lang['FlightsEnd']='Ronda $a';
 $lang['FlightsReset']='Reiniciar';
 $lang['FlightsTotals']='Totales';
 $lang['FlightsUpdateSetup']='Actualizar Configuración';
@@ -297,12 +344,15 @@
 $lang['GetArcInfo']='Incluir Fecha de Nacimiento y E-mail del Arquero';
 $lang['GetCredentials']='Obtener Código Competencia';
 $lang['GetCredentialsExplained']='Puede solicitar la publicación de su competencia en nuestro servidor en <b><a href="http://ianseo.net/TourList.php" target="_blank">ianseo.net</a></b>.<br/> El servicio ofrecido es gratuito pero los términos y condiciones pueden cambiar en cualquier momento sin aviso previo.';
+$lang['GivenName']='Nombre';
 $lang['GoldLabel']='Etiqueta para Diez';
 $lang['GoLive']='Seguir en vivo!';
 $lang['GoToRunning']='Ir Al Turno en Ejecución';
 $lang['Group']='Grupo';
 $lang['Group#']='Grupo $a';
+$lang['GroupBy']='Agrupar Por';
 $lang['HiddenCredited']='Ocultar Acreditados';
+$lang['HorScore']='Hoja de puntuación Horizontal';
 $lang['Hour']='Hora';
 $lang['I-Session']='Encuentros Individuales';
 $lang['IanseoDbVersionTooOld']='Versión de Base de Datos de Ianseo es más antigüa que InfoSystem';
@@ -310,6 +360,7 @@
 $lang['IdCard']='Tarjeta Identificación';
 $lang['Image']='Imagen';
 $lang['ImageChecked']='Imagen Verificada';
+$lang['ImgInfo']='Tipo de imágenes permitidas: PNG y JPG - Tam. máx: 256KB';
 $lang['ImportARFFile']='Importar archivo ARF';
 $lang['ImportedEntries']='Inscripciones importadas';
 $lang['ImportedTour']='Competencia importada';
@@ -321,13 +372,21 @@
 $lang['IndFinEvent']='Final Indiv.';
 $lang['IndoorTourCategory']='Competencia de Salón';
 $lang['IndQual']='Individual - Serie Clasif.';
+$lang['InitEliminations']='Inicializar Eliminatorias';
 $lang['InitProcess']='Inicializando';
 $lang['Invalid Password']='Contraseña Incorrecta';
 $lang['IOCcode']='Código IOC';
+$lang['IRM-10']='DNS-No comenzó';
+$lang['IRM-15']='DSQ-Descalificado';
+$lang['IRM-20']='DQB-Descalificado por conducta antideportiva';
+$lang['IRM-5']='DNF-No terminó';
+$lang['IRM-7']='DNF-No terminó (no rankea)';
+$lang['IrmStatus']='Situación IRM';
 $lang['IsDbVersionTooOld']='Base de Datos InfoSystem es más antigua que Ianseo';
 $lang['IsGenericConfig']='Configuración Genérica';
 $lang['Judge']='Juez';
 $lang['Jury']='Miembro del Jurado de Apelación';
+$lang['Languages']='Idiomas';
 $lang['Last']='Ultimo';
 $lang['LastPhase']='Ultima Fase';
 $lang['LastTarget']='Ultima Contención';
@@ -340,14 +399,18 @@
 $lang['ListLoadBlocked']='Líneas NO actualizadas (presione sobre el enlace para forzar la actualización)';
 $lang['ListLoadInserted']='Líneas insertadas';
 $lang['ListLoadUpdated']='Líneas actualizadas';
+$lang['LiveUpdate']='En Vivo!';
 $lang['Loading']='Cargando...';
 $lang['LocalCode']='Matrícula Local';
 $lang['LocalRule']='Reglamentación';
 $lang['LocalRuleAlert']='ATENCION!\n\nRecuerde seleccionar la Reglamentación correcta a utilizar, si la hay, en el siguiente cuadro!';
 $lang['LocalSubRule']='Subregla';
+$lang['Location']='Ubicación';
 $lang['LocRuleDefaultNo']='Por defecto';
 $lang['LocRuleModifiedNo']='Modificado';
 $lang['LocRuleValidNo']='No Modificado';
+$lang['Login']='Logearse';
+$lang['LogisticResp']='Responsable de la Logística';
 $lang['LogoB']='Imágen Inferior (la proporción para anchura completa es 19:1 para A4, y 20:1 para Carta)';
 $lang['LogoL']='Imágen Superior Izquierda';
 $lang['LogoManagement']='Gestión de Imágenes';
@@ -359,13 +422,17 @@
 $lang['LUE-FRA']='Francia';
 $lang['LUE-ITA']='Italia';
 $lang['LUE-ITA_e']='Italia (esordienti)';
+$lang['LUE-ITA_i']='Italia (Indoor)';
 $lang['LUE-ITA_p']='Italia (pinocchio)';
 $lang['LUE-NOR']='Noruega';
 $lang['LUE-NOR_s']='Noruega (estandar)';
+$lang['LUE-SLO']='Eslovenia';
 $lang['LUE-SUI']='Suiza';
 $lang['LUE-SWE']='Suecia';
 $lang['LueFill']='Crear Búsqueda de Inscriptos';
 $lang['MailBody']='Correo electrónico';
+$lang['MailCc']='Copia Carbónica (CC)';
+$lang['MailConfirmSending']='Este mail será enviado a _NUM_ direcciones. Confirma?';
 $lang['MailFrom']='Remitente (De)';
 $lang['MailPreview']='Vista Previa';
 $lang['MailSmtpPort']='Puerto SMTP';
@@ -373,6 +440,7 @@
 $lang['MailSmtpServer']='Servidor SMTP';
 $lang['MailSmtpUser']='Usuario SMTP';
 $lang['MailSubject']='Asunto';
+$lang['MailTitle']='Nombre';
 $lang['MakeSnapshotError']='Imposible guardar vista instantánea';
 $lang['MakeSnapshotOk']='Vista instantánea guardada satisfactoriamente';
 $lang['MakeTeams']='Re-Generar Equipos';
@@ -386,11 +454,13 @@
 $lang['ManMatchArr4Phase']='Definir las Flechas por Set de las Fases';
 $lang['ManPrices']='Gestión de Tarifas';
 $lang['ManSession']='Gestión de Turnos de Tiro';
+$lang['ManStaffOnField']='Gestión Personal de Campo';
 $lang['ManSubClasses']='Gestión de Sub Clases';
 $lang['ManTourDistances']='Configurar Rondas de la Competencia';
 $lang['ManTraining']='Gestión de Turnos para Calentamiento';
 $lang['ManualTargetAssignment']='Asignar Contención Manualmente';
 $lang['Match']='Encuentro';
+$lang['Match4Target']='Encuentros por Contención';
 $lang['MatchDateTime']='Fecha/Hora Encuentro';
 $lang['MatchMins']='Duración del encuentro (min.)';
 $lang['MatchName-0']='Encuentro Medalla de Oro';
@@ -405,6 +475,9 @@
 $lang['MedalClass']='Resultados por Clase y División - Medallas';
 $lang['MedalIndClass']='Resultados por Clase y División - Medalla Individual';
 $lang['MedalSqClass']='Resultados por Clase y División - Medallas Equipo';
+$lang['MediaResp']='Responsable de Medios';
+$lang['MedOfficer']='Médico';
+$lang['MissingPhoto']='Sin Foto';
 $lang['MissingScorecards']='Hojas de puntuación de $a->session, ronda $a->distance';
 $lang['MixedTeamFinEvent']='Final Equipo Mixto';
 $lang['MoveWinner2NextPhase']='Mover Ganador a Próxima Fase';
@@ -412,15 +485,18 @@
 $lang['MsgLookup2']='Verificar Integridad de los Datos';
 $lang['MsgLookup3']='Importar Datos';
 $lang['MsgLookup4']='Verificar Datos del Competidor';
-$lang['MsgLookup5']='Tanda';
+$lang['MsgLookup5']='Ronda';
 $lang['MsgSelOneValue']='Por favor, seleccione un valor!';
 $lang['MsgSyncFile']='Descargar Actualización desde un archivo';
 $lang['MsgSyncNet']='Descargar Actualización desde Internet';
 $lang['MsgSyncronize']='Sincronizar Archivo de Arqueros';
 $lang['Multimedia']='Multimedia';
 $lang['Name']='Nombre';
+$lang['Nameplates']='Cartel Identificatorio';
 $lang['NationShort']='Nombre Completo País/Fed./Club';
+$lang['Natl-Nation']='País';
 $lang['New']='Nueva';
+$lang['NewChannel']='Añadir nuevo canal vacío.';
 $lang['NewMediaContent']='Añadir contenido Multimedia';
 $lang['NewTour']='Nueva Competencia';
 $lang['NewTourContent']='Añadir contenido de la competencia';
@@ -428,16 +504,20 @@
 $lang['NoAcc']='No Acreditados';
 $lang['NoAth2Manage']='No hay arqueros para gestionar!';
 $lang['NoCredential']='Códigos On-line no configurados';
-$lang['NoDistance']='Sin Tandas';
+$lang['NoDistance']='Sin Rondas';
 $lang['NoFilters']='Sin filtros';
 $lang['NoMoreAth4Session']='No puedes agregar otros arqueros al turno seleccionado!';
 $lang['NoMorePhases']='No Más Fases';
 $lang['NoPay']='Gratis';
 $lang['NoSession']='Sin Turno';
+$lang['NoStaffOnField']='No Hay Personal de Campo';
+$lang['NoSwapOpponents']='Oponentes no pueden ser intercambiados';
 $lang['NotAllShootoffResolved']='Las siguientes pruebas no han sido guardadas porque no todos los shoot off han sido resueltos: $a';
 $lang['NoTeamUpdate']='No Actualizar Equipos';
+$lang['Notes']='Notas';
 $lang['NotInTournament']='No Compite';
 $lang['NoTour']='No ha Seleccionado Competencia';
+$lang['NotUsable']='No Disponible';
 $lang['Now']='Ahora';
 $lang['NumberOfEntriesByCountry']='Número de Inscriptos por País';
 $lang['NumberOfEntriesByEvent']='Número de Inscriptos por Prueba';
@@ -453,6 +533,7 @@
 $lang['OpDelete']='Operación Requerida: Borrar';
 $lang['Opponent']='Oponente';
 $lang['OpponentName']='Oponente: $a';
+$lang['Opponents']='Oponentes';
 $lang['OpponentSignature']='Firma del Oponente';
 $lang['Option1']='Opcional 1';
 $lang['Option2']='Opcional 2';
@@ -463,9 +544,12 @@
 $lang['OR-Record']='Record Olímpico';
 $lang['OR-short']='OR';
 $lang['Order']='Orden';
+$lang['OrisScorecards']='Hojas de Puntuación (C73D)';
+$lang['OrisScorecardsTeam']='Hojas de Puntuación (C73D)';
 $lang['OtherTourCategory']='Otra';
 $lang['OutdoorTourCategory']='Competencia Aire Libre';
 $lang['OverwritePreviousArchers']='Sobreescribir Arqueros Anteriores';
+$lang['OvrSignalSendAll']='Enviar Todo';
 $lang['PaperSize']='Tamaño Papel';
 $lang['ParamWarning']='ATENCION!<br/>Ingresando los valores incorrectos en éste campo puede dañar su configuración!<br/>Usar con EXTREMA precaución!';
 $lang['PartecipantLabel']='Listado de Participantes - Etiquetas';
@@ -479,6 +563,7 @@
 $lang['PhaseBlock_0']='Personal de la Competencia';
 $lang['PhaseBlock_1']='Clasificación';
 $lang['PhaseBlock_10']='Configuración de Vuelos';
+$lang['PhaseBlock_11']='Todos contra Todos';
 $lang['PhaseBlock_2']='Eliminatorias';
 $lang['PhaseBlock_3']='Final individual';
 $lang['PhaseBlock_4']='Final por Equipo';
@@ -486,6 +571,8 @@
 $lang['PhaseBlock_6']='Información de la Competencia';
 $lang['PhaseBlock_7']='Cambios en la Media';
 $lang['PhaseBlock_8']='Acreditación';
+$lang['PhaseBlock_9']='Publicación En Línea';
+$lang['PhasesDetails']='Opciones Específicas de las Fases';
 $lang['PhaseTimeDescription']='Una vez que la fecha y la hora de una fase han sido introducidas, el horario de las siguientes fases se puede asignar rápidamente insertando en el campo hora un "+" seguido del total de minutos y presionando sobre "Colocar en todos".';
 $lang['Photo']='Foto';
 $lang['PhotoBadTypeError']='Formato incorrecto!';
@@ -509,19 +596,26 @@
 $lang['PrintChinese']='Incluir caracteres chinos';
 $lang['PrintCommentTip']='Introducir «||X» [(pipe)(pipe)(Number of Arrows)] para imprimir "Provisorio después de X flechas" en todas las publicaciones de Clasificaciones y Series de Eliminatorias
 Introducir «||!X» [(pipe)(pipe)(exclamation point)(Number of Arrows)] para imprimir "Oficial después de X flechas" en todas las publicaciones de Clasificaciones y Series Eliminatorias.';
+$lang['PrintFlightsAwardsByName']='Listado Ganadores por Nombre';
+$lang['PrintFlightsAwardsCheck']='Lista de Ganadores del Premio';
+$lang['PrintFlightsByName']='Por Nombre';
 $lang['PrintLabels']='Imprimir Etiquetas';
 $lang['PrintLanguage']='Idioma para impresión';
 $lang['PrintList']='Imprimir Listados';
 $lang['PrintNames']='Imprimir Nombres';
 $lang['PrintNormal']='Normal (Latin)';
 $lang['PrintScore']='Imprimir Hojas de Puntuación';
+$lang['PrintScoreInd']='Imprimir Hojas de Puntuación Prueba Individual';
+$lang['PrintScoreTeam']='Imprimir Hojas de Puntuación por Equipos';
 $lang['PrintText']='Texto del encabezamiento';
 $lang['PrintTextTitle']='Encabezamiento para Impresión de Resultados';
 $lang['Q-Session']='Series de Clasificación';
 $lang['QF_Phase']='Cuartos de Final';
+$lang['QR-Code']='Código QR';
 $lang['QrCode']='Código QR con detalles del arquero';
 $lang['QualificationLoaded']='Datos de Clasificación Cargados para el turno {$a}';
 $lang['QualSessionShort']='Turno Clasif.';
+$lang['R-Session']='Todos contra Todos';
 $lang['RaiseFlag']='Izar Banderas';
 $lang['RankByDistance']='Clasificación por ronda';
 $lang['RankFinals']='Clasificación Final';
@@ -533,22 +627,30 @@
 $lang['Reference']='Referencia';
 $lang['RelatedMatchTime']='Horario del Encuentro Relacionado';
 $lang['Reload']='Recargar';
+$lang['RememberPwd']='Recordar Contraseñas';
+$lang['RemoveStars']='Remover Todo *';
 $lang['ReplicaServer']='Réplica servidor $a';
 $lang['ReplicaServerNew']='Nuevo Servidor de Réplica';
 $lang['Report']='Informe';
 $lang['ReportCopy1']='Copia para los jueces';
 $lang['ReportCopy2']='Copia para el país';
 $lang['ReportCopy3']='Copia para la federación';
+$lang['RePrint']='Imprimir de Nuevo';
 $lang['RequestDisclaimer']='Enviar el correo electrónico no implica que la solicitud sea aceptada. El servicio se brinda "tal cual" y puede ser suspendido en cualquier momento si aviso previo. Si una competencia no tiene resultados (ej: Clasificación) al término de la misma podrá ser eliminada sin advertencia previa.';
+$lang['RequestEmail']='Email Responsable de Resultados';
 $lang['RequestHeader']='Por favor envíame los códigos para ésta competencia (recuerda elegir una contraseña):';
+$lang['ResetBadges']='Reiniciar Estado Impresión';
 $lang['ResetElimError']='ADVERTENCIA! Error al reiniciar las eliminatorias!';
 $lang['ResultAbs']='Serie Clasificatoria - Completa';
 $lang['ResultClass']='Resultados por Clase y División';
 $lang['ResultIndAbs']='Serie Clasificatoria - Individual';
 $lang['ResultIndClass']='Resultados por Clase y División - Individual';
+$lang['ResultResp']='Responsable de Resultados';
 $lang['Results']='Resultados';
 $lang['ResultSqAbs']='Serie Clasificatoria - Equipos';
 $lang['ResultSqClass']='Resultados por Clase y División - Equipo';
+$lang['ResultsRobin']='Resultados Prueba Todos contra Todos';
+$lang['ResVerifier']='Control de Resultados';
 $lang['Round']='Serie';
 $lang['Round#']='Serie $a';
 $lang['RoundSummary']='Resumen de Series';
@@ -556,12 +658,14 @@
 $lang['Row-2']='Segunda Fila';
 $lang['RunningEv']='Clasificación por Media';
 $lang['RunningEvents']='Configuración de Eventos en Curso';
+$lang['RunningTotal']='Acumulado Total';
 $lang['Schedule']='Programa';
 $lang['ScheduledMatches']='Encuentros Programados';
 $lang['ScheduledSessions']='Turnos Programados';
 $lang['ScheduleFromDay']='Programa desde día:';
 $lang['ScheduleNotes']='Notas sobre la programación';
 $lang['ScheduleToday']='Programa de Hoy';
+$lang['ScheduleUnfinished']='Excluir turnos finalizados';
 $lang['SchIncFinalists']='Incluir Nombres de Finalistas';
 $lang['Score']='Puntaje';
 $lang['Score1PageAllDist']='Imprimir hoja de Puntuación del arquero con todas las rondas en una página';
@@ -570,17 +674,19 @@
 $lang['ScorecardsInd']='Hoja Puntuación Pruebas Individuales';
 $lang['ScorecardsQual']='Hojas de Puntuación para Clasificación';
 $lang['ScorecardsTeams']='Hoja Puntuación Pruebas por Equipo';
-$lang['ScoreCollector']='Recoger datos Flecha a Flecha, elije cuantas flechas por tanda:';
+$lang['ScoreCollector']='Recoger datos Flecha a Flecha, elije cuantas flechas por ronda:';
 $lang['ScoreComplete']='Hoja de Puntuación Completa (Esquema y Datos)';
 $lang['ScoreCompleteTotals']='Hoja de Puntuación Completa (Esquema y Datos) + Columna para los totales arrastrados de la competencia';
 $lang['ScoreCutoff']='Puntuación de Corte';
 $lang['ScoreData']='Solo Datos';
+$lang['ScoreFile-1']='Por Turnos';
+$lang['ScoreFile-2']='Por Categorías';
 $lang['ScoreFinalMatch']='Encuentro Final';
 $lang['ScoreFlags']='Añadir Banderas de País/Club';
 $lang['ScoreLogos']='Agregar Imágenes';
 $lang['ScorePrintMode']='Imprimir Hojas de Puntuación - Detalles';
-$lang['ScoreSingle']='Hoja Única con una Tanda (Estilo Vegas)';
-$lang['ScoreSingleAllDistances']='Hoja Única con Todas las Tandas';
+$lang['ScoreSingle']='Hoja Única con una Ronda (Estilo Vegas)';
+$lang['ScoreSingleAllDistances']='Hoja Única con Todas las Rondas';
 $lang['ScoreTargetNo']='Solo Número de Contención';
 $lang['ScoreTournament']='Incluir Encabezamiento de la Competencia';
 $lang['Search']='Buscar';
@@ -593,6 +699,7 @@
 $lang['SendAll']='Enviar a todos';
 $lang['SendAwarded']='Ganadores de los premios';
 $lang['SendData']='Enviar Datos';
+$lang['SendLogos']='Enviar Imágenes de la Competencia';
 $lang['SendMail']='Enviar Mail';
 $lang['SendTestMail']='Enviar correo de prueba a:';
 $lang['SeparateClasses']='Clases Separadas';
@@ -602,6 +709,7 @@
 $lang['SessionEnd']='Fecha/Hora Finalización del Turno';
 $lang['SessionShort']='Tur.';
 $lang['SessionStart']='Fecha/Hora de Inicio del Turno';
+$lang['SessionTime']='Horario Turno';
 $lang['Set-DSQ']='Configurar como DSQ';
 $lang['SetAccreditedAll']='Setear seleccionados como Acreditados';
 $lang['SetByUser']='Configurado por el usuario';
@@ -626,7 +734,7 @@
 $lang['ShowMissing']='Mostrar Hojas de Puntuación Faltantes';
 $lang['ShowPicture']='Mostrar Fotos';
 $lang['showRecords']='Mostrar Records';
-$lang['ShowSetEnds']='Incluir Tandas de Set';
+$lang['ShowSetEnds']='Incluir Rondas de Set';
 $lang['ShowSubClass']='Mostrar Sub Clases';
 $lang['Sign/guide-board']='Cartel';
 $lang['SingleArrow']='Flecha Única';
@@ -636,6 +744,8 @@
 $lang['Special']='Premio Especial';
 $lang['SpecialFilter']='Filtro especial (ver código)';
 $lang['SportPres']='Presentación Deportiva';
+$lang['Spotter']='Observador';
+$lang['StaffOnField']='Personal de Campo';
 $lang['StandardElabTeamMode']='Elaboración Estandar';
 $lang['StandardEv']='Clasificación Normal';
 $lang['StartCamera']='Iniciar Cámara';
@@ -691,6 +801,7 @@
 $lang['SuggestedFlag']='Bandera Sugerida';
 $lang['SupportIanseo']='Por favor considere apoyar a Ianseo: ve a www.ianseo.net y presiona el botón "Donate" :)';
 $lang['SVGFile']='Archivo SVG';
+$lang['SwapOpponents']='Intercambiar Oponentes';
 $lang['T-Session']='Encuentros por Equipos';
 $lang['TakePicture']='Capturar Foto para Acreditación';
 $lang['Tar4Session']='Contenciones por Turno';
@@ -701,6 +812,7 @@
 $lang['TargetAssignment']='Imprimir Asignación de Contenciones';
 $lang['TargetAssignmentDescription']='Un simple número asigna esta contención a este encuentro;<br/> Un número seguido por el signo "+" asigna el número de las contenciones desde este encuentro hasta el último correspondiente a esta fase, con un incremento continuo de una unidad;<br/> Un número seguido por el signo "-" asigna el número de las contenciones desde este encuentro hasta el último correspondiente a esta fase con incremento continuo de una unidad, pero solamente para aquellos encuentros sin pase directo.<br/> Un número seguido por el signo "*" asigna el número de las contenciones desde este encuentro hasta el último de esta fase con incremento continuo de una unidad, dejando un hueco de una contención entre dos parapetos adyacentes.';
 $lang['TargetDoAssignment']='Asignar a contención';
+$lang['TargetJudgeSignature']='Firma del Juez';
 $lang['Targets']='Contenciones';
 $lang['TargetShort']='C#';
 $lang['TargetsToHHt']='Enviar asignación de Contención en lugar de Nombres';
@@ -710,7 +822,8 @@
 $lang['TeamCreationMode_2']='Siempre 2do Equipo';
 $lang['TeamCreationMode_3']='Siempre 3er Equipo';
 $lang['TeamFin']='Equipos - Serie Elim. y Final';
-$lang['TeamFinEvent']='Final por Equipo';
+$lang['TeamFinEvent']='Pruebas por Equipo';
+$lang['TeamManagerSignature']='Firma Capitán del Equipo';
 $lang['TeamPlace']='Imprime Identificación Zona de Equipo';
 $lang['TeamPlaceLocal']='Imprime Identificación Zona de Equipo (localizado)';
 $lang['TeamQual']='Equipos - Serie Clasif.';
@@ -725,6 +838,7 @@
 $lang['Total1']='Total (1ra. Mitad)';
 $lang['Total2']='Total (2da. Mitad)';
 $lang['TotalCompetitors']='Total de Competidores';
+$lang['TotalMissingScorecars']='$a Hojas de Puntuación Faltante(s)';
 $lang['TotalProg']='Sum';
 $lang['TotalShort']='Tot.';
 $lang['TourBusy']='ATENCION!\n\nEstá por importar una competencia mientras otra competencia se está ejecutando!\nDesea confirmar la operación?';
@@ -754,7 +868,7 @@
 $lang['TourType_4']='Campo';
 $lang['TourType_8']='3D';
 $lang['TourWhen']='Fecha';
-$lang['TourWhere']='Lugar';
+$lang['TourWhere']='Dirección';
 $lang['Transport']='Transportes';
 $lang['Transport_1']='Auto';
 $lang['Transport_2']='Van';
@@ -781,6 +895,7 @@
 $lang['TVCss3CountryCode']='Código Pais/Fed./Club';
 $lang['TVCss3CountryDescr']='País/Fed./Club';
 $lang['TVCss3Defaults']='Por defecto para todas las páginas. Usar sintaxis CSS3 para el elemento';
+$lang['TVCss3DistScore']='Puntaje Ronda';
 $lang['TVCss3Divider']='Divisor';
 $lang['TVCss3Flag']='Bandera (img)';
 $lang['TVCss3FlagDiv']='Bandera (div)';
@@ -826,6 +941,7 @@
 $lang['TVDefinedChain']='Segmentos de regla ya definidos';
 $lang['TVFilter-Display']='Competencia: filtro<br>Multimedia: tiempo visualización';
 $lang['TVFilterColumns']='Columnas para mostrar';
+$lang['TvGivenName']='Nombre TV';
 $lang['TvLightPage']='Versión Liviana';
 $lang['TVManagingRule']='Gestión de regla: $a';
 $lang['TVMultimediaContents']='Contenido Multimedia';
@@ -839,6 +955,7 @@
 $lang['TVMultimediaTimeDescr']='Tiempo en segundos de la visualización de éste contenido en éste segmento';
 $lang['TVNameComplete']='Ver nombre completo del arquero';
 $lang['TVNameCompleteDescr']='On: muestra primer nombre del arquero de forma completa<br/>Off: muestra solo la inicial del primer nombre.';
+$lang['TVNameShort']='Nombre Corto para TV';
 $lang['TVNewRule']='Nueva regla';
 $lang['TVNoFill2NotChange']='Dejar vacío si no quiere modificar';
 $lang['TVNumRows']='Número de filas a recuperar';
@@ -876,7 +993,7 @@
 $lang['TVViewDetailsDescr']='Alterna para mostrar los 10s y los 9s/Xs';
 $lang['TvViewDIST']='Ver Columnas de Cada Ronda';
 $lang['TvViewDIVCLAS']='Ver Categoría';
-$lang['TvViewENDS']='Ver Detalle de Tanda';
+$lang['TvViewENDS']='Ver Detalle de la Ronda';
 $lang['TvViewFLAG']='Ver Banderas';
 $lang['TVViewNationName']='Ver nombres completos de los países/club';
 $lang['TVViewNationNameDescr']='Alterna la visualización del País/Club del arquero';
@@ -896,6 +1013,7 @@
 $lang['Type_FITA']='FITA';
 $lang['Type_FITA 72']='FITA 72';
 $lang['Type_FITA+50']='Serie FITA + 50m';
+$lang['Type_GiochiStudentes']='Juegos Escolares';
 $lang['Type_Indoor 18']='Salón 18 m';
 $lang['Type_Indoor 25']='Salón 25 m';
 $lang['Type_Indoor 25+18']='Salón 25+18';
@@ -906,13 +1024,19 @@
 $lang['Type_NorH']='Cazador (Noruega)';
 $lang['Type_NZ_FITA+72']='Serie FITA + 70m/50m';
 $lang['Type_ProAMIndoor']='Salón ProAM';
+$lang['UDPPort']='Puerto UDP';
 $lang['Unisex']='Unisex';
 $lang['Unset-DSQ']='Eliminar DSQ';
 $lang['UpdateIanseo']='La versión de Ianseo no es compatible con el servicio requerido: por favor actualice a una versión más reciente!';
 $lang['UpdateJPG']='también crear versión JPG';
+$lang['UpdateNeeded']='Necesita actualizar a la última versión de Ianseo para subir los resultados';
 $lang['UpdatePNG']='Actualizar el archivo PNG correspondiente?';
 $lang['URL']='URL';
+$lang['UserPassword']='Nueva Contraseña';
+$lang['UserPasswordOld']='Contraseña Anterior';
+$lang['UserPasswordRetype']='Confirmar Nueva Contraseña';
 $lang['UseSubClasses']='Aplicar a subclases específicas';
+$lang['ValidClass']='Clases Válidas';
 $lang['ValidDivisions']='Div. Permitidas (vacío para todas)';
 $lang['VersionBracketsInd']='Esquema Individual';
 $lang['VersionBracketsTeam']='Esquema por Equipos';
@@ -925,7 +1049,9 @@
 $lang['VersionPrintDateTime']='Imprimir Fecha y Hora';
 $lang['VersionSector']='Sector';
 $lang['VersionSectors']='Sectores Afectados';
+$lang['ViewTeamComponents']='Ver miembros del equipo (absoluto)';
 $lang['ViewTeamComponentsDescr']='Alterna la visualización de los miembros del equipo';
+$lang['WaIdShort']='ID Arquero';
 $lang['WarmUp']='Calentamiento';
 $lang['WarmUpMins']='Calentamiento (min.)';
 $lang['WarmupTargets']='Contenciones para calentamiento';
diff --git a/src/Common/Languages/es/Api.php b/src/Common/Languages/es/Api.php
index dac47246..151ffa6d 100644
--- a/src/Common/Languages/es/Api.php
+++ b/src/Common/Languages/es/Api.php
@@ -31,6 +31,7 @@
 $lang['DevConnected']='Conectado';
 $lang['DevDisconnected']='Desconectado';
 $lang['DistanceNum']='Distancia $a';
+$lang['FieldMonitor']='Monitor de campo';
 $lang['FlashCodeDistance']='Escanear este código en la App para tantear $a';
 $lang['HitToWin']='Impacto para ganar';
 $lang['ImportDoneQualRecheck']='Se han importado los resultados de la Serie de Calificación. Por favor, comprobar la clasificación tan pronto como sea posible.';
@@ -49,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='Estado de la conexión';
 $lang['ISK-DeleteDevices']='Eliminar dispositivos';
 $lang['ISK-DenyAccess']='Acceso denegado';
+$lang['ISK-Deprecated']='IMPORTANTE: la App "Ianseo Score Keeper (ISK)" va a ser dada de baja en las tiendas Android y Apple, y ya no será respaldada, por lo que se dará de baja de Ianseo en Septiembre de 2024. Por favor,  cambie a la nueva aplicación "Ianseo Score Keeper NG".';
 $lang['ISK-DeviceAlive']='En línea';
 $lang['ISK-DeviceBattery']='Batería';
 $lang['ISK-DeviceEnabled']='Habilitado';
@@ -78,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='No se ha podido obtener el Código de la Competición';
 $lang['ISK-Lite-QRCode']='Imprimir el Código QR para el Dispositivo ISK de Resultados de Ianseo';
 $lang['ISK-Lite-ServerUrl']='Servidor URL (incluido protocolo y puerto, de no ser el 80)';
+$lang['ISK-Live-Deprecated']='IMPORTANTE: La App "Ianseo Score Keeper Live" no será respaldada en adelante, y será dada de baja en Ianseo en Septiembre de 2024. Por favor, cambie a la nueva App "Ianseo Score Keeper NG".';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper DIRECTO';
 $lang['ISK-lockPortrait']='Bloquear el dispositivo en vista vertical';
 $lang['ISK-Name']='Dispositivo ISK de Ianseo';
@@ -90,6 +93,7 @@
 $lang['ISK-OnlyProAloud']='¡Solo la aplicación Pro está permitida en está competición!';
 $lang['ISK-Options']='Opciones';
 $lang['ISK-OptionsOVA']='Opciones de Asistente en Competición';
+$lang['ISK-OptionsWAGate']='Opciones para puertas WA';
 $lang['ISK-Pro-Name']='Ianseo ScoreKeeper Pro';
 $lang['ISK-QRCode']='Imprimir Código QR para Ianseo ScoreKeeper';
 $lang['ISK-RefreshTO']='Terminado el tiempo de actualización de datos';
@@ -154,6 +158,7 @@
 $lang['NewGroup']='Nueva asignación de grupos';
 $lang['NewTarget']='Nueva asignación de dianas';
 $lang['PartialImport']='Autoimportar Parciales';
+$lang['PartialImportAll']='Importar TODO';
 $lang['PopupStatusDistance']='Distancia: $a';
 $lang['PopupStatusEnd']='Tanda: $a';
 $lang['PopupStatusEvent']='Evento: $a';
@@ -181,11 +186,15 @@
 $lang['SelectedReNumber']='Renumerar dispositivos empezando desde';
 $lang['StatusTemporaryArrows']='Situación de las flechas en la Tabla Temporal';
 $lang['StickyAlreadySet']='Los adhesivos de las tandas han sido configurados en un Turno diferente!';
+$lang['TargetRequests-Printout']='Imprimir la hoja de CódigosQR de las Dianas Requeridas';
+$lang['TargetScoring-Printout']='Imprimir la hoja de Códigos QR de las Dianas en que se está tanteando.';
 $lang['TempArrowsDelete']='ELIMINAR Flechas de la Tabla Temporal';
 $lang['TempArrowsImport']='Importar flechas desde la Tabla Temporal';
+$lang['TempArrowsM']='No se han importado los valores de las flechas de los encuentros (Ind., Equipos, Calificaciones, Grupos, etc)';
 $lang['TempArrowsQ']='No se han importado los valores de flechas de las Series de Calificación ni de las Eliminatorias';
 $lang['UnlockAll']='Desbloquear todos los turnos';
 $lang['UsePersonalDevices-Granted']='Personal';
+$lang['UsePersonalDevices-Print']='Imprimir los CódigosQR en las Hojas de Puntuación de las Dianas Requeridas';
 $lang['ViewSize']='Ver tamaño';
 $lang['WAToolbox-MissingParams']='Faltan parámetros';
 $lang['WAToolbox-NoCompCode']='No se ha podido obtener el Código de la Competición';
diff --git a/src/Common/Languages/es/BackNumbers.php b/src/Common/Languages/es/BackNumbers.php
index 43346bfd..9a9ed89c 100644
--- a/src/Common/Languages/es/BackNumbers.php
+++ b/src/Common/Languages/es/BackNumbers.php
@@ -84,8 +84,10 @@
 $lang['FamCaps']='APELLIDOS';
 $lang['FamCaps-GAlone']='APELLIDOS N.';
 $lang['FamCaps-GivCamel']='APELLIDOS Nombre';
-$lang['FamCaps-GivCamel-ClubCamel']='Apellidos, Nombre, País';
+$lang['FamCaps-GivCamel-ClubCamel']='APELLIDOS Nombre, País';
+$lang['FamCaps-GivCamel-ClubCaps']='APELLIDOS Nombre, País';
 $lang['FamCaps-GivCaps']='APELLIDOS NOMBRE';
+$lang['FamCaps-GivCaps-ClubCaps']='APELLIDOS NOMBRE, País';
 $lang['FinalRanking']='Clasificación Final';
 $lang['FinPosition']='Posición Final';
 $lang['Flag']='Bandera del País/Club';
@@ -93,11 +95,16 @@
 $lang['GAlone-FamCaps']='N. APELLIDOS';
 $lang['GivCamel']='Nombre';
 $lang['GivCamel-FamCamel']='Nombre Apellidos';
+$lang['GivCamel-FamCamel-ClubCamel']='Nombre Apellidos, País';
 $lang['GivCamel-FamCaps']='Nombre APELLIDOS';
+$lang['GivCamel-FamCaps-ClubCamel']='Nombre APELLIDOS, País';
+$lang['GivCamel-FamCaps-ClubCaps']='Nombre APELLIDOS, PAÍS';
 $lang['GivCaps']='NOMBRE';
 $lang['GivCaps-FamCaps']='NOMBRE APELLIDOS';
+$lang['GivCaps-FamCaps-ClubCaps']='NOMBRE APELLIDOS, PAÍS';
 $lang['GivenNameInitial']='Inicial del nombre';
 $lang['Heigh']='Altura';
+$lang['HLayout']='Horizontal';
 $lang['HLine']='Linea horizontal';
 $lang['I-Badge']='Dorsales para los encuentros individuales';
 $lang['IdCardHor']='a lo ancho';
@@ -128,6 +135,8 @@
 $lang['OpenPictureScreen']='Abrir pantalla secundaria';
 $lang['PageDimension']='Tamaño de Página';
 $lang['PaperDimention']='Dimensiones del papel';
+$lang['PhaseFrom']='De Fase';
+$lang['PhaseTo']='A Fase';
 $lang['Picture']='Foto del Atleta';
 $lang['Portrait']='Vertical';
 $lang['PosX']='Posición (X)';
@@ -158,6 +167,7 @@
 $lang['ToRight']='Logotipo de la Competición (derecha)';
 $lang['TVViewIdCard']='Ver acreditaciones';
 $lang['TVViewIdCardDescr']='En modo vista de encuentros proporciona la identificación de los 2 oponentes en lugar de las filas "estándar"';
+$lang['VLayout']='Vertical';
 $lang['Width']='Anchura';
 $lang['WRank']='Ranking Mundial';
 $lang['Y-Badge']='Diploma (Individual)';
diff --git a/src/Common/Languages/es/Common.php b/src/Common/Languages/es/Common.php
index c8cc7ada..fa680bc8 100644
--- a/src/Common/Languages/es/Common.php
+++ b/src/Common/Languages/es/Common.php
@@ -70,6 +70,7 @@
 $lang['CmdOk']='Ok';
 $lang['CmdOn']='Conectado';
 $lang['CmdPostUpdate']='Publicar actualización';
+$lang['CmdRefresh']='Refrescar';
 $lang['CmdSave']='Guardar';
 $lang['CmdSaveContinue']='Guardar & Continuar';
 $lang['CmdSet2All']='Colocar en Todos';
@@ -147,6 +148,10 @@
 $lang['Finish']='Final';
 $lang['FirstPhase']='Primera Fase';
 $lang['FopSetup']='Diseño del Campo de Tiro';
+$lang['Gender0']='Hombre';
+$lang['Gender1']='Mujer';
+$lang['GenderShort0']='H';
+$lang['GenderShort1']='M';
 $lang['GF']='Damas < 14 años';
 $lang['GM']='Caballeros < 14 años';
 $lang['HELP']='¡AYUDA!';
@@ -216,6 +221,7 @@
 $lang['MenuLMRemoveNoShows']='Quitar No-Shows';
 $lang['MenuLM_Accreditation']='Acreditación';
 $lang['MenuLM_Accreditation colors management']='Gestión de los colores de las acreditaciones';
+$lang['MenuLM_AdvancedFeatures']='Funciones avanzadas';
 $lang['MenuLM_AdvLabels']='Impresión avanzada de Etiquetas';
 $lang['MenuLM_Archers on Targets']='Arqueros por Diana';
 $lang['MenuLM_Arr4Set']='Flechas por Set';
@@ -229,6 +235,7 @@
 $lang['MenuLM_Athlets fees status']='Situación de las inscripciones de los Atletas';
 $lang['MenuLM_Authentication']='Autenticación del usuario';
 $lang['MenuLM_AutoCheckinSetup']='Configuración del auto registro';
+$lang['MenuLM_Automator']='Automator';
 $lang['MenuLM_Back Number Printout']='Imprimir Dorsales';
 $lang['MenuLM_Boinx']='Instalación de las Capas Boinx';
 $lang['MenuLM_BoinxMeteo']='Capa Boinx de datos meteorológicos';
@@ -239,9 +246,11 @@
 $lang['MenuLM_Category Result List']='Clasificación por Categorías';
 $lang['MenuLM_Change Components']='Cambiar Componentes';
 $lang['MenuLM_ChangeNationsNames']='Cambia los nombres de los Países';
+$lang['MenuLM_ChangePassword']='Cambiar Contraseña';
 $lang['MenuLM_Check Data Update']='Verificar Actualización de Datos';
 $lang['MenuLM_Check shoot-off before eliminations']='Resolver los desempates antes de las Series Eliminatorias';
 $lang['MenuLM_Check shoot-off before final phases']='Resolver Desempates antes de las Fases Finales';
+$lang['MenuLM_Check shoot-off before Rank']='Verificar el desempate antes de imprimir la clasificación';
 $lang['MenuLM_CheckAwards']='Verificar la Traducción de Premiación';
 $lang['MenuLM_CheckList']='Imprimir listado de Verificaciones';
 $lang['MenuLM_CIS']='CIS';
@@ -337,6 +346,7 @@
 $lang['MenuLM_Modules']='Módulos';
 $lang['MenuLM_MoveSession']='Cambiar Turno asignado';
 $lang['MenuLM_MoveTarget']='Mueve las Dianas Asignadas';
+$lang['MenuLM_N62']='Información N62A/B ORIS';
 $lang['MenuLM_New']='Nuevo';
 $lang['MenuLM_NewBacknumbers']='Dorsales';
 $lang['MenuLM_OdsExport']='Exportar como Hoja de Cálculo (.ods)';
@@ -440,6 +450,7 @@
 $lang['MsgImportOk']='¡Importación Completada!';
 $lang['MsgInitFinalGridsError']='Atención: los cuadros para este evento ya están inicializados. ¿Quiere continuar?';
 $lang['MsgInitFinalGridsOk']='¡Inicialización Completada!';
+$lang['MsgInitFinalGridsRunningError']='Operación no permitida mientras se está desarrollando la competición';
 $lang['MsgMakeFinReset']='¡Los Cuadros de la Serie Olímpica han sido Reinicializados!<br>¡Para añadir los datos es necesario completar otra vez las operaciones preliminares!';
 $lang['MsgNeedInitGrids']='¡Error!<br>¡Es necesario arrancar de nuevo los Cuadros!';
 $lang['MsgNeedShootOff']='¡Error!<br>¡Es necesario resolver antes los desempates!';
@@ -496,6 +507,7 @@
 $lang['Score1Page1Match']='Hoja de puntuación para cada encuentro';
 $lang['ScoreDrawing']='Sólo Diseño (Página única)';
 $lang['ScoreFilled']='Imprimir Hojas de Puntuación completadas con los valores de cada flecha';
+$lang['ScoreIncAllNames']='Incluir todos los posibles oponentes';
 $lang['ScoreIncEmpty']='Imprimir también encuentros con pase directo';
 $lang['Scorer']='Tanteador';
 $lang['SearchOrphanTexts']='Buscar Textos Huerfanos';
@@ -507,6 +519,7 @@
 $lang['SF']='Damas';
 $lang['ShootOff4Elim']='Solucionar empates antes de las Series Eliminatorias';
 $lang['ShootOff4Final']='Solucionar empates antes de las Series Finales';
+$lang['ShootOff4Rank']='Verificar el desempate antes de imprimir la Clasificación';
 $lang['SM']='Caballeros';
 $lang['SnapshotConf']='Configuración para publicación inmediata';
 $lang['SortBy']='Publicado por';
@@ -560,11 +573,14 @@
 $lang['TrgIndComplete']='Diana de Sala (1-10 grande)';
 $lang['TrgIndSmall']='Diana de Sala (6-10 grande)';
 $lang['TrgKyudo']='Kyudo-Mato';
+$lang['TrgLancaster']='Lancaster (1-11)';
+$lang['TrgLancShootUp']='Lancaster (Anillo +12)';
 $lang['TrgNfaa3D']='3D NFAA (12,10,8,5,M)';
 $lang['TrgNfaaAnimal']='Serie NFAA de Animales';
 $lang['TrgNfaaHunt5']='NFAA Campo/Cazadores (3-5/X.5)';
 $lang['TrgNfaaHunt6']='NFAA Campo/Cazadores (3-5/X.6)';
 $lang['TrgNfaaInd']='Sala NFAA (1-5/X)';
+$lang['TrgNfaaIndIX']='NFAA Indoor (1-5/X + IX)';
 $lang['TrgOutdoor']='Diana de Aire Libre (1-X)';
 $lang['TrgProAMIndNfaa']='ProAM Indoor - Diana NFAA (1-5/X.6)';
 $lang['TrgProAMIndVegas']='ProAM Indoor - Diana Las Vegas (1-10/X.11)';
diff --git a/src/Common/Languages/es/Errors.php b/src/Common/Languages/es/Errors.php
index 73cf3ddb..a8e19656 100644
--- a/src/Common/Languages/es/Errors.php
+++ b/src/Common/Languages/es/Errors.php
@@ -4,6 +4,7 @@
 $lang['Anomalies']='Anomalías';
 $lang['BarCodeSession']='Hay errores en la configuración: ¡intente configurar un turno!';
 $lang['BarCodeSettings']='Hay un error en la configuración';
+$lang['CategoresNotDefined']='Faltan definiciones de Categorías';
 $lang['ClassFromToError']='"Desde" y "Hasta" deben ser valores numéricos';
 $lang['ClubNotFound']='No se ha encontrado el Código del Club en la Base de Datos actual. ¿Por favor, actualice primero la base de datos!';
 $lang['ConflictingCategories']='La definición del filtro para estas categorías se superpone a filtros previos: $a!';
@@ -15,6 +16,8 @@
 $lang['EmptyFrom']='Email vacio: ¡este campo es obligatorio!';
 $lang['EmptySubject']='Sujeto vacio: ¡este campo es obligatorio!';
 $lang['EmptyTitle']='Título vacio:¡este campo es obligatorio!';
+$lang['EntriesNoCategory']='Inscripciones sin Categoría';
+$lang['EntriesNoCountry']='Inscripciones sin País/Club';
 $lang['ErrCodeExists']='¡Ya existe un código!';
 $lang['ErrCommitteeError']='Código del Comité o descripción inválida';
 $lang['ErrConnection']='No hay conexión con el servidor $a';
@@ -39,7 +42,9 @@
 $lang['ImageFetchError']='Error buscando la imagen';
 $lang['ImageSaveError']='Imagen no guardada';
 $lang['IncompleteSettings']='Configuración incompleta';
+$lang['InvalidCharacters']='El campo contiene caracteres inválidos. Los caracteres válidos son $a';
 $lang['InvalidEmail']='Email inválido: por favor verifique nuevamente la dirección del correo antes de guardarlo';
+$lang['InvalidLogin']='Contraseña inválida';
 $lang['LockedProcedure']='Este Procedimiento está cerrado';
 $lang['MailingAlreadyExists']='Ya existe un Email con el mismo título ({$a}), por favor cambie el título o seleccione el email para modificar desde el selector.';
 $lang['MailingDeleteText']='Por favor, confirme que desea borrar permanentemente este mailing';
@@ -52,19 +57,28 @@
 $lang['MissingData']='Faltan Datos';
 $lang['MissingPhpIntlModule']='Se puede realizar la transliteración instalando o activando el módulo php-intl';
 $lang['NameNotEmpty']='El nombre no puede estar vacío';
+$lang['NoCountryInsert']='No se ha metido el País';
+$lang['NoData']='No se han proporcionado datos';
+$lang['NoDistancesSet']='Categorías sin distancias asignadas';
 $lang['NoDNSRecord']='El nombre del Servidor no es correcto o no está en línea: por favor, debe estar conectado a Internet para configurar esta opción.';
 $lang['NoMailingTemplate']='¡No se ha seleccionado/disponible ningún formato de Email!';
 $lang['NoMailRecipients']='¡No hay nadie a quien enviar los correos! Por favor, revise las opciones de filtros.';
 $lang['NoPrivilege']='Privilegios insuficientes: no está autorizado a operar en esta página';
 $lang['NoSameOrders']='El nuevo valor de la Orden no puede ser duplicado.';
 $lang['NoSmtpServerSet']='¡Por favor, configure SMTP antes de enviar emails!';
+$lang['NoTargetSet']='Categorías sin dianas asignadas';
+$lang['PhpOutdated']='Su versión PHP está caducada. Ianseo podría trabajar, pero algunas funciones necesitarán al menos la versión  {$a}.<br>Por favor, actualice su versión lo antes posible para mantener PHP{$a} o más reciente.';
 $lang['RegExp']='Para usar RegExp (Expresiones Regulares), por favor consultar $a';
+$lang['ResetSyncData']='Resetear Sync Data';
+$lang['ServiceNotAvailable']='Servicio no disponible';
 $lang['SetupNotFinished']='No puede acceder a esta página: por favor, complete primero {$a}';
 $lang['SpecialFilterDiscrepancy']='Se ha configurado un filtro especial, pero no está activo';
+$lang['SyncNotAvailable']='Sync no disponible';
 $lang['TargetNumberMismatch']='El número de la diana solo puede ser del formato [NúmeroDeDiana][LetraDeDiana], como 129C';
 $lang['TargetRangeMismatch']='El Rango de Dianas debe contener 2 numeros de diana (sin letras), separados por el signo menos, siendo el primer número menor que el segundo, como por ejemplo 23-44';
 $lang['TextSmtpDelete']='Por favor, confirme que quiere quitar los ajustes de SMTP en esta instalación de Ianseo';
 $lang['TooManyArrows']='Demasiadas flechas totales: el máximo es $a';
 $lang['TooManyElimQualified']='Las Series del tipo $a[0] pueden aceptar solamente hasta $a[1] arqueros';
+$lang['WrongData']='Se han recibido datos erroneos';
 $lang['WrongPort']='¡Este puerto no está soportado!';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es/IOC_Codes.php b/src/Common/Languages/es/IOC_Codes.php
index 2d1a4dde..ef29ba2f 100644
--- a/src/Common/Languages/es/IOC_Codes.php
+++ b/src/Common/Languages/es/IOC_Codes.php
@@ -12,8 +12,8 @@
 $lang['ASA']='Samoa Americana';
 $lang['AUS']='Australia';
 $lang['AUT']='Austria';
-$lang['Award-Anthem']='Señoras y señores, por favor ponganse de pie para escuchar el himno nacional de';
-$lang['Award-Anthem-TPE']='Señoras y señores, por favor ponganse de pie para escuchar el himno de';
+$lang['Award-Anthem']='Señoras y señores, aquellos que puedan hacerlo por favor ponganse de pie para escuchar el himno nacional de';
+$lang['Award-Anthem-TPE']='Señoras y señores, aquellos que puedan hacerlo por favor ponganse de pie para escuchar el himno de';
 $lang['Award-Applause']='Señoras y señores, por favor demosle un calido aplauso a nuestros medallistas';
 $lang['Award-Intro']='Señoras y señores la ceremonia de premiacion para {$a}';
 $lang['Award-MedalGiver']='Las medallas seran entregadas por $a';
@@ -42,16 +42,13 @@
 $lang['BUL']='Bulgaria';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='República Centroafricana';
-$lang['CAM']='Camboya';
 $lang['CAN']='Canada';
 $lang['CAY']='Islas Caimán';
 $lang['CGO']='República del Congo';
 $lang['CHA']='Chad';
 $lang['CHI']='Chile';
-$lang['CHN']='China';
 $lang['CIV']='Costa de Marfil';
 $lang['CMR']='Camerún';
-$lang['COD']='República Democrática del Congo';
 $lang['COK']='Islas Cook';
 $lang['COL']='Colombia';
 $lang['COM']='Comores';
@@ -60,7 +57,6 @@
 $lang['CRO']='Croacia';
 $lang['CUB']='Cuba';
 $lang['CYP']='Chipre';
-$lang['CZE']='República Checa';
 $lang['DEN']='Dinamarca';
 $lang['DJI']='Yibuti';
 $lang['DMA']='Dominica';
@@ -91,17 +87,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guayana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Hungria';
 $lang['INA']='Indonesia';
 $lang['IND']='India';
-$lang['IRI']='Irán';
 $lang['IRL']='Irlanda';
 $lang['IRQ']='Iraq';
 $lang['ISL']='Islandia';
 $lang['ISR']='Israel';
-$lang['ISV']='Islas Virgenes Americanas';
 $lang['ITA']='Italia';
 $lang['IVB']='Islas Virgenes Británicas';
 $lang['JAM']='Jamaica';
@@ -114,7 +107,6 @@
 $lang['KOR']='República de Corea';
 $lang['KSA']='Arabia Saudita';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
 $lang['LAT']='Letonia';
 $lang['LBA']='Libia';
 $lang['LBR']='Liberia';
@@ -128,7 +120,6 @@
 $lang['MAR']='Marruecos';
 $lang['MAS']='Malasia';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldavia';
 $lang['MDV']='Maldivas';
 $lang['Medal-1']='Medalla de Oro';
 $lang['Medal-2']='Medalla de Plata';
@@ -137,7 +128,6 @@
 $lang['MEX']='México';
 $lang['MGL']='Mongolia';
 $lang['MHL']='Islas Marshall';
-$lang['MKD']='Macedonia del Norte';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -166,7 +156,6 @@
 $lang['PNG']='Papúa Nueva Guinea';
 $lang['POL']='Polonia';
 $lang['POR']='Portugal';
-$lang['PRK']='Corea del Norte';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Rumania';
@@ -193,13 +182,11 @@
 $lang['SVK']='Eslovaquia';
 $lang['SWE']='Suecia';
 $lang['SWZ']='Esuatini';
-$lang['SYR']='Siria';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Tailandia';
 $lang['TJK']='Tajikistán';
 $lang['TKM']='Turkmenistán';
-$lang['TLS']='Timor Este';
 $lang['TOG']='Togo';
 $lang['TPE']='China Taipei';
 $lang['TRI']='Trinidad y Tobago';
diff --git a/src/Common/Languages/es/ISK-App.php b/src/Common/Languages/es/ISK-App.php
index 89d8dea8..5271236e 100644
--- a/src/Common/Languages/es/ISK-App.php
+++ b/src/Common/Languages/es/ISK-App.php
@@ -62,10 +62,15 @@
 $lang['HelpIntro3Text']='Scorekeeper NG trabaja bien con Lite, Pro, o competiciones en directo en Ianseo. Dependiendo del tipo de competición, la app habilitará o deshabilitará el uso de algunas funciones avanzadas.';
 $lang['HelpIntro4Text']='La app contiene cinco funciones principales:';
 $lang['HelpMainHead']='Principal';
+$lang['HelpMainText']='Esta es la pantalla principal usada por los arqueros una vez que el dispositivo ha sido configurado y se ha conectado a Ianseo. Esto muestra la información de la competición, turno actual, y la lista de los arqueros configurados para una o varias dianas. Mostrará para cada arquero la tanda actual, tipo de diana, valores de flechas y totales. Pulsando en un arquero se verá su pantalla de tanteo. También es posible ir a la hoja de puntuación y ver la información de todos los arqueros y las distancias configuradas para esa(s) diana(s).';
 $lang['HelpScorecardHead']='Hoja de puntuación';
+$lang['HelpScorecardText']='La pantalla muestra las flechas tanteadas hasta ese momento con los totales. Puede mostrar todos los arqueros configurados para ese dispositivo y las distancias, o el tanteo de un solo arquero, dependiendo de si la solicitud se hace desde la página principal o desde las hojas de puntuación.';
 $lang['HelpScoringHead']='Tantear';
+$lang['HelpScoringText']='Esta pantalla permite a los arqueros tantear sus flechas en una tanda determinada o cambiar valores de flechas previamente tanteados. La tanda actual está resaltada para identificar donde deben introducirse los valores de las flechas. Si se van a tirar varias distancias y éstas ya han sido configuradas en el dispositivo serán resaltadas a medida que avance la competición. Si se necesitase, es posible también pasar de la anotación de flechas actual  a la hoja de puntuación electrónica del arquero.';
 $lang['HelpSettingsHead']='Configuración';
+$lang['HelpSettingsText']='Esta función le permitirá configurar la conexión del dispositivo a Ianseo. Una vez configurado, el dispositivo intentará conectarse utilizando los parámetros disponibles. El indicador del estado de la conexión mostrará el estado de la misma en ese momento señalando si el dispositivo está conectado, desconectado o está intentado conectarse. Si se desea, es posible también descargar idiomas adicionales. Existen parámetros avanzados adicionales dependiendo del tipo de la competición.';
 $lang['HelpStartHead']='Inicio';
+$lang['HelpStartText']='Esto le permitirá iniciar la configuración de la app. Puede elegir escanear el código QR generado por Ianseo para configurar la competición en la app de un modo sencillo. Esto seleccionará automáticamente el tipo correcto de competición, los parámetros correctos de su conexión con el servidor, asi como cualquier parámetro avanzado configurado en Ianseo. Si se desea, tambien es posible configurar el dispositivo manualmente.';
 $lang['MainDistance']='Distancia';
 $lang['MainEnd']='Tanda';
 $lang['MainInvalidKey']='Llave de licencia inválida';
@@ -89,6 +94,7 @@
 $lang['ScorecardTarget']='Diana';
 $lang['ScoreTotalsCloseButton']='Cerrar';
 $lang['ScoreTotalsConfirmButton']='Confirmar';
+$lang['ScoreTotalsConfirmOrReview']='Uno o más de los totales no coinciden. Cambie los valores y pulse Confirmar para verificar otra vez o pulse Cerrar para volver y revisar sus puntuaciones.';
 $lang['ScoreTotalsMessage']='Por favor, introduzca las puntuaciones de su hoja de puntuación';
 $lang['ScoreTotalsMissingValues']='Por favor, introduzca todos los valores requeridos';
 $lang['ScoreTotalsScore']='Puntuación total';
@@ -141,14 +147,17 @@
 $lang['SettingsManualRRLevel']='Nivel';
 $lang['SettingsManualRRRound']='Serie';
 $lang['SettingsManualSession']='Sesión';
+$lang['SettingsManualStage']='Fase';
 $lang['SettingsManualTarget']='Diana';
 $lang['SettingsOtherAskForSignature']='Preguntar por la firma';
 $lang['SettingsOtherAskForTotals']='Preguntar por los totales cuando se ha sumado';
 $lang['SettingsOtherCategory']='Otras opciones';
+$lang['SettingsOtherEnableHaptics']='Habilitar las valoraciones táctiles';
 $lang['SettingsOtherHideTotals']='Ocultar totales cuando se está tanteando';
 $lang['SettingsOtherSignatureNone']='No';
 $lang['SettingsOtherSignatureScan']='Escanear ID del arquero';
 $lang['SettingsOtherSignatureScreen']='Firmar en pantalla';
+$lang['SettingsOtherSpotting']='Modo localizar';
 $lang['SettingsQrCodesCategory']='Códigos QR';
 $lang['SettingsQrCodesDevice']='Dispositivo';
 $lang['SettingsQrCodesPayload']='Datos QR';
@@ -181,6 +190,8 @@
 $lang['ShootoffClosestTitle']='Se requiere la flecha más cercana al centro';
 $lang['ShootoffNewConfirmation']='Confirmación del desempate';
 $lang['ShootoffNewIsNeeded']='¿Se necesita un nuevo desempate para decidir el ganador del encuentro?';
+$lang['SignatureClear']='Limpiar';
+$lang['SignatureIncorrectCodeMessage']='El código que ha escaneado no es el correcto para este arquero. ¿Está seguro de que ha escaneado el código para {{n}}? Por favor, escanee el código correcto.';
 $lang['SignatureIncorrectCodeTitle']='Código de barras incorrecto';
 $lang['SignatureReturnDev']='Devuelva el dispositivo al equipo de resultados';
 $lang['SignatureSaved']='¡Guardado!';
diff --git a/src/Common/Languages/es/Ianseo.php b/src/Common/Languages/es/Ianseo.php
index ca6d3556..d01fc2fc 100644
--- a/src/Common/Languages/es/Ianseo.php
+++ b/src/Common/Languages/es/Ianseo.php
@@ -7,4 +7,9 @@
 $lang['Cert-Level4']='Curso Master';
 $lang['Cert-Level5']='Personal de Ianseo';
 $lang['CertificateManagement']='Certificado de Gestión';
+$lang['GenerateFile']='Crear Archivo';
+$lang['ResetItems']='Reorganizar Items.<br>Esta acción no requiere confirmación y no podrá deshacerse!<br>Resetear la calificación reseteará también todos los subsiguientes eventos!';
+$lang['ResetResult']='Los turnos solicitados han sido reorganizados';
+$lang['ResetSessions']='Confirmar Reseteo';
+$lang['ShuffleResults']='Reorganizar los resultados';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/es/Install.php b/src/Common/Languages/es/Install.php
index 67c396d0..ff4d17b2 100644
--- a/src/Common/Languages/es/Install.php
+++ b/src/Common/Languages/es/Install.php
@@ -83,7 +83,7 @@
 $lang['Parameter']='Párametro';
 $lang['Password']='Contraseña';
 $lang['PHP settings']='Ajustes del PHP';
-$lang['PHP too old']='Tú instalación PHP es demasiado anticuada. La versión mínima para trabajar con IANSEO debe ser la 5.0.';
+$lang['PHP too old']='Tú versión de PHP instalada está anticuada. La versión mínima para trabajar con IANSEO debe ser la 8.0.';
 $lang['PHP version']='Versión PHP';
 $lang['php.ini file']='archivo php.ini';
 $lang['Prepare']='Preparando los datos para la actualización';
diff --git a/src/Common/Languages/es/Records.php b/src/Common/Languages/es/Records.php
index 4572ba86..95ed13e3 100644
--- a/src/Common/Languages/es/Records.php
+++ b/src/Common/Languages/es/Records.php
@@ -48,7 +48,7 @@
 $lang['RecordAreaName']='Nombre del Récord';
 $lang['RecordAreaNew']='Nuevo Récord de Área';
 $lang['RecordAreaOdfCode']='Código de Publicación de 2 Letras';
-$lang['RecordAreaOdfCodeHelp']='Un Código Genérico específico de 2-3 Letras para este tipo de récord para usarlo en publicación. Ejemplo: GR para Récord de Juegos, NR para Récord Nacional, NPR para Récord Nacional Adaptado.';
+$lang['RecordAreaOdfCodeHelp']='Un Código Genérico específico de 2-3 Letras para este tipo de récord para usarlo en publicaciones. Ejemplo: GR para Récord de Juegos, NR para Récord Nacional, NPR para Récord Nacional Adaptado.';
 $lang['RecordAreaOdfHeader']='Encabezado del récord';
 $lang['RecordAreaOdfHeaderHelp']='Nombre completo para este Ejemplo de Récord: "Récord de Juegos", "Récord Nacional Klingon", "Record Juegos Paralímpicos"';
 $lang['RecordAreaOdfParaCode']='Código de Publicación de 2 Letras (Adaptado)';
diff --git a/src/Common/Languages/es/RunArchery.php b/src/Common/Languages/es/RunArchery.php
index 2d7f3d20..cd18e61b 100644
--- a/src/Common/Languages/es/RunArchery.php
+++ b/src/Common/Languages/es/RunArchery.php
@@ -1,4 +1,5 @@
 <?php
+$lang['Accepted']='Aceptado';
 $lang['ArrowsShot']='Flechas tiradas';
 $lang['CallTime']='Tiempo para llamada {$a}';
 $lang['CallTimeToRoom']='Cámara de llamadas para {$a}';
diff --git a/src/Common/Languages/es/ServiceErrors.php b/src/Common/Languages/es/ServiceErrors.php
index 5fd01cfd..b539a9a6 100644
--- a/src/Common/Languages/es/ServiceErrors.php
+++ b/src/Common/Languages/es/ServiceErrors.php
@@ -6,6 +6,7 @@
 $lang['ErrArcherCodeFree']='El número de Identificación del arquero es Libre';
 $lang['ErrArcherCodeTooLong']='El número de Identificación del arquero es demasiado largo';
 $lang['ErrArcherDobWrong']='El formato de la fecha de nacimiento del Arquero no es correcto';
+$lang['ErrArcherEndDateWrong']='La fecha límite del arquero está en formato erróneo';
 $lang['ErrArcherFamilyLong']='Los Apellidos del Arquero son demasiado largos';
 $lang['ErrArcherGivenLong']='El Nombre del Arquero es demasiado largo';
 $lang['ErrArcherInvalidCode']='El número de identificación del arquero contiene caractéres inválidos';
@@ -17,10 +18,12 @@
 $lang['ErrClassNotFound']='No se ha encontrado la clase';
 $lang['ErrClassNotFoundAge']='Clase por edad no encontrada';
 $lang['ErrClassNotFoundScoring']='No se ha encontrado la Clase que está tanteando';
+$lang['ErrClassScore']='La Clase que está tanteando no es válida';
 $lang['ErrClubCodeExists']='Ya existe Código del Club';
 $lang['ErrClubCodeFree']='El Código del Club es libre';
 $lang['ErrClubCodeNoCode']='No hay Código del Club';
 $lang['ErrClubCodeTooLong']='El Código del Club es demasiado largo';
+$lang['ErrClubEndDateWrong']='La fecha límite del Club está en formato erróneo';
 $lang['ErrClubFullNameTooLong']='El nombre completo del Club es demasiado largo';
 $lang['ErrClubId']='Club no válido';
 $lang['ErrClubInvalidCode']='El Código del Club contiene caractéres no válidos';
diff --git a/src/Common/Languages/es/Tournament.php b/src/Common/Languages/es/Tournament.php
index 9cceeb14..a8c73eff 100644
--- a/src/Common/Languages/es/Tournament.php
+++ b/src/Common/Languages/es/Tournament.php
@@ -40,11 +40,13 @@
 $lang['ActualFlag']='Bandera utilizada!';
 $lang['AddContact']='Añadir Contacto';
 $lang['AddMaxRows']='Añadir número máximo de filas';
+$lang['AddOnsItem']='Item #{$a}';
 $lang['AddTournament']='Añadir Torneo';
 $lang['ADOfficer']='Responsable del Control Anti-Dopaje';
 $lang['AdvancedParams']='Parámetros avanzados';
 $lang['AfterDistance']='Clasificación DESPUÉS de la siguiente distancia:';
 $lang['AfterXDistance']='Resultados DESPUÉS de la distancia de $a';
+$lang['AgeClass']='Clase por edades';
 $lang['AllDistances']='Todos';
 $lang['AllEntries']='Todas las inscripciones';
 $lang['AllEvents']='Todas las Pruebas';
@@ -84,13 +86,17 @@
 $lang['AthButtLegend2']='Encuentros por diana';
 $lang['AthleteFile']='Cargar los Atletas de un Fichero';
 $lang['AthleteList']='Cargar Atletas';
+$lang['AthletesCoachingToo']='Incluir Atletas en la selección de Entrenadores';
 $lang['AthleteSummary']='Resumen de atletas';
 $lang['AttachDiplomas']='Enviar los diplomas (individual y equipos, si fuera un miembro del mismo) como PDF adjunto';
+$lang['AttachICS']='Adjuntar el Programa como iCal (.ics)';
 $lang['AttachQualScorecard']='Enviar Hojas Personales de Puntuación de la Calificación como PDF adjunto (todas las distancias)';
 $lang['AtXDistance']='Resultados DE la distancia de $a';
 $lang['AuthCode']='Código de Autorización';
 $lang['AuthCodeA2A']='Código de Autorización para seguimiento Flecha a Flecha';
+$lang['AutoCoinToss']='Asignación automática del sorteo de moneda';
 $lang['AutoEdits']='Autoeditar';
+$lang['AutomatorAccPrint']='Configuración de la impresión de Acreditaciones';
 $lang['AutoMoveNext']='Mover automáticamente a la siguiente flecha';
 $lang['AutoRefresh']='Autoactualizar';
 $lang['AutoTargetAssignment']='Asignación Automática de Dianas - Sorteo';
@@ -100,6 +106,8 @@
 $lang['Awarders']='Premiados';
 $lang['AwardFirstLanguage']='Primer idioma';
 $lang['AwardName']='Nombre del Trofeo';
+$lang['AwardNew']='Nuevo Trofeo';
+$lang['AwardNum']='Trofeo $a';
 $lang['AwardPlayAnthem']='¿Se tocarán los Himnos Nacionales durante la Ceremonia de premiación?';
 $lang['AwardRepresentCountry']='¿Los atletas premiados representarán a Paises/Clubes?';
 $lang['Awards']='Trofeos';
@@ -142,9 +150,13 @@
 $lang['BlockSet']='Deshabilitar Editar';
 $lang['BlockSetup']='Bloquear Edición en el Área de Competición';
 $lang['BlockUnset']='Habilitar Editar';
+$lang['Block_Excluded']='IP sin exclusiones -ACCESO COMPLETO';
 $lang['Block_IP']='Acceso IP (v4)';
 $lang['Block_Manage']='Gestión del Control de Acceso';
 $lang['Block_Nick']='Nombre de acceso';
+$lang['Block_TemplateIP']='Plantillas de IP';
+$lang['Block_TemplateName']='Descripción';
+$lang['Block_TemplatePattern']='Patrón';
 $lang['BoldIsDefault']='En negrita por defecto';
 $lang['Bonus']='Bonus';
 $lang['ByeMovedToPhase']='Atleta avanzado a la siguiente fase';
@@ -179,14 +191,17 @@
 $lang['CatJury']='Jurado de Apelación';
 $lang['CatOC']='Comité de Organización';
 $lang['ChairmanJudge']='Presidente de la Comisión de Jueces';
+$lang['ChairmanJudgeDeputy']='Vicepresidente de la Comisión de Jueces';
 $lang['ChairmanJury']='Presidente del Jurado de Apelación';
 $lang['ChangeLookUpTable']='Cambiar Tabla de Busqueda';
 $lang['ChangeNationsNames']='Cambia los nombres de los Países';
 $lang['Channel']='Canal';
+$lang['CheckGoldsInMatch']='Comprobar oros en Empates';
 $lang['CheckRefMail']='Verificar E-Mail de referencia...';
 $lang['CheckScorecards']='Revisar Hojas de Puntuación';
 $lang['CheckTargetUpdate']='Verificar Actualización de Datos';
 $lang['CheckWaIds']='Verificar las Identificaciones WA de los arqueros coincidentes';
+$lang['CheckXNinesInMatch']='Comprobar X9 en Empates';
 $lang['Classes']='Clases';
 $lang['ClearField']='Campo de Competición vacio';
 $lang['ClickToMailRequest']='Pinchar para abrir un correo prefijado';
@@ -216,6 +231,8 @@
 $lang['CmdUnset']='Desconfigurar $a';
 $lang['CmdUpload']='Almacenar';
 $lang['Coach']='Entrenador';
+$lang['CoachSelectionForm']='Formulario de selección de Entrenadores';
+$lang['CoachSelectionMatches']='Entrenador - Asignación de Encuentros';
 $lang['CoalesceScorecards']='Combinar hojas de puntuación';
 $lang['CoalesceScorecardsTip']='Si hay 1 o 2 arqueros por diana, combinar las hojas puntuación de las dianas de 2 en 2';
 $lang['Code']='Licencia';
@@ -223,6 +240,7 @@
 $lang['CoinTossShort']='S.M.';
 $lang['Collation']='Recopilación';
 $lang['Color']='Colores';
+$lang['CombiCompList']='Listado de la Competición';
 $lang['CombiCompNewRule']='Nueva Regla';
 $lang['ComparedTo']='Comparar w/pos. @flechas (-1: último disponible)';
 $lang['CompetitionOfficials']='Oficiales de la Competición';
@@ -264,6 +282,7 @@
 $lang['DeleteChannel']='Quitar el Canal. Esto eliminará todos los niveles del canal y el canal mismo.';
 $lang['DeletePreviousArchers']='Borrar las inscripciones existentes que no estén en la lista';
 $lang['DeletePreviousTeams']='Borrar Equipos Anteriores';
+$lang['DeleteSplit']='Quitar nivel. Esto quiratá el nivel.';
 $lang['DeleteTourConfirm']='Por favor, introduzca en la casilla de texto el siguiente código de control:';
 $lang['DeleteTournament']='Eliminar Competición';
 $lang['Deleting']='Trabajo en proceso: eliminando archivos en-línea...';
@@ -311,7 +330,7 @@
 $lang['EmailScorecardShort']='Resumen de la Hoja de Puntuación';
 $lang['EmailsToSend']='Emails a enviar';
 $lang['EmailSuccessfull']='Un Email ha sido enviado con éxito a $a';
-$lang['EnableAccess']='Políticas de Activar/Desactivar';
+$lang['EnableAccess']='Políticas de acceso: Activar/Desactivar';
 $lang['EnableAddOns']='Habilitar/Deshabilitar extensiones';
 $lang['Ends']='Tandas';
 $lang['EndsToShoot']='Tandas por tirar';
@@ -335,6 +354,8 @@
 $lang['Events']='Competiciones';
 $lang['EventStartPosition']='Clasificación del Primer Atleta/Equipo a Seleccionar';
 $lang['EventStillTie']='ATENCIÓN:\nVan ser comprobados los siguientes Eventos:\n\n$a';
+$lang['EventsToAdd']='Eventos a añadir:';
+$lang['EventsToDelete']='Eventos a eliminar:';
 $lang['EventWillNotRecreated']='(Si cambias el tipo de competición, las clases/divisiones y los eventos por defecto no serán regenerados)';
 $lang['EvNameTranslated']='Evento traducido';
 $lang['Export2Fitarco']='Exportar como archivo EXP';
@@ -412,6 +433,7 @@
 $lang['FlightsTotals']='Totales';
 $lang['FlightsUpdateSetup']='Actualizar la instalación';
 $lang['FollowHHT']='Mostrar la programación HHT establecida';
+$lang['FontWarning']='Solamente soporta fuentes TTF';
 $lang['FOP-ODS']='Campo de competición (ODS)';
 $lang['ForceAccreditation']='Forzar la acreditación';
 $lang['ForceOldPhotos']='Incluir Fotos antiguas';
@@ -439,6 +461,8 @@
 $lang['GroupMatches']='Encuentros de Grupo';
 $lang['HiddenCredited']='Ocultar Acreditados';
 $lang['HideRank']='Ocultar clasificación';
+$lang['HorScore']='Hoja de puntuación horizontal';
+$lang['HorScoreAllDist']='Hoja de puntuación horizontal con todas las distancias (Lancaster)';
 $lang['Hour']='Hora';
 $lang['I-Session']='Encuentros individuales';
 $lang['IanseoDbVersionTooOld']='La Versión de la Base de Datos de Ianseo es anterior a InfoSystem';
@@ -461,6 +485,8 @@
 $lang['InitEliminations']='Inicializar Eliminatorias';
 $lang['InitProcess']='Inicializando Proceso';
 $lang['InnerTens']='Dieces Interiores (X)';
+$lang['InsertLeftLogo']='Insertar Logo de la izquierda';
+$lang['InsertRightLogo']='Insertar Logo de la derecha';
 $lang['Invalid Password']='Contraseña no válida';
 $lang['IOCcode']='Código del país del CIO';
 $lang['IRM-10']='DNS-No ha comenzado';
@@ -481,6 +507,8 @@
 $lang['JudgesSelectionMatches']='Jueces - Asignación de Encuentros';
 $lang['Jury']='Miembro del Jurado de Apelación';
 $lang['KeyPress']='Teclado para Entrada';
+$lang['Lanc-Explanation']='Todavia se está tirando, la clasificación saldrá después de las series de eliminatorias';
+$lang['LancasterScorecard']='Hoja de puntuación estilo Lancaster';
 $lang['Languages']='Idiomas';
 $lang['Last']='Último';
 $lang['LastPhase']='Ultima fase';
@@ -507,6 +535,7 @@
 $lang['LocRuleDefaultNo']='Por defecto';
 $lang['LocRuleModifiedNo']='Modificado';
 $lang['LocRuleValidNo']='Sin modificar';
+$lang['Login']='Login';
 $lang['LogisticResp']='Responsable de la Logística';
 $lang['LogMessage']='Registrar Mensaje';
 $lang['LogoB']='Imagen Inferior (la proporción para anchura completa es 19:1 para A4,  y de 20:1 para carta)';
@@ -519,6 +548,7 @@
 $lang['LUE-CAN']='Canada';
 $lang['LUE-FITA']='World Archery';
 $lang['LUE-FRA']='Francia';
+$lang['LUE-GBR']='Archery GB';
 $lang['LUE-ITA']='Italia';
 $lang['LUE-ITA_e']='Italia (noveles)';
 $lang['LUE-ITA_i']='Italia (indoor)';
@@ -667,6 +697,7 @@
 $lang['NumSession']='Número de Turnos';
 $lang['NumTieAtPosition']='{$a[0]} empatados en la posición {$a[1]}';
 $lang['Officials']='Oficiales';
+$lang['OldStyleElimination']='Eliminatorias de 3D/Campo al estilo antiguo';
 $lang['OnePlace']='1er Puesto';
 $lang['OnlineId']='Código de Identidad en-línea';
 $lang['OnlyAccredited']='solo si está acreditado';
@@ -699,12 +730,16 @@
 $lang['OrisFinals']='Finales (C75B)';
 $lang['OrisScorecards']='Hojas de puntuación (C73D)';
 $lang['OrisScorecardsTeam']='Hojas de puntuación (C73E)';
+$lang['OrisStatsIndividual']='Estadísticas (C85A)';
+$lang['OrisStatsTeam']='Estadísticas (C85B+C)';
 $lang['OrisTeamList']='Listado de Equipos en Oris';
 $lang['OtherTourCategory']='Otros';
 $lang['OutdoorTourCategory']='Competición al Aire Libre';
 $lang['OverwritePreviousArchers']='Sobrescribir Arqueros anteriores';
+$lang['OvrBioAchievements']='Logros de los Atletas';
 $lang['OvrRefresh']='Actualizar Página (no enviar)';
 $lang['OvrSendSerial']='Enviar a OVR (en Serie)';
+$lang['OVRSignals']='Enviar Señales OVR';
 $lang['OvrSignalSendAll']='Enviar todo';
 $lang['PageBreakBeforeDays']='Cambiar de página antes de cada día';
 $lang['PaperSize']='Tamaño del papel';
@@ -785,6 +820,8 @@
 $lang['PrintNames']='Imprimir Nombres';
 $lang['PrintNormal']='Normal (Latín)';
 $lang['PrintScore']='Imprimir Hojas de Puntuación';
+$lang['PrintScoreInd']='Imprimir las Hojas de Puntuación Ondividuales';
+$lang['PrintScoreTeam']='Imprimir las Hojas de Puntuación de Equipos';
 $lang['PrintText']='Texto del encabezamiento';
 $lang['PrintTextTitle']='Encabezamiento para las Hojas de Resultados';
 $lang['Privacy-1']='Ianseo no conserva datos personales, excepto en el caso en el que el usuario lo haya permitido. El software de Ianseo puede utilizarse para guardar datos personales si el controlador tiene un interés legítimo en dichos datos.';
@@ -873,6 +910,7 @@
 $lang['ScheduleFromDay']='Programa desde el día:';
 $lang['ScheduleNotes']='Notas sobre la programación';
 $lang['ScheduleToday']='Programación de hoy';
+$lang['ScheduleUnfinished']='Excluir turnos finalizados';
 $lang['SchIncFinalists']='Incluir los Nombres de los Finalistas';
 $lang['Score']='Puntuación';
 $lang['Score1PageAllDist']='Imprimir la hoja de puntuación de un atleta con todas las distancias en una sola página';
@@ -1088,7 +1126,7 @@
 $lang['TeamCreationMode_2']='Siempre el 2º Equipo';
 $lang['TeamCreationMode_3']='Siempre el 3er Equipo';
 $lang['TeamFin']='Equipos - Series Eliminatorias y Finales';
-$lang['TeamFinEvent']='Final de Equipos';
+$lang['TeamFinEvent']='Eventos por Equipos';
 $lang['TeamLoaded']='Encuentros de Equipos cargados para la programación {$a}';
 $lang['TeamManagerSignature']='Firma del Responsable del Equipo';
 $lang['TeamPlace']='Señales del posicionamiento de los Equipos';
@@ -1211,6 +1249,7 @@
 $lang['TVCss3RankNone']='Sin posición';
 $lang['TVCss3RankOld']='Posición anterior';
 $lang['TVCss3RankUp']='Subir posición';
+$lang['TVCss3Schedule']='Programa';
 $lang['TVCss3Score']='Resultado';
 $lang['TVCss3Session']='Turno';
 $lang['TVCss3SpecificSettings']='Configuración específica de esta página. Usar la sintaxis CSS3 para este elemento.';
@@ -1306,6 +1345,7 @@
 $lang['TVViewNationNameDescr']='Alterna la visualización del País/Club del atleta.';
 $lang['TVViewPartials']='Ver las puntuaciones de las distancias';
 $lang['TVViewPartialsDescr']='Cambia la visualización de las puntuaciones de todas las distamcias';
+$lang['TvViewSCHED']='Mostrar el programa';
 $lang['TvViewTEAM']='Ver columna de Equipos';
 $lang['TvViewTIT2ROWS']='Título en 2 filas';
 $lang['TvViewTOT']='Ver el Gran Total';
@@ -1370,7 +1410,9 @@
 $lang['UserDetails']='Detalles del usuario';
 $lang['UserEnabled']='Activado';
 $lang['UserName']='Nombre de usuario';
-$lang['UserPassword']='Contraseña';
+$lang['UserPassword']='Nueva Contraseña';
+$lang['UserPasswordOld']='Contraseña antigua';
+$lang['UserPasswordRetype']='Vuelve a escribir la nueva Contraseña';
 $lang['UseSubClasses']='Aplicar a subclases específicas';
 $lang['ValidClass']='Clases asignables';
 $lang['ValidDivisions']='Divisiones permitidas (vacio pata todas)';
@@ -1386,6 +1428,7 @@
 $lang['VersionSector']='Sector';
 $lang['VersionSectors']='Sectores afectados';
 $lang['VersionTimestamp']='Ultima versión';
+$lang['VertScoreAllDist']='Hoja de puntuación vertical con todas las distancias (Lancaster)';
 $lang['ViewTeamComponents']='Ver los componentes de los equipos';
 $lang['ViewTeamComponentsDescr']='Alterna  la visualización de los componentes del Equipo';
 $lang['WaCategory']='Categoría WA';
diff --git a/src/Common/Languages/fi/IOC_Codes.php b/src/Common/Languages/fi/IOC_Codes.php
index 55232b85..e4f54768 100644
--- a/src/Common/Languages/fi/IOC_Codes.php
+++ b/src/Common/Languages/fi/IOC_Codes.php
@@ -32,16 +32,12 @@
 $lang['BUL']='Bulgaria';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Keski-Afrikan tasavalta';
-$lang['CAM']='Kambodza';
 $lang['CAN']='Kanada';
 $lang['CAY']='Caymansaaret';
 $lang['CGO']='Kongon tasavalta';
 $lang['CHA']='Tsad';
 $lang['CHI']='Chile';
-$lang['CHN']='Kiina';
-$lang['CIV']='Norsunluurannikko';
 $lang['CMR']='Kamerun';
-$lang['COD']='Kongon demokraattinen tasavalta';
 $lang['COK']='Cookinsaaret';
 $lang['COL']='Kolumbia';
 $lang['COM']='Komorit';
@@ -50,7 +46,6 @@
 $lang['CRO']='Kroatia';
 $lang['CUB']='Kuuba';
 $lang['CYP']='Kypros';
-$lang['CZE']='Tsekki';
 $lang['DEN']='Tanska';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -81,17 +76,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hongkong';
 $lang['HON']='Honduras';
 $lang['HUN']='Unkari';
 $lang['INA']='Indonesia';
 $lang['IND']='Intia';
-$lang['IRI']='Iran';
 $lang['IRL']='Irlanti';
 $lang['IRQ']='Irak';
 $lang['ISL']='Islanti';
 $lang['ISR']='Israel';
-$lang['ISV']='Yhdysvaltain Neitsytsaaret';
 $lang['ITA']='Italia';
 $lang['IVB']='Brittiläiset Neitsytsaaret';
 $lang['JAM']='Jamaika';
@@ -104,7 +96,6 @@
 $lang['KOR']='Korean tasavalta';
 $lang['KSA']='Saudi-Arabia';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Kaos';
 $lang['LAT']='Latvia';
 $lang['LBA']='Libya';
 $lang['LBR']='Liberia';
@@ -118,7 +109,6 @@
 $lang['MAR']='Marokko';
 $lang['MAS']='Malesia';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldova';
 $lang['MDV']='Malediivit';
 $lang['Medal-1']='Kultamitali';
 $lang['Medal-2']='Hopeamitali';
@@ -127,7 +117,6 @@
 $lang['MEX']='Meksiko';
 $lang['MGL']='Mongolia';
 $lang['MHL']='Marshallinsaaret';
-$lang['MKD']='Pohjois Makedonia';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -156,7 +145,6 @@
 $lang['PNG']='Papua-Uusi-Guinea';
 $lang['POL']='Puola';
 $lang['POR']='Portugali';
-$lang['PRK']='Korean demokraattinen tasavalta';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Romania';
@@ -183,13 +171,11 @@
 $lang['SVK']='Slovakia';
 $lang['SWE']='Ruotsi';
 $lang['SWZ']='Swasimaa';
-$lang['SYR']='Syyria';
 $lang['TAN']='Tansania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thaimaa';
 $lang['TJK']='Tadzikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Itä-Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Kiinalainen Taipei';
 $lang['TRI']='Trinidad ja Tobago';
diff --git a/src/Common/Languages/fi/Install.php b/src/Common/Languages/fi/Install.php
index 2b7fe439..d794fe29 100644
--- a/src/Common/Languages/fi/Install.php
+++ b/src/Common/Languages/fi/Install.php
@@ -45,7 +45,6 @@
 $lang['Parameter']='Parametri';
 $lang['Password']='Salasana';
 $lang['PHP settings']='PHP asetukset';
-$lang['PHP too old']='PHP: n versio on liian vanha. IANSEO vaatii version 5.0 tai uudemman.';
 $lang['PHP version']='PHP versio';
 $lang['php.ini file']='php.ini -tiedosto';
 $lang['Prepare']='Valmistelee tietoja päivitystä varten';
diff --git a/src/Common/Languages/fi/Tournament.php b/src/Common/Languages/fi/Tournament.php
index f78e84b5..949b7ca2 100644
--- a/src/Common/Languages/fi/Tournament.php
+++ b/src/Common/Languages/fi/Tournament.php
@@ -56,7 +56,6 @@
 $lang['BadgeIncludePhoto']='Kuvan lisäys';
 $lang['BadgeNames']='Nimi';
 $lang['BadgeNoData']='Ei tulostettavaa tietoa';
-$lang['BadgeOnlyNotPrinted']='VAIN tulostamattomat kortit';
 $lang['BadgeOnlyPrintAccredited']='VAIN jo akkreditoiduille kortit';
 $lang['BadgeOnlyPrintPhoto']='VAIN kuvalliset kortit';
 $lang['BadgeOptions']='Tulostusvaihtoehdot';
@@ -96,8 +95,6 @@
 $lang['CatJudge']='Tuomarit';
 $lang['CatJury']='Jury';
 $lang['CatOC']='Järjestelytoimikunta';
-$lang['ChairmanJudge']='Päätuomari';
-$lang['ChairmanJury']='Juryn puheenjohtaja';
 $lang['ChangeNationsNames']='Vaihda maiden/seurojen nimet';
 $lang['CheckRefMail']='Tarkista suositus sähköposti...';
 $lang['CheckTargetUpdate']='Tarkista tietojen päivitys';
@@ -535,7 +532,6 @@
 $lang['TeamCreationMode_2']='Aina 2. joukkue';
 $lang['TeamCreationMode_3']='Aina 3. joukkue';
 $lang['TeamFin']='Jouekkuekilpailun pudotus- ja finaalikierros';
-$lang['TeamFinEvent']='Joukkue-finaali';
 $lang['TeamPlace']='Joukkue-kyltit';
 $lang['TeamPlaceLocal']='Joukkue-kyltit (lokalisoitu)';
 $lang['TeamQual']='Joukkuekilpailun karsintakierros';
diff --git a/src/Common/Languages/fr-ca/IOC_Codes.php b/src/Common/Languages/fr-ca/IOC_Codes.php
index fe5fc9cb..9e78fa4b 100644
--- a/src/Common/Languages/fr-ca/IOC_Codes.php
+++ b/src/Common/Languages/fr-ca/IOC_Codes.php
@@ -12,7 +12,6 @@
 $lang['ASA']='Les Samoa Américains';
 $lang['AUS']='Australie';
 $lang['AUT']='Autriche';
-$lang['Award-Anthem']='Mesdames et messieurs, s\'il vous plaît debout pour l\'hyme national de';
 $lang['Award-PremiumGiver']='Le $a[0]sera présenté par $a[1]';
 $lang['Award-representing']='Représentant $a';
 $lang['AZE']='Azerbaïdjan';
@@ -35,16 +34,12 @@
 $lang['BUL']='Bulgarie';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='République centrafricaine';
-$lang['CAM']='Cambodge';
 $lang['CAN']='Canada';
 $lang['CAY']='Îles Caymand';
 $lang['CGO']='République du Congo';
 $lang['CHA']='Tchad';
 $lang['CHI']='Chilie';
-$lang['CHN']='Chine';
-$lang['CIV']='Côte d\'Ivoire';
 $lang['CMR']='Cameroun';
-$lang['COD']='République démocratique du Congo';
 $lang['COK']='Îles Cook';
 $lang['COL']='Colombie';
 $lang['COM']='Coromes';
@@ -53,7 +48,6 @@
 $lang['CRO']='Croatie';
 $lang['CUB']='Cuba';
 $lang['CYP']='Chypre';
-$lang['CZE']='République Tchèque';
 $lang['DEN']='Danemark';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominique';
@@ -84,17 +78,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyane';
 $lang['HAI']='Haïti';
-$lang['HKG']='Honk Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Hongrie';
 $lang['INA']='Indonésie';
 $lang['IND']='Inde';
-$lang['IRI']='Iran';
 $lang['IRL']='Irelande';
 $lang['IRQ']='Iraq';
 $lang['ISL']='Islande';
 $lang['ISR']='Israël';
-$lang['ISV']='État des États-Îles Vierges';
 $lang['ITA']='Italie';
 $lang['IVB']='Îles Vierges Britanniques';
 $lang['JAM']='Jamaique';
@@ -106,7 +97,6 @@
 $lang['KIR']='Kiribati';
 $lang['KSA']='Arabie Saoudite';
 $lang['KUW']='Kuweit';
-$lang['LAO']='Laos';
 $lang['LAT']='Lettonie';
 $lang['LBA']='Libye';
 $lang['LBR']='Libéria';
@@ -120,7 +110,6 @@
 $lang['MAR']='Maroc';
 $lang['MAS']='Malasie';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldavie';
 $lang['MDV']='Maldives';
 $lang['Medal-1']='Médaille d\'or';
 $lang['Medal-2']='Médaille d\'argent';
@@ -157,7 +146,6 @@
 $lang['PNG']='Papouasie Nouvelle Guinée';
 $lang['POL']='Polongne';
 $lang['POR']='Portugal';
-$lang['PRK']='Korée du Nord';
 $lang['PUR']='Porto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Roumanie';
@@ -182,13 +170,11 @@
 $lang['SUR']='Suriname';
 $lang['SVK']='Slovaquie';
 $lang['SWE']='Suède';
-$lang['SYR']='Syrie';
 $lang['TAN']='Tanzanie';
 $lang['TGA']='Tonga';
 $lang['THA']='Thaïlande';
 $lang['TJK']='Tadjikistan';
 $lang['TKM']='Turkménistan';
-$lang['TLS']='Timo oriental';
 $lang['TOG']='Togo';
 $lang['TPE']='Taipei Chinois';
 $lang['TRI']='Trinité-et-Tobago';
diff --git a/src/Common/Languages/fr-ca/Tournament.php b/src/Common/Languages/fr-ca/Tournament.php
index 18cd9b3b..cdcdb9fd 100644
--- a/src/Common/Languages/fr-ca/Tournament.php
+++ b/src/Common/Languages/fr-ca/Tournament.php
@@ -60,7 +60,6 @@
 $lang['BadgeConfirmPrintedDescr']='Pousser SEULEMENT ce bouton si les insignes sélectionnées ont été correctement imprimées';
 $lang['BadgeIncludePhoto']='Inclure photo dans l\'insigne?';
 $lang['BadgeNoData']='Pas de données à imprimer';
-$lang['BadgeOnlyNotPrinted']='SEULEMENT les insgines pas encore imprimées';
 $lang['BadgeOnlyPrintAccredited']='SEULEMENT les insignes des participants accrédités';
 $lang['BadgeOnlyPrintPhoto']='SEULEMENT les insignes avec photo?';
 $lang['BadgeOptions']='Options';
@@ -91,8 +90,6 @@
 $lang['CatJudge']='Juges';
 $lang['CatJury']='Jury d\'appel';
 $lang['CatOC']='Comité organisateur';
-$lang['ChairmanJudge']='Président des juges';
-$lang['ChairmanJury']='Président du Jury d\'appel';
 $lang['ChangeNationsNames']='Changer noms des pays';
 $lang['CheckScorecards']='Vérifier cartes de pointage';
 $lang['Classes']='Classes';
diff --git a/src/Common/Languages/fr/Api.php b/src/Common/Languages/fr/Api.php
index 74d582d2..30281329 100644
--- a/src/Common/Languages/fr/Api.php
+++ b/src/Common/Languages/fr/Api.php
@@ -50,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='Etat de la connection';
 $lang['ISK-DeleteDevices']='Supprimer les dispositifs';
 $lang['ISK-DenyAccess']='Refuse l\'accès';
+$lang['ISK-Deprecated']='IMPORTANT: L\'application ISK "Ianseo Score Keeper" est maintenant plus supportée! Nous vous invitons à télécharger la nouvelle version de ISK: "Ianseo Score Keeper NG".';
 $lang['ISK-DeviceAlive']='En ligne';
 $lang['ISK-DeviceBattery']='Batterie';
 $lang['ISK-DeviceEnabled']='Activé';
@@ -79,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='Code de compétition manquant';
 $lang['ISK-Lite-QRCode']='Imprimer le QR-Code pour Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='URL du serveur (inclure le protocole et le port si différent de 80)';
+$lang['ISK-Live-Deprecated']='IMPORTANT: L\'application ISK "Ianseo Score Keeper Live" est maintenant plus supportée! Nous vous invitons à télécharger la nouvelle version de ISK: "Ianseo Score Keeper NG".';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper DIRECT';
 $lang['ISK-lockPortrait']='Bloquer la vue portrait sur le périphérique';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
diff --git a/src/Common/Languages/fr/BackNumbers.php b/src/Common/Languages/fr/BackNumbers.php
index 14123f6c..21415736 100644
--- a/src/Common/Languages/fr/BackNumbers.php
+++ b/src/Common/Languages/fr/BackNumbers.php
@@ -50,6 +50,7 @@
 $lang['BarcodeSeparator']='Séparateur de code-barre';
 $lang['BgImage']='Image de fond';
 $lang['BibNumber']='Numéro du tournoi';
+$lang['BlackWhite']='Noir & Blanc';
 $lang['Bold']='Gras';
 $lang['Category']='Catégorie';
 $lang['CharColor']='Couleur Car.';
@@ -57,9 +58,12 @@
 $lang['CharType']='Type de caractères';
 $lang['CheckBarcodeSeparator']='Vérifier le séparateur de Code Barre';
 $lang['Club']='Détails Pays / Club';
+$lang['Club2']='Libellé du Pays/Club 2';
+$lang['Club3']='Libellé du Pays/Club 3';
 $lang['ClubCamel']='Nom du Club';
 $lang['ClubCaps']='NOM DU CLUB';
 $lang['ColoredArea']='Bloque de texte';
+$lang['Coloured']='Coloriés';
 $lang['CompDetails']='Détails de la compétition';
 $lang['CompName']='Nom de la compétition';
 $lang['Content']='Contenu';
@@ -99,6 +103,7 @@
 $lang['GivCaps-FamCaps']='PRÉNOM NOM DE FAMILLE';
 $lang['GivenNameInitial']='1ère lettre du nom';
 $lang['Heigh']='Hauteur';
+$lang['HLayout']='Horizontal';
 $lang['HLine']='Ligne Horizontale';
 $lang['I-Badge']='Dossard des matchs individuels';
 $lang['IdCardHor']='Nombre de carte en largeur';
@@ -126,13 +131,18 @@
 $lang['Offest2nd']='Décalage du 2ème dossard (si nécessaire)';
 $lang['OneLine']='En Ligne';
 $lang['OnlyAthletes']='Athlètes uniquement';
+$lang['OpenPictureScreen']='Ouvrir un second ecran';
 $lang['PageDimension']='Dimension de la page';
 $lang['PaperDimention']='Dimention du papier';
+$lang['PhaseFrom']='Depuis la phase';
+$lang['PhaseTo']='Jusqu\'à la phase';
 $lang['Picture']='Photo de l\'athlète';
 $lang['Portrait']='Portrait';
 $lang['PosX']='Position (X)';
 $lang['PosY']='Position (Y)';
 $lang['PrintBackNo']='Imprimer les dossards';
+$lang['PrintHasPlastic']='Uniquement les détenteurs de Cartes Lanyards';
+$lang['PrintSyncResult']='$a Backnumbers ont été imprimés!';
 $lang['Q-Badge']='Qualification Athlète Numéro';
 $lang['QRScore']='Score des qualifications';
 $lang['QualPosition']='Classement des qualifications';
@@ -142,6 +152,8 @@
 $lang['ReadSeparator']='Lire le séparateur';
 $lang['ResetBackNo']='Réinitialiser la mise en page du N° d\'athlète';
 $lang['ResetBarcodeSeparator']='Reset du séparateur de code-barre';
+$lang['RnkCardinalEN']='Numérotation standard (1,2,...,10)';
+$lang['RnkOrdinal']='Numérotation de place (1er, 2ème,....,10ème) - FR';
 $lang['Schedule']='Programme';
 $lang['Session']='Session de Qualification';
 $lang['SessionTarget']='Code de session et cible';
@@ -155,8 +167,10 @@
 $lang['ToRight']='Logo de la compétition (droite)';
 $lang['TVViewIdCard']='Voir les ID des cartes';
 $lang['TVViewIdCardDescr']='En vue matchs, afficher les 2 N° de carte des adversaires au lieu de lignes "standards"';
+$lang['VLayout']='Vertical';
 $lang['Width']='Largeur';
 $lang['WRank']='Classement mondial';
-$lang['Y-Badge']='Badge individuel';
-$lang['Z-Badge']='Badge Equipe';
+$lang['WRankImage']='Photo WA';
+$lang['Y-Badge']='Diplôme (individuel)';
+$lang['Z-Badge']='Diplôme (Equipe)';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/Boinx.php b/src/Common/Languages/fr/Boinx.php
index f2d55caf..30c1e1b9 100644
--- a/src/Common/Languages/fr/Boinx.php
+++ b/src/Common/Languages/fr/Boinx.php
@@ -7,6 +7,99 @@
 $lang['ArcheryTopScoring.qtz']='Montre le résulta d\'un match en court dans le coin supérieur gauche de l\'écran ou en plein écran. Il est possible de visualiser également la photo de l\'archer ou le drapeau du pays. Avec le set ou le score cumulatif.';
 $lang['BoinxLayer']='Composants Boinx';
 $lang['BoinxSchedule']='Horaire de Boinx';
+$lang['CssArrowCommon']='Flèches';
+$lang['CssArrTitle']='Score total  - Titre';
+$lang['CssArrTotal']='Score total - Valeurs';
+$lang['CssBoxCommon']='Bloc - Général';
+$lang['CssBoxLeft']='Bloc - Gauche';
+$lang['CssBoxRight']='Bloc - Droite';
+$lang['CssCountry']='Bloc Nom et couleurs - Pays';
+$lang['CssCountryCommon']='Pays';
+$lang['CssFlag']='Bloc';
+$lang['CssFlexArrows']='Bloc volée détaillée - Commun';
+$lang['CssFlexArrowsDiv']='Emplacement Flèche';
+$lang['CssFlexName']='Bloc Nom et Drapeau - Commun';
+$lang['CssFlexSum']='Bloc Volée actuelle - Commun';
+$lang['CssFlexTotal']='Bloc Score total - Commum';
+$lang['CssImage']='Image d\'habillage';
+$lang['CssImage1']='CSS Image 1';
+$lang['CssImage2']='CSS Image 2';
+$lang['CssImage3']='CSS Image 3';
+$lang['CssImageDiv']='Espace de l\'image d\'habillage';
+$lang['CssLeftFlexArrows']='Volée détaillée - Gauche';
+$lang['CssLeftFlexName']='Nom et drapeau - Gauche';
+$lang['CssLeftFlexSum']='Volée actuelle - Gauche';
+$lang['CssLeftFlexTotal']='Score total - Gauche';
+$lang['CssLeftLight']='Timming - Gauche';
+$lang['CssLeftNames']='Marque - Gauche';
+$lang['CssLeftPresentation']='Présentation - Gauche';
+$lang['CssLeftPresentationCountry']='Présentation du Club -Gauche';
+$lang['CssLeftPresentationEvent']='Présentation du tour - Gauche';
+$lang['CssLeftPresentationNames']='Présentation de l\'Archer - Gauche';
+$lang['CssLeftWinner']='Vainqueur Gauche';
+$lang['CssLight']='Bloc temps - Commun';
+$lang['CssMatchBottom']='Match - Ligne du bas';
+$lang['CssMatchCommon']='Match - Commun';
+$lang['CssMatchTop']='Match - Ligne du haut';
+$lang['CssName']='Nom + Drapeau de l\'Archer';
+$lang['CssNames']='Feuille de marque';
+$lang['CssPointsCommon']='Point';
+$lang['CssPresentation']='Menu de présentation';
+$lang['CssPresentationCountry']='Nom du club';
+$lang['CssPresentationCountryCode']='Numéro de licence';
+$lang['CssPresentationCountryFlag']='Drapeau';
+$lang['CssPresentationCountryName']='Nom du club';
+$lang['CssPresentationEvent']='Présentation de la phase en cours';
+$lang['CssPresentationNames']='Nom de la phase en cours';
+$lang['CssRankCommon']='Rang de la cellule';
+$lang['CssReminder']='N\'oubliez pas de sauvegarder :) !';
+$lang['CssRightFlexArrows']='Detail de la volée - Droite';
+$lang['CssRightFlexName']='Bloc Nom et Drapeau - Droit';
+$lang['CssRightFlexSum']='Bloc Volée actuelle - Droit';
+$lang['CssRightFlexTotal']='Bloc Score total - Droit';
+$lang['CssRightLight']='Bloc Temps - Droit';
+$lang['CssRightNames']='Feuille de marque - Droit';
+$lang['CssRightPresentation']='Présentation - Droit';
+$lang['CssRightPresentationCountry']='Ligne du Pays/club - Droit';
+$lang['CssRightPresentationEvent']='Ligne de la catégorie - Droit';
+$lang['CssRightPresentationNames']='Ligne des noms - Droit';
+$lang['CssRightWinner']='Bloc Vainqueur - Droit';
+$lang['CssSeriesHeaderCommon']='Entête - Commun';
+$lang['CssSeriesTitle']='Total';
+$lang['CssSetsCommon']='Point de set';
+$lang['CssSetTitle']='Point de match';
+$lang['CssSoCommon']='Bloc Flèche de Barrage - Commun';
+$lang['CssSoPoints']='Bloc Flèche de Barrage - Points';
+$lang['CssSoPointsCommon']='Points';
+$lang['CssSoSeriesTitle']='Entête - Titre de la catégorie';
+$lang['CssSoSets']='Bloc Flèche de Barrage - Set';
+$lang['CssSoSetsCommon']='Sets';
+$lang['CssSoSetTitle']='Entête - Set';
+$lang['CssSumTitle']='Titre de la Volée en cours';
+$lang['CssSumTotal']='Valeur de la volée en cours';
+$lang['CssText1']='CSS pour Texte 1';
+$lang['CssText2']='CSS pour Texte 2';
+$lang['CssText3']='CSS pour Texte 3';
+$lang['CssText4']='CSS pour Texte  4';
+$lang['CssTitleCommon']='Titre principal';
+$lang['CssVegasFreeTextRow']='Ligne';
+$lang['CssVegasFreeTextText']='Texte';
+$lang['CssVegasFreeTextTitle']='Sous titre';
+$lang['CssVegasInOutFlag']='Drapeau';
+$lang['CssVegasInOutIsIn']='Variation des points IN';
+$lang['CssVegasInOutIsLens']='Variation des points LENS (non utilisé)';
+$lang['CssVegasInOutIsOut']='Variation des points OUT';
+$lang['CssVegasInOutIsWinner']='Vainqueur - Variation de point';
+$lang['CssVegasInOutLong']='Drapeau + Nom';
+$lang['CssVegasInOutName']='Nom';
+$lang['CssVegasInOutPoints']='Points';
+$lang['CssVegasInOutRow']='Ligne';
+$lang['CssVegasSOName']='Nom';
+$lang['CssVegasSOPoints']='Points';
+$lang['CssVegasSORow']='Ligne';
+$lang['CssVegasSOTarget']='Cible';
+$lang['CssWindSpeed']='Panneau Vent';
+$lang['CssWinner']='Bloc Vainqueur - Commun';
 $lang['DirNotWriteable']='Pas d\'accès en écriture dans le répertoire';
 $lang['Download']='Télécharger';
 $lang['HowToUse']='Comment intégrer Ianseo et Boinx ?';
diff --git a/src/Common/Languages/fr/Common.php b/src/Common/Languages/fr/Common.php
index fbe0ec89..b7bb01a0 100644
--- a/src/Common/Languages/fr/Common.php
+++ b/src/Common/Languages/fr/Common.php
@@ -11,10 +11,13 @@
 $lang['32_Phase']='1/32';
 $lang['48_Phase']='1/48';
 $lang['4_Phase']='1/4';
+$lang['50M']='Homme +50ans';
+$lang['50W']='Femme +50ans';
 $lang['63_Phase']='Rencontres D1';
 $lang['64_Phase']='1/64';
 $lang['7_Phase']='1/6ème de finale (14 qualifiés)';
 $lang['8_Phase']='1/8';
+$lang['AccreditationBoothSetup']='Paramétrage bureau des accréditation';
 $lang['Advanced']='Avancé';
 $lang['AdvancedMode']='Mode Avancé';
 $lang['AF']='Dames Cadet';
@@ -26,6 +29,7 @@
 $lang['AllowMultiTeam']='Créer automatiquement plusieurs équipes';
 $lang['AllowPartialTeams']='Autoriser les équipes incomplètes';
 $lang['AllSecReviews']='Commentaires en langue secondaire';
+$lang['All_Phases']='Toutes les phases';
 $lang['AM']='Hommes Cadet';
 $lang['AN']='Bare Bow';
 $lang['Archer']='Archer';
@@ -64,9 +68,11 @@
 $lang['CmdOk']='Ok';
 $lang['CmdOn']='On';
 $lang['CmdPostUpdate']='Post-mise à jour';
+$lang['CmdRefresh']='Actualiser';
 $lang['CmdSave']='Sauvegarder';
 $lang['CmdSaveContinue']='Sauver et continuer';
 $lang['CmdSet2All']='Assigner à tous';
+$lang['CmdSync']='Synchroniser';
 $lang['CmdUpdate']='Mettre à jour';
 $lang['CO']='Arc à Poulies';
 $lang['CommaSeparatedValues']='Valeurs séparées par des virgules';
@@ -110,6 +116,7 @@
 $lang['DayOfWeek_4']='Jeu';
 $lang['DayOfWeek_5']='Ven';
 $lang['DayOfWeek_6']='Sam';
+$lang['DefaultMode']='Mode par defaut';
 $lang['DeleteSession']='Supprimer le départ';
 $lang['Description']='Description';
 $lang['Destination']='Cible de destination';
@@ -136,6 +143,10 @@
 $lang['Finish']='Fin';
 $lang['FirstPhase']='Première phase';
 $lang['FopSetup']='Aménagement du terrain';
+$lang['Gender0']='Homme';
+$lang['Gender1']='Femme';
+$lang['GenderShort0']='M';
+$lang['GenderShort1']='F';
 $lang['GF']='Dames Benjamins';
 $lang['GM']='Hommes Benjamins';
 $lang['HELP']='Aide!';
@@ -153,7 +164,14 @@
 $lang['IndFinEventWithoutShootOff']='Attention!<br>les épreuves suivantes sont encore en barrage et ne seront pas visibles!';
 $lang['IndImport']='Importer les données des duels individuels';
 $lang['Individual']='Individuel';
+$lang['IndTeam-0']='Individuel';
+$lang['IndTeam-1']='Equipes';
+$lang['InitEliminations']='Initialiser les phases Eliminatoires';
+$lang['InitEliminations1']='Initialiser le 1er tour des phases Eliminatoires';
+$lang['InitEliminations2']='Initialiser le 2nd tour des phases Eliminatoires';
 $lang['InitFinalGrids']='Initialiser les duels';
+$lang['InitPools']='Initialisation des Poules';
+$lang['InvalidAction']='Action invalide';
 $lang['ISK-Configuration']='Gestion des périphériques';
 $lang['ISK-GetQRData']='Obtenir données QRCode';
 $lang['ISK-Results']='Résultats';
@@ -169,6 +187,7 @@
 $lang['jrTextBox']='Zone de texte,  $a caractères maximum';
 $lang['jrYesNo']='Oui / Non';
 $lang['JudgeNotes']='Annotations des arbitres';
+$lang['JW']='Junior Femme';
 $lang['LB']='Long Bow';
 $lang['LiveOff']='Désactiver le mode direct-LIVE';
 $lang['LiveOffSession']='Mettre le direct en OFF pour tous les matchs';
@@ -185,14 +204,18 @@
 $lang['MatchMode_0']='Cumulatif';
 $lang['MatchMode_1']='Mode "set"';
 $lang['MatchNo']='Match N°';
+$lang['MatchWinShot']='Match pour la victoire';
+$lang['MatchWinShotHelp']='[Nb de tirs gagnants réussis] - [Nb de tirs vainqueurs échoués] %=Pourcentage de succès lorsqu’une flèche est un gagnant potentiel';
 $lang['Medal']='Médaille';
 $lang['MedalBronze']='Bronze';
 $lang['MedalGold']='Or';
 $lang['MedalList']='Liste des médailles';
 $lang['MedalSilver']='Argent';
 $lang['MedalStanding']='Classement des médailles';
+$lang['MenuLMRemoveNoShows']='Supprimer les absents';
 $lang['MenuLM_Accreditation']='Accréditation';
 $lang['MenuLM_Accreditation colors management']='Gestion des couleurs d\'accréditaton';
+$lang['MenuLM_AdvancedFeatures']='Fonctions avancées';
 $lang['MenuLM_AdvLabels']='Impression avancée des étiquettes';
 $lang['MenuLM_Archers on Targets']='Archers par cible';
 $lang['MenuLM_Arr4Set']='Flèches par set';
@@ -202,7 +225,9 @@
 $lang['MenuLM_Athletes Participation to Ind/Team Event']='Participation des compétiteurs aux épreuves Ind/Equipe';
 $lang['MenuLM_Athletes Setup']='Configuration des compétiteurs';
 $lang['MenuLM_Athletes Sync.']='Synchronisation des compétiteurs';
+$lang['MenuLM_AthletesDiscrepancies']='Para-Archers';
 $lang['MenuLM_Athlets fees status']='Etat du paiement des compétiteurs';
+$lang['MenuLM_Authentication']='Identifiant utilisateur';
 $lang['MenuLM_AutoCheckinSetup']='Mise au point de l\'auto check-in';
 $lang['MenuLM_Back Number Printout']='Impression des dossards';
 $lang['MenuLM_Boinx']='Configuration des couches Boinx';
@@ -214,11 +239,14 @@
 $lang['MenuLM_Category Result List']='Liste des résultats par catégorie';
 $lang['MenuLM_Change Components']='Changement des composants';
 $lang['MenuLM_ChangeNationsNames']='Changer les noms des Nations';
+$lang['MenuLM_ChangePassword']='Changer le mot de passe';
 $lang['MenuLM_Check Data Update']='Contrôles des données';
 $lang['MenuLM_Check shoot-off before eliminations']='Contrôler les ex-aequo avant les éliminatoires';
 $lang['MenuLM_Check shoot-off before final phases']='Contrôler les ex-aequo avant les phases finales';
+$lang['MenuLM_Check shoot-off before Rank']='Vérifier les tirs de barrage avant l\'impression du classement';
 $lang['MenuLM_CheckAwards']='Vérification de la traduction des récompenses';
 $lang['MenuLM_CheckList']='Imprimer la liste de vérification';
+$lang['MenuLM_CIS']='CIS';
 $lang['MenuLM_CleanDir']='Nettoyage du répertoire temporaire';
 $lang['MenuLM_Close']='Fermer';
 $lang['MenuLM_ClubChampEvent']='Championnat Nationnal des équipes club';
@@ -255,6 +283,7 @@
 $lang['MenuLM_Export-FR-Results']='Export pour FFTA';
 $lang['MenuLM_ExportFieldStatistics']='Export du champs statistiques';
 $lang['MenuLM_Extended Table']='Tableau étendu';
+$lang['MenuLM_ExtraAddOns']='Add-Ons';
 $lang['MenuLM_ExtraCategories']='Catégories standard suplémentaires';
 $lang['MenuLM_Fees setup']='Configuration des paiements';
 $lang['MenuLM_Field Crew']='Equipe de terrain';
@@ -264,6 +293,9 @@
 $lang['MenuLM_FinalFOPChoose']='Terrain Final étendu';
 $lang['MenuLM_FlightsAwardManagement']='Gestion des récompenses des Flights';
 $lang['MenuLM_FlightsManagement']='Gestion des Flights';
+$lang['MenuLM_FontManagement']='Gestion de la police';
+$lang['MenuLM_GateControl']='Contrôle Portes d\'Accès';
+$lang['MenuLM_GateSituation']='Supervision Portes d\'Accès';
 $lang['MenuLM_Get Info']='Informations';
 $lang['MenuLM_getBiographies']='Prendre les Biographies WA';
 $lang['MenuLM_GetScoreBarcode']='Prise des scores via barre-code';
@@ -294,6 +326,7 @@
 $lang['MenuLM_ListLoad']='Chargement de liste (importation tableur)';
 $lang['MenuLM_Lock manage']='Conditions d\'accès au réseau';
 $lang['MenuLM_Lock setup']='Configuration des verrouillages';
+$lang['MenuLM_Logout']='Déconnexion';
 $lang['MenuLM_LueFill']='Créer une boucle à partir d\'un fichier';
 $lang['MenuLM_Manage Events']='Gestion des Epreuves';
 $lang['MenuLM_ManageActiveSession']='Gérer les sessions actives';
@@ -319,6 +352,7 @@
 $lang['MenuLM_Pools']='Poules';
 $lang['MenuLM_Print Sign']='Écriteau';
 $lang['MenuLM_PrintAwards']='Impression des récompenses';
+$lang['MenuLM_PrintAwardsPositions']='Imprimer les positions pour les récompenses';
 $lang['MenuLM_PrintBadges']='Impression des badges d\'accreditation';
 $lang['MenuLM_PrintFinalReport']='Imprimer le rapport final';
 $lang['MenuLM_Printout']='Impressions';
@@ -326,6 +360,7 @@
 $lang['MenuLM_PrintSchedulingByDay']='Imprimer le programe par jour';
 $lang['MenuLM_PrnShootOff']='Impression du status Shoot-Off / Pièce';
 $lang['MenuLM_QrCodes']='Imprimer les QR-Codes';
+$lang['MenuLM_QrCodesGates']='QR-Code d\'Accès terrain';
 $lang['MenuLM_Qualification']='Qualification';
 $lang['MenuLM_Qualification Field of Play Layout']='Aménagement du terrain des qualifications';
 $lang['MenuLM_Qualification Round']='Impression du tour de Qualification';
@@ -409,6 +444,7 @@
 $lang['MsgRowMustBeComplete']='ATTENTION!<br>Il faut compléter entièrement la ligne avant de continuer!';
 $lang['MsgWhyImportError']='Vous êtes en train de réinsérer les duels.<br>Il faut d\'abord vider les duels avant de rappeler cette fonction!';
 $lang['MultiTeamMaxNo']='Nombre maximum d\'équipes générées (0 = aucune limite)';
+$lang['MW']='Vétérans Femmes';
 $lang['MySqlCollation']='général';
 $lang['Nation']='Nom du Club/pays';
 $lang['NextMatchNames']='Noms de la phase suivante';
@@ -457,6 +493,7 @@
 $lang['Score1Page1Match']='Score du match';
 $lang['ScoreDrawing']='Schéma seulement (une seule page)';
 $lang['ScoreFilled']='Imprimer les feuilles de marques avec les résultats des flèches';
+$lang['ScoreIncAllNames']='Inclure tous les archers possible';
 $lang['ScoreIncEmpty']='Impression de tous les matchs';
 $lang['Scorer']='Marqueur';
 $lang['SearchOrphanTexts']='Recherche de textes orphelins';
@@ -467,7 +504,9 @@
 $lang['SF']='Dames Senior';
 $lang['ShootOff4Elim']='Contrôler les ex-aequo avant les éliminatoires';
 $lang['ShootOff4Final']='Contrôler les ex-aequo avant les phases finales';
+$lang['ShootOff4Rank']='Vérifier les tirs de barrage avant l\'impression du classement';
 $lang['SM']='Hommes Senior';
+$lang['SnapshotConf']='Instantané de config.';
 $lang['SortBy']='Trier par';
 $lang['Source']='Cible source';
 $lang['SourceSession']='Vers la session';
@@ -497,6 +536,7 @@
 $lang['TeamFinal']='Finales Équipes';
 $lang['Teams']='Equipes';
 $lang['TecError']='Pour des raisons techniques il est impossible d\'afficher la page demandée';
+$lang['TempRank']='Classement temporaire';
 $lang['TF']='Equipes Femmes';
 $lang['Tie']='Barrage';
 $lang['TieArrows']='Flèches de barrage';
@@ -512,6 +552,8 @@
 $lang['TrgCOOutdoorSmall']='Extérieur (6-X)';
 $lang['TrgField']='Tir campagne';
 $lang['TrgForestSwe']='Forêt (Suède)';
+$lang['TrgFrBeursault']='Beusault';
+$lang['TrgFrBouquet']='Bouquet Provincial';
 $lang['TrgHMOutComplete']='Cible académique (touché/manqué)';
 $lang['TrgHunterNor']='Chasse (Norvège)';
 $lang['TrgIndComplete']='Salle standard (1-10)';
@@ -519,9 +561,15 @@
 $lang['TrgNfaaInd']='NFAA Indoor (1-5/X)';
 $lang['TrgOutdoor']='Extérieur (1-X)';
 $lang['U']='Unisexe';
+$lang['U18M']='U18 Homme';
+$lang['U18W']='U18 Femme';
+$lang['U21M']='U21 Homme';
+$lang['U21W']='U21 Femme';
 $lang['UnexpectedError']='Erreur inattendue';
 $lang['VF']='Dames Vétérants';
 $lang['VM']='Hommes Vétérants';
+$lang['W']='Femme';
+$lang['WADivision']='Catégories WA';
 $lang['Winner']='Gagnant';
 $lang['Yes']='Oui';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/Errors.php b/src/Common/Languages/fr/Errors.php
index 3d9f9fd7..6cfd5513 100644
--- a/src/Common/Languages/fr/Errors.php
+++ b/src/Common/Languages/fr/Errors.php
@@ -1,7 +1,24 @@
 <?php
 $lang['AllFieldsMandatory']='Tous les champs sont obligatoires';
+$lang['AllMailsRedirect']='Tous les messages seront envoyés à';
 $lang['Anomalies']='Anomalies';
+$lang['BarCodeSession']='Erreur dans les paramètres : essayez de configurer une session !';
+$lang['BarCodeSettings']='Erreur dans les paramètres';
+$lang['CategoresNotDefined']='Définitions de catégorie manquantes';
+$lang['ClassFromToError']='"Du" et "Au" ne peuvent accepter que des valeurs numériques';
+$lang['ClubNotFound']='Le numéro du club n\'existe pas ! Mettez à jour la base licences via l\'extranet FFTA !';
+$lang['ConflictingCategories']='Le filtre actuel chevauche le filtre précédents pour les catégories: $a';
+$lang['DecodeError']='Erreur de décodage !';
+$lang['DiameterMandatory']='Taille de blason obligatoire';
 $lang['DirectoryNotWriteable']='Pas d\'écriture possible par le serveur web dans le répetoire $a . Veuillez modifier les permissions afin qu\'il soit inscriptible par tous.';
+$lang['DistanceOutRange']='Distante incorrecte';
+$lang['DivClasNumberNotEmpty']='Vous devez sélectionner au moins une division et une classe (et le nombre d’archers par équipe).';
+$lang['EmptyBody']='Le corps du message est obligatoire!';
+$lang['EmptyFrom']='L\'email est obligatoire !';
+$lang['EmptySubject']='L\'objet du mail est obligatoire';
+$lang['EmptyTitle']='Le titre du mail est obligatoire !';
+$lang['EntriesNoCategory']='Archer sans catégorie';
+$lang['EntriesNoCountry']='Archer sans Club/Cie';
 $lang['ErrCodeExists']='Le code existe déjà!';
 $lang['ErrCommitteeError']='Code comité ou description invalide';
 $lang['ErrConnection']='Pas de connexion au serveur $a';
@@ -19,4 +36,52 @@
 $lang['ErrRedCard']='Le comité subi un carton rouge et ne peut pas demander à ce que des concours soient hébergés sur ianseo. Contactez codes@ianseo.net pour plus d\'explications.';
 $lang['ErrUnknownNation']='Pays inconnu';
 $lang['ErrYellowCard']='Le Comité subi un carton jaune car aucun résultats du concours n\'a été téléchargés. Contactez codes@ianseo.net pour plus d\'explications.';
+$lang['EventIncompleteSetting']='Paramétrage incorrect dans les phases suivantes: $a';
+$lang['FilterAlreadyExists']='Fitre déjà existant';
+$lang['FilterNotEmpty']='Définissez un filtre !';
+$lang['IllegalTarget']='Le blason sélectionné n\'existe pas !';
+$lang['IllegalTargetChars']='Valeur(s) de flèche(s) incorrecte(s)';
+$lang['ImageFetchError']='Erreur de chargement de l\'image';
+$lang['ImageSaveError']='Image non sauvegardée';
+$lang['IncompleteSettings']='Paramètres incomplets';
+$lang['InvalidCharacters']='Ce champ contient des caractères invalides. Caractères valide:$a';
+$lang['InvalidEmail']='Email invalide, vérifier votre saisie !';
+$lang['InvalidLogin']='Identifiant incorrect';
+$lang['LockedProcedure']='La procédure est verrouillée';
+$lang['MailingAlreadyExists']='Un email avec le même sujet ({$a}) existe déjà ! Modifiez le titre ou sélectionnez le mail pour changer.';
+$lang['MailingDeleteText']='Veuillez confirmer que vous voulez supprimer définitivement cet envoi.';
+$lang['MailingDeleteTitle']='Suppression d\'envoi de mail';
+$lang['MailingError']='Aucun changement réalisé';
+$lang['MalformedMail']='Adresse mail incorrecte, veuillez saisir une adresse mail correcte ({$a})';
+$lang['ManDistance-EmptySelection']='Le filtre ne correspond à aucune catégorie !';
+$lang['MismatchedRecordsSettings']='Les paramètres définis ne sont pas compatibles avec un enregistrement valide. Veuillez vérifier à nouveau tous les paramètres.';
+$lang['MissingAccreditation']='Accréditation manquante!';
+$lang['MissingData']='Données manquantes';
+$lang['MissingPhpIntlModule']='La traduction peut se faire en installant ou en activant le module php-intl.';
+$lang['NameNotEmpty']='Nom ne peut être vide !';
+$lang['NoCountryInsert']='Pas de clubs selectioné';
+$lang['NoData']='Pas de données reçues';
+$lang['NoDistancesSet']='Catégories sans distance définie';
+$lang['NoDNSRecord']='Le nom du serveur est incorrect ou n\'est pas en ligne. Rappel: Vous devez être connecté à Internet pour définir cette option.';
+$lang['NoEntryInsert']='Pas de données enregistrée';
+$lang['NoMailingTemplate']='Aucun modèle d\'email est disponible !';
+$lang['NoMailRecipients']='Aucun destinataire disponible! Vérifier vos filtres.';
+$lang['NoPrivilege']='Vous n\'êtes pas autorisé à accéder à cette page!';
+$lang['NoSmtpServerSet']='Veuillez configurer le serveur SMTP avant d\'envoyer des emails !';
+$lang['NoTargetSet']='Catégories sans type de cibles définis';
+$lang['PhpOutdated']='Votre version de PHP est obsolète. Ianseo peut fonctionner mais certaines fonctionnalités nécessitent au moins la version {$a}.<br/>Veuillez mettre à jour votre installation dès que possible pour supporter PHP {$a} ou plus récent.';
+$lang['RegExp']='Pour utiliser les RegExp (Expressions Régulières), veuillez vous référer à $a';
+$lang['ResetSyncData']='Réinitialiser la synchronisation de données';
+$lang['ServiceNotAvailable']='Service non disponible';
+$lang['SetupNotFinished']='Vous ne pouvez pas accéder à cette page : veuillez d\'abord compléter {$a}';
+$lang['SpecialFilterDiscrepancy']='Le filtre spécial a été paramétré mais non activé!';
+$lang['SyncNotAvailable']='Synchronisation non disponible';
+$lang['TargetNumberMismatch']='Formatage de l\'affectation des cibles [Numero de cible][Lettre de cible]. Exemple: 123C / 001D';
+$lang['TargetRangeMismatch']='Les plages de cibles doivent être composées de deux numéros de cibles (pas de lettres) séparés par un tiret (signe moins), le premier étant plus bas que le second, comme dans 23-44.';
+$lang['TextSmtpDelete']='Désactiver les paramètres SMTP sur cette installation d\'Ianseo';
+$lang['TooManyArrows']='Trop de flèches saisies: le maximum est $a';
+$lang['TooManyDistancesMatch']='Catégories paramétrées avec plusieurs distances';
+$lang['TooManyElimQualified']='Type de duels $a[0] ne peuvent accepter que jusqu\'à $a[1]archers';
+$lang['WrongData']='Données erronées';
+$lang['WrongPort']='Ce port n\'est pas supporté!';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/Help.php b/src/Common/Languages/fr/Help.php
index 518951eb..10c201c7 100644
--- a/src/Common/Languages/fr/Help.php
+++ b/src/Common/Languages/fr/Help.php
@@ -1,6 +1,11 @@
 <?php
+$lang['AutoCheckinAlreadyDone']='Vous êtes déjà enregistré pour la compétition! Si vous devez modifier des informations, retournez au greffe.';
+$lang['AutoCheckinSearch']='Scannez le QR Code que vous avez reçu ou saisissez votre nom!';
+$lang['AutoCHK-Print']='Impressions automatique';
+$lang['CombiCompList']='Liste des codes de compétitions! Séparateur","';
 $lang['GetBarcodeSeparator']='Aprèsl\'mpression du tableau de référence des codes barres, lire le "SÉPARATEUR" du code barre pour activer la lecture correcte des élément.';
 $lang['HomePage']='Voici la page où vous pouvez sélectionner ou créer un tournoi.';
 $lang['ISK-ServerUrlPin']='<b>Ne pas partager ce code</b><br>Utiliser un code Pin à 4 chiffres pour sécuriser votre compétition.<br>Les tablettes peuvent se connecter à la compétition via le QR-Code.<br> En cas de saisie manuelle dans l\'application, utiliser ce code <b>{$a}</b>';
 $lang['ScoreBarCodeShortcuts']='Lire le code-barre de la feuille de marque.<br/> Insertion Manuelle d\'un # suivi par le nom de l\'Athlète recherche dans la base de données pour le trouver<br/> Insérer un @ suivit d\'un N° de cible recherche cette cible. La distance doit être indiquée; la session doit être spécifiée (un chiffre) et la cible 000 (3 chiffres)';
+$lang['UserName']='Identifant unique dans le systeme. Minimum de 6 caractères';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/IOC_Codes.php b/src/Common/Languages/fr/IOC_Codes.php
index 45ae6138..0761308d 100644
--- a/src/Common/Languages/fr/IOC_Codes.php
+++ b/src/Common/Languages/fr/IOC_Codes.php
@@ -12,8 +12,8 @@
 $lang['ASA']='Samoa Américaines';
 $lang['AUS']='Australie';
 $lang['AUT']='Autriche';
-$lang['Award-Anthem']='Mesdames et Messieurs, veuillez vous lever pour l\'Hymne National de';
-$lang['Award-Anthem-TPE']='Mesdames et Messieurs, veuillez vous lever pour l\'hymne de';
+$lang['Award-Anthem']='Mesdames et Messieurs, veuillez vous lever si vous le pouvez, pour l\'Hymne National de';
+$lang['Award-Anthem-TPE']='Mesdames et Messieurs, veuillez vous lever si vous le pouvez pour l\'hymne de';
 $lang['Award-Applause']='Mesdames et Messieurs, veuillez applaudir chaleureusement nos athlètes';
 $lang['Award-Intro']='Mesdames et Messieurs, la cérémonie protocolaire pour la catégorie {$a}';
 $lang['Award-MedalGiver']='Les médailles seront remises par $a';
@@ -48,10 +48,8 @@
 $lang['CGO']='République du Congo';
 $lang['CHA']='Tchad';
 $lang['CHI']='Chili';
-$lang['CHN']='Chine';
 $lang['CIV']='Côte d\'Ivoire';
 $lang['CMR']='Caméroun';
-$lang['COD']='République Démocratique du Congo';
 $lang['COK']='Îles Cook';
 $lang['COL']='Colombie';
 $lang['COM']='Comôres';
@@ -60,7 +58,6 @@
 $lang['CRO']='Croatie';
 $lang['CUB']='Cuba';
 $lang['CYP']='Chypre';
-$lang['CZE']='République Tchèque';
 $lang['DEN']='Danemark';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominique';
@@ -74,7 +71,9 @@
 $lang['ETH']='Étiopie';
 $lang['FIJ']='Fidji';
 $lang['FIN']='Finlande';
+$lang['FPO']='Tahiti';
 $lang['FRA']='France';
+$lang['FRO']='Iles Féroé';
 $lang['FSM']='Micronésie';
 $lang['GAB']='Gabon';
 $lang['GAM']='Gambie';
@@ -84,6 +83,7 @@
 $lang['GEQ']='Guinée Équatoriale';
 $lang['GER']='Allemagne';
 $lang['GHA']='Ghana';
+$lang['GLP']='Guadeloupe';
 $lang['GRE']='Grèce';
 $lang['GRN']='Grenade';
 $lang['GUA']='Guatémala';
@@ -91,17 +91,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyanne';
 $lang['HAI']='Haïti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Hongrie';
 $lang['INA']='Indonésie';
 $lang['IND']='Inde';
-$lang['IRI']='Iran';
 $lang['IRL']='Irlande';
 $lang['IRQ']='Iraq';
 $lang['ISL']='Islande';
 $lang['ISR']='Israël';
-$lang['ISV']='Îles Vierges (US)';
 $lang['ITA']='Italie';
 $lang['IVB']='Îles Vierges (UK)';
 $lang['JAM']='Jamaïque';
@@ -112,11 +109,12 @@
 $lang['KGZ']='Kirghizistan';
 $lang['KIR']='Kiribati';
 $lang['KOR']='République de Corée';
+$lang['KOS']='Kosovo';
 $lang['KSA']='Arabie Saoudite';
 $lang['KUW']='Koweit';
-$lang['LAO']='Laos';
 $lang['LAT']='Lettonie';
 $lang['LBA']='Libye';
+$lang['LBN']='Liban';
 $lang['LBR']='Libéria';
 $lang['LCA']='Sainte Lucie';
 $lang['LES']='Lesotho';
@@ -124,11 +122,11 @@
 $lang['LIE']='Lichtenstein';
 $lang['LTU']='Lituanie';
 $lang['LUX']='Luxembourg';
+$lang['MAC']='Macao, Chine';
 $lang['MAD']='Madagascar';
 $lang['MAR']='Maroc';
 $lang['MAS']='Malaysie';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldavie';
 $lang['MDV']='Maldives';
 $lang['Medal-1']='Médaille d\'Or';
 $lang['Medal-2']='Médaille d\'Argent';
@@ -137,7 +135,6 @@
 $lang['MEX']='Mexique';
 $lang['MGL']='Mongolie';
 $lang['MHL']='Îles Marshall';
-$lang['MKD']='Macédoine du Nord';
 $lang['MLI']='Mali';
 $lang['MLT']='Malte';
 $lang['MNE']='Monténégro';
@@ -145,9 +142,11 @@
 $lang['MOZ']='Mozambique';
 $lang['MRI']='Maurice';
 $lang['MTN']='Mauritanie';
+$lang['MTQ']='Martinique';
 $lang['MYA']='Myanmar';
 $lang['NAM']='Namibie';
 $lang['NCA']='Nicaragua';
+$lang['NCL']='Nouvelle Caledonie';
 $lang['NED']='Pays Bas';
 $lang['NEP']='Népal';
 $lang['NGR']='Nigéria';
@@ -166,7 +165,6 @@
 $lang['PNG']='Papouasie Nouvelle Guinée';
 $lang['POL']='Pologne';
 $lang['POR']='Portugal';
-$lang['PRK']='Korée du Nord';
 $lang['PUR']='Porto Rico';
 $lang['QAT']='Quatar';
 $lang['ROU']='Roumanie';
@@ -193,16 +191,15 @@
 $lang['SVK']='Slovaquie';
 $lang['SWE']='Suède';
 $lang['SWZ']='Swaziland';
-$lang['SYR']='Syrie';
 $lang['TAN']='Tanzanie';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailande';
 $lang['TJK']='Tadjikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Timor oriental';
 $lang['TOG']='Togo';
 $lang['TPE']='Taïpei Chinoise';
 $lang['TRI']='Trinité et Tobago';
+$lang['TTO']='Trinité-et-Tobago';
 $lang['TUN']='Tunisie';
 $lang['TUR']='Turquie';
 $lang['TUV']='Tuvalu';
diff --git a/src/Common/Languages/fr/ISK-App.php b/src/Common/Languages/fr/ISK-App.php
index ad0909f8..54a51e06 100644
--- a/src/Common/Languages/fr/ISK-App.php
+++ b/src/Common/Languages/fr/ISK-App.php
@@ -1,27 +1,90 @@
 <?php
-$lang['AboutPrivacy']='Politique de confidentialité d\'I@nseo';
+$lang['0_Phase']='Or';
+$lang['12_Phase']='1/12ème';
+$lang['14_Phase']='1/14ème';
+$lang['16_Phase']='1/16ème';
+$lang['1_Phase']='Bronze';
+$lang['24_Phase']='1/24ème';
+$lang['2_Phase']='Demi-finale';
+$lang['32_Phase']='1/32ème';
+$lang['48_Phase']='1/48ème';
+$lang['4_Phase']='Quart de finale';
+$lang['63_Phase']='Matchs Davis par équipe';
+$lang['64_Phase']='1/64ème';
+$lang['7_Phase']='1/7ème';
+$lang['8_Phase']='1/8ème';
+$lang['AboutAppDeveloper']='Application développée par';
+$lang['AboutPrivacy']='Politique de confidentialité de Ianseo';
+$lang['AboutProducer']='Conçue et développée par';
+$lang['AboutTitle']='À propos de Scorekeeper';
+$lang['AboutUX']='Conception UX en collaboration avec';
+$lang['AppPageAbout']='À propos de';
+$lang['AppPageHelp']='Aide';
+$lang['AppPageSettings']='Paramètres';
+$lang['AppPageStart']='Page d\'accueil';
+$lang['AppTitle']='ScoreKeeper NG';
+$lang['BarcodeErrorMessage']='Ce n\'est pas un code barre valide';
+$lang['BarcodeErrorTitle']='Erreur de code barre';
+$lang['BarcodeScanPrompt']='Centrer le code barre dans le finder';
+$lang['DeviceId']='ID de l\'appareil';
+$lang['EnterPinCodeInvalidValue']='Code d\'autorisation invalide';
 $lang['EnterPinCodeMessage']='Saisir le code d\'autorisation pour utiliser cette fonction';
+$lang['EnterPinCodeTitle']='Code d\'autorisation requis';
+$lang['EnterPinCodeValue']='Code';
 $lang['FabReconnect']='Reconnection';
+$lang['GenericCancel']='Annuler';
+$lang['GenericDelete']='Supprimer';
+$lang['GenericNext']='Prochain';
+$lang['GenericNo']='Non';
+$lang['GenericOk']='OK';
+$lang['GenericPrevious']='Précédent';
 $lang['GenericYes']='Oui';
 $lang['HelpContactHead']='Contact';
 $lang['HelpContactText']='Si vous rencontrez des problèmes avec l\'application et que vous avez besoin d\'aide, vous pouvez nous contacter en nous envoyant un courriel à l\'adresse suivante';
+$lang['HelpIntro13D']='Tir 3D';
+$lang['HelpIntro1Field']='Tir en Campagne';
+$lang['HelpIntro1Head']='ScoreKeeper NG';
+$lang['HelpIntro1RR']='Round Robin';
+$lang['HelpIntro1TargetIn']='Tir à 18m';
+$lang['HelpIntro1TargetOut']='Tir à l\'Arc Extérieur (TAE)';
 $lang['HelpIntro1Text']='est la nouvelle génération d\'applications pour le tir à l\'arc ! Il s\'agit d\'une application complémentaire au logiciel de tir à l\'arc Ianseo, qui permet de noter en direct :';
 $lang['HelpIntro2Elim']='Eliminatoires';
+$lang['HelpIntro2MI']='Matchs individuels';
+$lang['HelpIntro2MT']='Matchs par équipe';
+$lang['HelpIntro2Qual']='Qualifications';
+$lang['HelpIntro2Text']='L\'application permet de noter toutes les facettes des compétitions de tir à l\'arc, y compris :';
+$lang['HelpIntro3Lite']='Lite';
 $lang['HelpIntro3LiteText']='- fonctions basiques de notation de l\'application, pas de gestion des appareils dans Ianseo';
 $lang['HelpIntro3Live']='En direct';
 $lang['HelpIntro3LiveText']='- les fonctions de base de l\'application, l\'administration de l\'appareil et les résultats en direct dans Ianseo, ainsi que les communications avancées avec les appareils (pour les utilisateurs avancés uniquement)';
+$lang['HelpIntro3Pro']='Pro';
 $lang['HelpIntro3ProText']='- fonctions de base de l\'application, gestion des appareils et résultats en direct dans Ianseo';
 $lang['HelpIntro3Text']='Scorekeeper NG fonctionne aussi bien avec les compétitions Lite, Pro ou Live d\'Ianseo. Selon le type de compétition, l\'application activera ou désactivera la possibilité d\'utiliser certaines fonctions avancées.';
 $lang['HelpIntro4Text']='L\'application comprend cinq fonctions principales :';
+$lang['HelpMainHead']='Principal';
 $lang['HelpMainText']='C\'est l\'écran principal utilisé par les archers une fois que l\'application est configurée et connectée à Ianseo. Il affiche les informations sur la compétition, la session en cours et la liste des archers configurés pour la ou les cible(s) donnée(s). Pour chaque archer, la fin actuelle, le type de blasons, les valeurs des flèches et les totaux sont affichés. En tapant sur un archer, l\'écran de score s\'affiche. Il est également possible d\'aller sur la feuille de marque et de voir les informations pour tous les archers et toutes les distances.';
 $lang['HelpScorecardHead']='Feuille de marque';
 $lang['HelpScorecardText']='La feuille de marque affiche une vue d\'ensemble des flèches marquées avec les totaux. Elle peut afficher tous les archers et toutes les distances ou un seul archer, selon qu\'elle est choisie sur la page principale ou sur la page des scores.';
+$lang['HelpScoringHead']='Prise de scores';
 $lang['HelpScoringText']='Cet écran permet aux archers de marquer leurs flèches pour une extrémité donnée ou de modifier les valeurs des flèches précédentes. L\'extrémité actuelle est mise en évidence pour identifier facilement les flèches à saisir. Si plusieurs distances doivent être tirées et ont été configurées pour l\'appareil, elles seront affichées au fur et à mesure de la compétition. Il est possible de passer de l\'enregistrement des flèches à la feuille de marque de l\'archer si nécessaire.';
+$lang['HelpSettingsHead']='Paramètres';
 $lang['HelpSettingsText']='Cette fonction vous permet de configurer la façon dont l\'appareil se connectera à Ianseo. Une fois configuré, l\'appareil tentera automatiquement une connexion en utilisant les paramètres fournis. L\'indicateur d\'état de la connexion affiche clairement l\'état actuel de la connexion, indiquant si l\'appareil est en ligne, hors ligne ou en train de tenter une connexion. Il est également possible de télécharger des langues supplémentaires si vous le souhaitez. Il existe d\'autres paramètres avancés en fonction du type de compétition.';
+$lang['HelpStartHead']='Démarrage';
 $lang['HelpStartText']='Cela vous permet de commencer la configuration de l\'application. Vous pouvez choisir de scanner un QR-code produit par Ianseo pour configurer facilement votre compétition dans l\'application. Celui-ci sélectionnera automatiquement le type de compétition, les paramètres de connexion au serveur, ainsi que tous les paramètres avancés configurés dans Ianseo. Il est également possible de configurer l\'appareil manuellement si vous le souhaitez.';
+$lang['MainDistance']='Distance';
+$lang['MainEnd']='Volée';
+$lang['MainInvalidKey']='Clé de licence invalide';
+$lang['MainNotInUse']='Dispositif non utilisé';
 $lang['MainSignatureMessage']='La prise de score est terminée. Voulez-vous signer votre feuille de marque et terminer ce tour ?';
+$lang['MainSignatureTitle']='Prise de score complète';
 $lang['MainTargets']='Cible(s) assignée(s)';
+$lang['MainTotal']='Total';
+$lang['MainWaitingConfig']='Donner à l\'équipe Résultats';
 $lang['MainWinner']='G A G N A N T';
+$lang['MenuAppVersion']='Version :';
+$lang['MenuCloseMenu']='Fermer le menu';
+$lang['MenuDeviceId']='Identifiant de l\'appareil';
+$lang['MenuExitApp']='Quitter l\'application';
 $lang['ScorecardArrows']='Valeur des flèches';
 $lang['ScorecardCompTotal']='Total';
 $lang['ScorecardDistTotal']='Dist';
@@ -29,38 +92,137 @@
 $lang['ScorecardEndTotal']='Volée';
 $lang['ScorecardSetPoints']='Set';
 $lang['ScorecardTarget']='Cible';
+$lang['ScoreTotalsCloseButton']='Fermer';
+$lang['ScoreTotalsConfirmButton']='Confirmer';
+$lang['ScoreTotalsConfirmOrReview']='Un ou plusieurs des totaux ne correspondent pas. Modifiez les valeurs et appuyez sur Confirmer pour vérifier à nouveau ou appuyez sur Fermer pour revenir et vérifier vos scores.';
 $lang['ScoreTotalsMessage']='Veuillez saisir les résultats de votre feuille de marque papier';
+$lang['ScoreTotalsMissingValues']='Veuillez saisir toutes les valeurs requises';
+$lang['ScoreTotalsScore']='Score total';
+$lang['ScoreTotalsTitle']='Confirmation du score';
+$lang['ScoringDeleteArrow']='Supprimer la flèche';
+$lang['ScoringDeleteEnd']='Supprimer la volée';
 $lang['ScoringDeleteEndConfirmMessage']='Voulez-vous vraiment supprimer toutes les flèches de la volée sélectionnée ?';
+$lang['ScoringDeleteEndConfirmTitle']='Confirmation de la suppression';
 $lang['ScoringDistanceDoneMessage']='Toutes les flèches ont déjà été saisies. Vous pouvez sélectionner une flèche pour la modifier si nécessaire.';
+$lang['ScoringDistanceDoneTitle']='Distance complète';
+$lang['ScoringDistTotal']='Total';
+$lang['ScoringEndTotal']='Volée';
+$lang['ScoringMissingPointsMessage']='Il manque à l\'archer une ou plusieurs valeurs de flèches. Continuer quand même ?';
+$lang['ScoringMissingPointsTitle']='Points manquants';
+$lang['SettingsChooseValue']='Choisir la valeur';
+$lang['SettingsCompetitionType']='Type de compétition';
 $lang['SettingsConnectionCategory']='Connexion';
 $lang['SettingsConnectionCompCode']='Code de la compétition';
 $lang['SettingsConnectionSocketAddress']='Adresse du socket';
 $lang['SettingsConnectionSocketPort']='Port du socket';
 $lang['SettingsConnectionUrl']='Url';
+$lang['SettingsCouldNotGetCompInfo']='Impossible d\'obtenir les informations de la compétition';
+$lang['SettingsCouldNotGetConfigInfo']='Impossible d\'obtenir les informations de configuration';
+$lang['SettingsCouldNotGetDistanceInfo']='Impossible d\'obtenir l\'information sur la distance';
+$lang['SettingsCouldNotGetEventInfo']='Impossible d\'obtenir les informations sur l\'événement';
+$lang['SettingsCouldNotGetMatchInfo']='Impossible d\'obtenir les informations sur le match';
 $lang['SettingsDeviceNotAllowed']='Appareil non autorisé pour cette compétition. Vérifiez les informations relatives à la configuration du concours ou contactez l\'organisateur de l\'événement.';
+$lang['SettingsDeviceUnknownError']='Appareil non autorisé par Ianseo pour une raison inconnue';
+$lang['SettingsElimFirstTarget']='Première cible';
 $lang['SettingsEventSelection']='Sélection d\'un événement';
 $lang['SettingsFunctionsCategory']='Autres fonctions';
 $lang['SettingsFunctionsResetSettings']='Rétablir les paramètres par défaut';
+$lang['SettingsGenerateQr']='Générer';
+$lang['SettingsGpsCategory']='Localisation GPS';
+$lang['SettingsGpsFrequency']='Fréquence';
+$lang['SettingsGpsMinute']='minute';
+$lang['SettingsGpsMinutes']='minutes';
+$lang['SettingsGpsSeconds']='secondes';
+$lang['SettingsGpsSendPosition']='Envoyer la position de l\'appareil';
+$lang['SettingsLanguageCategory']='Langue';
 $lang['SettingsLanguageCurrent']='Langue actuelle';
+$lang['SettingsLanguageUpdate']='Mise à jour des langues';
+$lang['SettingsManualAllDistances']='Tout';
+$lang['SettingsManualDistance']='Distance';
+$lang['SettingsManualEvent']='Événement';
+$lang['SettingsManualGroup']='Groupe';
+$lang['SettingsManualMatch']='Match';
+$lang['SettingsManualPhase']='Phase';
+$lang['SettingsManualRRGroup']='Groupe';
+$lang['SettingsManualRRLevel']='Niveau';
+$lang['SettingsManualRRRound']='Tournoi';
+$lang['SettingsManualSession']='Départ';
+$lang['SettingsManualStage']='Étape';
+$lang['SettingsManualTarget']='Cible';
+$lang['SettingsOtherAskForSignature']='Demande de signature';
+$lang['SettingsOtherAskForTotals']='Demander les totaux à la fin de la phase';
+$lang['SettingsOtherCategory']='Autres options';
 $lang['SettingsOtherEnableHaptics']='Activer le retour haptic';
+$lang['SettingsOtherHideTotals']='Masquer les totaux lors de la prise des scores';
+$lang['SettingsOtherSignatureNone']='Non';
+$lang['SettingsOtherSignatureScan']='Scanner l\'identification de l\'archer';
+$lang['SettingsOtherSignatureScreen']='Signature sur l\'écran';
+$lang['SettingsOtherSpotting']='Mode spotting';
+$lang['SettingsQrCodesCategory']='QR-Code';
+$lang['SettingsQrCodesDevice']='Appareil';
+$lang['SettingsQrCodesPayload']='QR-Code';
 $lang['SettingsQrCodesScorecard']='Feuille de marque';
+$lang['SettingsReset']='Remise à zéro';
+$lang['SettingsSaveConfig']='Sauvegarder';
 $lang['SettingsScanSendQr']='Envoyer';
 $lang['SettingsScanSendQrError']='QR-code en erreur';
+$lang['SettingsScanSendQrOk']='QR-Code envoyé à Ianseo';
 $lang['SettingsShowAdvanced']='Avancé';
 $lang['SettingsStageE1']='1er tour des éliminatoires';
 $lang['SettingsStageE2']='2ème tour des éliminatoires';
+$lang['SettingsStageMI']='Matchs - Individuel';
+$lang['SettingsStageMT']='Matchs par équipes';
+$lang['SettingsStageP']='Poules';
+$lang['SettingsStageQ']='Qualifications';
+$lang['SettingsStageRI']='Tournoi Robin - Individuel';
+$lang['SettingsStageRT']='Tournoi Robin - Equipe';
+$lang['SettingsTitle']='Paramètres';
+$lang['SettingsWifiAdd']='Ajouter le WFi';
+$lang['SettingsWifiAddNew']='Ajouter un nouveau SSID WiFi';
+$lang['SettingsWifiCategory']='WiFi';
 $lang['SettingsWifiEdit']='Modifier le WiFi';
 $lang['SettingsWifiManage']='Gérer la connexion WiFi';
+$lang['SetupManually']='Configuration manuelle';
+$lang['SetupNeedHelp']='Avez-vous besoin d\'aide ?';
 $lang['SetupUsingBarcode']='Configurer l\'application à l\'aide d\'un QR-Code';
+$lang['ShootoffClosestArcher']='est le plus proche';
+$lang['ShootoffClosestNew']='Nouveau tir de barrage';
+$lang['ShootoffClosestTitle']='Le plus proche du centre est requis';
+$lang['ShootoffNewConfirmation']='Configuration du tir de barrage';
+$lang['ShootoffNewIsNeeded']='Un nouveau tir de barrage est-il nécessaire pour désigner le vainqueur du match ?';
+$lang['SignatureClear']='Nettoyer';
 $lang['SignatureIncorrectCodeMessage']='Le code scanné n\'est pas le bon pour cet archer. Etes-vous sûr d\'avoir scanné le code de {{n}} ? Veuillez scanner le bon code';
 $lang['SignatureIncorrectCodeTitle']='Code barre incorrect';
+$lang['SignatureReturnDev']='Retourner l\'appareil à l\'équipe de gestion des résultats';
+$lang['SignatureSaved']='Sauvegardé !';
+$lang['SignatureSaveSign']='Enregistrer votre signature';
+$lang['SignatureScanCode']='Code de confirmation du scan';
+$lang['SignatureSignature']='Signature';
+$lang['SignatureSuccess']='OK';
+$lang['SignatureTextArcher']='Signature de l\'archer';
+$lang['SignatureTextScorer']='Signature du marqueur';
 $lang['SignatureTitle']='Signez votre feuille de marque';
 $lang['SignatureTitleFinished']='La feuille de marque est terminé';
+$lang['SignatureUndo']='Annuler';
+$lang['SignatureVerification']='Vérification';
 $lang['SignatureVerificationFailed']='Impossible de vérifier le code. Veuillez vérifier votre connexion réseau et réessayer.';
+$lang['SignatureVerified']='Vérifié !';
+$lang['UpdateLangAdditional']='Langues supplémentaires';
+$lang['UpdateLangGetAll']='Obtenir des langues disponibles...';
+$lang['UpdateLangGetSingle']='Téléchargement de la langue...';
+$lang['UpdateLangInstalled']='Langues installées';
+$lang['UpdateLangTitle']='Mise à jour des langues';
+$lang['WiFiCannotAdd']='WIFI : Impossible d\'ajouter le Wifi {{n}}';
 $lang['WiFiCannotConnect']='WIFI : Impossible de se connecter au WiFi {{n}}';
+$lang['WiFiCannotDetermineStatus']='WIFI : Impossible de déterminer l\'état de l\'appareil WiFi';
 $lang['WiFiCannotEnable']='WIFI : Impossible d\'activer le périphérique WiFi';
+$lang['WiFiCannotRemove']='WIFI : Impossible de supprimer le WiFi avant d\'ajouter {{n}}';
 $lang['WiFiConnected']='WIFI : Connecté au WiFi {{n}}';
 $lang['WiFiDeviceEnabled']='WIFI : Dispositif activé';
 $lang['WiFiDeviceNotEnabled']='WIFI : Dispositif NON activé';
+$lang['WifiPassword']='Mot de passe';
+$lang['WifiSsid']='SSID';
+$lang['WifiTargetFrom']='Cible de';
+$lang['WifiTargetTo']='Cible à';
 $lang['WiFiTurnOnManually']='Impossible d\'activer le WiFi. Veuillez l\'activer manuellement !';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/ISK.php b/src/Common/Languages/fr/ISK.php
index 57cc593f..39d9f56e 100644
--- a/src/Common/Languages/fr/ISK.php
+++ b/src/Common/Languages/fr/ISK.php
@@ -1,5 +1,6 @@
 <?php
 $lang['0_Phase']='Or';
+$lang['12_Phase']='1/12ème';
 $lang['14_Phase']='1/12ème de finale (28 qualifiés)';
 $lang['16_Phase']='1/16';
 $lang['1_Phase']='Finale Bronze';
@@ -13,13 +14,22 @@
 $lang['7_Phase']='1/6ème de finale (14 qualifiés)';
 $lang['8_Phase']='1/8';
 $lang['About']='A propos';
+$lang['AfterEachArrow']='Après chaque flèche (Par défaut)';
+$lang['AfterEachEnd']='Après chaque volée';
+$lang['AfterEachImport']='Après chaque import (Par défaut)';
 $lang['AlertNoScore']='Un ou plusieurs archers n\'ont pas de score pour la volée. Ces lignes sont surlignées en rouge. Cliquer sur la ligne pour corriger le score ou continuer si c\'est correct.';
 $lang['AlertNoScoreTitle']='Scores Manquants';
 $lang['All']='Tout';
+$lang['ApiPath']='API Ianseo';
+$lang['AppName']='ScoreKeeper Lite';
 $lang['ArrowValues']='Valeur des flèches';
 $lang['AthletesError']='Les données des athlètes ne sont pas dans la zone.';
 $lang['AutoEntry']='Entrée Auto';
+$lang['AutoImportSettings']='Import auto de la configuration';
 $lang['Back']='Retour';
+$lang['CacheToQr']='Créer un QR-Code depuis le cache';
+$lang['CalculateNow']='Calculez maintenant';
+$lang['CalculateNowDone']='Classement recalculé';
 $lang['Cancel']='Annuler';
 $lang['CantConfirmQr']='Le QR-Code n\'a pas été confirmé. Essayer à nouveau. Erreur__TEXT__';
 $lang['CantGetAthlete']='Ne peut retrouver les information de l\'athlète. Réessayez à nouveau.
@@ -51,6 +61,7 @@
 $lang['ChooseValue']='Choisissez une valeur';
 $lang['ClearAll']='Effacer tout';
 $lang['ClearAllDesc']='<strong>Effacer Tout</strong> - éfface tous les scores de flèche entrés.';
+$lang['ClearingCache']='Vider le cache';
 $lang['ClearLast']='Effacer le dernier';
 $lang['ClearLastDesc']='<strong>Effacer le dernier</strong> - efface le score de la dernière flèche entré.';
 $lang['Close']='Fermer le menu';
@@ -65,20 +76,28 @@
 $lang['Confirmation']='Confirmation';
 $lang['ConfirmValues']='Êtes vous certain de vouloir utiliser ces valeurs?';
 $lang['Continue']='suite';
+$lang['Data']='Données:';
 $lang['DeleteError']='Effacement des informations précédentes de l\'athlète échoué: Veuillez essayer à nouveau Error: __TEXT__';
 $lang['Developer']='App développée par Ken Sentell';
+$lang['DeviceId']='ID de l\'appareil';
+$lang['Diags']='Diagnostic';
 $lang['Distance']='Distance';
 $lang['DistDoesntExist']='Ce QR-code n\'est pas valide sur cette distance';
 $lang['DistErr']='Données de distance ne sont pas dans la zone';
 $lang['DistTotal']='Dist<br/>Total';
 $lang['EditScores']='Editer les scores';
+$lang['Elimination']='Elimination';
 $lang['EmptyEndAlert']='La volée précédante n\'a pas été notée. Êtes vous certain de vouloir noter cette flèche dans cette volée?';
 $lang['EmptyResponse']='Réponse Serveur Vide';
 $lang['End']='Volée';
+$lang['EndLocked']='La volée a été verrouillée et ne peut être changée';
+$lang['EndRequest']='Saisie manuel requis';
 $lang['EndSummary']='Fin du sommaire';
 $lang['EndTotal']='End<br/>Total';
 $lang['EnterCompCode']='Veuillez entrer le code de compétition et réessayer';
 $lang['EnterServerUrl']='Veuillez entrer l\'URL du serveur et réessayer';
+$lang['EntryEnd']='Sélectionnez la volée où vous voulez agir';
+$lang['EntryTarget']='Entrer le bon numéro de cible';
 $lang['ErrorClearArrows']='Ne peut effacer toutes les valeurs des flèches. Réessayez! Error __TEXT__';
 $lang['ErrorGetAthlete']='Ne peut retrouver les informations de l\'athlète. Error __TEXT__';
 $lang['ErrorGetComp']='Ne peut retrouver les informations de la compétition. Réessayez!Error __TEXT__';
@@ -91,6 +110,7 @@
 $lang['Exit']='Sortir';
 $lang['ExitConfirm']='Êtes vous certain de vouloir quitter l\'app?';
 $lang['Face']='Blason';
+$lang['FieldControl']='Contrôle Terrain';
 $lang['FirstTarget']='1ère Cible:';
 $lang['GestureHelp']='Vous pouvez parcourir les archers et/ou les volées en utilisant les gestes décrits ci dessous.';
 $lang['Gestures']='Gestes';
@@ -99,13 +119,20 @@
 $lang['HasUpdate']='Mise à jour';
 $lang['Help']='Aide';
 $lang['ImportDoneEmpty']='Aucune donnée à importer';
+$lang['ImportDoneMatches']='Import réalisé avec succès, les matchs de classement individuel et par équipe ont été recalculés';
+$lang['ImportDoneQual']='Import réalisé avec succès, le classement qualificatif individuel et par équipe a été recalculé';
+$lang['ImportNow']='Importer maintenant (Qualification)';
+$lang['ImportNowMatches']='Importer maintenant (Matchs)';
+$lang['ImportType']='Import automatique des flèches';
 $lang['IpAddr']='Adresse IP';
 $lang['ISK-TruncateTableAll']='Tronquer la table (complet)';
 $lang['LastEndDist']='La dernière volée pour la distance a été complètée. Pour passer à la distance suivante appuyer sur OK sinon appuyer sur annuler pour revenir sur cette distance.';
 $lang['LastEndSession']='La dernière volée de ce départ est terminée. Il n\'y a plus de volées à tirer. Vous pouvez maintenant vérifier la Feuille de marque ou retourner au Paramétrage.';
+$lang['LinkSpeed']='Vitesse de connexion';
 $lang['LockAll']='Bloquer toutes les sessions';
 $lang['LRSwipeLabel']='Gauche / Droite Sensibilité du touché';
 $lang['LRSwipeText']='La durée du mouvement du doigt pour enregistrer un coup. Déplacez le curseur ou tapez la valeur que vous souhaitez utiliser. <u> Un petit nombre est plus sensible </ u>.';
+$lang['ManageLockedSessions']='Gérer les sessions bloquées';
 $lang['Manual']='Contacter le serveur';
 $lang['ManualEntry']='Entrée manuelle';
 $lang['Match']='Match';
@@ -113,9 +140,12 @@
 $lang['MatchOver']='Le Match est fini. Pour revenir au setup appuyez sur OK, sinon appuyez sur Annuler.';
 $lang['MatchSummary']='Résumé du match';
 $lang['Menu']='Menu';
+$lang['NetworkConn']='Connecté';
+$lang['NetworkId']='ID du réseau';
 $lang['NextArcher']='Archer suivant';
 $lang['NextArcherDesc']='<strong>Archer Suivant</strong> - Affiche le prochain archer pour les scores.';
 $lang['NextDistAlert']='Êtes vous certain de vouloir poursuivre la distance suivante?';
+$lang['No']='Non';
 $lang['NoArrowScored']='Avant de marquer la flèche comme étant la plus proche elle doit être notée.';
 $lang['NoAthletes']='Pas d\'athlète trouvé';
 $lang['NoDist']='Pas de distance trouvée';
@@ -123,16 +153,27 @@
 $lang['NoLanguages']='L\'anglais est le seul language actuellement disponible. Utilisez la fonction de mise à jour des langues du menu ajout d\'autres langues et réessayez à nouveau.';
 $lang['NoServerUrl']='Vouqs devez scanner le QR-Code ou entrer manuellement l\'URL de Ianseo avant de pouvoir mettre à jour les languages.';
 $lang['NoTargetTypes']='Pas de type de cible trouvé';
+$lang['NotAvailIos']='Non disponible sur iOS';
 $lang['Number']='Numéro';
+$lang['Off']='Off';
 $lang['Ok']='OK';
 $lang['OnDevice']='Le dispositif';
+$lang['OnlyPro']='Le mode Pro est obligatoire pour cette compétition!';
 $lang['Phase']='Phase';
+$lang['PingServer']='Ping server';
 $lang['Points']='Points';
 $lang['Prefs']='Préférences utilisateur';
 $lang['PrevDistAlert']='êtes vous certain de vouloir revenir à la distance précédante?';
+$lang['ProBadLicense']='Licence ISK Pro invalide';
+$lang['ProDiag']='Diagnostic';
+$lang['ProEnd']='Choisir la volée';
+$lang['ProRecvCode']='Configuration reçue';
 $lang['proScanQr']='Scanner le QR-code';
+$lang['ProWaitAuth']='Attente de l\'autorisation';
+$lang['ProWaitCode']='Attente de la configuration';
 $lang['QrInvalid']='Ne peut interpréter le contenu du code-bare. Réessayez avec un code-bare Ianseo valide';
 $lang['QrIskLive']='La compétition est configurée pour fonctionner avec la version ISK Live. Cette Application ne fonctionnera qu\'avec les compétitions Lite ou Pro.';
+$lang['QrIskNone']='La compétition n\'est pas configuré pour ScoreKeeper. Vérifier la configuration de la compétition.';
 $lang['QrNoCode']='Pas de compétition trouvée dans le code-bare. Réessayez avec un code-bare Ianseo valide';
 $lang['Reset']='Reset';
 $lang['ReuseProQR']='La précédente compétition utilisait la version PRO. Souhaitez-vous utiliser ce code ?';
@@ -143,11 +184,14 @@
 $lang['Scan']='Scanner';
 $lang['ScanCancelled']='Scan annulé';
 $lang['ScanFailed']='Scan échoué:  __TEXT__';
+$lang['Scanning']='Recherche en cours! Appuyer pour annuler.';
 $lang['ScanQRCode']='Scanner le Code QR';
 $lang['Score']='Score';
 $lang['Scorecard']='Feuille de marque';
+$lang['ScorecardsManagement']='Gestion des Feuilles de marque';
 $lang['ScoredPoints']='Points marqués';
 $lang['ScoreHelp']='Aide';
+$lang['ScoreHelpDesc']='Cet écran vous permet de marquer les flèches tirées. Information sur la distance, type de cible et les informations de l\'archer sont aussi affichées. Entrer les valeurs des flèches en utilisant les chiffres.';
 $lang['ScoringEntry']='Saisie des scores';
 $lang['SelDist']='Veuillez choisir une distance et réessayer';
 $lang['SelTgtNum']='Veuillez choisir un numéro de cible et réessayer';
@@ -157,25 +201,32 @@
 $lang['SettingForGroup']='Configuration pour le Groupe $a';
 $lang['Setup']='Setup';
 $lang['ShootOff']='SO';
+$lang['SSID']='SSID';
+$lang['SsidMissing']='Pas de nom SSID';
 $lang['Stage']='Étape';
 $lang['StageE1']='Tour délimination 1';
 $lang['StageE2']='Tour délimination 2';
 $lang['StageMI']='Matchs-individuel';
 $lang['StageMT']='Matchs par équipes';
 $lang['StageQ']='Qualifications';
+$lang['Status']='Statuts:';
+$lang['Superuser']='Super utilisateur';
 $lang['SwipeDown']='<strong>Glisser vers le bas</strong> vers la volée précédante du compétiteur courrant';
 $lang['SwipeLeft']='<strong>Glisser vers la gauche</strong>Vers le prochain compétiteur de la cible ou du groupe dans la même volée';
 $lang['SwipeRight']='<strong>Glisser vers la droite</strong>Vers le compétiteur précédant pour la cible ou le groupe dans la même volée';
 $lang['SwipeUp']='<strong>Glisser vers le haut</strong>Vers la prochaine volée pour le compétiteur courrant';
+$lang['TapToScan']='Appuyer pour scanner';
 $lang['Target']='Cible #';
+$lang['TargetEntry']='Saisie manuel de la cible';
 $lang['TargetTypesError']='Donnée du type de cible n\'est pas dans la zone';
 $lang['Tgt']='&nbsp;<br/>Tgt';
+$lang['Timeout']='Délai expiré';
 $lang['Total']='Total';
 $lang['Unknown']='Inconnu';
 $lang['UnlockAll']='Déverrouiller les sessions';
 $lang['Update']='Mise à jour';
 $lang['UpdateLang']='Mise à jour des langues';
-$lang['Url']='Url:';
+$lang['Url']='URL:';
 $lang['VerifyCorrect']='Veuillez vérifier la validité des données avant de continuer.';
 $lang['VerNotCompatible']='Cette version de l\'app, __currver__ et n\'est pas compatible avec le logiciel Ianseo, qui fonctionne de la version __minver__ à la version __maxver__ . Veuillez installer la bonne version ou mettre à jour Ianseo.';
 $lang['VerNotVerified']='Ne peut vérifier la version de l\'app avec le logiciel Ianseo. Vérifiez votre installation et réessayez!';
diff --git a/src/Common/Languages/fr/Ianseo.php b/src/Common/Languages/fr/Ianseo.php
index 3167d6f7..26fe3c7b 100644
--- a/src/Common/Languages/fr/Ianseo.php
+++ b/src/Common/Languages/fr/Ianseo.php
@@ -7,4 +7,8 @@
 $lang['Cert-Level4']='Cours Maître';
 $lang['Cert-Level5']='Équipe Ianseo';
 $lang['CertificateManagement']='Gestion de certificat';
+$lang['GenerateFile']='Créer le fichier';
+$lang['ResetItems']='Réinitialiser les éléments.<br>Cette action ne demandera pas de confirmation et ne peut pas être annulée !<br>La réinitialisation des qualifications réinitialisera également tous les événements suivants !';
+$lang['ResetResult']='Les sessions demandées ont été réinitialisées';
+$lang['ResetSessions']='Confirmez la réinitialisation?';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/InfoSystem.php b/src/Common/Languages/fr/InfoSystem.php
index f857d628..42f52c4a 100644
--- a/src/Common/Languages/fr/InfoSystem.php
+++ b/src/Common/Languages/fr/InfoSystem.php
@@ -1,6 +1,7 @@
 <?php
 $lang['AutoUpdate']='Mise à jour automatique';
 $lang['BarRecord']='Montrer la barre de moyenne de record';
+$lang['BrokenRecords']='Record battu';
 $lang['ByClub']='Par Pays / Club';
 $lang['ByEvent']='Par évènement';
 $lang['ByName']='Par nom';
@@ -17,6 +18,7 @@
 $lang['Individual']='Individuel';
 $lang['InfoPointAlert']='<b> Faites la même chose sur votre ordinateur portable, tablette, smartphone : </ b> <br/> Connectez votre appareil via la connexion wifi  «ianseo» (gratuit,  sans mot de passe), accédez à http://ianseo/ et suivez en direct!';
 $lang['InfoPointIndex']='Utilisez le menu ci-dessus pour consulter les résultats de la compétition et trouver le rang d\'un archer.';
+$lang['Kiosk']='Kiosque';
 $lang['LineToExamine']='Cliquer sur la ligne de départ à examiner';
 $lang['Live']='Direct';
 $lang['Matches']='Matchs';
@@ -45,8 +47,33 @@
 $lang['Record-CR-FAA-avg']='Moyenne record Africains';
 $lang['Record-CR-OCE']='Record d\'Océanie';
 $lang['Record-CR-OCE-avg']='Moyenne record d\'Océanie';
+$lang['Record-CR-WAAf']='Record d\'Afrique';
+$lang['Record-CR-WAAf-avg']='Moyenne du Record d\'Afrique';
+$lang['Record-CR-WAAM']='Record d\'Amérique';
+$lang['Record-CR-WAAM-avg']='Moyenne du Record des Amériques';
+$lang['Record-CR-WAAs']='Record d\'Asie';
+$lang['Record-CR-WAAs-avg']='Moyenne du Record d\'Asie';
+$lang['Record-CR-WAE']='Record d\'Europe';
+$lang['Record-CR-WAE-avg']='Moyenne du Record d\'Europe';
+$lang['Record-CR-WAO	-avg']='Moyenne du Record d\'Océanie';
+$lang['Record-CR-WAO']='Record d\'Océanie';
+$lang['Record-GR-FISU']='Record Universiade';
+$lang['Record-GR-FISU-avg']='Moyenne du Record de l\'Universiade';
+$lang['Record-GR-WAAM-CG']='Record des Jeux Pan-Américain';
+$lang['Record-GR-WAAM-CG-avg']='Moyenne du Record des Jeux Pan Américains';
+$lang['Record-GR-WAE-CG']='Record des Jeux Européens';
+$lang['Record-GR-WAE-CG-avg']='Moyenne du Record des Jeux Européens';
+$lang['Record-OR-avg']='Moyenne du Record Olympique';
 $lang['Record-OR-WA']='Record Olympique';
 $lang['Record-OR-WA-avg']='Moyenne record Olympique';
+$lang['Record-WAAF-CR-avg']='Moyenne du Record d\'Afrique';
+$lang['Record-WAAM-CC-GR']='Record Pan-Américain';
+$lang['Record-WAAM-CC-GR-avg']='Moyenne du Record des Jeux Pan Américains';
+$lang['Record-WAAM-CR-avg']='Moyenne du Record des Amériques';
+$lang['Record-WAAS-CR-avg']='Moyenne du Record d\'Asie';
+$lang['Record-WAE-CR-avg']='Moyenne du Record d\'Europe';
+$lang['Record-WAO-CR-avg']='Moyenne du Record d\'Océanie';
+$lang['Record-WR-avg']='Moyenne du Record du Monde';
 $lang['Record-WR-WA']='Record Mondial';
 $lang['Record-WR-WA-avg']='Moyenne record Mondial';
 $lang['RR_Score']='Score RR';
diff --git a/src/Common/Languages/fr/Install.php b/src/Common/Languages/fr/Install.php
index 37f0093b..9e02a877 100644
--- a/src/Common/Languages/fr/Install.php
+++ b/src/Common/Languages/fr/Install.php
@@ -4,6 +4,7 @@
 $lang['AcceptGPL-Desc0']='Ce logiciel est un logiciel gratuit : vous pouvez contribuez/modifier en respectant les termes de la licence GNU.';
 $lang['AcceptGPL-Logo']='Plus d\'informations';
 $lang['AcceptGPL-ReadTXT']='Lire la licence';
+$lang['AcceptGPL-Start']='Pour installer, mettre à niveau et utiliser Ianseo, veuillez cocher la case suivante :';
 $lang['Changed']='Changé';
 $lang['cmdForceUpdate']='Forcer la mise à jour';
 $lang['Config write failed']='Le fichier de configuration ne peut être modifié. S\'il vous plait, vérifier les autorisations sur le répertoire "Common" à la racine d\'installation de IANSEO';
@@ -16,6 +17,7 @@
 $lang['Credits-Credits']='Remerciements';
 $lang['Credits-DebugManager']='Mode Débug activé';
 $lang['Credits-Development']='Développement et Coding';
+$lang['Credits-Documentation']='Documentation & Support';
 $lang['Credits-FitarcoCredits']='Qu\'est-ce que Ianseo ? 
 Ianseo est un logiciel pour la gestion des résultats d\'un tournoi de Tir à l\'arc.
 C\'est un projet "Open Source" développé avec le soutien financier de la fédération italienne de Tir à l\'arc, qui a décidé de le distribuer gratuitement en Europe.
@@ -28,6 +30,7 @@
 Il est le diffuseur officiel pour la Fitarco (Fédération Italienne de Tir à l\'arc), World Archery Europe (Fédération Européenne de Tir à l\'Arc) et plusieurs événements de la World Archery (Fédération Mondiale de Tir à l\'Arc).';
 $lang['Credits-ISK']='développement ISK';
 $lang['Credits-License']='IANSEO est publié sous licence GNU General Public License version 3 (GPLv3)';
+$lang['Credits-Support']='Support (Syteme de Tickets)';
 $lang['Credits-TranslationCoordination']='Traducteur officiel';
 $lang['Credits-Translators']='Équipe de traduction IANSEO';
 $lang['Database name']='Nom de la base de données';
@@ -38,6 +41,11 @@
 $lang['EventWillBeReset']='ATTENTION: Un changement dans "$a[0]", "$a[1]" ou "$a[2]" remetra tous les paramètres du tournoi aux valeurs par défaut spécifiées par les règles spécifiques au tournoi sélectionné.';
 $lang['Failed']='ÉCHOUÉ!';
 $lang['Failing install']='S\'il vous plait, mettez à jour l\'installation PHP avant la prochaine exécution de IANSEO';
+$lang['Field24Normal']='Campagne 24 Cibles';
+$lang['FieldPegBlue']='Piquet Bleu';
+$lang['FieldPegRed']='Piquet Rouge';
+$lang['FieldPegWhite']='Piquet Blanc';
+$lang['FieldPegYellow']='Piquet Jaune';
 $lang['File permission error']='Vous devez vérifier les autorisations d\'accès au répertoire d\'installation IANSEO : il doit être accessible en écriture pour l\'utilisateur exécutant le serveur (ou pour tous les utilisateurs)';
 $lang['FreeOnlineResults']='<b>Publication en ligne gratuite:</b>Avec une connexion à internet basique, vous pouvez montrez au monde ce qu\'il se passe pendant la compétition. C\'est gratuit alors pourquoi attendre? Une fois la compétition créée, demandez un code via le menu «{$a}».';
 $lang['Host']='Serveur hôte';
@@ -75,7 +83,7 @@
 $lang['Parameter']='Paramètre';
 $lang['Password']='Mot de passe';
 $lang['PHP settings']='Paramètres PHP';
-$lang['PHP too old']='Votre installation PHP est obsolète. La version minimale pour IANSEO est 5.0';
+$lang['PHP too old']='Votre installation PHP est obsolète. La version minimale pour IANSEO est 8.0';
 $lang['PHP version']='Version PHP';
 $lang['php.ini file']='Fichier php.ini';
 $lang['Prepare']='Préparation des données pour mise à jour';
@@ -120,9 +128,11 @@
 $lang['SetCompound50m']='Compound - 50 m';
 $lang['SetCompound70m']='Compound - 70 m';
 $lang['SetCR']='Championnat régional (1 tour éliminatoire)';
+$lang['SetFrBeursault']='Beursault';
+$lang['SetFrBouquet']='Bouquet Provincial';
 $lang['SetFRChampionshipElite']='Championnat Elite';
 $lang['SetFRChampionshipJun']='Championnat de France Jeune';
-$lang['SetFRChampionshipSen']='Championnat Adultes/Equipe';
+$lang['SetFRChampionshipSen']='Championnat Elite/Adulte';
 $lang['SetFRChampJunTeams']='Championnat de France Jeune Equipe';
 $lang['SetFRChampsD1DNAP']='D1 Classique/Compound';
 $lang['SetFRChampsFederal']='Championnat Fédéral';
@@ -134,10 +144,12 @@
 $lang['SetFRD12023']='Championnat D1';
 $lang['SetFRFinalsD2']='Finales France D2';
 $lang['SetFRFinDRD2']='Finales des DR';
+$lang['SetFrSelectif']='Sélectif';
+$lang['SetFrSelectifPara']='Sélectif + Para';
 $lang['SetFRTAE']='Championnat de France Elite';
 $lang['SetFRTAE-Para']='Selectif TAE + Para';
 $lang['SetFRTAE-Valides']='Selectif TAE';
-$lang['SetIndoor']='Tir en Salle';
+$lang['SetIndoor']='Tir à 18m';
 $lang['SetJ-CClass']='Juniors et cadets';
 $lang['SetJ-SClass']='Juniors et Seniors';
 $lang['SetKermesse']='Kermesse';
@@ -148,23 +160,34 @@
 $lang['SetOneClass']='Toutes les Classes en une';
 $lang['SetOrdinary']='Tournoi ordinaire';
 $lang['SetOrdinaryFinals']='Tournoi ordinaire avec finales';
+$lang['SetPara']='Para-Tir à l\'Arc';
 $lang['SetSE_SweDist']='Distances Suédoises';
 $lang['SetSE_WaDist']='Distances WA';
 $lang['SetUkJunNationals']='Championnat Nationnal Jeunes';
 $lang['SetUkNationals']='Championnat Nationnal';
 $lang['Setup-ARLEF']='Règles de LEF-Archery';
+$lang['Setup-AT']='Règles Autrichiennes';
+$lang['Setup-AU']='Règles Australiennes';
+$lang['Setup-BR']='Règles Brésiliennes';
 $lang['Setup-CA']='Règles du Tournoi Canadiennes';
 $lang['Setup-CH']='Règles du Tournoi Suisses';
 $lang['Setup-Default']='Tournoi Règlement World Archery';
+$lang['Setup-DK']='Règles Danoises';
 $lang['Setup-FR']='Règles françaises';
+$lang['Setup-IT']='Règles du Tournoi Italiennes - FITARCO';
+$lang['Setup-Kyudo']='Tournoi de Kyudo';
+$lang['Setup-LANC']='Lancaster';
 $lang['Setup-NFAA']='Règles NFAA';
 $lang['Setup-NL']='Règles du Tournoi Néerlandaise';
 $lang['Setup-NO']='Tournoi Norvégien (Norges Bueskytterforbund rules)';
+$lang['Setup-NZ']='Règles Néozélandaises';
 $lang['Setup-PAR']='Tournoi paralympic (règles FITA)';
 $lang['Setup-SE']='Règles du Tournoi Suédoises';
 $lang['Setup-Select']='Sélectionnez la règle locale applicable';
+$lang['Setup-SI']='Règles Slovéniennes';
 $lang['Setup-UK']='Règles du Tournoi ArcheryGB';
 $lang['Setup-US']='Règles US Archery';
+$lang['Setup-WAN']='Règles Nordiques';
 $lang['SetVegas-KOA']='Rois de l\'archerie - Hollande';
 $lang['SetVegas-WAF']='Festival Mondial de l\'archerie - Las Vegas';
 $lang['SpecialUpdate']='Vous utilisez une installation "testing".<br/>Seuls les utilisateurs autorisés peuvent utiliser cette fonctionnalité: Veuillez fournir le courriel avec lequel vous vous êtes enregistré.<br/> Une notification vous sera envoyée ainsi qu\'à l\'équipe Ianseo.';
@@ -183,7 +206,6 @@
 $lang['Value']='Valeur (éléments de tableaux indexés: Clé1::Valeur1 | clé2::valeur2)';
 $lang['WhatIanseoDoes01']='<b>Règles conformes World Archery:</b> Ianseo est continuellement à jour avec les règles de la World Archery. Les développeurs sont également disponibles pour adapter ianseo aux règles Nationnales et/ou spécifiques.';
 $lang['WhatIanseoDoes02']='<b>Aide et support:</b> Si vous avez besoin d\'aide, envoyez un courriel à $a: Vous reçevrez directement une réponse de la part des développeurs de Ianseo!';
-$lang['WhatIanseoDoes03']='<b>Entraînements et cours sur site:</b> Ianseo est disponible pour gérer des cours spécifiques sur place. Deux niveaux: sans et avec boitiers électroniques. Le premier vise à connaître tous les aspects de Ianseo de la préparation de la compétition et des horaires jusqu\'à la publication en ligne et locale des résultats. Le second niveau visant à acquérir les connaissances spécifiques pour réaliser une compétition "flèche par flèche".';
 $lang['WhatIanseoDoes04']='<b>Dons!</b>Ianseo est Libre et Ouvert... Si vous l\'apréciez aidez nous s\'il vous plait a maintenir le logiciel et le serveur à jour: cliquez sur le bouton "Donate" de la page d\'Accueil de $a!';
 $lang['WhatIanseoDoes05']='<b> Média Social</b> Ianseo est aussi sur $a!';
 $lang['WhatIanseoDoesTitle']='Que peut faire Ianseo pour votre compétition?';
diff --git a/src/Common/Languages/fr/Languages.php b/src/Common/Languages/fr/Languages.php
index 7ba8b0d7..44b95334 100644
--- a/src/Common/Languages/fr/Languages.php
+++ b/src/Common/Languages/fr/Languages.php
@@ -14,11 +14,13 @@
 $lang['CA-Cl-JW']='Dame Jeune';
 $lang['CA-Cl-M']='Homme';
 $lang['CA-Cl-MM']='Homme Maître';
+$lang['CA-Cl-MO']='Open Homme';
 $lang['CA-Cl-MW']='Dame Maître';
 $lang['CA-Cl-PM']='Homme Pré-club';
 $lang['CA-Cl-PW']='Dame Pré-club';
 $lang['CA-Cl-W']='Dames';
 $lang['CA-Cl-WM']='Pupille Homme';
+$lang['CA-Cl-WO']='Open Femme';
 $lang['CA-Cl-WW']='Pupille Dame';
 $lang['CA-Ev-BCM']='Homme BareBow / Nu Cadet';
 $lang['CA-Ev-BCW']='Dame BareBow / Nu Cadette';
@@ -101,6 +103,7 @@
 $lang['CA-R']='Recurve';
 $lang['CA-T']='Traditionnel';
 $lang['CA-U']='Compound Illimité';
+$lang['CA-W1']='W1 (Arc à Poulies/Arc Classique)';
 $lang['CA-YC']='Jeune compound';
 $lang['CmdSearch']='Trouver les modules';
 $lang['Create']='Créer';
diff --git a/src/Common/Languages/fr/ODF.php b/src/Common/Languages/fr/ODF.php
index d838ca27..c592f7c8 100644
--- a/src/Common/Languages/fr/ODF.php
+++ b/src/Common/Languages/fr/ODF.php
@@ -8,20 +8,32 @@
 $lang['DocumentVersion']='Version';
 $lang['EndpointNotConfigured']='Elément non configuré !';
 $lang['GoodMorning']='BONJOUR';
-$lang['GoodNight']='AU REVOIR';
+$lang['GoodNight']='BONNE NUIT';
+$lang['IntEVENT']='Nom de l\'évènement';
 $lang['IntFUNC']='Fonction';
-$lang['IntMATCH']='Matches';
+$lang['IntMATCH']='Matchs';
 $lang['IntQUAL']='Classement du tournoi';
 $lang['IntRES']='Résultats';
-$lang['IntSCHED']='Planning';
+$lang['IntSCHED']='Programme';
 $lang['IntTRANSLATE']='Traduction';
+$lang['IrmHelp']='Gestion des abandons / Disqualifications: Pour générer les classements (DNF, DNS, DSQ, DQB). Par défaut la place affectée sera vraiment haut. DNF: Abandon=>29.999; DNS: N\'a pas pris part au départ=>30.000; DSQ: Disqualifié=>31.000; DQB: Disqualification pour cause majeur =>32.000. <br> Pour rétablir le classement initial, il faut vérifier manuellement <b>l\'ensemble du classement<b>!<br>';
+$lang['KAOffset']='Retard pris';
 $lang['LangNotSupported']='Cette langue $a n\'est pas supporté';
+$lang['Languages']='ODF Langues officiels';
 $lang['LoserMatchName']='Perdant du match $a';
 $lang['MissingFile']='Fichier manquant';
 $lang['NoRankAvailable']='Pas de classement disponible';
 $lang['NotAwarded']='Pas de récompenses';
+$lang['OdfUploadFileText']='Selectionnez un fichier XML pour l\'import';
 $lang['ResultsDetails']='Vu détaillé des résultats';
 $lang['SessionName']='$a->Category, $a->RoundType';
+$lang['Test']='TEST';
+$lang['TestMode']='Production - Mode TEST';
+$lang['Timetable']='Planning';
+$lang['TMMeeting']='Réunion des capitaines d\'équipes';
+$lang['TypSCHEDLOC']='Lieu';
+$lang['TypSCHEDVEN']='Lieu de la compétition';
+$lang['TypSTATUS']='Etat';
 $lang['VictoryCeremony']='Cérémonie protocolaire pour $a';
 $lang['WinnerMatchName']='Gagnant du match $a';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/Records.php b/src/Common/Languages/fr/Records.php
index c0283049..30b6c59d 100644
--- a/src/Common/Languages/fr/Records.php
+++ b/src/Common/Languages/fr/Records.php
@@ -1,3 +1,6 @@
 <?php
-$lang['SelectRecordCategory']='Sélection d\'une catégorie du Record';
+$lang['BrokenRecord']='Record(s) battu(s)';
+$lang['CreateRecords']='Créer un nouveau record';
+$lang['SelectRecordCategory']='Sélection d\'une catégorie de Record';
+$lang['StandingRecord']='Records actuels';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/RunArchery.php b/src/Common/Languages/fr/RunArchery.php
index 9f931a00..e94ee04d 100644
--- a/src/Common/Languages/fr/RunArchery.php
+++ b/src/Common/Languages/fr/RunArchery.php
@@ -64,6 +64,7 @@
 $lang['StartTime']='Horaire de départ';
 $lang['StartType']='Décalage au départ';
 $lang['TargetGroupShort']='Cible/Groupe';
+$lang['TargetsHit']='Cibles touchés';
 $lang['TargetToHit']='Cibles à toucher';
 $lang['TeamAlreadySetError']='L\'équipe a déjà tous ses membres';
 $lang['TimeSheetImportedFailure']='Il y a eu des erreurs en lecture de la feuille des temps! La page sera actualisée pour mettre à jour les données importées : contrôle que tout soit correct !';
diff --git a/src/Common/Languages/fr/ServiceErrors.php b/src/Common/Languages/fr/ServiceErrors.php
index 480f113f..e8a4265f 100644
--- a/src/Common/Languages/fr/ServiceErrors.php
+++ b/src/Common/Languages/fr/ServiceErrors.php
@@ -1,4 +1,7 @@
 <?php
+$lang['ArcClassified']='Mauvaise classification';
+$lang['ArcNative']='Mauvaise équipe nationale';
+$lang['ArcPara']='Mauvaise catégorie Para';
 $lang['ErrArcherCodeExists']='L\'ID de l\'archer existe déjà';
 $lang['ErrArcherCodeFree']='Le numéro ID de l\'archer est libre';
 $lang['ErrArcherCodeTooLong']='Le numéro ID de l\'archer est trop long';
@@ -49,5 +52,7 @@
 $lang['ErrSubClass']='Sous-classe invalide';
 $lang['ErrSubClassNotFound']='sous-classe non trouvée';
 $lang['ErrWronglevel']='Club / Archer mauvais niveau';
+$lang['InvalidData']='Donnés invalides';
 $lang['LoginTooManyArchers']='Plus d\'un archer utilise cet E-Mail. Veuillez utiliser l\'ID membre';
+$lang['WrongType']='Mauvais catégorie';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/fr/Tournament.php b/src/Common/Languages/fr/Tournament.php
index ed362ac6..bf0179ca 100644
--- a/src/Common/Languages/fr/Tournament.php
+++ b/src/Common/Languages/fr/Tournament.php
@@ -13,6 +13,7 @@
 $lang['AccrCaption']='Légende de l\'accréditation';
 $lang['AccreditateAll']='Confirmer tout';
 $lang['Accreditation']='Accréditation';
+$lang['AccrNoShow']='Absent';
 $lang['AclAccreditation']='Accréditation';
 $lang['AclAPI']='API';
 $lang['AclCompetition']='Compétition';
@@ -23,18 +24,6 @@
 $lang['AclISKServer']='Gestion de l\'application ISK';
 $lang['AclModules']='Modules';
 $lang['ACLNoAccess']='Pas d\'accès';
-$lang['AclNotes']='<b>Notes à propos de la sécurité réseau</b>
-
-	<ul>
-	<li>les restrictions s\'appliquent par compétition et non par hôte</li> 
-	<li>localhost (127.0.0.1 or ::1) ne peut être restreint</li> 
-	<li>Les politiques de restrictions peuvent être supprimées par le serveur lui-même <b>{$a}</b> </li></ul>
-	
-	<ul> 
-	<li>Lorsque des restrictions réseau sont appliquées, par default les clients non identifiés ne possèdent pas d\'accès à la compétition.</li>
-	<li>Il est possible d\'ajouter un "*" pour définir une plage d\'IP autorisés (192.168.0.* or 172.16.*). Ce système est limité à de la visualisation uniquement</li> 
-	<li>IP in the range 0.0.0.[1-254] will not be considered real IPs and the system will use the description content as RegExp to match the IP address. RegExps will be evaluated in the order they are shown and allows R/W policies</li>
-	</ul>';
 $lang['AclOutput']='Sorties';
 $lang['AclParticipants']='Participants';
 $lang['AclQualification']='Qualification';
@@ -92,6 +81,7 @@
 $lang['AthleteList']='Acquision des athlètes';
 $lang['AthleteSummary']='Résumé de l\'Athlète';
 $lang['AttachDiplomas']='Envoie les diplômes (individuels et équipe si vous faites partie d\'une équipe) en pièce jointe au format PDF.';
+$lang['AttachICS']='Joindre le calendrier en tant qu\'iCal';
 $lang['AttachQualScorecard']='Envoie la feuille de qualification personnelle en pièce jointe PDF (toutes distances)';
 $lang['AtXDistance']='Résultats DE la distance $a';
 $lang['AuthCode']='Code d\'autorisation';
@@ -126,7 +116,6 @@
 $lang['BadgeIncludePhoto']='Inclure les photos dans les badges ?';
 $lang['BadgeNames']='Nom complet (non imprimé en premier)';
 $lang['BadgeNoData']='Pas de données à imprimer';
-$lang['BadgeOnlyNotPrinted']='SEULEMENT les badges non encore imprimés ?';
 $lang['BadgeOnlyPrintAccredited']='SEULEMENT les badges des participants accrédités ?';
 $lang['BadgeOnlyPrintPhoto']='SEULEMENT les badges avec photos ?';
 $lang['BadgeOptions']='Options';
@@ -155,6 +144,7 @@
 $lang['Block_IP']='Accès IP (v4)';
 $lang['Block_Manage']='Conditions d\'accès au réseau';
 $lang['Block_Nick']='Pseudonyme d\'accès';
+$lang['Block_TemplatePattern']='Modèle';
 $lang['BoldIsDefault']='Gras est par défaut';
 $lang['Bonus']='Bonus';
 $lang['BytesCurrent']='Dernier';
@@ -189,13 +179,15 @@
 $lang['CatOC']='Comité d\'Organisation';
 $lang['ChairmanJudge']='Arbitre Responsable';
 $lang['ChairmanJudgeDeputy']='Adjoint à l\'arbitre responsable';
-$lang['ChairmanJury']='Président(e) du jury d\'appel';
+$lang['ChairmanJury']='Président(e) du Jury d\'Appel';
 $lang['ChangeNationsNames']='Changer les noms des Nations';
 $lang['Channel']='Canal';
+$lang['CheckGoldsInMatch']='Vérifier les égalités au nombres de 10 & 10+';
 $lang['CheckRefMail']='Contrôle du courriel de référence...';
 $lang['CheckScorecards']='Vérification des feuilles de marque';
 $lang['CheckTargetUpdate']='Contrôles des données';
 $lang['CheckWaIds']='Vérifier Id WA des archers correspondants';
+$lang['CheckXNinesInMatch']='Vérifier les égalités au nombres de 10 & 9';
 $lang['Classes']='Classes';
 $lang['ClickToMailRequest']='Cliquer pour ouvrir un courriel pré-rempli';
 $lang['ClickToRequestCode']='Cliquez pour demander un code';
@@ -306,6 +298,9 @@
 $lang['ElimSO']='SO Flèches d\'élimination';
 $lang['Email']='Courriel';
 $lang['EmailScorecardLong']='Feuilles de marque complètes';
+$lang['EmailSuccessfull']='L\'email a été envoyé à $a';
+$lang['EnableAccess']='Activer/Désactiver les conditions d\'accès';
+$lang['EnableAddOns']='Activer/Desactiver les AddOns';
 $lang['Ends']='Volées';
 $lang['EndTotal']='Total volée';
 $lang['EndUpdate']='Toutes les mises à jour sont faites';
@@ -414,6 +409,7 @@
 $lang['GoldLabel']='Étiquette OR';
 $lang['GoLive']='Suivre en direct';
 $lang['GoogleMap']='collez le lien <a href="$a" target="GoogleMap">Google Map URL</a> indiquant le lieu de la competition.';
+$lang['GoToRunning']='Aller sur la session en cours';
 $lang['Group']='Groupe';
 $lang['Group#']='Poule $a';
 $lang['GroupBy']='Regroupé par';
@@ -446,6 +442,7 @@
 $lang['IRM-20']='Disqualifié (Cause: Acte non sportif) (DQB)';
 $lang['IRM-5']='Abandon';
 $lang['IRM-7']='Abandon (sans classement)';
+$lang['IrmStatus']='Statut de classement';
 $lang['IsDbVersionTooOld']='La base de données du système d\'informations est plus ancienne que Ianseo';
 $lang['IsGenericConfig']='Configuration Générique';
 $lang['IsParamWarning']='Configuration du système d\'information! <br/> Utiliser avec EXTREME prudence!';
@@ -479,6 +476,7 @@
 $lang['LocRuleModifiedNo']='Modifié';
 $lang['LocRuleValidNo']='Non Modifié';
 $lang['LogisticResp']='Responssable de la logistique';
+$lang['LogoB']='Image du bas (Le rapport pleine largeur est de 19:1 pour le format A4, 20:1 pour le format lettre)';
 $lang['LogoL']='Image en haut à gauche';
 $lang['LogoManagement']='Gestion des Images';
 $lang['LogoR']='Image en haut à droite';
@@ -491,10 +489,16 @@
 $lang['LUE-SUI']='Suisse';
 $lang['LUE-SWE']='Suéde';
 $lang['LueFill']='Créer les entrées de consultation';
+$lang['MailBcc']='CCI';
 $lang['MailBody']='Courriel';
 $lang['MailBodyShortcuts']='Ces racourcis peuvent être utilisés:';
+$lang['MailCc']='CC';
 $lang['MailFrom']='Expéditeur du courriel (From)';
+$lang['MailingFooter']='Le pied de page sera l\'image du bas sur les éditions de la compétition. Remplacez HAUTEUR par la hauteur réelle en pixels.';
+$lang['MailingLogs']='Voir les logs d\'envoi de mails';
 $lang['MailPreview']='Prévisualiser le courriel';
+$lang['MailRecipients']='Destinataires des mails';
+$lang['MailSmtpEncryption']='Chiffrement des mails';
 $lang['MailSmtpPort']='Port SMTP';
 $lang['MailSmtpPwd']='mot de passe SMTP';
 $lang['MailSmtpServer']='Serveur SMTP';
@@ -769,12 +773,12 @@
 $lang['ScheduleUnfinished']='Masquer les tours terminés';
 $lang['SchIncFinalists']='Inclure Noms des finalistes';
 $lang['Score']='Score';
-$lang['Score1PageAllDist']='Feuille de marque de l\'athlète de toutes les distances sur un seule page';
+$lang['Score1PageAllDist']='Feuille de marque de l\'archer avec toutes les distances sur une seule page';
 $lang['ScoreBarcode']='Imprimer le code barre sur la feuille de marque';
 $lang['ScorecardLabelEnd']='Volée';
 $lang['ScorecardLabelSet']='Set';
 $lang['ScorecardsElim']='Feuilles de marque Éliminatoire';
-$lang['ScorecardsInd']='Feuille de marque matchs individuel';
+$lang['ScorecardsInd']='Feuille de marque duels individuels';
 $lang['ScorecardsQual']='Feuilles de marque Qualification';
 $lang['ScorecardsTeams']='Feuilles de marque matchs par équipe';
 $lang['ScoreCollector']='Collecte flèche par flèche, Choix de flèches par volée:';
@@ -808,8 +812,10 @@
 $lang['SeparateDivisions']='Divisions séparées';
 $lang['SessionDay']='Jour de session';
 $lang['SessionDescr']='Description de la Session';
+$lang['SessionEnd']='Fin de session Date/Heure';
 $lang['SessionSchedule']='Programme de session';
 $lang['SessionShort']='Ses.';
+$lang['SessionStart']='Début de session Date/Heure';
 $lang['SessionTarget']='Cible de session';
 $lang['SessionTime']='Heure de session';
 $lang['Set-DSQ']='Définir comme DSQ (Disqualifié)';
@@ -836,6 +842,7 @@
 $lang['Sign/guide-board']='Entente';
 $lang['SignedTotal']='Total signé';
 $lang['SingleArrow']='Flèche individuelle';
+$lang['SMTPSettings']='Paramètre SMTP';
 $lang['SnapShort']='$a Arr.';
 $lang['Snapshot']='Instantané';
 $lang['SOFirstTarget']='Première cible';
@@ -935,7 +942,6 @@
 $lang['TeamCreationMode_2']='Toujours 2ème équipe';
 $lang['TeamCreationMode_3']='Toujours 3ème équipe';
 $lang['TeamFin']='Équipes - Éliminatoires & Finales';
-$lang['TeamFinEvent']='Finale Équipe';
 $lang['TeamLoaded']='Matchs par équipes chargés pour l\'horaire {$a}';
 $lang['TeamPlace']='Dossards de l\'équipe';
 $lang['TeamPlaceLocal']='Dossards de l\'équipe (avec le nom de la compétition)';
@@ -1168,7 +1174,7 @@
 $lang['Type_GiochiGioventuW']='Jeux hivernaux de la Jeunesse';
 $lang['Type_HF 12+12']='Campagne 12+12';
 $lang['Type_HF 24+24']='Campagne 24+24';
-$lang['Type_Indoor 18']='Salle 18 m';
+$lang['Type_Indoor 18']='2x18 m';
 $lang['Type_Indoor 25']='Salle 25 m';
 $lang['Type_Indoor 25+18']='Salle 18+25 m';
 $lang['Type_ITA_Sperimental']='Compétition des débutants';
@@ -1188,7 +1194,6 @@
 $lang['UpdatePNG']='Mise à jour du fichier PNG correspondant';
 $lang['UploadFile']='Télécharger des fichiers (PDF)';
 $lang['URL']='URL';
-$lang['UserPassword']='Mot de passe';
 $lang['UseSubClasses']='Appliquer des sous-classes';
 $lang['ValidClass']='Classes possibles';
 $lang['ValidDivisions']='Div. Authorisées (Vide pour toutes)';
diff --git a/src/Common/Languages/he/IOC_Codes.php b/src/Common/Languages/he/IOC_Codes.php
index 4b9c91d0..226ac379 100644
--- a/src/Common/Languages/he/IOC_Codes.php
+++ b/src/Common/Languages/he/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='סמואה האמריקנית';
 $lang['AUS']='אוסטרליה';
 $lang['AUT']='אוסטריה';
-$lang['Award-Anthem']='גבירותי ורבותי, הנכם מתבקשים לקום להשמעת ההמנון הלאומי של';
-$lang['Award-Anthem-TPE']='גבירותי ורבותי, הנכם מתבקשים לעמוד להשמעת ההמנון של';
 $lang['Award-Applause']='גבירותי ורבותי, קבלו בבקשה במחיאות כפיים את המתחרים שלנו.';
 $lang['Award-Intro']='גבירותי ורבותי, טקס הפרסים של תחרות {$a}';
 $lang['Award-MedalGiver']='מדליות יוענקו על-ידי $a';
@@ -42,16 +40,12 @@
 $lang['BUL']='בולגריה';
 $lang['BUR']='בורקינה פאסו';
 $lang['CAF']='הרפובליקה המרכז אפריקאית';
-$lang['CAM']='קמבודיה';
 $lang['CAN']='קנדה';
 $lang['CAY']='איי קיימן';
 $lang['CGO']='רפובליקת קונגו';
 $lang['CHA']='צ\'אד';
 $lang['CHI']='צ\'ילה';
-$lang['CHN']='סין';
-$lang['CIV']='חוף השנהב';
 $lang['CMR']='קאמרון';
-$lang['COD']='הרפובליקה הדמוקרטית של קונגו';
 $lang['COK']='איי קוק';
 $lang['COL']='קולומביעה';
 $lang['COM']='איי קומורו';
@@ -60,7 +54,6 @@
 $lang['CRO']='קרואטיה';
 $lang['CUB']='קובה';
 $lang['CYP']='קפריבין';
-$lang['CZE']='צ\'כיה';
 $lang['DEN']='דנמרק';
 $lang['DJI']='ג\'יבוטי';
 $lang['DMA']='דומיניקה';
@@ -91,17 +84,14 @@
 $lang['GUM']='גואם';
 $lang['GUY']='גיאנה';
 $lang['HAI']='האיטי';
-$lang['HKG']='הונג-קונג';
 $lang['HON']='הונדורס';
 $lang['HUN']='הונגריה';
 $lang['INA']='אינדונזיה';
 $lang['IND']='הודו';
-$lang['IRI']='איראן';
 $lang['IRL']='אירלנד';
 $lang['IRQ']='עיראק';
 $lang['ISL']='איסלנד';
 $lang['ISR']='ישראל';
-$lang['ISV']='איי הבתולה של ארה"ב';
 $lang['ITA']='איטליה';
 $lang['IVB']='איי הבתולה הבריטיים';
 $lang['JAM']='ג\'אמייקה';
@@ -114,7 +104,6 @@
 $lang['KOR']='דרום קוריאה';
 $lang['KSA']='ערב הסעודית';
 $lang['KUW']='כווית';
-$lang['LAO']='לאוס';
 $lang['LAT']='לטביה';
 $lang['LBA']='לוב';
 $lang['LBR']='ליבריה';
@@ -128,7 +117,6 @@
 $lang['MAR']='מרוקו';
 $lang['MAS']='מאלזיה';
 $lang['MAW']='מאלאווי';
-$lang['MDA']='מולדובה';
 $lang['MDV']='האיים המלדיביים';
 $lang['Medal-1']='מדליית זהב';
 $lang['Medal-2']='מדליית כסף';
@@ -137,7 +125,6 @@
 $lang['MEX']='מקסיקו';
 $lang['MGL']='מונגוליה';
 $lang['MHL']='איי מרשל';
-$lang['MKD']='צפון מקדוניה';
 $lang['MLI']='מאלי';
 $lang['MLT']='מלטה';
 $lang['MNE']='מונטנגרו';
@@ -166,7 +153,6 @@
 $lang['PNG']='פפואה גינאה החדשה';
 $lang['POL']='פולין';
 $lang['POR']='פורטוגל';
-$lang['PRK']='צפון קוריאה';
 $lang['PUR']='פוארטו ריקו';
 $lang['QAT']='קטאר';
 $lang['ROU']='רומניה';
@@ -193,13 +179,11 @@
 $lang['SVK']='סלובקיה';
 $lang['SWE']='שבדיה';
 $lang['SWZ']='סוואזילנד';
-$lang['SYR']='סוריה';
 $lang['TAN']='טנזניה';
 $lang['TGA']='טונגה';
 $lang['THA']='תאילנד';
 $lang['TJK']='טאג\'יקיסטאן';
 $lang['TKM']='תורכמניסטאן';
-$lang['TLS']='טימור המזרחית';
 $lang['TOG']='טוגו';
 $lang['TPE']='טאייפה הסינית';
 $lang['TRI']='טרינידד וטובגו';
diff --git a/src/Common/Languages/he/Install.php b/src/Common/Languages/he/Install.php
index 969cea91..34d7acc6 100644
--- a/src/Common/Languages/he/Install.php
+++ b/src/Common/Languages/he/Install.php
@@ -67,7 +67,6 @@
 $lang['Parameter']='נתון';
 $lang['Password']='סיסמה';
 $lang['PHP settings']='הגדרות PHP';
-$lang['PHP too old']='גרסת ה-PHP המותקנת ישנה מידי. מספר הגרסה המינימלי עבור IANSEO הוא 5.0.';
 $lang['PHP version']='גרסת PHP';
 $lang['php.ini file']='קובץ php.ini';
 $lang['Prepare']='מכין מידע לעדכון';
diff --git a/src/Common/Languages/he/Tournament.php b/src/Common/Languages/he/Tournament.php
index 05b049b6..bece2a95 100644
--- a/src/Common/Languages/he/Tournament.php
+++ b/src/Common/Languages/he/Tournament.php
@@ -107,7 +107,6 @@
 $lang['BadgeIncludePhoto']='לכלול תמונות בתג?';
 $lang['BadgeNames']='שם מלא (לא הודפס ראשון)';
 $lang['BadgeNoData']='אין מידע להדפסה';
-$lang['BadgeOnlyNotPrinted']='רק תגים שעדיין לא הודפסו?';
 $lang['BadgeOnlyPrintAccredited']='רק תגים של משתתפים ששילמו?';
 $lang['BadgeOnlyPrintPhoto']='רק תגים עם תמונה?';
 $lang['BadgeOptions']='אפשרויות';
@@ -169,8 +168,6 @@
 $lang['CatJudge']='שופטים';
 $lang['CatJury']='חבר שופטים לערעורים';
 $lang['CatOC']='ועדה מארגנת';
-$lang['ChairmanJudge']='יו"ר חבר השופטים';
-$lang['ChairmanJury']='יו"ר חבר שופטים לערעורים';
 $lang['ChangeLookUpTable']='שנה טבלת איתור';
 $lang['ChangeNationsNames']='שנה שמות אומות';
 $lang['Channel']='ערוץ';
@@ -279,7 +276,6 @@
 $lang['Email']='דואר אלקטרוני';
 $lang['EmailScorecardLong']='לוחות תצאות מלאים';
 $lang['EmailScorecardShort']='סיכום לוח תוצאות';
-$lang['EnableAccess']='הפעל/בטל מדיניות';
 $lang['Ends']='מקצי ירי';
 $lang['EndTotal']='סיכום מקצה';
 $lang['EndUpdate']='כל העדכונים בוצעו';
@@ -960,7 +956,6 @@
 $lang['TeamCreationMode_2']='תמיד קבוצה שניה';
 $lang['TeamCreationMode_3']='תמיד קבוצה שלשית';
 $lang['TeamFin']='סבבי הדחה וגמר - קבוצתי';
-$lang['TeamFinEvent']='גמר קבוצתי';
 $lang['TeamLoaded']='התמודדויות קבוצתיות נטענו ללוח הזמנים של {$a}';
 $lang['TeamPlace']='שלטי מיקום קבותות';
 $lang['TeamPlaceLocal']='שילטי מיקום קבוצות (מותאמי שפה)';
diff --git a/src/Common/Languages/hr/Api.php b/src/Common/Languages/hr/Api.php
index 866105fe..8145463b 100644
--- a/src/Common/Languages/hr/Api.php
+++ b/src/Common/Languages/hr/Api.php
@@ -1,31 +1,202 @@
 <?php
+$lang['API-AutoGroup']='Skupno stvaranje grupa';
 $lang['API-ConfirmDeleteRow']='Jeste li sigurni da želite izbrisati ovaj redak?';
+$lang['API-DeviceGrouping']='Grupiranje uređaja';
+$lang['API-EnableDeviceGrouping']='Omogući grupiranje uređaja';
 $lang['API-Group']='grupa';
 $lang['API-TargetGrouping']='Grupiranje meta';
 $lang['API-Targets']='Mete';
+$lang['AskSignature-0']='Ne';
+$lang['AskSignature-1']='Skenirajte ID streličara';
+$lang['AskSignature-2']='Potpisivanje na zaslonu';
 $lang['AutoImport']='Automatski uvoz';
+$lang['CheckConnected']='Provjerite Povezano';
 $lang['CmdDelete']='Ukloni';
 $lang['CmdImport']='Uvoz';
+$lang['ConfirmGenerateZip']='Potvrdite da generirate ZIP datoteku sa svim $a[0] za sesiju $a[1]';
+$lang['Controller']='Controller';
+$lang['DataRefresh']='Osvježi podatke';
+$lang['Desc-Let-1']='Trenutačni završetak uvezen';
+$lang['Desc-Let-2']='Nedostaju strijele na trenutnom kraju';
+$lang['Desc-Let-3']='Kraj spreman za uvoz';
+$lang['Desc-Let-4']='Bodovanje u tijeku';
+$lang['Desc-Let-B']='Trenutačni kraj uvezen';
+$lang['Desc-Let-C']='Nedostaju strijele u trenutnom kraju';
+$lang['Desc-Let-F']='Meč gotov';
+$lang['Desc-Let-G']='Prazno mjesto';
+$lang['Desc-Let-O']='Strijele na različitim krajevima';
+$lang['Desc-Let-R']='Strelice u drugoj sesiji';
+$lang['Desc-Let-Y']='Kraj spreman za uvoz';
+$lang['Desc-Let-Z']='Bodovanje u tijeku';
+$lang['DevConnected']='Povezan';
+$lang['DevDisconnected']='Nepovezan';
+$lang['DistanceNum']='Udaljenost $a';
+$lang['FieldMonitor']='Nadzornik polja';
+$lang['FlashCodeDistance']='Skenirajte ovaj kod u aplikaciji da postignete $a';
+$lang['HitToWin']='Pogodi za pobjedu';
+$lang['ImportDoneQualRecheck']='Uvoz kvalifikacijskih rezultata obavljen. Molimo vas da što je prije moguće temeljito provjerite izračun ranga.';
+$lang['ISK-Anomalies']='Anomalije';
+$lang['ISK-AppInfo']='Informacije o aplikaciji';
+$lang['ISK-AppList']='popis APK-ova';
+$lang['ISK-AppQrCode']='Ispis QR konfiguracijskih kodova';
+$lang['ISK-ApproveConfig']='Odobri konfiguraciju';
+$lang['ISK-askSignature']='Zatražite potpis';
+$lang['ISK-askTotals']='Zatražite ukupne iznose na papiru';
+$lang['ISK-AuthRequest']='Zahtjev za autorizaciju';
+$lang['ISK-BadCompCode']='Neispravan kod natjecanja';
 $lang['ISK-CheckAlive']='Provjera uređaja';
+$lang['ISK-checkCompeting']='Samo sportaši koji se natječu';
+$lang['ISK-checkGate']='Provjera protoka (ulaz/izlaz)';
+$lang['ISK-ConnectionStatus']='Status veze';
+$lang['ISK-DeleteDevices']='Izbriši uređaje';
+$lang['ISK-DenyAccess']='Zabrani pristup';
+$lang['ISK-Deprecated']='VAŽNO: aplikacija "Ianseo Score Keeper" postupno se povlači iz Android i Apple trgovina i više nije podržana, stoga će biti uklonjena iz Iansea u rujnu 2024. Prijeđite na novu aplikaciju "Ianseo Score Keeper NG".';
+$lang['ISK-DeviceAlive']='Online';
 $lang['ISK-DeviceBattery']='Baterija';
+$lang['ISK-DeviceEnabled']='Omogućeno';
 $lang['ISK-DeviceId']='ID uređaja';
 $lang['ISK-DeviceIpAddress']='IP adresa';
 $lang['ISK-DeviceLastSeen']='Zadnje viđeno';
 $lang['ISK-DeviceStatus']='Status uređaja';
+$lang['ISK-DeviceStatusWanted']='Prisilni novi status';
+$lang['ISK-DeviceUsed']='U upotrebi';
+$lang['ISK-enableGPS']='Pošalji položaj uređaja';
+$lang['ISK-enableHaptics']='Omogući povratne informacije Otiska';
 $lang['ISK-EnableScore']='Omogući Ianseo ScoreKeeper';
+$lang['ISK-enableTotals']='Omogućite Total View na uređajima';
+$lang['ISK-enableWIFIManagement']='Ovlastite aplikaciju za upravljanje Wi-Fi mrežom uređaja';
+$lang['ISK-ExportDevices']='Izvoz uređaja';
+$lang['ISK-ForceConfirm']='Nametni potvrdu uređaja';
+$lang['ISK-Gps']='GPS lokacija';
+$lang['ISK-gpsFrequency']='Učestalost ažuriranja';
+$lang['ISK-hideTotals']='Sakrij ukupne iznose';
+$lang['ISK-ImportDevices']='Uvoz uređaja';
+$lang['ISK-kioskMode']='Omogući način rada Kiosk';
+$lang['ISK-LicenseEmail']='ISK Pro registrirana e-pošta';
+$lang['ISK-LicenseNumber']='ISK Pro broj licence';
+$lang['ISK-LicenseVoucher']='ISK Pro otkupni vaučer';
+$lang['ISK-LicenseVoucherTip']='Važeći kuponi bit će promijenjeni u valjanu licencu nakon objave na ianseo.net';
 $lang['ISK-Lite-Name']='Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-NoCompCode']='Nedostaje kod natjecatelja';
 $lang['ISK-Lite-QRCode']='Printaj QR kod za Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='Server URL (uključujući protokol i port, ako nije 80)';
+$lang['ISK-Live-Deprecated']='VAŽNO: aplikacija "Ianseo Score Keeper Live" više nije podržana, stoga će biti uklonjena iz Iansea u rujnu 2024. Prijeđite na novu aplikaciju "Ianseo Score Keeper NG".';
+$lang['ISK-Live-Name']='Ianseo ScoreKeeper UŽIVO';
+$lang['ISK-lockPortrait']='Zaključajte uređaj u portretnom prikazu';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
+$lang['ISK-Ng-Name']='Ianseo zapisničar NG';
+$lang['ISK-NG-QRCode']='Ispišite QR kod za Ianseo zapisničar NG';
+$lang['ISK-NgLive-Name']='Ianseo zapisničar NG - Značajke UŽIVO';
+$lang['ISK-NgPro-Name']='Ianseo zapisničar NG - Pro značajke';
 $lang['ISK-NoCompCode']='Nedostaje kod natjecanja';
+$lang['ISK-onlyAccreditated']='Validirana akreditacija';
+$lang['ISK-OnlyProAloud']='U ovom natjecanju dopuštena je samo Pro aplikacija!';
+$lang['ISK-Options']='Mogućnosti';
+$lang['ISK-OptionsOVA']='Na opcijama pomoćnika za mjesto održavanja';
+$lang['ISK-OptionsWAGate']='WA Gate opcije';
+$lang['ISK-Pro-Name']='Ianseo ScoreKeeper Pro';
 $lang['ISK-QRCode']='Ispis QR koda za Ianseo ScoreKeeper';
+$lang['ISK-RefreshTO']='Istek vremena za osvježavanje podataka';
+$lang['ISK-ReloadConfig']='Ponovno učitaj konfiguraciju';
+$lang['ISK-Remove']='Ukloniti';
+$lang['ISK-RequiresApproval']='Zahtijeva odobrenje';
+$lang['ISK-RunInBackground']='Pokreni u pozadini';
+$lang['ISK-SendQrSetup']='Pošaljite postavke QRCodea';
+$lang['ISK-Sequence']='Predviđena faza natjecanja';
 $lang['ISK-ServerUrl']='URL poslužitelja (uključujući protokol i port, ako nije 80)';
+$lang['ISK-ServerUrlPin']='Sigurnosni Pin natjecanja';
+$lang['ISK-SetQRData']='Postavite uređaje pomoću QRCodea';
+$lang['ISK-SettingsPIN']='Postavke PIN-a';
+$lang['ISK-SETUP-11']='Postavljanje ISK-NG Lite';
+$lang['ISK-SETUP-12']='Postavljanje ISK-NG Pro';
+$lang['ISK-SETUP-13']='Postavljanje ISK-NG uživo';
+$lang['ISK-showPictures']='Prikaži slike';
+$lang['ISK-SocketAction']='Akcija';
+$lang['ISK-SocketIP']='Web Socket IP (za uređaje)';
+$lang['ISK-SocketIPMaster']='Web Socket IP (za mastere)';
+$lang['ISK-SocketPort']='Web Socket Port';
+$lang['ISK-spottingMode']='Spotting Mode';
+$lang['ISK-StatusNoShoot']='Uređaj ne može bodovati';
+$lang['ISK-StatusOK']='Konfiguracija uređaja OK';
+$lang['ISK-StatusReloading']='Ponovno učitavanje konfiguracije';
+$lang['ISK-StatusWaitConfirm']='Čeka se potvrda uređaja';
+$lang['ISK-TruncateTable']='Prazni privremenu tablicu';
+$lang['ISK-TruncateTableAll']='Prazna privremena tablica (dovršeno)';
+$lang['ISK-UsePersonalDevices']='Koristite osobne uređaje';
+$lang['ISK-UsePersonalDevices-Help']='Odaberite ovu opciju ako će se koristiti osobni uređaji Strijelaca. Oni će se morati prethodno registrirati i skenirati QrCode na tablicama rezultata kako bi mogli bodovati.';
+$lang['ISK-VibrateUpdate']='Vibriraj na ažuriranju';
+$lang['ISK-WiFi']='WiFi Management';
+$lang['ISK-WifiDELETE']='Izbrišite drugi Wi-Fi s uređaja za bodovanje';
+$lang['ISK-WifiPWD']='Wi-Fi lozinka (samo WPA. WEP nije podržan)';
+$lang['ISK-WifiReconnectTO']='Istek vremena za ponovno povezivanje';
+$lang['ISK-WifiResetCounter']='Neuspjeli pokušaj povezivanja prije resetiranja WiFi parametara';
+$lang['ISK-WifiSearch']='Potražite bolji WiFi Time Out';
+$lang['ISK-WifiSSID']='Wi-Fi ESSID';
+$lang['ISK-WifiSwitchLvl']='Razina prekidača WiFi mreže (dBm).';
+$lang['ISK-WifiTargetRange']='Preferirani Wi-Fi za metu';
+$lang['ISK-WifiUse']='WiFi s omogućenom aplikacijom';
 $lang['IskDeviceAssigned']='Uređaj(i)';
+$lang['IskResetAlert']='UPOZORENJE: sve postavke koje nisu u ovoj postavci bit će uklonjene, osim značajke grupiranja.';
+$lang['IskScoringDevice']='Uređaj $a nije ovlašten za bodovanje u ovoj sesiji/natjecanju!';
+$lang['IskSpuriousDevice']='Uređaj $a[0] šalje neželjene rezultate na cilj $a[1]';
+$lang['IskSpuriousScore-Device']='Uređaj $a[0] šalje rezultate na metu $a[1] iz faze $a[2]';
+$lang['IskSpuriousScore-Distance']='Uređaj $a[0] postiže bodove na udaljenosti $a[1]';
+$lang['IskSpuriousScore-Empty']='Uređaj $a[0] je osvojila mjesto $a[1]';
+$lang['IskSpuriousScore-End']='Uređaj $a[0] postiže bodove na kraju $a[1]';
+$lang['IskSpuriousScore-Match']='Uređaj $a[0] daje bodove u meču $a[1]';
+$lang['IskTargetTitle']='Meta $a';
+$lang['IskUnknownDevice']='Nepoznati uređaj na meti $a';
+$lang['LockAll']='Zaključaj sve sesije';
+$lang['LockToEnds']='Ograniči bodovanje na sljedeće krajeve (nula znači neograničeno bodovanje)';
+$lang['ManageGroupTarget']='Upravljanje grupama i metama';
+$lang['ManageLockedSessions']='Upravljanje zaključanim sesijama';
+$lang['Masters']='Masters';
+$lang['MissingParameter']='Nedostaje parametar';
+$lang['MsgDelAllTablets']='Izbrišite sve tablete na popisu';
+$lang['MsgDelTablet']='Izbriši tablet';
+$lang['MsgEmptyTemporaryOfGroup']='Isprazni privremenu tablicu podataka sa svih uređaja iz odabrane grupe.';
+$lang['NewGroup']='Nova dodjela grupe';
+$lang['NewTarget']='Nova dodjela meta';
+$lang['PartialImport']='Djelomični automatski uvoz';
+$lang['PartialImportAll']='Uvezi SVE';
+$lang['PopupStatusDistance']='Udaljenost: $a';
+$lang['PopupStatusEnd']='Kraj: $a';
+$lang['PopupStatusEvent']='Događaj: $a';
+$lang['PopupStatusPhase']='Faza: $a';
+$lang['PopupStatusSession']='Sesija: $a';
+$lang['Preparing']='Pripremanje datoteke ...';
+$lang['QrCodeWidth']='Širina QrCode';
+$lang['RankCalcSettings']='Postavke izračuna ranga';
+$lang['RasActive']='Aktivan';
 $lang['RasIpAddress']='IP adresa';
 $lang['RasLastSeen']='zadnja konekcija';
 $lang['RaspControl']='Raspberry kontrola';
 $lang['RaspDevice']='Uređaj';
+$lang['RasUrl']='Url za posluživanje';
+$lang['RecalcAfterImport']='Nakon svakog uvoza (zadano)';
+$lang['RecalcFullDist']='Nakon primitka svih podataka o udaljenosti';
+$lang['RecalcManually']='Ručno';
+$lang['RecalcMode']='Način ponovnog izračuna';
+$lang['ScorecardsEmpty']='Prazne tablice rezultata';
+$lang['ScorecardsFull']='Tablice rezultata s vrijednostima strijela';
+$lang['ScorerNum']='Streličar $a';
+$lang['ScoringCount']='Broj bodova';
+$lang['SelectedDevicesAction']='Radnja na odabranim uređajima';
+$lang['SelectedMove2Group']='Premjestite uređaje u grupu';
+$lang['SelectedReNumber']='Prenumeriraj uređaje počevši od';
+$lang['StatusTemporaryArrows']='Situacija sa strijelama u privremenoj tablici';
+$lang['StickyAlreadySet']='Sticky Ends su već postavljeni u drugoj sesiji!';
+$lang['TargetRequests-Printout']='Ispis listova s QrCode zahtjevima za mete';
+$lang['TargetScoring-Printout']='Ispišite tablicu s QRCodom za bodovanje meta';
+$lang['TempArrowsDelete']='IZBRIŠI strijele iz privremene tablice';
+$lang['TempArrowsImport']='Uvoz strijele iz privremene tablice';
+$lang['TempArrowsM']='Strijele koje nisu uvezene u mečevima (Ind., Tean, Ranking Rounds, Pools itd.)';
+$lang['TempArrowsQ']='Neuvezene strijele u kvalifikacijskim rundama ili eliminacijama';
+$lang['UnlockAll']='Otključaj sve sesije';
+$lang['UsePersonalDevices-Granted']='Osobno';
+$lang['UsePersonalDevices-Print']='Ispis zahtjeve meta QrCode na Tablice s rezultatima';
+$lang['ViewSize']='Prikaz veličine';
 $lang['WAToolbox-MissingParams']='Nedostaje parametar';
 $lang['WAToolbox-NoCompCode']='Nedostaje kod natjecanja';
+$lang['XToWin']='$a za pobjedu';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/hr/Awards.php b/src/Common/Languages/hr/Awards.php
index 50a19237..f2458e97 100644
--- a/src/Common/Languages/hr/Awards.php
+++ b/src/Common/Languages/hr/Awards.php
@@ -1,11 +1,18 @@
 <?php
 $lang['CM0']='Compound Men';
 $lang['CM1']='Compound Men Tim';
+$lang['CustomAward']='Prilagođena nagrada';
+$lang['CustomEvent']='Naziv nagrade';
+$lang['CustomNation']='Nacionalnost nagrađenih';
+$lang['CustomPrize']='Dodjela nagrada';
+$lang['CustomWinner']='Nagrađena(e) osoba';
 $lang['CW0']='Compound žene';
 $lang['CW1']='Compound žene Tim';
 $lang['CX']='Compound Mixed Team';
 $lang['CX1']='Compound Mixed Team';
 $lang['EvNameTranslated']='Preveden događaj';
+$lang['PrecisionPrizeEvent']='Nagrada za preciznost';
+$lang['PrecPrizePresentation']='Pobjednik muške nagrade za preciznost u kompleksu za pozornicu XXX';
 $lang['RM0']='Recurve Men';
 $lang['RM1']='Recurve Men Tim';
 $lang['RW0']='Recurve žene';
diff --git a/src/Common/Languages/hr/BackNumbers.php b/src/Common/Languages/hr/BackNumbers.php
index 8936e42c..b6151966 100644
--- a/src/Common/Languages/hr/BackNumbers.php
+++ b/src/Common/Languages/hr/BackNumbers.php
@@ -1,5 +1,10 @@
 <?php
+$lang['A-Badge']='Akreditacijski bedž';
+$lang['Access']='Područja za pristup';
+$lang['AccessGraphics']='Pristupno područje - ikone';
+$lang['Accomodation']='Smještaj, ishrana, prijevoz';
 $lang['AccreditationKO']='Problem sa akreditacijom... MOLIM OBRATITE SE NA DESK';
+$lang['AccreditationMatches']='Ova značka je specifična za sljedeće kategorije:';
 $lang['AccreditationOK']='Proces akreditacije uspio!';
 $lang['AccreditationTwice']='Akreditacija je već završena.';
 $lang['AlignC']='Centar';
@@ -7,40 +12,112 @@
 $lang['Alignment']='Svrstati';
 $lang['AlignR']='Desno';
 $lang['AllCaps']='Prezime velikim slovima';
+$lang['AthBarCode']='Kod natjecatelja (bar kod)';
+$lang['AthCode']='Šifra natjecatelja (tekst)';
+$lang['Athlete']='Ime natjecatelja';
+$lang['AthQrCode']='Šifra natjecatelja (QR kod)';
 $lang['AutoCheckin']='Auto prijava';
 $lang['AutoCHK-Camera']='Koristite fotoaparat za čitanje QR-kodova';
+$lang['AutoCHK-CanEdit']='Uredi unose';
 $lang['AutoCHK-Code']='kod natjecanja';
 $lang['AutoCHK-Confirm']='Potvrdi check-in';
 $lang['AutoCHK-IP']='IP adrese u auto-prijavljenih uređaja (jedna po retku)';
+$lang['AutoCHK-IPinfo']='Samoposlužne info točke';
+$lang['AutoCHK-IPnoMgm']='Samoposlužni kiosci';
 $lang['AutoCHK-Names']='Provjere također imena/ prezimena';
 $lang['AutoCHK-nobody']='Nitko sa ovim kodom nije u DB u ovom trenutku ... MOLIM JAVITE SE NA DESK';
 $lang['AutoCHK-Print']='Automatski printaj akreditacijske kartice';
+$lang['BackCat']='Kategorija Pozadina';
+$lang['BackColor']='Boja pozadine';
+$lang['BackNoComplete']='Potpuni pozadinski broj';
+$lang['BackNoConfirmPrinted']='Označi Pozadinske brojeve kao tiskane';
 $lang['BackNoEdit']='Promjena Izgleda';
 $lang['BackNoExportLayout']='Izvoz predloška brojeva natjecatelja';
 $lang['BackNoImportLayout']='Uvoz predloška brojeva natjecatelja';
 $lang['BackNoPrintEmpty']='Ispis natjecateljskog broja, čak i ako meta nije dodijeljena';
+$lang['BackNoTest']='Test pozadinskih brojeva (jedna stranica)';
+$lang['BackNumbers']='Pozadinski brojevi';
 $lang['BadgeComplete']='Sve akreditacijske kartice';
+$lang['BadgeCreate']='Izradi novu značku';
+$lang['BadgeCustom']='Prilagođena značka';
+$lang['BadgeDelete']='Izbriši značku';
 $lang['BadgeDimention']='Dimenzije akreditacijske kartice';
 $lang['BadgeEdit']='Uredi akreditacijske kartice';
 $lang['BadgeExportLayout']='Izvoz izgleda akreditacijskih kartica';
 $lang['BadgeImportLayout']='Uzvoz izgleda akreditacijskih kartica';
+$lang['BadgeName']='Naziv značke';
 $lang['BadgeSetup']='Uređenje akreditacijskih kartica';
 $lang['BadgeTest']='testiraj akreditacijske kartice';
 $lang['Barcode']='Barcode';
+$lang['BarCodeFields']='<ul> <li><b>Prazno: </b>ispisat će se niz odvojen crticom s šifrom unosa, odjelom i klasom</li> <li><b>{ENCODE}: </b>{ENCODE } bit će prevedeno u šifru unosa</li> <li><b>{COUNTRY}: </b>{COUNTRY} će biti prevedeno u šifru zemlje</li> <li><b>{DIVISION}: </b>{DIVISION} bit će preveden u šifru odjela</li> <li><b>{CLASS}: </b>{CLASS} će biti preveden u šifru klase</li> <li>< b>{TOURNAMENT}: {TOURNAMENT} će biti preveden u kod natjecanja</li> </ul>';
+$lang['BarcodeSeparator']='Barcode Separator';
 $lang['BgImage']='Pozadinska slika';
+$lang['BibNumber']='Bib broj';
+$lang['BlackWhite']='Okvir u jednoj boji (koristite: Boja pozadine)';
 $lang['Bold']='podebljano';
+$lang['Category']='Kategorija';
 $lang['CharColor']='boja znakova';
+$lang['CharSize']='veličina znakova';
 $lang['CharType']='vrsta znakova';
 $lang['CheckBarcodeSeparator']='Provjerite Barcode Separator';
+$lang['Club']='Pojedinosti o zemlji/klubu';
+$lang['Club2']='2. pojedinosti o zemlji/klubu';
+$lang['Club3']='3. pojedinosti o zemlji/klubu';
+$lang['ClubCamel']='Naziv Kluba';
+$lang['ClubCaps']='NAZIV KLUBA';
+$lang['ColoredArea']='Blok teksta';
+$lang['Coloured']='Obojeni Phase rubovi';
+$lang['CompDetails']='Detalji natjecanja';
+$lang['CompName']='Naziv natjecanja';
+$lang['Content']='Sadržaj';
 $lang['CountryCodeAndLong']='Kod zemlje i dugi naziv zemlje';
 $lang['CountryCodeOnly']='samo kod zemlje';
 $lang['CountryFlagAndLong']='Državna zastava i dugo ime';
 $lang['CountryFlagOnly']='Samo zastave zemalja';
 $lang['CountryLongName']='samo naziv zemlje';
+$lang['Depot']='Depo';
+$lang['E-Badge']='Eliminacijski broj sportaša';
+$lang['EvCode']='Šifra događaja';
+$lang['EvCode-EvDescr']='Šifra i opis događaja';
+$lang['EvDescr']='Opis događaja';
+$lang['EvDescrUpper']='OPIS DOGAĐAJA';
+$lang['Event']='Događaj';
+$lang['ExportPhotos']='Izvoz slika';
+$lang['ExtraAddOns']='Tekst dodatnih dodataka';
+$lang['ExtraAddOnsImage']='Slika dodatnih dodataka';
+$lang['FamCamel']='Prezime';
+$lang['FamCamel-GAlone']='Prezime G.';
+$lang['FamCamel-GivCamel']='Prezime  Ime';
+$lang['FamCaps']='PREZIME';
+$lang['FamCaps-GAlone']='PREZIME G.';
+$lang['FamCaps-GivCamel']='PREZIME Ime';
+$lang['FamCaps-GivCamel-ClubCamel']='Prezime  Ime, Naziv zemlje';
+$lang['FamCaps-GivCamel-ClubCaps']='PREZIME Ime, NAZIV ZEMLJE';
+$lang['FamCaps-GivCaps']='PREZIME NAZIV ZEMLJE';
+$lang['FamCaps-GivCaps-ClubCaps']='PREZIME IME,  NAZIV ZEMLJE';
+$lang['FinalRanking']='Konačan poredak';
+$lang['FinalRankLimit']='Ograničenje konačnog poretka';
+$lang['FinPosition']='Konačna pozicija';
+$lang['Flag']='Zastava države/kluba';
+$lang['GAlone-FamCamel']='G. Prezime';
+$lang['GAlone-FamCaps']='G. PREZIME';
+$lang['GivCamel']='Ime';
+$lang['GivCamel-FamCamel']='Ime Prezime';
+$lang['GivCamel-FamCamel-ClubCamel']='Ime Prezime, naziv zemlje';
+$lang['GivCamel-FamCaps']='Ime PREZIME';
+$lang['GivCamel-FamCaps-ClubCamel']='Ime PREZIME, Naziv zemlje';
+$lang['GivCamel-FamCaps-ClubCaps']='Ime PREZIME, NAZIV ZEMLJE';
+$lang['GivCaps']='IME';
+$lang['GivCaps-FamCaps']='IME PREZIME';
+$lang['GivCaps-FamCaps-ClubCaps']='IME PREZIME, NAZIV ZEMLJE';
 $lang['GivenNameInitial']='Prvo slovo imena';
 $lang['Heigh']='Visina';
+$lang['HLayout']='Horizontalno';
+$lang['HLine']='Horizontalna linija';
+$lang['I-Badge']='Broj sportaša za pojedinačne utakmice';
 $lang['IdCardHor']='Brojevi na karitcama u širini';
 $lang['IdCardNumber']='Broj akreditacijskih kartica u pregledu';
+$lang['IdCardOffsets']='Pomak: 0 ako postoji samo jedna osobna iskaznica po stranici, pomaci u mm odvojeni znakom ";" ako ih je više';
 $lang['IdCardVer']='Brojevi na karitcama u visini';
 $lang['IdLayout']='Orijantacija';
 $lang['IdMarginH']='Visina margine';
@@ -48,18 +125,66 @@
 $lang['IdMarginR']='Desna margina';
 $lang['IdMarginT']='Gornja margina';
 $lang['IdMarginW']='Širina margine';
+$lang['Image']='Slika';
+$lang['Images']='Slike';
+$lang['ImageSvg']='SVG slika';
 $lang['IncludeLogo']='Printaj zastave zemalja/logo kluba';
 $lang['IncludeSession']='Uključi sesiju u ispisu';
 $lang['Italic']='Italic';
 $lang['Landscape']='Vodoravno (Landscape)';
+$lang['MultiLine']='Više redaka';
+$lang['NameTag']='Oznaka s imenom';
+$lang['NewBadgeName']='Novo ime značke';
+$lang['NocCaps']='Kod Kluba';
+$lang['NocCaps-ClubCamel']='KOD KLUBA Naziv kluba';
+$lang['NocCaps-ClubCaps']='KOD KLUBA NAZIV KLUBA';
+$lang['Offest2nd']='Pomak drugog pozadinskog broja (ako je potrebno)';
+$lang['OneLine']='Jedna linija';
+$lang['OnlyAthletes']='Samo natjecatelji';
+$lang['OpenPictureScreen']='Otvorite sekundarni zaslon';
 $lang['PageDimension']='Veličina stranice';
+$lang['PaperDimention']='Dimenzija papira';
+$lang['PhaseFrom']='Iz faze';
+$lang['PhaseTo']='Za fazu';
+$lang['Picture']='Fotografija sportaša';
 $lang['Portrait']='Okomito (Portrait)';
 $lang['PosX']='Pozicija (X)';
 $lang['PosY']='Pozicija (Y)';
 $lang['PrintBackNo']='Printaj pozadinske brojeve';
+$lang['PrintHasPlastic']='Samo kartice vlasnika lanyardsa';
+$lang['PrintSpecificBadges']='Ispis pomoću znački za automatsko podudaranje';
+$lang['PrintSyncResult']='$a Pozadinski brojevi su ispisani!';
+$lang['Q-Badge']='Kvalifikacijski broj sportaša';
+$lang['QrCodeFields']='<ul> <li><b>Prazno: </b>ispisat će se niz odvojen crticom s šifrom unosa, odjelom i klasom</li> <li><b>{ENCODE}: </b>{ENCODE } bit će prevedeno u šifru unosa</li> <li><b>{COUNTRY}: </b>{COUNTRY} će biti prevedeno u šifru zemlje</li> <li><b>{DIVISION}: </b>{DIVISION} bit će preveden u šifru odjela</li> <li><b>{CLASS}: </b>{CLASS} će biti preveden u šifru klase</li> <li>< b>{TOURNAMENT}: </b>{TOURNAMENT} će biti preveden u Kodeks natjecanja</li> </ul>';
+$lang['QRScore']='Rezultat kvalifikacijske runde';
+$lang['QualPosition']='Kvalifikacijska pozicija';
+$lang['RandomImage']='Slučajna slika';
+$lang['Ranking']='Kvalifikacijski rang';
+$lang['RankLimit']='Ograničenje ranga kvalifikacije';
 $lang['ReadSeparator']='Odvajanje redka za čitanje';
 $lang['ResetBackNo']='Resetiranje izgleda broja natjecatelja';
+$lang['ResetBarcodeSeparator']='Poništi separator crtičnog koda';
+$lang['RnkCardinalEN']='Kardinalni pogled (1, 2, ..., 10)';
+$lang['RnkOrdinal']='Redni prikaz (1., 2., ..., 10.) - EN';
+$lang['Schedule']='zakazano';
+$lang['Session']='Kvalifikacijska sesija';
+$lang['SessionTarget']='Kod sesije i mete';
+$lang['SetAccreditationMatches']='Ovaj bedž može biti specifičan za sljedeće kategorije:';
+$lang['SkipPrinted']='Preskoči tiskane pozadinske brojeve';
+$lang['T-Badge']='broj natjecatelja u timskom meču';
+$lang['Target']='Meta';
+$lang['TeamComponents']='Sastav tima';
+$lang['TgtSequence']='Niz meta';
+$lang['ToBottom']='Logo natjecanja (dolje)';
+$lang['ToLeft']='Logo natjecanja (lijevo)';
+$lang['ToRight']='Logo natjecanja (desno)';
 $lang['TVViewIdCard']='Pogledaj ID kartice';
 $lang['TVViewIdCardDescr']='U pregledu povuci 2 ID karte od protivnika umjesto iz "standardnog" reda';
+$lang['VLayout']='Okomito';
 $lang['Width']='Širina';
+$lang['WRank']='Svjetski poredak';
+$lang['WRankFields']='Ne prikazuj nakon WR pozicije (0: Prikaži sve)';
+$lang['WRankImage']='Slika za svjetsku rang listu';
+$lang['Y-Badge']='Diploma (pojedinačna)';
+$lang['Z-Badge']='Diploma (ekipno)';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/hr/Boinx.php b/src/Common/Languages/hr/Boinx.php
index 9441d95f..75b3114a 100644
--- a/src/Common/Languages/hr/Boinx.php
+++ b/src/Common/Languages/hr/Boinx.php
@@ -7,6 +7,17 @@
 $lang['ArcheryTopScoring.qtz']='Pokazuje tekuće rezultate natjecanja u gornjem lijevom kutu zaslona ili punom zaslonu. Postoji mogućnost povezivanja slike streličara ili zastave uz set ili kumulativni rezultat.';
 $lang['BoinxLayer']='Boinx Layer';
 $lang['BoinxSchedule']='Planer za Boinx Layere';
+$lang['CssArrowCommon']='Strijele';
+$lang['CssArrTitle']='Ukupni rezultat Naslov';
+$lang['CssArrTotal']='Ukupna rezultatska vrijednost';
+$lang['CssBoxCommon']='Box - Zajednički';
+$lang['CssBoxLeft']='Box - lijevo';
+$lang['CssBoxRight']='Box - desno';
+$lang['CssCountry']='Blok naziva i zastave - kod zemlje';
+$lang['CssCountryCommon']='Zemlja';
+$lang['CssFlag']='Blok imena i zastave - Zastava';
+$lang['CssFlexArrows']='Blok detalja strijela- Uobičajeno';
+$lang['CssFlexArrowsDiv']='Jedna strijela Div';
 $lang['DirNotWriteable']='Direktoriju nije omogućen zapis!';
 $lang['Download']='Preuzimanje';
 $lang['HowToUse']='Kako integrirati Ianseo i Boinx';
diff --git a/src/Common/Languages/hr/Common.php b/src/Common/Languages/hr/Common.php
index 30d0532b..39a13e0c 100644
--- a/src/Common/Languages/hr/Common.php
+++ b/src/Common/Languages/hr/Common.php
@@ -24,6 +24,7 @@
 $lang['Archer']='Streličar';
 $lang['Archers']='Streličari';
 $lang['Arrow']='Strijela';
+$lang['ArrowAverage']='Prosjek strijela';
 $lang['Athlete']='Natjecatelj';
 $lang['Athletes']='Natjectelji';
 $lang['Back']='Nazad';
@@ -123,6 +124,7 @@
 $lang['IndFinEventWithoutShootOff']='Pažnja! <br> sljedeći serije moraju riješiti veze prije prikaza!';
 $lang['IndImport']='Uvezi podatke u pojedinačne češljeve';
 $lang['Individual']='Pojedinačno';
+$lang['InitFinalGrids']='Inicijalizirati pojedinačne češljeve';
 $lang['JF']='Junior žene';
 $lang['JM']='Junior mouškarci';
 $lang['jrMultiChoice']='$a (Multi Opcije)';
@@ -130,6 +132,7 @@
 $lang['jrTextArea']='Površina teksta ($a[1] $ redaka x $a[0] stupaca)';
 $lang['jrTextBox']='Tekstualni okvir, max $a znakova';
 $lang['jrYesNo']='Da / Ne';
+$lang['JudgeNotes']='Komentari sudaca';
 $lang['LB']='Dugi Luk';
 $lang['LiveOff']='Ukloni Live flag';
 $lang['LiveOn']='Podesi Live flag';
@@ -194,6 +197,7 @@
 $lang['MenuLM_DeleteTarget']='Brisanje dodjeljenih meta';
 $lang['MenuLM_Distances']='Uredi udaljenosti';
 $lang['MenuLM_Div/Class Result List']='Stil/Kat. Lista rezultata';
+$lang['MenuLM_Divisions and Classes']='Stilovi i kategorije';
 $lang['MenuLM_Draw']='Auto-raspored';
 $lang['MenuLM_Edit Competition Info']='Uredi info natjecanja';
 $lang['MenuLM_EditFinalReport']='Uredi finalni izvještaj';
@@ -203,6 +207,7 @@
 $lang['MenuLM_ExplodeIanseoFile']='Explode IANSEO file';
 $lang['MenuLM_Export']='Izvoz';
 $lang['MenuLM_Export ARF']='Izvoz ARF';
+$lang['MenuLM_Export BackNumbers']='Eksport pozadinskih brojeva';
 $lang['MenuLM_Export Results']='Izvoz rezultata';
 $lang['MenuLM_Export Text File']='Izvoz tekst datoteke';
 $lang['MenuLM_Export Tournament']='Izvoz turnira';
@@ -210,6 +215,7 @@
 $lang['MenuLM_Extended Table']='Proširena Tablica';
 $lang['MenuLM_ExtraCategories']='Standardni za dodatnu Kategoriju';
 $lang['MenuLM_Fees setup']='Postavljanje kotizacija';
+$lang['MenuLM_Field Crew']='Terenska ekipa';
 $lang['MenuLM_Final Field of Play Layout']='Izgled terena za finale';
 $lang['MenuLM_Final report']='Završni izvještaj';
 $lang['MenuLM_Final Rounds']='Finalne runde';
@@ -240,6 +246,8 @@
 $lang['MenuLM_LastShootoff']='Zadnji shoot-off';
 $lang['MenuLM_List (Simple)']='Popis (Jednostavan)';
 $lang['MenuLM_ListLoad']='Učitaj Popis (Uvoz proračunske tablice )';
+$lang['MenuLM_Lock manage']='Upravljanje kontrolama pristupa';
+$lang['MenuLM_Lock setup']='Postavke zaključavanja';
 $lang['MenuLM_LueFill']='Stvaranje pretraživanja iz datoteke';
 $lang['MenuLM_Manage Events']='Upravljanje serijama';
 $lang['MenuLM_ManageActiveSession']='Upravljanje aktivnim sesijama';
@@ -262,6 +270,7 @@
 $lang['MenuLM_Personal Rank']='Osobni poredak';
 $lang['MenuLM_Print Sign']='Ispis Prijava';
 $lang['MenuLM_PrintAwards']='Ispis nagrada';
+$lang['MenuLM_PrintBadges']='Ispis akreditacijskih kartica';
 $lang['MenuLM_PrintFinalReport']='Ispis Završnog izvješća';
 $lang['MenuLM_Printout']='Ispis';
 $lang['MenuLM_PrintScheduling']='Ispis rasporeda natjecanja';
@@ -270,6 +279,7 @@
 $lang['MenuLM_QrCodes']='Ispis QR kodova';
 $lang['MenuLM_Qualification']='Kvalifikacije';
 $lang['MenuLM_Qualification Field of Play Layout']='Raspored kvalifikacija';
+$lang['MenuLM_Qualification Round']='Kvalifikacijski krug';
 $lang['MenuLM_QuotaTournament']='turnir za kvotu';
 $lang['MenuLM_ResultQualIndOds']='Izvoz kvalifikacija (ODS)';
 $lang['MenuLM_ResultText']='Rezultati u Quark Xpress Oznakama';
@@ -330,8 +340,10 @@
 $lang['Month_8']='Ruj';
 $lang['Month_9']='Lis';
 $lang['MsgAreYouSure']='Jeste li sigurni?';
+$lang['MsgAttentionFinReset']='UPOZORENJE! <br> Ova operacija se NE MOŽE poništiti!!! <br> Svi unešeni rezultati pojedinačni i timski će biti izbrisani. <br> Ova operacija je obično potrebna ako je bilo grešaka u kvalifikacijama ili shoot-off proceduri . <br> Želite li nastaviti?';
 $lang['MsgImportError']='Pogreška! <br> ne mogu uvoziti podatke!';
 $lang['MsgImportOk']='Uvoz Dovršen!';
+$lang['MsgInitFinalGridsError']='Pogreška! <br> Brackets nisu prazni!';
 $lang['MsgInitFinalGridsOk']='Uspješno Pokretanje!';
 $lang['MsgMakeFinReset']='Završni Bracketsi Ponovno Inicijalizirani! <br> Ponovite sve prethodne operacije prije nego umetnete nove podatke!';
 $lang['MsgNeedInitGrids']='Pogreška! <br> Brackets nisu inicijalizirani!';
@@ -369,6 +381,7 @@
 $lang['RankingInd']='Eliminacije i završni krug - poredak pojedinaca';
 $lang['Rankings']='Poredak';
 $lang['RankingSq']='Eliminacije i završni krug - poredak timova';
+$lang['RankScoreShort']='Kval.';
 $lang['RB']='Zakrivljeni luk';
 $lang['Review']='Pregled';
 $lang['RevMainLang']='Glavni jezik';
diff --git a/src/Common/Languages/hr/HTT.php b/src/Common/Languages/hr/HTT.php
index 137609f1..6a49aa7d 100644
--- a/src/Common/Languages/hr/HTT.php
+++ b/src/Common/Languages/hr/HTT.php
@@ -9,6 +9,7 @@
 $lang['CmdReplace']='pisati preko';
 $lang['CmdTruncateHTTData']='Odreži privremenu tablicu';
 $lang['Country']='Država';
+$lang['DateTime']='Datum / vrijeme';
 $lang['Distance']='Udaljenost';
 $lang['Download']='Skupi podatke';
 $lang['EnableHHT']='Omogući HHT sustav';
diff --git a/src/Common/Languages/hr/IOC_Codes.php b/src/Common/Languages/hr/IOC_Codes.php
index f59e799d..2d1bf0e7 100644
--- a/src/Common/Languages/hr/IOC_Codes.php
+++ b/src/Common/Languages/hr/IOC_Codes.php
@@ -13,7 +13,10 @@
 $lang['AUS']='Australija';
 $lang['AUT']='Austrija';
 $lang['Award-Anthem']='Dame i gospodo, molimo vas da ustanete za nacionalnu himnu';
+$lang['Award-Applause']='Dame i gospodo, pozdravite srdačnim pljeskom naše sportaše';
+$lang['Award-Intro']='Dame i gospodo, podjela medalja za';
 $lang['Award-MedalGiver']='Medalje će dodijeliti $a';
+$lang['Award-PlaqueGiver']='Plakete će dodijeliti $a';
 $lang['Award-PremiumGiver']='$a[0] sat će dodijeliti $a[1]';
 $lang['Award-PremiumGiving']='$a[0] sat će dodijeliti $a[1]';
 $lang['Award-representing']='dobiva $a';
@@ -37,16 +40,13 @@
 $lang['BUL']='Bugarska';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Centralna Afrička Republika';
-$lang['CAM']='Kambodža';
 $lang['CAN']='Kanada';
 $lang['CAY']='Kajmanski Otoci';
 $lang['CGO']='Republika Kongo';
 $lang['CHA']='Čad';
 $lang['CHI']='Čile';
-$lang['CHN']='Kina';
 $lang['CIV']='Obala Bjelokosti';
 $lang['CMR']='Kamerun';
-$lang['COD']='Demokratska Republika Kongo';
 $lang['COK']='Kukovi Otoci';
 $lang['COL']='Kolumbija';
 $lang['COM']='Komori';
@@ -55,7 +55,6 @@
 $lang['CRO']='Hrvatska';
 $lang['CUB']='Kuba';
 $lang['CYP']='Cipar';
-$lang['CZE']='Republika Češka';
 $lang['DEN']='Danska';
 $lang['DJI']='Đibuti';
 $lang['DMA']='Dominika';
@@ -86,17 +85,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Gvajana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Mađarska';
 $lang['INA']='Indonezija';
 $lang['IND']='Indija';
-$lang['IRI']='Iran';
 $lang['IRL']='Irska';
 $lang['IRQ']='Irak';
 $lang['ISL']='Island';
 $lang['ISR']='Izrael';
-$lang['ISV']='Američki Djevičanski Otoci';
 $lang['ITA']='Italija';
 $lang['IVB']='Britanski Djevičanski Otoci';
 $lang['JAM']='Jamajka';
@@ -106,9 +102,9 @@
 $lang['KEN']='Kenija';
 $lang['KGZ']='Kirgistan';
 $lang['KIR']='Kiribati';
+$lang['KOR']='Južna Koreja';
 $lang['KSA']='Saudijska Arabija';
 $lang['KUW']='Kuvajt';
-$lang['LAO']='Laos';
 $lang['LAT']='Latvija';
 $lang['LBA']='Libija';
 $lang['LBR']='Liberija';
@@ -122,7 +118,6 @@
 $lang['MAR']='Maroko';
 $lang['MAS']='Malezija';
 $lang['MAW']='Malavi';
-$lang['MDA']='Moldavija';
 $lang['MDV']='Maldivi';
 $lang['Medal-1']='Zlatnu medalju';
 $lang['Medal-2']='Srebrnu medalju';
@@ -158,7 +153,6 @@
 $lang['PNG']='Papua Nova Gvineja';
 $lang['POL']='Poljska';
 $lang['POR']='Portugal';
-$lang['PRK']='Severna Koreja';
 $lang['PUR']='Portoriko';
 $lang['QAT']='Katar';
 $lang['ROU']='Rumunjska';
@@ -183,17 +177,17 @@
 $lang['SUR']='Surinam';
 $lang['SVK']='Slovačka';
 $lang['SWE']='Švedska';
-$lang['SYR']='Sirija';
+$lang['SWZ']='Svaziland';
 $lang['TAN']='Tanzanija';
 $lang['TGA']='Tonga';
 $lang['THA']='Tajland';
 $lang['TJK']='Tadžikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Istočni Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Kineski Taipei';
 $lang['TRI']='Trinidad i Tobago';
 $lang['TUN']='Tunis';
+$lang['TUR']='Turska';
 $lang['TUV']='Tuvalu';
 $lang['UAE']='Ujedinjeni Arapski Emirati';
 $lang['UGA']='Uganda';
diff --git a/src/Common/Languages/hr/Install.php b/src/Common/Languages/hr/Install.php
index 2962ebf4..2df33509 100644
--- a/src/Common/Languages/hr/Install.php
+++ b/src/Common/Languages/hr/Install.php
@@ -6,8 +6,11 @@
 $lang['Credits-Coordination']='IT koordinacija projekta';
 $lang['Credits-CoreGroup']='IANSEO Core Group';
 $lang['Credits-Credits']='Credits';
+$lang['Credits-Documentation']='Dokumentacija i Podrška';
+$lang['Credits-FitarcoCredits']='Što je Ianseo? Ianseo je softver za upravljanje rezultatima streličarskih turnira, to je open source projekt razvijen zahvaljujući financijskoj potpori talijanske Streličarskke Federacije, koja ga je odlučila slobodno distribuirati u cijeloj Europi. Prevedeni na više jezika, Ianseo je najažurnije i naprednije u svijetu integrao sva FITA pravila, ali je evoluirala uključiti sveobuhvatno upravljanje Streličarskim turnirima u cjelini: od akreditacije natjecatelja i časnika za svaku vrstu ispisa , alata, mreže i on-line integracije FOP dizajn.';
 $lang['Credits-HHT']='HHT integracija';
 $lang['Credits-IanseoTeam']='Ianseo & Ianseo Team';
+$lang['Credits-IanseoWorld']='I.A.N.S.E.O. je ujedno i najveći stručnjak Radne skupine za Streličarska natjecanja za upravljanje i organizaciju. Prva iskustva komponente skupine natrag u devedesetima, ali u ove najnovije godina (grupa je postojeći kao momčad od 2006) Ianseo tim je sve više i više su uključeni u mnoge od najvećih događaja u svijetu: olimpijski igre, Svjetska prvenstva, Europska prvenstva, Grand Prix, svjetske igre, Universiade, Sveučilištna prvenstva, Svjetski streličarski festival i nekoliko talijanskih nacionalnih događanja. To je službeni rezultat tima za Fitarco (talijanske Streličarskim Federacija), EMAU (europskih i mediteranskih Streličarskim unije) i nekoliko FITA (Federation Internationale de Tir l\'Arc) događanja.';
 $lang['Credits-License']='IANSEO je objavljen pod GNU OPĆA JAVNA LICENCA verzija 3 (GPLV3)';
 $lang['Credits-Translators']='IANSEO Translation Team';
 $lang['Database name']='ime baze podataka';
@@ -20,6 +23,7 @@
 $lang['Failing install']='Molimo ažurirajte PHP instalacije prije ponovnog pokretanja IANSEO.';
 $lang['File permission error']='Morate provjeriti dozvole na direktorij IANSEO instalacije:
 treba biti omogućeno pisanje od strane korisnika koji izvodi poslužitelj ili world-writable.';
+$lang['FreeOnlineResults']='<b>Besplatni online pubblishing:</b> s osnovnom internetskom vezom možete pokazati svijetu ono što se događa za vrijeme natjecanja. To je besplatno, pa zašto čekati? Nakon kreiranja natjecanja, potraži kod putem točki izbornika «{$a}».';
 $lang['Host']='Domaćin (Host)';
 $lang['Install-0']='kritična pogreška';
 $lang['Install-1 Title']='PHP checking';
@@ -105,15 +109,23 @@
 $lang['SetUkJunNationals']='Juniorsko nacionalno prvenstvo';
 $lang['SetUkNationals']='Nacionalno prvenstvo';
 $lang['Setup-ARLEF']='LEF Pravila';
+$lang['Setup-CH']='Švicarska pravila';
+$lang['Setup-Default']='Međunarodni turnir (FITA pravila)';
+$lang['Setup-IT']='Local italian tournament (Fitarco rules)';
+$lang['Setup-NFAA']='Las Vegas Rules';
+$lang['Setup-NL']='Nizozemski turnir';
 $lang['Setup-NO']='Norwegian tournament (Norges Bueskytterforbund rules)';
 $lang['Setup-PAR']='Paralimpic turnir (IPC pravila)';
+$lang['Setup-SE']='Švedski turnir';
 $lang['Setup-Select']='Odaberite odgovarajuća lokalna pravila';
+$lang['Setup-UK']='UK rules';
 $lang['SetVegas-KOA']='Kings of Archery - NED';
 $lang['SetVegas-WAF']='World Archery Festival - Las Vegas';
 $lang['SpecialUpdate']='Imate "testnu" Instalaciju <br/> samo odabrani korisnici mogu imati ovu značajku:.. Molimo navedite e-mail s kojeg ste prijavljeni s <br/> obavijest će biti poslana i na vas i Ianseo stožer.';
 $lang['Start Ianseo']='idi na IANSEO!';
 $lang['Status']='Status';
 $lang['stdValue']='Vrijednost';
+$lang['Suboptimal']='Iako php.ini datoteka nije postavljena s optimalnim vrijednostima, <br/> IANSEO treba raditi ispravno za većinu njegovih funkcija. <br/> Preporučujemo vam da postavite parametre za optimalnu vrijednost.';
 $lang['System value']='sustav vrijednosti';
 $lang['UpdatePrepared']='Vaša instalacija će se automatski ažurirati. Imajte na umu da bi backup svih turnira prije početka.Postupak ažuriranja može potrajati dugo, ovisno o vezi i elementima koje je potrebno nadograditi. <br/> Imajte na umu da bilo koji izvorne datoteke će se ukloniti, osim sadržaja «modules / Custom» mape.';
 $lang['Updating']='Ažuriranje lokalne instalacije Ianseo';
@@ -123,6 +135,7 @@
 $lang['Value']='Vrijednost (indeksiranih polja predmeta: key1:: vrijednost1 | key2:: vrijednost2)';
 $lang['WhatIanseoDoes01']='<b>u skladu sa WA pravilima:</b> Ianseo je uvijek u toku sa WA pravilima.  Developeri su dostupni za prilagodbe kako bi odgovarao nacionalnim i natjecanjima sa posebnim pravilima!';
 $lang['WhatIanseoDoes02']='<b> Pomoć i podrška:</b> ako vam je potrebna pomoć, pošaljite e-mail na $a: dobit ćete odgovor direktno od Ianseo core developera!';
+$lang['WhatIanseoDoes03']='<b>On site obuke i tečajevi:</b> Ianseo je može organizirati upravljanje tečajevima lokaciji. Dvije razine: bez i sa elektronskim uređajima. Prvi cilj je upoznati sve aspekte ianseo od pripreme natjecanja i rasporeda do online objave i lokalne distribucije rezultata. Drugi je usmjeren na stjecanje specifičnih znanja za pokretanje "arrow by arrow" natjecanja.';
 $lang['WhatIanseoDoes04']='<b> Donirajte! </b> Ianseo je besplatan i open source ... ako vam se sviđa, molimo da nam pomognete u održavanju softvera i poslužitelja ažurnim:pritisnite "donirati" gumb na početnoj stranici $a!';
 $lang['WhatIanseoDoes05']='<b> Društveni mediji: </b> Ianseo je također na $a!';
 $lang['WhatIanseoDoesTitle']='Što Ianseo može napraviti za vaše natjecanje';
diff --git a/src/Common/Languages/hr/Tournament.php b/src/Common/Languages/hr/Tournament.php
index 54904a97..8ce4ae80 100644
--- a/src/Common/Languages/hr/Tournament.php
+++ b/src/Common/Languages/hr/Tournament.php
@@ -64,7 +64,6 @@
 $lang['BadgeIncludePhoto']='uključi fotografije u akreditacijskoj kartici?';
 $lang['BadgeNames']='Puno ime (ne printa se prvo)';
 $lang['BadgeNoData']='Nema podataka za ispis';
-$lang['BadgeOnlyNotPrinted']='SAMO akreditacijske kartice koje već nisu ispisane?';
 $lang['BadgeOnlyPrintAccredited']='SAMO akreditacijske kartice akredititranih sudionika?';
 $lang['BadgeOnlyPrintPhoto']='SAMO akreditacijske kartice sa slikom?';
 $lang['BadgeOptions']='Opcije';
@@ -77,6 +76,7 @@
 $lang['BadParams']='Neispravni parametri!';
 $lang['Barcode']='Jedna dimenzija ID barkodova';
 $lang['BarcodeMissing']='Ispis bar kodova koji nedostaju';
+$lang['BF_Phase']='Meč za 3. mjesto';
 $lang['BigNames']='ispis na cijeloj stranici';
 $lang['Bill']='Naplata';
 $lang['BillAndCash']='Ukupno za naplatu';
@@ -114,12 +114,10 @@
 $lang['CancelAcc']='otkaži akreditaciju';
 $lang['CannotDelete']='Ovaj predmet se ne može izbrisati';
 $lang['Cash']='Ukupno za naplatu';
-$lang['CatDos']='Direktor turnira';
-$lang['CatJudge']='Sudci';
-$lang['CatJury']='Vijeće za žalbe';
+$lang['CatDos']='Direktor turnira (DOS)';
+$lang['CatJudge']='Suci';
+$lang['CatJury']='Žiri za žalbe';
 $lang['CatOC']='Organizacijski odbor';
-$lang['ChairmanJudge']='Glavni sudac';
-$lang['ChairmanJury']='presjedavajući vijeća za žalbe';
 $lang['ChangeNationsNames']='Promjena naziva nacije';
 $lang['CheckRefMail']='Provjerite Referentni E-Mail ...';
 $lang['CheckScorecards']='Provjera rezultatskih kartica';
@@ -145,6 +143,7 @@
 $lang['Collation']='Uspoređivanje';
 $lang['Color']='Boja';
 $lang['ComparedTo']='Usporedite w / POS. @ strijele (-1: najnovije dostupne)';
+$lang['CompetitionOfficials']='Službe natjecanja';
 $lang['CompleteSchedule']='kompletan raspored';
 $lang['Confirm']='Potvrdi';
 $lang['ConfirmDescr']='OVO ĆE UNIŠTITI PRETHODNE DODJELE I NE MOŽE SE PONIŠTITI!';
@@ -157,7 +156,7 @@
 $lang['CreateFiles']='Izrada datoteke';
 $lang['Credited']='Akreditiran';
 $lang['CtrlCodeShort']='Ctrl. kod';
-$lang['Currency']='Kn';
+$lang['Currency']='€';
 $lang['DailySchedule']='Dnevni raspored';
 $lang['DATABASE NOT REACHABLE']='ONLINE BAZA PODATAKA NIJE DOSTUPNA';
 $lang['Date']='Datum';
@@ -178,7 +177,7 @@
 $lang['Divisions']='Stilovi';
 $lang['DOB']='Datum rođenja';
 $lang['Dos']='Direktor pucanja';
-$lang['DoubleSpace']='Samostrijel';
+$lang['DoubleSpace']='Samostrel';
 $lang['DuplicateEntry']='Dupli unos';
 $lang['E-Session']='Eliminacije';
 $lang['Edit']='Uredi';
@@ -288,7 +287,7 @@
 $lang['IOCcode']='IOC Nacionalni kod';
 $lang['IsParamWarning']='Infosystem Setup! <br/> Koristi se s velikim oprezom!';
 $lang['Judge']='Sudac';
-$lang['Jury']='Član vijeća za žalbe';
+$lang['Jury']='Član žirija za žalbe';
 $lang['Last']='Zadnji';
 $lang['LastPhase']='Zadnja faza';
 $lang['LegendSO']='Shoot Off i bacanje novčića skraćeno';
@@ -342,6 +341,11 @@
 $lang['ManualTargetAssignment']='Ručna dodjela meta';
 $lang['Match']='Natjecanje';
 $lang['MatchMins']='Duljina natjecanja (min.)';
+$lang['MatchName-0']='Finale';
+$lang['MatchName-1']='Meč za 3. mjesto';
+$lang['MatchName-16']='Osmina finala';
+$lang['MatchName-2']='Polufinale';
+$lang['MatchName-4']='Četvrtfinale';
 $lang['MatchPoints']='Match bodovi';
 $lang['MatchScore']='Match rezultat';
 $lang['MatchScoreSheets']='Bodovne liste natjecanja';
@@ -397,6 +401,7 @@
 $lang['OnlyWithoutPhoto']='Prikaži samo one bez fotografija';
 $lang['OpDelete']='Zatražena Operacija: Brisanje';
 $lang['Opponent']='Protivnik';
+$lang['Opponents']='Protivnik';
 $lang['Option1']='Opcija 1';
 $lang['Option2']='Opcija 2';
 $lang['Option3']='Opcija 3';
@@ -410,7 +415,7 @@
 $lang['OrisTeamList']='Oris Team Lista';
 $lang['OtherTourCategory']='Ostali';
 $lang['OutdoorTourCategory']='Outdoor natjecanje';
-$lang['OverwritePreviousArchers']='prebrisati predhodne streličare';
+$lang['OverwritePreviousArchers']='prebrisati prethodne streličare';
 $lang['OvrRefresh']='Osvježi stranicu (bez slanja)';
 $lang['OvrSendSerial']='Poslati na OVR (serijski)';
 $lang['PaperSize']='Veličina papira';
@@ -422,12 +427,12 @@
 $lang['Pay']='platiti';
 $lang['PersonalRank']='Osobni Ranking';
 $lang['PersonList']='Popis Ljudi';
-$lang['PhaseBlock_0']='Osobe turnira';
+$lang['PhaseBlock_0']='Službe natjecanja';
 $lang['PhaseBlock_1']='Kvalifikacije';
 $lang['PhaseBlock_10']='Flight postavljanje';
 $lang['PhaseBlock_2']='Eliminacije';
 $lang['PhaseBlock_3']='Individualno  finale';
-$lang['PhaseBlock_4']='Team Finale';
+$lang['PhaseBlock_4']='Ekipno finale';
 $lang['PhaseBlock_5']='Završni izvještaj';
 $lang['PhaseBlock_6']='Info natjecanja';
 $lang['PhaseBlock_7']='izmjene Media';
@@ -460,10 +465,11 @@
 $lang['PrintList']='Liste za ispis';
 $lang['PrintNames']='Ispis imena';
 $lang['PrintNormal']='Normal (Latin)';
-$lang['PrintScore']='Ispis Rezultata';
+$lang['PrintScore']='Ispis zapisnika';
 $lang['PrintText']='Tekst zaglavlja';
 $lang['PrintTextTitle']='Zaglavlje ispisa rezultata';
 $lang['Q-Session']='Kvalifikacije';
+$lang['QF_Phase']='Četvrtfinale';
 $lang['QrCode']='Qr Code sa detaljima streličara';
 $lang['QualSessionShort']='Kval. serija';
 $lang['RankByDistance']='Rangiranja po udaljenosti';
@@ -493,7 +499,7 @@
 $lang['ResultIndClassSnap']='Kratki pregled Rezultat Lista Kategorija i stilova - Individualna';
 $lang['ResultIndSubClass']='Flight rezultati';
 $lang['Results']='Rezultati';
-$lang['ResultSqAbs']='Krug kvalifikacija - Team';
+$lang['ResultSqAbs']='Kvalifikacije - ekipno';
 $lang['ResultSqClass']='Lista rezultata po kategorijama i stilovima - timovi';
 $lang['Round']='Runda';
 $lang['Round#']='Runda $a';
@@ -511,11 +517,11 @@
 $lang['SchIncFinalists']='uključujući imena finalista';
 $lang['Score']='Rezultat';
 $lang['Score1PageAllDist']='Bodovanja natjecatelja sa svim udaljenostima na jednoj stranici';
-$lang['ScoreBarcode']='Ispis Bar Koda na rezultatatske liste';
-$lang['ScorecardsElim']='eliminacijske rezultatatske liste';
-$lang['ScorecardsInd']='individualni mečevi rezultatatske liste';
-$lang['ScorecardsQual']='kvalifikacijske rezultatatske liste';
-$lang['ScorecardsTeams']='timovi rezultatatske liste';
+$lang['ScoreBarcode']='Ispis Bar Koda na zapisnike';
+$lang['ScorecardsElim']='Zapisnik za eliminacije';
+$lang['ScorecardsInd']='Zapisnici za pojedinačne mečeve';
+$lang['ScorecardsQual']='Zapisnici za kvalifikacije';
+$lang['ScorecardsTeams']='Zapisnici za ekipne mečeve';
 $lang['ScoreCollector']='Strijela za strijelu sakupljanje, odabrati strijele po završetku';
 $lang['ScoreComplete']='Kompletan rezultat (crtež i podaci)';
 $lang['ScoreCompleteTotals']='Kompletan rezultat (crtež i podaci) + Stupac za natjecanje kumulativni zbrojevi';
@@ -551,9 +557,10 @@
 $lang['SetByUser']='Postavi od strane korisnika';
 $lang['SetCredentials']='Postavljanje on-line kodova';
 $lang['SetFilter']='Postavite filtere';
-$lang['SetPoints']='Postavi točke';
-$lang['SetTotal']='Postavi ukupno';
+$lang['SetPoints']='Bodovi (set)';
+$lang['SetTotal']='Zbroj';
 $lang['Sex']='Spol';
+$lang['SF_Phase']='Polufinale';
 $lang['ShootOffArrows']='Shoot Off strijele';
 $lang['ShortFemale']='W';
 $lang['ShortMale']='M';
@@ -575,10 +582,13 @@
 $lang['StartList']='startna lista';
 $lang['StartlistAlfabetical']='Sudionici u abecednom redu';
 $lang['StartlistAlpha']='Popis sudionika po abecednom redu';
+$lang['StartListbyTarget']='Startna lista po metama';
 $lang['StartlistCategory']='lista natjecatelja po kategoriji';
 $lang['StartlistCountry']='Popis sudionika grupirano prema državama';
 $lang['StartlistCountryOnlyAthletes']='Lista natjecatelja grupirana po državama';
+$lang['StartlistEachCategory']='Startna lista po kategorijama (jedna po stranici)';
 $lang['StartlistEachCountry']='Popis sudionika grupirano prema državama(jedna po stranici)';
+$lang['StartlistEachCountryExtra']='Startna lista po državama (jedna po stranici)';
 $lang['StartlistSession']='Popis sudionika po meti';
 $lang['StartlistSessionNoEmpty']='- Bez praznih meta -';
 $lang['StartlistSessionPicture']='Popis sudionika sortirane po meti sa slikom';
@@ -649,7 +659,6 @@
 $lang['TeamCreationMode_2']='Uvijek 2. Team';
 $lang['TeamCreationMode_3']='Uvijek 3. Team';
 $lang['TeamFin']='Team - Elim. & Final Round';
-$lang['TeamFinEvent']='Team Final';
 $lang['TeamPlace']='Znakovi mjesta za timove';
 $lang['TeamPlaceLocal']='Znakovi mjesta za timove (lokalizirani)';
 $lang['TeamQual']='Team - Qual. Round';
@@ -669,8 +678,9 @@
 $lang['TooManyElimSO']='Bilo je previše neriješenih strelica!';
 $lang['Total1']='Ukupno (1. poluvrijeme)';
 $lang['Total2']='Ukupno (2. poluvrijeme)';
+$lang['TotalPoints']='Bodovi ukupno';
 $lang['TotalProg']='Zbir';
-$lang['TotalShort']='Tot.';
+$lang['TotalShort']='Ukupno';
 $lang['TourBusy']='POZOR! \ n \ n Vi ste o uvezli turnir dok je drugi turnir pokrenut! \ N potvrdite da li je to ono što želite učiniti?';
 $lang['TourCategory']='Kategorija turnira';
 $lang['TourCode']='Kod natjecanja';
diff --git a/src/Common/Languages/hr/translators.json b/src/Common/Languages/hr/translators.json
index 095cf401..955dd4ff 100644
--- a/src/Common/Languages/hr/translators.json
+++ b/src/Common/Languages/hr/translators.json
@@ -1 +1 @@
-{"lang":"Hrvatski - Croatian","peop":["Igor&nbsp;Sabljak"],"id":"hr"}
\ No newline at end of file
+{"lang":"Hrvatski - Croatian","peop":["Martin&nbsp;Oborovecki","Igor&nbsp;Sabljak"],"id":"hr"}
\ No newline at end of file
diff --git a/src/Common/Languages/hu/IOC_Codes.php b/src/Common/Languages/hu/IOC_Codes.php
index 49501829..fdc46b41 100644
--- a/src/Common/Languages/hu/IOC_Codes.php
+++ b/src/Common/Languages/hu/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='Amerikai Szamoa';
 $lang['AUS']='Ausztrália';
 $lang['AUT']='Ausztria';
-$lang['Award-Anthem']='Hölgyeim és Uraim, kérem álljanak fel a himnusz meghallgatásához';
-$lang['Award-Anthem-TPE']='Hölgyeim és Uraim, kérem álljanak fel a himnusz meghallgatásához';
 $lang['Award-Applause']='Hölgyeim és Uraim, kérem tapsolják meg a sportolókat';
 $lang['Award-Intro']='Hölgyeim és Urai, a {$a} kategória eredményhirdetése következik';
 $lang['Award-MedalGiver']='Az éremeket átadja $a';
@@ -42,16 +40,12 @@
 $lang['BUL']='Bulgária';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Közép-Afrikai Köztársaság';
-$lang['CAM']='Kambodzsa';
 $lang['CAN']='Kanada';
 $lang['CAY']='Kajmán Szigetek';
 $lang['CGO']='Kongói Köztársaság';
 $lang['CHA']='Csád';
 $lang['CHI']='Chile';
-$lang['CHN']='Kína';
-$lang['CIV']='Elefántcsontpart';
 $lang['CMR']='Kamerun';
-$lang['COD']='Kongói Demokratikus Köztársaság';
 $lang['COK']='Cook-szigetek';
 $lang['COL']='Kolumbia';
 $lang['COM']='Comore-szigetek';
@@ -60,7 +54,6 @@
 $lang['CRO']='Horvátország';
 $lang['CUB']='Kuba';
 $lang['CYP']='Ciprus';
-$lang['CZE']='Cseh Köztársaság';
 $lang['DEN']='Dánia';
 $lang['DJI']='Dzsibuti';
 $lang['DMA']='Dominika';
@@ -91,17 +84,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Magyarország';
 $lang['INA']='Indonézia';
 $lang['IND']='India';
-$lang['IRI']='Irán';
 $lang['IRL']='Írország';
 $lang['IRQ']='Irak';
 $lang['ISL']='Izland';
 $lang['ISR']='Izrael';
-$lang['ISV']='US Virgin Islands';
 $lang['ITA']='Olaszország';
 $lang['IVB']='Brit Virgin Islands';
 $lang['JAM']='Jamaika';
@@ -114,7 +104,6 @@
 $lang['KOR']='Koreai Köztársaság';
 $lang['KSA']='Saudi Arabia';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laosz';
 $lang['LAT']='Lettország';
 $lang['LBA']='Líbia';
 $lang['LBR']='Liberia';
@@ -128,7 +117,6 @@
 $lang['MAR']='Marokkó';
 $lang['MAS']='Malajzia';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldova';
 $lang['MDV']='Maldív-szigetek';
 $lang['Medal-1']='Aranyérmes';
 $lang['Medal-2']='Ezüstérmes';
@@ -137,7 +125,6 @@
 $lang['MEX']='Mexikó';
 $lang['MGL']='Mongólia';
 $lang['MHL']='Marshall-szigetek';
-$lang['MKD']='Macedonia';
 $lang['MLI']='Mali';
 $lang['MLT']='Málta';
 $lang['MNE']='Montenegro';
@@ -166,7 +153,6 @@
 $lang['PNG']='Pápua Új-guinea';
 $lang['POL']='Lengyelország';
 $lang['POR']='Portugália';
-$lang['PRK']='Észak-Korea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Románia';
@@ -193,13 +179,11 @@
 $lang['SVK']='Szlovákia';
 $lang['SWE']='Svédország';
 $lang['SWZ']='Sváziföld';
-$lang['SYR']='Szíria';
 $lang['TAN']='Tanzánia';
 $lang['TGA']='Tonga';
 $lang['THA']='Thaiföld';
 $lang['TJK']='Tadzsikisztán';
 $lang['TKM']='Türkmenisztán';
-$lang['TLS']='Kelet-Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Kínai Taipei';
 $lang['TRI']='Trinidad és Tobago';
diff --git a/src/Common/Languages/hu/Install.php b/src/Common/Languages/hu/Install.php
index e4e2fa6f..ea8fe44c 100644
--- a/src/Common/Languages/hu/Install.php
+++ b/src/Common/Languages/hu/Install.php
@@ -58,7 +58,6 @@
 $lang['Parameter']='Paraméter';
 $lang['Password']='Jelszó';
 $lang['PHP settings']='PHP beállítások';
-$lang['PHP too old']='A PHP telepítésed túl régi! Az IANSEO futtatásához legalább PHP 5.0 szükséges.';
 $lang['PHP version']='PHP verzió';
 $lang['php.ini file']='php.ini fájl';
 $lang['Prepare']='Adatok előkészítése a frissítéshez';
diff --git a/src/Common/Languages/hu/Tournament.php b/src/Common/Languages/hu/Tournament.php
index 77ec6801..4ece5b2e 100644
--- a/src/Common/Languages/hu/Tournament.php
+++ b/src/Common/Languages/hu/Tournament.php
@@ -112,7 +112,6 @@
 $lang['BadgeIncludePhoto']='Legyen kép a belépőn?';
 $lang['BadgeNames']='Teljes név (Nem nyomtatódik először)';
 $lang['BadgeNoData']='Nincs nyomtatható adat';
-$lang['BadgeOnlyNotPrinted']='CSAK a még ki nem nyomtatott belépők';
 $lang['BadgeOnlyPrintAccredited']='CSAK az akkreditált versenyzők belépői';
 $lang['BadgeOnlyPrintPhoto']='CSAK a fényképes belépők';
 $lang['BadgeOptions']='Lehetőségek';
@@ -174,8 +173,6 @@
 $lang['CatJudge']='Bírók';
 $lang['CatJury']='Óvási testület';
 $lang['CatOC']='Szervezőbizottság';
-$lang['ChairmanJudge']='Vezetőbíró';
-$lang['ChairmanJury']='Óvási testület Elnöke';
 $lang['ChangeLookUpTable']='Lekérdezés módosítása';
 $lang['ChangeNationsNames']='Országnév módosítása';
 $lang['Channel']='Csatorna';
@@ -300,7 +297,6 @@
 $lang['EmailScorecardShort']='Bearólap összegzés';
 $lang['EmailsToSend']='Elküldésre váró emailek';
 $lang['EmailSuccessfull']='Email sikeresen elküldve $a címére';
-$lang['EnableAccess']='Szabályozás engedélyezése/tiltása';
 $lang['Ends']='Sorozat';
 $lang['EndUpdate']='Minden frissítés kész';
 $lang['Entries']='Nevezések';
@@ -889,7 +885,6 @@
 $lang['TeamCreationMode_2']='Mindoig 2. csapat';
 $lang['TeamCreationMode_3']='Mindig 3. csapat';
 $lang['TeamFin']='Csapat - Kieséses és döntő';
-$lang['TeamFinEvent']='Csapat döntő';
 $lang['TeamLoaded']='Csapatversenyek betöltve {$a} menetrendhez';
 $lang['TeamPlace']='Csapat beosztás (EN)';
 $lang['TeamPlaceLocal']='Csapat beosztás (magyarul)';
@@ -1143,7 +1138,6 @@
 $lang['UserDetails']='Felhasználó adatai';
 $lang['UserEnabled']='Engedélyezve';
 $lang['UserName']='Felhasználónév';
-$lang['UserPassword']='Jelszó';
 $lang['UseSubClasses']='Alkalmazd a specifikus al-korcsoportokra';
 $lang['ValidDivisions']='Engedélyezett kategóriák (ha mind, hagyd üresen)';
 $lang['VersionBracketsInd']='Egyéni fésű';
diff --git a/src/Common/Languages/id/Api.php b/src/Common/Languages/id/Api.php
index a8352a6e..83221bc1 100644
--- a/src/Common/Languages/id/Api.php
+++ b/src/Common/Languages/id/Api.php
@@ -16,17 +16,17 @@
 $lang['ConfirmGenerateZip']='Harap konfirmasi bahwa Anda membuat file ZIP dengan semua $a[0] untuk sesi $a[1]';
 $lang['Controller']='Pengontrol';
 $lang['DataRefresh']='Perbarui data';
-$lang['Desc-Let-1']='Rambahan sekarang diimpor';
-$lang['Desc-Let-2']='Panah Miss di rambahan / seri ini';
-$lang['Desc-Let-3']='Rambahan siap diimpor';
+$lang['Desc-Let-1']='Seri sekarang diimpor';
+$lang['Desc-Let-2']='Panah Miss di seri ini';
+$lang['Desc-Let-3']='Seri siap diimpor';
 $lang['Desc-Let-4']='Proses skoring sedang berjalan';
-$lang['Desc-Let-B']='Rambahan Sekarang Diimpor';
-$lang['Desc-Let-C']='Panah di Rambahan ini tidak ada';
+$lang['Desc-Let-B']='Seri Sekarang Diimpor';
+$lang['Desc-Let-C']='Panah di Seri ini tidak ada';
 $lang['Desc-Let-F']='Pertandingan selesai';
 $lang['Desc-Let-G']='Tempat Kosong';
-$lang['Desc-Let-O']='Panah di Rambahan Berbeda';
+$lang['Desc-Let-O']='Panah di Seri Berbeda';
 $lang['Desc-Let-R']='Panah di Sesi Berbeda';
-$lang['Desc-Let-Y']='Rambahan Siap untuk di Impor';
+$lang['Desc-Let-Y']='Seri Siap untuk di Impor';
 $lang['Desc-Let-Z']='Skoring sedang berlangsung';
 $lang['DevConnected']='Terhubung';
 $lang['DevDisconnected']='Terputus';
@@ -50,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='Status Koneksi';
 $lang['ISK-DeleteDevices']='Hapus Perangkat';
 $lang['ISK-DenyAccess']='Menolak Akses';
+$lang['ISK-Deprecated']='PENTING: Aplikasi "Ianseo Score Keeper" akan dihapus dari toko Android dan Apple dan tidak lagi didukung, sehingga akan dihapus dari Ianseo pada September 2024. Silakan beralih ke Aplikasi "Ianseo Score Keeper NG" yang baru.';
 $lang['ISK-DeviceAlive']='Online';
 $lang['ISK-DeviceBattery']='Batterai';
 $lang['ISK-DeviceEnabled']='Tersedia';
@@ -79,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='Kode Kompetisi Tidak Ada';
 $lang['ISK-Lite-QRCode']='Cetak QR Code untuk Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='URL Server (termasuk protokol dan port jika bukan 80)';
+$lang['ISK-Live-Deprecated']='PENTING: Aplikasi "Ianseo Score Keeper Live" tidak lagi didukung, sehingga akan dihapus dari Ianseo pada September 2024. Silakan beralih ke Aplikasi "Ianseo Score Keeper NG" yang baru.';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper LIVE';
 $lang['ISK-lockPortrait']='Kunci Perangkat dalam tampilan Portrait';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
@@ -140,12 +142,12 @@
 $lang['IskSpuriousScore-Device']='Perangkat $a[0] mengirim skor pada target $a[1] dari fase $a[2]';
 $lang['IskSpuriousScore-Distance']='Perangkat $a[0] sedang proses skoring di jarak $a[1]';
 $lang['IskSpuriousScore-Empty']='Perangkat $a[0] mendapat skor di tempat $a[1]';
-$lang['IskSpuriousScore-End']='Perangkat $a[0] melakukan skoring di rambahan $a[1';
+$lang['IskSpuriousScore-End']='Perangkat $a[0] melakukan skoring di rambahan $a[1]';
 $lang['IskSpuriousScore-Match']='Perangkat $a[0] melakukan skoring dalam pertandingan $a[1]';
 $lang['IskTargetTitle']='Target $a';
 $lang['IskUnknownDevice']='Perangkat tidak dikenal di target $a';
 $lang['LockAll']='Kunci semua sesi';
-$lang['LockToEnds']='Batasi skoring untuk rambahan berikut (tidak ada berarti skoring tidak dibatasi)';
+$lang['LockToEnds']='Batasi skoring untuk seri berikut (tidak ada berarti skoring tidak dibatasi)';
 $lang['ManageGroupTarget']='Managemen Grup dan Target';
 $lang['ManageLockedSessions']='Atur sesi yang terkunci';
 $lang['Masters']='Master';
@@ -158,7 +160,7 @@
 $lang['PartialImport']='Impor Otomatis secara Parsial';
 $lang['PartialImportAll']='Import semua';
 $lang['PopupStatusDistance']='Jarak: $a';
-$lang['PopupStatusEnd']='Rambahan: $a';
+$lang['PopupStatusEnd']='Seri: $a';
 $lang['PopupStatusEvent']='Event: $a';
 $lang['PopupStatusPhase']='Fase: $a';
 $lang['PopupStatusSession']='Sesi: $a';
@@ -183,7 +185,7 @@
 $lang['SelectedMove2Group']='Pindahkan perangkat ke grup';
 $lang['SelectedReNumber']='Mengulang penomoran perangkat dimulai dari';
 $lang['StatusTemporaryArrows']='Situasi Anak panah pada tabel sementara';
-$lang['StickyAlreadySet']='Rambahan yang ditandai sudah di-set pada sesi yang berbeda!';
+$lang['StickyAlreadySet']='Seri yang ditandai sudah di-set pada sesi yang berbeda!';
 $lang['TargetRequests-Printout']='Print Lembar QrCode Lembar Permintaan Target';
 $lang['TargetScoring-Printout']='Print Lembar QrCode Skoring Target';
 $lang['TempArrowsDelete']='HAPUS anak panah dari tabel sementara';
diff --git a/src/Common/Languages/id/BackNumbers.php b/src/Common/Languages/id/BackNumbers.php
index 3c967e90..fed34d7b 100644
--- a/src/Common/Languages/id/BackNumbers.php
+++ b/src/Common/Languages/id/BackNumbers.php
@@ -112,6 +112,7 @@
 $lang['GivCaps-FamCaps-ClubCaps']='NAMADIBERIKAN NAMAKELUARGA, NAMA NEGARA';
 $lang['GivenNameInitial']='Huruf pertama Nama Lengkap';
 $lang['Heigh']='Tinggi';
+$lang['HLayout']='Horizontal';
 $lang['HLine']='Garis Horizontal';
 $lang['I-Badge']='Nomor Atlet untuk pertandingan Individual';
 $lang['IdCardHor']='dalam lebar';
@@ -143,6 +144,8 @@
 $lang['OpenPictureScreen']='Buka Tampilan Sekunder';
 $lang['PageDimension']='Ukuran Kertas';
 $lang['PaperDimention']='Dimensi Kertas';
+$lang['PhaseFrom']='Dari Fase';
+$lang['PhaseTo']='Ke Fase';
 $lang['Picture']='Photo Atlet';
 $lang['Portrait']='Potret';
 $lang['PosX']='Posisi (X)';
@@ -163,6 +166,8 @@
 $lang['ResetBarcodeSeparator']='Reset Pemisah Barcode';
 $lang['RnkCardinalEN']='Tampilan Kardinal (1, 2, ..., 10)';
 $lang['RnkOrdinal']='Tampilan Ordinal (ke-1, ke-2, ..., ke-10) - ID';
+$lang['RnkRoman']='Angka Romawi (I, II, ... IV, ... CM)';
+$lang['S-Badge']='Sticker';
 $lang['Schedule']='Jadwal';
 $lang['Session']='Sesi Kualifikasi';
 $lang['SessionTarget']='Kode Sesi dan Target';
@@ -177,6 +182,7 @@
 $lang['ToRight']='Logo Kompetisi (Kanan)';
 $lang['TVViewIdCard']='Lihat Kartu ID';
 $lang['TVViewIdCardDescr']='Dalam tampilan pertandingan menarik 2 Kartu ID dari lawan alih-alih baris "standar"';
+$lang['VLayout']='Vertikal';
 $lang['Width']='Lebar';
 $lang['WRank']='Peringkat Dunia';
 $lang['WRankFields']='Jangan ditampilkan setalah posisi Peringkat Dunia (0: Tampilkan semua)';
diff --git a/src/Common/Languages/id/Boinx.php b/src/Common/Languages/id/Boinx.php
index 519a1991..eb40ac5b 100644
--- a/src/Common/Languages/id/Boinx.php
+++ b/src/Common/Languages/id/Boinx.php
@@ -19,13 +19,16 @@
 $lang['CssFlexArrows']='Blok Detail Panah - Umum';
 $lang['CssFlexArrowsDiv']='Div Panah Tunggal';
 $lang['CssFlexName']='Blok Nama dan Bendera - Umum';
-$lang['CssFlexSum']='Blok Rambahan Berjalan - Umum';
+$lang['CssFlexSum']='Blok Seri Berjalan - Umum';
 $lang['CssFlexTotal']='Blok Total Skor - Umum';
 $lang['CssImage']='Overlay Gambar';
+$lang['CssImage1']='Css untuk gambar 1';
+$lang['CssImage2']='Css untuk gambar 2';
+$lang['CssImage3']='Css untuk gambar 3';
 $lang['CssImageDiv']='Kotak Div dari gambar overlay';
 $lang['CssLeftFlexArrows']='Blok Detail Panah - Kiri';
 $lang['CssLeftFlexName']='Blok Nama dan Bendera - Kiri';
-$lang['CssLeftFlexSum']='Blok Rambahan Berjalan - Kiri';
+$lang['CssLeftFlexSum']='Blok Seri Berjalan - Kiri';
 $lang['CssLeftFlexTotal']='Blok Total Skor - Kiri';
 $lang['CssLeftLight']='Kotak Waktu - Kiri';
 $lang['CssLeftNames']='Panel Papan Skor - Kiri';
@@ -49,9 +52,10 @@
 $lang['CssPresentationEvent']='Presentasi Event - Umum';
 $lang['CssPresentationNames']='Presentasi Nama - Umum';
 $lang['CssRankCommon']='Sel Peringkat';
+$lang['CssReminder']='Jangan lupa untuk menyimpan perubahan anda!';
 $lang['CssRightFlexArrows']='Blok Detail Panah - Kanan';
 $lang['CssRightFlexName']='Blok Nama dan Bendera - Kanan';
-$lang['CssRightFlexSum']='Blok Rambahan Berjalan - Kanan';
+$lang['CssRightFlexSum']='Blok Seri Berjalan - Kanan';
 $lang['CssRightFlexTotal']='Blok Total Skor - Kanan';
 $lang['CssRightLight']='Kotak Waktu - Kanan';
 $lang['CssRightNames']='Panel Papan Skor - Kanan';
@@ -71,8 +75,12 @@
 $lang['CssSoSets']='Kotak SO - Set Sel';
 $lang['CssSoSetsCommon']='Set';
 $lang['CssSoSetTitle']='Heading - Set Judul';
-$lang['CssSumTitle']='Judul Rambahan Berjalan';
-$lang['CssSumTotal']='Nilai Rambahan Berjalan';
+$lang['CssSumTitle']='Judul Seri Berjalan';
+$lang['CssSumTotal']='Nilai Seri Berjalan';
+$lang['CssText1']='Css untuk teks 1';
+$lang['CssText2']='Css untuk teks 2';
+$lang['CssText3']='Css untuk teks 3';
+$lang['CssText4']='Css untuk teks 4';
 $lang['CssTitleCommon']='Judul Utama';
 $lang['CssVegasFreeTextRow']='Baris';
 $lang['CssVegasFreeTextText']='Teks';
diff --git a/src/Common/Languages/id/Common.php b/src/Common/Languages/id/Common.php
index fc49856c..e6876fb4 100644
--- a/src/Common/Languages/id/Common.php
+++ b/src/Common/Languages/id/Common.php
@@ -71,6 +71,7 @@
 $lang['CmdOk']='OK';
 $lang['CmdOn']='Hidup';
 $lang['CmdPostUpdate']='Setelah update';
+$lang['CmdRefresh']='Refresh';
 $lang['CmdSave']='Simpan';
 $lang['CmdSaveContinue']='Simpan & Lanjutkan';
 $lang['CmdSet2All']='Set ke Semua';
@@ -134,8 +135,8 @@
 $lang['Eliminations_0']='Tanpa Eliminasi';
 $lang['Eliminations_1']='Babak Eliminasi 1';
 $lang['Eliminations_2']='Babak Eliminasi 2';
-$lang['End (volee)']='Rambahan';
-$lang['EndAverage']='Rambahan Rata2';
+$lang['End (volee)']='Seri';
+$lang['EndAverage']='Seri Rata2';
 $lang['EndScore']='Jumlah';
 $lang['Error']='Error';
 $lang['ErrorIndTeamsRank']='Terjadi kesalahan saat menghitung ulang peringkat Individu dan Tim';
@@ -148,6 +149,10 @@
 $lang['Finish']='Selesai';
 $lang['FirstPhase']='Fase Pertama';
 $lang['FopSetup']='Tata Letak Lapangan Pertandingan';
+$lang['Gender0']='Laki-Laki';
+$lang['Gender1']='Perempuan';
+$lang['GenderShort0']='L';
+$lang['GenderShort1']='P';
 $lang['GF']='Perempuan Muda';
 $lang['GM']='Laki-Laki Muda';
 $lang['HELP']='BANTUAN!';
@@ -207,16 +212,19 @@
 $lang['MatchMode_0']='Akumulasi';
 $lang['MatchMode_1']='Sistem Set';
 $lang['MatchNo']='Pertandingan No.';
+$lang['MatchWinShot']='Tembakan Pemenang Pertandingan';
+$lang['MatchWinShotHelp']='[Jumlah tembakan pemenang pertandingan yang berhasil] - [Jumlah tembakan pemenang pertandingan yang gagal] %=Persentase keberhasilan ketika anak panah merupakan calon pemenang pertandingan';
 $lang['Medal']='Medali';
 $lang['MedalBronze']='Perunggu';
 $lang['MedalGold']='Emas';
 $lang['MedalList']='List Medali';
 $lang['MedalSilver']='Perak';
-$lang['MedalStanding']='Pemenang Medali';
+$lang['MedalStanding']='Perolehan Medali';
 $lang['MenuLMPrintedBadgesFlag']='Perbarui tanda "Akreditasi sudah di-print"';
 $lang['MenuLMRemoveNoShows']='Hapus No-Shows';
 $lang['MenuLM_Accreditation']='Akreditasi';
 $lang['MenuLM_Accreditation colors management']='Managemen Warna Akreditasi';
+$lang['MenuLM_AdvancedFeatures']='Fitur lanjutan';
 $lang['MenuLM_AdvLabels']='Printout Label Lanjutan';
 $lang['MenuLM_Archers on Targets']='Pemanah pada Target';
 $lang['MenuLM_Arr4Set']='Anak Panah per Set';
@@ -230,6 +238,7 @@
 $lang['MenuLM_Athlets fees status']='Status Pembayaran Atlet';
 $lang['MenuLM_Authentication']='Otentifikasi Pengguna';
 $lang['MenuLM_AutoCheckinSetup']='Setup Check-In Otomatis';
+$lang['MenuLM_Automator']='Pengotomasi';
 $lang['MenuLM_Back Number Printout']='Printout Nomor Punggung';
 $lang['MenuLM_Boinx']='Setup Boinx Layer';
 $lang['MenuLM_BoinxMeteo']='Data Boinx Meteo Layer';
@@ -240,9 +249,11 @@
 $lang['MenuLM_Category Result List']='Daftar Hasil Kategori';
 $lang['MenuLM_Change Components']='Ubah Komponen';
 $lang['MenuLM_ChangeNationsNames']='Ubah Nama Negara';
+$lang['MenuLM_ChangePassword']='Ubah Password';
 $lang['MenuLM_Check Data Update']='Periksa Update Data';
 $lang['MenuLM_Check shoot-off before eliminations']='Periksa shoot-off sebelum eliminasi';
 $lang['MenuLM_Check shoot-off before final phases']='Periksa shoot-off sebelum fase Final';
+$lang['MenuLM_Check shoot-off before Rank']='Periksa hasil shoot-off sebelum mencetak peringkat';
 $lang['MenuLM_CheckAwards']='Periksa Penerjemahan Penghargaan';
 $lang['MenuLM_CheckList']='Cheklist Print';
 $lang['MenuLM_CIS']='CIS';
@@ -296,6 +307,7 @@
 $lang['MenuLM_FinalFOPChoose']='Final FOP Diperluas';
 $lang['MenuLM_FlightsAwardManagement']='Managemen Penghargaan Kloter';
 $lang['MenuLM_FlightsManagement']='Managemen Kloter';
+$lang['MenuLM_FontManagement']='Management Huruf';
 $lang['MenuLM_GateControl']='Panel Kontrol Gerbang Akses';
 $lang['MenuLM_GateSituation']='Situasi Gerbang';
 $lang['MenuLM_Get Info']='Dapatkan info';
@@ -338,6 +350,7 @@
 $lang['MenuLM_Modules']='Modul';
 $lang['MenuLM_MoveSession']='Mengubah Sesi yang  telah Ditentukan';
 $lang['MenuLM_MoveTarget']='Memindahkan Target yang telah ditentukan';
+$lang['MenuLM_N62']='Informasi N62A/B ORIS';
 $lang['MenuLM_New']='Baru';
 $lang['MenuLM_NewBacknumbers']='Nomor Atlet';
 $lang['MenuLM_OdsExport']='Expor SpredSheet (.ods)';
@@ -410,7 +423,7 @@
 $lang['MenuLM_Team Final Setup']='Setup Final Beregu';
 $lang['MenuLM_Team Finals']='Tim Final';
 $lang['MenuLM_Team Spot']='Tempat Tim';
-$lang['MenuLM_Training']='Jadwal Pemanasan';
+$lang['MenuLM_Training']='Jadwal Percobaan';
 $lang['MenuLM_TV Channels']='Saluran TV Output';
 $lang['MenuLM_TV Output']='TV Output';
 $lang['MenuLM_TVAdvanced']='TV Output (tingkat lanjut)';
@@ -442,6 +455,7 @@
 $lang['MsgImportOk']='Impor Selesai!';
 $lang['MsgInitFinalGridsError']='Peringatan: Braket sudah diinisialisasi untuk event ini. Apakah Anda ingin melanjutkan?';
 $lang['MsgInitFinalGridsOk']='Inisialisasi Berhasil!';
+$lang['MsgInitFinalGridsRunningError']='Operasi tidak diizinkan ketika Event sedang dalam Mode Running';
 $lang['MsgMakeFinReset']='Braket Final Diinisialisasi Ulang!<br>Ulangi semua operasi pendahuluan sebelum memasukkan data baru!';
 $lang['MsgNeedInitGrids']='Error!<br>Braket tidak diinisialisasi!';
 $lang['MsgNeedShootOff']='Error!<br>Pertama, Anda harus memeriksa shoot-off!';
@@ -498,6 +512,7 @@
 $lang['Score1Page1Match']='Skor untuk pertandingan tunggal';
 $lang['ScoreDrawing']='Hanya Drawing (Halaman Tunggal)';
 $lang['ScoreFilled']='Cetak Kartu Skor terisi dengan semua nilai dari anak panah tunggal';
+$lang['ScoreIncAllNames']='Sertakan semua kemungkinan Lawan';
 $lang['ScoreIncEmpty']='Cetak pertandingan meskipun jika tanpa lawan';
 $lang['Scorer']='Scorer';
 $lang['SearchOrphanTexts']='Cari Text Orphan';
@@ -506,9 +521,12 @@
 $lang['SelectAll']='Pilih Semua';
 $lang['SelTour']='Kompetisi Terpilih';
 $lang['Session']='Sesi';
+$lang['SetWinShot']='Tetapkan Tembakan Pemenang';
+$lang['SetWinShotHelp']='[Jumlah tembakan pemenang set yang berhasil] - [Jumlah tembakan pemenang set yang gagal] %=Persentase keberhasilan ketika anak panah berpotensi menjadi pemenang set';
 $lang['SF']='Wanita Senior';
 $lang['ShootOff4Elim']='Periksa shoot-off sebelum eliminasi';
 $lang['ShootOff4Final']='Periksa shoot-off sebelum fase Final';
+$lang['ShootOff4Rank']='Periksa hasil shoot-off sebelum mencetak peringkat';
 $lang['SM']='Pria Senior';
 $lang['SnapshotConf']='Konfigurasi Snapshot';
 $lang['SortBy']='Sortir berdasarkan';
@@ -550,12 +568,15 @@
 $lang['Total']='Total';
 $lang['TotaleScore']='Total';
 $lang['Trg3DComplete']='3D standard';
+$lang['Trg3DReddingEnd']='3D Redding';
 $lang['TrgCOIndComplete']='Indoor (1-10 kecil)';
 $lang['TrgCOIndSmall']='Indoor (6-10 kecil)';
 $lang['TrgCOOutdoor']='Outdoor (5-X)';
 $lang['TrgCOOutdoorSmall']='Outdoor (6-X)';
 $lang['TrgField']='Field Archery';
 $lang['TrgForestSwe']='Hutan (SWE)';
+$lang['TrgFrBeursault']='Beursault';
+$lang['TrgFrBouquet']='Bouquet';
 $lang['TrgHMOutComplete']='Hit-Miss';
 $lang['TrgHunterNor']='Hunter (Norwegia)';
 $lang['TrgImperial']='Target Imperial (1-9)';
diff --git a/src/Common/Languages/id/Errors.php b/src/Common/Languages/id/Errors.php
index 8b6cf6d6..027f00f1 100644
--- a/src/Common/Languages/id/Errors.php
+++ b/src/Common/Languages/id/Errors.php
@@ -2,11 +2,14 @@
 $lang['AllFieldsMandatory']='Semua isian wajib disi';
 $lang['AllMailsRedirect']='Semua pesan akan dikirim ke';
 $lang['Anomalies']='Anomali';
+$lang['BackupTournaments']='Mohon diingat untuk menyimpan semua kompetisimu sebelum memperbarui atau install ulang ianseo!';
 $lang['BarCodeSession']='Terdapat error pada settingan: coba setting satu sesi!';
 $lang['BarCodeSettings']='Terdapat error pada settingan';
+$lang['CategoresNotDefined']='Definisi Kategori Hilang';
 $lang['ClassFromToError']='Dari dan Ke harus dalam nilai numerik';
 $lang['ClubNotFound']='Kode Klub tidak ditemukan di klub yang ada. Harap perbarui database terlebih dahulu!';
 $lang['ConflictingCategories']='Definisi filter tumpang tindih dengan filter sebelumnya untuk kategori ini: $a!';
+$lang['DecodeError']='Error Decode';
 $lang['DiameterMandatory']='Diameter Target Face wajib diisi';
 $lang['DirectoryNotWriteable']='Direktori $a tidak dapat ditulisi oleh server web. Harap ubah izinnya agar dapat ditulisi oleh siapa pun.';
 $lang['DistanceOutRange']='Jarak di luar jangkauan';
@@ -15,6 +18,9 @@
 $lang['EmptyFrom']='Email Kosong: isian ini wajib diisi';
 $lang['EmptySubject']='Subjek Kosong: isian ini wajib diisi';
 $lang['EmptyTitle']='Judul Kosong: isian ini wajib diisi';
+$lang['EndsArrowsMisMatch']='$a dengan pengaturan Seri/Panah yang salah';
+$lang['EntriesNoCategory']='Inputan tanpa Kategori';
+$lang['EntriesNoCountry']='Inputan tanpa Negara/Club';
 $lang['ErrCodeExists']='Kode sudah ada!';
 $lang['ErrCommitteeError']='Kode Komite atau deskripsi tidak valid atau';
 $lang['ErrConnection']='Tidak ada koneksi ke server $a';
@@ -32,6 +38,7 @@
 $lang['ErrRedCard']='Panitia mendapat kartu merah dan tidak bisa meminta kompetisi diselenggarakan di ianseo. Hubungi code@ianseo.net untuk penjelasan lebih lanjut.';
 $lang['ErrUnknownNation']='Negara Tidak Dikenal';
 $lang['ErrYellowCard']='Panitia mendapatkan Kartu Kuning karena tidak ada hasil kompetisi yang diupload. Hubungi code@ianseo.net untuk penjelasan lebih lanjut.';
+$lang['EventIncompleteSetting']='$a dengan pengaturan kategori yang diizinkan hilang';
 $lang['FilterAlreadyExists']='Filter ini sudah ada';
 $lang['FilterNotEmpty']='Anda perlu untuk mendefinisikan filter';
 $lang['IllegalTarget']='Target Face terpilih tidak ada dalam DB';
@@ -39,7 +46,9 @@
 $lang['ImageFetchError']='Terjadi kesalahan saat mengambil Gambar';
 $lang['ImageSaveError']='Gambar tidak disimpan';
 $lang['IncompleteSettings']='Setting tidak komplit';
+$lang['InvalidCharacters']='Kolom isian mengandung karakter yang tidak valid. Karakter yang valid adalah $a';
 $lang['InvalidEmail']='Email Tidak Valid: harap periksa kembali email sebelum menyimpan';
+$lang['InvalidLogin']='Login tidak valid';
 $lang['LockedProcedure']='Prosedur ini TERKUNCI';
 $lang['MailingAlreadyExists']='Email dengan judul yang sama ({$a}) sudah ada, harap ubah judul atau pilih email yang akan diubah dari pemilih.';
 $lang['MailingDeleteText']='Harap konfirmasi bahwa Anda ingin menghapus surat ini secara permanen';
@@ -51,21 +60,34 @@
 $lang['MissingAccreditation']='Akreditasi online tidak ada';
 $lang['MissingData']='Data Tidak Ada';
 $lang['MissingPhpIntlModule']='Transliterasi dapat dilakukan dengan menginstal atau mengaktifkan modul php-intl';
+$lang['MysqlInnoDbProcess']='Ianseo akan memperbarui database untuk performance yang lebih baik. Ini mungkin akan memerlukan beberapa waktu.';
+$lang['MysqlUpdateNeeded']='Anda menggunakan Server Mysql yang sangat lama. Mohon untuk memperbarui server anda, XAMP, WAMP atau LAMP ke versi yang lebih baru atau install ulang Ianseo dari awal.';
 $lang['NameNotEmpty']='Nama tidak dapat dikosongkan';
+$lang['NoCountryInsert']='Tidak ada Negara yang dimasukkan';
+$lang['NoData']='Tidak ada Data yang disediakan';
+$lang['NoDistancesSet']='Kategori tanpa pengaturan jarak';
 $lang['NoDNSRecord']='Nama Server salah atau tidak online: harap diperhatikan bahwa Anda harus terhubung ke Internet untuk menyetel opsi ini.';
+$lang['NoEntryInsert']='Tidak ada Entri yang disisipkan';
 $lang['NoMailingTemplate']='Tidak ada Template Email yang dipilih/tersedia!';
 $lang['NoMailRecipients']='Tidak seorang pun untuk mengirim surat! Harap tinjau opsi filter Anda.';
 $lang['NoPrivilege']='Hak Istimewa Tidak Memadai: Anda tidak diizinkan untuk mengoperasikan halaman ini';
 $lang['NoSameOrders']='Nilai Urutan baru tidak dapat diduplikasi.';
 $lang['NoSmtpServerSet']='Harap setel server SMTP sebelum mengirim email!';
+$lang['NoTargetSet']='Kategori tanpa pengaturan target';
+$lang['PhpOutdated']='Versi PHP Anda sudah kedaluwarsa. Ianseo mungkin berfungsi tetapi beberapa fungsi memerlukan setidaknya versi {$a}.<br/>Harap tingkatkan instalasi Anda sesegera mungkin untuk mendukung PHP {$a} atau yang lebih baru.';
 $lang['RegExp']='Untuk menggunakan RegExp (Regular Expressions), silakan merujuk ke $a';
+$lang['ResetSyncData']='Reset Data Sinkronisasi';
+$lang['ServiceNotAvailable']='Service tidak tersedia';
 $lang['SetupNotFinished']='Anda tidak dapat mengakses halaman ini: harap lengkapi {$a} terlebih dahulu!';
 $lang['SpecialFilterDiscrepancy']='Filter khusus telah disetel tetapi tidak aktif!';
 $lang['SqlJolly']='Dalam Statemen SQL sebuah "%" berfungsi sebagai jolly, a "_" menggantikan sebuah huruf. Sebagai contoh "R%M" akan mencocokkan "RM" sebagai "RCM", "RMM" tetapi tidak "RMC". "R_M" akan cocok untuk "RSM", "RJM" tetapi tidak "RM".';
+$lang['SyncNotAvailable']='Sinkronisasi tidak tersedia';
 $lang['TargetNumberMismatch']='Nomor Target hanya dapat berbentuk [TargetNumber][TargetLetter], seperti pada 129C';
 $lang['TargetRangeMismatch']='Rentang Target harus berupa 2 angka target (tanpa huruf) yang dipisahkan oleh tanda hubung (tanda minus), yang pertama lebih rendah dari yang kedua, seperti pada 23-44';
 $lang['TextSmtpDelete']='Harap konfirmasikan bahwa Anda ingin menghapus pengaturan SMTP pada instalasi Ianseo';
 $lang['TooManyArrows']='Terlalu banyak total anak panah: maksimum adalah $a';
+$lang['TooManyDistancesMatch']='Kategori dengan pengaturan multi jarak';
 $lang['TooManyElimQualified']='Tipe Ronde $a[0] hanya dapat menerima hingga $a[1] pemanah';
+$lang['WrongData']='Data yang disediakan salah';
 $lang['WrongPort']='Port ini tidak didukung';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/id/HTT.php b/src/Common/Languages/id/HTT.php
index a6cb6d62..866947ea 100644
--- a/src/Common/Languages/id/HTT.php
+++ b/src/Common/Languages/id/HTT.php
@@ -49,7 +49,7 @@
 $lang['Name']='Nama';
 $lang['OfficeMode']='Mode Office';
 $lang['OpenFile']='Buka Berkas';
-$lang['OvrErrSelectSession']='Tidak ada Rambahan dipilih!';
+$lang['OvrErrSelectSession']='Tidak ada Seri dipilih!';
 $lang['Port']='Port';
 $lang['QualSession']='Kual. Ses.';
 $lang['Report']='Laporan';
@@ -73,6 +73,6 @@
 $lang['Terminal']='HTT';
 $lang['TerminalMode']='Mode Terminal';
 $lang['TotaleScore']='Total';
-$lang['Volee']='Rambahan';
-$lang['VoleeIsPresent']='RAMBAHAN ini sudah ada';
+$lang['Volee']='Seri';
+$lang['VoleeIsPresent']='SERI ini sudah ada';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/id/Help.php b/src/Common/Languages/id/Help.php
index f32313d0..6f4e4ed4 100644
--- a/src/Common/Languages/id/Help.php
+++ b/src/Common/Languages/id/Help.php
@@ -1,4 +1,5 @@
 <?php
+$lang['AuthTourCode']='Daftar kode turnamen yang dipisahkan koma yang dapat dikelola oleh pengguna.<br>Karakter pengganti yang diizinkan: "%"';
 $lang['AutoCheckinAlreadyDone']='Anda sudah check-in<br>Jika Anda perlu mengubah informasi apa pun, lanjutkan ke meja akreditasi';
 $lang['AutoCheckinConfirm']='Jika semua detail sudah benar, tekan CONFIRM CHECK-IN<br> Jika tidak, tekan CANCEL dan lanjutkan ke meja akreditasi';
 $lang['AutoCheckinSearch']='Scan Kode QR yang Anda terima atau ketik nama Anda';
@@ -14,6 +15,11 @@
 &#9655&nbsp;Skor tidak termasuk dalam total babak kualifikasi tim';
 $lang['CombiCompList']='Daftar Kode Kompetisi, dipisahkan koma';
 $lang['FlightsManagement']='<b>Ke kategori penerbangan</b> <ul> <li>Pilih Ujung mana - Total Jarak - Total Penuh hitung penerbangan;</li> <li>Pilih ukuran potongan penerbangan awal berdasarkan kategori. Sistem memuat tabel penerbangan standar NFAA ketika kompetisi mengizinkannya;</li> <li>Pratinjau Pengelompokan Penerbangan akan menghitung SEMUA KATEGORI, tekan tombol muat ulang di sisi ukuran potongan penerbangan untuk memaksa penghitungan satu kategori; </li> <li>Penerbangan yang ditandai oranye hanyalah indikator perbedaan antara penerbangan yang dipratinjau dan tabel peraturan. Ini TIDAK mempengaruhi divisi penerbangan.</li> <li>Gunakan perintah drop - split - merge untuk menyesuaikan info penerbangan. Harap dicatat, setelah menjalankan pratinjau penuh atau penyegaran kategori, semua perubahan pada penerbangan akan hilang.</li> </ul> <b>Catatan</b> <ul> <li>Kategori dengan peserta yang terlalu sedikit tidak termasuk dari terbang. Penerbangan dapat dipaksa dengan menunjukkan jumlah pemotongan penerbangan;</li> <li>Jika suatu kategori dianggap diterbangkan, gunakan \'-1\' sebagai potongan untuk secara eksplisit mengecualikan dari penerbangan</li> <li>Profesional dan/atau Kejuaraan sebagai dikecualikan dari penerbangan dan berwarna abu-abu</li> </ul>';
+$lang['FontFamily']='Nama huruf untuk digunakan di CSS';
+$lang['FontFile']='Lokasi file di disk';
+$lang['FontName']='Nama huruf sebenarnya';
+$lang['FontStyle']='Gaya huruf pada CSS';
+$lang['FontWeight']='Tebal huruf pada CSS';
 $lang['GetBarcodeSeparator']='Setelah mencetak lembar referensi barcode, baca «SEPARATOR» barcode untuk mengaktifkan item pembaca yang benar.';
 $lang['HomePage']='Halaman ini tempat Anda dapat memilih atau membuat turnamen.';
 $lang['ISK-LockedSessionHelp']='{$a} ikon menunjukkan apakah aplikasi dapat memproses skor atau tidak dalam sesi yang dimaksud';
@@ -25,6 +31,7 @@
 $lang['ScoreBarCodeShortcuts']='Baca Barcode yang tercetak di kartu skor.<br/>
 Memasukkan # secara manual diikuti dengan nama atlet mencari database untuk menemukan atlet tersebut<br/>
 Memasukkan @ diikuti dengan nomor target akan mencari target tersebut. Jarak HARUS diatur. Sesi harus ditentukan (digit pertama) dan target diisi 0 hingga 3 digit.';
+$lang['ScoreboardFreetext-Texts']='Insert {{date}} to insert the date in english format (ie: january 4, 2024).<br> Insert {{date-lang}} to insert a date in local language (ie: {{date-de}} to have 4. Januar 2024)<br> Insert {{time}} to have the ticking time in ISO format (ie: 15:03:23)<br> Insert {{time-am}} to have ticking time in AM/PM format (ie: 3:03:23 PM)<br> Insert {{counter-datetime}} to have a full date countdown (ie: [[[days:]hours:]minutes:]seconds layout, where datetime is the time to reach in ISO format 2024-12-04T09:00:00 for local time)<br> There can only be one of these fields in a text';
 $lang['TargetRequests-Printout']='Mencetak QrCode dari target yang diminta agar perangkat pribadi dapat dengan cepat ditetapkan ulang ke target yang benar.<br> Pilih grup perangkat mana yang ingin Anda cetak dan rentang sasaran target:<br> 1-10 mencetak QrCOde dari target 1 hingga 10<br> 1,7,12-15 mencetak QrCOde target 1, 7 dan dari 12 hingga 15';
 $lang['TargetScoring-Printout']='Mencetak QrCode dari target yang diminta untuk proses skoring pada Jarak Target Sesi yang diperlukan dengan ISK NG Lite. Ini adalah kode QR yang sama yang dapat Anda temukan di scorecard<br> Pilih sesi mana yang ingin Anda cetak dan rentang target sasaran:<br> 1-10 mencetak QrCOde dari target 1 hingga 10<br> 1 ,7,12-15 mencetak QrCOde target 1, 7 dan dari 12 hingga 15';
 $lang['TV-ChannelSetup']='= Pengaturan Saluran =
@@ -67,5 +74,7 @@
 <li>versi lanjutan yang menggunakan kemampuan HTML5 browser modern</li>
 </ul>
 <div>Untuk membuat konten baru, masukkan nama untuk konten tersebut dan tekan tombol.</div>';
+$lang['UserName']='Harus unik dalam sistem. Panjang minimal: 6 karakter';
+$lang['UserPassword']='Biarkan kosong untuk mempertahankan password yang sekarang';
 $lang['ZeroBased']='Nomor berbasis nol';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/id/IOC_Codes.php b/src/Common/Languages/id/IOC_Codes.php
index b922b833..f855ed9a 100644
--- a/src/Common/Languages/id/IOC_Codes.php
+++ b/src/Common/Languages/id/IOC_Codes.php
@@ -12,8 +12,8 @@
 $lang['ASA']='Samoa Amerika';
 $lang['AUS']='Australia';
 $lang['AUT']='Austria';
-$lang['Award-Anthem']='Hadirin sekalian, dimohon berdiri untuk Lagu Kebangsaan';
-$lang['Award-Anthem-TPE']='Hadirin sekalian, dimohon berdiri untuk Lagu Kebangsaan';
+$lang['Award-Anthem']='Hadirin sekalian, untuk yang bisa, dimohon berdiri untuk Lagu Kebangsaan';
+$lang['Award-Anthem-TPE']='Hadirin sekalian, untuk yang bisa, dimohon berdiri untuk Lagu Kebangsaan';
 $lang['Award-Applause']='Hadirin sekalian, dimohon untuk memberikan tepuk tangan kepada Atlet kita';
 $lang['Award-Intro']='Hadirin sekalian Upacara Kemenangan untuk {$a}';
 $lang['Award-MedalGiver']='Medali akan dipersembahkan oleh $a';
@@ -48,7 +48,7 @@
 $lang['CGO']='Republik Kongo';
 $lang['CHA']='Chad';
 $lang['CHI']='Chili';
-$lang['CHN']='China';
+$lang['CHN']='Republik Rakyat China';
 $lang['CIV']='Pantai Gading';
 $lang['CMR']='Kamerun';
 $lang['COD']='Republik Demokratis Kongo';
@@ -59,6 +59,7 @@
 $lang['CRC']='Kosta Rika';
 $lang['CRO']='Kroatia';
 $lang['CUB']='Kuba';
+$lang['CUW']='Curacao';
 $lang['CYP']='Syprus';
 $lang['CZE']='Republik Ceko';
 $lang['DEN']='Denmark';
@@ -74,7 +75,10 @@
 $lang['ETH']='Ethiopia';
 $lang['FIJ']='Fiji';
 $lang['FIN']='Finlandia';
+$lang['FLK']='Kepulauan Falkland';
+$lang['FPO']='Tahiti';
 $lang['FRA']='Francis';
+$lang['FRO']='Kepulauan Faroe';
 $lang['FSM']='Mikronesia';
 $lang['GAB']='Gabon';
 $lang['GAM']='Gambia';
@@ -84,6 +88,7 @@
 $lang['GEQ']='Guinea Ekuator';
 $lang['GER']='Jerman';
 $lang['GHA']='Ghana';
+$lang['GLP']='Guadalupe';
 $lang['GRE']='Yunani';
 $lang['GRN']='Grenada';
 $lang['GUA']='Guatemala';
@@ -91,7 +96,7 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
+$lang['HKG']='Hong Kong, China';
 $lang['HON']='Honduras';
 $lang['HUN']='Hungaria';
 $lang['INA']='Indonesia';
@@ -112,11 +117,13 @@
 $lang['KGZ']='Kyrgyzstan';
 $lang['KIR']='Kiribati';
 $lang['KOR']='Republik Korea';
+$lang['KOS']='Kosovo';
 $lang['KSA']='Saudi Arabia';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
+$lang['LAO']='Republik Rakyat Laos';
 $lang['LAT']='Latvia';
 $lang['LBA']='Libya';
+$lang['LBN']='Libanon';
 $lang['LBR']='Liberia';
 $lang['LCA']='Saint Lucia';
 $lang['LES']='Lesotho';
@@ -124,6 +131,7 @@
 $lang['LIE']='Liechtenstein';
 $lang['LTU']='Lithuania';
 $lang['LUX']='Luxembourg';
+$lang['MAC']='Macau, China';
 $lang['MAD']='Madagaskar';
 $lang['MAR']='Maroko';
 $lang['MAS']='Malaysia';
@@ -145,13 +153,18 @@
 $lang['MOZ']='Mozambik';
 $lang['MRI']='Mauritus';
 $lang['MTN']='Mauritania';
+$lang['MTQ']='Martinik';
 $lang['MYA']='Myanmar';
 $lang['NAM']='Namibia';
 $lang['NCA']='Nicaragua';
+$lang['NCL']='Kaledonia Baru';
 $lang['NED']='Belanda';
 $lang['NEP']='Nepal';
+$lang['NFK']='Pulau Norfolk';
 $lang['NGR']='Nigeria';
 $lang['NIG']='Niger';
+$lang['NIU']='Niue';
+$lang['NMI']='Kepulauan Mariana Utara';
 $lang['NOR']='Norwegia';
 $lang['NRU']='Nauru';
 $lang['NZL']='Selandia Baru';
@@ -166,7 +179,7 @@
 $lang['PNG']='Papua Nugini';
 $lang['POL']='Polandia';
 $lang['POR']='Portugis';
-$lang['PRK']='Korea Utara';
+$lang['PRK']='Republik Rakyat Korea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Romania';
@@ -193,7 +206,7 @@
 $lang['SVK']='Slowakia';
 $lang['SWE']='Swedia';
 $lang['SWZ']='eSwatini';
-$lang['SYR']='Siria';
+$lang['SYR']='Republik Arab Siria';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailand';
@@ -203,6 +216,7 @@
 $lang['TOG']='Togo';
 $lang['TPE']='Taiwan';
 $lang['TRI']='Trinidad dan Tobago';
+$lang['TTO']='Trinidad and Tobago';
 $lang['TUN']='Tunisia';
 $lang['TUR']='Turki';
 $lang['TUV']='Tuvalu';
diff --git a/src/Common/Languages/id/ISK-App.php b/src/Common/Languages/id/ISK-App.php
index 1156b0d8..b27bd9b8 100644
--- a/src/Common/Languages/id/ISK-App.php
+++ b/src/Common/Languages/id/ISK-App.php
@@ -72,7 +72,7 @@
 $lang['HelpStartHead']='Mulai';
 $lang['HelpStartText']='Ini memungkinkan Anda untuk memulai konfigurasi aplikasi. Anda dapat memilih untuk memindai kode QR yang dihasilkan oleh Ianseo untuk mengonfigurasi pesaing Anda dengan mudah di aplikasi. Ini akan secara otomatis memilih jenis kompetisi yang tepat, parameter koneksi server, serta parameter lanjutan yang dikonfigurasi di Ianseo. Dimungkinkan juga untuk mengonfigurasi perangkat secara manual jika diinginkan.';
 $lang['MainDistance']='Jarak / Sesi';
-$lang['MainEnd']='Seri / Rambahan';
+$lang['MainEnd']='Seri';
 $lang['MainInvalidKey']='Kunci Lisensi tidak valid';
 $lang['MainNotInUse']='Perangkat sedang tidak digunakan';
 $lang['MainSignatureMessage']='Penilaian selesai. Apakah Anda ingin menandatangani kartu skor Anda dan menyelesaikan babak ini?';
diff --git a/src/Common/Languages/id/ISK.php b/src/Common/Languages/id/ISK.php
index fb952512..32477be8 100644
--- a/src/Common/Languages/id/ISK.php
+++ b/src/Common/Languages/id/ISK.php
@@ -15,9 +15,9 @@
 $lang['8_Phase']='1/8';
 $lang['About']='Tentang';
 $lang['AfterEachArrow']='Setelah Setiap Panah (default)';
-$lang['AfterEachEnd']='Setelah Setiap Rambahan';
+$lang['AfterEachEnd']='Setelah Setiap Seri';
 $lang['AfterEachImport']='Setelah Setiap Impor (default)';
-$lang['AlertNoScore']='Satu atau lebih pemanah tidak memiliki skor rambahan. Baris ini disorot dengan warna merah. Klik pada baris untuk memperbaiki skor atau lanjutkan jika ini benar.';
+$lang['AlertNoScore']='Satu atau lebih pemanah tidak memiliki skor seri. Baris ini disorot dengan warna merah. Klik pada baris untuk memperbaiki skor atau lanjutkan jika ini benar.';
 $lang['AlertNoScoreTitle']='Skor hilang';
 $lang['All']='Semua';
 $lang['ApiPath']='Path IANSEO API';
@@ -46,7 +46,7 @@
 $lang['CantGetComp']='Tidak dapat mengambil informasi kompetisi. Harap periksa kode kompetisi Anda dan coba lagi. Error: __TEXT__';
 $lang['CantGetDist']='Tidak dapat mengambil informasi jarak. Silakan coba lagi.';
 $lang['CantGetDist2']='Tidak dapat mengambil informasi jarak. Silakan coba lagi. Error __TEXT__';
-$lang['CantGetEndResults']='Tidak dapat mengambil skor untuk rambahan. Silakan coba lagi. Error __TEXT__';
+$lang['CantGetEndResults']='Tidak dapat mengambil skor untuk seri. Silakan coba lagi. Error __TEXT__';
 $lang['CantGetEndSummary']='Tidak dapat mengambil hasil dari server. Silakan coba lagi. Error __TEXT__';
 $lang['CantGetEvents']='Tidak dapat mengambil informasi event. Silakan coba lagi. Error __TEXT__';
 $lang['CantGetMatches']='Tidak dapat mengambil informasi pertandingan. Silakan coba lagi. Error __TEXT__';
@@ -61,7 +61,7 @@
 $lang['ChooseValue']='Pilih nilai';
 $lang['ClearAll']='Hapus semua';
 $lang['ClearAllDesc']='<strong>Hapus Semua</strong> - menghapus semua skor panah yang dimasukkan.';
-$lang['ClearingCache']='Menghapus cache rambahan';
+$lang['ClearingCache']='Menghapus cache seri';
 $lang['ClearLast']='Hapus Terakhir';
 $lang['ClearLastDesc']='<strong>Hapus Terakhir</strong> - menghapus skor panah yang terakhir dimasukkan.';
 $lang['Close']='Tutup Menu';
@@ -87,16 +87,16 @@
 $lang['DistTotal']='Dist<br/>Total';
 $lang['EditScores']='Edit Skor';
 $lang['Elimination']='Eliminasi';
-$lang['EmptyEndAlert']='Rambahan sebelumnya belum dinilai. Apakah anda yakin ingin menilai Panah pada rambahan ini?';
+$lang['EmptyEndAlert']='Seri sebelumnya belum dinilai. Apakah anda yakin ingin menilai Panah pada seri ini?';
 $lang['EmptyResponse']='Respons server kosong';
-$lang['End']='Rambahan';
-$lang['EndLocked']='Rambahan terkunci dan tidak dapat diubah.';
-$lang['EndRequest']='Permintaan Rambahan Manual';
-$lang['EndSummary']='Rangkuman Rambahan';
-$lang['EndTotal']='Rambahan<br/>Total';
+$lang['End']='Seri';
+$lang['EndLocked']='Seri terkunci dan tidak dapat diubah.';
+$lang['EndRequest']='Permintaan Seri Manual';
+$lang['EndSummary']='Rangkuman Seri';
+$lang['EndTotal']='Seri<br>Total';
 $lang['EnterCompCode']='Harap memasukkan kode kompetisi dan coba lagi';
 $lang['EnterServerUrl']='Harap masukkan URL server dan coba lagi';
-$lang['EntryEnd']='Pilih rambahan yang anda inginkan';
+$lang['EntryEnd']='Pilih seri yang anda inginkan';
 $lang['EntryTarget']='Masukan nomor target yang benar';
 $lang['ErrorClearArrows']='Tidak dapat menghapus semua nilai panah. Silakan coba lagi. Error __TEXT__';
 $lang['ErrorGetAthlete']='Tidak dapat mengambil informasi atlet. Error __TEXT__';
@@ -112,7 +112,7 @@
 $lang['Face']='Wajah';
 $lang['FieldControl']='Kontrol Lapangan';
 $lang['FirstTarget']='Target Pertama';
-$lang['GestureHelp']='Anda dapat menggeser antara pemanah dan/atau rambahan menggunakan gestur sebagaimana dijelaskan di bawah.';
+$lang['GestureHelp']='Anda dapat menggeser antara pemanah dan/atau seri menggunakan gestur sebagaimana dijelaskan di bawah.';
 $lang['Gestures']='Gestur';
 $lang['GoSetupAlert']='Apakah anda yakin bahwa anda akan kembali ke layar Setup';
 $lang['Group']='Grup #';
@@ -126,8 +126,8 @@
 $lang['ImportType']='Nilai Panah di-impor otomatis';
 $lang['IpAddr']='Alamat IP';
 $lang['ISK-TruncateTableAll']='Tabel Terpotong (lengkap)';
-$lang['LastEndDist']='Rambahan terakhir untuk jarak ini telah lengkap. Untuk melanjutkan ke jarak selanjutnya tekan OK, atau tekan Cancel untuk tetap di jarak ini.';
-$lang['LastEndSession']='Rambahan terakhir untuk sesi ini telah lengkap. Tidak ada lagi rambahan untuk ditembakkan. Anda sekarang dapat memeriksa Kartu Skor atau kembali ke Setup.';
+$lang['LastEndDist']='Seri terakhir untuk jarak ini telah lengkap. Untuk melanjutkan ke jarak selanjutnya tekan OK, atau tekan Cancel untuk tetap di jarak ini.';
+$lang['LastEndSession']='Seri terakhir untuk sesi ini telah lengkap. Tidak ada lagi seri untuk ditembakkan. Anda sekarang dapat memeriksa Kartu Skor atau kembali ke Setup.';
 $lang['LinkSpeed']='Kecepatan Tautan';
 $lang['LockAll']='Kunci Semua Sesi';
 $lang['LRSwipeLabel']='Sensitifitas Sapuan Kiri/Kanan';
@@ -167,7 +167,7 @@
 $lang['PrevDistAlert']='Apakah anda yakin ingin kembali ke jarak sebelumnya?';
 $lang['ProBadLicense']='Kunci Pro Tidak Valid';
 $lang['ProDiag']='Diagnosa';
-$lang['ProEnd']='Pilih Rambahan';
+$lang['ProEnd']='Pilih Seri';
 $lang['ProEntry']='Entri Pro';
 $lang['ProOnline']='Paksa';
 $lang['ProRecvCode']='Pro Memaksa Online';
diff --git a/src/Common/Languages/id/Ianseo.php b/src/Common/Languages/id/Ianseo.php
index 68696b88..65759789 100644
--- a/src/Common/Languages/id/Ianseo.php
+++ b/src/Common/Languages/id/Ianseo.php
@@ -7,4 +7,9 @@
 $lang['Cert-Level4']='Kursus Master';
 $lang['Cert-Level5']='Tim Ianseo';
 $lang['CertificateManagement']='Managerial Sertifikat';
+$lang['GenerateFile']='Buat File';
+$lang['ResetItems']='Atur Ulang Item.<br/>Tindakan ini tidak akan meminta konfirmasi dan tidak dapat dibatalkan!<br/>Menyetel ulang kualifikasi akan mengatur ulang semua acara berikutnya juga!';
+$lang['ResetResult']='Sesi yang diminta telah diatur ulang';
+$lang['ResetSessions']='Konfirmasi pengaturan ulang';
+$lang['ShuffleResults']='Hasil acak';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/id/Install.php b/src/Common/Languages/id/Install.php
index 29f9dbf3..341241a6 100644
--- a/src/Common/Languages/id/Install.php
+++ b/src/Common/Languages/id/Install.php
@@ -35,6 +35,7 @@
 $lang['Email']='Email';
 $lang['Email not in DB']='Email tidak ada dalam DB kami';
 $lang['EventWillBeReset']='PERINGATAN: perubahan pada "$a[0]", "$a[1]" atau "$a[2]" akan mengatur ulang semua parameter turnamen ke default yang ditentukan oleh aturan dan jenis turnamen yang dipilih.';
+$lang['ExportAllComps']='Expor semua kompetisi';
 $lang['Failed']='GAGAL!';
 $lang['Failing install']='Harap meng-update installasi PHP anda sebelum menjalankan IANSEO kembali';
 $lang['Field24Normal']='Arena 24 target';
@@ -87,7 +88,7 @@
 $lang['Parameter']='Parameter';
 $lang['Password']='Password';
 $lang['PHP settings']='Setting PHP';
-$lang['PHP too old']='Installasi PHP anda terlalu tua. Nomor versi minimum untuk IANSEO adalah 5.0.';
+$lang['PHP too old']='Installasi PHP anda terlalu tua. Nomor versi PHP minimum untuk IANSEO adalah 8.0.';
 $lang['PHP version']='Versi PHP';
 $lang['php.ini file']='file php.ini';
 $lang['Prepare']='Mempersiapkan data untuk update';
@@ -103,11 +104,11 @@
 $lang['Set12+12']='12+12 target - 2 jarak';
 $lang['Set16']='16 target - 1 jarak';
 $lang['Set16+16']='16+16 target - 2 jarak';
-$lang['Set1Dist1Arrow']='1 Jarak - 1 Panah/Rambahan';
-$lang['Set1Dist2Arrow']='1 Jarak - 2 Panah/Rambahan';
-$lang['Set1Dist2ArrowPayPlay']='1 Jarak - 2 Panah/Rambahan, Bayar dan Main';
+$lang['Set1Dist1Arrow']='1 Jarak - 1 Panah/Seri';
+$lang['Set1Dist2Arrow']='1 Jarak - 2 Panah/Seri';
+$lang['Set1Dist2ArrowPayPlay']='1 Jarak - 2 Panah/Seri, Bayar dan Main';
 $lang['Set1Elim']='1 Babak Eliminasi';
-$lang['Set1x30']='1x30 Rambahan';
+$lang['Set1x30']='Seri 1x30';
 $lang['Set20']='10 target - 1 jarak';
 $lang['Set20+20']='20+20 target - 2 jarak';
 $lang['Set24']='24 target - 1 jarak';
@@ -117,7 +118,7 @@
 $lang['Set2Dist2Arrow']='2 Jarak - 2 Anak Panah/Seri';
 $lang['Set2Dist2ArrowPayPlay']='2 Jarak - 2 Anak Panah/Seri, Bayar dan Main';
 $lang['Set2Elim']='2 Babak Eliminasi';
-$lang['Set2x15']='2x15 Rambahan';
+$lang['Set2x15']='Seri 2x15';
 $lang['Set32']='32 target - 1 jarak';
 $lang['Set3D']='3D - 1 Jarak';
 $lang['Set3D+3D']='3D - 2 Jarak';
@@ -139,9 +140,12 @@
 $lang['SetCompound70m']='Compound - 70m';
 $lang['SetCR']='Kejuaraan Regional (1 Babak Eliminasi)';
 $lang['SetDKShortDistances']='Jarak Pendek (B & L)';
+$lang['SetFrBeursault']='Beursault';
+$lang['SetFrBouquet']='Bouquet';
 $lang['SetFRChampionshipElite']='Elit Juara';
 $lang['SetFRChampionshipJun']='Kejuaraan Pemuda';
 $lang['SetFRChampionshipSen']='Kejuaraan Dewasa';
+$lang['SetFRChampJunTeams']='Championnat de France Jeune Equipe';
 $lang['SetFRChampsD1DNAP']='Pertandingan Davis-Like Beregu';
 $lang['SetFRChampsFederal']='Championnat Fédéral';
 $lang['SetFRChampsScratchC']='Event Tunggal Kejuaraan Compound';
@@ -150,8 +154,13 @@
 $lang['SetFRChampsVet']='Kejuaraan Master';
 $lang['SetFRCoupeFrance']='Piala Perancis';
 $lang['SetFRD12023']='Championnat D1 / 2023';
+$lang['SetFRFinalsD2']='Finales France D2';
 $lang['SetFRFinDRD2']='Final DR/D2';
+$lang['SetFrSelectif']='Selectif';
+$lang['SetFrSelectifPara']='Selectif + Para';
 $lang['SetFRTAE']='Kejuaraan Perancis TAE';
+$lang['SetFRTAE-Para']='Selectif TAE + Para';
+$lang['SetFRTAE-Valides']='Selectif TAE';
 $lang['SetIndoor']='Dalam Ruangan';
 $lang['SetIPCandWA']='Kategori IPC dan WA';
 $lang['SetJ-CClass']='Junior dan Kadet';
@@ -243,7 +252,7 @@
 $lang['Value']='Nilai';
 $lang['WhatIanseoDoes01']='<b>Sesuai dengan Aturan World Archery:</b> Ianseo selalu mengikuti aturan World Archery. Pengembang tersedia untuk penyesuaian agar sesuai dengan Aturan Khusus Nasional dan Kompetisi juga!';
 $lang['WhatIanseoDoes02']='<b>Bantuan dan dukungan:</b> jika Anda membutuhkan bantuan, kirim email ke $a: Anda akan mendapatkan jawaban langsung dari pengembang inti Ianseo!';
-$lang['WhatIanseoDoes03']='<b>Pelatihan dan kursus di lokasi:</b> Ianseo tersedia untuk mengelola kursus lokasi tertentu. Dua tingkat: tanpa dan dengan perangkat elektronik. Yang pertama bertujuan untuk mengetahui semua aspek ianseo mulai dari persiapan dan jadwal kompetisi hingga publikasi online dan distribusi hasil lokal. Yang kedua bertujuan untuk memperoleh semua pengetahuan khusus untuk menjalankan kompetisi "panah demi panah".';
+$lang['WhatIanseoDoes03']='<b>Pelatihan dan kursus di lokasi:</b> Ianseo tersedia untuk mengelola kursus di lokasi tertentu. Dua tingkatan: tanpa dan dengan Aplikasi IANSEO Scorekeeper NG. Yang pertama bertujuan untuk mengetahui semua aspek ianseo mulai dari persiapan dan jadwal kompetisi hingga publikasi online dan distribusi hasil secara lokal. Yang kedua bertujuan untuk memperoleh semua pengetahuan khusus untuk menjalankan kompetisi secara "panah demi panah".';
 $lang['WhatIanseoDoes04']='<b>Donasi!</b> Ianseo gratis dan open source... jika Anda suka, tolong bantu kami menjaga perangkat lunak dan server tetap mutakhir: tekan tombol "Donasi" di halaman beranda $a!';
 $lang['WhatIanseoDoes05']='<b>Media Sosial:</b> Ianseo juga ada di $a!';
 $lang['WhatIanseoDoesTitle']='Apa yang Ianseo dapat lakukan untuk kompetisi anda';
diff --git a/src/Common/Languages/id/ODF.php b/src/Common/Languages/id/ODF.php
index c17436dd..4d776bad 100644
--- a/src/Common/Languages/id/ODF.php
+++ b/src/Common/Languages/id/ODF.php
@@ -53,8 +53,10 @@
 $lang['OdfCommonCodeVersion']='Versi Kode Umum';
 $lang['OdfCompetition']='Kode Kompetisi ODF';
 $lang['OdfEventCode']='Kode Event ODF';
+$lang['OdfGeneralCodeVersion']='Versi Kamus Data Umum';
 $lang['OdfReceiverOn']='Penerima Aktif';
 $lang['OdfReceiverSetup']='Setup Penerima ODF';
+$lang['OdfSportCodeVersion']='Versi Kamus Data Olahraga';
 $lang['OdfUploadFileText']='Harap memilih sebuah berkas XML untuk diunggah...';
 $lang['Production']='Produksi';
 $lang['Receiver']='Penerima';
@@ -87,6 +89,7 @@
 $lang['TMMeeting']='Rapat Manager Tim';
 $lang['Transmitter']='Pemancar';
 $lang['TypCODE']='Suffix Kode Dokumen';
+$lang['TypDISCIPLINE']='Disiplin (ref Sports CC@Discipline)';
 $lang['TypEVENT']='Deskripsi Event';
 $lang['TypNAME']='Deskripsi';
 $lang['TypPHASE']='Deskripsi Fase';
diff --git a/src/Common/Languages/id/RoundRobin.php b/src/Common/Languages/id/RoundRobin.php
index d149a25b..fdd063e0 100644
--- a/src/Common/Languages/id/RoundRobin.php
+++ b/src/Common/Languages/id/RoundRobin.php
@@ -39,7 +39,7 @@
 $lang['Setup']='Setup';
 $lang['SetupChangeWarning']='Perubahan dalam pengaturan level ini akan mengatur ulang level dan tugas grup berikut. Silakan lanjutkan hanya jika Anda tahu apa yang Anda lakukan!';
 $lang['SetupCopyWarning']='Menyalin penyiapan dari acara lain akan sepenuhnya menimpa penyiapan dan penetapan untuk semua Level dan grup. Silakan lanjutkan hanya jika Anda tahu apa yang Anda lakukan!';
-$lang['ShowEndDetails']='Detail Rambahan';
+$lang['ShowEndDetails']='Detail Seri';
 $lang['Source']='Tingkat Sumber+Grup';
 $lang['SourceRank']='Peringkat Sumber';
 $lang['TargetAssignment']='Penentuan Target';
diff --git a/src/Common/Languages/id/Tournament.php b/src/Common/Languages/id/Tournament.php
index 0e6cb254..06347951 100644
--- a/src/Common/Languages/id/Tournament.php
+++ b/src/Common/Languages/id/Tournament.php
@@ -27,7 +27,7 @@
 $lang['AclISKServer']='Managemen ISK';
 $lang['AclModules']='Modul';
 $lang['ACLNoAccess']='Tanpa Akses';
-$lang['AclNotes']='<b>Catatan tentang Keamanan Jaringan</b> <ul> <li>pembatasan bersifat "berbasis kompetisi" dan bukan "berbasis server"</li> <li>localhost (127.0.0.1 atau ::1) tidak dapat dibatasi< /li> <li>Kebijakan dapat dinonaktifkan dengan panggilan dari server itu sendiri <b>{$a}</b> </ul><ul> <li>Jika kebijakan diaktifkan, perilaku default untuk klien yang tidak terdaftar adalah " Tidak Ada Akses"</li> <li>Dimungkinkan untuk menambahkan * sebagai grup terakhir dari Alamat IP (192.168.0.* atau 172.16.*) untuk menambahkan grup default, terbatas pada kebijakan hanya baca</li> < li>IP dalam kisaran 0.0.0.[1-254] tidak akan dianggap sebagai IP asli dan sistem akan menggunakan konten deskripsi sebagai RegExp untuk mencocokkan alamat IP. RegExps akan dievaluasi sesuai urutan yang ditampilkan dan mengizinkan kebijakan R/W</li> </ul>';
+$lang['AclNotes']='<b>Catatan tentang Keamanan Jaringan</b> <ul> <li>Pembatasan ini "berbasis persaingan" dan bukan "berbasis server"</li> <li>localhost (127.0.0.1 atau ::1) tidak dapat dibatasi</li> <li>Kebijakan dapat dinonaktifkan dengan memanggil dari server itu sendiri <b>{$a}</b> </li></ul><ul> <li>Ketika kebijakan diaktifkan, perilaku default untuk klien yang tidak tercantum adalah "Tidak Ada Akses"</li> <li>Dimungkinkan untuk menambahkan * sebagai grup terakhir dari Alamat IP (192.168.0.* atau 172.16.*) untuk menambahkan grup default</li> <li>Dimungkinkan untuk menggunakan RegExp untuk mencocokkan alamat IP. RegExp akan dievaluasi dalam urutan yang ditampilkan dan memungkinkan kebijakan R/W</li> </ul>';
 $lang['AclOdf']='Managemen ODF';
 $lang['AclOutput']='Output';
 $lang['AclParticipants']='Partisipan';
@@ -52,6 +52,7 @@
 $lang['AllDistances']='Semua';
 $lang['AllEntries']='Semua Isian';
 $lang['AllEvents']='Semua Event';
+$lang['AllowCompetitionACL']='Izinkan Kebijakan Akses Jaringan Kompetisi';
 $lang['AllRound']='Semua Babak';
 $lang['AllSessions']='Semua Sesi';
 $lang['AllsF']='Semua';
@@ -75,11 +76,11 @@
 $lang['Area_6']='Area VIP';
 $lang['Area_7']='Area $a';
 $lang['Arr4Set']='Anak Panah per Set';
-$lang['ArrowPhaseLegend1']='Detail Anak Panah/Rambahan untuk Babak Eliminasi';
-$lang['ArrowPhaseLegend2']='Detail Panah/Rambahan untuk Babak Final';
+$lang['ArrowPhaseLegend1']='Detail Anak Panah/Seri untuk Babak Eliminasi';
+$lang['ArrowPhaseLegend2']='Detail Panah/Seri untuk Babak Final';
 $lang['Arrows']='Anak Panah';
-$lang['Arrows4End']='Panah/Rambahan: $a';
-$lang['ArrowsPerEnd']='Panah/Rambahan';
+$lang['Arrows4End']='Panah/Seri: $a';
+$lang['ArrowsPerEnd']='Panah/Seri';
 $lang['AssignAwarded']='Tugas Diberikan';
 $lang['AssignLookupTable']='Set semua Entri ke: {$a}';
 $lang['AtDistance']='Peringkat dari jarak berikut:';
@@ -98,6 +99,7 @@
 $lang['AuthCodeA2A']='Kode Otorisasi Panah per panah';
 $lang['AutoCoinToss']='Penentuan Lempar Koin Otomatis';
 $lang['AutoEdits']='Edit Otomatis';
+$lang['AutomatorAccPrint']='Setting Pencetakan Akreditasi';
 $lang['AutoMoveNext']='Otomatis Pindah ke Panah berikutnya';
 $lang['AutoRefresh']='Segarkan Otomatis';
 $lang['AutoTargetAssignment']='Penentuan Target Otomatis - Pengundian';
@@ -118,6 +120,7 @@
 $lang['AwardSecondLanguage']='Bahasa Kedua';
 $lang['AwardShowPoints']='Tampilkan Poin';
 $lang['BackBarCodeCheck']='Kembali ke Pengecekan Barcode';
+$lang['BackFromHome']='Tidak kehilangan';
 $lang['BadEntries']='Entri TIDAK diimpor';
 $lang['Badge1PerPage']='1 Lencana per halaman';
 $lang['Badge2PerPage']='2 Lencana per halaman';
@@ -128,7 +131,7 @@
 $lang['BadgeIncludePhoto']='Masukkan Photo di Lencana?';
 $lang['BadgeNames']='Nama Lengkap (Tidak dicetak pertama)';
 $lang['BadgeNoData']='Tidak ada data untuk dicetak';
-$lang['BadgeOnlyNotPrinted']='HANYA Lencana yang belum dicetak?';
+$lang['BadgeOnlyNotPrinted']='Hanya yang BELUM dicetak';
 $lang['BadgeOnlyPrintAccredited']='HANYA Lencana dengan Partisipan yang terakreditasi?';
 $lang['BadgeOnlyPrintPhoto']='HANYA Lencana dengan Photo?';
 $lang['BadgeOptions']='Opsi';
@@ -158,6 +161,9 @@
 $lang['Block_IP']='IP Akses (v4)';
 $lang['Block_Manage']='Aturan Akses Network';
 $lang['Block_Nick']='Nama Samaran Akses';
+$lang['Block_TemplateIP']='Template IP';
+$lang['Block_TemplateName']='Deskripsi';
+$lang['Block_TemplatePattern']='Pola';
 $lang['BoldIsDefault']='Bold adalah default';
 $lang['Bonus']='Bonus';
 $lang['ByeMovedToPhase']='Atlet berpindah ke Fase berikutnya';
@@ -205,6 +211,7 @@
 $lang['CheckXNinesInMatch']='Cek XNine di tie';
 $lang['Classes']='Kelas';
 $lang['ClearField']='Area Kompetisi Kosong';
+$lang['ClickMovesPosition']='Hanya memperbarui posisi Arrow';
 $lang['ClickToMailRequest']='Klik untuk membuka email yang sudah diisikan sebelumnya';
 $lang['ClickToRequestCode']='Klik untuk meminta Kode';
 $lang['Clone']='Duplikat';
@@ -253,7 +260,7 @@
 $lang['Confirm']='Konfirmasi';
 $lang['ConfirmByeMsg']='Apakah Anda yakin ingin memberikan bye pada pertandingan ini?';
 $lang['ConfirmDescr']='INI AKAN MENGHANCURKAN TUGAS SEBELUMNYA DAN TIDAK DAPAT DIUBAH!';
-$lang['ConfirmEnd']='Konfirmasi Rambahan';
+$lang['ConfirmEnd']='Konfirmasi Seri';
 $lang['ConfirmIrmMsg']='Apakah Anda yakin ingin mengubah status IRM?';
 $lang['ConfirmMatch']='Konfirmasi Pertandingan';
 $lang['ConfirmResetAll']='Konfirmasikan opsi Reset ke semua entri yang dipilih?';
@@ -273,6 +280,7 @@
 $lang['CtrlCodeShort']='Kode Ctrl';
 $lang['Currency']='€';
 $lang['CurrentCompCode']='Kode Kompetisi Berjalan: $a';
+$lang['CustomAclDetails']='Detail ACL custom';
 $lang['D1AllInOne']='Semua Pertandingan dalam Kompetisi Tunggal';
 $lang['DailySchedule']='Jadwal Harian';
 $lang['DATABASE NOT REACHABLE']='DATABASE ONLINE TIDAK TERJANGKAU';
@@ -287,6 +295,8 @@
 $lang['DefaultLocRule']='FITA';
 $lang['DefaultVI']='VI Default';
 $lang['Delayed']='Tertunda (-1 untuk mengatur ulang)';
+$lang['DeleteAclRule']='Hapus peraturan ACL';
+$lang['DeleteAclUser']='Hapus pengguna ACL';
 $lang['DeleteAwarded']='Hapus Juara';
 $lang['DeleteChannel']='Hapus Saluran. Ini akan menghapus semua pemisahan dari saluran dan saluran itu sendiri.';
 $lang['DeletePreviousArchers']='Hapus entri sekarang yang tidak ada di daftar';
@@ -344,7 +354,7 @@
 $lang['EditContact']='Edit Kontak';
 $lang['ElabTeamMode']='Mode Elaborasi beregu';
 $lang['ElimArrows']='Panah Eliminasi';
-$lang['ElimEnds']='Rambahan Eliminasi';
+$lang['ElimEnds']='Seri Eliminasi';
 $lang['EliminationShort']='Elim.';
 $lang['EliminationType']='Tipe Eliminasi';
 $lang['ElimSO']='Panah SO Eliminasi';
@@ -353,12 +363,12 @@
 $lang['EmailScorecardShort']='Rangkuman Kartu Skor';
 $lang['EmailsToSend']='Email untuk dikirim';
 $lang['EmailSuccessfull']='Email telah berhasil terkirim ke $a';
-$lang['EnableAccess']='Aktifkan/Nonaktifkan Peraturan';
+$lang['EnableAccess']='Aktifkan/Nonaktifkan Kebijakan Akses';
 $lang['EnableAddOns']='Aktif/Non Aktif Add-On';
-$lang['Ends']='Rambahan';
-$lang['EndsOffset']='Tambahan Rambahan';
-$lang['EndsToShoot']='Rambahan untuk Menembak';
-$lang['EndTotal']='Total Rambahan';
+$lang['Ends']='Seri';
+$lang['EndsOffset']='Tambahan Seri';
+$lang['EndsToShoot']='Seri untuk Menembak';
+$lang['EndTotal']='Total Seri';
 $lang['EndUpdate']='Semua Update selesai';
 $lang['Entries']='Entri';
 $lang['EntriesByCountry']='Entri berdasarkan Negara';
@@ -369,8 +379,8 @@
 $lang['EventAccess']='Partisipasi Atlet dalam Event Ind/Regu';
 $lang['EventCodeDeclared']='Kode Event On-Line';
 $lang['EventCreationCancellation']='Buat dan Hapus Event berdasarkan Peserta';
-$lang['EventDetails']='$a[0] Rambahan dari $a[1] Panah + $a[2] SO';
-$lang['EventDetailsShort']='$a[0] rambahan dari $a[1] panah';
+$lang['EventDetails']='$a[0] Seri dari $a[1] Panah + $a[2] SO';
+$lang['EventDetailsShort']='$a[0] seri dari $a[1] panah';
 $lang['EventHasMedal']='Adalah Event dengan Medali';
 $lang['EventNumQualified']='Nomor Atlet/Tim untuk dipilih';
 $lang['EventParentCode']='Kode Induk Event';
@@ -380,6 +390,8 @@
 $lang['Events']='Event';
 $lang['EventStartPosition']='Peringkat Atlet/Tim Pertama untuk dipilih';
 $lang['EventStillTie']='PERHATIAN:\Acara berikut masih harus diperiksa:\n\n$a';
+$lang['EventsToAdd']='Event yang akan ditambahkan:';
+$lang['EventsToDelete']='Event yang akan dihapus:';
 $lang['EventWillNotRecreated']='(Jika Anda mengubah jenis kompetisi, kelas/divisi dan semua acara default tidak akan dibuat ulang)';
 $lang['EventWinnerFinalRank']='Peringkat Akhir Pemenang Event';
 $lang['EvNameTranslated']='Acara yang Diterjemahkan';
@@ -390,6 +402,7 @@
 $lang['ExportInstructions']='Untuk mengekspor data dan mengirimkannya secara otomatis, Anda harus melengkapi formulir berikut.';
 $lang['ExportNotes']='Anotasi';
 $lang['ExportRefEMail']='E-mail Referensi';
+$lang['ExportSocketData']='Ekspor Data Soket';
 $lang['ExportWinners']='Expor Pemenang';
 $lang['ExtraAddOns']='Tambahan Add-On';
 $lang['FamilyName']='Nama Keluarga';
@@ -421,7 +434,7 @@
 $lang['FinArrows']='Panah Final';
 $lang['FindArcher']='Cari Atlet';
 $lang['FindYourRank']='Temukan peringkat anda!';
-$lang['FinEnds']='Rambahan Final';
+$lang['FinEnds']='Seri Final';
 $lang['FinSO']='Panah SO Final';
 $lang['FirstPhase']='Fase Pertama';
 $lang['FirstPhaseInOut']='Qualified No. (dan tidak)';
@@ -442,7 +455,7 @@
 $lang['FlightsDescription']='Deskripsi';
 $lang['FlightsDistTotal']='Total $a';
 $lang['FlightsDrop']='Turunkan Kloter';
-$lang['FlightsEnd']='Rambahan $a';
+$lang['FlightsEnd']='Seri $a';
 $lang['FlightsExecute']='Jalankan pemisahan Kloter';
 $lang['FlightsManagement']='Managemen Kloter';
 $lang['FlightsMerge1']='Gabungkan 1';
@@ -459,6 +472,13 @@
 $lang['FlightsTotals']='Total';
 $lang['FlightsUpdateSetup']='Setup Update';
 $lang['FollowHHT']='Tampilkan jadwal yang diaktifkan HHT';
+$lang['FontFamily']='Keluarga Font CSS';
+$lang['FontFile']='File Huruf';
+$lang['FontName']='Nama Huruf';
+$lang['FontSample']='Contoh Huruf';
+$lang['FontStyle']='Gaya Huruf CSS';
+$lang['FontWarning']='Hanya mendukung huruf-huruf TTF';
+$lang['FontWeight']='Tebal Huruf CSS';
 $lang['FOP-ODS']='Arena Pertandingan (ODS)';
 $lang['ForceAccreditation']='Paksa Akreditasi';
 $lang['ForceOldPhotos']='Termasuk Gambar Lama';
@@ -562,6 +582,7 @@
 $lang['LocRuleDefaultNo']='Default';
 $lang['LocRuleModifiedNo']='Dimodifikasi';
 $lang['LocRuleValidNo']='Tidak Dimodifikasi';
+$lang['Login']='Login';
 $lang['LogisticResp']='Manager Logistik';
 $lang['LogMessage']='Log Pesan';
 $lang['LogoB']='Gambar Bawah (rasio lebar penuh adalah 19:1 untuk A4, 20:1 untuk huruf)';
@@ -574,6 +595,7 @@
 $lang['LUE-CAN']='Kanada';
 $lang['LUE-FITA']='World Archery';
 $lang['LUE-FRA']='Francis';
+$lang['LUE-GBR']='Archery GB';
 $lang['LUE-ITA']='Italia';
 $lang['LUE-ITA_e']='Italia (esordienti)';
 $lang['LUE-ITA_i']='Italia (indoor)';
@@ -615,6 +637,7 @@
 $lang['ManageByes']='Mengatur bye';
 $lang['ManAthStatus']='Managemen Status Atlet';
 $lang['ManColors']='Mangatur Warna';
+$lang['MandatoryLoginACL']='Permintaan Paksa Login untuk Alamat IP yang tidak terdaftar';
 $lang['ManDistances']='Kelola Jarak';
 $lang['ManDivClass']='Mengatur Divisi/Kelas';
 $lang['ManMatchArr4Phase']='Mengatur Panah Fase per Set';
@@ -623,7 +646,7 @@
 $lang['ManStaffOnField']='Manajemen Ofisial Kompetisi';
 $lang['ManSubClasses']='Mengatur SubKelas';
 $lang['ManTourDistances']='Managemen Jarak Kompetisi';
-$lang['ManTraining']='Managemen Sesi Pemanasan';
+$lang['ManTraining']='Managemen Sesi Percobaan';
 $lang['ManualTargetAssignment']='Penentuan Target Manual';
 $lang['Match']='Pertandingan';
 $lang['Match4Target']='Pertandingan per Target';
@@ -673,7 +696,7 @@
 $lang['MsgLookup2']='Periksa Integritas Data';
 $lang['MsgLookup3']='Impor Data';
 $lang['MsgLookup4']='Periksa Data Pesaing';
-$lang['MsgLookup5']='Rambahan';
+$lang['MsgLookup5']='Seri';
 $lang['MsgNotUniqueKey']='Kunci tidak Unik!<br>Tidak dapat melanjutkan';
 $lang['MsgSelOneValue']='Harap periksa nilai!';
 $lang['MsgSyncFile']='Unduh update dari file';
@@ -683,6 +706,7 @@
 $lang['Name']='Nama';
 $lang['NameOrder']='Urutan Nama';
 $lang['NameOrderHint']='Negara2 ini menukar Nama Lengkap dan Nama Keluarga: CHN - TPE - HKG - KOR - PRK';
+$lang['Nameplates']='Papan Nama';
 $lang['NationShort']='Nama Pendek';
 $lang['Natl-Nation']='Kebangsaan';
 $lang['New']='Baru';
@@ -761,10 +785,14 @@
 $lang['OrisScorecards']='Kartu Skor (C73D)';
 $lang['OrisScorecardsAverage']='Skor rata-rata anak panah';
 $lang['OrisScorecardsTeam']='Kartu Skor (C73E)';
+$lang['OrisStatsIndividual']='Statistik (C85A)';
+$lang['OrisStatsTeam']='Statistik (C85B+C)';
 $lang['OrisTeamList']='Daftar Tim Oris';
+$lang['OtherCountriesCoachingToo']='Sertakan Entri dari negara lain dalam pilihan Pelatih';
 $lang['OtherTourCategory']='Lainnya';
 $lang['OutdoorTourCategory']='Turnamen Outdoor';
 $lang['OverwritePreviousArchers']='Timpa Pemanah Sebelumnya';
+$lang['OvrBioAchievements']='Pencapaian Atlet';
 $lang['OvrMatchesMessages']='OVR Cocok dengan Sinyal';
 $lang['OvrRefresh']='Segarkan halaman (tidak dikirimkan)';
 $lang['OvrSendSerial']='Kirim ke OVR (Serial)';
@@ -850,6 +878,8 @@
 $lang['PrintNames']='Cetak Nama';
 $lang['PrintNormal']='Normal (Latin)';
 $lang['PrintScore']='Cetak Skor';
+$lang['PrintScoreInd']='Cetak Scorecard Individu';
+$lang['PrintScoreTeam']='Cetak Scorecard Beregu';
 $lang['PrintText']='Teks header';
 $lang['PrintTextTitle']='Header untuk Printout Hasil';
 $lang['Privacy-1']='Ianseo tidak menyimpan data pribadi kecuali jika izin diberikan oleh pengguna. Perangkat lunak Ianseo dapat digunakan untuk menyimpan data pribadi jika pengontrol memiliki kepentingan yang sah atas data tersebut.';
@@ -947,13 +977,13 @@
 $lang['Score']='Skor';
 $lang['Score1PageAllDist']='Kartu skor atlet dengan semua jarak pada satu halaman';
 $lang['ScoreBarcode']='Cetak Barcode pada Kartu Skor';
-$lang['ScorecardLabelEnd']='Seri / Rambahan';
+$lang['ScorecardLabelEnd']='Seri';
 $lang['ScorecardLabelSet']='Set';
 $lang['ScorecardsElim']='Kartu Skor Eliminasi';
 $lang['ScorecardsInd']='Kartu Skor Pertandingan Individual';
 $lang['ScorecardsQual']='Kartu Skor Kualifikasi';
 $lang['ScorecardsTeams']='Kartu Skor Pertandingan Beregu';
-$lang['ScoreCollector']='Koleksi Panah per Panah, pilih panah per rambahan';
+$lang['ScoreCollector']='Koleksi Panah per Panah, pilih panah per seri';
 $lang['ScoreComplete']='Skor Lengkap (Penarikan & Data';
 $lang['ScoreCompleteTotals']='Skor lengkap (Penarikan & Data) + Kolom untuk total kompetisi berjalan';
 $lang['ScoreCutoff']='Batas Skor';
@@ -983,6 +1013,7 @@
 $lang['SelectedClub-1']='Tampilkan Nama Negara ke-2';
 $lang['SelectedClub-2']='Tampilkan Nama Negara ke-3';
 $lang['SelectFirstN']='Hasil $a Pertama';
+$lang['SelectMulti']='Pilih setidaknya satu item. Untuk memilih lebih, tekan CTRL+Click';
 $lang['SelectSession']='Pilih Sesi';
 $lang['Send2Ianseo']='Kirim data ke www.ianseo.net';
 $lang['SendAll']='Kirim ke semua';
@@ -1039,7 +1070,7 @@
 $lang['ShowPicture']='Tampilkan Foto';
 $lang['showRecords']='Tamplkan Rekor';
 $lang['ShowSecondary']='Tampilkan Kompetisi Sekunder';
-$lang['ShowSetEnds']='Termasuk Set Rambahan';
+$lang['ShowSetEnds']='Termasuk Set Seri';
 $lang['ShowSubClass']='Tampilkan Sub Kelas';
 $lang['ShowTourCode']='Tampilkan Kode Tur';
 $lang['Sign/guide-board']='Tanda';
@@ -1071,16 +1102,16 @@
 $lang['StartlistAlpha']='Daftar Partisipan dalam urutan Alphabeth';
 $lang['StartListbyTarget']='Mulai Daftar berdasarkan Target';
 $lang['StartlistCategory']='Grup Daftar Peserta berdasarkan Kategori';
-$lang['StartlistCountry']='Grup Daftar Peserta berdasarkan Negara';
+$lang['StartlistCountry']='Daftar Peserta dikelompokkan berdasarkan Negara';
 $lang['StartlistCountryOnlyAthletes']='Grup Daftar Atlet berdasarkan Negara';
 $lang['StartlistEachCategory']='Grup Daftar Peserta berdasarkan Kategori (satu per halaman)';
-$lang['StartlistEachCountry']='Grup Daftar Peserta berdasarkan Negara (satu per halaman';
-$lang['StartlistEachCountryExtra']='Grup Daftar Peserta berdasarkan Negara (satu per halaman + item yang hilang)';
+$lang['StartlistEachCountry']='Daftar Peserta dikelompokkan berdasarkan Negara (satu per halaman';
+$lang['StartlistEachCountryExtra']='Daftar Peserta dikelompokkan berdasarkan Negara (satu per halaman + item yang hilang)';
 $lang['StartlistSession']='Daftar Peserta diurutkan berdasarkan Target';
 $lang['StartlistSessionEmptyPlaces']='- hanya target KOSONG -';
 $lang['StartlistSessionNoEmpty']='- tanpa target kosong -';
 $lang['StartlistSessionPicture']='Daftar Peserta diurutkan berdasarkan Target dengan Gambar';
-$lang['StartlistTeam']='Daftar Partisipan diurutkan berdasarkan Event';
+$lang['StartlistTeam']='Daftar Peserta diurutkan berdasarkan Event';
 $lang['StatClasses']='Statistik (Kelas dan Divisi)';
 $lang['StatCountries']='Statistik (Klub)';
 $lang['StatEvents']='Statistik (Penghargaan dan Event)';
@@ -1168,7 +1199,7 @@
 $lang['TeamCreationMode_2']='Selalu Regu ke-2';
 $lang['TeamCreationMode_3']='Selalu Regu ke-3';
 $lang['TeamFin']='Babak Eliminasi & Final Beregu';
-$lang['TeamFinEvent']='Final Beregu';
+$lang['TeamFinEvent']='Event Beregu';
 $lang['TeamLoaded']='Pertandingan Beregu Dimuat untuk jadwal {$a}';
 $lang['TeamManagerSignature']='Tanda Tangan Manajer Regu/Tim';
 $lang['TeamPlace']='Tanda-tanda tempat Regu';
@@ -1186,9 +1217,9 @@
 $lang['Title']='Judul';
 $lang['TitleColor']='Warna Judul dibalik';
 $lang['TitleTourMenu']='Pilih Kompetisi';
-$lang['To']='Kepada';
+$lang['To']='Sampai';
 $lang['ToFollow']='Sembunyikan waktu';
-$lang['TooManyElimArrows']='Hasil rambahan*Panah yang dihasilkan melebihi panah yang dapat disimpan di DB!';
+$lang['TooManyElimArrows']='Hasil Seri*Panah yang dihasilkan melebihi panah yang dapat disimpan di DB!';
 $lang['TooManyElimSO']='Terdapat terlalu banyak panah Tie break';
 $lang['Total1']='Total (Pertengahan pertama)';
 $lang['Total2']='Total (Pertengahan kedua)';
@@ -1293,6 +1324,7 @@
 $lang['TVCss3RankNone']='Peringkat Tidak Ada';
 $lang['TVCss3RankOld']='Peringkat lama';
 $lang['TVCss3RankUp']='Peringkat Naik';
+$lang['TVCss3Schedule']='Jadwal';
 $lang['TVCss3Score']='Skor';
 $lang['TVCss3Session']='Sesi';
 $lang['TVCss3SpecificSettings']='Pengaturan khusus halaman ini. Gunakan syntax CSS3 untuk elemen';
@@ -1381,13 +1413,14 @@
 $lang['TVViewDetailsDescr']='Mengalihkan tampilan 10s dan 9s/Xs';
 $lang['TvViewDIST']='Lihat Kolom Setiap Jarak';
 $lang['TvViewDIVCLAS']='Lihat Kategori';
-$lang['TvViewENDS']='Lihat Detail Rambahan';
+$lang['TvViewENDS']='Lihat Detail Seri';
 $lang['TvViewFIXED']='Posisi Tetap';
 $lang['TvViewFLAG']='Lihat Bendera';
 $lang['TVViewNationName']='Lihat nama lengkap Negara';
 $lang['TVViewNationNameDescr']='Mengalihkan tampilan Negara/Klub atlet';
 $lang['TVViewPartials']='Lihat Skor Jarak';
 $lang['TVViewPartialsDescr']='Mengalihkan tampilan skor semua jarak';
+$lang['TvViewSCHED']='Tampilkan Jadwal';
 $lang['TvViewTEAM']='Lihat Kolom Regu';
 $lang['TvViewTIT2ROWS']='Judul pada 2 baris';
 $lang['TvViewTOT']='Lihat Total Keseluruhan';
@@ -1415,6 +1448,7 @@
 $lang['Type_FITA']='FITA';
 $lang['Type_FITA 72']='FITA 72';
 $lang['Type_FITA+50']='FITA + Ronde 50m';
+$lang['Type_FR_Beursault']='Beursault';
 $lang['Type_FR_Kyudo']='Comité National de Kyudo (FRA)';
 $lang['Type_GiochiGioventu']='Giochi della Gioventù';
 $lang['Type_GiochiGioventuW']='Giochi della Gioventù Invernali';
@@ -1459,7 +1493,9 @@
 $lang['UserDetails']='Detail Pengguna';
 $lang['UserEnabled']='Diaktifkan';
 $lang['UserName']='NamaPengguna';
-$lang['UserPassword']='Password';
+$lang['UserPassword']='Password Baru';
+$lang['UserPasswordOld']='Password Lama';
+$lang['UserPasswordRetype']='Ketik Ulang Password Baru';
 $lang['UseSubClasses']='Terapkan ke subkelas spesifik';
 $lang['ValidClass']='Kelas Valid';
 $lang['ValidDivisions']='Divisi yang Diizinkan (kosongkan untuk semua)';
@@ -1481,10 +1517,11 @@
 $lang['WaCategory']='Kategori WA';
 $lang['WaId']='ID Lisensi Pemanah';
 $lang['WaIdShort']='ID Pemanah';
-$lang['WarmUp']='Pemanasan';
-$lang['WarmUpMins']='Pemanasan (min)';
-$lang['WarmupTargets']='Target Pemanasan';
+$lang['WarmUp']='Percobaan';
+$lang['WarmUpMins']='Percobaan (min)';
+$lang['WarmupTargets']='Target Percobaan';
 $lang['Warning']='Peringatan';
+$lang['Went2Home']='kehilangan';
 $lang['WheelChair']='Kursi Roda';
 $lang['WheelchairShort']='W';
 $lang['Wikipedia']='Wikipedia';
diff --git a/src/Common/Languages/is/IOC_Codes.php b/src/Common/Languages/is/IOC_Codes.php
index 107b448f..615dc2fc 100644
--- a/src/Common/Languages/is/IOC_Codes.php
+++ b/src/Common/Languages/is/IOC_Codes.php
@@ -6,8 +6,6 @@
 $lang['ARM']='Armenía';
 $lang['AUS']='Ástralía';
 $lang['AUT']='Austurríki';
-$lang['Award-Anthem']='Vinsamlegast standið fyrir þjóðsöng';
-$lang['Award-Anthem-TPE']='Vinsamlegast standið fyrir þjóðsöng';
 $lang['Award-Applause']='Vinsamlegast gefið keppendum okkar gott klapp';
 $lang['Award-Intro']='Verðlauna afhending fyrir {$a}';
 $lang['Award-MedalGiver']='Verðlaun verða afhent af $a';
@@ -22,13 +20,11 @@
 $lang['BRA']='Brasílía';
 $lang['BUL']='Búlgaría';
 $lang['CAN']='Kanada';
-$lang['CHN']='Kína';
 $lang['COL']='Kólumbía';
 $lang['CRC']='Kosta Ríka';
 $lang['CRO']='Króatía';
 $lang['CUB']='Kúba';
 $lang['CYP']='Kýpur';
-$lang['CZE']='Tékkland';
 $lang['DEN']='Danmörk';
 $lang['EGY']='Egyptaland';
 $lang['ESP']='Spánn';
@@ -43,7 +39,6 @@
 $lang['HUN']='Ungverjaland';
 $lang['INA']='Indónesía';
 $lang['IND']='Indland';
-$lang['IRI']='Íran';
 $lang['IRL']='Írland';
 $lang['IRQ']='Írak';
 $lang['ISL']='Ísland';
@@ -64,7 +59,6 @@
 $lang['PLE']='Palestína';
 $lang['POL']='Póland';
 $lang['POR']='Portúgal';
-$lang['PRK']='Norður Kórea';
 $lang['ROU']='Rúmenía';
 $lang['RSA']='Suður Afríka';
 $lang['RUS']='Rússland';
@@ -75,9 +69,7 @@
 $lang['SRB']='Serbía';
 $lang['SUD']='Súdan';
 $lang['SWE']='Svíþjóð';
-$lang['SYR']='Sýrland';
 $lang['THA']='Tæland';
-$lang['TLS']='Austur Tímor';
 $lang['UAE']='Sameinuðu arabísku furstadæmin';
 $lang['UGA']='Úganda';
 $lang['UKR']='Úkraína';
diff --git a/src/Common/Languages/is/Tournament.php b/src/Common/Languages/is/Tournament.php
index 9c1fe6f5..5295bb6d 100644
--- a/src/Common/Languages/is/Tournament.php
+++ b/src/Common/Languages/is/Tournament.php
@@ -27,7 +27,6 @@
 $lang['Badge4PerPage']='3 skírteini per síðu';
 $lang['Badge4PerPageB7']='4 skírteini per síðu (B7 format)';
 $lang['BadgeConfirmPrinted']='Staðfesta prentað';
-$lang['BadgeOnlyNotPrinted']='BARA skírteini sem er ekki þegar búið að prenta?';
 $lang['BadgeOnlyPrintAccredited']='BARA skírteini af staðfestum þátttakendum?';
 $lang['BadgeOnlyPrintPhoto']='BARA skírteini með myndum?';
 $lang['BadgeOptions']='Valmöguleikar';
diff --git a/src/Common/Languages/it-rm/Install.php b/src/Common/Languages/it-rm/Install.php
index 740b8d82..fe8e978b 100644
--- a/src/Common/Languages/it-rm/Install.php
+++ b/src/Common/Languages/it-rm/Install.php
@@ -28,7 +28,6 @@
 $lang['Parameter']='Parametri';
 $lang['Password']='Parola d\'Ordine!!!';
 $lang['PHP settings']='Settaggi Piaccappì';
-$lang['PHP too old']='La tua istallazzione der Piaccappì è vecchia come \'r cucco. T\'ha da scaricà la verzione minima de IANSEO, la 5.0';
 $lang['PHP version']='Verzione Piaccappì';
 $lang['php.ini file']='Fail Piaccappìpuntoini';
 $lang['Read connection failed']='La connessione cor Servere de lettura è ita male: o nun j\'hai fornito la passuorde de amministrazzione oppure le \'nformazzioni de loghinne nun sò corette!';
diff --git a/src/Common/Languages/it-rm/Tournament.php b/src/Common/Languages/it-rm/Tournament.php
index bd3fcb95..6d3e5226 100644
--- a/src/Common/Languages/it-rm/Tournament.php
+++ b/src/Common/Languages/it-rm/Tournament.php
@@ -42,7 +42,6 @@
 $lang['BadgeIncludePhoto']='Accrediti deveno da include la foto?';
 $lang['BadgeNames']='Nome Completo (Nun stampati pè primi)';
 $lang['BadgeNoData']='Nisun dato da stampà';
-$lang['BadgeOnlyNotPrinted']='Stampa solo l\'accrediti nun ancora stampati';
 $lang['BadgeOnlyPrintAccredited']='Stampa l\'accrediti solo de li partecipanti accreditati?';
 $lang['BadgeOnlyPrintPhoto']='Stampa l\'accrediti solo de chi ha deggià la foto \'nzerita?';
 $lang['BadgeOptions']='Oppzzioni';
@@ -343,7 +342,6 @@
 $lang['TargetTo']='Piazzola Finale';
 $lang['TeamClEvent']='Classe a Squadre';
 $lang['TeamFin']='Squadre - Fasi Finali';
-$lang['TeamFinEvent']='Finale a Squadre';
 $lang['TeamQual']='Squadre - Class. de Classe';
 $lang['TicketGetScore']='Mini-Score pè l\'accuisizzione de li punteggi parziali';
 $lang['TieWinner']='Vincitore S.O.';
diff --git a/src/Common/Languages/it/Api.php b/src/Common/Languages/it/Api.php
index ee25a4bb..85460f0d 100644
--- a/src/Common/Languages/it/Api.php
+++ b/src/Common/Languages/it/Api.php
@@ -14,7 +14,7 @@
 $lang['CmdDelete']='Cancella';
 $lang['CmdImport']='Importa';
 $lang['ConfirmGenerateZip']='Conferma che stai generando il file ZIP con tutti i $a[0] per la sessione $a[1]';
-$lang['Controller']='Controllore';
+$lang['Controller']='Controllo';
 $lang['DataRefresh']='Aggiorna i dati';
 $lang['Desc-Let-1']='Volée corrente importata';
 $lang['Desc-Let-2']='Frecce mancanti nella volée corrente';
@@ -50,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='Stato della connessione';
 $lang['ISK-DeleteDevices']='Elimina dispositivi';
 $lang['ISK-DenyAccess']='Nega accesso';
+$lang['ISK-Deprecated']='IMPORTANTE: l\'app "Ianseo ScoreKeeper" è in fase di eliminazione dagli store Apple e Android e non è più supportata, pertanto sarà anche rimossa da Ianseo a Settembre 2024. Si prega di spostarsi sulla nuova "Ianseo ScoreKeeper NG".';
 $lang['ISK-DeviceAlive']='Online';
 $lang['ISK-DeviceBattery']='Batteria';
 $lang['ISK-DeviceEnabled']='Abilitato';
@@ -79,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='Codice Competizione Mancante';
 $lang['ISK-Lite-QRCode']='Stampa il QR-Code per Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='Url del Server (include protocollo e porta se diversa da porta 80)';
+$lang['ISK-Live-Deprecated']='IMPORTANTE: l\'app "Ianseo ScoreKeeper Live" non è più supportata, pertanto sarà anche rimossa da Ianseo a Settembre 2024. Si prega di spostarsi sulla nuova "Ianseo ScoreKeeper NG".';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper LIVE';
 $lang['ISK-lockPortrait']='Blocca il dispositivo il vista verticale';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
@@ -134,7 +136,7 @@
 $lang['ISK-WifiTargetRange']='WiFi preferita per la piazzola';
 $lang['ISK-WifiUse']='App in cui utilizzare questa WiFi';
 $lang['IskDeviceAssigned']='Dispositivi';
-$lang['IskResetAlert']='ATTENZIONE: Tutte le impostazioni non presenti in questa configurazione verranno rimosse, ad eccezione della funzione Raggruppamento.';
+$lang['IskResetAlert']='ATTENZIONE: Tutte le impostazioni ISK non presenti in questa configurazione verranno rimosse, ad eccezione della funzione Raggruppamento Bersagli.';
 $lang['IskScoringDevice']='Il dispositivo $a non è autorizzato a scorare in questa sessione/competizione';
 $lang['IskSpuriousDevice']='Il dispositivo $a[0] manda punti non richiesti al bersaglio $a[1]';
 $lang['IskSpuriousScore-Device']='Il dispositivo $a[0] manda punti alla piazzola $a[1] in sessione $a[2]';
@@ -151,7 +153,7 @@
 $lang['Masters']='Masters';
 $lang['MissingParameter']='Parametro mancante';
 $lang['MsgDelAllTablets']='Elimina tutti i Tablet nell\'elenco';
-$lang['MsgDelTablet']='Elimina Tablet';
+$lang['MsgDelTablet']='Rimuovi Tablet';
 $lang['MsgEmptyTemporaryOfGroup']='Elimina tabella temporanea (di tutti i dispositivi del girone selezionato)';
 $lang['NewGroup']='Nuova assegnazione Gruppi';
 $lang['NewTarget']='Nuova assegnazione Piazzole';
diff --git a/src/Common/Languages/it/BackNumbers.php b/src/Common/Languages/it/BackNumbers.php
index d69d9b94..05ad75d3 100644
--- a/src/Common/Languages/it/BackNumbers.php
+++ b/src/Common/Languages/it/BackNumbers.php
@@ -166,6 +166,8 @@
 $lang['ResetBarcodeSeparator']='Annulla il separatore del codice a barre';
 $lang['RnkCardinalEN']='Vista Cardinale (1, 2, ..., 10)';
 $lang['RnkOrdinal']='Vista Ordinale (1°, 2°, ..., 10°)';
+$lang['RnkRoman']='Numeri romani (I, II, ... IV, ... CM)';
+$lang['S-Badge']='Adesivi';
 $lang['Schedule']='Programma';
 $lang['Session']='Sessione di Qualifica';
 $lang['SessionTarget']='Codice sessione e Piazzola';
diff --git a/src/Common/Languages/it/Common.php b/src/Common/Languages/it/Common.php
index 5a6ca068..ca7da803 100644
--- a/src/Common/Languages/it/Common.php
+++ b/src/Common/Languages/it/Common.php
@@ -149,6 +149,10 @@
 $lang['Finish']='Finito';
 $lang['FirstPhase']='Fase di Partenza';
 $lang['FopSetup']='Impostazione Campo di gara';
+$lang['Gender0']='Uomo';
+$lang['Gender1']='Donna';
+$lang['GenderShort0']='M';
+$lang['GenderShort1']='F';
 $lang['GF']='Giovanissimi Femminile';
 $lang['GM']='Giovanissimi Maschile';
 $lang['HELP']='AIUTO!';
@@ -221,6 +225,7 @@
 $lang['MenuLMRemoveNoShows']='Non Rimuovere - Mostra';
 $lang['MenuLM_Accreditation']='Accreditamento';
 $lang['MenuLM_Accreditation colors management']='Gestione colori';
+$lang['MenuLM_AdvancedFeatures']='Funzioni avanzate';
 $lang['MenuLM_AdvLabels']='Stampa avanzata etichette';
 $lang['MenuLM_Archers on Targets']='Numero Arcieri per Piazzola';
 $lang['MenuLM_Arr4Set']='Frecce per set';
@@ -234,6 +239,7 @@
 $lang['MenuLM_Athlets fees status']='Arcieri con iscrizione gratuita';
 $lang['MenuLM_Authentication']='Autenticazione Utente';
 $lang['MenuLM_AutoCheckinSetup']='Setup del Check-In Automatico';
+$lang['MenuLM_Automator']='Automator';
 $lang['MenuLM_Back Number Printout']='Stampa Pettorali';
 $lang['MenuLM_Boinx']='Setup dei Layer Boinx';
 $lang['MenuLM_BoinxMeteo']='Layer Meteo di Boinx';
@@ -244,9 +250,11 @@
 $lang['MenuLM_Category Result List']='Classifiche di Classe';
 $lang['MenuLM_Change Components']='Cambia Componenti';
 $lang['MenuLM_ChangeNationsNames']='Cambia Nomi Società';
+$lang['MenuLM_ChangePassword']='Modifica password';
 $lang['MenuLM_Check Data Update']='Stato degli Inserimenti';
 $lang['MenuLM_Check shoot-off before eliminations']='Spareggi per l\'ingresso alle Eliminatorie';
 $lang['MenuLM_Check shoot-off before final phases']='Spareggi per l\'ingresso alle Finali';
+$lang['MenuLM_Check shoot-off before Rank']='Controllo SO prima della stampa Classifica';
 $lang['MenuLM_CheckAwards']='Controlla Traduzioni delle Premiazioni';
 $lang['MenuLM_CheckList']='Stampa Checklist';
 $lang['MenuLM_CIS']='CIS';
@@ -267,6 +275,9 @@
 $lang['MenuLM_Delete']='Elimina Torneo';
 $lang['MenuLM_DeleteTarget']='Annulla Assegnazione Piazzole';
 $lang['MenuLM_Distances']='Gestisci Distanze';
+$lang['MenuLM_DistrCompExport']='Esportazione dati della gara locale';
+$lang['MenuLM_DistrCompImport']='Importazione dati della gara a distanza';
+$lang['MenuLM_DistributedCompetition']='Competizione distribuita';
 $lang['MenuLM_Div/Class Result List']='Classifiche di Classe';
 $lang['MenuLM_Divisions and Classes']='Divisioni e Classi';
 $lang['MenuLM_Draw']='Sorteggio Elettronico';
@@ -300,6 +311,7 @@
 $lang['MenuLM_FinalFOPChoose']='FOP Esteso';
 $lang['MenuLM_FlightsAwardManagement']='Gestione premi raggruppamenti';
 $lang['MenuLM_FlightsManagement']='Gestione dei Flights';
+$lang['MenuLM_FontManagement']='Gestione dei caratteri';
 $lang['MenuLM_GateControl']='Pannello di Controllo Accessi della App WA Gate';
 $lang['MenuLM_GateSituation']='Situazione Accessi';
 $lang['MenuLM_Get Info']='Info Terminali';
@@ -342,6 +354,7 @@
 $lang['MenuLM_Modules']='Moduli';
 $lang['MenuLM_MoveSession']='Cambia Turno Assegnato';
 $lang['MenuLM_MoveTarget']='Sposta Piazzole';
+$lang['MenuLM_N62']='Informazioni ORIS N62A/B';
 $lang['MenuLM_New']='Nuovo';
 $lang['MenuLM_NewBacknumbers']='Pettorale Atleti';
 $lang['MenuLM_OdsExport']='Esportazione foglio di calcolo (.ods)';
@@ -419,7 +432,7 @@
 $lang['MenuLM_TV Output']='Uscita TV';
 $lang['MenuLM_TVAdvanced']='Uscita TV (Avanzato)';
 $lang['MenuLM_Twitter']='Twitter';
-$lang['MenuLM_Update']='Aggiorna Ianseo';
+$lang['MenuLM_Update']='Aggiorna I@nseo';
 $lang['MenuLM_UpdateWeb']='Aggiornamento Live';
 $lang['MenuLM_Versioning']='Gestione Versione Stampe';
 $lang['MenuLM_View Competition Info']='Visualizza Dati Gara';
@@ -446,6 +459,7 @@
 $lang['MsgImportOk']='Importazione Completata!';
 $lang['MsgInitFinalGridsError']='Attenzione: le griglie sono state già create per questo evento. Vuoi proseguire?';
 $lang['MsgInitFinalGridsOk']='Inizializzazione Riuscita!';
+$lang['MsgInitFinalGridsRunningError']='Operazione non consentita quando l\'Evento è in modalità "Running"';
 $lang['MsgMakeFinReset']='I dati degli scontri di finale sono stati resettati!<br>Occorrerà ri-eseguire le operazioni preliminari per poter inserire i dati!';
 $lang['MsgNeedInitGrids']='Errore!<br>Occore inizializzare le griglie!';
 $lang['MsgNeedShootOff']='Errore!<br>Occorre risolvere gli spareggi!';
@@ -502,6 +516,7 @@
 $lang['Score1Page1Match']='Score per singolo scontro';
 $lang['ScoreDrawing']='Solo Schema dello Score (Pagina Singola)';
 $lang['ScoreFilled']='Stampa Score compilato con i valori delle singole frecce';
+$lang['ScoreIncAllNames']='Includere tutti i possibili Avversari';
 $lang['ScoreIncEmpty']='Stampa anche scontri senza avversario';
 $lang['Scorer']='Marcatore';
 $lang['SearchOrphanTexts']='Ricerca testi non in uso';
@@ -516,6 +531,7 @@
 $lang['SF']='Seniores Femminile';
 $lang['ShootOff4Elim']='Spareggi per l\'ingresso alle Eliminatorie';
 $lang['ShootOff4Final']='Spareggi per l\'ingresso alle Finali';
+$lang['ShootOff4Rank']='Controllo SO prima della stampa Classifica';
 $lang['SM']='Seniores Maschile';
 $lang['SnapshotConf']='Configurazione Snapshot';
 $lang['SortBy']='Ordinamento';
diff --git a/src/Common/Languages/it/Errors.php b/src/Common/Languages/it/Errors.php
index 1d70b32b..85abe14d 100644
--- a/src/Common/Languages/it/Errors.php
+++ b/src/Common/Languages/it/Errors.php
@@ -2,11 +2,14 @@
 $lang['AllFieldsMandatory']='Tutti i campi sono obbligatori';
 $lang['AllMailsRedirect']='Tutti i messaggi verranno inviati a';
 $lang['Anomalies']='Anomalie';
+$lang['BackupTournaments']='Ricordatevi di salvare tutte le vostre gare prima di aggiornare o reinstallare Ianseo!';
 $lang['BarCodeSession']='C\'è un errore nelle impostazioni: provare a impostare un turno!';
 $lang['BarCodeSettings']='C\'è un errore nelle impostazioni';
+$lang['CategoresNotDefined']='Categorie non definite';
 $lang['ClassFromToError']='"Da" e "A" devono essere valori numerici';
 $lang['ClubNotFound']='Codice società non trovato nelle società esistenti. Si prega di aggiornare prima il database!';
 $lang['ConflictingCategories']='La definizione del filtro si sovrappone ai filtri precedenti per queste classi/Divisioni: $a!';
+$lang['DecodeError']='Errore di decodifica';
 $lang['DiameterMandatory']='Il diametro del bersaglio è obbligatorio';
 $lang['DirectoryNotWriteable']='La directory $a non è scrivibile. Per favore, modifica i permessi così che sia scrivibile da chiunque.';
 $lang['DistanceOutRange']='La distanza è fuori dal range';
@@ -15,6 +18,9 @@
 $lang['EmptyFrom']='Nessun mittente o mittente non inserito correttamente: questo campo è obbligatorio!';
 $lang['EmptySubject']='Soggetto Vuoto: questo campo è obbligatorio!';
 $lang['EmptyTitle']='Titolo Vuoto: questo campo è obbligatorio!';
+$lang['EndsArrowsMisMatch']='$a con errori nel settaggio volées/frecce';
+$lang['EntriesNoCategory']='Partecipanti senza Classe/Divisione';
+$lang['EntriesNoCountry']='Partecipanti senza Società/Nazione';
 $lang['ErrCodeExists']='Il codice scelto esiste già!';
 $lang['ErrCommitteeError']='Il codice del comitato o la descrizione non sono validi';
 $lang['ErrConnection']='Nessuna connessione al server $a';
@@ -32,6 +38,7 @@
 $lang['ErrRedCard']='Il comitato organizzatore ha ricevuto un cartellino rosso e non può chiedere, al momento, nessun codice per pubblicare su ianseo. Mandare una email a codes@ianseo.net per ricevere ulteriori chiarimenti.';
 $lang['ErrUnknownNation']='Nazione Sconosciuta';
 $lang['ErrYellowCard']='Il comitato organizzatore ha ricevuto un cartellino giallo perchè non ha pubblicato nessun risultato della gara. Mandare una email a codes@ianseo.net per ricevere ulteriori chiarimenti.';
+$lang['EventIncompleteSetting']='$a senza indicazioni di chi ha titolo a partecipare';
 $lang['FilterAlreadyExists']='Questo filtro esiste già';
 $lang['FilterNotEmpty']='Devi definire un filtro';
 $lang['IllegalTarget']='Il bersaglio selezionato non è nel DB';
@@ -39,7 +46,9 @@
 $lang['ImageFetchError']='Errore nell\'acquisizione dell\'immagine';
 $lang['ImageSaveError']='Immagine non salvata';
 $lang['IncompleteSettings']='Impostazioni incomplete';
+$lang['InvalidCharacters']='Il campo contiene caratteri non validi. I caratteri validi sono $a';
 $lang['InvalidEmail']='E-mail non valida: Per favore controlla 2 volte prima di effettuare il salvataggio';
+$lang['InvalidLogin']='Login non valido';
 $lang['LockedProcedure']='Questa Procedura è BLOCCATA';
 $lang['MailingAlreadyExists']='Una Email esiste già con il medesimo titolo ({$a}), per favore cambia il titolo o seleziona la Email da modificare dal selettore.';
 $lang['MailingDeleteText']='Conferma di voler eliminare definitivamente questa mail!';
@@ -51,21 +60,34 @@
 $lang['MissingAccreditation']='Manca l\'accreditamento online!';
 $lang['MissingData']='Mancano dei dati';
 $lang['MissingPhpIntlModule']='La traslitterazione può essere fatta installando o attivando il modulo php-intl';
+$lang['MysqlInnoDbProcess']='Ianseo aggiornerà il database per migliorare le prestazioni. Questa operazione potrebbe richiedere del tempo.';
+$lang['MysqlUpdateNeeded']='Stai utilizzando un Server Mysql molto vecchio. Si prega di aggiornare il server, XAMP, WAMP o LAMP a una versione più recente o reinstallare Ianseo da zero.';
 $lang['NameNotEmpty']='Il nome non può essere vuoto';
+$lang['NoCountryInsert']='Nessun Paese/Società inserita';
+$lang['NoData']='Nessun dato fornito';
+$lang['NoDistancesSet']='Divisioni/Classi senza distanze definite';
 $lang['NoDNSRecord']='Il Nome del Server non è corretto o non è online: per favore, ricorda che occorre essere connessi ad internet per impostare questa opzione.';
+$lang['NoEntryInsert']='Nessun Partecipante inserito';
 $lang['NoMailingTemplate']='Nessun modello email selezionato/disponibile';
 $lang['NoMailRecipients']='Nessuno a cui inviare la mail! Si prega di rivedere le opzioni di filtro.';
 $lang['NoPrivilege']='Privilegi insufficienti: non sei autorizzato ad operare su questa pagina!';
 $lang['NoSameOrders']='Il nuovo valore dell\'ordine non può essere duplicato.';
 $lang['NoSmtpServerSet']='Per favore, imposta il server SMTP prima di mandare emails!';
+$lang['NoTargetSet']='Divisioni/Classi senza bersaglio definito';
+$lang['PhpOutdated']='La tua versione di PHP è obsoleta. I@nseo potrebbe funzionare, ma alcune funzionalità richiedono almeno la versione {$a}.<br/>Si prega di aggiornare l\'installazione il prima possibile per supportare PHP {$a} o più recente.';
 $lang['RegExp']='Per utilizzare RegExp (espressioni regolari), fare riferimento a $a';
+$lang['ResetSyncData']='Reset dei dati di sincronizzazione';
+$lang['ServiceNotAvailable']='Servizio non disponibile';
 $lang['SetupNotFinished']='Non puoi accedere a questa pagina: completa prima {$a}!';
 $lang['SpecialFilterDiscrepancy']='Un filtro speciale è stato impostato, ma non è attivo!';
 $lang['SqlJolly']='In una istruzione SQL il percento "%" funge da jolly(rappresenza zero, uno o più caratteri), mentre l\'underscore "_" rappresenta uno e un solo carattere. Per esempio "OL%" corrisponderà a tutti gli olimpici: "OLSM" così come a "OLSF", "OLMM", ecc. Mentre "OL_M" corrisponderà a "OLSM","OLMM", "OLJM", ecc, ma non a "OLSF".';
+$lang['SyncNotAvailable']='Sincronizzazione non disponibile';
 $lang['TargetNumberMismatch']='Il numero della piazzola può essere solamente nella forma [NumeroPiazzola][LetteraPiazzola], ad esempio: [129][C]';
 $lang['TargetRangeMismatch']='Gli intervalli delle piazzole devono essere 2 numeri di piazzole (senza lettere) separati da un trattino (segno meno). Il primo numero inferiore al secondo, ad esempio: 23-44';
 $lang['TextSmtpDelete']='Per favore, conferma che vuoi rimuovere i settaggi di SMTP da questa installazione di Ianseo';
 $lang['TooManyArrows']='Troppi valori totali di frecce: il massimo è $a';
+$lang['TooManyDistancesMatch']='Divisioni/Classi con più distanze definite';
 $lang['TooManyElimQualified']='Gironi del tipo $a[0] possono accettare solo $a[1] arcieri';
+$lang['WrongData']='Dati errati';
 $lang['WrongPort']='Questa porta non è supportata!';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/it/Help.php b/src/Common/Languages/it/Help.php
index 2ac49e91..902eab0f 100644
--- a/src/Common/Languages/it/Help.php
+++ b/src/Common/Languages/it/Help.php
@@ -1,4 +1,5 @@
 <?php
+$lang['AuthTourCode']='Elenco separato da virgole dei codici gara gestibili dall\'utente.<br>Carattere jolly ammesso: "%"';
 $lang['AutoCheckinAlreadyDone']='Hai già effettuato il check-in<br>Se hai bisogno di modificare qualsiasi informazione, procedi al banco dell\'accreditamento';
 $lang['AutoCheckinConfirm']='Se tutti i dati sono corretti premi CONFERMA CHECK-IN<br> Altrimenti premi ANNULLA e procedi al DESK di accreditamento';
 $lang['AutoCheckinSearch']='Scansiona il QR-Code che hai ricevuto o digita il tuo nome';
@@ -11,13 +12,23 @@
 $lang['AutoImportSettings']='<b>Solo per Utenti Esperti</b><br>Cambiare i parametri di default può portare ad avere risultati non precisi.<br> E\' importante ricalcolare tutte le rank degli eventi che sono stati impostati manualmente PRIMA di inviare i risultati a ianseo.net o stampare i risultati e, in generale, sempre prima di fare qualsiasi tipo di distribuzione.';
 $lang['ChangeComponents']='<p>Per procedere con un cambio di componente, prima togliere l\'atleta che non è più nel team in modo da poter attivare le opzioni di sostituzione.</p> &#9654&nbsp;Punteggi inclusi nel totale del team nella fase di qualifica<br> &#9655&nbsp;Punteggi non inclusi nel totale del team nella fase di qualifica';
 $lang['CombiCompList']='Elenco dei Codici Competizione, separati da virgole';
+$lang['ExportAdvanced']='Esporta anche i dati dei partecipanti e del Paese/Società da fornire se mancanti al Destinatario';
+$lang['ExportCategories']='Scegliere quali Div.Cl/eventi esportare (nessuna selezione significa tutte)';
+$lang['ExportDistances']='Seleziona quali distanze esportare (nessuna selezione significa tutte le distanze)';
+$lang['ExportSchedule']='Seleziona dal programma di gara il turno da esportare';
+$lang['ExportScheduleToday']='Mostra solo i turni programmati per oggi';
 $lang['FlightsManagement']='<b>Ai raggruppamenti per categorie</b> <ul> <li>Selezionare in quale Voleé-Totale di Distanza-Totale Completo calcolare i raggruppamenti;</li> <li>Selezionare la dimensione iniziale della riduzione di raggruppamento per categoria. Il sistema precarica la tabella di raggruppamento standard NFAA quando la competizione lo consente;</li> <li>L\'anteprima del raggruppamento calcolerà TUTTE LE CATEGORIE; premete il pulsante di ricarica a lato della dimensione della riduzione di raggruppamento per forzare il calcolo di una singola categoria; </li> <li>I raggruppamenti contrassegnati con l\'arancione sono solo un indicatore di una differenza tra l\'anteprima dei raggruppamenti e la tabella delle regole. NON influisce sulla divisione del raggruppamento;</li> <li>Usare i comandi “Elimina”, “Separa” e “Unisci” per regolare le informazioni sui raggruppamenti. Si noti che dopo aver eseguito un\'anteprima completa o un aggiornamento delle categorie, tutte le modifiche apportate al raggruppamento vengono perse;</li> </ul> <b>Note</b> <ul> <li>Le categorie con un numero troppo basso di partecipanti vengono escluse dal raggruppamento. Il raggruppamento può essere forzato indicando la quantità di riduzione del raggruppamento;</li> <li>Se una categoria è considerata raggruppabile, utilizzare \'-1\' come riduzione per escluderla esplicitamente dal processo di raggruppamento.</li> <li>Professionisti e/o Campionati sono esclusi dal raggruppamento e sono contrassegnati in grigio</li> </ul>';
+$lang['FontFamily']='Nome del carattere da utilizzare nel CSS';
+$lang['FontFile']='Posizione del file sul disco';
+$lang['FontName']='Nome effettivo del carattere';
+$lang['FontStyle']='Stile del carattere in CSS';
+$lang['FontWeight']='Peso del carattere in CSS';
 $lang['GetBarcodeSeparator']='Dopo aver stampato la pagina con i riferimenti dei Codici a Barre, leggi con la pistola il codice a barre "SEPARATORE" in modo da attivare il corretto lettore';
 $lang['HomePage']='Questa è la pagina dove puoi selezionare o creare un Torneo';
 $lang['ISK-LockedSessionHelp']='L\'icona {$a} indica se la app può inserire o meno dei punteggi nella sessione';
 $lang['ISK-ServerUrlPin']='<b>NON RIVELARE QUESTO NUMERO</b><br>Scegli un PIN (4 Cifre Numeriche) da usare per accedere alla tua competizione.<br>I Dispositivi potranno inviare punteggi alla tua gara solo leggendo il QR-Code che viene stampata da IANSEO.<br> In caso di inserimento manuale dei dati di gara nella app Ianseo Scorekeeper LITE, Il codice competizione da usare è <b>{$a}</b>';
 $lang['QrCodeLandscape']='Un singolo o doppio "<" disegnerà una freccia che punta a sinistra. Un singolo o doppio ">" disegnerà una freccia che punta a destra. Un singolo o doppio "^" disegnerà una freccia che punta in alto. Una singola o doppia "v" disegnerà una freccia che punta verso il basso.';
-$lang['QrCodePortrait']='Il campo è compatibile con HTML. Se inserisci qualcosa circondato da &lt;qrcode&gt;...&lt;/qrcode&gt; il contenuto verrà modificato in un QR-Code';
+$lang['QrCodePortrait']='Il campo è compatibile con HTML. Se inserisci qualcosa circondato da &lt;qrcode&gt;...&lt;/qrcode&gt;  il contenuto verrà modificato in un QR-Code';
 $lang['ScoreBarCodeShortcuts']='Leggi il Codice a Barre stampato sullo Score.
 Inserendo # seguito dal nome di un atleta si cerca nel database questo atleta.
 Inserendo @ seguita dal numero di piazzola si cerca nel database questa piazzola. La distanza DEVE essere specificata. La sessione può essere specificata (primo numero) e il numero della piazzola deve essere composto da 3 cifre';
@@ -30,5 +41,7 @@
 $lang['TV-RotEdit']='<div>Una pagina di presentazione è composta da almeno una pagina di contenuto.</div><div>Le pagine di contenuto verranno quindi mostrate una dopo l\'altra e ricominceranno daccapo.</div> <div><b> NOTA:</b> nei motori di versione normale e leggera, il primo contenuto viene nuovamente mostrato come ultimo, è quindi consigliabile inserire come primo contenuto un\'immagine (ad esempio il logo della competizione).</div> <div> I contenuti possono essere inerenti alla competizione (elenco piazzole, qualifiche, scontri...) oppure "multimediali" (immagini, messaggi HTML, ...).</div>';
 $lang['TV-RotEdit-DB']='<h2>Gestione CSS3 (motore avanzato)</h2><h3>Unità di lunghezza</h3><ul><li><b>rem:</b> altezza del carattere principale</li><li><b>em:</b>altezza del carattere corrente</li><li><b>ex:</b>altezza della "x"minuscola</li><li><b>ch: </ b> larghezza del numero "0"</li><li><b>vh:</b>un centesimo dell\'altezza dello schermo</li><li><b>vw:</b> un centesimo della larghezza dello schermo</li><li><b>vmin:</b> un centesimo del valore minimo tra l\'altezza e la larghezza dello schermo</li><li><b>vmax:</b> un centesimo del valore massimo tra l\'altezza e la larghezza dello schermo</li></ul><h3> Box flessibili</h3><li><b>contrai ABC:</b><ul><li><b>A</b>: se 0 significa che la casella non può espandersi; se> 1 significa che la casella può espandersi a quella "velocità" rispetto ad altre caselle (se la casella 1 ha 2 e la casella 2 ha 3, la casella 2 si espanderà di 1,5 in più rispetto alla casella 1 che a sua volta si espanderà il doppio di una casella con questo valore impostato a 1)</li><li><b>B:</b> se 0 il box non può ridursi; se 1 il box può ridursi</li><li> <b>C:</b> dimensione iniziale del box</li></ul></li><h3>Riferimento CSS</h3><a href="https://developer.mozilla.org/en-US/docs/Web/CSS/Reference">https://developer.mozilla.org/en-US/docs/Web/CSS/Reference</a>';
 $lang['TV-RotList']='<div>Questo è l\'elenco delle pagine di presentazione disponibili da inviare a maxischermi, monitor o broadcast.</div><div> Sono forniti 3 diversi motori, fare clic sul collegamento per attivarli:</div><ul><li>un normale motore compatibile con la maggior parte dei browser</li><li>una versione leggera del motore compatibile con la maggior parte dei browser ma che utilizza meno risorse</li><li>una versione avanzata che utilizza i browser moderni funzionalità HTML5</li></ul><div>Per creare un nuovo contenuto, inserisci un nome e premi il pulsante.</div>';
+$lang['UserName']='Deve essere unico nel Sistema. Lunghezza minima: 6 caratteri';
+$lang['UserPassword']='Lasciare vuoto per mantenere la password corrente';
 $lang['ZeroBased']='Numero a base zero';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/it/IOC_Codes.php b/src/Common/Languages/it/IOC_Codes.php
index e8cb3447..466cef9d 100644
--- a/src/Common/Languages/it/IOC_Codes.php
+++ b/src/Common/Languages/it/IOC_Codes.php
@@ -51,7 +51,7 @@
 $lang['CHN']='Cina';
 $lang['CIV']='Costa d\'Avorio';
 $lang['CMR']='Camerun';
-$lang['COD']='Repubblica Democratica del Congo';
+$lang['COD']='Congo';
 $lang['COK']='Isole Cook';
 $lang['COL']='Colombia';
 $lang['COM']='Comore';
@@ -59,6 +59,7 @@
 $lang['CRC']='Costa Rica';
 $lang['CRO']='Croazia';
 $lang['CUB']='Cuba';
+$lang['CUW']='Curaçao';
 $lang['CYP']='Cipro';
 $lang['CZE']='Repubblica Ceca';
 $lang['DEN']='Danimarca';
@@ -74,7 +75,10 @@
 $lang['ETH']='Etiopia';
 $lang['FIJ']='Figi';
 $lang['FIN']='Finlandia';
+$lang['FLK']='Isola di Falkland';
+$lang['FPO']='Tahiti';
 $lang['FRA']='Francia';
+$lang['FRO']='Isole Faroe';
 $lang['FSM']='Micronesia';
 $lang['GAB']='Gabon';
 $lang['GAM']='Gambia';
@@ -84,6 +88,7 @@
 $lang['GEQ']='Guinea Equatoriale';
 $lang['GER']='Germania';
 $lang['GHA']='Gana';
+$lang['GLP']='Guadalupe';
 $lang['GRE']='Grecia';
 $lang['GRN']='Grenada';
 $lang['GUA']='Guatemala';
@@ -101,7 +106,7 @@
 $lang['IRQ']='Iraq';
 $lang['ISL']='Islanda';
 $lang['ISR']='Israele';
-$lang['ISV']='Isole Vergini Statunitensi';
+$lang['ISV']='Isole Vergini Americane';
 $lang['ITA']='Italia';
 $lang['IVB']='Isole Vergini Britanniche';
 $lang['JAM']='Giamaica';
@@ -112,11 +117,13 @@
 $lang['KGZ']='Kirghizistan';
 $lang['KIR']='Kiribati';
 $lang['KOR']='Repubblica di Corea';
+$lang['KOS']='Kosovo';
 $lang['KSA']='Arabia Saudita';
 $lang['KUW']='Kuwait';
 $lang['LAO']='Laos';
 $lang['LAT']='Lettonia';
 $lang['LBA']='Libia';
+$lang['LBN']='Libano';
 $lang['LBR']='Liberia';
 $lang['LCA']='Santa Lucia';
 $lang['LES']='Lesotho';
@@ -124,6 +131,7 @@
 $lang['LIE']='Liechtenstein';
 $lang['LTU']='Lituania';
 $lang['LUX']='Lussemburgo';
+$lang['MAC']='Macao';
 $lang['MAD']='Madagascar';
 $lang['MAR']='Marocco';
 $lang['MAS']='Malesia';
@@ -137,7 +145,7 @@
 $lang['MEX']='Messico';
 $lang['MGL']='Mongolia';
 $lang['MHL']='Isole Marshall';
-$lang['MKD']='Macedonia';
+$lang['MKD']='Macedonia del Nord';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -145,13 +153,18 @@
 $lang['MOZ']='Mozambico';
 $lang['MRI']='Mauritius';
 $lang['MTN']='Mauritania';
+$lang['MTQ']='Martinica';
 $lang['MYA']='Myanmar';
 $lang['NAM']='Namibia';
 $lang['NCA']='Nicaragua';
+$lang['NCL']='Nuova Caledonia';
 $lang['NED']='Paesi Bassi';
 $lang['NEP']='Nepal';
+$lang['NFK']='Isola Norfolk';
 $lang['NGR']='Nigeria';
 $lang['NIG']='Niger';
+$lang['NIU']='Niue';
+$lang['NMI']='Isole Marianne Settentrionali';
 $lang['NOR']='Norvegia';
 $lang['NRU']='Nauru';
 $lang['NZL']='Nuova Zelanda';
@@ -203,6 +216,7 @@
 $lang['TOG']='Togo';
 $lang['TPE']='Taipei';
 $lang['TRI']='Trinidad e Tobago';
+$lang['TTO']='Trinidad e Tobago';
 $lang['TUN']='Tunisia';
 $lang['TUR']='Turchia';
 $lang['TUV']='Tuvalu';
diff --git a/src/Common/Languages/it/ISK-App.php b/src/Common/Languages/it/ISK-App.php
index 3060927c..64748e50 100644
--- a/src/Common/Languages/it/ISK-App.php
+++ b/src/Common/Languages/it/ISK-App.php
@@ -25,7 +25,7 @@
 $lang['AppTitle']='ScoreKeeper NG';
 $lang['BarcodeErrorMessage']='Codice a barre NON valido';
 $lang['BarcodeErrorTitle']='Errore Codice a barre';
-$lang['BarcodeScanPrompt']='Inquadrare il Codice a barre';
+$lang['BarcodeScanPrompt']='Inquadra il QR-Code';
 $lang['DeviceId']='ID Dispositivo';
 $lang['EnterPinCodeInvalidValue']='Codice di autorizzazione non valido';
 $lang['EnterPinCodeMessage']='Per usare questa funzione inserisci il codice di autorizzazione';
@@ -42,11 +42,11 @@
 $lang['HelpContactHead']='Contatti';
 $lang['HelpContactText']='Se hai difficoltà con la app o necessiti assistenza, puoi contattarci via email scrivendo a';
 $lang['HelpIntro13D']='Tiro 3D';
-$lang['HelpIntro1Field']='Tiro Hunter e Field';
+$lang['HelpIntro1Field']='Tiro di Campagna (Hunter e Field)';
 $lang['HelpIntro1Head']='Scorekeeper NG';
 $lang['HelpIntro1RR']='Gironi all\'italiana';
-$lang['HelpIntro1TargetIn']='Tiro in sala';
-$lang['HelpIntro1TargetOut']='Tiro all\'aperto';
+$lang['HelpIntro1TargetIn']='Tiro alla Targa al Chiuso (Indoor)';
+$lang['HelpIntro1TargetOut']='Tiro alla Targa all\'Aperto (Outdoor)';
 $lang['HelpIntro1Text']='è la nuova generazione di app per lo scoring! Affianca il programma Ianseo e permette di recuperare dal vivo i punteggi di:';
 $lang['HelpIntro2Elim']='Gironi Eliminatori';
 $lang['HelpIntro2MI']='Scontri Individuali';
@@ -59,7 +59,7 @@
 $lang['HelpIntro3LiveText']='- come la versione pro, con in più la comunicazione diretta da e per i dispositivi (per utenti avanzati)';
 $lang['HelpIntro3Pro']='Pro';
 $lang['HelpIntro3ProText']='- come la versione Lite, con in più gestione dei dispositivi e dei risultati live da Ianseo';
-$lang['HelpIntro3Text']='Scorekeeper NG riunisce le versioni Lite, Pro o Live di Ianseo. In base al tipo di gara impostato, la app abiliterà o disabiliterà le funzioni avanzate.';
+$lang['HelpIntro3Text']='Scorekeeper NG riunisce le versioni Lite, Pro o Live di I@nseo. In base al tipo di gara impostato, la app abiliterà o disabiliterà le funzioni avanzate.';
 $lang['HelpIntro4Text']='La app contiene 5 funzioni principali:';
 $lang['HelpMainHead']='Inizio';
 $lang['HelpMainText']='Questa è la schermata iniziale vista dagli arcieri una volta che la app è stata correttamente configurata e collegata a Ianseo. Mostra le informazioni di gara, la sessione corrente, la lista degli arcieri assegnati al/ai bersaglio/bersagli impostati. Per ogni tiratore viene mostrato il tipo di bersaglio, i valori frecce e i totali. Toccando il nominativo si apre la schermata di inserimento punti. È anche possibile visualizzare lo score completo per tutti gli arcieri e tutte le distanze impostate per quel dispositivo.';
@@ -80,7 +80,7 @@
 $lang['MainTargets']='Piazzole assegnate';
 $lang['MainTotal']='Totale';
 $lang['MainWaitingConfig']='Consegnare alla squadra risultati';
-$lang['MainWinner']='VINCENTE';
+$lang['MainWinner']='V I N C I T O R E';
 $lang['MenuAppVersion']='Versione:';
 $lang['MenuCloseMenu']='Chiudi menù';
 $lang['MenuDeviceId']='ID Dispositivo:';
@@ -126,7 +126,7 @@
 $lang['SettingsElimFirstTarget']='Primo bersaglio';
 $lang['SettingsEventSelection']='Selezione dell\'evento';
 $lang['SettingsFunctionsCategory']='Altre funzioni';
-$lang['SettingsFunctionsResetSettings']='Reset delle impostazioni ai valori di default';
+$lang['SettingsFunctionsResetSettings']='Reset imp. default';
 $lang['SettingsGenerateQr']='Genera';
 $lang['SettingsGpsCategory']='Posizione GPS';
 $lang['SettingsGpsFrequency']='Frequenza';
@@ -140,10 +140,10 @@
 $lang['SettingsManualAllDistances']='Tutte';
 $lang['SettingsManualDistance']='Distanza';
 $lang['SettingsManualEvent']='Evento';
-$lang['SettingsManualGroup']='Gruppo';
+$lang['SettingsManualGroup']='Piazzola';
 $lang['SettingsManualMatch']='Scontro';
 $lang['SettingsManualPhase']='Fase';
-$lang['SettingsManualRRGroup']='Gruppo';
+$lang['SettingsManualRRGroup']='Piazzola';
 $lang['SettingsManualRRLevel']='Livello';
 $lang['SettingsManualRRRound']='Round';
 $lang['SettingsManualSession']='Turno';
@@ -173,7 +173,7 @@
 $lang['SettingsStageMI']='Scontri Individuali';
 $lang['SettingsStageMT']='Scontri a Squadre';
 $lang['SettingsStageP']='Gironi';
-$lang['SettingsStageQ']='Qualificazioni';
+$lang['SettingsStageQ']='Qualifica';
 $lang['SettingsStageRI']='Gironi all\'italiana - Individuale';
 $lang['SettingsStageRT']='Gironi all\'italiana - Squadre';
 $lang['SettingsTitle']='Impostazioni';
@@ -185,9 +185,9 @@
 $lang['SetupManually']='Configurazione manuale';
 $lang['SetupNeedHelp']='Hai bisogno di aiuto?';
 $lang['SetupUsingBarcode']='Imposta l\'app utilizzando un QR-Code';
-$lang['ShootoffClosestArcher']='più centrale';
+$lang['ShootoffClosestArcher']='più vicina al centro';
 $lang['ShootoffClosestNew']='Nuovo Shoot-Off';
-$lang['ShootoffClosestTitle']='Richiesto il più centrale';
+$lang['ShootoffClosestTitle']='Necessario indicare la più vicina al centro';
 $lang['ShootoffNewConfirmation']='Conferma Shoot-Off';
 $lang['ShootoffNewIsNeeded']='Serve un altro Shoot-Off per definire il vincitore dello scontro?';
 $lang['SignatureClear']='Cancella';
diff --git a/src/Common/Languages/it/Ianseo.php b/src/Common/Languages/it/Ianseo.php
index dbb2659c..0b175c37 100644
--- a/src/Common/Languages/it/Ianseo.php
+++ b/src/Common/Languages/it/Ianseo.php
@@ -5,7 +5,7 @@
 $lang['Cert-Level2']='Corso Base';
 $lang['Cert-Level3']='Corso Avanzato';
 $lang['Cert-Level4']='Master';
-$lang['Cert-Level5']='Staff Ianseo';
+$lang['Cert-Level5']='Staff I@nseo';
 $lang['CertificateManagement']='Gestione Certificati';
 $lang['GenerateFile']='Crea File';
 $lang['ResetItems']='Reset degli Elementi.<br>Questa azione non richiede conferma e non può essere annullata!<br>Il Reset delle qualifiche azzera anche tutti gli eventi successivi!';
diff --git a/src/Common/Languages/it/Install.php b/src/Common/Languages/it/Install.php
index ade70855..36a0e81a 100644
--- a/src/Common/Languages/it/Install.php
+++ b/src/Common/Languages/it/Install.php
@@ -6,7 +6,7 @@
 $lang['AcceptGPL-Desc2']='Dovresti aver ricevuto una copia della licenza GPL3. In caso contrario, vedi $a.';
 $lang['AcceptGPL-Logo']='Maggiori informazoni';
 $lang['AcceptGPL-ReadTXT']='Leggi la Licenza';
-$lang['AcceptGPL-Start']='Per Installare, Aggiornare o Utilizzare Ianseo spunta la casella seguente:';
+$lang['AcceptGPL-Start']='Per Installare, Aggiornare o Utilizzare I@nseo spunta la casella seguente:';
 $lang['Changed']='Cambi';
 $lang['cmdForceUpdate']='Forza l\'aggiornamento';
 $lang['Config write failed']='Impossibile scrivere il file di configurazione. Controllare i permessi sulla cartella "Common" nella cartella di installazione principale di IANSEO.';
@@ -28,13 +28,14 @@
 $lang['Credits-License']='IANSEO è rilasciato sotto la LICENZA PUBBLICA GENERALE GNU versione 3 (GPLV3)';
 $lang['Credits-Support']='Supporto (OTRS)';
 $lang['Credits-TranslationCoordination']='Coordinatore della traduzione';
-$lang['Credits-Translators']='Traduttori di IANSEO';
+$lang['Credits-Translators']='Traduttori di I@NSEO';
 $lang['Database name']='Nome Database';
 $lang['Deleting']='Cancellazione file non usati/obsoleti';
 $lang['Done']='fatto!';
 $lang['Email']='Email';
 $lang['Email not in DB']='La mail non  nel nostro DataBase';
 $lang['EventWillBeReset']='ATTENZIONE: un cambio in "$a[0]", "$a[1]" o "$a[2]" ripristinerà tutti i parametri della gara ai valori predefiniti per la scelta effettuata.';
+$lang['ExportAllComps']='Esportazione di tutte le competizioni';
 $lang['Failed']='FALLITO!';
 $lang['Failing install']='Aggiornare l\'installazione di PHP prima di aprire nuovamente il programma IANSEO.';
 $lang['Field24Normal']='Tiro di Campagna 24 Piazzole';
@@ -73,7 +74,7 @@
 $lang['NFAAField-5Dist']='2xField, 2xHunter, Animal';
 $lang['NoChanges']='Invariati';
 $lang['NoData']='Nessun dato inviato...';
-$lang['NoDowngrade']='Non è possibile aggiornare a una versione precedente la tua installazione. Se vuoi proprio farlo, installa una nuova versione di Ianseo <b>USANDO UN NOME DI DATABASE DIVERSO</b>.';
+$lang['NoDowngrade']='Non è possibile aggiornare a una versione precedente la tua installazione. Se vuoi proprio farlo, installa una nuova versione di I@nseo <b>USANDO UN NOME DI DATABASE DIVERSO</b>.';
 $lang['NordicYouthChamp']='Campionati nordici giovanil';
 $lang['NorgesRunden']='Norges Runden';
 $lang['NorgesRundenFinals']='Norges Runden con Finali';
@@ -81,13 +82,13 @@
 $lang['NorskKortrundeFinals']='Norsk kortrunde con Finali';
 $lang['NoSubRules']='Nessuna sottoregola';
 $lang['NotFound']='Non trovati';
-$lang['NothingToDo']='La tua installazione di Ianseo è aggiornata. Torna a controllare ogni tanto se ci sono aggiornamenti, dato che aggiungiamo di continuo nuove funzionalità e correzioni di bachi e regolamenti.';
-$lang['NotUpdatable']='La tua installazione di Ianseo non può essere aggiornata automaticamente. Controlla che la cartella Ianseo e tutti i suoi contenuti siano scrivibili dal server o da tutti.';
+$lang['NothingToDo']='La tua installazione di I@nseo è aggiornata. Torna a controllare ogni tanto se ci sono aggiornamenti, dato che aggiungiamo di continuo nuove funzionalità e correzioni di bachi e regolamenti.';
+$lang['NotUpdatable']='La tua installazione di Ianseo non può essere aggiornata automaticamente. Controlla che la cartella Ianseo ($a) e tutti i suoi contenuti siano scrivibili dal server o da tutti.';
 $lang['Optimal value']='Valore Ottimale';
 $lang['Parameter']='Parametro';
 $lang['Password']='Password';
 $lang['PHP settings']='Impostazioni PHP';
-$lang['PHP too old']='La versione di PHP installata è troppo vecchia. La versione minima per utilizzare IANSEO è la 5.0';
+$lang['PHP too old']='La versione di PHP installata è troppo vecchia. La versione minima per utilizzare IANSEO è 8.0.';
 $lang['PHP version']='Versione PHP';
 $lang['php.ini file']='file php.ini';
 $lang['Prepare']='Preparazione dati per l\'aggiornamento.';
@@ -236,25 +237,25 @@
 $lang['SetWAPools-One']='Classe unica (WA 4 Gironi)';
 $lang['SetYouthClass']='Classi giovanili';
 $lang['SpecialUpdate']='Stai usando una versione "testing".<br/>Solo pochi utenti hanno accesso a questa versione: inserisci la tua e-mail di registrazione per procedere.<br/>Sarà inviata una e-mail di notifica dell\'avvenuta operazione sia a te sia allo Staff Ianseo.';
-$lang['Start Ianseo']='Vai a IANSEO';
+$lang['Start Ianseo']='Vai a I@NSEO';
 $lang['Status']='Stato';
 $lang['stdValue']='Valore';
 $lang['Suboptimal']='Sebbene il file php.ini non è configurato con i valori ottmali, <br/>la maggior parte delle funzionalità di IANSEO sono operative.<br/>Consigliamo caldamente di impostare i parametri ai valori ottimali.';
 $lang['System value']='Valore Attuale';
 $lang['UpdateInProgress']='Un aggiornamento è già in corso, attendi...';
-$lang['UpdatePrepared']='La tua installazione di Ianseo sta per essere aggiornata automaticamente. Ricordati di fare un salvataggio di tutte le gare importanti prima di iniziare. L\'aggiornamento potrebbe durare parecchio tempo, in base al tipo di collegamento e dal numero di elementi che devono essere aggiornati.<br/>Si ricorda che qualunque contenuto non originale verrà rimosso, <b>tranne il contenuto della cartella «Modules/Custom»</b>.';
+$lang['UpdatePrepared']='La tua installazione di I@nseo sta per essere aggiornata automaticamente. Ricordati di fare un salvataggio di tutte le gare importanti prima di iniziare. L\'aggiornamento potrebbe durare parecchio tempo, in base al tipo di collegamento e dal numero di elementi che devono essere aggiornati.<br>Si ricorda che qualunque contenuto non originale verrà rimosso, <b>tranne il contenuto della cartella «Modules/Custom»</b>.';
 $lang['Updating']='Aggiornamento della versione locale di Ianseo in corso';
 $lang['UpdatingLanguages']='Aggiornamento lingue installate';
 $lang['UpdatingModulesInfo']='Aggiornamento delle informazioni sui moduli';
 $lang['UpgradeFinished']='L\'aggiornamento è concluso.';
 $lang['User']='Nome utente';
 $lang['Value']='Valori (arrays indicizzati: key1::value1|key2::value2)';
-$lang['WhatIanseoDoes01']='<b>Regole World Archery e FITARCO:</b> Ianseo è sempre aggiornato con le regole World Archery e viene aggiornato alle regole FITARCO dietro indicazioni dell\'ufficio tecnico. Gli sviluppatori sono disponibili per adattare ianseo a particolari regole o formati di gara!';
-$lang['WhatIanseoDoes02']='<b>Aiuto e supporto:</b> se hai bisogno di aiuto manda una mail a $a: riceverai una risposta direttamente da uno degli sviluppatori di Ianseo!';
-$lang['WhatIanseoDoes03']='<b>Corsi e aggiornamenti in sede:</b> Ianseo è disponibile a tenere corsi e aggiornamenti, di due livelli differenti. Il primo prevede la conoscenza di tutto ianseo senza l\'uso di tastierini elettronici, il secondo è destinato all\'utilizzo e alla soluzione dei problemi dei tastierini elettronici.';
-$lang['WhatIanseoDoes04']='<b>Donate!</b> Ianseo è un programma gratuito e open source... se ti piace aiutaci a mantenere software e server aggiornati: premi il tasto "Donate" nella home page di $a!';
-$lang['WhatIanseoDoes05']='<b>Social Media:</b> Ianseo è anche su $a!';
-$lang['WhatIanseoDoesTitle']='Cosa può fare Ianseo per le tue gare';
+$lang['WhatIanseoDoes01']='<b>Regole World Archery e FITARCO:</b> I@nseo è sempre aggiornato con le regole World Archery e viene aggiornato alle regole FITARCO dietro indicazioni dell\'ufficio tecnico. Gli sviluppatori sono disponibili per adattare I@nseo a particolari regole o formati di gara!';
+$lang['WhatIanseoDoes02']='<b>Aiuto e supporto:</b> se hai bisogno di aiuto manda una mail a <a href="mailto:aiuto@ianseo.net">aiuto@ianseo.net</a> o $a : riceverai una risposta direttamente da uno degli sviluppatori di I@nseo!';
+$lang['WhatIanseoDoes03']='<b>Corsi e aggiornamenti in sede:</b> I@nseo è disponibile a tenere corsi e aggiornamenti, di due livelli differenti. Il primo prevede la conoscenza di tutto I@nseo senza l\'uso dei dispositivi elettronici mentre il secondo è destinato all\'utilizzo e alla soluzione dei problemi dei dispositivi elettronici per poter gestire una gara "freccia per freccia".';
+$lang['WhatIanseoDoes04']='<b>Donate!</b> I@nseo è un programma gratuito e open source... se ti piace aiutaci a mantenere software e server aggiornati: premi il pulsante "<a href="https://www.paypal.com/signin?forceLogin=true&returnUri=https%3A%2F%2Fwww.paypal.com%2Fdonate&state=%252Fmember%253Ftoken%253DTzF3usuGHGmQI9zuCtSVQO54Thj_HfNKThVQzNlaFuh944i3gjadYtdZF59RT6AFpnmsCPBP8SrfyUoW%2526fromUL%253Dtrue&intent=donate&ctxId=868e29bfd4584e08b56383b093e7f7ec" target="_blank">PayPal</a>" o "<a href="https://donate.stripe.com/eVa3es65S07L2HK8ww" target="_blank">Stripe</a>" nella home page di $a!';
+$lang['WhatIanseoDoes05']='<b>Social Media:</b> I@nseo è anche su $a!';
+$lang['WhatIanseoDoesTitle']='Cosa può fare I@nseo per le tue gare';
 $lang['Write connection failed']='La connessione con il server di scrittura è fallita: o non è stata fornita a password di amministrazione oppure le informazioni di login non sono corrette!';
 $lang['Write Database not present']='Il database di scritturanon è accessibile: o il nome del DB è errato oppure non è stata fornita la password di amministrazione per crearlo';
 $lang['Write server']='Server di Scrittura';
diff --git a/src/Common/Languages/it/ODF.php b/src/Common/Languages/it/ODF.php
index a2e4f1c7..b9f68c89 100644
--- a/src/Common/Languages/it/ODF.php
+++ b/src/Common/Languages/it/ODF.php
@@ -33,7 +33,7 @@
 $lang['IntSCHED']='Programma';
 $lang['IntSESSION']='Sessioni ODF';
 $lang['IntTRANSLATE']='Stringhe multilingue';
-$lang['IrmHelp']='IRM:Utilizzato per posizionare la voce nell\'apposita posizione sulle stampe, che si trova alla fine dei PDF(DNF, DNS, DSQ, DQB), l\'impostazione di un IRM imposterà una ranking predefinita come segue: DNF (non in classifica) -> 29.999; DNS -> 30.000; DSQ -> 31.000; DQB -> 32.000<br> Il ripristino di uno stato IRM richiederà un controllo approfondito <b>TUTTI</b> posizioni!';
+$lang['IrmHelp']='IRM:Per impostare l\'ordine corretto nelle stampe (DNF, DNS, DSQ, DQB), l\'impostazione di un IRM imposterà una posizione in ranking predefinita come segue: DNF (no rank) -> 29.999; DNS -> 30.000; DSQ -> 31.000; DQB -> 32.000<br> Il ripristino di uno stato IRM richiederà un controllo approfondito di  <b>TUTTE</b> le posizioni in classifica!';
 $lang['KAOffset']='Compensa il ritardo';
 $lang['KASeconds']='Tempo per il Keep Alive';
 $lang['LangNotSupported']='La Lingua $a non è supportata';
@@ -53,8 +53,10 @@
 $lang['OdfCommonCodeVersion']='Versione del codice comune';
 $lang['OdfCompetition']='Codice Gara ODF';
 $lang['OdfEventCode']='Codice Evento ODF';
+$lang['OdfGeneralCodeVersion']='Versione del dizionario dei dati generali';
 $lang['OdfReceiverOn']='Ricevitore attivo';
 $lang['OdfReceiverSetup']='Configurazione del ricevitore ODF';
+$lang['OdfSportCodeVersion']='Versione del dizionario dei dati sportivi';
 $lang['OdfUploadFileText']='Seleziona un file XML da caricare...';
 $lang['Production']='Produzione';
 $lang['Receiver']='Ricevitore';
@@ -87,6 +89,7 @@
 $lang['TMMeeting']='Riunione dei Team Manager';
 $lang['Transmitter']='Trasmettitore';
 $lang['TypCODE']='Suffisso codice documento';
+$lang['TypDISCIPLINE']='Disciplina (rif. Sports CC@Discipline)';
 $lang['TypEVENT']='Descrizione dell\'Evento';
 $lang['TypNAME']='Descrizione';
 $lang['TypPHASE']='Descrizione della fase';
diff --git a/src/Common/Languages/it/RunArchery.php b/src/Common/Languages/it/RunArchery.php
index 4a888fe3..b44e5e2d 100644
--- a/src/Common/Languages/it/RunArchery.php
+++ b/src/Common/Languages/it/RunArchery.php
@@ -17,7 +17,7 @@
 $lang['DueLoops-Due']='Dovuti';
 $lang['DueLoops-Loops']='Giri';
 $lang['End']='Volée';
-$lang['EntryIsIn']='Gareggiare';
+$lang['EntryIsIn']='Atleti che gareggiano';
 $lang['ExportChips']='Esportazione ODS per l\'impostazione dei pod';
 $lang['Final1']='Finale A';
 $lang['Final2']='Finale B';
@@ -25,7 +25,7 @@
 $lang['FinalTime']='Tempo finale';
 $lang['FinishTime']='Tempo finale';
 $lang['GroupedStart']='Inizio Raggruppato';
-$lang['Hits']='Tiri';
+$lang['Hits']='Colpiti';
 $lang['ImportArrows']='Importa Frecce';
 $lang['ImportLoops']='Importa giri';
 $lang['ImportTimes']='Importa scheda attività';
@@ -43,7 +43,7 @@
 $lang['MoveToNextDisclaimer']='ATTENZIONE: Questo sovrascriverà le assegnazioni precedenti e non potrà essere annullato! Sei sicuro di voler continuare?';
 $lang['MoveToNextPhase']='Muovi alla prossima fase';
 $lang['NumArrows']='Num frecce per giro';
-$lang['OfficialName']='Nome ufficiale';
+$lang['OfficialName']='Nome Personale di campo';
 $lang['OfficialPracticeForEvents']='Tiri di prova ufficiali sul campo di gara per $a';
 $lang['ParticipantList']='Partecipanti ordinati per ora di partenza';
 $lang['PenaltyArrow']='Frecce di penalità';
diff --git a/src/Common/Languages/it/Tournament.php b/src/Common/Languages/it/Tournament.php
index b323d52f..d6bb3e82 100644
--- a/src/Common/Languages/it/Tournament.php
+++ b/src/Common/Languages/it/Tournament.php
@@ -33,7 +33,7 @@
 $lang['AclParticipants']='Partecipanti';
 $lang['AclQualification']='Qualifiche';
 $lang['ACLReadOnly']='Accesso limitato (Solo lettura)';
-$lang['ACLReadWrite']='Accesso completo (Lettura e Scrittura';
+$lang['ACLReadWrite']='Accesso completo (Lettura e Scrittura)';
 $lang['AclRobin']='Girone Robin';
 $lang['AclRoot']='Superutente';
 $lang['AclSpeaker']='Annunciatore';
@@ -52,6 +52,7 @@
 $lang['AllDistances']='Tutti';
 $lang['AllEntries']='Tutti gli Iscritti';
 $lang['AllEvents']='Tutti gli Eventi';
+$lang['AllowCompetitionACL']='Consentire la Gestione Controllo Accessi dalla Rete della Competizione';
 $lang['AllRound']='Tutti i  rounds';
 $lang['AllSessions']='Tutti i Turni';
 $lang['AllsF']='Tutti';
@@ -94,10 +95,11 @@
 $lang['AttachICS']='Allega Programma come iCal (.ics)';
 $lang['AttachQualScorecard']='Invia lo score personale come allegato PDF (tutte le distanze)';
 $lang['AtXDistance']='Risultati DELLA Distanza $a';
-$lang['AuthCode']='Codice di autorizzazione';
+$lang['AuthCode']='Authorization Code (password)';
 $lang['AuthCodeA2A']='Codice di autorizzazione del Freccia a Freccia';
 $lang['AutoCoinToss']='Assegnazioni automatiche con Lancio della Moneta';
 $lang['AutoEdits']='Edit automatico';
+$lang['AutomatorAccPrint']='Impostazioni di stampa dell\'accreditamento';
 $lang['AutoMoveNext']='Sposta automaticamente alla freccia successiva';
 $lang['AutoRefresh']='Aggiornamento Automatico';
 $lang['AutoTargetAssignment']='Assegnazione Automatica delle Piazzole - Sorteggio';
@@ -128,7 +130,7 @@
 $lang['BadgeIncludePhoto']='Accrediti devono includere la foto?';
 $lang['BadgeNames']='Nome Completo (Non stampati per primi)';
 $lang['BadgeNoData']='Nessun dato da stampare';
-$lang['BadgeOnlyNotPrinted']='Stampa solo gli accrediti non ancora stampati?';
+$lang['BadgeOnlyNotPrinted']='Stampa solo gli accrediti non ancora stampati';
 $lang['BadgeOnlyPrintAccredited']='Stampa gli accrediti solo dei partecipanti accreditati?';
 $lang['BadgeOnlyPrintPhoto']='Stampa gli accrediti solo di chi ha già la foto inserita?';
 $lang['BadgeOptions']='Opzioni';
@@ -158,6 +160,9 @@
 $lang['Block_IP']='IP di accesso (IPv4)';
 $lang['Block_Manage']='Gestione Controllo Accessi dalla Rete';
 $lang['Block_Nick']='Nome';
+$lang['Block_TemplateIP']='Modelli di IP';
+$lang['Block_TemplateName']='Descrizione';
+$lang['Block_TemplatePattern']='Modello';
 $lang['BoldIsDefault']='In grassetto i predefiniti';
 $lang['Bonus']='Bonus';
 $lang['ByeMovedToPhase']='L\'atleta è passato alla prossima fase';
@@ -199,6 +204,7 @@
 $lang['CannotDelete']='Questo elemento non può essere cancellato';
 $lang['Cash']='Totale Pagamenti';
 $lang['CatDos']='Direttore dei Tiri';
+$lang['CategoriesEvents']='Div.Cl/Eventi';
 $lang['CatJudge']='Giudici di Gara';
 $lang['CatJury']='Commissione di Garanzia';
 $lang['CatOC']='Comitato Organizzatore';
@@ -284,6 +290,7 @@
 $lang['CtrlCodeShort']='Cod. Fisc.';
 $lang['Currency']='€';
 $lang['CurrentCompCode']='Codice attuale Competizione: $a';
+$lang['CustomAclDetails']='Dettagli ACL personalizzati';
 $lang['D1AllInOne']='Tutti gli scontri in una singola gara';
 $lang['DailySchedule']='Programma quotidiano';
 $lang['DATABASE NOT REACHABLE']='DATABASE ONLINE NON RAGGIUNGIBILE';
@@ -298,6 +305,8 @@
 $lang['DefaultLocRule']='FITA';
 $lang['DefaultVI']='Predefinito VI';
 $lang['Delayed']='Ritardo(-1 azzera)';
+$lang['DeleteAclRule']='Eliminare la regola ACL';
+$lang['DeleteAclUser']='Elimina utente ACL';
 $lang['DeleteAwarded']='Cancella Premiati';
 $lang['DeleteChannel']='Rimuovi canale. Questo rimuoverà tutte le divisioni dal canale e il canale stesso.';
 $lang['DeletePreviousArchers']='Cancella Arcieri non presenti in elenco';
@@ -376,7 +385,7 @@
 $lang['EmailScorecardShort']='Sommario dei punteggi';
 $lang['EmailsToSend']='Email a cui spedire';
 $lang['EmailSuccessfull']='L\'email è stata mandata con successo a $a';
-$lang['EnableAccess']='Abilita/Disabilita gestione controllo';
+$lang['EnableAccess']='Abilita/Disabilita Gestione Controllo Accessi';
 $lang['EnableAddOns']='Abilita/disabilita i componenti aggiuntivi';
 $lang['Ends']='Volée';
 $lang['EndsOffset']='Spostamento delle volée';
@@ -410,6 +419,7 @@
 $lang['EvNameTranslated']='Evento Tradotto';
 $lang['Export2Fitarco']='Esportazioni per Fitarco';
 $lang['ExportAndSend']='Esporta e Invia Automaticamente';
+$lang['ExportEndpoint']='URL Destinatario (URL di base di I@nseo)';
 $lang['ExportEntries']='Esporta Partecipanti';
 $lang['ExportICS']='Esporta file iCal (.ics)';
 $lang['ExportInstructions']='Per eseguire l\'esportazione e la spedizione in automatico dei dati occorre compilare la seguente form.';
@@ -485,6 +495,13 @@
 $lang['FlightsTotals']='Totali';
 $lang['FlightsUpdateSetup']='Aggiorna configurazione';
 $lang['FollowHHT']='Mostra eventi degli HHT';
+$lang['FontFamily']='Famiglia di caratteri CSS';
+$lang['FontFile']='File di caratteri';
+$lang['FontName']='Nome del carattere';
+$lang['FontSample']='Campione di caratteri';
+$lang['FontStyle']='Stile di carattere CSS';
+$lang['FontWarning']='Supporta solo i caratteri TTF';
+$lang['FontWeight']='Peso del carattere CSS';
 $lang['FOP-ODS']='Campo di gara (ODS)';
 $lang['ForceAccreditation']='Forza accreditamento';
 $lang['ForceOldPhotos']='Includi vecchie foto';
@@ -518,7 +535,7 @@
 $lang['Hour']='Ora';
 $lang['I-Session']='Scontri Individuali';
 $lang['IanseoDbVersionTooOld']='La versione del DB ianseo è più vecchia di quella dell\'Infosystem';
-$lang['IANSEOVersion']='Versione IANSEO';
+$lang['IANSEOVersion']='Versione I@NSEO';
 $lang['IdCard']='Accrediti';
 $lang['Image']='Immagine';
 $lang['ImageChecked']='Immagine controllata';
@@ -530,7 +547,7 @@
 $lang['IncompatibleVersions']='Non è stato possibile importare la gara perché è più recente di Ianseo.<br/>Aggiorna Ianseo all\'ultimo rilascio da $a.';
 $lang['IndClEvent']='Classe Individuale';
 $lang['IndFin']='Individuale - Fasi Finali';
-$lang['IndFinEvent']='Finali Individuale';
+$lang['IndFinEvent']='Finali Individuali';
 $lang['IndividualLoaded']='Scontri individuali caricati per il programma {$a}';
 $lang['IndoorTourCategory']='Gara Indoor';
 $lang['IndQual']='Individuale - Class. di Classe';
@@ -544,8 +561,8 @@
 $lang['IRM-10']='DNS-Non ha iniziato la gara';
 $lang['IRM-15']='DSQ-Squalificato';
 $lang['IRM-20']='DQB-Squalificato per comportamento antisportivo';
-$lang['IRM-5']='DNF-Non ha finito la gara';
-$lang['IRM-7']='DNF-Non ha finito la gara(non compare in classifica)';
+$lang['IRM-5']='DNF-Non ha finito la gara (si rank)';
+$lang['IRM-7']='DNF-Non ha finito la gara (no rank)';
 $lang['IrmStatus']='Stato IRM';
 $lang['IrmUpdateIndAndTeams']='Aggiorna manualmente la Ranking Individuale e a Squadre';
 $lang['IrmUpdateIndividual']='Aggiorna manualmente la Ranking Individuale';
@@ -588,6 +605,7 @@
 $lang['LocRuleDefaultNo']='Default';
 $lang['LocRuleModifiedNo']='Elementi Modificati';
 $lang['LocRuleValidNo']='Elementi NON Modificati';
+$lang['Login']='Login';
 $lang['LogisticResp']='Responsabile dei Trasporti';
 $lang['LogMessage']='Messaggio di registro';
 $lang['LogoB']='Immagine in Basso (proporzioni per occupare tutto lo spazio: carta A4 --> 19:1, carta Letter -> 20:1)';
@@ -600,6 +618,7 @@
 $lang['LUE-CAN']='Canada';
 $lang['LUE-FITA']='World Archery';
 $lang['LUE-FRA']='Francia';
+$lang['LUE-GBR']='Archery GB';
 $lang['LUE-ITA']='Italia';
 $lang['LUE-ITA_e']='Italia (esordienti)';
 $lang['LUE-ITA_i']='Italia (categorie indoor)';
@@ -641,7 +660,8 @@
 $lang['ManageByes']='Gestisci i Bye';
 $lang['ManAthStatus']='Gestione Stato Arcieri';
 $lang['ManColors']='Gestione colori';
-$lang['ManDistances']='Gestione distanze';
+$lang['MandatoryLoginACL']='Forza la Richiesta di accesso per un indirizzo IP non registrato';
+$lang['ManDistances']='Gestisci distanze';
 $lang['ManDivClass']='Gestione Divisioni/Classi';
 $lang['ManMatchArr4Phase']='Gestione frecce per set';
 $lang['ManPrices']='Gestione Prezzi';
@@ -755,7 +775,7 @@
 $lang['Officials']='Personale sul Campo';
 $lang['OldStyleElimination']='Vecchio modello Eliminatorie 3D/Field';
 $lang['OnePlace']='1 Posto';
-$lang['OnlineId']='Identificativo';
+$lang['OnlineId']='ID';
 $lang['OnlyAccredited']='Solo se accreditato';
 $lang['OnlyMissing']='Solo i mancanti';
 $lang['OnlyPaid']='Solo se pagato';
@@ -791,9 +811,11 @@
 $lang['OrisStatsIndividual']='Statistiche Individuali (C85A)';
 $lang['OrisStatsTeam']='Statistiche Squadre (C85B+C)';
 $lang['OrisTeamList']='Elenco squadre ORIS';
+$lang['OtherCountriesCoachingToo']='Includere gli Iscritti di altri paesi nella selezione degli Allenatori';
 $lang['OtherTourCategory']='Altro';
 $lang['OutdoorTourCategory']='Gare all\'aperto';
 $lang['OverwritePreviousArchers']='Sovrascrivi gli Arcieri Precedenti';
+$lang['OvrBioAchievements']='Risultati degli atleti';
 $lang['OvrMatchesMessages']='Segnali OVR degli scontri';
 $lang['OvrRefresh']='Aggiorna pagina (senza inviare dati)';
 $lang['OvrSendSerial']='Invia a OVR (Seriale)';
@@ -815,7 +837,7 @@
 $lang['PersonList']='Elenco del Personale sul Campo';
 $lang['PhaseBlock_0']='Elenchi partecipanti';
 $lang['PhaseBlock_1']='Qualificazione';
-$lang['PhaseBlock_10']='Impostazioni dei tiri';
+$lang['PhaseBlock_10']='Impostazioni dei raggruppamenti tipo Vegas';
 $lang['PhaseBlock_11']='Girone Robin';
 $lang['PhaseBlock_2']='Gironi Eliminatori';
 $lang['PhaseBlock_3']='Elim. e Finali Individuali';
@@ -923,7 +945,7 @@
 $lang['RelatedMatchTime']='Tempo scontro correlato';
 $lang['Reload']='Ricaricare';
 $lang['ReloadTime']='Ricarica tempo';
-$lang['RememberPwd']='Ricorda le password';
+$lang['RememberPwd']='Ricorda la password';
 $lang['RemoveStars']='Rimuovi tutto *';
 $lang['ReplicaServer']='Server di replica $a';
 $lang['ReplicaServerNew']='Nuovo server di replica';
@@ -932,10 +954,10 @@
 $lang['ReportCopy2']='Copia per la società';
 $lang['ReportCopy3']='Copia per la federazione';
 $lang['RePrint']='Stampa di nuovo';
-$lang['RequestAuthCode']='Inserisci una password di tua scelta';
-$lang['RequestDisclaimer']='L\'invio della mail non implica la sua accettazione. Il servizio viene offerto così com\'è e può essere sospeso in qualunque momento senza preavviso. Se una competizione non ha risultati (per esempio qualificazioni) dopo la fine della gara può essere cancellata senza preavviso.';
+$lang['RequestAuthCode']='Inserisci una password a tua scelta';
+$lang['RequestDisclaimer']='L\'invio della mail non implica la sua accettazione. Il servizio viene offerto così com\'è e può essere sospeso in qualunque momento senza preavviso. Se una competizione non ha risultati (per esempio Classifiche di Classe) dopo la fine della gara, potrà essere cancellata senza preavviso.';
 $lang['RequestedDescription']='Questi campi DEVONO essere presenti nel file. Il separatore dei campi è il tabulatore, il separatore dei record è il ritorno a capo.';
-$lang['RequestEmail']='Email del Responsabile Risultati';
+$lang['RequestEmail']='Email del Responsabile dei Risultati';
 $lang['RequestHeader']='Vorrei ricevere i codici di accesso per questa competizione (RICORDA DI INSERIRE UNA PASSWORD!):';
 $lang['ResetBadges']='Azzeramento dello stato di stampa';
 $lang['ResetBeforeSO']='Ripristina i dati alla situazione prima dello spareggio';
@@ -946,7 +968,7 @@
 $lang['ResultIndAbsSnap']='Fase di Qualificazione - Classifica Snapshot Individuale';
 $lang['ResultIndClass']='Classifica di Classe - Individuale';
 $lang['ResultIndClassSnap']='Classifica Snapshot di Classe - Individuale';
-$lang['ResultIndSubClass']='Risultati per categorie';
+$lang['ResultIndSubClass']='Classifica per categorie';
 $lang['ResultResp']='Responsabile dei Risultati';
 $lang['Results']='Risultati';
 $lang['ResultSqAbs']='Fase di Qualificazione - Classifica a Squadre';
@@ -963,6 +985,7 @@
 $lang['RunningEvents']='Impostazione degli eventi "Running"';
 $lang['RunningTotal']='Totale cumulativo';
 $lang['RunNumber']='Esegui $a';
+$lang['SaveSelectionAsFile']='Salva la selezione come File';
 $lang['SB-Record']='Migliore stagionale';
 $lang['ScanAthleteFirst']='Scansiona prima l\'atleta';
 $lang['SchAddRank']='Aggiungi classifica qualificazione';
@@ -1062,7 +1085,7 @@
 $lang['ShowChildren']='Mostra gli Eventi Collegati';
 $lang['ShowCountry2']='Mostra Paese 2';
 $lang['ShowCountry3']='Mostra Paese 3';
-$lang['ShowDisable']='Mostra Sedie a rotelle';
+$lang['ShowDisable']='Mostra sedia a rotelle';
 $lang['ShowEmail']='Mostra Email';
 $lang['ShowIanseoMenu']='Mostra Menù Ianseo';
 $lang['ShowLocalCode']='Mostra Identificativo Locale';
@@ -1090,7 +1113,7 @@
 $lang['SOTruncate']='Numero di lettere';
 $lang['Special']='Premio speciale';
 $lang['SpecialFilter']='Filtro speciale (vedi codice)';
-$lang['SpecialImports']='Importazioni Speciali<br>Alcune funzionalità non sono documentate e riservate ai partner I@ANSEO (Contatta la tua persona di riferimento per la documentazione)';
+$lang['SpecialImports']='Importazioni Speciali<br>Alcune funzionalità non sono documentate e riservate ai partner I@NSEO (Contatta la tua persona di riferimento per la documentazione)';
 $lang['Split']='File divisi';
 $lang['SportPres']='Sport Presentation';
 $lang['Spotter']='Spotter';
@@ -1167,7 +1190,7 @@
 $lang['Subject']='Soggetto';
 $lang['SubTitle']='Sottotitolo';
 $lang['SuggestedFlag']='Bandiera suggerita';
-$lang['SupportIanseo']='Considera l\'idea di supportare Ianseo: vai sul sito www.ianseo.net e premi sul pulsante "donate" :)';
+$lang['SupportIanseo']='Considera l\'idea di supportare I@nseo: vai sul sito <a href="https://www.ianseo.net/" target="_blank">www.ianseo.net</a> e premi sul pulsante "<a href="https://www.paypal.com/signin?forceLogin=true&returnUri=https%3A%2F%2Fwww.paypal.com%2Fdonate&state=%252Fmember%253Ftoken%253DTzF3usuGHGmQI9zuCtSVQO54Thj_HfNKThVQzNlaFuh944i3gjadYtdZF59RT6AFpnmsCPBP8SrfyUoW%2526fromUL%253Dtrue&intent=donate&ctxId=868e29bfd4584e08b56383b093e7f7ec" target="_blank">PayPal</a>" o "<a href="https://donate.stripe.com/eVa3es65S07L2HK8ww" target="_blank">Stripe</a>" :)';
 $lang['SVGFile']='File SVG';
 $lang['SwapOpponents']='Scambia avversari';
 $lang['SwitchToAscii']='Traslittera in ASCII';
@@ -1277,21 +1300,21 @@
 $lang['TVContentTextDescr']='Inserisci un testo al posto di un file. Il testo può essere in formato HTML';
 $lang['TVContentUpload']='File Multimediale';
 $lang['TVContentUploadDescr']='File da caricare come contenuto multimediale';
-$lang['TVCss3Arrows']='Colpito';
-$lang['TVCss3Athlete']='Atleta';
+$lang['TVCss3Arrows']='N°Frecce tirate';
+$lang['TVCss3Athlete']='Cognome e Nome atleta';
 $lang['TVCss3BgColor1-even']='sfondo<br/>(riga 1 - pari)';
 $lang['TVCss3BgColor1-odd']='sfondo<br/>(riga 1 - dispari)';
 $lang['TVCss3BgColor2-even']='sfondo<br/>(riga 2 - pari)';
 $lang['TVCss3BgColor2-odd']='sfondo<br/>(riga 2 - dispari)';
 $lang['TVCss3BottomRow']='Riga inferiore';
-$lang['TVCss3Category']='Categoria (lungo)';
+$lang['TVCss3Category']='Divisione e Classe (lungo)';
 $lang['TVCss3CategoryCode']='Categoria (codice)';
 $lang['TVCss3CountryBlock']='Blocca Nazione';
-$lang['TVCss3CountryCode']='Prefisso internazionale Nazione';
-$lang['TVCss3CountryDescr']='Nome del paese';
+$lang['TVCss3CountryCode']='Codice Società/Nazione';
+$lang['TVCss3CountryDescr']='Nome Società/Nazione';
 $lang['TVCss3Defaults']='Impostazioni predefinite per tutte le pagine. Usa la sintassi CSS3 per l\'elemento';
 $lang['TVCss3DistPos']='Rank di Distanza';
-$lang['TVCss3DistScore']='Distanza dei punteggi';
+$lang['TVCss3DistScore']='Punteggi di distanza';
 $lang['TVCss3Divider']='Separatore';
 $lang['TVCss3EndPoints']='Punti Volée';
 $lang['TVCss3Flag']='Bandiera (img)';
@@ -1300,13 +1323,13 @@
 $lang['TVCss3FontColor1-odd']='colore<br/>(riga 1 - dispari)';
 $lang['TVCss3FontColor2-even']='colore<br/>(riga 2 - pari)';
 $lang['TVCss3FontColor2-odd']='colore<br/>(riga 2 - dispari)';
-$lang['TVCss3FontName']='font';
+$lang['TVCss3FontName']='Carattere';
 $lang['TVCss3FontRev1-even']='colore inverso<br/>(riga 1 - pari)';
 $lang['TVCss3FontRev1-odd']='colore inverso<br/>(riga 1 - dispari)';
 $lang['TVCss3FontRev2-even']='colore inverso<br/>(riga 2 - pari)';
 $lang['TVCss3FontRev2-odd']='colore inverso<br/>(riga 2 - dispari)';
-$lang['TVCss3FontSize']='dimensione del font';
-$lang['TVCss3Gold']='Finale Oro';
+$lang['TVCss3FontSize']='dimensione del carattere';
+$lang['TVCss3Gold']='Totale Ori';
 $lang['TVCss3Headers']='Intestazioni di colonna';
 $lang['TVCss3IdAthletes']='ID arcieri';
 $lang['TVCss3IdPanel']='ID mezza riga';
@@ -1319,22 +1342,23 @@
 $lang['TVCss3MainContent']='Soddisfare';
 $lang['TVCss3Management']='Gestione CSS';
 $lang['TvCss3Page']='Pagina in CSS';
-$lang['TVCss3Rank']='Rank';
+$lang['TVCss3Rank']='Posizione in Classifica';
 $lang['TVCss3RankDown']='Rank in giù';
 $lang['TVCss3RankMinus']='Rank S.O.';
 $lang['TVCss3RankNone']='Nessuna Rank';
 $lang['TVCss3RankOld']='Vecchia Rank';
 $lang['TVCss3RankUp']='Rank in alto';
-$lang['TVCss3Score']='Punteggio';
+$lang['TVCss3Schedule']='Programma';
+$lang['TVCss3Score']='Punteggio Totale';
 $lang['TVCss3Session']='Sessione';
 $lang['TVCss3SpecificSettings']='Questa pagina ha specifiche impostazioni. Usa la sintassi CSS3 per l\'elemento';
 $lang['TVCss3SubTitle']='Sottotitolo';
-$lang['TVCss3Target']='Bersaglio';
+$lang['TVCss3Target']='Piazzola';
 $lang['TVCss3TgtAssign']='Blocco di posizione assegnato';
 $lang['TVCss3TgtBlock']='Blocca Bersaglio';
 $lang['TVCss3Title']='Titolo';
 $lang['TVCss3TopRow']='Riga superiore';
-$lang['TVCss3XNine']='XNove';
+$lang['TVCss3XNine']='Totale X/9';
 $lang['TVDefault']='Predefinito';
 $lang['TVDefault-Scroll']='Torneo: caratteri e colori predefiniti<br>Multimedia: Tempo di scorrimento';
 $lang['TVDefaultScroll']='Tempo di scorrimento predefinito';
@@ -1370,7 +1394,7 @@
 $lang['TVNoFill2NotChange']='Lasciare vuoto per non modificare';
 $lang['TVNumInd']='Numero Righe degli Individuali';
 $lang['TVNumRows']='Numero di righe da visualizzare';
-$lang['TVNumRowsDescr']='saranno visualizzate solo queste righe';
+$lang['TVNumRowsDescr']='Saranno visualizzate solo queste righe. Se 0 saranno visualizzate tutte';
 $lang['TVNumTeam']='Numero Righe delle Squadre';
 $lang['TVOutNoRules']='Nessuna Regola Impostata';
 $lang['TVOutNoRulesWithStart']='Non è stata impostata nessuna Regola utilizzabile!';
@@ -1420,6 +1444,7 @@
 $lang['TVViewNationNameDescr']='Visualizza i nomi completi delle squadre';
 $lang['TVViewPartials']='Mostra le distanze';
 $lang['TVViewPartialsDescr']='Visualizza i risultati ottenuti in ogni distanza';
+$lang['TvViewSCHED']='Mostra Programma';
 $lang['TvViewTEAM']='Vedi colonna Club/Nazione';
 $lang['TvViewTIT2ROWS']='Titolo su 2 righe';
 $lang['TvViewTOT']='Vedi Punteggio finale';
@@ -1492,7 +1517,9 @@
 $lang['UserDetails']='Dettagli dell\'utente';
 $lang['UserEnabled']='Abilitato';
 $lang['UserName']='Nome utente';
-$lang['UserPassword']='Password';
+$lang['UserPassword']='Nuova Password';
+$lang['UserPasswordOld']='Vecchia Password';
+$lang['UserPasswordRetype']='Digitare nuovamente la nuova password';
 $lang['UseSubClasses']='Applica a categorie specifiche';
 $lang['ValidClass']='Classi Ammesse';
 $lang['ValidDivisions']='Div. ammesse (vuoto=tutti)';
@@ -1518,7 +1545,7 @@
 $lang['WarmUpMins']='Riscaldamento (min.)';
 $lang['WarmupTargets']='Bersagli riscaldamento';
 $lang['Warning']='Attenzione!';
-$lang['WheelChair']='Sedie a rotelle';
+$lang['WheelChair']='Sedia a rotelle';
 $lang['WheelchairShort']='W';
 $lang['Wikipedia']='Wikipedia';
 $lang['WR-Record']='Record Mondiale';
diff --git a/src/Common/Languages/ja/Api.php b/src/Common/Languages/ja/Api.php
index 06210d44..12d451a7 100644
--- a/src/Common/Languages/ja/Api.php
+++ b/src/Common/Languages/ja/Api.php
@@ -1,25 +1,28 @@
 <?php
 $lang['API-ConfirmDeleteRow']='この列を削除してもいいですか？';
-$lang['API-DeviceGrouping']='デバイスグルーピング';
+$lang['API-DeviceGrouping']='端末グルーピング';
+$lang['API-EnableDeviceGrouping']='端末のグルーピングを有効にする>>>';
 $lang['API-Group']='グループ';
 $lang['API-TargetGrouping']='ターゲットグルーピング';
 $lang['API-Targets']='ターゲット';
 $lang['AutoImport']='自動インポート';
 $lang['CmdDelete']='削除';
 $lang['CmdImport']='インポート';
+$lang['ConfirmGenerateZip']='セッション$a[1]のすべての$a[0]を含むZIPファイルを生成していることを確認してください。';
 $lang['Controller']='コントローラ';
-$lang['Desc-Let-1']='現ｴﾝﾄﾞのｲﾝﾎﾟｰﾄ完了';
-$lang['Desc-Let-2']='現ｴﾝﾄﾞに未入力あり';
-$lang['Desc-Let-3']='現ｴﾝﾄﾞのｲﾝﾎﾟｰﾄ準備完了';
+$lang['Desc-Let-1']='インポート完了';
+$lang['Desc-Let-2']='未入力の点数あり';
+$lang['Desc-Let-3']='点数入力完了';
 $lang['Desc-Let-4']='点数入力中';
 $lang['Desc-Let-B']='現在のエンドのインポート完了';
 $lang['Desc-Let-C']='現在のエンドで未入力の素点あり';
-$lang['Desc-Let-F']='ﾏｯﾁ終了';
+$lang['Desc-Let-F']='マッチ終了';
 $lang['Desc-Let-G']='空欄';
-$lang['Desc-Let-O']='異なるエンドでの得点';
+$lang['Desc-Let-O']='異なるエンドでの入力';
 $lang['Desc-Let-R']='異なるセッションでの得点';
 $lang['Desc-Let-Y']='インポート可能なエンド';
 $lang['Desc-Let-Z']='点数入力中';
+$lang['DevDisconnected']='切断されました';
 $lang['DistanceNum']='距離 $a';
 $lang['FieldMonitor']='フィールドモニター';
 $lang['FlashCodeDistance']='$aは、
@@ -40,7 +43,6 @@
 $lang['ISK-DeviceEnabled']='有効か否か';
 $lang['ISK-DeviceId']='デバイスID';
 $lang['ISK-DeviceIpAddress']='IPアドレス';
-$lang['ISK-DeviceLastSeen']='戻る';
 $lang['ISK-DeviceStatus']='デバイス ステータス';
 $lang['ISK-DeviceStatusWanted']='新規ステータスを強制';
 $lang['ISK-DeviceUsed']='使用中';
@@ -58,7 +60,7 @@
 $lang['ISK-Live-Name']='Ianseoスコアキーパー LIVE';
 $lang['ISK-Name']='Ianseoスコアキーパー';
 $lang['ISK-Ng-Name']='Ianseoスコアキーパー NG';
-$lang['ISK-NG-QRCode']='IanseoスコアキーパーNG用QRコードを印刷';
+$lang['ISK-NG-QRCode']='Ianseoスコアキーパー NG用QRコードを印刷';
 $lang['ISK-NgLive-Name']='Ianseoスコアキーパー NG - LIVE';
 $lang['ISK-NgPro-Name']='Ianseoスコアキーパー NG - PRO';
 $lang['ISK-NoCompCode']='大会コード欠落';
@@ -71,6 +73,8 @@
 $lang['ISK-Sequence']='大会進行予定';
 $lang['ISK-ServerUrl']='Ianseo用サーバーURL';
 $lang['ISK-ServerUrlPin']='ISK用大会暗証番号';
+$lang['ISK-SETUP-11']='ISK-NG Liteセットアップ';
+$lang['ISK-SETUP-12']='ISK-NG Proセットアップ';
 $lang['ISK-showPictures']='画像を表示';
 $lang['ISK-SocketIP']='Web Socket IP（デバイス用）';
 $lang['ISK-SocketIPMaster']='Web Socket IP（マスター用）';
diff --git a/src/Common/Languages/ja/Awards.php b/src/Common/Languages/ja/Awards.php
index 3ac56611..1106f60b 100644
--- a/src/Common/Languages/ja/Awards.php
+++ b/src/Common/Languages/ja/Awards.php
@@ -1,17 +1,4 @@
 <?php
-$lang['CM0']='コンパウンド男子';
-$lang['CM1']='コンパウンド男子団体';
 $lang['CustomPrize']='表彰式';
 $lang['CustomWinner']='受賞者';
-$lang['CW0']='コンパウンド女子';
-$lang['CW1']='コンパウンド女子団体';
-$lang['CX']='コンパウンドミックスチーム';
-$lang['CX1']='コンパウンドミックスチーム';
-$lang['PrecisionPrizeEvent']='ロンジン賞';
-$lang['RM0']='リカーブ 男子';
-$lang['RM1']='リカーブ 男子団体';
-$lang['RW0']='リカーブ 女子';
-$lang['RW1']='リカーブ 女子団体';
-$lang['RX']='リカーブ ミックス';
-$lang['RX1']='リカーブ ミックス';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ja/BackNumbers.php b/src/Common/Languages/ja/BackNumbers.php
index 308276e9..8ad73b97 100644
--- a/src/Common/Languages/ja/BackNumbers.php
+++ b/src/Common/Languages/ja/BackNumbers.php
@@ -3,6 +3,7 @@
 $lang['Access']='アクセスエリア';
 $lang['AccreditationMatches']='このバッチは特定のカテゴリーに適用されます：';
 $lang['AutoCHK-Code']='大会コード';
+$lang['AutoCHK-Confirm']='チェックインを確認';
 $lang['BackNumbers']='ゼッケン';
 $lang['BadgeComplete']='すべてのゼッケン';
 $lang['BadgeCreate']='新規作成';
@@ -31,6 +32,8 @@
 $lang['FamCamel']='姓２';
 $lang['FamCaps']='姓３';
 $lang['Flag']='国旗・クラブ';
+$lang['GivCamel']='GivenName';
+$lang['GivCaps']='GIVENNAME';
 $lang['I-Badge']='個人マッチ戦用ゼッケン';
 $lang['Image']='画像';
 $lang['Images']='画像（ロゴ等）設定';
@@ -39,14 +42,19 @@
 $lang['IncludeSession']='セッションを含める';
 $lang['Italic']='イタリック';
 $lang['NewBadgeName']='ゼッケン名編集';
+$lang['Picture']='選手写真';
+$lang['Portrait']='ポートレート';
 $lang['Q-Badge']='予選ラウンド用ゼッケン';
 $lang['RandomImage']='ランダム画像';
 $lang['Ranking']='クオリフィケーションランク';
-$lang['ReadSeparator']='セパレータを読込む';
+$lang['ReadSeparator']='セパレーターを読み込む';
 $lang['ResetBarcodeSeparator']='バーコードセパレータをリセット';
 $lang['Schedule']='スケジュール';
 $lang['Session']='クオリフィケーションセッション';
 $lang['T-Badge']='団体マッチ戦用ゼッケン';
 $lang['Target']='的番号５';
 $lang['TeamComponents']='チームメンバー';
+$lang['ToBottom']='大会ロゴ（フッター）';
+$lang['ToLeft']='大会ロゴ（左ヘッダー）';
+$lang['ToRight']='大会ロゴ（右ヘッダー）';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ja/Common.php b/src/Common/Languages/ja/Common.php
index 38631b2c..78a6a4f5 100644
--- a/src/Common/Languages/ja/Common.php
+++ b/src/Common/Languages/ja/Common.php
@@ -45,7 +45,7 @@
 $lang['Bye']='-ﾊﾞｲ-';
 $lang['CB']='コンパウンドボウ';
 $lang['ChangeComponents']='チーム編成交代';
-$lang['ChangeElimWarning']='注意！エリミネーション条件を編集すると、エリミネーションとファイナルの入力データが全てリセットされます。';
+$lang['ChangeElimWarning']='注意！イリミネーション条件を編集すると、イリミネーションとファイナルの入力データが全てリセットされます。';
 $lang['CheckUpdate']='IANSEOのアップデートを実施してから10日以上経過しています。インターネット接続時にアップデートを確認して下さい。<a href="$a" style="text-decorator: underline; font-size: 15px;">クリックして確認</a>.<br/> Ianseo Team';
 $lang['Class']='クラス';
 $lang['Close']='閉じる';
@@ -78,7 +78,6 @@
 $lang['DateFmtDB']='%Y年%c月%e日';
 $lang['DateFmtDBshort']='%m-%d';
 $lang['DateFmtMoreDays']='$a[0]〜$a[1]';
-$lang['DateViewFmt']='yyyy年mm月dd日';
 $lang['DayOfWeekLong_0']='日曜日';
 $lang['DayOfWeekLong_1']='月曜日';
 $lang['DayOfWeekLong_2']='火曜日';
@@ -86,7 +85,6 @@
 $lang['DayOfWeekLong_4']='木曜日';
 $lang['DayOfWeekLong_5']='金曜日';
 $lang['DayOfWeekLong_6']='土曜日';
-$lang['DayOfWeek_0']='日1';
 $lang['DayOfWeek_1']='月';
 $lang['DayOfWeek_2']='火';
 $lang['DayOfWeek_3']='水';
@@ -137,13 +135,14 @@
 $lang['JudgeNotes']='審判注記';
 $lang['JW']='ジュニア女子';
 $lang['LB']='ロングボウ';
+$lang['LiveOff']='Live Flag解除';
+$lang['LiveOn']='Live Flag設定';
 $lang['M']='男子';
 $lang['ManFinAthTargetInd']='個人決勝ラウンド_ターゲットあたりの選手数設定';
 $lang['ManFinAthTargetTeam']='ターゲット';
 $lang['ManFinScheduleInd']='個人決勝スケジュール';
 $lang['ManFinScheduleTeam']='団体決勝スケジュール';
 $lang['ManSetPoint']='すべてのセットのスコアを管理する';
-$lang['ManTie']='タイブレークを管理する';
 $lang['MatchModeScoring']='スコアリング方法';
 $lang['MatchMode_0']='累計';
 $lang['MatchMode_1']='ｾｯﾄｼｽﾃﾑ';
@@ -204,7 +203,7 @@
 $lang['MenuLM_Final report']='報告書';
 $lang['MenuLM_Final Rounds']='決勝ラウンド';
 $lang['MenuLM_FinalFOPChoose']='決勝ラウンド射場設定一覧';
-$lang['MenuLM_GetScoreBarcode']='点数バーコードの読込み';
+$lang['MenuLM_GetScoreBarcode']='スコアカードチェック';
 $lang['MenuLM_GetScoreBarcodeReport']='指示バーコード表示';
 $lang['MenuLM_Header for Result Printouts']='リザルトヘッダー編集';
 $lang['MenuLM_HTT']='HTT';
@@ -279,7 +278,6 @@
 $lang['MenuLM_Training']='ウォームアップスケジュール設定';
 $lang['MenuLM_TV Output']='TV出力';
 $lang['MenuLM_TVAdvanced']='TV出力(アドバンス設定)';
-$lang['MenuLM_Twitter']='ツイッター';
 $lang['MenuLM_Update']='Ianseoを更新する';
 $lang['MenuLM_UpdateWeb']='ライブアップデート';
 $lang['MenuLM_Versioning']='書類バージョン管理';
@@ -294,7 +292,6 @@
 $lang['Month_11']='12月';
 $lang['Month_2']='3月';
 $lang['Month_3']='4月';
-$lang['Month_4']='May';
 $lang['Month_5']='6月';
 $lang['Month_6']='7月';
 $lang['Month_7']='8月';
@@ -304,7 +301,7 @@
 $lang['MsgInitFinalGridsError']='<b>警告！</b>このイベントの対戦表は既に作成済みです。再作成しますか？';
 $lang['MultiTeamMaxNo']='チーム生成最大数（0:無制限）';
 $lang['MW']='マスター女子';
-$lang['Nation']='所属';
+$lang['Nation']='所属先';
 $lang['NextMatchNames']='次フェーズ選手';
 $lang['NextMatchScores']='次フェーズ用スコアカード';
 $lang['NextPhase']='次フェーズ';
@@ -326,16 +323,14 @@
 $lang['Progr']='順序';
 $lang['QualRound']='ランキングラウンド';
 $lang['Rank']='予選順位';
-$lang['RankingInd']='イリミネーション＆決勝個人';
+$lang['RankingInd']='個人戦ランキング';
 $lang['Rankings']='ランキング';
-$lang['RankScoreShort']='RR';
+$lang['RankingSq']='団体戦ランキング';
+$lang['RankScoreShort']='予選順位';
 $lang['RB']='リカーブ';
 $lang['RoundDefinition']='ﾗｳﾝﾄﾞ';
 $lang['Scheduler']='スケジューラー';
-$lang['Score1Page1Athlete']='個人マッチスコア';
-$lang['Score1Page1Match']='マッチスコア一覧';
-$lang['ScoreDrawing']='組み合わせ一覧';
-$lang['ScoreFilled']='素点入力済みのスコアカードを印刷';
+$lang['ScoreFilled']='素点入力済みスコアカードを印刷';
 $lang['ScoreIncEmpty']='対戦者がいない場合も印刷する';
 $lang['Scorer']='記録者';
 $lang['SelectAll']='全て選択';
@@ -351,7 +346,6 @@
 $lang['SourceSession']='セッション選択';
 $lang['Status_1']='出場可能（ドキュメントチェック済）';
 $lang['Status_5']='ステータス不明（大会出場日がマッチしません）';
-$lang['Status_8']='出場不可（ドキュメントに記入漏れがあります';
 $lang['Status_9']='出場不可';
 $lang['Target']='的番号';
 $lang['TargetFinalInd']='個人決勝 的番';
@@ -374,15 +368,11 @@
 $lang['TrgCOOutdoor']='ｱｳﾄﾄﾞｱ（6ﾘﾝｸﾞ）';
 $lang['TrgCOOutdoorSmall']='ｱｳﾄﾄﾞｱ（6-X）';
 $lang['TrgField']='フィールド';
-$lang['TrgHMOutComplete']='　';
-$lang['TrgHunterNor']='　';
 $lang['TrgIndComplete']='ｲﾝﾄﾞｱ（1-大10）';
 $lang['TrgIndSmall']='ｲﾝﾄﾞｱ（6-大10）';
-$lang['TrgNfaaInd']='　';
 $lang['TrgOutdoor']='ｱｳﾄﾄﾞｱ（1-X）';
 $lang['TVEntryList']='エントリーリスト（TV表示用）';
 $lang['U']='ユニセック';
-$lang['UnexpectedError']='予期せぬエラ';
 $lang['VF']='スーパーマスター女子';
 $lang['VM']='スーパーマスター男子';
 $lang['W']='女子';
diff --git a/src/Common/Languages/ja/Errors.php b/src/Common/Languages/ja/Errors.php
index 7e44ff24..04938d7c 100644
--- a/src/Common/Languages/ja/Errors.php
+++ b/src/Common/Languages/ja/Errors.php
@@ -1,5 +1,4 @@
 <?php
-$lang['Anomalies']='不具合';
 $lang['ErrCodeExists']='大会コードが重複しています！';
 $lang['ErrConnection']='サーバー $a に接続出来ません！';
 $lang['ErrEmptyFields']='空欄にしないで下さい！';
@@ -8,7 +7,6 @@
 $lang['ErrNoCode']='大会コードが未入力です！';
 $lang['ErrNoEndDate']='終了日が未入力です！';
 $lang['ErrNoError']='受付完了！Ianseoよりコード番号がemailで送信され、コード番号の有効化手続き開始しました。有効化が完了した時点でemailでご連絡します。';
-$lang['ErrNoLocation']='開催地情報が入力されていません！';
 $lang['ErrNoName']='名称が入力されていません！';
 $lang['ErrNoNation']='所属先が入力されていません！';
 $lang['ErrNoStartDate']='開始日が入力されていません！';
diff --git a/src/Common/Languages/ja/HTT.php b/src/Common/Languages/ja/HTT.php
index 72a9fa21..70534ce2 100644
--- a/src/Common/Languages/ja/HTT.php
+++ b/src/Common/Languages/ja/HTT.php
@@ -17,7 +17,7 @@
 $lang['Mode']='モード';
 $lang['Name']='氏名1';
 $lang['QualSession']='R';
-$lang['SelFile2Imp']='インポートするファイルを選択する';
+$lang['SelFile2Imp']='ianseoファイルのインポート';
 $lang['SetDistanceError']='距離の設定が必要！！';
 $lang['SetupTerminals']='HTT設定';
 $lang['Target']='的番号４';
diff --git a/src/Common/Languages/ja/Help.php b/src/Common/Languages/ja/Help.php
index 87dad3ae..5a877ab9 100644
--- a/src/Common/Languages/ja/Help.php
+++ b/src/Common/Languages/ja/Help.php
@@ -1,7 +1,8 @@
 <?php
+$lang['AutoCheckinConfirm']='すべての詳細が正しい場合は、「確認・チェックイン」を押してください。<br>情報に誤りがある場合は、「キャンセル」を押して受付に進んでください。';
 $lang['AutoImportSettings']='<b>上級者用機能です</b><br>デフォルト設定を変更した場合、順位等の記録が不正確になる可能性があります。<br>手動設定としたものは、ianseo.netへのアップロードや記録の印刷・配信の前に、順位等の再計算を行う必要があります。';
 $lang['HomePage']='このページでは大会を選択するか新規登録が出来ます。';
 $lang['ISK-LockedSessionHelp']='{$a} アイコンは各々のセッションにおける端末の使用可否を示します。';
 $lang['ISK-ServerUrlPin']='<b>暗証番号は公開しないで下さい</b><br>ISKで大会にアクセスするための数字４桁の暗証番号を設定して下さい。<br>暗証番号を設定すると、スコアカードのQRコードを読み込む場合のみ使用可能になります。<br>ISKに手動入力する場合は、大会コードは以下の通りとなります。<br><b>{$a}</b>';
-$lang['ScoreBarCodeShortcuts']='スコアカードに印字されたバーコードを読み込んで下さい。<br/>バーコード欄に、#選手名、と入力することにより手動で選手を検索することが出来ます。<br/>バーコード欄に、@的番号、と入力することによりその的を検索出来ます。ラウンド、セッションは必ず選択して下さい。的番号は3桁（3桁未満の時は頭に0を追加）で入力します。';
+$lang['ScoreBarCodeShortcuts']='スコアカードに印字されたバーコードを読み込んで下さい。<br>バーコード欄に、#選手名、と入力することにより手動で選手を検索することが出来ます。<br>バーコード欄に、@的番号、と入力することによりその的を検索出来ます。ラウンド、セッションを必ず選択して下さい。';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ja/IOC_Codes.php b/src/Common/Languages/ja/IOC_Codes.php
index 33e446a1..24f1aeab 100644
--- a/src/Common/Languages/ja/IOC_Codes.php
+++ b/src/Common/Languages/ja/IOC_Codes.php
@@ -1,27 +1,198 @@
 <?php
 $lang['AFG']='アフガニスタン';
+$lang['AHO']='オランダ領アンティル';
 $lang['ALB']='アルバニア';
 $lang['ALG']='アルジェリア';
 $lang['AND']='アンドラ';
 $lang['ANG']='アンゴラ';
+$lang['ANT']='アンティグア・バーブーダ';
 $lang['ARG']='アルゼンチン';
 $lang['ARM']='アルメニア';
+$lang['ARU']='アルバ';
+$lang['ASA']='アメリカ領サモア';
 $lang['AUS']='オーストラリア';
 $lang['AUT']='オーストリア';
-$lang['Award-MedalGiver']='$a からメダルが贈呈されます';
 $lang['AZE']='アゼルバイジャン';
 $lang['BAH']='バハマ';
 $lang['BAN']='バングラデシュ';
 $lang['BAR']='バルバドス';
+$lang['BDI']='ブルンジ';
 $lang['BEL']='ベルギー';
+$lang['BEN']='ベナン';
+$lang['BER']='バミューダ';
 $lang['BHU']='ブータン王国';
+$lang['BIH']='ボスニア・ヘルツェゴビナ';
+$lang['BIZ']='ベリーズ';
+$lang['BLR']='ベラルーシ';
+$lang['BOL']='ボリビア';
+$lang['BOT']='ボツワナ';
 $lang['BRA']='ブラジル';
-$lang['CAM']='カンボジア';
-$lang['CHN']='中国';
+$lang['BRN']='バーレーン';
+$lang['BRU']='ブルネイ';
+$lang['BUL']='ブルガリア';
+$lang['BUR']='ブルキナファソ';
+$lang['CAF']='中央アメリカ';
+$lang['CAN']='カナダ';
+$lang['CAY']='ケイマン諸島';
+$lang['CGO']='コンゴ共和国';
+$lang['CHA']='チャド';
+$lang['CHI']='チリ';
+$lang['CIV']='コートジボワール';
+$lang['CMR']='カメルーン';
+$lang['COK']='クック諸島';
+$lang['COL']='コロンビア';
+$lang['COM']='モロッコ';
+$lang['CPV']='カーボベルデ';
+$lang['CRC']='コスタリカ';
+$lang['CRO']='クロアチア';
+$lang['CUB']='キューバ';
+$lang['CYP']='キプロス';
+$lang['DEN']='デンマーク';
+$lang['DJI']='ジブチ';
+$lang['DMA']='ドミニカ国';
+$lang['DOM']='ドミニカ共和国';
+$lang['ECU']='エクアドル';
+$lang['EGY']='エジプト';
+$lang['ERI']='エリトリア';
+$lang['ESA']='エルサルバドル';
+$lang['ESP']='スペイン';
+$lang['EST']='エストニア';
+$lang['ETH']='エチオピア';
+$lang['FIJ']='フィジー';
+$lang['FIN']='フィンランド';
+$lang['FRA']='フランス';
+$lang['FSM']='ミクロネシア連邦';
+$lang['GAB']='ガボン';
+$lang['GAM']='ガンビア';
+$lang['GBR']='イギリス';
+$lang['GBS']='ギニアビサウ';
+$lang['GEO']='ジョージア';
+$lang['GEQ']='赤道ギニア';
+$lang['GER']='ドイツ';
+$lang['GHA']='ガーナ';
+$lang['GRE']='ギリシャ';
+$lang['GRN']='グレナダ';
+$lang['GUA']='グアテマラ';
+$lang['GUI']='ギニア';
+$lang['GUM']='グアム';
+$lang['GUY']='ガイアナ';
+$lang['HAI']='ハイチ';
+$lang['HON']='ホンジュラス';
+$lang['HUN']='ハンガリー';
+$lang['INA']='インドネシア';
+$lang['IND']='インド';
+$lang['IRL']='アイルランド';
+$lang['IRQ']='イラク';
+$lang['ISL']='アイスランド';
+$lang['ISR']='イスラエル';
+$lang['ITA']='イタリア';
+$lang['IVB']='イギリス領ヴァージン諸島';
+$lang['JAM']='ジャマイカ';
+$lang['JOR']='ヨルダン';
 $lang['JPN']='日本';
-$lang['MDA']='モルドバ';
+$lang['KAZ']='カザフスタン';
+$lang['KEN']='ケニア';
+$lang['KGZ']='キルギス';
+$lang['KIR']='キリバス';
+$lang['KOR']='韓国';
+$lang['KSA']='サウジアラビア';
+$lang['KUW']='クウェート';
+$lang['LAT']='ラトビア';
+$lang['LBA']='リビア';
+$lang['LBR']='リベリア';
+$lang['LCA']='セントルシア';
+$lang['LES']='レソト';
+$lang['LIB']='レバノン';
+$lang['LIE']='リヒテンシュタイン';
+$lang['LTU']='リトアニア';
+$lang['LUX']='ルクセンブルク';
+$lang['MAD']='マダガスカル';
+$lang['MAR']='モロッコ';
+$lang['MAS']='マレーシア';
+$lang['MAW']='マラウイ';
+$lang['MDV']='モルディブ';
 $lang['Medal-1']='金メダル';
-$lang['Medal-2']='シルバー';
 $lang['Medal-3']='銅メダル';
 $lang['Medal-4']='4位';
+$lang['MEX']='メキシコ';
+$lang['MGL']='モンゴル';
+$lang['MHL']='マーシャル諸島';
+$lang['MLI']='マリ';
+$lang['MLT']='マルタ';
+$lang['MNE']='モンテネグロ';
+$lang['MON']='モナコ';
+$lang['MOZ']='モザンビーク';
+$lang['MRI']='モーリシャス';
+$lang['MTN']='モーリタニア';
+$lang['MYA']='ミャンマー';
+$lang['NAM']='ナミビア';
+$lang['NCA']='ニカラグア';
+$lang['NED']='オランダ';
+$lang['NEP']='ネパール';
+$lang['NGR']='ナイジェリア';
+$lang['NIG']='ニジェール';
+$lang['NOR']='ノルウェー';
+$lang['NRU']='ナウル';
+$lang['NZL']='ニュージーランド';
+$lang['OMA']='オマーン';
+$lang['PAK']='パキスタン';
+$lang['PAN']='パナマ';
+$lang['PAR']='パラグアイ';
+$lang['PER']='ペルー';
+$lang['PHI']='フィリピン';
+$lang['PLE']='パレスチナ';
+$lang['PLW']='パラオ';
+$lang['PNG']='パプアニューギニア';
+$lang['POL']='ポーランド';
+$lang['POR']='ポルトガル';
+$lang['PUR']='プエルトリコ';
+$lang['QAT']='カタール';
+$lang['ROU']='ルーマニア';
+$lang['RSA']='南アフリカ';
+$lang['RUS']='ロシア';
+$lang['RWA']='ルワンダ';
+$lang['SAM']='サモア';
+$lang['SEN']='セネガル';
+$lang['SEY']='セーシェル';
+$lang['SGP']='シンガポール';
+$lang['SIN']='シンガポール';
+$lang['SKN']='セントクリストファー・ネイビス';
+$lang['SLE']='シエラレオネ';
+$lang['SLO']='スロベニア';
+$lang['SMR']='サンマリノ';
+$lang['SOL']='ソロモン諸島';
+$lang['SOM']='ソマリア';
+$lang['SRB']='セルビア';
+$lang['SRI']='スリランカ';
+$lang['STP']='サントメ・プリンシペ';
+$lang['SUD']='スーダン';
+$lang['SUI']='スイス';
+$lang['SUR']='スリナム';
+$lang['SVK']='スロバキア';
+$lang['SWE']='スウェーデン';
+$lang['SWZ']='エスワティニ';
+$lang['TAN']='タンザニア';
+$lang['TGA']='トンガ';
+$lang['THA']='タイ';
+$lang['TJK']='タジキスタン';
+$lang['TKM']='トルクメニスタン';
+$lang['TOG']='トーゴ';
+$lang['TPE']='チャイニーズタイペイ';
+$lang['TRI']='トリニダード・トバゴ';
+$lang['TUN']='チュニジア';
+$lang['TUR']='トルコ';
+$lang['TUV']='ツバル';
+$lang['UAE']='アラブ首長国連邦';
+$lang['UGA']='ウガンダ';
+$lang['UKR']='ウクライナ';
+$lang['URU']='ウルグアイ';
+$lang['USA']='アメリカ合衆国';
+$lang['UZB']='ウズベキスタン';
+$lang['VAN']='バヌアツ';
+$lang['VEN']='ベネズエラ';
+$lang['VIE']='ベトナム';
+$lang['VIN']='セントビンセント・グレナディーン';
+$lang['YEM']='イエメン';
+$lang['ZAM']='ザンビア';
+$lang['ZIM']='ジンバブエ';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ja/ISK-App.php b/src/Common/Languages/ja/ISK-App.php
index 5b544a41..f1b1aafa 100644
--- a/src/Common/Languages/ja/ISK-App.php
+++ b/src/Common/Languages/ja/ISK-App.php
@@ -1,6 +1,7 @@
 <?php
 $lang['0_Phase']='ｺﾞｰﾙﾄﾞ';
 $lang['1_Phase']='ﾌﾞﾛﾝｽﾞ';
+$lang['2_Phase']='準決勝';
 $lang['4_Phase']='準々決勝';
 $lang['AppPageSettings']='設定';
 $lang['AppPageStart']='スタートページ';
@@ -11,7 +12,6 @@
 $lang['GenericOk']='OK';
 $lang['HelpIntro1Head']='スコアキーパーNG';
 $lang['HelpIntro1RR']='ラウンドロビン';
-$lang['HelpIntro2MI']='個人マッチ戦';
 $lang['HelpIntro2Qual']='予選ラウンド';
 $lang['HelpScorecardHead']='スコアカード';
 $lang['HelpSettingsHead']='設定';
@@ -19,15 +19,15 @@
 $lang['MainEnd']='小計';
 $lang['MainTargets']='的番号';
 $lang['MainTotal']='合計';
-$lang['MainWaitingConfig']='端末を係員にご返却下さい';
+$lang['MainWaitingConfig']='端末を係員に返却して下さい';
 $lang['MenuCloseMenu']='メニューを閉じる';
 $lang['MenuDeviceId']='端末ID:';
+$lang['MenuExitApp']='アプリを終了';
 $lang['ScorecardArrows']='素点';
 $lang['ScorecardCompTotal']='総計';
 $lang['ScorecardDistTotal']='合計';
 $lang['ScorecardEnd']='ｴﾝﾄﾞ';
 $lang['ScorecardEndTotal']='小計';
-$lang['ScorecardSetPoints']='ｾｯﾄ';
 $lang['ScoringDeleteArrow']='素点削除';
 $lang['ScoringDeleteEnd']='エンド削除';
 $lang['ScoringDeleteEndConfirmMessage']='このエンドの素点全てを本当に削除しますか？';
@@ -56,7 +56,7 @@
 $lang['SettingsManualStage']='ステージ';
 $lang['SettingsManualTarget']='的番号';
 $lang['SettingsOtherCategory']='その他のオプション';
-$lang['SettingsOtherEnableHaptics']='触覚フィードバックを有効にする';
+$lang['SettingsOtherEnableHaptics']='触覚フィードバックを有効';
 $lang['SettingsOtherHideTotals']='スコアリング中は合計を表示しない';
 $lang['SettingsOtherSpotting']='スポッティングモード';
 $lang['SettingsQrCodesCategory']='QRコード';
@@ -64,7 +64,6 @@
 $lang['SettingsQrCodesScorecard']='スコアカード';
 $lang['SettingsReset']='リセット';
 $lang['SettingsSaveConfig']='保存';
-$lang['SettingsScanSendQr']='送信';
 $lang['SettingsStageMI']='個人マッチ戦';
 $lang['SettingsStageMT']='団体マッチ戦';
 $lang['SettingsStageQ']='予選ラウンド';
@@ -73,6 +72,7 @@
 $lang['SetupUsingBarcode']='QRコードによる設定';
 $lang['SignatureReturnDev']='端末をスタッフに返却して下さい';
 $lang['SignatureSuccess']='OK';
+$lang['SignatureTitleFinished']='終了したスコアカード';
 $lang['UpdateLangAdditional']='追加可能言語';
 $lang['UpdateLangInstalled']='インストール済み言語';
 $lang['UpdateLangTitle']='言語アップデート';
diff --git a/src/Common/Languages/ja/ISK.php b/src/Common/Languages/ja/ISK.php
index 7213abb1..75118d32 100644
--- a/src/Common/Languages/ja/ISK.php
+++ b/src/Common/Languages/ja/ISK.php
@@ -3,7 +3,7 @@
 $lang['12_Phase']='1/12';
 $lang['14_Phase']='1/14';
 $lang['16_Phase']='1/16';
-$lang['1_Phase']='ブロンズメダルマッチ';
+$lang['1_Phase']='Bronze Final';
 $lang['24_Phase']='1/24';
 $lang['2_Phase']='準決勝(1/2)';
 $lang['32_Phase']='1/32';
diff --git a/src/Common/Languages/ja/InfoSystem.php b/src/Common/Languages/ja/InfoSystem.php
index 2c775b44..2ba8f0a0 100644
--- a/src/Common/Languages/ja/InfoSystem.php
+++ b/src/Common/Languages/ja/InfoSystem.php
@@ -1,11 +1,10 @@
 <?php
 $lang['ClassDiv']='ｶﾃｺﾞﾘｰ';
 $lang['CompleteSchedule']='全日程を表示す';
-$lang['Eliminations']='ｴﾘﾐﾈｰｼｮﾝ';
 $lang['Eliminations_1']='予選ラウンド_1回目';
 $lang['Eliminations_2']='予選ラウンド_2回目';
 $lang['Individual']='個人戦';
 $lang['Qualification']='予選ラウンド';
-$lang['Rankings']='個人戦_ｴﾘﾐﾈｰｼｮﾝﾗｳﾝﾄﾞ+決勝ﾗｳﾝﾄﾞ';
+$lang['RankingsTeam']='団体戦ランキング';
 $lang['Teams']='団体戦';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ja/Install.php b/src/Common/Languages/ja/Install.php
index de90659f..c603b36c 100644
--- a/src/Common/Languages/ja/Install.php
+++ b/src/Common/Languages/ja/Install.php
@@ -1,5 +1,4 @@
 <?php
-$lang['Credits-BeiterCredits']='バーコードモジュールはBeiter Archery Products社及びMr.Andreas Lorenzのサポートによりianseoに無償提供されています。';
 $lang['EventWillBeReset']='【注意】「$a[0]」「 $a[1]」「$a[2]」を変更すると、設定された大会のパラメータがすべてデフォルトに戻ります。ご注意ください。';
 $lang['FreeOnlineResults']='<b>試合結果公開:</b> インターネット接続があれば、試合結果をIanseoにフリーで公開することが出来ます。あなたの試合結果を世界に公開しましょう！大会情報が出来たら、接続コードを申請しましょう（メニュー «{$a}»）。';
 $lang['Module']='モジュール';
@@ -18,12 +17,12 @@
 $lang['SetOneClass']='全てひとつのクラス';
 $lang['Setup-Default']='<b>WA競技規則（日本の試合もこれを選択して下さい）</b>';
 $lang['Setup-PAR']='パラ大会（IPCルール）';
+$lang['SpecialUpdate']='Testing installation';
 $lang['Start Ianseo']='IANSEOヘ移動';
 $lang['Status']='ステータス';
-$lang['UpdatePrepared']='Ianseoの自動アップデートを行います。アップデートを行う前に、大会情報のバックアップをお願いします。アップデートは接続速度、アップデート内容により、時間がかかる場合があります。<br/>Ianseoオリジナル以外のファイルは≪Modules/Custom≫フォルダ内にあるものを除き、全て削除されるのでご注意下さい。';
+$lang['UpdatePrepared']='Ianseoの自動アップデートを行います。アップデートを行う前に、大会情報のバックアップをお願いします。アップデートは接続速度、アップデート内容により、時間がかかる場合があります。<br>Ianseoオリジナル以外のファイルは、≪Modules/Custom≫フォルダ内にあるものを除き、全て削除されるのでご注意下さい。';
 $lang['WhatIanseoDoes01']='<b>WA競技規則に準拠:</b> Ianseoは常に最新のWA競技規則に準拠しています。各国固有のルールに対応することも可能です。';
 $lang['WhatIanseoDoes02']='<b>サポート:</b> サポートが必要な場合は、e-mailでご連絡下さい、$a: Ianseoチームより回答致します。（英語のみ対応）';
-$lang['WhatIanseoDoes03']='<b>オンサイトトレーニングコース:</b> Ianseo使用方法、活用方法に関するトレーニングコースを実施出来ますので、ご相談下さい。（有償、英語のみ）';
 $lang['WhatIanseoDoes04']='<b>寄付のお願い!</b> Ianseoは無償のオープンソースソフトウエアです。Ianseoの開発継続にご協力をお願いします。Ianseoのホームページ $a で "Donate" ボタンを押して下さい。';
 $lang['WhatIanseoDoes05']='<b>ソーシャルメディア:</b> Ianseoの $a ページにもアクセス下さい!';
 $lang['WhatIanseoDoesTitle']='IANSEOシステムへようこそ！';
diff --git a/src/Common/Languages/ja/Languages.php b/src/Common/Languages/ja/Languages.php
index 5bf5c71f..5b08397b 100644
--- a/src/Common/Languages/ja/Languages.php
+++ b/src/Common/Languages/ja/Languages.php
@@ -13,22 +13,10 @@
 $lang['CA-Ev-CCMT']='コンパウンド キャデット男子団体';
 $lang['CA-Ev-CCWT']='コンパウンド キャデット女子団体';
 $lang['CA-Ev-CCX']='コンパウンド キャデットミックス団体';
-$lang['CA-Ev-CM']='コンパウンド男子';
 $lang['CA-Ev-CMT']='コンパウンド 男子団体';
-$lang['CA-Ev-CW']='コンパウンド女子';
 $lang['CA-Ev-CWT']='コンパウンド 女子団体';
 $lang['CA-Ev-CX']='コンパウンド ミックス団体';
 $lang['CA-Ev-MT']='男子団体';
-$lang['CA-Ev-RCM']='リカーブキャデット男子';
-$lang['CA-Ev-RCMT']='リカーブ キャデット 男子団体';
-$lang['CA-Ev-RCW']='リカーブ キャデット 女子';
-$lang['CA-Ev-RCWT']='リカーブ キャデット 女子団体';
-$lang['CA-Ev-RCX']='リカーブ キャデット ミックス団体';
-$lang['CA-Ev-RJM']='リカーブ ジュニア 男子';
-$lang['CA-Ev-RJMT']='リカーブ ジュニア 男子団体';
-$lang['CA-Ev-RJW']='リカーブ ジュニア 女子';
-$lang['CA-Ev-RJWT']='リカーブ ジュニア 女子団体';
-$lang['CA-Ev-RJX']='リカーブ ジュニア ミックス団体';
 $lang['CA-Ev-RM']='リカーブ 男子';
 $lang['CA-Ev-RMT']='リカーブ 男子団体';
 $lang['CA-Ev-RW']='リカーブ 女子';
@@ -42,6 +30,7 @@
 $lang['Languages']='選択可能な言語';
 $lang['Module']='モジュール';
 $lang['OK']='OK';
+$lang['Original']='Original';
 $lang['Separatore']='セパレータ';
 $lang['Translation']='翻訳';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ja/ODF.php b/src/Common/Languages/ja/ODF.php
index cd33453a..6f52f5d5 100644
--- a/src/Common/Languages/ja/ODF.php
+++ b/src/Common/Languages/ja/ODF.php
@@ -1,9 +1,7 @@
 <?php
-$lang['BrokenRecords']='新記';
 $lang['IntEVENT']='イベント名';
 $lang['IntRES']='リザルト';
 $lang['IntSCHED']='スケジュール';
-$lang['LoserMatchName']='マッチ $aの敗者';
 $lang['TypNAME']='詳細';
 $lang['TypSTATUS']='ｽﾃｰﾀｽ';
 $lang['WinnerMatchName']='マッチ $aの勝者';
diff --git a/src/Common/Languages/ja/Records.php b/src/Common/Languages/ja/Records.php
index 7822d34c..9994eec3 100644
--- a/src/Common/Languages/ja/Records.php
+++ b/src/Common/Languages/ja/Records.php
@@ -1,3 +1,4 @@
 <?php
+$lang['Country']='単一国、NOCを入力：';
 $lang['Para']='パラ';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ja/RoundRobin.php b/src/Common/Languages/ja/RoundRobin.php
index 38dea047..f199d452 100644
--- a/src/Common/Languages/ja/RoundRobin.php
+++ b/src/Common/Languages/ja/RoundRobin.php
@@ -5,9 +5,6 @@
 $lang['GroupName']='ｸﾞﾙｰﾌﾟ名';
 $lang['GroupNum']='ｸﾞﾙｰﾌﾟ{$a}';
 $lang['Groups']='ｸﾞﾙｰﾌﾟ数';
-$lang['LevelName']='ﾚﾍﾞﾙ名';
-$lang['LevelNum']='ﾚﾍﾞﾙ {$a}';
-$lang['LevelsHelp']='ﾚﾍﾞﾙ数';
 $lang['QualifiedArchers']='予選通過者';
 $lang['RegularBrackets']='標準ブラケット';
 $lang['RoundNum']='ﾗｳﾝﾄﾞ {$a}';
diff --git a/src/Common/Languages/ja/Tournament.php b/src/Common/Languages/ja/Tournament.php
index 3496e081..fe242a9f 100644
--- a/src/Common/Languages/ja/Tournament.php
+++ b/src/Common/Languages/ja/Tournament.php
@@ -8,6 +8,7 @@
 $lang['4R_Phase']='4回戦';
 $lang['5Before']='5分前';
 $lang['Acc']='有効にする';
+$lang['AccreditateAll']='すべて確認する';
 $lang['Accreditation']='選手登録１';
 $lang['AclAccreditation']='選手登録２';
 $lang['AclAPI']='API';
@@ -19,10 +20,11 @@
 $lang['AclOutput']='出力';
 $lang['AclParticipants']='選手';
 $lang['AclQualification']='クオリフィケーション';
+$lang['ACLReadWrite']='完全なアクセス権(読み込みと書き込み)';
 $lang['AclRobin']='ﾗｳﾝﾄﾞﾛﾋﾞﾝ';
 $lang['AclSpeaker']='実況ビュー';
 $lang['AclTeams']='団体決勝';
-$lang['AdvancedParams']='アドバンスパラメータ';
+$lang['AdvancedParams']='アドバンスパラメーター';
 $lang['AllDistances']='総て';
 $lang['AllEvents']='全イベント';
 $lang['AllRound']='全ラウンド';
@@ -31,7 +33,6 @@
 $lang['AllsM']='すべて';
 $lang['AllTargets']='すべてのターゲット';
 $lang['AlternateMatch']='交互射ち';
-$lang['Announcer']='アナウンサー';
 $lang['ArcherNotFound']='選手が見つかりません！';
 $lang['ArcherSignature']='選手/ｴｰｼﾞｪﾝﾄｻｲﾝ';
 $lang['Areas']='アクセスエリア';
@@ -39,7 +40,7 @@
 $lang['Area_2']='練習会場';
 $lang['Area_4']='プレス';
 $lang['Area_5']='テレビ';
-$lang['Area_6']='VIP用';
+$lang['Area_6']='VIP';
 $lang['Arr4Set']='シューティング本数設定';
 $lang['ArrowPhaseLegend1']='イリミネーションラウンドの詳細設定';
 $lang['ArrowPhaseLegend2']='ファイナルラウンドの詳細設定';
@@ -51,6 +52,7 @@
 $lang['AthButtLegend2']='ﾀｰｹﾞｯﾄ当たりのﾏｯﾁ数';
 $lang['AthleteList']='選手をインポート';
 $lang['AuthCode']='パスワード';
+$lang['AutoMoveNext']='次の得点入力欄に自動で移動';
 $lang['AutoTargetAssignment']='的番号オート設定';
 $lang['AutoUploadToggle']='自動アップロードを有効にする。タイマーを設定して下さい。';
 $lang['AvailableValues']='有効なｶﾃｺﾞﾘｰ';
@@ -71,7 +73,7 @@
 $lang['BadgeType']='バッジ種類';
 $lang['BadParams']='なんでやねん';
 $lang['BarcodeMissing']='未入力バーコードを印刷';
-$lang['BF_Phase']='ブロンズマッチ';
+$lang['BF_Phase']='ブロンズメダルマッチ';
 $lang['BigNames']='全画面印刷';
 $lang['Birthdays']='生年月日';
 $lang['Block_IP']='IPアドレス';
@@ -94,6 +96,8 @@
 $lang['CatJury']='上訴委員';
 $lang['CatOC']='運営委員';
 $lang['ChairmanJudge']='審判長';
+$lang['ChairmanJudgeDeputy']='副審判長';
+$lang['ChairmanJury']='上訴委員長';
 $lang['ChangeNationsNames']='所属先名称変更';
 $lang['CheckScorecards']='スコアカードのチェック';
 $lang['CheckTargetUpdate']='更新を確認';
@@ -104,7 +108,7 @@
 $lang['CmdAdd']='追加';
 $lang['CmdChange']='変更';
 $lang['CmdDelete']='削除';
-$lang['CmdDeleteOnline']='www.ianseo.net上のファイルを削除';
+$lang['CmdDeleteOnline']='ianseo.net上のファイルを削除';
 $lang['CmdExport']='エクスポート';
 $lang['CmdImport']='インポート';
 $lang['CmdSend']='送信';
@@ -116,6 +120,8 @@
 $lang['CompleteSchedule']='全日程スケジュール';
 $lang['CompVenue']='会場名';
 $lang['Confirm']='修正確認';
+$lang['ConfirmEnd']='Confirm End';
+$lang['ConfirmMatch']='Confirm Match';
 $lang['Contacts']='連絡先';
 $lang['ControlMaterial']='用具検査';
 $lang['CountryClubNames']='国名・クラブ名';
@@ -141,7 +147,8 @@
 $lang['DNF']='DNF - 途中棄権';
 $lang['DNS']='欠場';
 $lang['DOB']='生年月日';
-$lang['Dos']='DoS';
+$lang['Dos']='DOS';
+$lang['DosAssistant']='副DOS';
 $lang['DoubleSpace']='クロスボウ';
 $lang['DQB']='DQB - 非スポーツマン行為により失格';
 $lang['DrawType']='設定タイプ';
@@ -156,6 +163,7 @@
 $lang['Export2Fitarco']='EXPファイルでエクスポート';
 $lang['ExportNotes']='審判注記';
 $lang['FamilyName']='苗字';
+$lang['FieldScorecard']='Field/3D スコアカード';
 $lang['FieldTourCategory']='フィールド';
 $lang['FilterOnDivCl']='部門･種別でフィルタ';
 $lang['FilterOnDivClAdv']='部門・種別でフィルタ（RegExp）';
@@ -174,6 +182,7 @@
 $lang['FlightsReset']='リセット';
 $lang['FlightsTotals']='合計';
 $lang['From']='開始';
+$lang['F_Phase']='ゴールドメダルマッチ';
 $lang['GetArcInfo']='選手の生年月日、e-mailを表示';
 $lang['GetCredentials']='オンラインコード申請';
 $lang['GetCredentialsExplained']='大会コード申請に関して：
@@ -186,11 +195,7 @@
 $lang['I-Session']='個人マッチ戦';
 $lang['Image']='画像';
 $lang['ImgInfo']='利用可能フォーマット：PNG、JPG（最大256KB）';
-$lang['IndClEvent']='予選ラウンド_個人';
-$lang['IndFin']='個人戦 - 決勝ラウンド（マッチ戦）';
-$lang['IndFinEvent']='決勝－個人';
 $lang['IndoorTourCategory']='インドア大会';
-$lang['IndQual']='個人戦 - 予選ラウンド';
 $lang['IOCcode']='IOC国コード';
 $lang['IRM-10']='欠場';
 $lang['IRM-15']='失格';
@@ -198,6 +203,9 @@
 $lang['IRM-5']='途中棄権';
 $lang['IRM-7']='途中棄権（ランキング無し）';
 $lang['IrmStatus']='IRM状況';
+$lang['Judge']='審判員';
+$lang['Jury']='上訴委員';
+$lang['KeyPress']='キーパッド入力モード';
 $lang['LastUpdate']='最終更新日';
 $lang['LegendSO']='シュートオフ及びコイントスの略号';
 $lang['Length']='時間（分）';
@@ -235,7 +243,6 @@
 $lang['MedalClass']='部門・種別リザルト-全メダル';
 $lang['MedalIndClass']='部門・種別リザルト-個人メダル';
 $lang['MedalSqClass']='部門・種別リザルト-団体メダル';
-$lang['MixedTeamFinEvent']='ミックス戦 - 決勝ラウンド';
 $lang['MoveWinner2NextPhase']='勝者を次フェーズに進める';
 $lang['MsgLookup4']='対戦者情報を表示';
 $lang['MsgLookup5']='小計';
@@ -248,11 +255,13 @@
 $lang['New']='新規作成';
 $lang['NewTour']='新しい大会を作成';
 $lang['NoAth2Manage']='選手情報が登録されていません！';
+$lang['NoDistance']='指定無し';
 $lang['NoLocations']='開催場所を含めない';
 $lang['Notes']='備考';
 $lang['NoTour']='大会情報が選択されていません。';
 $lang['NoTourExists']='大会情報がありません！';
 $lang['Now']='現在';
+$lang['NumberOfEntriesByEvent']='出場者数（部門別）';
 $lang['NumResult']='上位抽出（0:全リスト）';
 $lang['NumSession']='セッション数';
 $lang['NumTieAtPosition']='{$a[0]}選手が、{$a[1]}位タイです。';
@@ -320,10 +329,12 @@
 $lang['ResultIndAbsSnap']='クオリフィケーションラウンド-個人';
 $lang['ResultIndClass']='部門・種別リザルトリスト-個人';
 $lang['ResultIndClassSnap']='部門・種別スナップショットリザルトリスト-個人';
+$lang['ResultResp']='記録長';
 $lang['Results']='リザルト';
 $lang['ResultSqAbs']='ランキングラウンド ー 団体';
 $lang['ResultSqClass']='部門・種別リザルトリスト-団体';
 $lang['ResultsRobin']='ﾗｳﾝﾄﾞﾛﾋﾞﾝ結果';
+$lang['ResVerifier']='記録委員';
 $lang['Round#']='ラウンド $a';
 $lang['RunningEv']='平均点順位リスト';
 $lang['RunningEvents']='大会速報設定';
@@ -334,6 +345,7 @@
 $lang['ScheduleFromDay']='指定日以降のスケジュール';
 $lang['ScheduleNotes']='備考';
 $lang['ScheduleToday']='本日のスケジュール';
+$lang['ScheduleUnfinished']='終了したセッションを除く';
 $lang['SchIncFinalists']='決勝進出者の名前を含む';
 $lang['Score']='点数';
 $lang['Score1PageAllDist']='選手毎に全ての距離を1枚にまとめたスコアカード';
@@ -346,13 +358,12 @@
 $lang['ScorecardsTeams']='チーム戦用スコアカード';
 $lang['ScoreComplete']='<b>標準スコアカード</b>';
 $lang['ScoreCompleteTotals']='標準スコアカード＋ランニング合計';
-$lang['ScoreCutoff']='通過点';
 $lang['ScoreFlags']='国旗・クラブ旗を追加';
 $lang['ScoreLogos']='大会ロゴを追加';
 $lang['ScorePrintMode']='スコアカードプリントアウト詳細設定';
 $lang['ScoreTournament']='ヘッダーを追加する';
 $lang['SelectSession']='セッション選択';
-$lang['Send2Ianseo']='www.ianseo.netにデータを送信する。';
+$lang['Send2Ianseo']='ianseo.netにデータを送信する。';
 $lang['SendLogos']='大会のロゴ等のイメージ';
 $lang['SeparateClasses']='種別に分け';
 $lang['SeparateDivisions']='部門別に分け';
@@ -367,6 +378,7 @@
 $lang['SetPoints']='ｾｯﾄﾎﾟｲﾝﾄ';
 $lang['SetTotal']='ｾｯﾄ小計';
 $lang['Sex']='性別';
+$lang['SF_Phase']='準決勝';
 $lang['ShortFemale']='女子';
 $lang['ShortMale']='男子';
 $lang['ShortUnisex']='U';
@@ -400,7 +412,6 @@
 $lang['StatEvents']='統計（表彰・イベント）';
 $lang['StatRecordsBroken']='新記';
 $lang['StatRecordsStanding']='大会記録';
-$lang['Status']='ｽﾃｰﾀｽ';
 $lang['StdORIS']='ORIS標準形式';
 $lang['StickersBarcode']='バーコードを印刷';
 $lang['StrCurrency']='通貨';
@@ -423,11 +434,7 @@
 $lang['TargetJudgeSignature']='ﾀｰｹﾞｯﾄｼﾞｬｯｼﾞｻｲﾝ';
 $lang['Targets']='ﾀｰｹﾞｯﾄ表示';
 $lang['TargetShort']='的#';
-$lang['TeamClEvent']='予選ラウンド_団体';
 $lang['TeamCreationMode']='チーム生成方式';
-$lang['TeamFin']='団体戦 - 決勝ラウンド（マッチ戦）';
-$lang['TeamFinEvent']='決勝－団体';
-$lang['TeamQual']='団体戦 - 予選ラウンド';
 $lang['Text']='内容';
 $lang['Time']='開始時間';
 $lang['TimeStampSignature']='ｻｲﾝ時間（HH:MM）';
@@ -439,7 +446,7 @@
 $lang['TotalProg']='小計';
 $lang['TotalShort']='累計';
 $lang['TourCode']='大会コード';
-$lang['TourCommitee']='主催者';
+$lang['TourCommitee']='大会主催者';
 $lang['TourIsOris']='ORIS準拠';
 $lang['TourIsOrisDescr']='チェックすると、出力が全てORIS（IOCオリンピック競技大会結果･情報サービス）準拠になります。';
 $lang['TourMainInfo']='大会情報';
@@ -448,7 +455,7 @@
 $lang['TournamentImport']='大会情報をインポート';
 $lang['TourPartecipants']='大会参加選手一覧';
 $lang['TourRuleResetDescr']='<b>本項目はチェックしないで下さい！</b>This action will reset all tournament related options to their default values: Divisions, Classes, Distances, Targets, etc...<br/><b>Use only if you know what you\'re doing!</b>';
-$lang['TourShortName']='所属先';
+$lang['TourShortName']='大会名略称';
 $lang['TourTimeZone']='タイムゾーン';
 $lang['TourType']='競技形式';
 $lang['TourTypeName']='競技形式';
@@ -458,11 +465,10 @@
 $lang['TourType_4']='フィールド';
 $lang['TourType_8']='3D';
 $lang['TourWhen']='開催日程';
-$lang['TourWhere']='開催地';
+$lang['TourWhere']='大会会場';
 $lang['TVContentName']='氏名';
-$lang['TVCss3Arrows']='ヒット数';
+$lang['TVCss3Arrows']='ヒット';
 $lang['TVCss3Athlete']='選手名';
-$lang['TVCss3CategoryCode']='カテゴリ（コード）';
 $lang['TVCss3CountryCode']='国コード';
 $lang['TVCss3CountryDescr']='国名';
 $lang['TVCss3Gold']='ゴール';
@@ -482,13 +488,11 @@
 $lang['Type_Indoor 18']='インドア 18m';
 $lang['Type_Indoor 25']='インドア 25m';
 $lang['Type_Indoor 25+18']='インドア 25+18m';
-$lang['Type_NorH']='　';
 $lang['Unisex']='ユニセック';
 $lang['Unset-DSQ']='失格を解除';
 $lang['UploadFile']='ファイルをアップロード（pdf）';
 $lang['URL']='URL';
 $lang['UserEnabled']='有効か否か';
-$lang['UserPassword']='パスワード';
 $lang['UseSubClasses']='チェックしてサブクラスを選択';
 $lang['ValidClass']='有効なクラス';
 $lang['ValidDivisions']='有効な部門（空欄：すべて有効）';
@@ -502,6 +506,5 @@
 $lang['WheelchairShort']='W　';
 $lang['WR-short']='WR';
 $lang['YearEnd']='年令上限';
-$lang['YearStart']='年令下限';
 $lang['Z-Session']='スケジュール追加';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ja/translators.json b/src/Common/Languages/ja/translators.json
index e1a05ef8..52b28b91 100644
--- a/src/Common/Languages/ja/translators.json
+++ b/src/Common/Languages/ja/translators.json
@@ -1 +1 @@
-{"lang":"\u65e5\u672c\u8a9e - Japanese","peop":["Yuko&nbsp;Okura","Junji&nbsp;Ozawa"],"id":"ja"}
\ No newline at end of file
+{"lang":"\u65e5\u672c\u8a9e - Japanese","peop":["Nomura&nbsp;Haru","Yuko&nbsp;Okura","Junji&nbsp;Ozawa"],"id":"ja"}
\ No newline at end of file
diff --git a/src/Common/Languages/ko/Api.php b/src/Common/Languages/ko/Api.php
index 3a9eaa44..525a9f14 100644
--- a/src/Common/Languages/ko/Api.php
+++ b/src/Common/Languages/ko/Api.php
@@ -2,11 +2,28 @@
 $lang['API-AutoGroup']='대량 그룹 생성';
 $lang['API-ConfirmDeleteRow']='이 행을 삭제하시겠습니까?';
 $lang['API-DeviceGrouping']='장치 그룹화';
+$lang['API-EnableDeviceGrouping']='장치 그룹화 활성화';
 $lang['API-Group']='그룹';
 $lang['API-TargetGrouping']='표적 그룹화';
 $lang['API-Targets']='표적';
+$lang['AskSignature-0']='아니오';
+$lang['AskSignature-1']='선수 ID 스캔';
+$lang['AskSignature-2']='화면 서명';
 $lang['AutoImport']='자동 가져오기';
 $lang['CheckConnected']='접속상태 확인';
 $lang['CmdDelete']='제거';
 $lang['CmdImport']='가져오기';
+$lang['ConfirmGenerateZip']='세션 $a[1]에 대한 모든 $a[0]이 포함된 ZIP 파일 생성을 확인해 주세요.';
+$lang['Controller']='컨트롤러';
+$lang['DataRefresh']='데이터 새로고침';
+$lang['Desc-Let-1']='현재 엔드 가져오기';
+$lang['Desc-Let-2']='현재 엔드에서 누락된 화살';
+$lang['ISK-BadCompCode']='잘못된 대회 코드';
+$lang['ISK-Lite-NoCompCode']='대회 코드 누락';
+$lang['ISK-Lite-ServerUrl']='서버 URL (프로토콜 및 포트 80이 아닌 경우 포함)';
+$lang['ISK-NoCompCode']='대회 코드 누락';
+$lang['ISK-onlyAccreditated']='검증된 AD인증';
+$lang['ISK-ServerUrl']='서버 URL (프로토콜 및 포트 80이 아닌 경우 포함)';
+$lang['ISK-ServerUrlPin']='대회 보안 PIN';
+$lang['WAToolbox-NoCompCode']='대회 코드 누락';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/BackNumbers.php b/src/Common/Languages/ko/BackNumbers.php
index 975dceb9..d8b5b6f9 100644
--- a/src/Common/Languages/ko/BackNumbers.php
+++ b/src/Common/Languages/ko/BackNumbers.php
@@ -1,7 +1,29 @@
 <?php
+$lang['A-Badge']='AD인증 뱃지';
+$lang['AccreditationKO']='AD인증 에 문제가 있습니다. 데스크로 와 주세요.';
+$lang['AccreditationMatches']='이 뱃지는 다음 범주에 해당됩니다.';
+$lang['AccreditationOK']='AD인증이 성공적입니다!';
+$lang['AccreditationTwice']='AD인증이 이미 완료 되었습니다.';
 $lang['AutoCheckin']='자동 체크인';
 $lang['AutoCHK-Camera']='카메라를 사용하여 QR 코드 읽기';
 $lang['AutoCHK-CanEdit']='장비들은 이름과 범주를 편집할 수 있습니다.';
 $lang['AutoCHK-Code']='대회 코드';
 $lang['AutoCHK-Confirm']='체크인 확인';
+$lang['BarCodeFields']='<ul>
+  <li><b>공란: </b>입력 코드, 디비전, 클래스가 대시로 구분된 문자열이 출력됩니다.</li>
+  <li><b>{ENCODE}: </b>{ENCODE}는 입력 코드로 변환됩니다.</li>
+  <li><b>{COUNTRY}: </b>{COUNTRY}는 국가 코드로 변환됩니다.</li>
+  <li><b>{DIVISION}: </b>{DIVISION}은 디비전 코드로 변환됩니다.</li>
+  <li><b>{CLASS}: </b>{CLASS}는 클래스 코드로 변환됩니다.</li>
+  <li><b>{TOURNAMENT}: </b>{TOURNAMENT}는 대회 코드로 변환됩니다.</li>
+</ul>';
+$lang['QrCodeFields']='<ul> 
+ <li><b>공란: </b>입력 코드, 디비전, 클래스가 대시로 구분된 문자열이 출력됩니다.</li>
+  <li><b>{ENCODE}: </b>{ENCODE}는 입력 코드로 변환됩니다.</li>
+  <li><b>{COUNTRY}: </b>{COUNTRY}는 국가 코드로 변환됩니다.</li>
+  <li><b>{DIVISION}: </b>{DIVISION}은 디비전 코드로 변환됩니다.</li>
+  <li><b>{CLASS}: </b>{CLASS}는 클래스 코드로 변환됩니다.</li>
+  <li><b>{TOURNAMENT}: </b>{TOURNAMENT}는 대회 코드로 변환됩니다.</li>
+</ul>';
+$lang['SetAccreditationMatches']='이 뱃지는 다음 카테고리에 맞게 지정될 수 있습니다.';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/Common.php b/src/Common/Languages/ko/Common.php
index efca6229..c569cc9a 100644
--- a/src/Common/Languages/ko/Common.php
+++ b/src/Common/Languages/ko/Common.php
@@ -1,4 +1,9 @@
 <?php
+$lang['AccreditationBoothSetup']='AD인증 부스 셋업';
+$lang['MenuLMPrintedBadgesFlag']='"AD인증카드 출력됨" 표시 업데이트';
+$lang['MenuLM_Accreditation']='AD인증(출입통제)';
+$lang['MenuLM_Accreditation colors management']='AD인증 색상 관리';
+$lang['MenuLM_PrintBadges']='AD인증 뱃지 출력';
 $lang['Month_0']='1월';
 $lang['Month_1']='2월';
 $lang['Month_10']='11월';
@@ -12,6 +17,7 @@
 $lang['Month_8']='9월';
 $lang['Month_9']='10월';
 $lang['MsgAreYouSure']='확실합니까?';
+$lang['SelTour']='선택된 대회';
 $lang['U']='남여공용';
 $lang['UnexpectedError']='예기치 못한 오류';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/Errors.php b/src/Common/Languages/ko/Errors.php
new file mode 100644
index 00000000..fa9df064
--- /dev/null
+++ b/src/Common/Languages/ko/Errors.php
@@ -0,0 +1,3 @@
+<?php
+$lang['MissingAccreditation']='온라인 AD인증 누락';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/Help.php b/src/Common/Languages/ko/Help.php
new file mode 100644
index 00000000..766e2e59
--- /dev/null
+++ b/src/Common/Languages/ko/Help.php
@@ -0,0 +1,7 @@
+<?php
+$lang['AutoCheckinAlreadyDone']='당신은 이미 체크인 되었습니다.<br>정보를 변경해야 하는경우 AD인증 데스크로 문의 하여 주시기 바랍니다.';
+$lang['AutoCheckinConfirm']='모든 정보가 정확하면 \'체크인 확인\'을 누르세요<br>그렇지 않으면 \'취소\'를 누르고 AD 인증 데스크로 가십시오';
+$lang['AutoCHK-Code']='대회 목록, 한 줄에 하나씩<br> 첫 번째 대회 코드는 자동 체크인 키오스크의 헤더로 사용됩니다.';
+$lang['AutoCHK-IPnoMgm']='셀프 체크인 키오스크의 IP 목록. 각 줄에 하나의 IP 주소를 다음 형식 중 하나에 맞게 작성하십시오:<br> 장치 IP <br> 장치 IP | AD인증 프린터 큐 <br> 장치 IP | AD인증 프린터 큐 | 이름 태그 프린터 큐 <br> 프린터 큐 형식: 큐 이름 [  @ 프린터 서버 ]';
+$lang['ISK-ServerUrlPin']='<b>이 번호를 공유하지 마십시오</b><br>본인이 선택한 PIN(4자리 숫자)을 사용하여 대회에 접속하세요.<br>Device(모바일장치)는 IANSEO에서 인쇄한 QR 코드를 읽어야만 대회 점수를 기록할 수 있습니다.<br> Ianseo Scorekeeper LITE 앱에서 수동 입력할 경우, 사용할 대회 코드는 <b>{$a}</b>입니다.';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/ISK-App.php b/src/Common/Languages/ko/ISK-App.php
new file mode 100644
index 00000000..73004758
--- /dev/null
+++ b/src/Common/Languages/ko/ISK-App.php
@@ -0,0 +1,4 @@
+<?php
+$lang['SettingsConnectionCompCode']='대회 코드';
+$lang['SettingsElimFirstTarget']='첫번째 타겟';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/ISK.php b/src/Common/Languages/ko/ISK.php
new file mode 100644
index 00000000..1fbe89fd
--- /dev/null
+++ b/src/Common/Languages/ko/ISK.php
@@ -0,0 +1,8 @@
+<?php
+$lang['CantGetComp']='대회 정보를 가져올 수 없습니다. 대회 코드를 확인하고 다시 시도하세요. Error: __TEXT__';
+$lang['CantVerifyServer']='대회 컴퓨터의 존재를 확인할 수 없습니다. 대회 코드를 확인하고 다시 시도하세요. Error __TEXT__';
+$lang['CompCode']='대회 코드';
+$lang['EnterCompCode']='대회 코드를 입력하고 다시 시도하세요';
+$lang['FirstTarget']='첫번째 타겟';
+$lang['QrNoCode']='바코드에서 대회 코드를 찾을 수 없습니다. 유효한 Ianseo 바코드로 다시 시도해 주세요.';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/Install.php b/src/Common/Languages/ko/Install.php
new file mode 100644
index 00000000..c2482c33
--- /dev/null
+++ b/src/Common/Languages/ko/Install.php
@@ -0,0 +1,5 @@
+<?php
+$lang['CreateStandardCatColors']='AD인증 생성';
+$lang['CreateStandardCatFull']='AD인증과 범주 생성';
+$lang['Credits-FitarcoCredits']='Ianseo란 무엇인가요? Ianseo는 양궁 대회의 결과를 관리하는 소프트웨어입니다. 이탈리아 양궁 연맹의 재정 지원 덕분에 개발된 오픈 소스 프로젝트로, 유럽 전역에 무료로 배포되었습니다. 여러 언어로 번역된 Ianseo는 전 세계에서 가장 최신의 고급 프로그램으로, 모든 세계 양궁 규칙을 통합하고 있습니다. Ianseo는 선수 및 임원의 AD인증부터 모든 종류의 출력 유틸리티, 네트워크 및 온라인 통합, FOP 설계에 이르기까지 양궁 대회를 포괄적으로 관리하는 프로그램으로 발전했습니다.';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/ODF.php b/src/Common/Languages/ko/ODF.php
new file mode 100644
index 00000000..d5508ca0
--- /dev/null
+++ b/src/Common/Languages/ko/ODF.php
@@ -0,0 +1,4 @@
+<?php
+$lang['CompetitionCodeNotThere']='대회 코드 $a가 시스템에 없습니다';
+$lang['OdfCompetition']='ODF 대회 코드';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ko/Tournament.php b/src/Common/Languages/ko/Tournament.php
index 96521756..2e8d5c4f 100644
--- a/src/Common/Languages/ko/Tournament.php
+++ b/src/Common/Languages/ko/Tournament.php
@@ -8,13 +8,14 @@
 $lang['4R_Phase']='네번째 라운드';
 $lang['5Before']='5분 전에';
 $lang['Accomodation']='숙박';
-$lang['AccrCaption']='인증 설명문';
+$lang['AccrCaption']='AD인증 문구';
 $lang['AccreditateAll']='모두 확인';
 $lang['AccreditateNone']='모두 확인 취소';
-$lang['Accreditation']='인증';
-$lang['AccreditationBooth']='인증 부스만!';
+$lang['Accreditation']='AD인증(출입통제)';
+$lang['AccreditationBooth']='AD인증 부스만!';
+$lang['AccreditationCards']='배송 예정 AD인증카드';
 $lang['AccrNoShow']='대회에 참가하지 않음 - 노쇼';
-$lang['AclAccreditation']='인증';
+$lang['AclAccreditation']='AD인증(출입통제)';
 $lang['AclAPI']='API';
 $lang['AclCompetition']='대회';
 $lang['AclEliminations']='본선전';
@@ -32,6 +33,30 @@
 $lang['AclTeams']='단체전 경기';
 $lang['Action']='동작';
 $lang['ActualFlag']='사용된 깃발';
+$lang['Ath4Target']='Archers per Target (타겟당 선수 수)';
 $lang['AutoEdits']='자동 편집';
+$lang['AutomatorAccPrint']='AD인증 출력 설정';
 $lang['AutoRefresh']='자동 새로고침';
+$lang['CancelAcc']='AD인증 취소';
+$lang['CoalesceScorecardsTip']='타겟당 1명 또는 2명의 선수가 있을 경우, 타겟의 기록지를 2개씩 병합하십시오.';
+$lang['ConnectedCodes']='연결된 모든 대회 코드';
+$lang['CurrentCompCode']='현대 대회 코드: $a';
+$lang['DescCaption']='##CAPTION## <i><tab></i> BIB <i><tab></i> CAPTION<br>BIB로 식별된 양궁 선수의 카테고리 대신 AD인증서에 인쇄된 CAPTION 텍스트';
+$lang['FirstTarget']='첫번째 타겟';
+$lang['ForceAccreditation']='강제 AD인증';
+$lang['GetCredentials']='대회 코드 받기';
+$lang['PhaseBlock_8']='AD인증(출입통제)';
+$lang['PrintedAccreditation']='이전 참여기록 출력';
+$lang['SessionEnd']='세션 종료 날짜/시간';
+$lang['SessionStart']='세션 시작 날짜/시간';
+$lang['ShowCaption']='AD인증 문구 보기';
+$lang['SOFirstTarget']='첫번째 타겟';
+$lang['TakePicture']='AD인증 사진 촬영';
+$lang['Tar4Session']='세션당 타겟수';
+$lang['TitleTourMenu']='대회 선택';
+$lang['ToFollow']='Timing 숨기기';
+$lang['TourCode']='대회 코드';
+$lang['TourIsOrisDescr']='이 확인란을 선택하면 이 토너먼트가 ORIS 준수 상태가 됩니다: 모든 출력이 ORIS(Olympic Results and Information Services) 표준으로 기본 설정됩니다.';
+$lang['TourMainInfo']='주요 정보';
+$lang['TourRuleResetDescr']='이 작업은 모든 토너먼트 관련 옵션을 기본값으로 재설정합니다: 디비전, 클래스, 거리, 타겟 등...<br/><b>정확히 알고 있는 경우에만 사용하십시오!</b>';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/Api.php b/src/Common/Languages/lv/Api.php
index 5215ae87..8cf3aad7 100644
--- a/src/Common/Languages/lv/Api.php
+++ b/src/Common/Languages/lv/Api.php
@@ -92,6 +92,9 @@
 $lang['RasLastSeen']='Pēdējā pieslēgšanās';
 $lang['RaspControl']='Raspberry Pārvaldība';
 $lang['RaspDevice']='Ierīce';
+$lang['ScorecardsEmpty']='Tukši protokli';
+$lang['ScorecardsFull']='Protokoli ar bultu vērtībām';
+$lang['UsePersonalDevices-Print']='Drukāt vairoga pieprasījuma QR kodu uz protokoliem';
 $lang['WAToolbox-MissingParams']='Trūkst parametri';
 $lang['WAToolbox-NoCompCode']='Trūkst sacensību kods';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/BackNumbers.php b/src/Common/Languages/lv/BackNumbers.php
index 5cdff4d6..d3289da7 100644
--- a/src/Common/Languages/lv/BackNumbers.php
+++ b/src/Common/Languages/lv/BackNumbers.php
@@ -55,6 +55,7 @@
 $lang['Bold']='Bold';
 $lang['Category']='Kategorija';
 $lang['CharColor']='Burtu krāsa';
+$lang['CharSize']='Burtu izmērs';
 $lang['CharType']='Burtu veids';
 $lang['CheckBarcodeSeparator']='Pārbaudīt barkoda atdalītāju';
 $lang['Club']='Valsts/kluba informācija';
@@ -96,6 +97,7 @@
 $lang['GivCaps-FamCaps']='VĀRDS UZVĀRDS';
 $lang['GivenNameInitial']='Vārda pirmais burts';
 $lang['Heigh']='Augstums';
+$lang['HLayout']='Horizontāls';
 $lang['HLine']='Horizontālā līnija';
 $lang['I-Badge']='Individuālo maču dalībnieku numuri';
 $lang['IdCardHor']='platumā';
@@ -108,7 +110,7 @@
 $lang['IdMarginR']='Labā mala';
 $lang['IdMarginT']='Augšējā mala';
 $lang['IdMarginW']='Horizontālā mala';
-$lang['Image']='Attēls';
+$lang['Image']='Attēli';
 $lang['Images']='Attēli';
 $lang['ImageSvg']='SVG Bilde';
 $lang['IncludeLogo']='Drukāt valsts karogus/klubu logo';
@@ -125,6 +127,8 @@
 $lang['OnlyAthletes']='Tikai sportisti';
 $lang['PageDimension']='Lapas izmērs';
 $lang['PaperDimention']='Lapas izmērs';
+$lang['PhaseFrom']='No fāzes';
+$lang['PhaseTo']='Līdz fāzei';
 $lang['Picture']='Sportista fotogrāfija';
 $lang['Portrait']='Portrets';
 $lang['PosX']='Pozīcija (X)';
@@ -147,12 +151,16 @@
 $lang['T-Badge']='Komandu cīņu dalībnieku numuri';
 $lang['Target']='Vairogs';
 $lang['TeamComponents']='Komandu sastāvs';
+$lang['TgtSequence']='Vairogu sekvence';
 $lang['ToBottom']='Sacensību logo (apakšā)';
 $lang['ToLeft']='Sacensību logo (pa kreisi)';
 $lang['ToRight']='Sacensību logo (pa labi)';
 $lang['TVViewIdCard']='Aplūkot ID kartes';
 $lang['TVViewIdCardDescr']='Turnīru skatā ņem 2 ID  pretinieku kartes "standarta" rindiņu vietā';
+$lang['VLayout']='Vertikāls';
 $lang['Width']='Platums';
+$lang['WRank']='Pasaules rangs';
+$lang['WRankImage']='Pasaules ranga attēls';
 $lang['Y-Badge']='Diploms (individuāli)';
 $lang['Z-Badge']='Diploms (komanda)';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/Common.php b/src/Common/Languages/lv/Common.php
index 47515e3c..51e83219 100644
--- a/src/Common/Languages/lv/Common.php
+++ b/src/Common/Languages/lv/Common.php
@@ -11,6 +11,8 @@
 $lang['32_Phase']='1/32';
 $lang['48_Phase']='1/48';
 $lang['4_Phase']='1/4';
+$lang['50M']='50+ vīrieši';
+$lang['50W']='50+ sievietes';
 $lang['64_Phase']='1/64';
 $lang['7_Phase']='1/7';
 $lang['8_Phase']='1/8';
@@ -28,7 +30,7 @@
 $lang['All_Phases']='Visas daļas';
 $lang['AM']='Kadeti zēni';
 $lang['AN']='Neaprīkotais loks';
-$lang['Archer']='Loka šāvējs';
+$lang['Archer']='Lokšāvējs';
 $lang['Archers']='Lokšāvēji';
 $lang['Arrow']='Bulta';
 $lang['ArrowAverage']='Vidējais';
@@ -64,6 +66,7 @@
 $lang['CmdOk']='Ok';
 $lang['CmdOn']='Ieslēgt';
 $lang['CmdPostUpdate']='Atjaunināt';
+$lang['CmdRefresh']='Atjaunināt';
 $lang['CmdSave']='Saglabāt';
 $lang['CmdSaveContinue']='Saglabāt un turpināt';
 $lang['CmdSet2All']='Iestatīt visiem';
@@ -130,6 +133,10 @@
 $lang['Finish']='Finišs';
 $lang['FirstPhase']='Pirmā fāze';
 $lang['FopSetup']='Šaušanas lauka izkārtojums';
+$lang['Gender0']='Vīrietis';
+$lang['Gender1']='Sieviete';
+$lang['GenderShort0']='V';
+$lang['GenderShort1']='S';
 $lang['GF']='Bērni, meitenes';
 $lang['GM']='Bērni, zēni';
 $lang['HELP']='Palīdzība!';
@@ -147,6 +154,8 @@
 $lang['IndFinEventWithoutShootOff']='Uzmanību!<br>Visām disciplīnām ir jāātrisina neizšķirti lai varētu skatīt!';
 $lang['IndImport']='Importēt datus individuālajās turnīru tabulās';
 $lang['Individual']='Individuāli';
+$lang['IndTeam-0']='Individuāli';
+$lang['IndTeam-1']='Komandas';
 $lang['ISK-Configuration']='Ierīču menedžments';
 $lang['ISK-GetQRData']='Iegūt QRCode datus';
 $lang['ISK-Results']='Rezultāti';
@@ -184,6 +193,7 @@
 $lang['MedalList']='Medaļnieku saraksts';
 $lang['MedalSilver']='Sudrabs';
 $lang['MedalStanding']='Medaļas';
+$lang['MenuLMRemoveNoShows']='Noņemt neieradušos';
 $lang['MenuLM_Accreditation']='Akreditācija';
 $lang['MenuLM_Accreditation colors management']='Iestatīt akreditācijas krāsas';
 $lang['MenuLM_Archers on Targets']='Šāvēji uz mērķiem';
@@ -219,6 +229,7 @@
 $lang['MenuLM_Collect Data']='Savākt datus';
 $lang['MenuLM_Competition']='Sacensības';
 $lang['MenuLM_Competition Info']='Informācija par sacensībām';
+$lang['MenuLM_CreateDbStruFile']='Izveidot DB Struktūrfailu';
 $lang['MenuLM_Data Import']='Importēt datus';
 $lang['MenuLM_Data Import (Advanced user)']='Importēt datus (pieredzējušiem lietotājiem)';
 $lang['MenuLM_Data insert (Bracket view)']='Ievadīt rezultātus (braketes skats)';
@@ -249,6 +260,7 @@
 $lang['MenuLM_ExtraCategories']='Standarta Papildus Katedorijas';
 $lang['MenuLM_ExtraDataEdit']='Mainīt Papildu Datus';
 $lang['MenuLM_Fees setup']='Dalības maksu uzstādījumi';
+$lang['MenuLM_Field Crew']='Šaušanas lauka komanda';
 $lang['MenuLM_Final Field of Play Layout']='Laukuma iekārtojums fināliem';
 $lang['MenuLM_Final report']='Gala atskaite';
 $lang['MenuLM_Final Rounds']='Finālu raundi';
@@ -258,8 +270,8 @@
 $lang['MenuLM_GateSituation']='Vārtu stāvoklis';
 $lang['MenuLM_Get Info']='Iegūt informāciju';
 $lang['MenuLM_getBiographies']='Iegūt WA biogrāfijas';
-$lang['MenuLM_GetScoreBarcode']='Iegūt rezultātu svītru kodus';
-$lang['MenuLM_GetScoreBarcodeReport']='Drukāt svītru kodu direktīvas';
+$lang['MenuLM_GetScoreBarcode']='Iegūt rezultātu svītrkodus';
+$lang['MenuLM_GetScoreBarcodeReport']='Drukāt svītrkodu direktīvas';
 $lang['MenuLM_GetScoreUSCAA']='USCAA datu faila importēšana';
 $lang['MenuLM_Header for Result Printouts']='Rezultātu izdrukas virsraksts';
 $lang['MenuLM_HTT']='HTT';
@@ -285,6 +297,7 @@
 $lang['MenuLM_LastShootoff']='Pēdējais izšķiršāviens';
 $lang['MenuLM_List (Simple)']='Saraksts (vienkāršs)';
 $lang['MenuLM_ListLoad']='Ielādēt sarakstu (Izklājlapas Imports)';
+$lang['MenuLM_Lock manage']='Tīkla piekļuves politika';
 $lang['MenuLM_Lock setup']='Bloķēt rediģēšanas iespēju';
 $lang['MenuLM_Logout']='Izlogoties';
 $lang['MenuLM_LueFill']='Izveidot Meklējumu no Faila';
@@ -421,6 +434,7 @@
 $lang['RankingInd']='Izlēgšanas & Fināla Raundi - Individuālais Rangs';
 $lang['Rankings']='Rangi';
 $lang['RankingSq']='Izlēgšanas & Fināla Raundi - Komandu Rangs';
+$lang['RankScoreShort']='Kval.';
 $lang['RB']='Olimpiskais loks';
 $lang['RecalcIndTeamsRank']='Individuālo un Komadu rangu pārskaitīšana veigsmīga';
 $lang['Review']='Pārskats';
@@ -432,10 +446,10 @@
 $lang['RowByRow']='Iestatīt rindu pa rindai';
 $lang['RowToImport']='Visas sekojošās rindas tiks importētas';
 $lang['Scheduler']='Programma';
-$lang['Score1Page1Athlete']='Individuāli punkti ar visiām cīņām';
-$lang['Score1Page1Match']='Rezultāts vienā cīņā';
+$lang['Score1Page1Athlete']='Individuālie protokoli visām cīņām';
+$lang['Score1Page1Match']='Protokols vienai cīņai';
 $lang['ScoreDrawing']='Tikai tabulas (viena lapa)';
-$lang['ScoreFilled']='Drukāt aizpildītas punktulapas ar individuālo trāpījumu ierakstiem';
+$lang['ScoreFilled']='Drukāt aizpildītus protokolus ar individuālo trāpījumu ierakstiem';
 $lang['ScoreIncEmpty']='Drukāt cīņas pat ja nav pretinieka';
 $lang['Scorer']='Punktu skaitītājs';
 $lang['Seeded16th']='pirms izsījāšna 1/16';
@@ -476,6 +490,7 @@
 $lang['TeamFinal']='Komandu fināli';
 $lang['Teams']='Komandas';
 $lang['TecError']='Tehnisku iemeslu dēļ nav iespējams apkalpot pieprasīto lapu';
+$lang['TempRank']='Pagaidu rangs';
 $lang['TF']='Sieviešu komanda';
 $lang['Tie']='Neizšķirts';
 $lang['TieArrows']='Izšķiršāvieni';
@@ -498,9 +513,14 @@
 $lang['TrgNfaaInd']='NFAA Indoor (1-5/X)';
 $lang['TrgOutdoor']='Outdoor (1-X)';
 $lang['U']='Unisex';
+$lang['U18M']='U18 vīrieši';
+$lang['U18W']='U18 sievietes';
+$lang['U21M']='U21 vīrieši';
+$lang['U21W']='U21 sievietes';
 $lang['UnexpectedError']='Negaidīta kļūda';
 $lang['VF']='Profesionāļi sievietes';
 $lang['VM']='Profesionāļi vīrieši';
+$lang['W']='Sievietes';
 $lang['WA_Pool4']='WA 4 grupas';
 $lang['WG_Pool2']='Pasaules spēļu 2 grupas';
 $lang['Winner']='Uzvarētājs';
diff --git a/src/Common/Languages/lv/Help.php b/src/Common/Languages/lv/Help.php
index e653fc39..2eafc1f7 100644
--- a/src/Common/Languages/lv/Help.php
+++ b/src/Common/Languages/lv/Help.php
@@ -1,5 +1,5 @@
 <?php
 $lang['GetBarcodeSeparator']='Pēc svītu kodu atsauču lapas drukāšanas, lūdzu ielasiet "ATDALĪTĀJS" svītrkodu, lai aktivizētu pareizos ielasīšanas priekšmetus.';
 $lang['HomePage']='Šī ir lapa, kur Jūs varat izvēlēties vai izveidot jaunas sacensības.';
-$lang['ScoreBarCodeShortcuts']='Nolasiet svītru kodu kas uzdrukāts uz rezultātu kartiņas. <br/> Ievadot ar roku a # kam seko atlēta vārds, tiek veikta atlēta meklēšana datubāzē <br/>Ievadot a @ kam seko mērķa numurs, tiek veikta mērķa meklēšana. Distancei JĀBŪT norādītai. Jābūt norādītai sesijai (pirmais cipars) un mērķa numurs tiek papildināts ar 0 līdz 3 cipariem.';
+$lang['ScoreBarCodeShortcuts']='Nolasiet svītrkodu kas uzdrukāts uz rezultātu kartiņas. <br> Ievadot ar roku a # kam seko atlēta vārds, tiek veikta atlēta meklēšana datubāzē <br>Ievadot a @ kam seko mērķa numurs, tiek veikta mērķa meklēšana. Distancei JĀBŪT norādītai. Jābūt norādītai sesijai (pirmais cipars) un mērķa numurs tiek papildināts ar 0 līdz 3 cipariem.';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/IOC_Codes.php b/src/Common/Languages/lv/IOC_Codes.php
index af639fd5..c0d4372a 100644
--- a/src/Common/Languages/lv/IOC_Codes.php
+++ b/src/Common/Languages/lv/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='Amerikas Samoa salas';
 $lang['AUS']='Austrālija';
 $lang['AUT']='Austrija';
-$lang['Award-Anthem']='Dāmas un kungi, lūdzu piecelieties par godu $a himnai';
-$lang['Award-Anthem-TPE']='Dāmas un kungi, lūdzu piecelieties par godu $a himnai';
 $lang['Award-Applause']='Dāmas un kungi, lūdzu sveiciet sportistus ar aplausiem.';
 $lang['Award-Intro']='Dāmas un kungi, apbalvošanas ceremonija par godu {$a}';
 $lang['Award-MedalGiver']='Medaļas pasniegs $a';
@@ -42,16 +40,13 @@
 $lang['BUL']='Bulgārija';
 $lang['BUR']='Burkinafaso';
 $lang['CAF']='Centrālāfrikas Republika';
-$lang['CAM']='Kambodža';
 $lang['CAN']='Kanāda';
 $lang['CAY']='Kaimanu Salas';
 $lang['CGO']='Kongo Republika';
 $lang['CHA']='Čada';
 $lang['CHI']='Čīle';
-$lang['CHN']='Ķīna';
 $lang['CIV']='Kotdivuāra';
 $lang['CMR']='Kamerūna';
-$lang['COD']='Kongo Demokrātiskā Republika';
 $lang['COK']='Kuka Salas';
 $lang['COL']='Kolumbija';
 $lang['COM']='Komoras salas';
@@ -60,7 +55,6 @@
 $lang['CRO']='Horvātija';
 $lang['CUB']='Kuba';
 $lang['CYP']='Kipra';
-$lang['CZE']='Čehija';
 $lang['DEN']='Dānija';
 $lang['DJI']='Džibutija';
 $lang['DMA']='Dominika';
@@ -91,17 +85,14 @@
 $lang['GUM']='Guama';
 $lang['GUY']='Gajana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Honkonga';
 $lang['HON']='Hondurasa';
 $lang['HUN']='Ungārija';
 $lang['INA']='Indonēzija';
 $lang['IND']='Indija';
-$lang['IRI']='Irāna';
 $lang['IRL']='Īrija';
 $lang['IRQ']='Irāka';
 $lang['ISL']='Islande';
 $lang['ISR']='Izraēla';
-$lang['ISV']='ASV Virdžīnu salas';
 $lang['ITA']='Itālija';
 $lang['IVB']='Britu Virdžīnu salas';
 $lang['JAM']='Jamaika';
@@ -114,7 +105,6 @@
 $lang['KOR']='Dienvidkoreja';
 $lang['KSA']='Saūda Arābija';
 $lang['KUW']='Kuveita';
-$lang['LAO']='Laosa';
 $lang['LAT']='Latvija';
 $lang['LBA']='Lībija';
 $lang['LBR']='Libērija';
@@ -128,7 +118,6 @@
 $lang['MAR']='Maroka';
 $lang['MAS']='Malaizija';
 $lang['MAW']='Malāvija';
-$lang['MDA']='Moldova';
 $lang['MDV']='Maldivija';
 $lang['Medal-1']='Zelta medaļa';
 $lang['Medal-2']='Sudraba Medaļa';
@@ -137,7 +126,6 @@
 $lang['MEX']='Meksika';
 $lang['MGL']='Mongolija';
 $lang['MHL']='Māršala Salas';
-$lang['MKD']='Ziemeļmaķedonija';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Melnkalne';
@@ -166,7 +154,6 @@
 $lang['PNG']='Papua-Jaungvineja';
 $lang['POL']='Polija';
 $lang['POR']='Portugāle';
-$lang['PRK']='Ziemeļkoreja';
 $lang['PUR']='Puertoriko';
 $lang['QAT']='Katara';
 $lang['ROU']='Rumānija';
@@ -193,17 +180,16 @@
 $lang['SVK']='Slovākija';
 $lang['SWE']='Zviedrija';
 $lang['SWZ']='Svazilenda';
-$lang['SYR']='Sīrija';
 $lang['TAN']='Tanzānija';
 $lang['TGA']='Tonga';
 $lang['THA']='Taizeme';
 $lang['TJK']='Tadžikistāna';
 $lang['TKM']='Turkmenistāna';
-$lang['TLS']='Austrumtimora';
 $lang['TOG']='Togo';
 $lang['TPE']='Ķīnas Taipeja';
 $lang['TRI']='Trinidada un Tobāgo';
 $lang['TUN']='Tunisija';
+$lang['TUR']='Turcija';
 $lang['TUV']='Tuvalu';
 $lang['UAE']='Apvienotie Arābu Emirāti';
 $lang['UGA']='Uganda';
diff --git a/src/Common/Languages/lv/ISK-App.php b/src/Common/Languages/lv/ISK-App.php
new file mode 100644
index 00000000..e1e6f40c
--- /dev/null
+++ b/src/Common/Languages/lv/ISK-App.php
@@ -0,0 +1,59 @@
+<?php
+$lang['0_Phase']='Zelts';
+$lang['12_Phase']='1/12';
+$lang['14_Phase']='1/14';
+$lang['16_Phase']='1/16';
+$lang['1_Phase']='Bronza';
+$lang['24_Phase']='1/24';
+$lang['2_Phase']='Pusfināls';
+$lang['32_Phase']='1/32';
+$lang['48_Phase']='1/48';
+$lang['4_Phase']='Ceturtdaļfināls';
+$lang['64_Phase']='1/64';
+$lang['7_Phase']='1/7';
+$lang['8_Phase']='1/8';
+$lang['AppPageHelp']='Palīdzība';
+$lang['AppPageSettings']='Iestātījumi';
+$lang['AppPageStart']='Sākuma lapa';
+$lang['BarcodeErrorTitle']='Svītrkoda kļūda';
+$lang['BarcodeScanPrompt']='Iecentrējiet svītrkodu lodziņā';
+$lang['DeviceId']='Ierīces ID';
+$lang['EnterPinCodeValue']='Kods';
+$lang['FabReconnect']='Atjaunot savienojumu';
+$lang['GenericCancel']='Atcelt';
+$lang['GenericDelete']='Dzēst';
+$lang['GenericNext']='Nākamais';
+$lang['GenericOk']='OK';
+$lang['GenericPrevious']='Iepriekšējais';
+$lang['GenericYes']='Jā';
+$lang['HelpIntro13D']='3D loka šaušana';
+$lang['HelpIntro1Field']='Apvidus loka šaušana';
+$lang['HelpIntro1RR']='Robina raunds';
+$lang['HelpIntro1TargetIn']='Loka šaušana telpās';
+$lang['HelpIntro1TargetOut']='Loka šaušana ārā';
+$lang['HelpIntro2Elim']='Izslēgšana';
+$lang['HelpIntro2MI']='Individuālie mači';
+$lang['HelpIntro2MT']='Komandu mači';
+$lang['HelpIntro2Qual']='Kvalifikācija';
+$lang['HelpScorecardHead']='Protokols';
+$lang['MainDistance']='Distance';
+$lang['MainEnd']='Sērija';
+$lang['MainTotal']='Kopā';
+$lang['MenuExitApp']='Iziet';
+$lang['ScorecardArrows']='Bultu vērtības';
+$lang['ScorecardCompTotal']='Kopā';
+$lang['ScorecardDistTotal']='Dist.';
+$lang['ScorecardEnd']='Sērija';
+$lang['ScorecardEndTotal']='Sērija';
+$lang['ScorecardSetPoints']='Sets';
+$lang['ScorecardTarget']='Vairogs';
+$lang['ScoreTotalsCloseButton']='Aizvērt';
+$lang['ScoreTotalsConfirmButton']='Apstiprināt';
+$lang['ScoringDeleteArrow']='Izdzēst bultas vērtību';
+$lang['ScoringDeleteEnd']='Izdzēst sēriju';
+$lang['ScoringDistTotal']='Kopā';
+$lang['ScoringEndTotal']='Sērija';
+$lang['SettingsChooseValue']='Izvēlēties vērtību';
+$lang['SettingsQrCodesScorecard']='Protokols';
+$lang['SignatureTitle']='Paraksti savu protokolu';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/ISK.php b/src/Common/Languages/lv/ISK.php
index d96203e5..cf6a4755 100644
--- a/src/Common/Languages/lv/ISK.php
+++ b/src/Common/Languages/lv/ISK.php
@@ -1,5 +1,7 @@
 <?php
 $lang['0_Phase']='Zelts';
+$lang['12_Phase']='1/12';
+$lang['14_Phase']='1/14';
 $lang['16_Phase']='1/16';
 $lang['1_Phase']='Bronza';
 $lang['24_Phase']='1/24';
@@ -8,12 +10,14 @@
 $lang['48_Phase']='1/48';
 $lang['4_Phase']='Ceturtdaļfināli';
 $lang['64_Phase']='1/64';
+$lang['7_Phase']='1/7';
 $lang['8_Phase']='1/8';
 $lang['About']='Par';
 $lang['AlertNoScore']='Vienam vai vairākiem lokšāvējiem nav rezultāta šajā sērijā. Šīs rindas ir iekrāsotas sarkanas. Spiediet uz rindas, lai labotu rezultātus vai turpiniet, ja tie ir pareizi.';
 $lang['AlertNoScoreTitle']='Trūkst rezultāti';
 $lang['All']='Visi';
 $lang['ApiPath']='IANSEO API ceļš';
+$lang['AppName']='Scorekeeper';
 $lang['ArrowValues']='Trāpījumu vērtības';
 $lang['AthletesError']='Atlētu dati nav masīvā';
 $lang['AutoEntry']='Ievadīt automātiski';
@@ -23,6 +27,7 @@
 $lang['CacheSendNone']='Vienumam nav kešatmiņas ko sūtīt';
 $lang['CacheSendOK']='Kešatmiņa veiksmīgi nosūtīta! __TEXT__ vienumi nosūtīti';
 $lang['CacheToQr']='Izveidot QR no kešatmiņas';
+$lang['CalculateNow']='Aprēķināt tagad';
 $lang['Cancel']='Atcelt';
 $lang['CantConfirmQr']='Nebija iespējams veikt QR-koda izsaukuma apstiprinājumu. Lūdzu mēģiniet vēlreiz. Kļūda __TEXT__';
 $lang['CantGetAthlete']='Nevar atrast informāciju par sportistu. Lūdzu mēģiniet vēlreiz. Kļūda __TEXT__';
@@ -112,8 +117,8 @@
 $lang['Menu']='Izvēlne';
 $lang['NetworkConn']='Pievienots Tīklam';
 $lang['NetworkId']='Tīkla ID';
-$lang['NextArcher']='Nākamais loka šāvējs';
-$lang['NextArcherDesc']='<strong>Nākamais loka šāvējs</strong> - Parāda nākamo loka šāvēju rezultāta ievadīšanai.';
+$lang['NextArcher']='Nākamais lokšāvējs';
+$lang['NextArcherDesc']='<strong>Nākamais lokšāvējs</strong> - Parāda nākamo lokšāvēju rezultāta ievadīšanai.';
 $lang['NextDistAlert']='Vai esat pārliecināts, ka vēlaties pāriet uz nākamo distanci?';
 $lang['No']='Nē';
 $lang['NoArrowScored']='Ir jābūt pierakstītam trāpijumam lai varētu atzīmēt, tuvāk centram';
@@ -140,8 +145,8 @@
 $lang['ProTarget']='Pro Vairogu Pieprasījums';
 $lang['ProWaitAuth']='Gaida autorizāciju';
 $lang['ProWaitCode']='Gaida konfigurāciju';
-$lang['QrInvalid']='Nevarēja nolasīt svītru koda informāciju. Lūdzu mēģiniet vēlreiz ar derīgu IANSEO svītru kodu.';
-$lang['QrNoCode']='Svītru kodā netika atrasta sacensību informācija. Lūdzu mēģiniet vēlreiz ar derīgu IANSEO svītru kodu.';
+$lang['QrInvalid']='Nevarēja nolasīt svītrkoda informāciju. Lūdzu mēģiniet vēlreiz ar derīgu IANSEO svītrkodu.';
+$lang['QrNoCode']='Svītrkodā netika atrasta sacensību informācija. Lūdzu mēģiniet vēlreiz ar derīgu IANSEO svītrkodu.';
 $lang['Reset']='Atiestatīt';
 $lang['ReuseProQR']='Iepriekšējs Pro QR-kods tika atrasts. Lietot šo kodu?';
 $lang['Save']='Saglabāt';
diff --git a/src/Common/Languages/lv/Ianseo.php b/src/Common/Languages/lv/Ianseo.php
index c685424e..fb2dbd03 100644
--- a/src/Common/Languages/lv/Ianseo.php
+++ b/src/Common/Languages/lv/Ianseo.php
@@ -7,4 +7,6 @@
 $lang['Cert-Level4']='Meistaru kurss';
 $lang['Cert-Level5']='IANSEO komanda';
 $lang['CertificateManagement']='Sertifikātu pārvaldība';
+$lang['GenerateFile']='Izveidot failu';
+$lang['ResetSessions']='Apstiprināt atiestatīšanu';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/InfoSystem.php b/src/Common/Languages/lv/InfoSystem.php
index e97742ad..4663992a 100644
--- a/src/Common/Languages/lv/InfoSystem.php
+++ b/src/Common/Languages/lv/InfoSystem.php
@@ -1,6 +1,7 @@
 <?php
 $lang['AutoUpdate']='Atjaunot automātiski';
 $lang['BarRecord']='Rādīt Vidējo Rekorda Slieksni';
+$lang['BrokenRecords']='Pārspētie rekordi';
 $lang['ByClub']='Pēc valsts/kluba';
 $lang['ByEvent']='Pēc sacensību veida';
 $lang['ByName']='Pēc vārda';
@@ -62,11 +63,15 @@
 $lang['Record-GR-WAAM-CG-avg']='PanAmerican spēļu rekorda vidējais';
 $lang['Record-GR-WAE-CG']='Eiropas spēļu rekords';
 $lang['Record-GR-WAE-CG-avg']='Eiropas spēļu rekords, vid.';
+$lang['Record-OR-avg']='Olimpiskais rekords vidēji';
 $lang['Record-OR-WA']='Olimpiskais rekords';
 $lang['Record-OR-WA-avg']='Olimpiskais rekords vid.';
+$lang['Record-WAE-CR-avg']='Eiropas rekords vidēji';
+$lang['Record-WR-avg']='Pasaules rekords vidēji';
 $lang['Record-WR-WA']='Pasaules rekords';
 $lang['Record-WR-WA-avg']='Pasaules rekords vid.';
 $lang['RR_Score']='RR rezultāts';
+$lang['StandingRecords']='Aktuālie rekordi';
 $lang['Teams']='Komandas';
 $lang['TypeName']='Ierakstiet vārdu, kuru meklējat';
 $lang['ViewIndividualResults']='Apskatīt individuālos rezultātus';
diff --git a/src/Common/Languages/lv/Install.php b/src/Common/Languages/lv/Install.php
index 654f267a..05cbf0ed 100644
--- a/src/Common/Languages/lv/Install.php
+++ b/src/Common/Languages/lv/Install.php
@@ -16,6 +16,7 @@
 $lang['Credits-Coordination']='IT projektu koordinators';
 $lang['Credits-CoreGroup']='IANSEO Core Group';
 $lang['Credits-Credits']='Izstrādātāji';
+$lang['Credits-Documentation']='Dokumentācija';
 $lang['Credits-FitarcoCredits']='Kas ir Ianseo? Ianseo ir programma, kas domāta Lokšaušanas Sacensību rezultātu pārvaldei; tas ir Open Source Projekts ir attīstīts pateicoties finansiālajam atbalstam no Itālijas Lokšaušanas Federācijas, kas ir nolēmusi to izplatīt bez maksas visā Eiropā. Tulkota vairākās valodās, Ianseo ir modernākā un attīstītākā pasaulē, iekļaujot visus World Archery noteikumus. Tā ir kļuvusi par visaptverošu Lokšaušanas sacensību vadības rīku: sākot no atlētu  un pārstāvju akreditācijas līdz visa veida izdrukām, no tīkla un tiešsaistes integrācijas līdz pat FOP dizainam.';
 $lang['Credits-HHT']='HHT integrācija';
 $lang['Credits-IanseoTeam']='IANSEO & IANSEO komanda';
@@ -31,6 +32,7 @@
 $lang['EventWillBeReset']='BRĪDINĀJUMS: mainot "$a[0]", "$a[1]" vai "$a[2]" tiks izdzēsti visi sacensību parametri uz noklusētajiem pēc izvēlēto sacensību noteikumiem un veida.';
 $lang['Failed']='NEIZDEVĀS!';
 $lang['Failing install']='Lūdzu atjauniniet PHP instalāciju pirms atkal startējat IANSEO.';
+$lang['Field24Normal']='Field 24 mērķi';
 $lang['FieldPegBlue']='Zilais marķieris';
 $lang['FieldPegRed']='Sarkanais marķieris';
 $lang['FieldPegWhite']='Baltais marķieris';
@@ -70,7 +72,6 @@
 $lang['Parameter']='Parametri';
 $lang['Password']='Parole';
 $lang['PHP settings']='PHP iestatījumi';
-$lang['PHP too old']='Jūsu PHP instalācija ir pārāk veca. Minimālā versija IANSEO ir 5.0.';
 $lang['PHP version']='PHP versija';
 $lang['php.ini file']='php.ini fails';
 $lang['Prepare']='Sagatavo datus atjaunināšanai';
@@ -120,6 +121,7 @@
 $lang['SetJ-SClass']='Juniori un seniori';
 $lang['SetKermesse']='Kermesse';
 $lang['SetKidClass']='Tikai jauniešu klases';
+$lang['SetMasterClass']='Tikai 50+ vecuma frupas';
 $lang['SetNoElim']='Bez izslēgšanas raundiem';
 $lang['SetNoMatches']='Bez mačiem';
 $lang['SetNZAllClasses']='Visas Grupas';
@@ -128,6 +130,7 @@
 $lang['SetOneClass']='Visas vecumu klases vienā';
 $lang['SetOrdinary']='Parastas sacensības';
 $lang['SetOrdinaryFinals']='Parastas sacensības ar fināliem';
+$lang['SetSeniorClass']='Tikai pieaugušo klases';
 $lang['SetSE_SweDist']='Zviedru distances';
 $lang['SetSE_WaDist']='WA distances';
 $lang['SetUkJunNationals']='Nacionālais jauniešu čempionāts';
@@ -136,6 +139,8 @@
 $lang['Setup-CA']='Kanādas sacensību noteikumi';
 $lang['Setup-CH']='Šveices sacensībau noteikumi';
 $lang['Setup-Default']='Starptautiskas sacensības (WA noteikumi)';
+$lang['Setup-FR']='Francijas turnīru noteikumi';
+$lang['Setup-IT']='Itālijas sacensību noteikumi - FitARCO noteikumi';
 $lang['Setup-NFAA']='NFAA sacensībau noteikumi';
 $lang['Setup-NL']='Dāņu sacensību noteikumi';
 $lang['Setup-NO']='Norvēģu sacensības';
@@ -143,6 +148,7 @@
 $lang['Setup-PAR']='Paralimpiskās sacensības (IPC noteikumi)';
 $lang['Setup-SE']='Zviedru sacensību noteikumi';
 $lang['Setup-Select']='Izvēlieties pareizus lokālos noteikumus';
+$lang['Setup-SI']='Slovēnikjas sacensību noteikumi';
 $lang['Setup-UK']='UK noteikumi';
 $lang['Setup-US']='US Archery noteikumi';
 $lang['SetVegas-KOA']='Kings of Archery - Nīderlande';
@@ -150,6 +156,7 @@
 $lang['SetWAPools-All']='Visas klases (WA 4 grupas)';
 $lang['SetWAPools-JS']='Juniori un seniori (WA 4 grupas)';
 $lang['SetWAPools-One']='Viena klase (WA 4 grupas)';
+$lang['SetYouthClass']='Jauniešu kategorijas';
 $lang['SpecialUpdate']='Jums ir "testa" Instalācija. <br/>Tikai izvēlēti lietotāji var izmantot šo iespēju: lūdzu norādiet e-pastu ar ko esat reģistrējies<br/>Ziņa tiks nosūtīta gan jums gan Ianseo personālam.';
 $lang['Start Ianseo']='Doties uz IANSEO!';
 $lang['Status']='Statuss';
diff --git a/src/Common/Languages/lv/ODF.php b/src/Common/Languages/lv/ODF.php
index cf20a643..99679d94 100644
--- a/src/Common/Languages/lv/ODF.php
+++ b/src/Common/Languages/lv/ODF.php
@@ -1,20 +1,25 @@
 <?php
 $lang['AssignAndSend']='Piešķirt un nosūtīt';
 $lang['BrokenRecords']='Pārspētie rekordi';
+$lang['DocumentCode']='Dokumenta kods';
 $lang['DocumentStatus']='Dokumenta statuss';
 $lang['DocumentSubcode']='Documenta subkods';
+$lang['DocumentType']='Dokumenta tips';
 $lang['DocumentVersion']='Versija';
 $lang['GoodMorning']='Labrīt';
 $lang['GoodNight']='Labvakar';
+$lang['IntEVENT']='Sacensību nosaukums';
 $lang['IntMATCH']='Mači';
 $lang['IntQUAL']='Kvalifikācijas raunds';
 $lang['IntRES']='Rezultāti';
 $lang['IntSCHED']='Programma';
 $lang['SendNewMessage']='Nosūtīt jaunu ziņu';
+$lang['SendOldMessage']='Nosūtīt vēlreiz';
 $lang['SesOdfCode']='ODF sesijas kods';
 $lang['SesOdfLocation']='ODF vietas kods';
 $lang['SesOdfPeriod']='ODF perioda kods';
 $lang['TMMeeting']='Komandu pārstāvju sanāksme';
 $lang['TypNAME']='Apraksts';
+$lang['TypSCHEDVEN']='Norises vietas apraksts';
 $lang['TypSTATUS']='Statuss';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/Records.php b/src/Common/Languages/lv/Records.php
new file mode 100644
index 00000000..67ed7c03
--- /dev/null
+++ b/src/Common/Languages/lv/Records.php
@@ -0,0 +1,5 @@
+<?php
+$lang['WA-Distance']='World Archery distance';
+$lang['WA-Rec-Class']='World Archery klase';
+$lang['WA-Rec-Division']='World Archery divīzija';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/RoundRobin.php b/src/Common/Languages/lv/RoundRobin.php
new file mode 100644
index 00000000..d6ef3459
--- /dev/null
+++ b/src/Common/Languages/lv/RoundRobin.php
@@ -0,0 +1,3 @@
+<?php
+$lang['TiebreakSystem-2']='SET punkti kopā';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/RunArchery.php b/src/Common/Languages/lv/RunArchery.php
new file mode 100644
index 00000000..27cbb52b
--- /dev/null
+++ b/src/Common/Languages/lv/RunArchery.php
@@ -0,0 +1,4 @@
+<?php
+$lang['PrintSpotterScore']='Drukāt spotera protokolu';
+$lang['SpotterName']='Spotera vārds';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/lv/Tournament.php b/src/Common/Languages/lv/Tournament.php
index c4afdb00..cabf24c1 100644
--- a/src/Common/Languages/lv/Tournament.php
+++ b/src/Common/Languages/lv/Tournament.php
@@ -31,14 +31,17 @@
 $lang['AclQualification']='Kvalifikācija';
 $lang['ACLReadOnly']='Ierobežota pieeja (tikai lasīšanai)';
 $lang['ACLReadWrite']='Pilna pieeja (lasīt un rakstīt)';
+$lang['AclRobin']='Robina raunds';
 $lang['AclRoot']='Superlietotājs';
 $lang['AclSpeaker']='Diktors';
 $lang['AclTeams']='Komandu fināli';
 $lang['Action']='Darbība';
 $lang['ActualFlag']='Izlietots karogs';
 $lang['AddMaxRows']='Pievienot visu pieejamo rindu';
+$lang['AddTournament']='Pievienot turnīru';
 $lang['AfterDistance']='Vietu sadalījums PĒC sekojošas distances:';
 $lang['AfterXDistance']='Rezultāti PĒC $a distances';
+$lang['AgeClass']='Vecuma grupa';
 $lang['AllDistances']='Visi';
 $lang['AllEvents']='Visi pasākumi';
 $lang['AllRound']='Visi raundi';
@@ -46,7 +49,7 @@
 $lang['AllsF']='Visi';
 $lang['AllsM']='Visi';
 $lang['AllTargets']='Visi vairogi';
-$lang['AlternateJury']='Apelācijas komisija (vietnieks)';
+$lang['AlternateJury']='Apelācijas komisija (rezervists)';
 $lang['AlternateMatch']='Alternatīvais mačs';
 $lang['Announcer']='Runātājs / diktors';
 $lang['ArcherNotFound']='Sportists nav atrasts!';
@@ -79,6 +82,7 @@
 $lang['AutoEdits']='Labot automātiski';
 $lang['AutoRefresh']='Atsvaidzināt automātiski';
 $lang['AutoTargetAssignment']='Automātiska kārtošana pa vairogiem - Sastādīt';
+$lang['AutoUploadToggle']='Ieslēgt automātiskās atjaunināšanas taimeri';
 $lang['AvailableValues']='Pieejamās vērtības';
 $lang['Award']='Balva';
 $lang['Awarders']='Apbalvošanas vadītāji';
@@ -89,7 +93,7 @@
 $lang['Awards']='Balva';
 $lang['AwardSecondLanguage']='Otrā valoda';
 $lang['AwardShowPoints']='Rādīt punktus';
-$lang['BackBarCodeCheck']='Atpakaļ uz svītru kodu pārbaudi';
+$lang['BackBarCodeCheck']='Atpakaļ uz svītrkodu pārbaudi';
 $lang['BadEntries']='Pieteikumi NAV ieimportēti';
 $lang['Badge1PerPage']='1 dalībnieka karte uz lapas';
 $lang['Badge2PerPage']='2 dalībnieka kartes uz lapas';
@@ -100,7 +104,6 @@
 $lang['BadgeIncludePhoto']='Iekļaut foto dalībnieka kartē';
 $lang['BadgeNames']='Pilns Vārds (netiek drukāts pirmais)';
 $lang['BadgeNoData']='Nav datu ko drukāt';
-$lang['BadgeOnlyNotPrinted']='TIKAI dalībnieku kartes, kas vēl nav izdrukātas';
 $lang['BadgeOnlyPrintAccredited']='TIKAI akreditēto dalībnieku kartes';
 $lang['BadgeOnlyPrintPhoto']='TIKAI dalībnieku kartes ar foto';
 $lang['BadgeOptions']='Iespējas';
@@ -111,9 +114,9 @@
 $lang['BadgeStandard6-bis']='Mazās dalībnieku kartes (6) Las Vegas';
 $lang['BadgeType']='Dalībnieka kartes veids';
 $lang['BadParams']='Nepareizi parametri!';
-$lang['Barcode']='Vienas dimensijas ID ar svītru kodu';
+$lang['Barcode']='Vienas dimensijas ID ar svītrkodu';
 $lang['BarcodeCapture']='Svītru koda skenēšana';
-$lang['BarcodeMissing']='Drukāt trūkstošos svītru kodus';
+$lang['BarcodeMissing']='Drukāt trūkstošos svītrkodus';
 $lang['BF_Phase']='Bronzas fināls';
 $lang['BigNames']='Drukāt visu lapu';
 $lang['Bill']='Rēķins';
@@ -156,6 +159,7 @@
 $lang['CatJury']='Apelācijas komisija';
 $lang['CatOC']='Organizatori';
 $lang['ChairmanJudge']='Galvenais tiesnesis';
+$lang['ChairmanJudgeDeputy']='Galvenā tiesneša vietnieks';
 $lang['ChairmanJury']='Apelācijas komisijas vadītājs';
 $lang['ChangeNationsNames']='Mainīt valstu nosaukumus';
 $lang['Channel']='Kanāls';
@@ -176,6 +180,7 @@
 $lang['CmdExec']='Izpildīt';
 $lang['CmdExport']='Eksportēt';
 $lang['CmdGo']='Aiziet!';
+$lang['CmdImport']='Importēt';
 $lang['CmdOpenBill']='Atvērt kvīti';
 $lang['CmdPrintBill']='Drukāt kvīti';
 $lang['CmdRemoveFilter']='Noņemt filtru';
@@ -184,6 +189,7 @@
 $lang['CmdSet']='Iestatīt';
 $lang['CmdUpload']='Augšuplādēt';
 $lang['Coach']='Treneris';
+$lang['CoalesceScorecards']='Apvienot protoklus';
 $lang['Code']='ID';
 $lang['CoinToss']='Monētas loze';
 $lang['CoinTossShort']='ML';
@@ -191,6 +197,8 @@
 $lang['Color']='Krāsa';
 $lang['CompetitionOfficials']='Tiesneši un organizatori';
 $lang['CompleteSchedule']='Pilna programma';
+$lang['CompManager']='Atbildīgais par sacensībām';
+$lang['CompVenue']='Norises vieta (Nosaukums, adrese)';
 $lang['Confirm']='Apstiprināt';
 $lang['ConfirmDescr']='ŠIS IZJAUKS IEPRIEKŠĒJO IZKĀRTOJUMU PA VAIROGIEM UN TO NEBŪS IESPĒJAMS ATCELT!';
 $lang['ConfirmEnd']='Apstiprināt sēriju';
@@ -234,6 +242,7 @@
 $lang['DOB']='Dzimšanas datums';
 $lang['Document']='Dokuments';
 $lang['Dos']='Šaušanas vadītājs (DOS)';
+$lang['DosAssistant']='Šaušanas vadītāja asistents';
 $lang['DoubleSpace']='Arbalets';
 $lang['DrawField3D']='Field/3D izloze';
 $lang['DrawNormal']='Standarta izloze';
@@ -251,7 +260,6 @@
 $lang['EliminationType']='Izslēgšanas raunda veids';
 $lang['ElimSO']='Izslēgšanas raundu bultas SO';
 $lang['Email']='E-pasts';
-$lang['EnableAccess']='Ieslēgt/Izlēgt politikas';
 $lang['Ends']='Sērijas';
 $lang['EndTotal']='Sērijas summa';
 $lang['EndUpdate']='Visi atjauninājumi pabeigti';
@@ -262,8 +270,9 @@
 $lang['EventAccess']='Sportista dalība Indiv./Kom.';
 $lang['EventCodeDeclared']='On-line pasākuma Kods';
 $lang['EventDetails']='$a[0] sērijas ar $a[1] bultām + $a[2] SO';
+$lang['EventDetailsShort']='$a[0] sērijas ar $a[1] bultām';
 $lang['EventPhaseResolved']='$a[0] - $a[1] atrisināts!';
-$lang['Events']='Sacensības';
+$lang['Events']='Turnīrcīņas';
 $lang['EvNameTranslated']='Tulkotās sacensības';
 $lang['Export2Fitarco']='Eksportēt kā EXP failu';
 $lang['ExportAndSend']='Eksportēt un sūtīt datus';
@@ -274,6 +283,8 @@
 $lang['ExportWinners']='Eksportēt uzvarētājus';
 $lang['FamilyName']='Uzvārds';
 $lang['FieldCleaned']='Lauks notīrīts';
+$lang['FieldResp']='Atbildīgais par laukumu';
+$lang['FieldScorecard']='Field/3D protokols';
 $lang['FieldTourCategory']='Apvidus sacensības';
 $lang['FillCountryFlags']='Ielasīt valstu karogus no noklusētajiem';
 $lang['FilterOnDivCl']='Filtrēt pēc divīzijām/klasēm';
@@ -333,12 +344,13 @@
 $lang['GroupBy']='Grupēt pēc';
 $lang['GroupMatches']='Grupu cīņas';
 $lang['HiddenCredited']='Slēpt akreditētos';
+$lang['HorScore']='Horizontāls protokols';
 $lang['Hour']='Stunda';
 $lang['I-Session']='Individuālās cīņas';
 $lang['IanseoDbVersionTooOld']='Ianseo Datubāzes Versija ir vecāka nekā InfoSystem';
 $lang['IANSEOVersion']='IANSEO versija';
 $lang['IdCard']='ID karte';
-$lang['Image']='Attēls';
+$lang['Image']='Attēli';
 $lang['ImageChecked']='Attēls pārbaudīts';
 $lang['ImgInfo']='Pieļaujamie attēlu veidi: PNG un JPG - maksimālais izmērs 64KB';
 $lang['ImportARFFile']='Importēt ARF failu';
@@ -376,11 +388,13 @@
 $lang['LiveUpdate']='Dzīvajā!';
 $lang['Loading']='Ielādē...';
 $lang['LocalCode']='Lokālais ID';
+$lang['LocalRule']='Lokalizētie noteikumi';
 $lang['LocalSubRule']='Apakšnoteikumi';
-$lang['Location']='Vieta';
+$lang['Location']='Vieta (pilsēta, novads, pagasts)';
 $lang['LocRuleDefaultNo']='Noklusētie';
 $lang['LocRuleModifiedNo']='Mainīts';
 $lang['LocRuleValidNo']='Nav mainīts';
+$lang['LogisticResp']='Atbildīgais par transportu';
 $lang['LogoB']='Apakšējās malas attēls (pilna platuma attiecība 19:1 A4 lapai, 20:1 letter lapai)';
 $lang['LogoL']='Augšējās kreisās malas attēls';
 $lang['LogoManagement']='Attēlu pārvaldīšana';
@@ -419,6 +433,7 @@
 $lang['ManDivClass']='Pārvaldīt divīzijas/klases';
 $lang['ManPrices']='Pārvaldīt dalības maksas';
 $lang['ManSession']='Pārvaldīt šaušanas sesijas';
+$lang['ManStaffOnField']='Pārvaldīt šaušanas lauka komandu';
 $lang['ManSubClasses']='Pārvaldīt apakšklases';
 $lang['ManTourDistances']='Pārvaldīt sacensību distances';
 $lang['ManTraining']='Pārvaldīt iesildīšanās sesijas';
@@ -445,6 +460,8 @@
 $lang['MedalClass']='Klašu un divīziju rezultāti - medaļas';
 $lang['MedalIndClass']='Klašu un divīziju rezultāti - medaļas individuāli';
 $lang['MedalSqClass']='Klašu un divīziju rezultāti - medaļas komandās';
+$lang['MediaResp']='Atbildīgais par medijiem';
+$lang['MedOfficer']='Mediķis';
 $lang['MixedTeamFinEvent']='MIX komandu fināli';
 $lang['MoveWinner2NextPhase']='Pārvietot uzvarētāju un nākamo fāzi';
 $lang['MsgLookup3']='Datu imports';
@@ -456,6 +473,7 @@
 $lang['MsgSyncronize']='Sinkronizēt sportista failu';
 $lang['Multimedia']='Multimēdiji';
 $lang['Name']='Vārds';
+$lang['Nameplates']='Vārdu plāksnes';
 $lang['NationShort']='Nosaukums saīsināti';
 $lang['New']='Jauns';
 $lang['NewMediaContent']='Pievienot multimediju saturu';
@@ -470,6 +488,7 @@
 $lang['NoPictureAvailable']='Attēls nav pieejams';
 $lang['NoRowSelected']='Rindas nav izvēlētas';
 $lang['NoSession']='Nav sesijas';
+$lang['NoStaffOnField']='Nav šaušanas lauka komandas';
 $lang['NotAllShootoffResolved']='Sekojošās disciplīnas netika saglabātas, jo netika atrisināti visi izšķiršāvieni';
 $lang['Notes']='Piezīmes';
 $lang['NoTie']='Nav neizšķirts';
@@ -502,12 +521,14 @@
 $lang['OR-Record']='Olimpiskais rekords';
 $lang['OR-short']='OR';
 $lang['Order']='Kārtība';
+$lang['OrgResponsible']='Organizatoru komitejas pārstāvis';
+$lang['OrisScorecardsAverage']='Vidējā bultu vērtība';
 $lang['OrisTeamList']='ORIS komandu saraksts';
 $lang['OtherTourCategory']='Cits';
 $lang['OverwritePreviousArchers']='Pārrakstīt iepriekšējos loka šāvējus';
 $lang['OvrRefresh']='Atsvaidzināt lapu (nenosūtīt)';
 $lang['OvrSendSerial']='Nosūtīt uz OVR (Serial)';
-$lang['PaperSize']='Papīra izmērs';
+$lang['PaperSize']='Izdruku papīra izmērs';
 $lang['ParamWarning']='UZMANĪBU!<br/>Ievadot nepareizas vērtības šajos laukos var tikt iznīcināti jūsu uzstādījumi!<br/> Izmantojiet ar ĪPAŠU piesardzību!';
 $lang['PartecipantLabel']='Dalībnieku saraksts - Etiķetes';
 $lang['PartecipantListError']='Dalībnieku saraksts - brīdinājumi';
@@ -547,15 +568,19 @@
 $lang['Price']='Cena';
 $lang['Primary']='Primāri';
 $lang['Print']='Drukāt';
+$lang['PrintCharset']='Izdruku fonta iestatīšana';
 $lang['PrintChinese']='Iekļaut ķīniešu alfabētu';
+$lang['PrintCyrillic']='Paplašinātais fonts (iekļauj arī LV mīkstinājuma zīmes)';
 $lang['PrintFOP']='Sacensību laukums';
 $lang['PrintJapanese']='Iekļaut japāņu alfabētu';
 $lang['PrintLabels']='Drukāt uzlīmes';
 $lang['PrintLanguage']='Izdruku valoda';
 $lang['PrintList']='Drukāt sarakstu';
 $lang['PrintNames']='Drukāt vārdus';
-$lang['PrintNormal']='Normal (Latin)';
-$lang['PrintScore']='Drukāt rezultātus';
+$lang['PrintNormal']='Normāls (Latīņu)';
+$lang['PrintScore']='Drukāt protoklous';
+$lang['PrintScoreInd']='Izdrukāt individuālos protokolus';
+$lang['PrintScoreTeam']='Drukāt komandu protokolus';
 $lang['PrintText']='Virsraksta teksts';
 $lang['PrintTextTitle']='Rezultātu izdrukas virsraksts';
 $lang['Q-Session']='Kvalifikācijas raundi';
@@ -584,9 +609,11 @@
 $lang['ResultIndClass']='Rezultāti pēc klases un divīzijas - Individuāli';
 $lang['ResultIndClassSnap']='Klases un divīzijas rezultātu saraksta momentuzņēmums - Individuāli';
 $lang['ResultIndSubClass']='Apakšgrupu rezultāti';
+$lang['ResultResp']='Atbildīgais par rezultātiem';
 $lang['Results']='Rezultāti';
 $lang['ResultSqAbs']='Kvalifikācijas raunds - Komandas';
 $lang['ResultSqClass']='Rezultāti pēc klases un divīzijas - Komandas';
+$lang['ResVerifier']='Rezultātu apstiprinātājs';
 $lang['Round']='Raunds';
 $lang['Round#']='Raunds $a';
 $lang['RoundSummary']='Raunda summa';
@@ -603,7 +630,9 @@
 $lang['SchIncFinalists']='Iekļaut finālistu vārdus';
 $lang['Score']='Rezultāts';
 $lang['Score1PageAllDist']='Sportista protokols ar visām distancēm uz vienas lapas';
-$lang['ScoreBarcode']='Drukāt  svītru kodu uz protokoliem';
+$lang['ScoreBarcode']='Drukāt  svītrkodu uz protokoliem';
+$lang['ScorecardLabelEnd']='Sērija';
+$lang['ScorecardLabelSet']='Sets';
 $lang['ScorecardsElim']='Izslēgšanas raundu protokoli';
 $lang['ScorecardsInd']='Individuālo cīņu protokoli';
 $lang['ScorecardsQual']='Kvalifikācijas protokoli';
@@ -665,8 +694,11 @@
 $lang['ShowPicture']='Rādīt foto';
 $lang['showRecords']='Rādīt rekordus';
 $lang['Sign/guide-board']='Zīme';
+$lang['SignedTotal']='Protokolā parakstītais rezultāts';
 $lang['SingleArrow']='Viena bulta';
 $lang['Snapshot']='Momentuzņēmums';
+$lang['Spotter']='Spoteris/rezultātu saucējs';
+$lang['StaffOnField']='Šaušanas lauka komanda';
 $lang['StandardElabTeamMode']='Standarta komandas papildināšana';
 $lang['StartCamera']='Ieslēgt Kameru';
 $lang['StartList']='Dalībnieku saraksts';
@@ -690,7 +722,7 @@
 $lang['Status']='Statuss';
 $lang['StatusValidUntil']='Statuss derīgs līdz';
 $lang['StdORIS']='Standarta ORIS izdruka';
-$lang['StickersBarcode']='Drukāt svītru kodu';
+$lang['StickersBarcode']='Drukāt svītrkodu';
 $lang['StickersBotMargin']='Apakšējā mala';
 $lang['StickersCols']='Kolonna/Platums';
 $lang['StickersInterCols']='Atstarpe starp kolonnām';
@@ -727,6 +759,7 @@
 $lang['TargetAssignment']='Drukāt izkārtojumu pa vairogiem';
 $lang['TargetDoAssignment']='Kārtot pa vairogiem';
 $lang['TargetFrom']='Sākuma vairogs';
+$lang['TargetJudgeSignature']='Vairoga tiesneša paraksts';
 $lang['Targets']='Vairogi';
 $lang['TargetShort']='T#';
 $lang['TargetsToHHt']='Nosūtīt izkārtojumu pa vairogiem aizvietojot vārdus';
@@ -737,7 +770,6 @@
 $lang['TeamCreationMode_2']='Vienmēr otrā komanda';
 $lang['TeamCreationMode_3']='Vienmēr trešā komanda';
 $lang['TeamFin']='Komandas - Izsl. un finālu raunds';
-$lang['TeamFinEvent']='Komandas fināls';
 $lang['TeamPlace']='Komandu vietu zīmes';
 $lang['TeamPlaceLocal']='Komandu vietu zīmes (lokalizēts)';
 $lang['TeamQual']='Komandas - Kval. raunds';
@@ -747,6 +779,7 @@
 $lang['TieWinner']='Uzvarētājs';
 $lang['Time']='Sākuma laiks';
 $lang['TimeAt']='Laiks';
+$lang['TimeStampSignature']='Paraksta laika zīmogs (HH:MM)';
 $lang['Title']='Virsraksts';
 $lang['TitleColor']='Apgriezt virsraksta krāsu';
 $lang['TitleTourMenu']='Izvēlēties sacensības';
@@ -755,17 +788,21 @@
 $lang['Total1']='Kopā (pirmā daļa)';
 $lang['Total2']='Kopā (otrā daļa)';
 $lang['TotalCompetitors']='Dalībnieku skaits kopā';
+$lang['TotalPoints']='SET punkti kopā';
 $lang['TotalProg']='Summa';
 $lang['TotalShort']='Kopā';
 $lang['TourCode']='Sacensību kods';
 $lang['TourCommitee']='Organizators';
 $lang['TourCountries']='Valsts/Kluba attēlu pārvaldīšana';
 $lang['TourDouble']='Dubults';
+$lang['TourIsOris']='ORIS atbilstība';
 $lang['TourMainInfo']='Pamatinformācija';
 $lang['TourName']='Nosaukums';
 $lang['TournamentImport']='Importēt sacensības';
 $lang['TourPartecipants']='Sacensību dalībnieki';
 $lang['TourRecordSetup']='Turnīru rekordu uzstādījumi';
+$lang['TourRuleReset']='Atiestatīt uz iepriekš definētām vērtībām';
+$lang['TourRuleResetDescr']='Šī darbība atiestatīs visas ar turnīru saistītās opcijas uz to noklusējuma vērtībām: Divīzijas, Klases, Distances, Mērķus, utt... <br><b>Izmantojiet tikai tad, ja zināt, ko darāt!</b>';
 $lang['TourShortName']='Saīsinājums';
 $lang['TourTimeZone']='Laika zona';
 $lang['TourType']='Sacensību veids';
@@ -776,7 +813,7 @@
 $lang['TourType_4']='Apvidus';
 $lang['TourType_8']='3D';
 $lang['TourWhen']='Datums';
-$lang['TourWhere']='Vieta';
+$lang['TourWhere']='Vieta (pilsēta, novads, pagasts)';
 $lang['TR-Record']='Sacensību rekords';
 $lang['Transport']='Transports';
 $lang['Transport_1']='Automašīna';
@@ -894,6 +931,7 @@
 $lang['Unisex']='Unisex';
 $lang['UpdateJPG']='izveidot arī JPG versiju';
 $lang['UpdatePNG']='Atjaunināt atbilstošo PNG failu?';
+$lang['UploadFile']='Augšuplādēt failus (PDF)';
 $lang['URL']='URL';
 $lang['ValidDivisions']='Pieļautās div. (atstāt tukšu visām)';
 $lang['VersionFile']='Datne';
diff --git a/src/Common/Languages/ms/Api.php b/src/Common/Languages/ms/Api.php
index dde6ac21..6b2dffbe 100644
--- a/src/Common/Languages/ms/Api.php
+++ b/src/Common/Languages/ms/Api.php
@@ -31,6 +31,7 @@
 $lang['DevConnected']='Disambungkan';
 $lang['DevDisconnected']='Tidak disambungkan';
 $lang['DistanceNum']='Jarak $a';
+$lang['FieldMonitor']='Pemantauan Lapangan';
 $lang['FlashCodeDistance']='Imbas kod ini di Aplikasi untuk pemarkahan $a';
 $lang['HitToWin']='Mata untuk menang';
 $lang['ImportDoneQualRecheck']='Import keputusan Kelayakan siap. Sila semak dengan teliti pengiraan Kedudukan secepat mungkin.';
@@ -49,6 +50,7 @@
 $lang['ISK-ConnectionStatus']='Status Penyambungan';
 $lang['ISK-DeleteDevices']='Buang Peranti';
 $lang['ISK-DenyAccess']='Akses Ditolak';
+$lang['ISK-Deprecated']='PENTING: Apl "Ianseo Score Keeper" sedang ditamatkan secara berperingkat daripada gedung Android dan Apple dan tidak disokong lagi, oleh itu ia akan dialih keluar daripada Ianseo pada September 2024. Sebaliknya, sila tukar kepada Apl "Ianseo Score Keeper NG" yang baharu.';
 $lang['ISK-DeviceAlive']='Online';
 $lang['ISK-DeviceBattery']='Bateri';
 $lang['ISK-DeviceEnabled']='Aktifkan';
@@ -59,6 +61,7 @@
 $lang['ISK-DeviceStatusWanted']='Paksa Status Baru';
 $lang['ISK-DeviceUsed']='Sedang digunakan';
 $lang['ISK-enableGPS']='Hantar Kedudukan Peranti';
+$lang['ISK-enableHaptics']='Hidupkan maklum balas Haptics';
 $lang['ISK-EnableScore']='Membolehkan Ianseo ScoreKeeper';
 $lang['ISK-enableTotals']='Membolehkan Jumlah Keseluruhan pada peranti';
 $lang['ISK-enableWIFIManagement']='Membenarkan ISK untuk mengurus peranti Wi-Fi';
@@ -77,6 +80,7 @@
 $lang['ISK-Lite-NoCompCode']='Kod Pertandingan Hilang';
 $lang['ISK-Lite-QRCode']='Cetak QR Kod untuk Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='Url Server (termasuk protokol dan port jika buka 80)';
+$lang['ISK-Live-Deprecated']='PENTING: Apl "Ianseo Score Keeper Live" tidak disokong lagi, oleh itu ia akan dialih keluar daripada Ianseo pada September 2024. Sebaliknya, sila tukar kepada Apl "Ianseo Score Keeper NG" yang baharu.';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper LIVE';
 $lang['ISK-lockPortrait']='Tetapan peranti dalam paparan potret';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
@@ -102,6 +106,10 @@
 $lang['ISK-ServerUrl']='Url Server (termasuk protokol dan port jika buka 80)';
 $lang['ISK-ServerUrlPin']='Pin Keselamatan Pertandingan';
 $lang['ISK-SetQRData']='Set Peranti menggunakan Kod QR';
+$lang['ISK-SettingsPIN']='Tetapan PIN';
+$lang['ISK-SETUP-11']='Persediaan ISK-NG Lite';
+$lang['ISK-SETUP-12']='Persediaan ISK-NG Pro';
+$lang['ISK-SETUP-13']='Persediaan Langsung ISK-NG';
 $lang['ISK-showPictures']='Tunjuk Gambar';
 $lang['ISK-SocketAction']='Tindakan';
 $lang['ISK-SocketIP']='IP Soket Web (untuk Peranti)';
@@ -114,6 +122,8 @@
 $lang['ISK-StatusWaitConfirm']='Peranti menunggu untuk disahkan';
 $lang['ISK-TruncateTable']='Memendekkan kotak jadual (sesi yang lain)';
 $lang['ISK-TruncateTableAll']='Memendekkan kotak jadual (lengkap)';
+$lang['ISK-UsePersonalDevices']='Gunakan Peranti Peribadi';
+$lang['ISK-UsePersonalDevices-Help']='Pilih pilihan ini jika peranti peribadi pemanah akan digunakan. Ini perlu didaftarkan terlebih dahulu dan mengimbas Kod Qr pada kad skor untuk dapat memasukkan markah.';
 $lang['ISK-VibrateUpdate']='Bergetar semasa Kemaskini';
 $lang['ISK-WiFi']='Pengurusan WiFi';
 $lang['ISK-WifiDELETE']='Hapuskan Wi-Fi yang lain dari peranti pemarkahan';
@@ -126,6 +136,7 @@
 $lang['ISK-WifiTargetRange']='WiFi pilihan untuk sasaran';
 $lang['ISK-WifiUse']='Aplikasi WiFi - Dibuka';
 $lang['IskDeviceAssigned']='Peranti(s)';
+$lang['IskResetAlert']='AMARAN: Semua tetapan yang tiada pada persediaan ini akan dialih keluar, kecuali untuk ciri Pengumpulan.';
 $lang['IskScoringDevice']='Peranti $a tidak dibenarkan mengambil markah dalam sesi / pertandingan ini!';
 $lang['IskSpuriousDevice']='Peranti $a[0] menghantar markah yang tidak dikehendaki pada sasaran $a[1]';
 $lang['IskSpuriousScore-Device']='Peranti $a[0] menghantar markah pada sasaran $a[1] dari fasa $a[2]';
@@ -143,9 +154,11 @@
 $lang['MissingParameter']='Parameter Hilang';
 $lang['MsgDelAllTablets']='Padam semua tablet dalam senarai';
 $lang['MsgDelTablet']='Padam tablet';
+$lang['MsgEmptyTemporaryOfGroup']='Kosongkan jadual data sementara daripada semua peranti daripada kumpulan yang dipilih.';
 $lang['NewGroup']='menetapkan Kumpulan Baru';
 $lang['NewTarget']='Menetapkan Sasaran Baru';
 $lang['PartialImport']='Import Partial secara Automatik';
+$lang['PartialImportAll']='Import SEMUA';
 $lang['PopupStatusDistance']='Jarak: $a';
 $lang['PopupStatusEnd']='Pusingan: $a';
 $lang['PopupStatusEvent']='Acara: $a';
@@ -160,6 +173,7 @@
 $lang['RaspControl']='Kawal Raspberry';
 $lang['RaspDevice']='Peranti';
 $lang['RasUrl']='Url ke pelayan';
+$lang['RecalcAfterImport']='Selepas setiap Import (tetap)';
 $lang['RecalcFullDist']='Selepas menerima semua data jarak';
 $lang['RecalcManually']='Secara Manual';
 $lang['RecalcMode']='Mod pengiraan semula';
@@ -172,6 +186,8 @@
 $lang['SelectedReNumber']='Susun semula susunan peranti bermula dari';
 $lang['StatusTemporaryArrows']='Situasi Anak Panah dalam Jadual Sementara';
 $lang['StickyAlreadySet']='Penghabisan Lekitan telah tersedia set dalam sesi berbeza!';
+$lang['TargetRequests-Printout']='Cetak Kod QR Sasaran yang diminta';
+$lang['TargetScoring-Printout']='Cetak QR Kod Markah Sassaran';
 $lang['TempArrowsDelete']='PADAM Anak panah dari Jadual Sementara';
 $lang['TempArrowsImport']='Import Anak Panah dari Jadual Sementara';
 $lang['TempArrowsM']='Anak Panah Tidak Diimport dalam Perlawanan (Ind., Tean, Pusingan Kedudukan, Pool, dll)';
@@ -179,6 +195,7 @@
 $lang['UnlockAll']='Buka Semua Sesi';
 $lang['UsePersonalDevices-Granted']='Peribadi';
 $lang['UsePersonalDevices-Print']='Cetak Kod Qr Permintaan Sasaran pada Kad Skor';
+$lang['ViewSize']='Lihat Saiz';
 $lang['WAToolbox-MissingParams']='Parameter Hilang';
 $lang['WAToolbox-NoCompCode']='Kod Pertandingan Hilang';
 $lang['XToWin']='$a untuk menang';
diff --git a/src/Common/Languages/ms/BackNumbers.php b/src/Common/Languages/ms/BackNumbers.php
index 4ed5f7cc..fe521408 100644
--- a/src/Common/Languages/ms/BackNumbers.php
+++ b/src/Common/Languages/ms/BackNumbers.php
@@ -22,6 +22,7 @@
 $lang['AutoCHK-Code']='Kod Pertandingan';
 $lang['AutoCHK-Confirm']='Sahkan Daftar Masuk';
 $lang['AutoCHK-IP']='IPs bagi Auto-Daftar Masuk Peranti (satu bagi setiap baris)';
+$lang['AutoCHK-IPinfo']='Maklumat Mata Layan Diri';
 $lang['AutoCHK-IPnoMgm']='IP Kios Khidmat Layan Diri';
 $lang['AutoCHK-Names']='Semak juga nama DIberi/Keluarga';
 $lang['AutoCHK-nobody']='Tiada sesiapa dengan kod ini didalam DB buat masa ini... SILA TERUSKAN KE MEJA';
@@ -111,6 +112,7 @@
 $lang['GivCaps-FamCaps-ClubCaps']='NAMADIBERI NAMAKELUARGA, NAMA NEGARA';
 $lang['GivenNameInitial']='Perkataan pertama nama diberi';
 $lang['Heigh']='Tinggi';
+$lang['HLayout']='Mendaftar';
 $lang['HLine']='Garisan Melintang';
 $lang['I-Badge']='Nombor Pemanah Perlawanan Individu';
 $lang['IdCardHor']='lebar';
@@ -131,6 +133,7 @@
 $lang['Italic']='Condong';
 $lang['Landscape']='Landskap';
 $lang['MultiLine']='Baris berbilang';
+$lang['NameTag']='Tanda Nama';
 $lang['NewBadgeName']='Nama Baru Lencana';
 $lang['NocCaps']='KodKelab';
 $lang['NocCaps-ClubCamel']='KODKELAB NamaKelab';
@@ -141,6 +144,8 @@
 $lang['OpenPictureScreen']='Buka Skrin Kedua';
 $lang['PageDimension']='Saiz Muka Surat';
 $lang['PaperDimention']='Ukuran kertas';
+$lang['PhaseFrom']='Dari Fasa';
+$lang['PhaseTo']='Ke Fasa';
 $lang['Picture']='Gambar Atlit';
 $lang['Portrait']='Potret';
 $lang['PosX']='Kedudukan (X)';
@@ -161,6 +166,8 @@
 $lang['ResetBarcodeSeparator']='Menetapkan semula Pemisah Kod Bar';
 $lang['RnkCardinalEN']='Pandangan kardinal (1, 2, ..., 10)';
 $lang['RnkOrdinal']='Pandangan ordinal (1, 2, ..., 10) - EN';
+$lang['RnkRoman']='Nombor Roman (I, II, ... IV, ... CM)';
+$lang['S-Badge']='Pelekat';
 $lang['Schedule']='Jadual';
 $lang['Session']='Sesi Kelayakkan';
 $lang['SessionTarget']='Sasaran dan Kod Sesi';
@@ -175,6 +182,7 @@
 $lang['ToRight']='Logo Pertandingan (Kanan)';
 $lang['TVViewIdCard']='Lihat Kad ID';
 $lang['TVViewIdCardDescr']='Dalam paparan perlawanan buat cabutan 2 Kad ID dari lawan  selain daripada "standard" baris';
+$lang['VLayout']='Menegak';
 $lang['Width']='Lebar';
 $lang['WRank']='Kedudukan Dunia';
 $lang['WRankFields']='Jangan pamer selepas Kedudukan RD (0:Lihat semua)';
diff --git a/src/Common/Languages/ms/Boinx.php b/src/Common/Languages/ms/Boinx.php
index 92818f6e..95c01557 100644
--- a/src/Common/Languages/ms/Boinx.php
+++ b/src/Common/Languages/ms/Boinx.php
@@ -21,6 +21,11 @@
 $lang['CssFlexName']='Blok Nama  dan Bendera - Biasa';
 $lang['CssFlexSum']='Blok Akhir Semasa - Biasa';
 $lang['CssFlexTotal']='Blok Jumlah Markah - Biasa';
+$lang['CssImage']='Imej Tindanan';
+$lang['CssImage1']='Css untuk Imej 1';
+$lang['CssImage2']='Css untuk Imej 2';
+$lang['CssImage3']='Css untuk Imej 3';
+$lang['CssImageDiv']='Kotak div imej tindanan';
 $lang['CssLeftFlexArrows']='Blok Perincian Anak Panah - Kiri';
 $lang['CssLeftFlexName']='Blok Nama dan Bendera - Kiri';
 $lang['CssLeftFlexSum']='Blok Akhir Semasa - Kiri';
@@ -28,6 +33,7 @@
 $lang['CssLeftLight']='Kotak Masa - Kiri';
 $lang['CssLeftNames']='Panel Papan Skor - Kiri';
 $lang['CssLeftPresentation']='Panel Pembentangan - Kiri';
+$lang['CssLeftPresentationCountry']='Garisan Negara Persembahan - Kiri';
 $lang['CssLight']='Kotak Masa - Biasa';
 $lang['CssMatchBottom']='Perlawanan - Baris Bawah';
 $lang['CssMatchCommon']='Perlawanan - Biasa';
@@ -37,6 +43,7 @@
 $lang['CssPointsCommon']='Mata';
 $lang['CssPresentation']='Panel Pembentangan - Biasa';
 $lang['CssRankCommon']='Sel Kedudukan';
+$lang['CssReminder']='Jangan lupa untuk simpan sebarang perubahan yang telah dibuat!';
 $lang['CssRightFlexArrows']='Blok Perincian Anak Panah - Kanan';
 $lang['CssRightFlexName']='Blok Nama dan Bendera - Kanan';
 $lang['CssRightFlexSum']='Blok Akhir Semasa - Kanan';
diff --git a/src/Common/Languages/ms/Common.php b/src/Common/Languages/ms/Common.php
index 0495138f..517fb7b3 100644
--- a/src/Common/Languages/ms/Common.php
+++ b/src/Common/Languages/ms/Common.php
@@ -1,6 +1,6 @@
 <?php
 $lang['0_Phase']='Emas';
-$lang['0_PhaseNM']='Penentuan Tempat1/2';
+$lang['0_PhaseNM']='Penentuan Tempat 1/2';
 $lang['12_Phase']='1/12';
 $lang['14_Phase']='1/14';
 $lang['16_Phase']='1/16';
@@ -70,6 +70,7 @@
 $lang['CmdOk']='ok';
 $lang['CmdOn']='Buka';
 $lang['CmdPostUpdate']='Hantar kemaskini';
+$lang['CmdRefresh']='Muat semula';
 $lang['CmdSave']='Simpan';
 $lang['CmdSaveContinue']='Simpan & Sambung';
 $lang['CmdSet2All']='Set Untuk Semua';
@@ -144,6 +145,10 @@
 $lang['Finish']='Tamat';
 $lang['FirstPhase']='Fasa Pertama';
 $lang['FopSetup']='Susan Atur Padang Permainan';
+$lang['Gender0']='Lelaki';
+$lang['Gender1']='Wanita';
+$lang['GenderShort0']='L';
+$lang['GenderShort1']='W';
 $lang['GF']='Budak Perempuan';
 $lang['GM']='Budak Lelaki';
 $lang['HELP']='Bantuan!';
@@ -203,6 +208,9 @@
 $lang['MatchMode_0']='Kumulatif';
 $lang['MatchMode_1']='Sistem Set';
 $lang['MatchNo']='No. Perlawanan';
+$lang['MatchWinShot']='Pemenang Perlawanan Panahan';
+$lang['MatchWinShotHelp']='[Bilangan pemenang perlawanan panahan yang berjaya] - [Bilangan pemenang perlawanan panahan yang gagal]
+%=Peratusan untuk berjaya bila mana anak panah menentukan pemenang perlawanan berpotensi';
 $lang['Medal']='Pingat';
 $lang['MedalBronze']='Gangsa';
 $lang['MedalGold']='Emas';
@@ -213,6 +221,7 @@
 $lang['MenuLMRemoveNoShows']='Keluarkan Tidak Muncul';
 $lang['MenuLM_Accreditation']='Akreditasi';
 $lang['MenuLM_Accreditation colors management']='Pengurusan warna akreditasi';
+$lang['MenuLM_AdvancedFeatures']='Ciri-ciri Maju';
 $lang['MenuLM_AdvLabels']='Cetakan Label Lanjutan';
 $lang['MenuLM_Archers on Targets']='Pemanah pada Sasaran';
 $lang['MenuLM_Arr4Set']='Set Anak Panah';
@@ -226,6 +235,7 @@
 $lang['MenuLM_Athlets fees status']='Status yuran atlet';
 $lang['MenuLM_Authentication']='Pengesahan Pengguna';
 $lang['MenuLM_AutoCheckinSetup']='Persediaan Masuk Automatik';
+$lang['MenuLM_Automator']='Automator';
 $lang['MenuLM_Back Number Printout']='Cetakan Nombor Pemanah';
 $lang['MenuLM_Boinx']='Persediaan Layer Boinx';
 $lang['MenuLM_BoinxMeteo']='Data Layer Boinx Meteo';
@@ -236,9 +246,11 @@
 $lang['MenuLM_Category Result List']='Senarai Keputusan Kategori';
 $lang['MenuLM_Change Components']='Tukar Komponan';
 $lang['MenuLM_ChangeNationsNames']='Tukar Nama Negara';
+$lang['MenuLM_ChangePassword']='Tukar Kata Laluan';
 $lang['MenuLM_Check Data Update']='Periksa Data Terkini';
 $lang['MenuLM_Check shoot-off before eliminations']='Periksa seri sebelum penyingkiran';
 $lang['MenuLM_Check shoot-off before final phases']='Periksa seri sebelum fasa akhir';
+$lang['MenuLM_Check shoot-off before Rank']='Semak shoot-off sebelum membuat Cetakan Kedudukan';
 $lang['MenuLM_CheckAwards']='Semak Terjemahan Anugerah';
 $lang['MenuLM_CheckList']='Senarai Semak Cetakan';
 $lang['MenuLM_CIS']='CIS';
@@ -284,13 +296,14 @@
 $lang['MenuLM_ExtraCategories']='Kategori Tambahan Standard';
 $lang['MenuLM_ExtraDataEdit']='Edit Data Tambahan';
 $lang['MenuLM_Fees setup']='Persediaan bayaran';
-$lang['MenuLM_Field Crew']='Pegawai Padang';
+$lang['MenuLM_Field Crew']='Pegawai Pertandingan';
 $lang['MenuLM_Final Field of Play Layout']='lakaran Padang Akhir';
 $lang['MenuLM_Final report']='Laporan Akhir';
 $lang['MenuLM_Final Rounds']='Pusingan Akhir';
 $lang['MenuLM_FinalFOPChoose']='Lanjutan Akhir FOP';
 $lang['MenuLM_FlightsAwardManagement']='Pengurusan Bendera Hadiah';
 $lang['MenuLM_FlightsManagement']='Pengurusan Bendera';
+$lang['MenuLM_FontManagement']='Pengurusan Jenis Huruf';
 $lang['MenuLM_GateControl']='Panel Kawalan Akses Pagar';
 $lang['MenuLM_GateSituation']='Situasi Pagar';
 $lang['MenuLM_Get Info']='Dapatkan Maklumat';
@@ -304,7 +317,7 @@
 $lang['MenuLM_HTT Setup']='Persediaan HTT';
 $lang['MenuLM_Ianseo']='Ianseo';
 $lang['MenuLM_Images']='Imej';
-$lang['MenuLM_Import ARF']='Impot ARF';
+$lang['MenuLM_Import ARF']='Import ARF';
 $lang['MenuLM_Import Tournament']='Import Pertandingan';
 $lang['MenuLM_Individual Final Setup']='Persediaan Individu Akhir';
 $lang['MenuLM_Individual Finals']='Individu Akhir';
@@ -391,6 +404,7 @@
 $lang['MenuLM_Standard Table']='Jadual Standard';
 $lang['MenuLM_Statistics']='Statistik';
 $lang['MenuLM_SubClasses']='SubKelas';
+$lang['MenuLM_Swaps']='Tukar Lawan';
 $lang['MenuLM_Synchronize']='Menyegerakkan InfoSystem';
 $lang['MenuLM_Target']='Sasaran';
 $lang['MenuLM_Target Assignment']='Tugasan Sasaran';
@@ -436,6 +450,7 @@
 $lang['MsgImportOk']='Mengimpot Selesai!';
 $lang['MsgInitFinalGridsError']='Amaran: kurungan sudah dimulakan untuk acara ini. Adakah anda mahu meneruskan?';
 $lang['MsgInitFinalGridsOk']='Permulaan Berjaya!';
+$lang['MsgInitFinalGridsRunningError']='Operasi tidak dibenarkan ketika Acara di dalam Mod Berlangsung';
 $lang['MsgMakeFinReset']='Kurungan Akhir Semula Inisiatif! <br> Buat semula semua operasi awal sebelum memasukkan data baru!';
 $lang['MsgNeedInitGrids']='Ralat! <br> Kurungan tidak dimulakan!';
 $lang['MsgNeedShootOff']='Ralat! <br> Mula-mula anda perlu menyemak tembak-semula!';
@@ -493,6 +508,7 @@
 $lang['Score1Page1Match']='Markah untuk perlawanan tunggal';
 $lang['ScoreDrawing']='Hanya Lukisan (Satu Halaman)';
 $lang['ScoreFilled']='Cetak Skor Kad yang diisi dengan semua nilai dari anak panah pertama';
+$lang['ScoreIncAllNames']='Masukkan semua Lawan yang berkemungkinan';
 $lang['ScoreIncEmpty']='Cetak perlawanan walaupun tiada pihak lawan';
 $lang['Scorer']='Pencatat Markah';
 $lang['SearchOrphanTexts']='Cari Teks Orphan';
@@ -501,9 +517,12 @@
 $lang['SelectAll']='Pilih Semua';
 $lang['SelTour']='Kejohanan Dipilih';
 $lang['Session']='Sesi';
+$lang['SetWinShot']='Pemenang Set Panahan';
+$lang['SetWinShotHelp']='[Bilangan pemenang perlawanan panahan yang berjaya] - [Bilangan pemenang perlawanan panahan yang gagal] %=Peratusan untuk berjaya bila mana anak panah menentukan pemenang perlawanan berpotensi';
 $lang['SF']='Wanita Senior';
 $lang['ShootOff4Elim']='Semak tembak-semula sebleum pusingan penyingkiran';
 $lang['ShootOff4Final']='Semak tembak-semula sebleum fasa akhir';
+$lang['ShootOff4Rank']='Semak shoot-off sebelum membuat Cetakan Kedudukan';
 $lang['SM']='Lelaki Senior';
 $lang['SnapshotConf']='Konfigurasi Snapshot';
 $lang['SortBy']='Susun Mengikut';
@@ -545,12 +564,14 @@
 $lang['Total']='Jumlah';
 $lang['TotaleScore']='Jumlah';
 $lang['Trg3DComplete']='Standard 3D';
+$lang['Trg3DReddingEnd']='3D Kemerahan';
 $lang['TrgCOIndComplete']='Dalam (1-10 kecil)';
 $lang['TrgCOIndSmall']='Dalam (6-10 kecil)';
 $lang['TrgCOOutdoor']='Luar (5-X)';
 $lang['TrgCOOutdoorSmall']='Luar (6-X)';
 $lang['TrgField']='Memanah Padang';
 $lang['TrgForestSwe']='Hutan (SWE)';
+$lang['TrgFrBouquet']='Sejambak';
 $lang['TrgHMOutComplete']='Kena-Tak Kena';
 $lang['TrgHunterNor']='Memburu (Norway)';
 $lang['TrgImperial']='Sasaran Imperial (1-9)';
diff --git a/src/Common/Languages/ms/Errors.php b/src/Common/Languages/ms/Errors.php
index 3f9d611e..0ea0e673 100644
--- a/src/Common/Languages/ms/Errors.php
+++ b/src/Common/Languages/ms/Errors.php
@@ -2,14 +2,21 @@
 $lang['AllFieldsMandatory']='Semua ruangan perlu diisi';
 $lang['AllMailsRedirect']='Semua mesej akan dihantar ke';
 $lang['Anomalies']='Anomali';
+$lang['BarCodeSession']='Ada kesalahan di dalam tetapan: cuba tetapan sesi!';
+$lang['BarCodeSettings']='Ada kesalahan di dalam tetapan';
 $lang['ClassFromToError']='Dari dan Ke mesti berupa nilai berangka';
 $lang['ClubNotFound']='Kod Kelab tidak ditemui dalam kelab sedia ada. Sila kemas kini pangkalan data dahulu!';
+$lang['DecodeError']='Nyahkod Ralat';
+$lang['DiameterMandatory']='Diameter target face adalah wajib';
 $lang['DirectoryNotWriteable']='Direktori $a tidak boleh ditulis oleh pelayan web. Sila ubah keizinannya untuk ditulis oleh sesiapa sahaja.';
+$lang['DistanceOutRange']='Jarak di luar julat';
 $lang['DivClasNumberNotEmpty']='Anda mesti memilih sekurang-kurangnya satu bahagian dan satu kelas (dan berapa ramai pemanah dalam pasukan).';
 $lang['EmptyBody']='Badan Tiada: bidang ini adalah wajib!';
 $lang['EmptyFrom']='Email Tiada: bidang ini adalah wajib!';
 $lang['EmptySubject']='Subjek Tiada: bidang ini adalah wajib!';
 $lang['EmptyTitle']='Tajuk Tiada: bidang ini adalah wajib!';
+$lang['EntriesNoCategory']='Kemasukan tanpa Kategori';
+$lang['EntriesNoCountry']='Kemasukan tanpa Negara/Kelab';
 $lang['ErrCodeExists']='Kod sudah wujud!';
 $lang['ErrCommitteeError']='Kod atau perihalan Jawatankuasa tidak sah';
 $lang['ErrConnection']='Tiada sambungan ke pelayan $a';
@@ -27,17 +34,27 @@
 $lang['ErrRedCard']='Jawatankuasa ini menjalani kad merah dan tidak boleh meminta pertandingan untuk dihoskan di ianseo. Hubungi codes@ianseo.net untuk penjelasan lanjut.';
 $lang['ErrUnknownNation']='Negara Tidak Diketahui';
 $lang['ErrYellowCard']='Jawatankuasa telah menjalani Kad Kuning kerana tiada hasil pertandingan telah dimuat naik. Hubungi codes@ianseo.net untuk penjelasan lanjut.';
+$lang['FilterAlreadyExists']='Tapisan ini telah wujud';
+$lang['FilterNotEmpty']='Anda perlu menentukan tapisan';
+$lang['ImageFetchError']='Ralat Ambilan Imej';
+$lang['ImageSaveError']='Imej tidak disimpan';
+$lang['IncompleteSettings']='Tetapan Tidak Lengkap';
 $lang['InvalidEmail']='E-mel Tidak Sah: sila semak semula e-mel sebelum menyimpan';
+$lang['InvalidLogin']='Log Masuk Tidak Sah';
 $lang['LockedProcedure']='Prosuder ini DIKUNCI';
 $lang['MailingAlreadyExists']='E-mel dengan tajuk yang sama ({$a}) sudah ada, sila ubah tajuk atau pilih e-mel untuk dipinda dari pemilih.';
 $lang['MailingDeleteText']='Sila sahkan bahawa anda ingin memadam surat ini secara kekal!';
 $lang['MailingDeleteTitle']='Buang Surat';
 $lang['MailingError']='Tiada perubahan dilakukan!';
 $lang['MalformedMail']='Mel tidak betul, sila masukkan e-mel yang sah ($a})';
+$lang['ManDistance-EmptySelection']='Tetapan tidak sepadan dengan mana-mana kategori';
 $lang['MissingAccreditation']='Tiada akreditasi dalam talian!';
 $lang['MissingData']='Data Tiada';
 $lang['MissingPhpIntlModule']='Transliterasi boleh dilakukan memasang dan mengaktifkan modul php-intl';
 $lang['NameNotEmpty']='Nama tidak boleh dibiarkan kosong';
+$lang['NoCountryInsert']='Tiada Negara Dimasukkan';
+$lang['NoData']='Tiada Data disediakan';
+$lang['NoDistancesSet']='Kategori tanpa tetapan jarak';
 $lang['NoDNSRecord']='Nama Pelayan tidak betul atau tidak dalam talian: harap maklum bahawa anda mesti disambungkan ke Internet untuk menetapkan pilihan ini.';
 $lang['NoMailingTemplate']='Tiada Templat E-mel yang dipilih/tersedia!';
 $lang['NoMailRecipients']='Email ini tidka ditujukan kepada sesiapa! Sila semak pilihan penapis anda.';
diff --git a/src/Common/Languages/ms/IOC_Codes.php b/src/Common/Languages/ms/IOC_Codes.php
index 60154b5e..df198b02 100644
--- a/src/Common/Languages/ms/IOC_Codes.php
+++ b/src/Common/Languages/ms/IOC_Codes.php
@@ -49,7 +49,7 @@
 $lang['CHA']='Chad';
 $lang['CHI']='Chile';
 $lang['CHN']='China';
-$lang['CIV']='Ivory Coast';
+$lang['CIV']='Côte d\'Ivoire';
 $lang['CMR']='Cameroon';
 $lang['COD']='Republik Demokratik Congo';
 $lang['COK']='Kepulauan Cook';
@@ -59,6 +59,7 @@
 $lang['CRC']='Costa Rica';
 $lang['CRO']='Croatia';
 $lang['CUB']='Cuba';
+$lang['CUW']='Curacao';
 $lang['CYP']='Cyprus';
 $lang['CZE']='Republik Czech';
 $lang['DEN']='Denmark';
@@ -74,7 +75,10 @@
 $lang['ETH']='Ethiopia';
 $lang['FIJ']='Fiji';
 $lang['FIN']='Finland';
+$lang['FLK']='Falkland Island';
+$lang['FPO']='Tahiti';
 $lang['FRA']='Perancis';
+$lang['FRO']='Faroe Islands';
 $lang['FSM']='Micronesia';
 $lang['GAB']='Gabon';
 $lang['GAM']='Gambia';
@@ -84,6 +88,7 @@
 $lang['GEQ']='Equatorial Guinea';
 $lang['GER']='Jerman';
 $lang['GHA']='Ghana';
+$lang['GLP']='Guadalupe';
 $lang['GRE']='Greece';
 $lang['GRN']='Grenada';
 $lang['GUA']='Guatemala';
@@ -112,11 +117,13 @@
 $lang['KGZ']='Kyrgyzstan';
 $lang['KIR']='Kiribati';
 $lang['KOR']='Korea Selatan';
+$lang['KOS']='Kosovo';
 $lang['KSA']='Arab Saudi';
 $lang['KUW']='Quwait';
 $lang['LAO']='Laos';
 $lang['LAT']='Latvia';
 $lang['LBA']='Libya';
+$lang['LBN']='Lebanon';
 $lang['LBR']='Liberia';
 $lang['LCA']='Saint Lucia';
 $lang['LES']='Lesotho';
@@ -124,6 +131,7 @@
 $lang['LIE']='Liechtenstein';
 $lang['LTU']='Lithuania';
 $lang['LUX']='Luxembourg';
+$lang['MAC']='Macau, China';
 $lang['MAD']='Madagascar';
 $lang['MAR']='Maghribi';
 $lang['MAS']='Malaysia';
@@ -199,10 +207,11 @@
 $lang['THA']='Thailand';
 $lang['TJK']='Tajikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='East Timor';
+$lang['TLS']='Timor Leste';
 $lang['TOG']='Togo';
 $lang['TPE']='Chinese Taipei';
 $lang['TRI']='Trinidad and Tobago';
+$lang['TTO']='Trinidad and Tobago';
 $lang['TUN']='Tunisia';
 $lang['TUR']='Turki';
 $lang['TUV']='Tuvalu';
diff --git a/src/Common/Languages/ms/Ianseo.php b/src/Common/Languages/ms/Ianseo.php
index ae708779..1bd539cd 100644
--- a/src/Common/Languages/ms/Ianseo.php
+++ b/src/Common/Languages/ms/Ianseo.php
@@ -7,4 +7,9 @@
 $lang['Cert-Level4']='Kursus Master';
 $lang['Cert-Level5']='Kru Ianseo';
 $lang['CertificateManagement']='Pengurusan Sijil';
+$lang['GenerateFile']='Cipta Fail';
+$lang['ResetItems']='Tetapkan Semula Item.<br>Tindakan ini tidak akan meminta pengesahan dan tidak boleh dibuat asal!<br>Menetapkan semula kelayakan akan menetapkan semula semua acara berikutnya juga!';
+$lang['ResetResult']='Sesi yang diminta telah ditetapkan semula';
+$lang['ResetSessions']='Sahkan Set Semula';
+$lang['ShuffleResults']='Kocok Keputusan';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/ms/Install.php b/src/Common/Languages/ms/Install.php
index 849b6348..97d3b1d0 100644
--- a/src/Common/Languages/ms/Install.php
+++ b/src/Common/Languages/ms/Install.php
@@ -78,7 +78,6 @@
 $lang['Parameter']='Parameter';
 $lang['Password']='Kata Laluan';
 $lang['PHP settings']='Tetapan PHP';
-$lang['PHP too old']='Pemasangan PHP anda terlalu lama. Nombor versi minimum untuk IANSEO adalah 5.0.';
 $lang['PHP version']='Versi PHP';
 $lang['php.ini file']='Fail php.ini';
 $lang['Prepare']='Menyediakan data untuk kemaskini';
@@ -222,7 +221,6 @@
 $lang['Value']='Nilai';
 $lang['WhatIanseoDoes01']='<b>Mematuhi Peraturan Memanah Dunia:</b>Ianseo sentiasa mengemaskini peraturan World Archery yang terkini. Pemaju boleh juga membuat perubahan bagi memenuhi Peraturan Khusus Negara dan Persaingan juga!';
 $lang['WhatIanseoDoes02']='<b>Bantuan dan sokongan:</b>jika anda memerlukan bantuan, hantar e-mel kepada $a: anda akan mendapat jawapan terus dari pemaju Ianseo!';
-$lang['WhatIanseoDoes03']='<b> Latihan dan kursus di lokasi: </b> Ianseo tersedia untuk menguruskan kursus lokasi khusus. Dua tahap: tanpa dan dengan peranti elektronik. Yang pertama bertujuan untuk mengetahui semua aspek ianseo dari persiapan dan jadual pertandingan hingga penerbitan dalam talian dan pengedaran hasil tempatan. Yang kedua bertujuan untuk memperoleh semua pengetahuan khusus untuk menjalankan pertandingan "panah demi anak panah".';
 $lang['WhatIanseoDoes04']='<b>Sumbangan!</b> Ianseo adalah sumber bebas dan terbuka ... jika anda suka, sila bantu kami menjaga perisian dan pelayan terkini: tekan butang "Donate" di halaman utama $a!';
 $lang['WhatIanseoDoes05']='<b>Media Sosial:</b>Ianseo juga pada $a!';
 $lang['WhatIanseoDoesTitle']='Apa yang boleh dilakukan oleh Ianseo untuk pertandingan anda';
diff --git a/src/Common/Languages/ms/RoundRobin.php b/src/Common/Languages/ms/RoundRobin.php
index fd6a423c..9a7e52d7 100644
--- a/src/Common/Languages/ms/RoundRobin.php
+++ b/src/Common/Languages/ms/RoundRobin.php
@@ -28,6 +28,7 @@
 $lang['Levels']='Tahap';
 $lang['LevelsHelp']='Jumlah Tahap';
 $lang['LevelShort']='Thp';
+$lang['PreSeedNum']='Kedudukan seperti $a';
 $lang['QualifiedArchers']='Pemanah yang Layak';
 $lang['RegularBrackets']='Carta Biasa';
 $lang['Round']='Pusingan';
@@ -42,6 +43,7 @@
 $lang['Source']='Tahap Sumber+Kumpulan';
 $lang['SourceRank']='Kedudukan Sumber';
 $lang['TargetAssignment']='Tugasan Sasaran';
+$lang['TargetAssignmentDescription']='Nombor Sasaran diikuti dengan "++" berfungsi sebagai "+" tetapi mengulangi sasaran yang sama pada semua peringkat bermula dari peringkat semasa;<br/> Nombor Sasaran diikuti dengan "**" berfungsi sebagai "*" tetapi untuk semua pusingan';
 $lang['Tie']='Seri';
 $lang['TieAllowed']='Seri Dibenarkan';
 $lang['TieBreak-1']='Pemutus 1';
diff --git a/src/Common/Languages/ms/Tournament.php b/src/Common/Languages/ms/Tournament.php
index 24930a78..ad3f1805 100644
--- a/src/Common/Languages/ms/Tournament.php
+++ b/src/Common/Languages/ms/Tournament.php
@@ -27,7 +27,7 @@
 $lang['AclISKServer']='Pengurusan ISK';
 $lang['AclModules']='Model';
 $lang['ACLNoAccess']='Tiada Akses';
-$lang['AclNotes']='<b>Nota tentang Keselamatan Rangkaian</b><ul><li> sekatan adalah "berasaskan pertandingan" dan bukan "berasaskan pelayan"</li><li>apabila polisi diaktifkan, klien yang tidak disenarai kana menjadi "Tiada Akses"</li> <li>localhost (127.0.0.1 atau ::1) tidak boleh disekat </li><li>Polisi boleh dinyahaktifkan dari pelayan itu sendiri<b>{$a}</b></ul>';
+$lang['AclNotes']='<b>Nota tentang Keselamatan Rangkaian</b> <ul> <li>Sekatan ini adalah "berasaskan persaingan" dan bukan "berasaskan pelayan"</li> <li>localhost (127.0.0.1 atau ::1) tidak boleh dihadkan </li> <li>Dasar boleh dilumpuhkan panggilan daripada pelayan itu sendiri <b>{$a}</b> </li></ul><ul> <li>Apabila dasar didayakan, tingkah laku lalai untuk klien tidak tersenarai ialah "Tiada Akses"</li> <li>Adalah mungkin untuk menambah * sebagai kumpulan terakhir Alamat IP (192.168.0.* atau 172.16.*) untuk menambah kumpulan lalai</li> < li>Adalah mungkin untuk menggunakan RegExp untuk memadankan alamat IP. RegExps akan dinilai mengikut susunan yang ditunjukkan dan membenarkan dasar R/W </ul>';
 $lang['AclOdf']='Pengurusan ODF';
 $lang['AclOutput']='Output';
 $lang['AclParticipants']='Peserta';
@@ -128,7 +128,7 @@
 $lang['BadgeIncludePhoto']='Sertakan Foto dalam Lencana?';
 $lang['BadgeNames']='Nama Penuh (Tidak dicetak terlebih dahulu)';
 $lang['BadgeNoData']='Tiada data untuk dicetak';
-$lang['BadgeOnlyNotPrinted']='HANYA Lencana belum dicetak?';
+$lang['BadgeOnlyNotPrinted']='Hanya yang BELUM dicetak?';
 $lang['BadgeOnlyPrintAccredited']='HANYA Lencana peserta bertauliah?';
 $lang['BadgeOnlyPrintPhoto']='HANYA Lencana dengan Foto?';
 $lang['BadgeOptions']='Pilihan';
@@ -338,7 +338,7 @@
 $lang['EmailScorecardShort']='Ringkasan Kad Markah';
 $lang['EmailsToSend']='Email dihantar kepada';
 $lang['EmailSuccessfull']='Email telah berjay dihantar ke $a';
-$lang['EnableAccess']='Aktifkan/Tutupkan Dasar';
+$lang['EnableAccess']='Aktifkan/Tutupkan Dasar Polisi';
 $lang['Ends']='Pusingan';
 $lang['EndTotal']='Jumlah Akhir';
 $lang['EndUpdate']='Semua kemaskini selesai';
@@ -381,9 +381,13 @@
 $lang['FinalRank']='Kedudukan Akhir';
 $lang['FinalReportTitle']='Laporan Pertandingan';
 $lang['Finals']='Akhir';
+$lang['FinalTarget']='Sasaran Akhir';
+$lang['FinalTime']='Masa akhir';
+$lang['FinArrows']='Anak panah akhir';
 $lang['FindArcher']='Cari Atlit';
 $lang['FinEnds']='Pusingan Akhir';
 $lang['FirstPhase']='Fasa Pertama';
+$lang['FirstTarget']='Sasaran Pertama';
 $lang['Flags']='Bendera/Logo Negara Kelab';
 $lang['FlightsAwardManagement']='Pengurusan Bendera Hadiah';
 $lang['FlightsCategories']='Kategori';
@@ -394,6 +398,9 @@
 $lang['FlightsManagement']='Pengurusan Bendera';
 $lang['FlightsReset']='Menetapkan semula';
 $lang['FlightsTotals']='Jumlah';
+$lang['FontFile']='Fail Tulisan';
+$lang['FontName']='Nama Tulisan';
+$lang['FontSample']='Contoh Tulisan';
 $lang['From']='Dari';
 $lang['GetCredentials']='Dapatkan Kod Pertandingan';
 $lang['Group']='Kumpulan';
@@ -580,11 +587,12 @@
 $lang['UserDetails']='Butiran Pengguna';
 $lang['UserEnabled']='Aktifkan';
 $lang['UserName']='Nama Pengguna';
-$lang['UserPassword']='Kata Laluan';
+$lang['UserPassword']='Kata Laluan Baru';
 $lang['VersionEntries']='Penyertaan';
 $lang['VersionEvent']='Acara/ Kategori';
 $lang['VersionFile']='Fail';
 $lang['VersionNotes']='Nota';
+$lang['VersionSector']='Sektor';
 $lang['WaCategory']='Kategori WA';
 $lang['WaId']='Lesen Id Pemanah';
 $lang['WaIdShort']='ID Pemanah';
@@ -600,4 +608,5 @@
 $lang['XNineLabel']='Label XSembilan';
 $lang['YearEnd']='Hingga Tahun';
 $lang['YearStart']='Dari Tahun';
+$lang['YourNextMatch']='Ini adalah perlawanan berikut anda';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/nl/Api.php b/src/Common/Languages/nl/Api.php
index a5813548..e48e0860 100644
--- a/src/Common/Languages/nl/Api.php
+++ b/src/Common/Languages/nl/Api.php
@@ -4,6 +4,9 @@
 $lang['API-Group']='Groep';
 $lang['API-TargetGrouping']='Doelen groeperen';
 $lang['API-Targets']='Doelen';
+$lang['AskSignature-0']='Nee';
+$lang['AskSignature-1']='Scan sporters-ID';
+$lang['AskSignature-2']='Ondertekening op het scherm';
 $lang['AutoImport']='Automatische import';
 $lang['CheckConnected']='Controleer verbonden';
 $lang['CmdDelete']='Verwijder';
@@ -17,7 +20,9 @@
 $lang['Desc-Let-Z']='Score wordt vastgelegd';
 $lang['ISK-Anomalies']='Afwijkingen';
 $lang['ISK-AppList']='APK Overzicht';
+$lang['ISK-AppQrCode']='Afdrukken QR installatiecodes';
 $lang['ISK-ApproveConfig']='Configuratie goedkeuren';
+$lang['ISK-askSignature']='Vraag om handtekening';
 $lang['ISK-askTotals']='Vraag naar het totaal op papieren scorebriefje';
 $lang['ISK-AuthRequest']='Autorisatie verzoek';
 $lang['ISK-BadCompCode']='Foute competitie code';
@@ -77,6 +82,8 @@
 $lang['ISK-StatusOK']='Apparaat instellingen OK';
 $lang['ISK-StatusReloading']='Configuratie opnieuw laden';
 $lang['ISK-StatusWaitConfirm']='In afwachting van bevestiging van apparaat';
+$lang['ISK-TruncateTable']='Kap tabel af (andere sessies)';
+$lang['ISK-TruncateTableAll']='Kap tabel af (volledig)';
 $lang['ISK-VibrateUpdate']='Trillen bij update';
 $lang['ISK-WiFi']='WiFi beheer';
 $lang['ISK-WifiDELETE']='Verwijder andere WiFi van het score apparaat';
@@ -114,6 +121,15 @@
 $lang['RaspDevice']='Apparaat';
 $lang['RasUrl']='URL naar server';
 $lang['StickyAlreadySet']='Deze niet te wijzigen series zijn al ingevoerd in een andere sessie.';
+$lang['TempArrowsDelete']='verwijder pijlen van de tijdelijke tabel';
+$lang['TempArrowsImport']='importeer pijlen van de tijdelijke tabel';
+$lang['TempArrowsM']='Niet geimporteerde pijlen in matches';
+$lang['TempArrowsQ']='Niet geimporteerde pijlen in kwalificatie of eliminatie';
+$lang['UnlockAll']='Herstel alle sessies';
+$lang['UsePersonalDevices-Granted']='Persoonlijk';
+$lang['UsePersonalDevices-Print']='Druk QrCode af op de score kaart';
+$lang['ViewSize']='Bekijk grote';
 $lang['WAToolbox-MissingParams']='Ontbrekende parameter';
 $lang['WAToolbox-NoCompCode']='Ontbrekende competitie code';
+$lang['XToWin']='$a om te winnen';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/nl/Common.php b/src/Common/Languages/nl/Common.php
index 6f660838..60252242 100644
--- a/src/Common/Languages/nl/Common.php
+++ b/src/Common/Languages/nl/Common.php
@@ -160,6 +160,7 @@
 $lang['InitEliminations']='Initialiseer eliminaties';
 $lang['InitEliminations1']='Initialiseer 1e ronde eliminaties';
 $lang['InitEliminations2']='Initialiseer 2e ronde eliminaties';
+$lang['InitFinalGrids']='Initialiseer de inidivduele rondes';
 $lang['InitPools']='Initialiseer poules';
 $lang['InvalidAction']='Ongeldige actie';
 $lang['ISK-Configuration']='Controle apparaten';
@@ -271,6 +272,7 @@
 $lang['MenuLM_ExtraCategories']='Standaard extra categorieen';
 $lang['MenuLM_ExtraDataEdit']='Wijzigen extra data';
 $lang['MenuLM_Fees setup']='instellingen voor betalen';
+$lang['MenuLM_Field Crew']='Veld ploeg';
 $lang['MenuLM_Final Field of Play Layout']='Veldopzet finale rondes';
 $lang['MenuLM_Final report']='eindrapport';
 $lang['MenuLM_Final Rounds']='Finale rondes';
@@ -455,6 +457,7 @@
 $lang['RankingInd']='Eliminatie en finale rondes - individueel';
 $lang['Rankings']='Standen';
 $lang['RankingSq']='Eliminatie en finale ronde - teams';
+$lang['RankScoreShort']='Kwalificatie';
 $lang['RB']='Recurve Boog';
 $lang['RecalcIndTeamsRank']='Bepalen individueel en team ranglijst geslaagd';
 $lang['Review']='Overzicht';
diff --git a/src/Common/Languages/nl/Errors.php b/src/Common/Languages/nl/Errors.php
index bc5a6be2..2953d315 100644
--- a/src/Common/Languages/nl/Errors.php
+++ b/src/Common/Languages/nl/Errors.php
@@ -1,5 +1,10 @@
 <?php
+$lang['AllFieldsMandatory']='Alle velden zijn verplicht';
+$lang['AllMailsRedirect']='Alle meldingen worden verstuurd aan';
 $lang['Anomalies']='Afwijkingen';
+$lang['BarCodeSession']='Er is een fout in de instellingen: herstel een sessie';
+$lang['BarCodeSettings']='Er is een fout in de instellingen';
+$lang['CategoresNotDefined']='categorie definities missen';
 $lang['DirectoryNotWriteable']='De map $a mag niet beschreven worden door de web-server. Wijzig de autorisatie zodat de map beschreven kan worden.';
 $lang['ErrCodeExists']='Code bestaat al';
 $lang['ErrCommitteeError']='Ongeldige code of omschrijving';
diff --git a/src/Common/Languages/nl/IOC_Codes.php b/src/Common/Languages/nl/IOC_Codes.php
index 7d28a1e3..52d70bfe 100644
--- a/src/Common/Languages/nl/IOC_Codes.php
+++ b/src/Common/Languages/nl/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='Amerikaans Samoa';
 $lang['AUS']='Australië';
 $lang['AUT']='Oostenrijk';
-$lang['Award-Anthem']='Dames en Heren, wilt u gaan staan voor het nationaal volkslied van';
-$lang['Award-Anthem-TPE']='Dames en Heren, wilt u gaan staan voor het volkslied van';
 $lang['Award-Applause']='Dames en Heren, graag een hartelijk applaus voor onze atleten';
 $lang['Award-Intro']='Dames en heren, de prijsuitreiking voor de categorie {$a}';
 $lang['Award-MedalGiver']='Medailles worden overhandigd door $a';
@@ -42,16 +40,12 @@
 $lang['BUL']='Bulgarije';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Centraal Afrikaanse Republiek';
-$lang['CAM']='Cambodja';
 $lang['CAN']='Canada';
 $lang['CAY']='Kaaimaneilanden';
 $lang['CGO']='Congo-Brazzaville';
 $lang['CHA']='Tsjaad';
 $lang['CHI']='Chili';
-$lang['CHN']='China';
-$lang['CIV']='Ivoorkust';
 $lang['CMR']='Kameroen';
-$lang['COD']='Democratische republiek Kongo';
 $lang['COK']='Cook eilanden';
 $lang['COL']='Columbia';
 $lang['COM']='Comoren';
@@ -60,7 +54,6 @@
 $lang['CRO']='Kroatië';
 $lang['CUB']='Cuba';
 $lang['CYP']='Cyprus';
-$lang['CZE']='Tsjechië';
 $lang['DEN']='Denemarken';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -91,17 +84,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haïti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Hongarije';
 $lang['INA']='Indonesië';
 $lang['IND']='India';
-$lang['IRI']='Iran';
 $lang['IRL']='Ierland';
 $lang['IRQ']='Irak';
 $lang['ISL']='IJsland';
 $lang['ISR']='Israël';
-$lang['ISV']='Amerikaanse maagdeneilanden';
 $lang['ITA']='Italië';
 $lang['IVB']='Britse maagdeneilanden';
 $lang['JAM']='Jamaica';
@@ -114,7 +104,6 @@
 $lang['KOR']='Republiek Korea';
 $lang['KSA']='Saudi Arabië';
 $lang['KUW']='Koeweit';
-$lang['LAO']='Laos';
 $lang['LAT']='Letland';
 $lang['LBA']='Libië';
 $lang['LBR']='Liberia';
@@ -128,7 +117,6 @@
 $lang['MAR']='Marokko';
 $lang['MAS']='Maleisië';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldavië';
 $lang['MDV']='Maladiven';
 $lang['Medal-1']='de gouden medaille';
 $lang['Medal-2']='de zilveren medaille';
@@ -137,7 +125,6 @@
 $lang['MEX']='Mexico';
 $lang['MGL']='Mongolië';
 $lang['MHL']='Marshall eilanden';
-$lang['MKD']='Noord-Macedonië';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -166,7 +153,6 @@
 $lang['PNG']='Papoea-Nieuw-Guinea';
 $lang['POL']='Polen';
 $lang['POR']='Portugal';
-$lang['PRK']='Noord Korea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Roemenië';
@@ -193,13 +179,11 @@
 $lang['SVK']='Slowakije';
 $lang['SWE']='Zweden';
 $lang['SWZ']='Swaziland';
-$lang['SYR']='Syrië';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailand';
 $lang['TJK']='Tadzjikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Oost Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Chinees Taipei';
 $lang['TRI']='Trinidad en Tobago';
diff --git a/src/Common/Languages/nl/Install.php b/src/Common/Languages/nl/Install.php
index 30b08cd6..29f25999 100644
--- a/src/Common/Languages/nl/Install.php
+++ b/src/Common/Languages/nl/Install.php
@@ -74,7 +74,6 @@
 $lang['Parameter']='Parameter';
 $lang['Password']='Wachtwoord';
 $lang['PHP settings']='PhP instellingen';
-$lang['PHP too old']='De PHP installatie is te oud. De minimaal benodigde versie voor Ianseo is 5.0';
 $lang['PHP version']='PHP versie';
 $lang['php.ini file']='phvp.ini bestand';
 $lang['Prepare']='Wijziging wordt voorbereid';
@@ -206,7 +205,6 @@
 $lang['Value']='Waarde (geindexeerde array: elementen sleutel1:: waarde 1|sleutel 2::waarde2)';
 $lang['WhatIanseoDoes01']='<b>World Archery regels worden gebruikt</b>Ianseo bevat altijd de laatste aanpassingen in World Archery regels. Ontwikkelaars zijn beschikbaar voor aanpassingen voor nationale en bezondere competie regels!';
 $lang['WhatIanseoDoes02']='<b>Help en ondersteuning</b> Heb je ondersteuning nodig stuur een e-mail naar $a: je krijgt een antwoord direct van de makers van Ianseo.';
-$lang['WhatIanseoDoes03']='<b>Verschillende trainingen en cursussen:</b> Ianseo kan cursussen geven op locatie. Dit kan gebeuren op 2 niveaus: zonder en met de elektronische score apparaten. De eerste cursus is bedoeld om alle aspecten van ianseo te leren van voorbereiding van de wedstrijd tot (online) publicatie en locale verspreiding van de resultaten. De tweede vorm is bedoeld om alle benodigde kennis op te doen om een "arrow by arrow" wedstrijd te runnen.';
 $lang['WhatIanseoDoes04']='<b> Geef geld!</b> Ianseo is vrij te gebruiken en open source. Help ons de software en de server up-to-date te houden: druk op de "Donate" knop  op de home page van $a!';
 $lang['WhatIanseoDoes05']='<b> Social Media;</b> Ianseo is ook op $a!';
 $lang['WhatIanseoDoesTitle']='Wat kan Ianseo doen voor jou wedstrijd';
diff --git a/src/Common/Languages/nl/Tournament.php b/src/Common/Languages/nl/Tournament.php
index 5d523d41..75fac724 100644
--- a/src/Common/Languages/nl/Tournament.php
+++ b/src/Common/Languages/nl/Tournament.php
@@ -27,12 +27,14 @@
 $lang['AclISKServer']='ISK beheer';
 $lang['AclModules']='Modules';
 $lang['ACLNoAccess']='Geen toegang';
+$lang['AclNotes']='<b>Aantekeningen over netwerkbeveiliging<b><ul><li>restricties zijn "competitie gebaseerd" en niet "server gebaseerd"</li><li>wanneer beleid is ingeschakeld, is standaard gedrag voor niet vermelde cliënten "geen toegang"</li><li>localhost (127.0.0.1 of ::1) kan niet worden beperkt</li><li>beleid kan worden uitgeschakeld door vanuit de server zelf in te bellen<b>{$a}</b></ul>';
 $lang['AclOdf']='Beheer ODF';
 $lang['AclOutput']='Uitvoer';
 $lang['AclParticipants']='Deelnemers';
 $lang['AclQualification']='Kwalificatie';
 $lang['ACLReadOnly']='Beperkte toegang (alleen lezen)';
 $lang['ACLReadWrite']='Complete toegang (lezen en schrijven)';
+$lang['AclRobin']='Round Robin';
 $lang['AclRoot']='Superuser';
 $lang['AclSpeaker']='Speaker';
 $lang['AclTeams']='Teamfinales';
@@ -40,6 +42,7 @@
 $lang['ActualFlag']='Gebruikte vlag';
 $lang['AddMaxRows']='Voeg alle mogelijke rijen toe';
 $lang['AddTournament']='Toernooi toevoegen';
+$lang['AdvancedParams']='Instellen parameters uitgebreid';
 $lang['AfterDistance']='Stand NA de volgende afstand';
 $lang['AfterXDistance']='Resultaat Na Afstand $a';
 $lang['AllDistances']='Alles';
@@ -76,6 +79,7 @@
 $lang['AssignLookupTable']='Zet alle ingangen op: {$a}';
 $lang['AtDistance']='Rangschikking van de volgende afstand:';
 $lang['Ath4Target']='Schutters per doel';
+$lang['AthButtLegend1']='Tegenstanders per doel';
 $lang['AthButtLegend2']='Matches per doel';
 $lang['AthleteFile']='laad sporters van bestand';
 $lang['AthleteList']='laad sporters';
@@ -238,12 +242,21 @@
 $lang['DefaultHM']='Standaard HM';
 $lang['DefaultLocRule']='FITA';
 $lang['DefaultVI']='Standaard VI';
+$lang['Delayed']='Vertraagd';
+$lang['DeletePreviousArchers']='Verwijder vorige sporters';
 $lang['DeletePreviousTeams']='Verwijder vorige teams';
 $lang['DeleteTourConfirm']='Voeg in tekstbox de volgende "control code" toe:';
 $lang['DeleteTournament']='Verwijder wedstrijd';
 $lang['Deleting']='Moment: verwijderen van bestanden';
+$lang['DescAddress']='Zie code';
+$lang['DescDOB']='Zie code';
+$lang['DescEmail']='Zie code';
+$lang['DescNOC']='Zie code';
 $lang['DescPhotoName']='Zie code';
 $lang['Descr']='Beschrijving';
+$lang['DescSession']='Zie code';
+$lang['DescTarget']='Zie code';
+$lang['DescWheelchair']='Zie code';
 $lang['DestroyTarget']='Verwijder Doel';
 $lang['Details']='$a details';
 $lang['Distance']='afstand';
@@ -261,6 +274,7 @@
 $lang['DOB']='Geboorte datum';
 $lang['Document']='Document';
 $lang['Dos']='Director of Shooting (wedstrijdleider)';
+$lang['DosAssistant']='D.O.S. assistent';
 $lang['DoubleSpace']='Kruisboog';
 $lang['DQB']='Gediskwalificeerd voor onsportief gedrag';
 $lang['DrawField3D']='Veld/3D loting';
@@ -310,6 +324,7 @@
 $lang['ExportRefEMail']='Referentie e-mail';
 $lang['ExportWinners']='Exporteer winnaars';
 $lang['FamilyName']='Familie naam';
+$lang['FieldResp']='Verantwoordelijk voor het veld';
 $lang['FieldTourCategory']='Veldwedstrijd';
 $lang['FilterOnDivCl']='Filter divisie / klasse';
 $lang['FilterOnDivClAdv']='Filter op divisie/klasse (uitgebreid)';
@@ -367,8 +382,10 @@
 $lang['GroupMatches']='Groeps wedstrijden';
 $lang['HiddenCredited']='Verberg erkenning';
 $lang['Hour']='Uur';
+$lang['I-Session']='Individuele matches';
 $lang['IdCard']='Bondsnummer';
 $lang['Image']='Foto';
+$lang['ImgInfo']='Toegestane foto type\'s PNG en JPG. Max. groote 64 KB.';
 $lang['ImportARFFile']='Importeer ARF-bestand';
 $lang['ImportedEntries']='Gegevens geimporteerd';
 $lang['ImportedTour']='Wedstrijd geimporteerd';
@@ -379,6 +396,7 @@
 $lang['IndFinEvent']='Individuele Finale';
 $lang['IndoorTourCategory']='Indoor wedstrijd';
 $lang['IndQual']='Individueel - Qualificatie';
+$lang['InitEliminations']='Initialiseer eliminaties';
 $lang['InitProcess']='Initialiseren';
 $lang['Invalid Password']='Foutief wachtwoord';
 $lang['IOCcode']='IOC land code';
@@ -395,12 +413,21 @@
 $lang['LocalRule']='Gebruikte regels';
 $lang['LocalRuleAlert']='Let op!!\n\nDenk er aan de juiste gebruikte regels te kiezen. Geef dit aan in het volgende veld.';
 $lang['LocalSubRule']='sub-regel';
+$lang['LogisticResp']='Verantwoordelijk voor de logistiek';
+$lang['LogoB']='Plaatje aan de onderkant';
 $lang['LogoL']='Plaatje boven aan links';
 $lang['LogoManagement']='Beheren van plaatjes';
 $lang['LogoR']='Plaatje boven aan rechts';
 $lang['LongTable']='Uitgebreide invoer';
 $lang['LookupTable']='Zoek tabel';
+$lang['LUE-CAN']='Canada';
+$lang['LUE-FRA']='Frankrijk';
+$lang['LUE-ITA']='Italië';
+$lang['LUE-NOR']='Noorwegen';
+$lang['LUE-SUI']='Zwitserland';
+$lang['LUE-SWE']='Zweden';
 $lang['LueFill']='Maak zoek-gegevens';
+$lang['MailTitle']='Naam';
 $lang['MakeSnapshotError']='Momentopname niet bewaard';
 $lang['MakeSnapshotOk']='Momentopname bewaard';
 $lang['MakeTeams']='Bouw teams opnieuw op.';
@@ -416,6 +443,7 @@
 $lang['ManMatchArr4Phase']='Onderhoud aantal pijlen per set';
 $lang['ManPrices']='Onderhoud kosten';
 $lang['ManSession']='Onderhoud Schietbeurten';
+$lang['ManStaffOnField']='Onderhoud veldploeg';
 $lang['ManSubClasses']='onderhoud sub-klasses';
 $lang['ManTourDistances']='Afstanden binnen de wedstrijd';
 $lang['ManTraining']='onderhoud warming-up mogelijkheden';
@@ -430,6 +458,7 @@
 $lang['MedalClass']='Klasse & divisie resulaten - Medailles';
 $lang['MedalIndClass']='Klasse & divisie resulaten - Individuele medailles';
 $lang['MedalSqClass']='Klasse & divisie resulaten - Team medailles';
+$lang['MediaResp']='Verantwoordelijk voor de media';
 $lang['Missing Credentials']='Ontbrekende referenties';
 $lang['Missing Tournament']='ontbrekende wedstrijd';
 $lang['MixedTeamFinEvent']='Mixed Team finale';
@@ -462,7 +491,9 @@
 $lang['NoPay']='Vrij';
 $lang['NoRowSelected']='Geen rij geselecteerd';
 $lang['NoSession']='Geen sessie';
+$lang['NoStaffOnField']='Geen veld ploeg bekend';
 $lang['NotAllShootoffResolved']='De volgende gebeurtenissen zijn niet bewaard omdat niet de uitslagen van alle shoot-offs bekend zijn: $a';
+$lang['Notes']='Notities';
 $lang['NoTie']='Geen gelijke stand';
 $lang['NoTour']='Geen wedstrijd gekozen';
 $lang['NoTourExists']='Geen bestaande wedstrijd';
@@ -485,6 +516,7 @@
 $lang['OR-Record']='Olympisch record';
 $lang['OR-short']='OR';
 $lang['Order']='stand';
+$lang['OrgResponsible']='Organisatie';
 $lang['OtherTourCategory']='Ander';
 $lang['OutdoorTourCategory']='Outdoor wedstrijd';
 $lang['PaperSize']='Papier grootte';
@@ -497,6 +529,7 @@
 $lang['PersonList']='Lijst van mensen';
 $lang['PhaseBlock_0']='tournooi info en personen';
 $lang['PhaseBlock_1']='Kwalificatie';
+$lang['PhaseBlock_11']='Round Robin';
 $lang['PhaseBlock_2']='Eliminatie';
 $lang['PhaseBlock_3']='Individuele finale';
 $lang['PhaseBlock_4']='Team finale';
@@ -520,16 +553,19 @@
 $lang['Print']='Druk af';
 $lang['PrintCharset']='Karakter set (afdrukken)';
 $lang['PrintChinese']='inclusief chines karakters';
+$lang['PrintCyrillic']='inclusief cyrillische karakters';
 $lang['PrintLanguage']='Taal waarin wordt afgedrukt';
 $lang['PrintList']='Afdruk overzicht';
 $lang['PrintNormal']='Normaal (Latin)';
 $lang['PrintScore']='Afdrukken scores';
 $lang['PrintText']='Tekst van de header';
 $lang['PrintTextTitle']='Header voor afdrukken resultaat';
+$lang['R-Session']='Round Robin';
 $lang['RankByDistance']='Overzicht gesorteerd op afstand';
 $lang['RankFinals']='Einduitslag';
 $lang['RankingPosition']='Positie op de ranglijst';
 $lang['RankMatches']='wedstrijden voor de ranking';
+$lang['RealCountry']='Land';
 $lang['RecreatePictures']='Maak foto\'s';
 $lang['RedrawPictures']='Vernieuw foto\'s';
 $lang['Report']='Rapport';
@@ -544,6 +580,7 @@
 $lang['ResultIndAbsSnap']='Kwalificatie ronde samenvatting individueel';
 $lang['ResultIndClass']='klasse en divisie Resultaat - Individueel';
 $lang['ResultIndClassSnap']='Klasse en divisie resultaat samenvatting - individueel';
+$lang['ResultResp']='Verantwoordelijk voor het resultaat';
 $lang['Results']='Resultaten';
 $lang['ResultSqAbs']='Kwalificatie ronde - teams';
 $lang['ResultSqClass']='Klasse en divisie Resultaat -Team';
@@ -559,6 +596,8 @@
 $lang['ScheduledMatches']='Schema van wedstrijden';
 $lang['Score']='Score';
 $lang['Score1PageAllDist']='Atleet scorekaart met alle afstanden op 1 pagina';
+$lang['ScorecardLabelEnd']='Ronde';
+$lang['ScorecardLabelSet']='Set';
 $lang['ScoreComplete']='Compleet score overzicht (trekking en data)';
 $lang['ScoreCompleteTotals']='Compleet score overzicht (trekking en data) en een kolom voor competitie totalen';
 $lang['ScoreCutoff']='score afsluiten';
@@ -575,6 +614,7 @@
 $lang['SelectSession']='Kies sessie';
 $lang['Send2Ianseo']='verstuur data naar www.ianseo.net';
 $lang['SendData']='verstuur data';
+$lang['SendLogos']='Verstuur toernooi foto\'s';
 $lang['SeparateClasses']='verschillende klasses';
 $lang['SeparateDivisions']='verschillende divisies';
 $lang['SessionDescr']='Titel van de sessie';
@@ -595,6 +635,8 @@
 $lang['Sign/guide-board']='Teken';
 $lang['SingleArrow']='1 pijl';
 $lang['Snapshot']='momentopname';
+$lang['SOFirstTarget']='Eerste doel';
+$lang['StaffOnField']='Veld ploeg';
 $lang['StandardElabTeamMode']='standaard uitwerking teams';
 $lang['StandardEv']='Standaard resultaat overzicht';
 $lang['StartlistAlpha']='deelnemers in alfabetische volgorde';
@@ -608,6 +650,7 @@
 $lang['StatClasses']='statistieken (klasses en divisies)';
 $lang['StatCountries']='Statistieken (club / land)';
 $lang['StatEvents']='Statistieken (toekenningen en wedstrijden)';
+$lang['StatRecordsBroken']='Gebroken records';
 $lang['Status']='Status';
 $lang['StatusValidUntil']='Geldig tot en met';
 $lang['StickersBotMargin']='Ruimte aan de onderkant';
@@ -636,6 +679,7 @@
 $lang['SubClassRank']='Ranglijst op sub-klasse';
 $lang['SupportIanseo']='Ondersteun de ontwikkeling van ianseo. Ga naar www.ianse.net en druk op de "donate" knop :)';
 $lang['SVGFile']='SVG Bestand';
+$lang['T-Session']='Team matches';
 $lang['TakePicture']='Maak accreditatie foto';
 $lang['Tar4Session']='Doel per sessie';
 $lang['TargetAssErase']='Verwijder toegekend doel';
@@ -719,7 +763,11 @@
 $lang['TVContentUpload']='Multimedia bestand';
 $lang['TVContentUploadDescr']='Bestand om te uploaden';
 $lang['TVCss3Divider']='Verdeler';
+$lang['TVCss3Gold']='Goud';
 $lang['TVCss3Loser']='Wijziging verliezer';
+$lang['TVCss3Session']='Sessie';
+$lang['TVCss3Target']='Doel';
+$lang['TVCss3Title']='Titel';
 $lang['TVDefault']='Standaard';
 $lang['TVDefault-Scroll']='Toernooi: standaard karakters en kleuren<br>Multimedia scroll tijd.';
 $lang['TVDefaultScroll']='Standaard scroll tijd';
@@ -809,6 +857,7 @@
 $lang['Type_FITA+50']='Fita + 50 M ronde';
 $lang['Type_GiochiGioventu']='Jeugd wedstrijden (Italiaans)';
 $lang['Type_GiochiGioventuW']='Jeugd winterspelen (Italiaans)';
+$lang['Type_GiochiStudentes']='School wedstrijden (Italiaans)';
 $lang['Type_HF 12+12']='Jacht en Veld 12 + 12';
 $lang['Type_HF 24+24']='Jacht en Veld 24 + 24';
 $lang['Type_Indoor 18']='Indoor 18m';
@@ -817,6 +866,7 @@
 $lang['Type_ITA_Sperimental']='Competitie voor nieuwkomers (Italiaans)';
 $lang['Type_Las Vegas']='Indoor Las Vegas';
 $lang['type_NFAA_Indoor']='NFAA Indoor';
+$lang['Type_NL_25p1']='25 meter 1 pijl';
 $lang['Type_NL_Hout']='NK Hout';
 $lang['Type_NL_YouthFita']='JeugdFita';
 $lang['Type_NorField']='Veld (Noorwegen)';
@@ -826,7 +876,10 @@
 $lang['UpdateJPG']='maak ook de JPG-versie';
 $lang['UpdatePNG']='wijzig bebehorende PNG-bestand?';
 $lang['URL']='URL';
+$lang['UserPassword']='Wachtwoord';
+$lang['ValidClass']='Geldige klasses';
 $lang['ValidDivisions']='Toegestane Div. (leeg voor allemaal)';
+$lang['VersionEntries']='Aanmeldingen';
 $lang['VersionFile']='bestand';
 $lang['VersionMajVersion']='Grote versie';
 $lang['VersionMinVersion']='Kleine versie';
@@ -835,6 +888,7 @@
 $lang['VersionSector']='Sector';
 $lang['VersionSectors']='beinvloede sectoren';
 $lang['VersionTimestamp']='Laatste datum en tijd';
+$lang['ViewTeamComponents']='Bekijk team-onderdelen';
 $lang['ViewTeamComponentsDescr']='Bekijk de beschijving van de veschillende team-onderdelen';
 $lang['WarmUp']='Warming Up';
 $lang['WarmUpMins']='Warming Up (min)';
diff --git a/src/Common/Languages/nl/translators.json b/src/Common/Languages/nl/translators.json
index 5a956957..eec57ed7 100644
--- a/src/Common/Languages/nl/translators.json
+++ b/src/Common/Languages/nl/translators.json
@@ -1 +1 @@
-{"lang":"Nederlands - Dutch","peop":["Jose&nbsp;Bruntink","Gerrit&nbsp;Buitenhuis","&nbsp;"],"id":"nl"}
\ No newline at end of file
+{"lang":"Nederlands - Dutch","peop":["Jose&nbsp;Bruntink","Gerrit&nbsp;Buitenhuis","&nbsp;","Paul&nbsp;Van Veen"],"id":"nl"}
\ No newline at end of file
diff --git a/src/Common/Languages/no/IOC_Codes.php b/src/Common/Languages/no/IOC_Codes.php
index e93ba718..927d6968 100644
--- a/src/Common/Languages/no/IOC_Codes.php
+++ b/src/Common/Languages/no/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='Amerikanske Samoa';
 $lang['AUS']='Australia';
 $lang['AUT']='Østerrike';
-$lang['Award-Anthem']='Mine damer og herrer, nasjonalsangen for';
-$lang['Award-Anthem-TPE']='Mine damer og herrer, vennligst reis dere for nasjonalsangen til';
 $lang['Award-Applause']='Mine damer og herrer, gi en varm applaus til våre skyttere.';
 $lang['Award-Intro']='Mine damer og herrer medaljeseremoni for {$a}';
 $lang['Award-MedalGiver']='Medaljene vil bli delt ut av $a';
@@ -42,16 +40,12 @@
 $lang['BUL']='Bulgaria';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Den Sentralafrikanske republikk';
-$lang['CAM']='Kambodsja';
 $lang['CAN']='Canada';
 $lang['CAY']='Caymanøyene';
 $lang['CGO']='Kongo';
 $lang['CHA']='Tsjad';
 $lang['CHI']='Chile';
-$lang['CHN']='Kina';
-$lang['CIV']='Elfenbenskysten';
 $lang['CMR']='Kamerun';
-$lang['COD']='Den demokratiske republikken Kongo';
 $lang['COK']='Cookøyene';
 $lang['COL']='Colombia';
 $lang['COM']='Komorene';
@@ -60,7 +54,6 @@
 $lang['CRO']='Kroatia';
 $lang['CUB']='Cuba';
 $lang['CYP']='Kypros';
-$lang['CZE']='Tsjekkia';
 $lang['DEN']='Danmark';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -91,17 +84,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Ungarn';
 $lang['INA']='Indonesia';
 $lang['IND']='India';
-$lang['IRI']='Iran';
 $lang['IRL']='Irland';
 $lang['IRQ']='Irak';
 $lang['ISL']='Island';
 $lang['ISR']='Israel';
-$lang['ISV']='Amerikanske Jomfruøyene';
 $lang['ITA']='Italia';
 $lang['IVB']='Britiske Jomfruøyene';
 $lang['JAM']='Jamaica';
@@ -114,7 +104,6 @@
 $lang['KOR']='Republikken, Korea';
 $lang['KSA']='Saudi-Arabia';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
 $lang['LAT']='Latvia';
 $lang['LBA']='Libya';
 $lang['LBR']='Liberia';
@@ -128,7 +117,6 @@
 $lang['MAR']='Marokko';
 $lang['MAS']='Malaysia';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldova';
 $lang['MDV']='Maldivene';
 $lang['Medal-1']='Gullmedalje';
 $lang['Medal-2']='Sølvmedalje';
@@ -137,7 +125,6 @@
 $lang['MEX']='Mexico';
 $lang['MGL']='Mongolia';
 $lang['MHL']='Marshalløyene';
-$lang['MKD']='Nord-Makedonia';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -166,7 +153,6 @@
 $lang['PNG']='Papua Ny-Guinea';
 $lang['POL']='Polen';
 $lang['POR']='Portugal';
-$lang['PRK']='Nord-Korea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Romania';
@@ -193,13 +179,11 @@
 $lang['SVK']='Slovakia';
 $lang['SWE']='Sverige';
 $lang['SWZ']='Swaziland';
-$lang['SYR']='Syria';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailand';
 $lang['TJK']='Tadsjikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Øst-Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Kinesisk Taipei';
 $lang['TRI']='Trinidad og Tobago';
diff --git a/src/Common/Languages/no/Ianseo.php b/src/Common/Languages/no/Ianseo.php
index 0acc5fb8..b07a9e50 100644
--- a/src/Common/Languages/no/Ianseo.php
+++ b/src/Common/Languages/no/Ianseo.php
@@ -7,4 +7,7 @@
 $lang['Cert-Level4']='Master kurs';
 $lang['Cert-Level5']='Ianseo Crew';
 $lang['CertificateManagement']='Sertifikatadministrasjon';
+$lang['GenerateFile']='Opprett fil';
+$lang['ResetSessions']='Bekreft tilbakestilling';
+$lang['ShuffleResults']='Stokk om på resultatene';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/no/Install.php b/src/Common/Languages/no/Install.php
index 31650d03..5aab7ed6 100644
--- a/src/Common/Languages/no/Install.php
+++ b/src/Common/Languages/no/Install.php
@@ -80,7 +80,7 @@
 $lang['Parameter']='Parametre';
 $lang['Password']='Passord';
 $lang['PHP settings']='PHP-innstillinger';
-$lang['PHP too old']='Din PHP installasjon er for gammel. Minste versjonsnummeret for IANSEO er 5.0.';
+$lang['PHP too old']='Din PHP installasjon er for gammel. Minimums krav for IANSEO er PHP v8.0.';
 $lang['PHP version']='PHP versjon';
 $lang['php.ini file']='php.ini';
 $lang['Prepare']='Klargjøre data for oppdatering';
@@ -161,6 +161,7 @@
 $lang['Setup-PAR']='Paralympisk stevne (IPC regler)';
 $lang['Setup-SE']='Svenske stevner';
 $lang['Setup-Select']='Velg oppsett';
+$lang['Setup-SI']='Slovensk Stevne';
 $lang['Setup-UK']='Engelske (UK) stevner';
 $lang['Setup-US']='USA stevner';
 $lang['SetVegas-KOA']='Kings of Archery - NED';
@@ -181,7 +182,6 @@
 $lang['Value']='Verdi (indeksert matriseelementer: key1::value1|key2::value2)';
 $lang['WhatIanseoDoes01']='<b>World Archery regelverk:</b> Ianseo er alltid oppdatert i henhold til World Archery sine regler. Vi er tilgjengelig til å tilpasse programmet til å passe nasjonale stevner eller spesifikke regler også!';
 $lang['WhatIanseoDoes02']='<b>Hjelp og støtte:</b> Dersom du trenger hjelp, send en e-post til $a: så vil du få svar direkte fra de sentrale utviklerne av Ianseo!';
-$lang['WhatIanseoDoes03']='<b>Opplæring og kurs hos deg:</b> Vi er tilgjengelig for å holde kurs hos dere. Det er kurs på to nivåer: med eller uten håndholdte terminaler. Det første er rettet mot å lære alle aspekter av Ianseo fra konkurranseforberedelser og planlegge til publisering av resultater online og lokal distribusjon av resultater. Det andre er rettet mot å lære seg til å kjøre en "pil for pil" konkurranse.';
 $lang['WhatIanseoDoes04']='<b>Støtt oss!</b> Ianseo er gratis og laget med åpen kildekode... Dersom du liker programmet, da kan du hjelpe oss med å holde programvare og server oppdatert: klikk på knappen "Donate" på hjemmesiden vår $a!';
 $lang['WhatIanseoDoes05']='<b>Sosiale media:</b> Ianseo er også på $a!';
 $lang['WhatIanseoDoesTitle']='Hva kan Ianseo gjøre for din konkurranse?';
diff --git a/src/Common/Languages/no/Tournament.php b/src/Common/Languages/no/Tournament.php
index 9beb1acc..b833d5f8 100644
--- a/src/Common/Languages/no/Tournament.php
+++ b/src/Common/Languages/no/Tournament.php
@@ -124,7 +124,6 @@
 $lang['BadgeIncludePhoto']='Ta med bild på navneskilt';
 $lang['BadgeNames']='Fullt navn (Ikke skrevet ut først)';
 $lang['BadgeNoData']='Ingen data å skrive ut';
-$lang['BadgeOnlyNotPrinted']='BARE navneskilt ikke allerede skrevet ut?';
 $lang['BadgeOnlyPrintAccredited']='BARE navneskilt med akkrediterte deltakere?';
 $lang['BadgeOnlyPrintPhoto']='KUN navneskilt med bilde?';
 $lang['BadgeOptions']='Valg';
@@ -188,8 +187,6 @@
 $lang['CatJury']='Jury';
 $lang['CatOC']='Organisasjonskomite';
 $lang['ChairmanJudge']='Hoveddommer';
-$lang['ChairmanJudgeDeputy']='Dommernes nestleder';
-$lang['ChairmanJury']='Jury-leder';
 $lang['ChangeLookUpTable']='Bytt skyttertabell';
 $lang['ChangeNationsNames']='Endre navn på klubb';
 $lang['Channel']='Kanal';
@@ -318,7 +315,6 @@
 $lang['EmailScorecardLong']='Komplett scorekort';
 $lang['EmailsToSend']='E-poster å sende';
 $lang['EmailSuccessfull']='E-post er sendt til $a';
-$lang['EnableAccess']='Aktiver / deaktiver tilgangskontroll';
 $lang['EnableAddOns']='Aktiver/deaktiver tillegg';
 $lang['Ends']='Runder';
 $lang['EndTotal']='Totalt';
@@ -462,6 +458,7 @@
 $lang['IsSpecificConfig']='Stevnespesifikke elementer';
 $lang['Judge']='Dommer';
 $lang['Jury']='Jury';
+$lang['LancasterScorecard']='Lancaster Stil på Scorekort';
 $lang['Languages']='Språk';
 $lang['Last']='Siste';
 $lang['LastPhase']='Siste runde';
@@ -470,6 +467,7 @@
 $lang['LegendSO']='Forkortelser';
 $lang['LegendStatus']='Tegnforklaring - Deltagelse ved stevnet';
 $lang['Length']='Varighet';
+$lang['LineJudge']='Linje dommer';
 $lang['ListCountries']='Liste over klubber';
 $lang['ListLoad']='Legg til skyttere fra liste';
 $lang['ListLoadBlocked']='Linjer ikke oppdatert (klikk på lenken for en tvunget oppdatering)';
@@ -488,6 +486,7 @@
 $lang['LocRuleModifiedNo']='Endret';
 $lang['LocRuleValidNo']='Ikke endret';
 $lang['LogisticResp']='Logistikkansvarlig';
+$lang['LogMessage']='Logg Melding';
 $lang['LogoB']='Nederste bilde ((fullt breddeforhold er 19: 1 for A4, 20: 1 for letter)';
 $lang['LogoL']='Topp-venstre bilde';
 $lang['LogoManagement']='Logo';
@@ -507,6 +506,8 @@
 $lang['LueFill']='Opprett skytterdatabase';
 $lang['MailBody']='E-post';
 $lang['MailBodyShortcuts']='Disse snarveiene kan brukes:';
+$lang['MailConfirmSending']='Denne E-posten vil bli sendt til _NUM_ adresse(r). Er du sikker?';
+$lang['MailExtras']='Tillegg som dagspass, bue oppbevaring, etc.';
 $lang['MailFrom']='Avsender';
 $lang['MailPreview']='Forhåndsvisning';
 $lang['MailSmtpPort']='SMTP-Port';
@@ -982,7 +983,6 @@
 $lang['TeamCreationMode_2']='Alltid 2. lag';
 $lang['TeamCreationMode_3']='Alltid 3. lag';
 $lang['TeamFin']='Lag - Elim. & finalerunder';
-$lang['TeamFinEvent']='Lagfinale';
 $lang['TeamLoaded']='Lagmatcher lastet i tidsplanen for {$a}';
 $lang['TeamPlace']='Stedsskilt lag';
 $lang['TeamPlaceLocal']='Stedsskilt (lokalisert) lag';
@@ -1229,7 +1229,6 @@
 $lang['UserDetails']='Brukerdetaljer';
 $lang['UserEnabled']='Aktivert';
 $lang['UserName']='Brukernavn';
-$lang['UserPassword']='Passord';
 $lang['UseSubClasses']='Bruk på spesifikke underklasser';
 $lang['ValidClass']='Gyldig klasser';
 $lang['ValidDivisions']='Tillatte Div. (tom for alle)';
diff --git a/src/Common/Languages/no/translators.json b/src/Common/Languages/no/translators.json
index 35ae0cb4..4236828b 100644
--- a/src/Common/Languages/no/translators.json
+++ b/src/Common/Languages/no/translators.json
@@ -1 +1 @@
-{"lang":"Norsk - Norwegian","peop":["Roar&nbsp;Jystad","Jon-Arne&nbsp;Storelv"],"id":"no"}
\ No newline at end of file
+{"lang":"Norsk - Norwegian","peop":["Roar&nbsp;Jystad","Bj\u00f8rn-Cato&nbsp;Knutsen","Jon-Arne&nbsp;Storelv"],"id":"no"}
\ No newline at end of file
diff --git a/src/Common/Languages/pl/Common.php b/src/Common/Languages/pl/Common.php
index 9ac4c219..362e2a85 100644
--- a/src/Common/Languages/pl/Common.php
+++ b/src/Common/Languages/pl/Common.php
@@ -250,6 +250,7 @@
 $lang['MenuLM_DeleteTarget']='Usuń przypisanie stanowisk';
 $lang['MenuLM_Distances']='Ustawienia odległości';
 $lang['MenuLM_Div/Class Result List']='Wyniki w kategoriach';
+$lang['MenuLM_Divisions and Classes']='Konkurencje i Kategorie';
 $lang['MenuLM_Draw']='Wylosuj';
 $lang['MenuLM_Edit Competition Info']='Edytuj informacje o zawodach';
 $lang['MenuLM_EditFinalReport']='Edytuj końcowy protokół';
diff --git a/src/Common/Languages/pl/IOC_Codes.php b/src/Common/Languages/pl/IOC_Codes.php
index 8b19ee21..6f76bd8d 100644
--- a/src/Common/Languages/pl/IOC_Codes.php
+++ b/src/Common/Languages/pl/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='Samoa Amerykańskie';
 $lang['AUS']='Australia';
 $lang['AUT']='Austria';
-$lang['Award-Anthem']='Panie i panowie, proszę wstać do odsłuchania hymnu narodowego';
-$lang['Award-Anthem-TPE']='Panie i panowie, proszę wstać do hymnu narodowego';
 $lang['Award-Applause']='Panie i panowie, proszę o gorące brawa dla naszych sportowców';
 $lang['Award-Intro']='Panie i panowie, ceremonia wręczenia medali dla {$a}';
 $lang['Award-MedalGiver']='Medale będą wręczone przez $a';
@@ -42,16 +40,12 @@
 $lang['BUL']='Bułgaria';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Republika Centralnej Afryki';
-$lang['CAM']='Kambodża';
 $lang['CAN']='Kanada';
 $lang['CAY']='Kajmany';
 $lang['CGO']='Republika Kongo';
 $lang['CHA']='Czad';
 $lang['CHI']='Czile';
-$lang['CHN']='Chiny';
-$lang['CIV']='Wybrzeże Kości Słoniowej';
 $lang['CMR']='Kamerun';
-$lang['COD']='Demokratyczna Republika Kongo';
 $lang['COK']='Wyspy Cooka';
 $lang['COL']='Kolumbia';
 $lang['COM']='Komory';
@@ -60,7 +54,6 @@
 $lang['CRO']='Chorwacja';
 $lang['CUB']='Kuba';
 $lang['CYP']='Cypr';
-$lang['CZE']='Czechy';
 $lang['DEN']='Dania';
 $lang['DJI']='Dżibuti';
 $lang['DMA']='Dominika';
@@ -91,17 +84,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Gujana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Węgry';
 $lang['INA']='Indonezja';
 $lang['IND']='Indie';
-$lang['IRI']='Iran';
 $lang['IRL']='Irlandia';
 $lang['IRQ']='Irak';
 $lang['ISL']='Islandia';
 $lang['ISR']='Izrael';
-$lang['ISV']='Wyspy Dziewicze Stanów Zjednoczonych';
 $lang['ITA']='Włochy';
 $lang['IVB']='Brytyjskie Wyspy Dziewicze';
 $lang['JAM']='Jamajka';
@@ -114,7 +104,6 @@
 $lang['KOR']='Korea Południowa';
 $lang['KSA']='Arabia Saudyjska';
 $lang['KUW']='Kuwejt';
-$lang['LAO']='Laso';
 $lang['LAT']='Łotwa';
 $lang['LBA']='Libia';
 $lang['LBR']='Liberia';
@@ -128,7 +117,6 @@
 $lang['MAR']='Maroko';
 $lang['MAS']='Malezja';
 $lang['MAW']='Malawi';
-$lang['MDA']='Mołdawia';
 $lang['MDV']='Malediwy';
 $lang['Medal-1']='Złoty Medal';
 $lang['Medal-2']='Srebrny Medal';
@@ -165,7 +153,6 @@
 $lang['PNG']='Papua Nowa Gwinea';
 $lang['POL']='Polska';
 $lang['POR']='Portugalia';
-$lang['PRK']='Korea Północna';
 $lang['PUR']='Portoryko';
 $lang['QAT']='Katar';
 $lang['ROU']='Rumunia';
@@ -190,13 +177,11 @@
 $lang['SUR']='Surinam';
 $lang['SVK']='Słowacja';
 $lang['SWE']='Szwecja';
-$lang['SYR']='Syria';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Tajlandia';
 $lang['TJK']='Tadżykistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Timor Wschodni';
 $lang['TOG']='Togo';
 $lang['TPE']='Chińskie Tajpej';
 $lang['TRI']='Trinidad i Tobago';
diff --git a/src/Common/Languages/pl/Install.php b/src/Common/Languages/pl/Install.php
index 45604c85..e4d8827c 100644
--- a/src/Common/Languages/pl/Install.php
+++ b/src/Common/Languages/pl/Install.php
@@ -56,7 +56,6 @@
 $lang['Parameter']='Parametr';
 $lang['Password']='Hasło';
 $lang['PHP settings']='Ustawienia PHP';
-$lang['PHP too old']='Twoja wersja PHP jest za stara. Minimalna instalacja dla IANSEO to 5.o';
 $lang['PHP version']='Wesja PHP';
 $lang['php.ini file']='plik php.ini';
 $lang['Prepare']='Przygotowanie danych do aktualizacji';
diff --git a/src/Common/Languages/pl/RunArchery.php b/src/Common/Languages/pl/RunArchery.php
index 0729ba2c..871e8cd9 100644
--- a/src/Common/Languages/pl/RunArchery.php
+++ b/src/Common/Languages/pl/RunArchery.php
@@ -1,3 +1,8 @@
 <?php
+$lang['AdjustedTime']='Korekta czasu';
+$lang['FinalTime']='Czas końcowy';
+$lang['PenaltyTime']='Czas kary';
+$lang['PhaseName-0']='Kwalifikacje';
 $lang['PhaseName-2']='Półfinał';
+$lang['RunningTime']='Czas biegu';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/pl/Tournament.php b/src/Common/Languages/pl/Tournament.php
index 69cf3ff0..a0d47cf0 100644
--- a/src/Common/Languages/pl/Tournament.php
+++ b/src/Common/Languages/pl/Tournament.php
@@ -62,10 +62,13 @@
 $lang['Area_6']='Strefa VIP';
 $lang['Area_7']='Strefy $a';
 $lang['Arr4Set']='Ilość strzał w secie';
+$lang['ArrowPhaseLegend1']='Ilość strzał w serii w rundzie eliminacyjnej';
+$lang['ArrowPhaseLegend2']='Ilość strzał w serii w rundzie finałowej';
 $lang['Arrows']='Strzały';
 $lang['Arrows4End']='Strzał/ Serię: $a';
 $lang['ArrowsPerEnd']='Strzał/ Serię';
 $lang['AssignAwarded']='Przyznaj nagrody';
+$lang['AssignLookupTable']='Ustaw wszystkie zgłoszenia na: {$a}';
 $lang['AtDistance']='Ranking na odległości:';
 $lang['Ath4Target']='Zawodników na Stanowisku';
 $lang['AthButtLegend1']='Ilość zawodników na stanowisku';
@@ -104,7 +107,7 @@
 $lang['BadgeIncludePhoto']='Dołączyć zdjęcie do plakietki?';
 $lang['BadgeNames']='Pełne imię i nazwisko';
 $lang['BadgeNoData']='Brak danych do wydruku';
-$lang['BadgeOnlyNotPrinted']='TYLKO plakietki jeszcze nie wydrukowane?';
+$lang['BadgeOnlyNotPrinted']='TYLKO plakietki jeszcze NIE wydrukowane';
 $lang['BadgeOnlyPrintAccredited']='TYLKO plakietki zaakredytowanych uczestników?';
 $lang['BadgeOnlyPrintPhoto']='TYLKO plakietki ze zdjęciem?';
 $lang['BadgeOptions']='Opcje';
@@ -167,7 +170,7 @@
 $lang['CatOC']='Komitet Organizacyjny';
 $lang['ChairmanJudge']='Sędzia Główny';
 $lang['ChairmanJudgeDeputy']='Zastępca Sędziego Głównego';
-$lang['ChairmanJury']='Przewodniczący Jury of Appeal';
+$lang['ChairmanJury']='Przewodniczący komisji apelacyjnej';
 $lang['ChangeNationsNames']='Zmień nazwy krajów';
 $lang['Channel']='Kanał';
 $lang['CheckRefMail']='Sprawdź e-mail odnośnika';
@@ -179,6 +182,7 @@
 $lang['ClickToRequestCode']='Kliknij aby zarządać Kod';
 $lang['Close2Center']='Najbliżej środka tarczy';
 $lang['ClosestShort']='Bliżej środka tarczy';
+$lang['Club-Nation']='Klub';
 $lang['CmdAdd']='Dodaj';
 $lang['CmdCloseBill']='Zamknij rachunek';
 $lang['CmdDelete']='Usuń';
@@ -206,6 +210,7 @@
 $lang['Collation']='Zestawienie';
 $lang['Color']='Kolor';
 $lang['ComparedTo']='Porównaj w/pos. @ strzał (-1: ostania dostępna)';
+$lang['CompetitionOfficials']='Obsługa zawodów';
 $lang['CompleteSchedule']='Pełny harmonogram';
 $lang['Confirm']='Potwierdź';
 $lang['ConfirmDescr']='TO DZIAŁANIE ZNISZCZY WSZYSTKIE USTAWIENIA I NIE MOŻE ZOSTAĆ COFNIĘTE!';
@@ -234,12 +239,14 @@
 $lang['DefaultLocRule']='FITA';
 $lang['DefaultVI']='Domyślny VI';
 $lang['Delayed']='Opóźniony (-1 aby zresetować)';
+$lang['DeletePreviousArchers']='Usuń zawodników nie będących na wprowadzanej liście';
 $lang['DeletePreviousTeams']='Usuń poprzednie drużyny';
 $lang['DeleteTourConfirm']='Wpisz do pola tekstowe następujący kod kontrolny:';
 $lang['DeleteTournament']='Usuń zawody';
 $lang['Deleting']='Praca w toku: kasowanie plików on-line';
 $lang['Descr']='Opis';
 $lang['DestroyTarget']='Zniszcz stanowisko/ cel';
+$lang['Details']='Szczegóły $a';
 $lang['Distance']='Odległość';
 $lang['Distances']='Odległości';
 $lang['DistanceShort']='Odl.';
@@ -252,7 +259,9 @@
 $lang['DOB']='Data urodzenia';
 $lang['Document']='Dokument';
 $lang['Dos']='Kierownik Strzelań';
+$lang['DosAssistant']='Asystent Kierownika Strzelań';
 $lang['DoubleSpace']='Kusza';
+$lang['DQB']='Zdyskwalifikowany za niesportowe zachowanie';
 $lang['DrawField3D']='Losowanie Field/ 3D';
 $lang['DrawNormal']='Standardowe losowanie';
 $lang['DrawOris']='Losowanie Oris';
@@ -368,6 +377,7 @@
 $lang['IdCard']='Karta ID';
 $lang['Image']='Obraz';
 $lang['ImageChecked']='Obrazek sprawdzony';
+$lang['ImgInfo']='Dozwolony rodzaj obrazka: PNG i JPG - max. rozmiar 256KB';
 $lang['ImportARFFile']='Importuj plik ARF';
 $lang['ImportedEntries']='Wpisy zaimportowane';
 $lang['ImportedTour']='Zawody zaimportowano';
@@ -384,6 +394,12 @@
 $lang['InnerTens']='Wewnętrzna 10 (X)';
 $lang['Invalid Password']='Niepoprawne hasło';
 $lang['IOCcode']='Kod kraju MKOL';
+$lang['IRM-10']='DNS - nie wystartował';
+$lang['IRM-15']='DSQ - zdyskwalifikowany';
+$lang['IRM-20']='DQB - zdyskwalifikowany za niesportowe zachowanie';
+$lang['IRM-5']='DNF - nie ukończył';
+$lang['IRM-7']='DNF - nie ukończył (bez miejsca końcowego)';
+$lang['IrmStatus']='Status IRM';
 $lang['IsDbVersionTooOld']='Baza danych InfoSystem jest starsza niż Ianseo';
 $lang['IsGenericConfig']='Konfiguracja ogólna';
 $lang['IsParamWarning']='Ustawienia InfoSystem!<br/>Zachować NAJWYŻSZĄ ostrożność!';
@@ -397,6 +413,7 @@
 $lang['LegendSO']='Rzut Monetą, Baraż - Skróty';
 $lang['LegendStatus']='Oznaczenia Statusu Zawodników - Uczestnictwo';
 $lang['Length']='Długość';
+$lang['LineJudge']='Sędzia liniowy';
 $lang['ListCountries']='Lista krajów/klubów';
 $lang['ListLoad']='Wczytaj Zawodników z Listy';
 $lang['ListLoadBlocked']='Wiersze niezaktualizowane (kliknij na link by wymusić aktualizację)';
@@ -445,6 +462,7 @@
 $lang['ManTraining']='Zarządzanie Sesjami Rozgrzewkowymi';
 $lang['ManualTargetAssignment']='Ręczne Rozstawienie';
 $lang['Match']='Pojedynek';
+$lang['Match4Target']='Ilość pojedynków na stanowisku';
 $lang['MatchDateTime']='Data/ godzina pojedynku';
 $lang['MatchesSchedule']='Harmonogram pojedynków';
 $lang['MatchMins']='Długość pojedynku (min.)';
@@ -462,10 +480,12 @@
 $lang['MatchPoints']='Punkty pojedynku';
 $lang['MatchScore']='Punkty pojedynku';
 $lang['MatchScoreSheets']='Tabela punktów pojedynku';
+$lang['MatchSecFinals']='Pojedynek $a';
 $lang['MatchTargets']='Stanowiska pojedynku';
 $lang['MaxDistScore']='Maks. ilość punktów na odległości';
 $lang['MaxFinIndScore']='Maks. ilość punktów indywidualnych';
 $lang['MaxFinTeamScore']='Maks. ilość punktów drużynowych';
+$lang['MaxTeamPersons']='Maksymalna ilość zawodników w zespole';
 $lang['Meals']='Posiłki';
 $lang['MedalClass']='Wyniki w kategorii i konkurencji- medale';
 $lang['MedalIndClass']='Wyniki w kategorii i konkurencji- medale indywidualne';
@@ -473,6 +493,7 @@
 $lang['Missing Credentials']='Brakujące referencje';
 $lang['Missing Tournament']='Brakujące Zawody';
 $lang['MissingAgileConfig']='Brakująca konfiguracji Agile';
+$lang['MissingPhoto']='Brakujące zdjęcie';
 $lang['MissingScorecards']='Brakujące metryczki z $a sesji, $a odległości';
 $lang['MixedTeamFinEvent']='Finały Mixtów';
 $lang['MoveWinner2NextPhase']='Przenieś Zwycięzcę do kolejnej fazy';
@@ -493,6 +514,7 @@
 $lang['NationShort']='Nazwa klubu';
 $lang['New']='Nowy';
 $lang['NewMediaContent']='Dodaj zawartość multimedialną';
+$lang['NewSORequired']='Wymagany nowy baraż';
 $lang['NewTour']='Nowe Zawody';
 $lang['NewTourContent']='Dodaj zawartość Zawodów';
 $lang['NextSchedule']='Harmonogram rozpoczynający się od dnia YYYY-mm-dd (albo d0, d1 etc)';
@@ -520,6 +542,7 @@
 $lang['NumberOfEntriesByEvent']='Liczba zgłoszeń wg wydarzenia';
 $lang['NumResult']='Ilość miejsc (0: wszystkie)';
 $lang['NumSession']='Liczba sesji';
+$lang['NumTieAtPosition']='{$a[0]} zawodników z takim samym wynikiem na miejscu {$a[1]}';
 $lang['Officials']='Oficjele';
 $lang['OnlineId']='On-line ID';
 $lang['OnlyToday']='Pokaż tylko dzisiejsze pojedynki';
@@ -590,6 +613,7 @@
 $lang['PrintCheques']='Wydruk czeków';
 $lang['PrintChinese']='Uwzględnij chińskie znaki';
 $lang['PrintCommentTip']='Wstaw «||X» <i>[(pipe)(pipe)(Number of Arrows)]</i> aby wydrukować  "NIEOFICJALNIE po X strzał" we wszystkich wydrukach rankingów oraz eliminacji<br/> Wstaw «||!X» <i>[(pipe)(pipe)(exclamation point)(Number of Arrows)]</i> to print "OFICJALNIE po X strzał" we wszystkich wydrukach rankingów oraz eliminacji';
+$lang['PrintCyrillic']='Uwzględnij cyrylicę (<b>w tym polskie znaki!</b>)';
 $lang['PrintFOP']='Ustawienie Torów';
 $lang['PrintLabels']='Drukuj etykiety';
 $lang['PrintLanguage']='Język wydruku';
@@ -597,6 +621,8 @@
 $lang['PrintNames']='Drukuj nazwiska';
 $lang['PrintNormal']='Normalny (Latin)';
 $lang['PrintScore']='Drukuj metryczki';
+$lang['PrintScoreInd']='Wydrukuj metryczki indywidualne';
+$lang['PrintScoreTeam']='Wydrukuj metryczki zespołowe';
 $lang['PrintText']='Tekst nagłówka';
 $lang['PrintTextTitle']='Nagłówek w wydrukach wyników';
 $lang['Q-Session']='Runda Kwalifikacyjna';
@@ -819,7 +845,6 @@
 $lang['TeamCreationMode_2']='Zawsze 2. drużyna';
 $lang['TeamCreationMode_3']='Zawsze 3. drużyna';
 $lang['TeamFin']='Eliminacje i Finały Drużynowe';
-$lang['TeamFinEvent']='Finał drużynowy';
 $lang['TeamLoaded']='Załadowano poj. drużynowe dla harmonogramu {$a}';
 $lang['TeamPlace']='Znak umiejscowienia drużyny';
 $lang['TeamPlaceLocal']='Znak umiejscowienia drużyny (jęz. lokalny)';
diff --git a/src/Common/Languages/pt-br/Api.php b/src/Common/Languages/pt-br/Api.php
index 14851f02..3a1d1454 100644
--- a/src/Common/Languages/pt-br/Api.php
+++ b/src/Common/Languages/pt-br/Api.php
@@ -31,8 +31,10 @@
 $lang['DevConnected']='Conectado';
 $lang['DevDisconnected']='Desconectado';
 $lang['DistanceNum']='distância $a';
+$lang['FieldMonitor']='Monitor de Campo';
 $lang['FlashCodeDistance']='Escaneie este código no app para marcar $a';
 $lang['HitToWin']='Pontuar para vencer';
+$lang['ImportDoneQualRecheck']='Resultados do Qualificatório importados com sucesso. Por favor, verifique cuidadosamente o cálculo do Ranking o mais rápido possível.';
 $lang['ISK-Anomalies']='Anomalias';
 $lang['ISK-AppInfo']='Info do APP';
 $lang['ISK-AppList']='Lista de APKs';
@@ -80,6 +82,7 @@
 $lang['ISK-lockPortrait']='Trava visão de retrato no dispositivo';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
 $lang['ISK-Ng-Name']='Ianseo Scorekeeper NG';
+$lang['ISK-NG-QRCode']='Imprimir Código QR para o Ianseo Scorekeeper NG';
 $lang['ISK-NgLive-Name']='Ianseo Scorekeeper NG - recursos do LIVE';
 $lang['ISK-NgPro-Name']='Ianseo Scorekeeper NG - recursos do PRO';
 $lang['ISK-NoCompCode']='Falta Código de Competição';
@@ -100,6 +103,7 @@
 $lang['ISK-ServerUrl']='URL do Servidor (incluindo protocolo e porta caso não seja 80)';
 $lang['ISK-ServerUrlPin']='Pin de segurança';
 $lang['ISK-SetQRData']='Configurar dispositivos usando QRCode';
+$lang['ISK-SettingsPIN']='PIN de configuração';
 $lang['ISK-SETUP-11']='ISK-NG Lite - Configuração';
 $lang['ISK-SETUP-12']='ISK-NG Pro - Configuração';
 $lang['ISK-SETUP-13']='ISK-NG Live - Configuração';
@@ -129,6 +133,7 @@
 $lang['ISK-WifiTargetRange']='WiFi preferencial para alvos';
 $lang['ISK-WifiUse']='Wifi habilitado pela aplicação';
 $lang['IskDeviceAssigned']='Dispositivo(s)';
+$lang['IskResetAlert']='AVISO: Todas as seleções desta configuração serão removidas, exceto os agrupamentos de dispositivos.';
 $lang['IskScoringDevice']='Dispositivo $a não está autorizado a marcar nesta sessão ou competição!';
 $lang['IskSpuriousDevice']='Dispositivo $a[0] enviando pontos indesejados no alvo $a[1]';
 $lang['IskSpuriousScore-Device']='Dispositivo $a[0] enviando pontos no alvo $a[1] na fase $a[2]';
@@ -149,6 +154,7 @@
 $lang['NewGroup']='Designar Novo Grupo';
 $lang['NewTarget']='Designar Novo Alvo';
 $lang['PartialImport']='Importar Parciais Automaticamente';
+$lang['PartialImportAll']='Importar TUDO';
 $lang['PopupStatusDistance']='Distância: $a';
 $lang['PopupStatusEnd']='Série: $a';
 $lang['PopupStatusEvent']='Evento: $a';
@@ -170,7 +176,15 @@
 $lang['ScorecardsEmpty']='Planilhas vazias';
 $lang['ScorecardsFull']='Planilhas com valores de flechas';
 $lang['ScorerNum']='Anotador';
+$lang['ScoringCount']='Marcação #';
+$lang['SelectedDevicesAction']='Ação nos Dispositivos Selecionados';
+$lang['SelectedMove2Group']='Mover dispositivos para o Grupo';
+$lang['SelectedReNumber']='Renumerar dispositivos iniciando por';
+$lang['StatusTemporaryArrows']='Situação das flechas na tabela temporária';
 $lang['StickyAlreadySet']='Séries para marcação estão determinadas em uma Sessão diferente!';
+$lang['TempArrowsDelete']='APAGAR flechas da tabela temporária';
+$lang['TempArrowsImport']='IMPORTAR flechas da tabela temporária';
+$lang['TempArrowsQ']='Flechas não importadas em rounds Qualificatórios ou Eliminatórios';
 $lang['UnlockAll']='Desbloquear todas as sessões';
 $lang['UsePersonalDevices-Granted']='Pessoal';
 $lang['ViewSize']='Tamanho';
diff --git a/src/Common/Languages/pt-br/BackNumbers.php b/src/Common/Languages/pt-br/BackNumbers.php
index 596f78f3..61fee394 100644
--- a/src/Common/Languages/pt-br/BackNumbers.php
+++ b/src/Common/Languages/pt-br/BackNumbers.php
@@ -108,6 +108,7 @@
 $lang['GivCaps-FamCaps-ClubCaps']='NOME SOBRENOME, PAÍS';
 $lang['GivenNameInitial']='Inicial do nome';
 $lang['Heigh']='Altura';
+$lang['HLayout']='Horizontal';
 $lang['HLine']='Linha Horizontal';
 $lang['I-Badge']='Número de Atleta - Partidas Individuais';
 $lang['IdCardHor']='Quantidade de cartões na largura';
@@ -128,6 +129,7 @@
 $lang['Italic']='Itálico';
 $lang['Landscape']='Paisagem';
 $lang['MultiLine']='Várias Linhas';
+$lang['NameTag']='Etiqueta de Nome';
 $lang['NewBadgeName']='Nome da nova credencial';
 $lang['NocCaps']='Código do Clube';
 $lang['NocCaps-ClubCamel']='CÓDIGODOCLUBE NomeDoClube';
@@ -135,14 +137,18 @@
 $lang['Offest2nd']='Deslocamento do segundo Número de Atleta (se necessário)';
 $lang['OneLine']='Uma Linha';
 $lang['OnlyAthletes']='Somente atletas';
+$lang['OpenPictureScreen']='Abrir tela secundária';
 $lang['PageDimension']='Tamanho da Página';
 $lang['PaperDimention']='Dimensão do Papel';
+$lang['PhaseFrom']='Da fase';
+$lang['PhaseTo']='Para a fase';
 $lang['Picture']='Foto do Atleta';
 $lang['Portrait']='Retrato';
 $lang['PosX']='Posição (X)';
 $lang['PosY']='Posição (Y)';
 $lang['PrintBackNo']='Imprimir Back Numbers';
 $lang['PrintSpecificBadges']='Imprimir utilizando identificação automática das credenciais';
+$lang['PrintSyncResult']='$a Backnumbers foram marcados como impressos!';
 $lang['Q-Badge']='Número de Atleta do Qualificatório';
 $lang['QRScore']='Pontuação do Round Qualificatório';
 $lang['QualPosition']='Posição no qualificatório';
@@ -168,6 +174,7 @@
 $lang['ToRight']='Logo da Competicão (direita)';
 $lang['TVViewIdCard']='Visualizar Cartões de Identificação';
 $lang['TVViewIdCardDescr']='Na visualização de partida, desenhar 2 cartões de identificação dos oponentes ao invés das linhas "padrão"';
+$lang['VLayout']='Vertical';
 $lang['Width']='Largura';
 $lang['WRank']='Ranking Mundial';
 $lang['WRankFields']='Não mostrar após posição no WR';
diff --git a/src/Common/Languages/pt-br/Boinx.php b/src/Common/Languages/pt-br/Boinx.php
index 09f7d58a..85b52721 100644
--- a/src/Common/Languages/pt-br/Boinx.php
+++ b/src/Common/Languages/pt-br/Boinx.php
@@ -5,6 +5,9 @@
 $lang['CssLeftPresentation']='Painel de Apresentação - Esquerdo';
 $lang['CssPresentation']='Painel de Apresentação - Comum';
 $lang['CssRightPresentation']='Painel de Apresentação - Direito';
+$lang['CssSoPointsCommon']='Pontos';
+$lang['CssVegasInOutPoints']='Pontos';
+$lang['CssVegasSOPoints']='Pontos';
 $lang['CssVegasSOTarget']='Alvo';
 $lang['CssWindSpeed']='Painel de Velocidade do Vento';
 $lang['DirNotWriteable']='O Diretório está protegido contra escrita';
diff --git a/src/Common/Languages/pt-br/Common.php b/src/Common/Languages/pt-br/Common.php
index 56351172..49ae011c 100644
--- a/src/Common/Languages/pt-br/Common.php
+++ b/src/Common/Languages/pt-br/Common.php
@@ -69,12 +69,16 @@
 $lang['CmdOk']='OK';
 $lang['CmdOn']='Ligar';
 $lang['CmdPostUpdate']='post-update';
+$lang['CmdRefresh']='Recarregar';
 $lang['CmdSave']='Salvar';
 $lang['CmdSaveContinue']='Salva e Continua';
 $lang['CmdSet2All']='Selecionar todos';
 $lang['CmdSync']='Sincronizar';
 $lang['CmdUpdate']='Atualizar';
 $lang['CO']='Composto';
+$lang['CombiCompRank_Export']='Exportar Ranking Combinado';
+$lang['CombiCompRank_Print']='Impressão do Ranking Combinado';
+$lang['CombiCompRank_Setup']='Configuração do Ranking Combinado';
 $lang['CommaSeparatedValues']='CSV - Valores Separados por Vírgula';
 $lang['CompleteCountryName']='Nome completo do País/Clubes';
 $lang['CompleteResultBook']='Livro Completo de Resultados';
@@ -131,6 +135,10 @@
 $lang['Finish']='Terminar';
 $lang['FirstPhase']='Primeira Fase';
 $lang['FopSetup']='Layout do campo de competição';
+$lang['Gender0']='Masculino';
+$lang['Gender1']='Feminino';
+$lang['GenderShort0']='M';
+$lang['GenderShort1']='F';
 $lang['GF']='Infantil Feminino';
 $lang['GM']='Infantil Masculino';
 $lang['HELP']='Ajuda!';
@@ -197,6 +205,7 @@
 $lang['MenuLMRemoveNoShows']='Remover No-Shows';
 $lang['MenuLM_Accreditation']='Credenciamento';
 $lang['MenuLM_Accreditation colors management']='Gerenciamento de cores do credenciamento';
+$lang['MenuLM_AdvancedFeatures']='Avançado';
 $lang['MenuLM_AdvLabels']='Etiquetas - Impressão avançada';
 $lang['MenuLM_Archers on Targets']='Atletas nos Alvos';
 $lang['MenuLM_Arr4Set']='Flechas por Set/Série';
@@ -210,6 +219,7 @@
 $lang['MenuLM_Athlets fees status']='Status de pagamento dos atletas';
 $lang['MenuLM_Authentication']='Autenticação de Usuários';
 $lang['MenuLM_AutoCheckinSetup']='Configuração de Auto Check-In';
+$lang['MenuLM_Automator']='Automação';
 $lang['MenuLM_Back Number Printout']='Impressão dos Back Numbers';
 $lang['MenuLM_Boinx']='Gerenciamento de camadas do Boinx';
 $lang['MenuLM_BoinxMeteo']='Camada de dados do Boinx';
@@ -220,11 +230,13 @@
 $lang['MenuLM_Category Result List']='Resultados por Categoria';
 $lang['MenuLM_Change Components']='Alterar Componentes';
 $lang['MenuLM_ChangeNationsNames']='Alterar os nomes dos Países/Clubes';
+$lang['MenuLM_ChangePassword']='Trocar Senha';
 $lang['MenuLM_Check Data Update']='Checar atualização de dados';
 $lang['MenuLM_Check shoot-off before eliminations']='Checar se há shoot-off antes das eliminatórias';
 $lang['MenuLM_Check shoot-off before final phases']='Checar se há shoot-off antes da realização das partidas';
 $lang['MenuLM_CheckAwards']='Checar tradução de Premiação';
 $lang['MenuLM_CheckList']='Imprimir check-list';
+$lang['MenuLM_CIS']='CIS';
 $lang['MenuLM_CleanDir']='Limpar pasta de temporários';
 $lang['MenuLM_Close']='Fechar';
 $lang['MenuLM_ClubChampEvent']='Campeonato Nacional de Clubes';
@@ -273,6 +285,7 @@
 $lang['MenuLM_FinalFOPChoose']='FOP Final - Extendido';
 $lang['MenuLM_FlightsAwardManagement']='Gestão de premiação dos Flights';
 $lang['MenuLM_FlightsManagement']='Gestão dos Flights';
+$lang['MenuLM_FontManagement']='Gestão de Fontes';
 $lang['MenuLM_GateControl']='Painel de controle de Acesso (Portão)';
 $lang['MenuLM_GateSituation']='Situação do Acesso (Portão)';
 $lang['MenuLM_Get Info']='Consultar Dispositivo';
@@ -370,6 +383,7 @@
 $lang['MenuLM_Standard Table']='Tabela Padrão (total por distância)';
 $lang['MenuLM_Statistics']='Estatísticas';
 $lang['MenuLM_SubClasses']='SubClasses';
+$lang['MenuLM_Swaps']='Inverter oponenter';
 $lang['MenuLM_Synchronize']='Sincronizar InfoSystem';
 $lang['MenuLM_Target']='Alvo';
 $lang['MenuLM_Target Assignment']='Atribuição de Alvos';
@@ -415,6 +429,7 @@
 $lang['MsgImportOk']='Importação completada!';
 $lang['MsgInitFinalGridsError']='Aviso: Chaves já foram inicializadas para este evento. Você quer continuar?';
 $lang['MsgInitFinalGridsOk']='Inicialização com sucesso!';
+$lang['MsgInitFinalGridsRunningError']='Operação não permitida enquanto um evento está no modo Running';
 $lang['MsgMakeFinReset']='Chaveamento das Partidas re-inicializado! Refaça todas as operações preliminares antes de inserir novos dados!';
 $lang['MsgNeedInitGrids']='ERRO!<br>Chaves não foram inicializadas!';
 $lang['MsgNeedShootOff']='ERRO!<br>Primeiro você deve checar se há empates / shoot-off!';
@@ -445,6 +460,8 @@
 $lang['PartialTeam']='Equipe parcial';
 $lang['Phase']='Fase';
 $lang['PositionShort']='Pos.';
+$lang['PostUpdateEnd']='Post-update completo';
+$lang['PostUpdating']='Aguardar post-update';
 $lang['PrecPhase']='Fase anterior';
 $lang['PressCtrl2SelectAll']='Para selecionar mais de um ítem, mantenha a tecla CTRL pressionada';
 $lang['Progr']='Ordem';
@@ -468,6 +485,7 @@
 $lang['Score1Page1Match']='Escore para partida simples';
 $lang['ScoreDrawing']='Somente Partidas (página simples)';
 $lang['ScoreFilled']='Imprimir planilhas preenchidas com todos os valores de cada flecha';
+$lang['ScoreIncAllNames']='Incluir todos os possíveis oponentes';
 $lang['ScoreIncEmpty']='Imprimir todas as partidas, mesmo que sem oponentes';
 $lang['Scorer']='Apontador';
 $lang['SearchOrphanTexts']='Buscar textos órfãos';
diff --git a/src/Common/Languages/pt-br/IOC_Codes.php b/src/Common/Languages/pt-br/IOC_Codes.php
index 4846194d..09eca2e5 100644
--- a/src/Common/Languages/pt-br/IOC_Codes.php
+++ b/src/Common/Languages/pt-br/IOC_Codes.php
@@ -12,8 +12,8 @@
 $lang['ASA']='Samoa Americana';
 $lang['AUS']='Austrália';
 $lang['AUT']='Áustria';
-$lang['Award-Anthem']='Senhoras e Senhores, por favor levantem-se para o Hino Nacional de';
-$lang['Award-Anthem-TPE']='Senhoras e senhores, por favor levantem-se para o Hino de';
+$lang['Award-Anthem']='Senhoras e Senhores, para todos que podem, por favor levantem-se para o Hino Nacional de';
+$lang['Award-Anthem-TPE']='Senhoras e senhores, para todos que podem, por favor levantem-se para o Hino de';
 $lang['Award-Applause']='Senhoras e Senhores, por favor vamos dar uma calorosa salva de palmas para os nossos Atletas!';
 $lang['Award-Intro']='Senhoras e Senhores, a cerimônia de premiação para o evento de Arco {$a}';
 $lang['Award-MedalGiver']='Medalhas serão entregues por $a';
@@ -42,16 +42,13 @@
 $lang['BUL']='Bulgária';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='República Centro-Africana';
-$lang['CAM']='Cambodja';
 $lang['CAN']='Canadá';
 $lang['CAY']='Ilhas Caiman';
 $lang['CGO']='República do Congo';
 $lang['CHA']='Chade';
 $lang['CHI']='Chile';
-$lang['CHN']='República Popular da China';
 $lang['CIV']='Costa do Marfim';
 $lang['CMR']='Camarões';
-$lang['COD']='República Democrática do Congo';
 $lang['COK']='Ilhas Cook';
 $lang['COL']='Colômbia';
 $lang['COM']='Comores';
@@ -60,7 +57,6 @@
 $lang['CRO']='Croácia';
 $lang['CUB']='Cuba';
 $lang['CYP']='Chipre';
-$lang['CZE']='República Tcheca';
 $lang['DEN']='Dinamarca';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -91,17 +87,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guiana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong, China';
 $lang['HON']='Honduras';
 $lang['HUN']='Hungria';
 $lang['INA']='Indonésia';
 $lang['IND']='Índia';
-$lang['IRI']='República Islâmica do Irão';
 $lang['IRL']='Irlanda';
 $lang['IRQ']='Iraque';
 $lang['ISL']='Islândia';
 $lang['ISR']='Israel';
-$lang['ISV']='Ilhas Virgens Americanas';
 $lang['ITA']='Itália';
 $lang['IVB']='Ilhas Virgens Britânicas';
 $lang['JAM']='Jamaica';
@@ -114,7 +107,6 @@
 $lang['KOR']='República da Coréia';
 $lang['KSA']='Arábia Saudita';
 $lang['KUW']='Kuwait';
-$lang['LAO']='República Democrática Popular do Laos';
 $lang['LAT']='Letônia';
 $lang['LBA']='Líbia';
 $lang['LBR']='Libéria';
@@ -128,7 +120,6 @@
 $lang['MAR']='Marrocos';
 $lang['MAS']='Malásia';
 $lang['MAW']='Malawi';
-$lang['MDA']='República de Moldova';
 $lang['MDV']='Maldivas';
 $lang['Medal-1']='Medalha de Ouro';
 $lang['Medal-2']='Medalha de Prata';
@@ -137,7 +128,6 @@
 $lang['MEX']='México';
 $lang['MGL']='Mongólia';
 $lang['MHL']='Ilhas Marshall';
-$lang['MKD']='Macedônia do Norte';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -166,7 +156,6 @@
 $lang['PNG']='Papua-Nova Guiné';
 $lang['POL']='Polônia';
 $lang['POR']='Portugal';
-$lang['PRK']='Coreia do Norte';
 $lang['PUR']='Porto Rico';
 $lang['QAT']='Catar';
 $lang['ROU']='Romênia';
@@ -193,13 +182,11 @@
 $lang['SVK']='Eslováquia';
 $lang['SWE']='Suécia';
 $lang['SWZ']='eSwatini';
-$lang['SYR']='Síria';
 $lang['TAN']='Tanzânia';
 $lang['TGA']='Tonga';
 $lang['THA']='Tailândia';
 $lang['TJK']='Tajiquistão';
 $lang['TKM']='Turquemenistão';
-$lang['TLS']='Timor-Leste';
 $lang['TOG']='Togo';
 $lang['TPE']='Taipé Chinês';
 $lang['TRI']='Trinidad e Tobago';
diff --git a/src/Common/Languages/pt-br/ISK-App.php b/src/Common/Languages/pt-br/ISK-App.php
index 0f3aa961..9cc209f0 100644
--- a/src/Common/Languages/pt-br/ISK-App.php
+++ b/src/Common/Languages/pt-br/ISK-App.php
@@ -1,9 +1,22 @@
 <?php
 $lang['0_Phase']='Ouro';
+$lang['12_Phase']='1/12';
+$lang['14_Phase']='1/14';
+$lang['16_Phase']='1/16';
 $lang['1_Phase']='Bronze';
+$lang['24_Phase']='1/24';
+$lang['2_Phase']='Semifinais';
+$lang['32_Phase']='1/32';
+$lang['48_Phase']='1/48';
+$lang['4_Phase']='Quartas de final';
+$lang['64_Phase']='1/64';
+$lang['7_Phase']='1/7';
+$lang['8_Phase']='1/8';
 $lang['AboutAppDeveloper']='App desenvolvido por';
+$lang['AboutPrivacy']='Política de privacidade do Ianseo';
 $lang['AboutProducer']='Desenhado e desenvolvido por';
 $lang['AboutTitle']='Sobre o Ssorekeeper';
+$lang['AboutUX']='Interface desenvolvida em cooperação com';
 $lang['AppPageAbout']='Sobre';
 $lang['AppPageHelp']='Ajuda';
 $lang['AppPageSettings']='Config.';
@@ -48,13 +61,16 @@
 $lang['HelpStartHead']='Início';
 $lang['MainDistance']='Distância';
 $lang['MainEnd']='Série';
+$lang['MainInvalidKey']='Chave de Licença Inválida';
 $lang['MainNotInUse']='Dispositivo não está em uso';
+$lang['MainSignatureMessage']='Pontuação completa. Você quer assinar sua planilha e encerrar este round?';
 $lang['MainSignatureTitle']='Pontuação completada';
 $lang['MainTargets']='Alvo(s) designado';
 $lang['MainTotal']='Total';
-$lang['MainWaitingConfig']='Entregue para a equipe de Resultados';
+$lang['MainWaitingConfig']='Entregue para Resul- tados';
 $lang['MainWinner']='V I T Ó R I A';
 $lang['MenuAppVersion']='Versão:';
+$lang['MenuCloseMenu']='Fechar menu';
 $lang['MenuDeviceId']='ID do dispositivo:';
 $lang['MenuExitApp']='Sair do app';
 $lang['ScorecardArrows']='Valores de flechas';
@@ -66,8 +82,48 @@
 $lang['ScorecardTarget']='Alvo';
 $lang['ScoreTotalsCloseButton']='Fechar';
 $lang['ScoreTotalsConfirmButton']='Confirmar';
+$lang['ScoreTotalsConfirmOrReview']='Um ou mais totais não batem. Altere os valores e pressione Confirme ou pressione Fechar para voltar e checar seus pontos.';
+$lang['ScoreTotalsMessage']='Por favor, entre os valores de sua planilha de papel';
+$lang['ScoreTotalsMissingValues']='Por favor, entre todos os valores necessários';
+$lang['ScoreTotalsScore']='Pontuação total';
+$lang['ScoreTotalsTitle']='Confirmar pontuação';
+$lang['ScoringDeleteArrow']='Apaga Flecha';
+$lang['ScoringDeleteEnd']='Apaga Serie';
+$lang['ScoringDeleteEndConfirmMessage']='Você realmente quer apagar todas as flechas desta série?';
+$lang['ScoringDeleteEndConfirmTitle']='Confirma apagar';
+$lang['ScoringDistanceDoneMessage']='Todas flechas foram marcadas. Você pode selecionar uma flecha para mudar, se necessário.';
+$lang['ScoringDistanceDoneTitle']='Distância completa';
+$lang['ScoringDistTotal']='Total';
 $lang['ScoringEndTotal']='Série';
+$lang['ScoringMissingPointsMessage']='Falta uma ou mais flecha do atleta. Continua mesmo assim?';
+$lang['ScoringMissingPointsTitle']='Faltam pontos';
+$lang['SettingsChooseValue']='Escolha valor';
+$lang['SettingsCompetitionType']='Tipo de competição';
+$lang['SettingsConnectionCategory']='Conexão';
+$lang['SettingsConnectionCompCode']='Código da competição';
+$lang['SettingsConnectionSocketAddress']='Endereço do Socket';
+$lang['SettingsConnectionSocketPort']='Porta do Socket';
+$lang['SettingsConnectionUrl']='Url';
+$lang['SettingsCouldNotGetCompInfo']='Não foi possível recuperar Informações da Competição';
+$lang['SettingsCouldNotGetConfigInfo']='Não foi possível recuperar Informações de Configuração';
+$lang['SettingsCouldNotGetDistanceInfo']='Não foi possível recuperar Informações da Distância';
+$lang['SettingsCouldNotGetEventInfo']='Não foi possível recuperar Informações do Evento';
+$lang['SettingsCouldNotGetMatchInfo']='Não foi possível recuperar Informações da Partida';
+$lang['SettingsElimFirstTarget']='Primeiro Alvo';
+$lang['SettingsEventSelection']='Seleção do Evento';
+$lang['SettingsFunctionsCategory']='Outras Funções';
+$lang['SettingsFunctionsResetSettings']='Carregar configuração padrão';
+$lang['SettingsGenerateQr']='Gerar';
+$lang['SettingsGpsCategory']='Posição GPS';
+$lang['SettingsGpsFrequency']='Frequência';
+$lang['SettingsGpsMinute']='minuto';
+$lang['SettingsGpsMinutes']='minutos';
+$lang['SettingsGpsSeconds']='segundos';
+$lang['SettingsGpsSendPosition']='Enviar posição do dispositivo';
+$lang['SettingsLanguageCategory']='Idioma';
+$lang['SettingsLanguageCurrent']='Idioma atual';
 $lang['SettingsLanguageUpdate']='Atualizar idioma';
+$lang['SettingsManualAllDistances']='Todas';
 $lang['SettingsManualDistance']='Distância';
 $lang['SettingsManualEvent']='Evento';
 $lang['SettingsManualGroup']='Grupo';
@@ -82,6 +138,7 @@
 $lang['SettingsOtherAskForSignature']='Solicita assinatura';
 $lang['SettingsOtherAskForTotals']='Solicita totais quando completo';
 $lang['SettingsOtherCategory']='Outras opções';
+$lang['SettingsOtherEnableHaptics']='Liga haptic feedback';
 $lang['SettingsOtherHideTotals']='Oculta totais quando pontuando';
 $lang['SettingsOtherSignatureNone']='Não';
 $lang['SettingsOtherSignatureScan']='Escaneia credencial';
@@ -89,18 +146,64 @@
 $lang['SettingsOtherSpotting']='Modo Spotting';
 $lang['SettingsQrCodesCategory']='Códigos QR';
 $lang['SettingsQrCodesDevice']='Dispositivo';
+$lang['SettingsQrCodesPayload']='Dados QR';
+$lang['SettingsQrCodesScorecard']='Planilha';
+$lang['SettingsReset']='Reset';
+$lang['SettingsSaveConfig']='Salvar';
+$lang['SettingsScanSendQr']='Enviar';
+$lang['SettingsScanSendQrError']='Não processou o QR code';
+$lang['SettingsScanSendQrOk']='Dados do QR code enviados para o Ianseo';
+$lang['SettingsShowAdvanced']='Avançado';
+$lang['SettingsStageE1']='Round Eliminatório 1';
+$lang['SettingsStageE2']='Round Eliminatório 2';
 $lang['SettingsStageMI']='Partidas - Individuais';
 $lang['SettingsStageMT']='Partidas - Equipes';
+$lang['SettingsStageP']='Pools';
+$lang['SettingsStageQ']='Qualificatório';
+$lang['SettingsStageRI']='Round Robin - Individual';
+$lang['SettingsStageRT']='Round Robin - Equipes';
+$lang['SettingsTitle']='Configuração';
+$lang['SettingsWifiAdd']='Entra WiFi';
+$lang['SettingsWifiAddNew']='Entra novo SSID de WiFi';
+$lang['SettingsWifiCategory']='WiFi';
+$lang['SettingsWifiEdit']='Edita WiFi';
+$lang['SettingsWifiManage']='Gerencia conexão WiFi';
+$lang['SetupManually']='Config. manual';
+$lang['SetupNeedHelp']='Precisa de ajuda?';
+$lang['SetupUsingBarcode']='Configurar usando Código QR';
+$lang['ShootoffClosestArcher']='mais próxima';
+$lang['ShootoffClosestNew']='Novo Shoot-Off';
+$lang['ShootoffClosestTitle']='Qual está mais próxima do centro?';
+$lang['ShootoffNewConfirmation']='Confirmação do Shoot-Off';
+$lang['ShootoffNewIsNeeded']='É necessário outro Shoot-Off para definir quem ganha a partida?';
+$lang['SignatureClear']='Limpar';
+$lang['SignatureIncorrectCodeTitle']='Código de barras errado';
+$lang['SignatureReturnDev']='Devolva para equipe de resultados';
+$lang['SignatureSaved']='Salvo!';
+$lang['SignatureSaveSign']='Salva sua assinatura';
+$lang['SignatureScanCode']='Escaneia código de confirmação';
+$lang['SignatureSignature']='Assinatura';
 $lang['SignatureSuccess']='OK';
 $lang['SignatureTextArcher']='Assinatura do atleta';
 $lang['SignatureTextScorer']='Assinatura do anotador';
 $lang['SignatureTitle']='Assine sua planilha';
+$lang['SignatureTitleFinished']='Planilha terminada';
 $lang['SignatureUndo']='Desfazer';
+$lang['SignatureVerification']='Verificação';
+$lang['SignatureVerificationFailed']='Não pode verificar o código. Por favor, verifique a conexão de rede e tente novamente.';
 $lang['SignatureVerified']='Verificado!';
+$lang['UpdateLangAdditional']='Mais idiomas';
 $lang['UpdateLangGetAll']='Buscando idiomas disponíveis...';
 $lang['UpdateLangGetSingle']='Baixando idiomas...';
 $lang['UpdateLangInstalled']='Idiomas instalados';
 $lang['UpdateLangTitle']='Atualizar idioma';
+$lang['WiFiCannotConnect']='WIFI: Não pode conectar a{{n}}';
+$lang['WiFiCannotDetermineStatus']='WIFI: Não pode determinar status do WiFi';
+$lang['WiFiCannotEnable']='WIFI: Não pode ligar o WiFi';
+$lang['WiFiCannotRemove']='WIFI: Não pode remover WiFi antes de incluir {{n}}';
+$lang['WiFiConnected']='WIFI: Conectado a WiFi {{n}}';
+$lang['WiFiDeviceEnabled']='WIFI: Dispositivo habilitado';
+$lang['WiFiDeviceNotEnabled']='WIFI: Dispositivo NÃO habilitado';
 $lang['WifiPassword']='Senha';
 $lang['WifiSsid']='SSID';
 $lang['WifiTargetFrom']='Alvo de';
diff --git a/src/Common/Languages/pt-br/ISK.php b/src/Common/Languages/pt-br/ISK.php
index 6220985b..bae4a9d5 100644
--- a/src/Common/Languages/pt-br/ISK.php
+++ b/src/Common/Languages/pt-br/ISK.php
@@ -103,6 +103,7 @@
 $lang['Exit']='Sair';
 $lang['ExitConfirm']='Você tem certeza que quer deixar o app?';
 $lang['Face']='Face';
+$lang['FieldControl']='Controle de campo';
 $lang['FirstTarget']='Primeiro Alvo:';
 $lang['GestureHelp']='Você pode navegar entre os arqueiros e/ou séries usando os gestos descritos abaixo.';
 $lang['Gestures']='Gestos';
@@ -111,6 +112,7 @@
 $lang['HasUpdate']='Favor Atualizar';
 $lang['Help']='Ajuda';
 $lang['ImportDoneEmpty']='Nada para importar';
+$lang['ImportDoneMatches']='Importação concluída. Ranking final Individual e de Equipe recalculados';
 $lang['ImportNow']='Importar agora (Qualificação)';
 $lang['ImportNowMatches']='Importar agora (partidas)';
 $lang['ImportType']='Auto-importar valores de flechas';
@@ -166,6 +168,7 @@
 $lang['ProWaitAuth']='Aguardando autorização';
 $lang['ProWaitCode']='Aguardando configuração';
 $lang['QrInvalid']='Não consegui entender o conteúdo deste código. Por favor, tente novamente com um código do IANSEO válido.';
+$lang['QrIskLive']='A competição está configurada para usar o Scorekeeper LIVE. Este app só vai funcionar com competições LITE ou PRO.';
 $lang['QrIskNone']='Esta prova está configurada para usar o Scorekeeper. Cheque as configurações da prova.';
 $lang['QrNoCode']='Não foi encontrado código de competição no código de barras. Por favor, tente novamente com um código do IANSEO válido.';
 $lang['Reset']='Reset';
@@ -218,6 +221,8 @@
 $lang['Tgt']='&nbsp;<br/>Alvo';
 $lang['Timeout']='Tempo limite';
 $lang['Total']='Total';
+$lang['TruncateMatches']='Remover dados temporários (partidas)';
+$lang['TruncateQual']='Remover dados temporários (Qualificação)';
 $lang['Unknown']='Desconhecido';
 $lang['UnlockAll']='Desbloquear todas as sessões';
 $lang['Update']='Atualizar';
diff --git a/src/Common/Languages/pt-br/Ianseo.php b/src/Common/Languages/pt-br/Ianseo.php
index 781c5497..fec4dddb 100644
--- a/src/Common/Languages/pt-br/Ianseo.php
+++ b/src/Common/Languages/pt-br/Ianseo.php
@@ -7,4 +7,6 @@
 $lang['Cert-Level4']='Curso Master';
 $lang['Cert-Level5']='Equipe Ianseo';
 $lang['CertificateManagement']='Gestão de certificados';
+$lang['GenerateFile']='Criar arquivo';
+$lang['ShuffleResults']='Embaralhar resultados';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/pt-br/Install.php b/src/Common/Languages/pt-br/Install.php
index 67f8b090..b35a7769 100644
--- a/src/Common/Languages/pt-br/Install.php
+++ b/src/Common/Languages/pt-br/Install.php
@@ -73,7 +73,7 @@
 $lang['Parameter']='Parâmetro';
 $lang['Password']='Senha';
 $lang['PHP settings']='Configurações do PHP';
-$lang['PHP too old']='Sua instalação do PHP é muit antiga. A versão mínima para o IANSEO é 5.0.';
+$lang['PHP too old']='Sua instalação do PHP é muit antiga. A versão mínima para o IANSEO é 8.0.';
 $lang['PHP version']='Versão do PHP';
 $lang['php.ini file']='Arquivo php.ini';
 $lang['Prepare']='Preparando dados para atualização';
@@ -139,6 +139,7 @@
 $lang['SetOrdinaryFinals']='Torneio regular com finais';
 $lang['SetOutdoor']='Outdoor';
 $lang['SetPara']='Para Archery';
+$lang['SetSeniorClass']='Só categorias Adulto';
 $lang['SetSE_SweDist']='Distancias Suecas';
 $lang['SetSE_WaDist']='Distâncias da WA';
 $lang['SetStandard']='Standard';
@@ -179,12 +180,13 @@
 $lang['UpdatePrepared']='Sua instalação está prestes a ser atualizada. Por favor, lembre-se de fazer uma cópia de todas as suas competições antes de iniciar. O processo de atualização pode demorar bastante, dependendo de sua conexão e da quantidade de elementos que precisam ser atualizados. <br/>Por favor, lembre-se que qualquer arquivo não original será removido, com exceção do conteúdo da pasta "Modules/Custom".';
 $lang['Updating']='Atualizando instalação local do IANSEO';
 $lang['UpdatingLanguages']='Atualizando idiomas instalados';
+$lang['UpdatingModulesInfo']='Atualizando informação dos Módulos';
 $lang['UpgradeFinished']='O processo de atualização está terminado';
 $lang['User']='Usuário';
 $lang['Value']='Valor';
 $lang['WhatIanseoDoes01']='<b>Em conformidade com as regras da World Archery:</b> Ianseo está sempre atualizado com as regras da World Archery. Os desenvolvedores estão disponíveis para customizações para se adequar a necessidades de competições Nacionais e com Regras Específicas também!';
 $lang['WhatIanseoDoes02']='<b>Ajuda e suporte:</b>Se você precisa de ajuda, envie um e-mail para $a: Você será ajudado diretamente pela equipe de desenvolvimento do Ianseo!';
-$lang['WhatIanseoDoes03']='<b>Treinamentos e cursos On Site:</b> Ianseo está disponível para gerenciar treinamentos específicos em seu país. Há dois níveis: Sem ou com equipamentos eletrônicos. O primeiro é orientado para aprender todos os aspectos do Ianseo, desde o planejamento e a agenda da competição até a publicação e distribuição local de resultados. O segundo é orientado para adquirir todo o conhecimento específico para conduzir uma competição "flecha por flecha".';
+$lang['WhatIanseoDoes03']='<b>Treinamentos e cursos On Site:</b> Ianseo está disponível para gerenciar treinamentos específicos em seu país. Há dois níveis: sem ou com o app Ianseo Scorekeeper NG. O primeiro é orientado para aprender todos os aspectos do Ianseo, desde o planejamento e a agenda da competição até a publicação e distribuição local de resultados. O segundo é orientado para adquirir todo o conhecimento específico para conduzir uma competição "flecha por flecha".';
 $lang['WhatIanseoDoes04']='<b>Doações!</b> Ianseo é gratuito e open source... se você gostou, por favor ajude-nos a manter o sistema e os servidores atualizados: aperte o botão "Donate" na home page do $a!';
 $lang['WhatIanseoDoes05']='<b>Mídias Sociais:</b> Ianseo também está no $a!';
 $lang['WhatIanseoDoesTitle']='O que o IANSEO pode fazer por sua competição';
diff --git a/src/Common/Languages/pt-br/Tournament.php b/src/Common/Languages/pt-br/Tournament.php
index aaee2cbe..5e84b9a4 100644
--- a/src/Common/Languages/pt-br/Tournament.php
+++ b/src/Common/Languages/pt-br/Tournament.php
@@ -43,6 +43,7 @@
 $lang['ADOfficer']='Oficial Antidopagem';
 $lang['AfterDistance']='Ranking APÓS a seguinte distância';
 $lang['AfterXDistance']='Resultados APÓS a distância de $a';
+$lang['AgeClass']='Classe de idade';
 $lang['AllDistances']='Tudo';
 $lang['AllEvents']='Todos os eventos';
 $lang['AllRound']='Todos os Rounds';
@@ -85,15 +86,19 @@
 $lang['AuthCode']='Seu código de acesso';
 $lang['AuthCodeA2A']='Flecha por flecha - Código de autorização';
 $lang['AutoEdits']='Auto edit';
+$lang['AutomatorAccPrint']='Config. de impressão de credenciamento';
 $lang['AutoRefresh']='Auto refresh';
 $lang['AutoTargetAssignment']='Atribuição de Alvos automática - SORTEIO';
 $lang['AutoUploadToggle']='Habilita timer de atualização automática';
 $lang['AvailableValues']='Valores disponíveis';
 $lang['Award']='Prêmio';
 $lang['AwardAvailableEvents']='Eventos disponíveis para premiação';
+$lang['AwarderNum']='Entregue por $a';
 $lang['Awarders']='Entregue por';
 $lang['AwardFirstLanguage']='Primeiro idioma';
 $lang['AwardName']='Nome do prêmio';
+$lang['AwardNew']='Nova premiação';
+$lang['AwardNum']='Prêmio $a';
 $lang['AwardPlayAnthem']='O hino nacional será tocado durante a cerimônia?';
 $lang['AwardRepresentCountry']='Os atletas premiados representam um país/clube?';
 $lang['Awards']='Prêmio';
@@ -110,7 +115,6 @@
 $lang['BadgeIncludePhoto']='Incluir FOTOS nas Credenciais?';
 $lang['BadgeNames']='Nome Completo (Não imprimir primeiro)';
 $lang['BadgeNoData']='Não há informações a imprimir';
-$lang['BadgeOnlyNotPrinted']='SOMENTE Credenciais que ainda não foram impressas?';
 $lang['BadgeOnlyPrintAccredited']='SOMENTE Credenciais dos participantes credenciados?';
 $lang['BadgeOnlyPrintPhoto']='SOMENTE Credenciais com Foto?';
 $lang['BadgeOptions']='Opções';
@@ -171,8 +175,6 @@
 $lang['CatJudge']='Juízes';
 $lang['CatJury']='Juri de Apelação';
 $lang['CatOC']='Comitê Organizador';
-$lang['ChairmanJudge']='Chefe de Juízes';
-$lang['ChairmanJury']='Chefe do Juri de Apelação';
 $lang['ChangeLookUpTable']='Altera Tabela de Busca';
 $lang['ChangeNationsNames']='Alterar os nomes dos Países';
 $lang['Channel']='Canal';
@@ -216,6 +218,7 @@
 $lang['CoinTossShort']='CT';
 $lang['Collation']='Agrupar';
 $lang['Color']='Cor';
+$lang['CombiCompNewRule']='Nova regra';
 $lang['ComparedTo']='Compara com a posição a X flechas (-1 = última disponível)';
 $lang['CompetitionOfficials']='Oficiais na Competição';
 $lang['CompleteSchedule']='Agenda completa';
@@ -251,6 +254,7 @@
 $lang['DefaultHM']='HM padrão';
 $lang['DefaultLocRule']='FITA';
 $lang['DefaultVI']='VI padrão';
+$lang['DeleteAwarded']='Apagar entregues';
 $lang['DeleteChannel']='Remover canal. Isto irá remover todas divisões do canal e o próprio canal.';
 $lang['DeletePreviousArchers']='Apagar entradas que não estejam na lista';
 $lang['DeletePreviousTeams']='Apagar Equipes Anteriores';
@@ -300,7 +304,6 @@
 $lang['EmailScorecardLong']='Planilha completa';
 $lang['EmailScorecardShort']='Resumo da planilha';
 $lang['EmailsToSend']='e-mails a enviar';
-$lang['EnableAccess']='Habilitar/Desligar regras';
 $lang['Ends']='Séries';
 $lang['EndTotal']='Total Série';
 $lang['EndUpdate']='Todas as atualizações foram realizadas';
@@ -927,7 +930,6 @@
 $lang['TeamCreationMode_2']='Sempre 2a equipe';
 $lang['TeamCreationMode_3']='Sempre 3a equipe';
 $lang['TeamFin']='Equipe - Partidas';
-$lang['TeamFinEvent']='Partida de Equipes';
 $lang['TeamLoaded']='Partidas de equipe carregadas para agenda ($a}';
 $lang['TeamPlace']='Sinalização de locais para Equipes';
 $lang['TeamQual']='Equipe - Round Qualificatório';
@@ -1162,7 +1164,6 @@
 $lang['UserDetails']='Detalhes do usuário';
 $lang['UserEnabled']='Habilitado';
 $lang['UserName']='Usuário';
-$lang['UserPassword']='Senha';
 $lang['UseSubClasses']='Aplicar a sub-classes específicas';
 $lang['ValidDivisions']='Divisões permitidas (vazio para todas)';
 $lang['VersionBracketsInd']='Chaves Individuais';
diff --git a/src/Common/Languages/pt/Api.php b/src/Common/Languages/pt/Api.php
new file mode 100644
index 00000000..99154e2b
--- /dev/null
+++ b/src/Common/Languages/pt/Api.php
@@ -0,0 +1,24 @@
+<?php
+$lang['API-AutoGroup']='Criação de grupos em volume';
+$lang['API-ConfirmDeleteRow']='Tem a certeza de que pretende eliminar esta linha?';
+$lang['API-DeviceGrouping']='Agrupamento de dispositivos';
+$lang['API-EnableDeviceGrouping']='Ativar o agrupamento de dispositivos';
+$lang['API-Group']='Pontuação do grupo';
+$lang['API-TargetGrouping']='Agrupamento dos Alvos';
+$lang['API-Targets']='Alvos';
+$lang['AskSignature-0']='Não';
+$lang['AskSignature-1']='Digitalizar ID do Arqueiro';
+$lang['AskSignature-2']='Assinatura no ecrã';
+$lang['AutoImport']='Importação automática';
+$lang['CheckConnected']='Verificação ligada';
+$lang['CmdDelete']='Remover';
+$lang['CmdImport']='Importar';
+$lang['ConfirmGenerateZip']='Por favor, confirme que está a gerar o ficheiro ZIP com todos os $a[0] para a sessão $a[1]';
+$lang['Controller']='Controlador';
+$lang['DataRefresh']='Atualizar dados';
+$lang['Desc-Let-4']='Pontuação em curso';
+$lang['Desc-Let-G']='Lugar vazio';
+$lang['Desc-Let-R']='Flechas em sessão diferente';
+$lang['Desc-Let-Z']='Pontuação em curso';
+$lang['DevConnected']='Conectado';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/ro/IOC_Codes.php b/src/Common/Languages/ro/IOC_Codes.php
index f2369d97..b80fe5f7 100644
--- a/src/Common/Languages/ro/IOC_Codes.php
+++ b/src/Common/Languages/ro/IOC_Codes.php
@@ -32,16 +32,12 @@
 $lang['BUL']='Bulgaria';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Republica Centrafricană';
-$lang['CAM']='Cambodgia';
 $lang['CAN']='Canada';
 $lang['CAY']='Insulele Caymand';
 $lang['CGO']='Republica Congo';
 $lang['CHA']='Republica Ciad';
 $lang['CHI']='Chile';
-$lang['CHN']='China';
-$lang['CIV']='Coasta de Azur';
 $lang['CMR']='Camerun';
-$lang['COD']='Republica Democrata Congo';
 $lang['COK']='Insulele Cook';
 $lang['COL']='Columbia';
 $lang['COM']='Insulele Comore';
@@ -50,7 +46,6 @@
 $lang['CRO']='Croatia';
 $lang['CUB']='Cuba';
 $lang['CYP']='Cipru';
-$lang['CZE']='Cehia';
 $lang['DEN']='Danemarca';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -80,17 +75,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Ungaria';
 $lang['INA']='Indonezia';
 $lang['IND']='India';
-$lang['IRI']='Iran';
 $lang['IRL']='Irlanda';
 $lang['IRQ']='Irak';
 $lang['ISL']='Islanda';
 $lang['ISR']='Israel';
-$lang['ISV']='Insulele Virgine Americane';
 $lang['ITA']='Italia';
 $lang['IVB']='Insulele Virgine Britanice';
 $lang['JAM']='Jamaica';
@@ -102,7 +94,6 @@
 $lang['KIR']='Kiribati';
 $lang['KSA']='Arabia Saudita';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
 $lang['LAT']='Latvia';
 $lang['LBA']='Libia';
 $lang['LBR']='Liberia';
@@ -116,7 +107,6 @@
 $lang['MAR']='Maroc';
 $lang['MAS']='Malaezia';
 $lang['MAW']='Malawi';
-$lang['MDA']='Moldova';
 $lang['MDV']='Maldive';
 $lang['MEX']='Mexic';
 $lang['MGL']='Mongolia';
@@ -149,7 +139,6 @@
 $lang['PNG']='Papua Noua Guinee';
 $lang['POL']='Polonia';
 $lang['POR']='Portugalia';
-$lang['PRK']='Coreea de Nord';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Romania';
@@ -173,13 +162,11 @@
 $lang['SUR']='Surinam';
 $lang['SVK']='Slovacia';
 $lang['SWE']='Suedia';
-$lang['SYR']='Siria';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailanda';
 $lang['TJK']='Tajikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Timorul de Est';
 $lang['TOG']='Togo';
 $lang['TPE']='Taipei-ul chinezesc';
 $lang['TRI']='Trinidad si Tobago';
diff --git a/src/Common/Languages/ro/Install.php b/src/Common/Languages/ro/Install.php
index dd7fce5b..751365ac 100644
--- a/src/Common/Languages/ro/Install.php
+++ b/src/Common/Languages/ro/Install.php
@@ -27,7 +27,6 @@
 $lang['Parameter']='Parametri';
 $lang['Password']='Parola';
 $lang['PHP settings']='Setari PHP';
-$lang['PHP too old']='Versiunea locala PHP este prea veche. Versiunea IANSEO minima este 5.0.';
 $lang['PHP version']='Versiune PHP';
 $lang['php.ini file']='Fisier php.ini';
 $lang['Read connection failed']='Conexiunea cu serverul s-a intrerupt: fie parola administrator este gresita, fie datele de logare nu sunt corecte!';
diff --git a/src/Common/Languages/ru/Api.php b/src/Common/Languages/ru/Api.php
index 7d792098..cc331ef2 100644
--- a/src/Common/Languages/ru/Api.php
+++ b/src/Common/Languages/ru/Api.php
@@ -2,6 +2,7 @@
 $lang['API-AutoGroup']='Массовое создание групп';
 $lang['API-ConfirmDeleteRow']='Вы уверены, что хотите стереть этот ряд?';
 $lang['API-DeviceGrouping']='Группировка устройств';
+$lang['API-EnableDeviceGrouping']='Включить группировку устройств';
 $lang['API-Group']='Группа';
 $lang['API-TargetGrouping']='Группировка щитов';
 $lang['API-Targets']='Щиты';
@@ -29,6 +30,7 @@
 $lang['ISK-CheckAlive']='проверка устройства';
 $lang['ISK-checkCompeting']='Только для соревнующихся спортсменов';
 $lang['ISK-DenyAccess']='Запрет доступа';
+$lang['ISK-Deprecated']='ВАЖНО: приложение «Ianseo Score Keeper» постепенно выводится из магазинов Android и Apple и больше не поддерживается, поэтому оно будет удалено из Ianseo в сентябре 2024 года. Вместо этого переключитесь на новое приложение «Ianseo Score Keeper NG».';
 $lang['ISK-DeviceBattery']='Батарея питания';
 $lang['ISK-DeviceId']='ID устройства';
 $lang['ISK-DeviceIpAddress']='IP адрес';
@@ -48,9 +50,11 @@
 $lang['ISK-Lite-NoCompCode']='Код отсутствующего соревнования';
 $lang['ISK-Lite-QRCode']='Печатать QR для Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-ServerUrl']='Сервер Url (включая протокол и порт если нет 80)';
+$lang['ISK-Live-Deprecated']='ВАЖНО: приложение «Ianseo Score Keeper Live» больше не поддерживается, поэтому оно будет удалено из Ianseo в сентябре 2024 года. Вместо этого переключитесь на новое приложение «Ianseo Score Keeper NG».';
 $lang['ISK-Live-Name']='Ianseo ScoreKeeper LIVE';
 $lang['ISK-lockPortrait']='Заблокировать устройство в верт. положении';
 $lang['ISK-Name']='Ianseo ScoreKeeper';
+$lang['ISK-NG-QRCode']='Добавить QR-код для приложения Ianseo ScoreKeeper NG';
 $lang['ISK-NoCompCode']='Утерян код соревнования';
 $lang['ISK-onlyAccreditated']='Подтверждённая аккредитация';
 $lang['ISK-OnlyProAloud']='Только PRO версия для этих соревнований !';
@@ -95,7 +99,7 @@
 $lang['IskSpuriousScore-Match']='Устройство $a[0] работает для матча $a[1]';
 $lang['IskTargetTitle']='Мишень(щит) $a';
 $lang['IskUnknownDevice']='Неизвестное устройство на щите $a';
-$lang['LockAll']='Разрешить всё';
+$lang['LockAll']='Запретить всё';
 $lang['LockToEnds']='Прекратить подсчёт до следующих серий (не означает запрет подсчёта)';
 $lang['ManageGroupTarget']='управление группами и щитами';
 $lang['ManageLockedSessions']='Управление доступом в приложении';
@@ -125,7 +129,7 @@
 $lang['TargetScoring-Printout']='Печать таблицы QR-кодов для мишеней';
 $lang['TempArrowsM']='Не импортированные стрелы в матчах (инд., командные, рейтинговые раунды, пулы и т. д.)';
 $lang['TempArrowsQ']='Не импортированные стрелы в квалификационных раундах или на выбывание';
-$lang['UnlockAll']='Запретить всё';
+$lang['UnlockAll']='Разрешить всё';
 $lang['WAToolbox-MissingParams']='Отсутствующий параметр';
 $lang['WAToolbox-NoCompCode']='Код отсутсвующего соревнования';
 $lang['XToWin']='$a для победы';
diff --git a/src/Common/Languages/ru/IOC_Codes.php b/src/Common/Languages/ru/IOC_Codes.php
index 7896ad75..4b978e98 100644
--- a/src/Common/Languages/ru/IOC_Codes.php
+++ b/src/Common/Languages/ru/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='Американское Самоа';
 $lang['AUS']='Австралия';
 $lang['AUT']='Австрия';
-$lang['Award-Anthem']='Дамы и Господа, пожалуйста встаньте для исполнения Национального Гимна';
-$lang['Award-Anthem-TPE']='Дамы и Господа, пожалуйста встаньте для исполнения Гимна';
 $lang['Award-Applause']='Дамы и Господа, окажите тёплый приём аплодисментами нашему атлету(ам)';
 $lang['Award-Intro']='Дамы и господа, начинаем церемонию награждения победителя и призеров в категории {$a}';
 $lang['Award-MedalGiver']='Медали предоставляются $a';
@@ -42,16 +40,12 @@
 $lang['BUL']='Болгария';
 $lang['BUR']='Буркина Фасо';
 $lang['CAF']='Центральная Африканская Республика';
-$lang['CAM']='Камбоджа';
 $lang['CAN']='Канада';
 $lang['CAY']='Каймановы Острова';
 $lang['CGO']='Республика Конго';
 $lang['CHA']='Чад';
 $lang['CHI']='Чили';
-$lang['CHN']='Китай';
-$lang['CIV']='Кот Д\'Ивуар';
 $lang['CMR']='Камерун';
-$lang['COD']='Демократическая Республика Конго';
 $lang['COK']='Острова Кука';
 $lang['COL']='Колумбия';
 $lang['COM']='Коморос';
@@ -60,7 +54,6 @@
 $lang['CRO']='Хорватия';
 $lang['CUB']='Куба';
 $lang['CYP']='Кипр';
-$lang['CZE']='Республика Чехия';
 $lang['DEN']='Дания';
 $lang['DJI']='Джибути';
 $lang['DMA']='Доминика';
@@ -91,17 +84,14 @@
 $lang['GUM']='Гуам';
 $lang['GUY']='Гайана';
 $lang['HAI']='Гаити';
-$lang['HKG']='Гонконг';
 $lang['HON']='Гондурас';
 $lang['HUN']='Венгрия';
 $lang['INA']='Индонезия';
 $lang['IND']='Индия';
-$lang['IRI']='Иран';
 $lang['IRL']='Ирландия';
 $lang['IRQ']='Ирак';
 $lang['ISL']='Исландия';
 $lang['ISR']='Израиль';
-$lang['ISV']='Виргинские Острова Соединенные Штаты';
 $lang['ITA']='Италия';
 $lang['IVB']='Британские Виргинские Острова';
 $lang['JAM']='Ямайка';
@@ -114,7 +104,6 @@
 $lang['KOR']='Республика Корея';
 $lang['KSA']='Саудовская Аравия';
 $lang['KUW']='Кувейт';
-$lang['LAO']='Лаос';
 $lang['LAT']='Латвия';
 $lang['LBA']='Ливия';
 $lang['LBR']='Либерия';
@@ -128,7 +117,6 @@
 $lang['MAR']='Морокко';
 $lang['MAS']='Малазия';
 $lang['MAW']='Малави';
-$lang['MDA']='Молдова';
 $lang['MDV']='Мальдивы';
 $lang['Medal-1']='Золотая медаль';
 $lang['Medal-2']='Серебряная медаль';
@@ -165,7 +153,6 @@
 $lang['PNG']='Папуа Новая Гвинея';
 $lang['POL']='Польша';
 $lang['POR']='Португалия';
-$lang['PRK']='Северная Корея';
 $lang['PUR']='Пуерто Рико';
 $lang['QAT']='Катар';
 $lang['ROU']='Румыния';
@@ -191,13 +178,11 @@
 $lang['SUR']='Суринам';
 $lang['SVK']='Словакия';
 $lang['SWE']='Швеция';
-$lang['SYR']='Сирия';
 $lang['TAN']='Танзания';
 $lang['TGA']='Тонга';
 $lang['THA']='Таиланд';
 $lang['TJK']='Таджикистан';
 $lang['TKM']='Туркменистан';
-$lang['TLS']='Восточный Тимор';
 $lang['TOG']='Того';
 $lang['TPE']='Китайский Тайбей';
 $lang['TRI']='Тринидад и Тобаго';
diff --git a/src/Common/Languages/ru/Install.php b/src/Common/Languages/ru/Install.php
index 7a6fda3b..5743e6f6 100644
--- a/src/Common/Languages/ru/Install.php
+++ b/src/Common/Languages/ru/Install.php
@@ -65,7 +65,6 @@
 $lang['Parameter']='Параметр';
 $lang['Password']='Пароль';
 $lang['PHP settings']='Настройки РНР';
-$lang['PHP too old']='Ваша РНР установка устарела. Минимальная версия IANSEO 5.0';
 $lang['PHP version']='Версия РНР';
 $lang['php.ini file']='php.ini файл';
 $lang['Prepare']='Подготовка данных для обновления.';
@@ -158,7 +157,6 @@
 $lang['Value']='Значение';
 $lang['WhatIanseoDoes01']='<b>Совместимость с правилами World Archery:</b> Ianseo постоянно отслеживает возможные изменения Правил World Archery и работает исходя из самой актуальной версии. Разработчики также готовы к персональной адаптации программы к национальным или иным специфическим Правилам (условиям) проведения турниров!';
 $lang['WhatIanseoDoes02']='<b>Помощь и поддержка:</b> если вам необходима помощь, отправьте запрос (на итальянском, немецком или английском языке) на $a: Вы получите ответ напрямую от главных разработчиков Ianseo !';
-$lang['WhatIanseoDoes03']='<b>Обучение и курсы:</b> у Ianseo существует несколько курсов обучения. Два уровня: без электронных устройств и с использованием электронных устройств. Первый направлен на изучение основных функций программы, от создания соревнования и планирования расписания, и до печати результатов и публикации в сети интернет. Второй направлен на изучение всех функций программы, для проведения соревнования с записью каждого выстрела.';
 $lang['WhatIanseoDoes04']='<b>Поддержать разработку !</b> Ianseo это бесплатный продукт с открытым кодом... если он вам понравился, пожалуйста поддержите его разработку и развитие: нажмите кнопку "Donate" на домашней странице сайта  $a!';
 $lang['WhatIanseoDoes05']='<b>Соц. сети:</b> Ianseo также присутствует на $a';
 $lang['WhatIanseoDoesTitle']='Чем интересен Ianseo применительно к вашим соревнованиям по стрельбе из лука';
diff --git a/src/Common/Languages/ru/Tournament.php b/src/Common/Languages/ru/Tournament.php
index e6951978..86c9b058 100644
--- a/src/Common/Languages/ru/Tournament.php
+++ b/src/Common/Languages/ru/Tournament.php
@@ -24,7 +24,6 @@
 $lang['AclISKServer']='Управление ISK';
 $lang['AclModules']='Модули';
 $lang['ACLNoAccess']='Нет доступа';
-$lang['AclNotes']='<b>Примечания по защите доступа по сети</b> <ul> <li>Ограничения устанавливаются на основе соревнования, а не на основе сервера</li> <li>localhost (127.0.0.1 или ::1) не может быть ограничен</li> <li>Ограничения можно отключить с самого сервера по ссылке: <b>{$a}</b> </li></ul><ul> <li>Если ограничения включены, по умолчанию для клиентов, не включенных в список доступа, отображается «Нет доступа»</li> <li>Если добавить * как последнюю часть IP адреса (192.168.0.* or 172.16.*) то добавится группа, ограниченная только чтением</li> <li>IP в диапазоне 0.0.0.[1-254] не будут считаться реальными IP-адресами, и система будет использовать содержимое описания в качестве RegExp для соответствия IP-адресу. RegExps будут оцениваться в том порядке, в котором они показаны, и позволяет использовать ограничения чтения и записи.</li> </ul>';
 $lang['AclOutput']='Вывод';
 $lang['AclParticipants']='Участники';
 $lang['AclQualification']='Квалификация';
@@ -105,7 +104,6 @@
 $lang['BadgeIncludePhoto']='Включить фото в бейдж';
 $lang['BadgeNames']='Полное имя (Не напечатанное)';
 $lang['BadgeNoData']='Нет данных для печати';
-$lang['BadgeOnlyNotPrinted']='ТОЛЬКО бейджи ещё не напечатаны?';
 $lang['BadgeOnlyPrintAccredited']='ТОЛЬКО бейджи аккредитованых участников?';
 $lang['BadgeOnlyPrintPhoto']='Только бейджи с фото?';
 $lang['BadgeOptions']='Опции';
@@ -154,8 +152,6 @@
 $lang['CatJudge']='Судьи';
 $lang['CatJury']='Апелляционное жюри';
 $lang['CatOC']='Организационный комитет';
-$lang['ChairmanJudge']='Главный судья';
-$lang['ChairmanJury']='Председатель апеляционного жюри';
 $lang['ChangeLookUpTable']='Изменить БД';
 $lang['ChangeNationsNames']='Изменить названия регионов';
 $lang['Channel']='Канал';
@@ -254,7 +250,6 @@
 $lang['EliminationShort']='Отбор.';
 $lang['EliminationType']='Тип Отборочного этапа';
 $lang['Email']='E-Mail';
-$lang['EnableAccess']='Вкл./Выкл. доступ';
 $lang['Ends']='серий';
 $lang['EndTotal']='Сумма';
 $lang['EndUpdate']='Все обновления выполнены';
@@ -598,6 +593,7 @@
 $lang['Results']='Результаты';
 $lang['ResultSqAbs']='Квалификация  - Команды';
 $lang['ResultSqClass']='Результаты по класс. и див.-  Команды';
+$lang['ReverseNameFunction']='Поменять местами Имя и Должность';
 $lang['Round']='Круг';
 $lang['Round#']='Круг $a';
 $lang['Row-1']='Первый Ряд';
diff --git a/src/Common/Languages/sk/Common.php b/src/Common/Languages/sk/Common.php
index 416ca913..3c8bccd9 100644
--- a/src/Common/Languages/sk/Common.php
+++ b/src/Common/Languages/sk/Common.php
@@ -81,6 +81,7 @@
 $lang['ISK-Results']='Výsledky v PDA';
 $lang['ISKMenuHeader']='ISK';
 $lang['jrYesNo']='Áno / Nie';
+$lang['JudgeNotes']='Poznámky rozhodcu';
 $lang['ManFinAthTargetInd']='Individuálne Eliminácie - Strelci na Terčovnici';
 $lang['ManFinScheduleInd']='Rozpis Eiliminácie Jednotlivcov';
 $lang['MatchModeScoring']='Typ Skórovania';
diff --git a/src/Common/Languages/sk/Tournament.php b/src/Common/Languages/sk/Tournament.php
index 2415c533..b20321ac 100644
--- a/src/Common/Languages/sk/Tournament.php
+++ b/src/Common/Languages/sk/Tournament.php
@@ -47,8 +47,8 @@
 $lang['CancelAcc']='Zruš Akreditáciu';
 $lang['CancelEquipment']='Zruš kontrolu náradia';
 $lang['Cash']='Platba spolu';
-$lang['CatDos']='Rozhodca';
-$lang['CatJudge']='Hlavný rozhodca';
+$lang['CatDos']='DOS';
+$lang['CatJudge']='Rozhodca';
 $lang['CatJury']='Výsledky spracoval';
 $lang['CatOC']='Technický Delegát';
 $lang['ChairmanJudge']='Hlavný Rozhodca';
@@ -83,7 +83,7 @@
 $lang['Divisions']='Divízia';
 $lang['DOB']='Dátum narodenia';
 $lang['Document']='Dokument';
-$lang['Dos']='Rozhodca';
+$lang['Dos']='DOS';
 $lang['DosAssistant']='---';
 $lang['DoubleSpace']='Kuša';
 $lang['DrawField3D']='Terénna/3D rozlosovanie';
@@ -131,7 +131,7 @@
 $lang['IndoorTourCategory']='Halová Súťaž';
 $lang['IndQual']='Kvalifikácia Jednotlivci';
 $lang['InitEliminations']='Inicializovať eliminácii';
-$lang['Judge']='---';
+$lang['Judge']='Rozhodca';
 $lang['Jury']='----';
 $lang['LegendSO']='Rozstrel & Hod Mincou Skratka';
 $lang['Length']='Trvanie';
@@ -287,7 +287,6 @@
 $lang['TeamClEvent']='Kvalif. Družstiev';
 $lang['TeamCreationMode']='Nastavenie zloženia družstva';
 $lang['TeamFin']='Eliminácie & Finále - Družstvá';
-$lang['TeamFinEvent']='Elim. Družstvá';
 $lang['TeamQual']='Kvalifikácia - Družstvá';
 $lang['TecDelegate']='Technický Delegát';
 $lang['Time']='Začiatok';
diff --git a/src/Common/Languages/sl/Tournament.php b/src/Common/Languages/sl/Tournament.php
index e2520b15..218d47ed 100644
--- a/src/Common/Languages/sl/Tournament.php
+++ b/src/Common/Languages/sl/Tournament.php
@@ -257,7 +257,6 @@
 $lang['EmailScorecardShort']='Povzetek zapisnikarjev';
 $lang['EmailsToSend']='Naslovi za pošiljanje';
 $lang['EmailSuccessfull']='Sporočilo je bilo uspešno poslano na $a';
-$lang['EnableAccess']='Omogoči/onemogoči pogoje';
 $lang['Ends']='Serije';
 $lang['EndTotal']='Serije skupaj';
 $lang['EndUpdate']='Vse posodobitve končane';
@@ -421,12 +420,16 @@
 $lang['ScoreTournament']='Dodaj glavo tekmovanja';
 $lang['SelectSession']='Izberi izmeno';
 $lang['Send2Ianseo']='Pošlji podatke na www.ianseo.net';
+$lang['SendLogos']='Pošlji slike/logotipe tekmovanja';
 $lang['SessionDescr']='Podrobnosti izmen';
 $lang['SessionShort']='Izm.';
 $lang['SetCredentials']='Nastavi on-line kode';
 $lang['SetPoints']='Set točke';
 $lang['SetTotal']='Skupaj';
 $lang['Sex']='Spol';
+$lang['ShortFemale']='Ž';
+$lang['ShortUnisex']='Uni';
+$lang['ShotOffShort']='SO';
 $lang['showRecords']='Pokaži rekorde';
 $lang['ShowTourCode']='Pokaži kodo tekmovanja';
 $lang['SignedTotal']='Podpisan rezultat';
@@ -491,8 +494,10 @@
 $lang['Type_3D']='3D';
 $lang['Type_FITA']='FITA';
 $lang['UploadFile']='Prenos datotek (PDF)';
+$lang['UserName']='Uporabniško ime';
 $lang['VersionEntries']='Prijave';
 $lang['WheelChair']='Voziček/stol';
+$lang['WheelchairShort']='Voz.';
 $lang['WR-Record']='Svetovni rekord';
 $lang['YearStart']='Od leta';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/sr/IOC_Codes.php b/src/Common/Languages/sr/IOC_Codes.php
index 4c885ef6..fc868916 100644
--- a/src/Common/Languages/sr/IOC_Codes.php
+++ b/src/Common/Languages/sr/IOC_Codes.php
@@ -32,16 +32,12 @@
 $lang['BUL']='Bugarska';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Centralnoafrička Republika';
-$lang['CAM']='Kambodža';
 $lang['CAN']='Kanada';
 $lang['CAY']='Kajmanska Ostrva';
 $lang['CGO']='Republika Kongo';
 $lang['CHA']='Čad';
 $lang['CHI']='Čile';
-$lang['CHN']='Kina';
-$lang['CIV']='Obala Slonovače';
 $lang['CMR']='Kamerun';
-$lang['COD']='Demokratska Republika Kongo';
 $lang['COK']='Kukova Ostrva';
 $lang['COL']='Kolumbija';
 $lang['COM']='Komori';
@@ -50,7 +46,6 @@
 $lang['CRO']='Hrvatska';
 $lang['CUB']='Kuba';
 $lang['CYP']='Kipar';
-$lang['CZE']='Češka Republika';
 $lang['DEN']='Danska';
 $lang['DJI']='Džibuti';
 $lang['DMA']='Dominika';
@@ -80,17 +75,14 @@
 $lang['GUM']='Gvam';
 $lang['GUY']='Gvajana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Mađarska';
 $lang['INA']='Indonezija';
 $lang['IND']='Indija';
-$lang['IRI']='Iran';
 $lang['IRL']='Irska';
 $lang['IRQ']='Irak';
 $lang['ISL']='Island';
 $lang['ISR']='Izrael';
-$lang['ISV']='Američka Devičanska Ostrva';
 $lang['ITA']='Italija';
 $lang['IVB']='Britanska Devičanska Ostrva';
 $lang['JAM']='Jamajka';
@@ -102,7 +94,6 @@
 $lang['KIR']='Kiribati';
 $lang['KSA']='Saudijska Arabija';
 $lang['KUW']='Kuvajt';
-$lang['LAO']='Laos';
 $lang['LAT']='Letonija';
 $lang['LBA']='Libija';
 $lang['LBR']='Liberija';
@@ -116,7 +107,6 @@
 $lang['MAR']='Maroko';
 $lang['MAS']='Malezija';
 $lang['MAW']='Malavi';
-$lang['MDA']='Moldavija';
 $lang['MDV']='Maldivi';
 $lang['MEX']='Meksiko';
 $lang['MGL']='Mongolija';
@@ -149,7 +139,6 @@
 $lang['PNG']='Papua Nova Gvineja';
 $lang['POL']='Poljska';
 $lang['POR']='Portugalija';
-$lang['PRK']='Severna Koreja';
 $lang['PUR']='Portoriko';
 $lang['QAT']='Katar';
 $lang['ROU']='Rumunija';
@@ -173,13 +162,11 @@
 $lang['SUR']='Surinam';
 $lang['SVK']='Slovačka';
 $lang['SWE']='Švedska';
-$lang['SYR']='Sirija';
 $lang['TAN']='Tanzanija';
 $lang['TGA']='Tonga';
 $lang['THA']='Tajland';
 $lang['TJK']='Tadžikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Istočni Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Kineski Taipei';
 $lang['TRI']='Trinidad i Tobago';
diff --git a/src/Common/Languages/sr/Install.php b/src/Common/Languages/sr/Install.php
index 3d1cd039..d4c45df3 100644
--- a/src/Common/Languages/sr/Install.php
+++ b/src/Common/Languages/sr/Install.php
@@ -50,7 +50,6 @@
 $lang['Parameter']='Parametar';
 $lang['Password']='Lozinka';
 $lang['PHP settings']='PHP podešavanja';
-$lang['PHP too old']='Vaša PHP instalacija je previše stara. IANSEO zahteva najmanje PHP 5.0.';
 $lang['PHP version']='PHP verzija';
 $lang['php.ini file']='php.ini fajl';
 $lang['Prepare']='Priprema podataka za ažuriranje';
diff --git a/src/Common/Languages/sr/Tournament.php b/src/Common/Languages/sr/Tournament.php
index ed2ead00..0715d59c 100644
--- a/src/Common/Languages/sr/Tournament.php
+++ b/src/Common/Languages/sr/Tournament.php
@@ -43,7 +43,6 @@
 $lang['BadgeIncludePhoto']='Staviti fotografije na propusnicu?';
 $lang['BadgeNames']='Puno ime (Nije štampano prvo)';
 $lang['BadgeNoData']='Nema podataka za štampu';
-$lang['BadgeOnlyNotPrinted']='SAMO propusnice koje nisu već odštampane?';
 $lang['BadgeOnlyPrintAccredited']='SAMO propusnice akreditovanih učesnika?';
 $lang['BadgeOnlyPrintPhoto']='SAMO propusnice sa fotografijom?';
 $lang['BadgeOptions']='Opcije';
@@ -73,7 +72,6 @@
 $lang['Cash']='Ukupno plaćanje';
 $lang['CatJudge']='Sudije';
 $lang['CatOC']='Organizacioni odbor';
-$lang['ChairmanJudge']='Glavni sudija';
 $lang['CheckRefMail']='Proveriti referentni e-mail...';
 $lang['CheckTargetUpdate']='Proveri ažuriranje podataka';
 $lang['Classes']='Klase';
@@ -367,7 +365,6 @@
 $lang['TargetTo']='Završna meta';
 $lang['TeamClEvent']='Ekipne kvalifikacije';
 $lang['TeamFin']='Ekipno - Rasp. i Finale';
-$lang['TeamFinEvent']='Ekipno finale';
 $lang['TeamQual']='Ekipno - Kvalifikacije';
 $lang['TicketGetScore']='Sakupljanje rezultata u toku takmičenja';
 $lang['TieWinner']='Pobednik dopucavanja';
diff --git a/src/Common/Languages/sv/Api.php b/src/Common/Languages/sv/Api.php
index 6812a2d2..2fb57b91 100644
--- a/src/Common/Languages/sv/Api.php
+++ b/src/Common/Languages/sv/Api.php
@@ -27,6 +27,8 @@
 $lang['Desc-Let-R']='Markering i fel omgång';
 $lang['Desc-Let-Y']='Serie klar att importera';
 $lang['Desc-Let-Z']='Markering pågår';
+$lang['DevConnected']='Ansluten';
+$lang['DevDisconnected']='Inte ansluten';
 $lang['DistanceNum']='avstånd $a';
 $lang['FieldMonitor']='Fältövervakning';
 $lang['FlashCodeDistance']='Scanna denna QR-kod i appen för att mata in poäng på $a';
@@ -42,6 +44,8 @@
 $lang['ISK-ConnectionStatus']='Uppkopplingsstatus';
 $lang['ISK-DeleteDevices']='Radera enheter';
 $lang['ISK-DenyAccess']='Neka åtkomst';
+$lang['ISK-Deprecated']='VIKTIGT! Den gamla ianseo appen kommer inte längre att uppdateras. Den kommer att tas bort ifrån ianseo i september 2024.
+Använd Scorekeeper NG istället.';
 $lang['ISK-DeviceBattery']='% Batteri';
 $lang['ISK-DeviceEnabled']='Aktiverad';
 $lang['ISK-DeviceId']='Enhets-ID';
@@ -51,15 +55,17 @@
 $lang['ISK-DeviceStatusWanted']='Pusha nya inställningar';
 $lang['ISK-DeviceUsed']='Aktiv';
 $lang['ISK-enableGPS']='Skicka position';
-$lang['ISK-EnableScore']='Använd Ianseo ScoreKeeper';
+$lang['ISK-enableHaptics']='Aktivera Haptisk respons';
+$lang['ISK-EnableScore']='Använd Ianseo ScoreKeeper NG';
 $lang['ISK-enableTotals']='Aktivera Total';
 $lang['ISK-enableWIFIManagement']='Tillåt appen att hantera Wi-Fi';
 $lang['ISK-ExportDevices']='Exportera enheter';
 $lang['ISK-ForceConfirm']='Tvinga enhetsinställningar';
 $lang['ISK-Gps']='GPS-position';
+$lang['ISK-gpsFrequency']='Uppdateringsfrekvens';
 $lang['ISK-hideTotals']='Göm totalen';
 $lang['ISK-ImportDevices']='Importera enheter';
-$lang['ISK-LicenseNumber']='Licenskod för<br>Scorekeeper PRO';
+$lang['ISK-LicenseNumber']='Licensnyckel för<br>Scorekeeper PRO';
 $lang['ISK-Lite-Name']='Ianseo ScoreKeeper Lite';
 $lang['ISK-Lite-NoCompCode']='Tävlingskoden saknas';
 $lang['ISK-Lite-QRCode']='Skriv ut QR-koden för Ianseo ScoreKeeper Lite';
@@ -81,7 +87,9 @@
 $lang['ISK-Sequence']='Schemalagd tävlingsfas.';
 $lang['ISK-ServerUrl']='Server-URL<br>(inklusive protokoll och port, om inte 80)';
 $lang['ISK-ServerUrlPin']='Säkerhetskod för tävling.';
+$lang['ISK-SettingsPIN']='Ställ in PIN';
 $lang['ISK-SocketAction']='Åtgärd';
+$lang['ISK-SocketIP']='Web Socket IP (för enheter)';
 $lang['ISK-spottingMode']='Spotting-läge';
 $lang['ISK-StatusOK']='Enheten är konfigurerad';
 $lang['ISK-StatusReloading']='Inställningar laddas upp';
@@ -90,6 +98,7 @@
 $lang['ISK-TruncateTableAll']='Töm temp-tabellen (helt)';
 $lang['ISK-UsePersonalDevices']='Använd skyttarnas enheter';
 $lang['ISK-UsePersonalDevices-Help']='Aktivera detta ifall ni vill ha möjlighet att använda skyttars egna telefoner. De behöver registreras under "Hantera enheter", innan de kan skanna QR-koder på skjutkort eller tavlor, för att kunna registrera poäng.';
+$lang['ISK-WiFi']='WiFi inställningar';
 $lang['IskDeviceAssigned']='Enhetskod';
 $lang['IskResetAlert']='Varning: Alla inställningar, förutom tavelgrupperingar, som inte gäller för vald App-typ kommer att raderas.';
 $lang['IskSpuriousScore-Device']='Enhet $a[0] markerar på tavla $a[1] i omgång/avstånd $a[2]';
diff --git a/src/Common/Languages/sv/BackNumbers.php b/src/Common/Languages/sv/BackNumbers.php
index 6f13cb1c..86c03ae9 100644
--- a/src/Common/Languages/sv/BackNumbers.php
+++ b/src/Common/Languages/sv/BackNumbers.php
@@ -41,10 +41,10 @@
 $lang['BadgeSetup']='Badge setup';
 $lang['BadgeTest']='Test-badge';
 $lang['Barcode']='Scanna Streckkod';
-$lang['BarCodeFields']='<ul> <li><b>Blank: </b> En "–" separerad sträng med, IdrottsID, Skjutstil och klass skrivs ut.</li> <li><b>{ENCODE}: </b>{ENCODE} ger IdrottsID</li> <li><b>{COUNTRY}: </b>{COUNTRY} ger Klubb-/lands- nummer/kod.</li> <li><b>{DIVISION}: </b>{DIVISION} ger Skjutstil</li> <li><b>{CLASS}: </b>{CLASS} ger Klass</li> <li><b>{TOURNAMENT}: </b>{TOURNAMENT} ger Tävlingskoden</li> </ul>';
+$lang['BarCodeFields']='<ul> <li><b>Blank: </b> En "–" separerad sträng med, licensnummer, Skjutstil och klass skrivs ut.</li> <li><b>{ENCODE}: </b>{ENCODE} ger licensnummer</li> <li><b>{COUNTRY}: </b>{COUNTRY} ger Klubb-/lands- nummer/kod.</li> <li><b>{DIVISION}: </b>{DIVISION} ger Skjutstil</li> <li><b>{CLASS}: </b>{CLASS} ger Klass</li> <li><b>{TOURNAMENT}: </b>{TOURNAMENT} ger Tävlingskoden</li> </ul>';
 $lang['BarcodeSeparator']='Streckkodsavskiljare';
 $lang['BgImage']='Bakgrundsbild';
-$lang['BibNumber']='Idrotts-ID';
+$lang['BibNumber']='Licensnr.';
 $lang['BlackWhite']='Svart/Vit';
 $lang['Bold']='Fet';
 $lang['Category']='Klass';
@@ -78,16 +78,23 @@
 $lang['FamCaps']='EFTERNAMN';
 $lang['FamCaps-GAlone']='EFTERNAMN F.';
 $lang['FamCaps-GivCamel']='EFTERNAMN Förnamn';
+$lang['FamCaps-GivCamel-ClubCamel']='EFTERNAMN Förnamn, Klubbnamn';
+$lang['FamCaps-GivCamel-ClubCaps']='EFTERNAMN Förnamn, KLUBBNAMN';
 $lang['FamCaps-GivCaps']='EFTERNAMN FÖRNAMN';
+$lang['FamCaps-GivCaps-ClubCaps']='EFTERNAMN FÖRNAMN, KLUBBNAMN';
 $lang['FinPosition']='Total placering';
 $lang['Flag']='Klubblogga';
 $lang['GAlone-FamCamel']='F. Efternamn';
 $lang['GAlone-FamCaps']='F. EFTERNAMN';
 $lang['GivCamel']='FörNamn';
 $lang['GivCamel-FamCamel']='Förnamn Efternamn';
+$lang['GivCamel-FamCamel-ClubCamel']='Förnamn Efternamn, Klubbnamn';
 $lang['GivCamel-FamCaps']='Förnamn EFTERNAMN';
+$lang['GivCamel-FamCaps-ClubCamel']='Förnamn EFTERNAMN, Klubbnamn';
+$lang['GivCamel-FamCaps-ClubCaps']='Förnamn EFTERNAMN, KLUBBNAMN';
 $lang['GivCaps']='FÖRNAMN';
 $lang['GivCaps-FamCaps']='FÖRNAMN EFTERNAMN';
+$lang['GivCaps-FamCaps-ClubCaps']='FÖRNAMN EFTERNAMN, KLUBBNAMN';
 $lang['GivenNameInitial']='Förnamn, initial';
 $lang['Heigh']='Höjd';
 $lang['HLine']='Horisontell linje';
@@ -103,6 +110,7 @@
 $lang['IncludeLogo']='Inkludera flagga/klubblogga';
 $lang['IncludeSession']='Inkludera omgång vid utskrift';
 $lang['Italic']='Kursiv';
+$lang['Landscape']='Landskap';
 $lang['NewBadgeName']='Namnge Badge';
 $lang['NocCaps']='Klubbnummer';
 $lang['NocCaps-ClubCamel']='KLUBBNUMMER Klubbnamn';
@@ -112,12 +120,13 @@
 $lang['PageDimension']='Sidstorlek';
 $lang['PaperDimention']='Pappersstorlek';
 $lang['Picture']='Deltagarfoto';
+$lang['Portrait']='Porträtt';
 $lang['PosX']='Position (X)';
 $lang['PosY']='Posistion(Y)';
 $lang['PrintBackNo']='Skrivt ut "startnummerlappar"';
 $lang['PrintSpecificBadges']='Print Using Auto-matching Badges';
 $lang['Q-Badge']='Startnummerlapp';
-$lang['QrCodeFields']='<ul> <li><b>Blank: </b> En "–" separerad sträng med, IdrottsID, Skjutstil och klass skrivs ut.</li> <li><b>{ENCODE}: </b>{ENCODE} ger IdrottsID</li> <li><b>{COUNTRY}: </b>{COUNTRY} ger Klubb-/lands- nummer/kod.</li> <li><b>{DIVISION}: </b>{DIVISION} ger Skjutstil</li> <li><b>{CLASS}: </b>{CLASS} ger Klass</li> <li><b>{TOURNAMENT}: </b>{TOURNAMENT} ger Tävlingskoden</li> </ul>';
+$lang['QrCodeFields']='<ul> <li><b>Blank: </b> En "–" separerad sträng med, licensnummer, Skjutstil och klass skrivs ut.</li> <li><b>{ENCODE}: </b>{ENCODE} ger licensnummer</li> <li><b>{COUNTRY}: </b>{COUNTRY} ger Klubb-/lands- nummer/kod.</li> <li><b>{DIVISION}: </b>{DIVISION} ger Skjutstil</li> <li><b>{CLASS}: </b>{CLASS} ger Klass</li> <li><b>{TOURNAMENT}: </b>{TOURNAMENT} ger Tävlingskoden</li> </ul>';
 $lang['QualPosition']='Placering efter kval.';
 $lang['RandomImage']='Bild/foto';
 $lang['Ranking']='Ranking kvalomgång';
@@ -137,6 +146,7 @@
 $lang['ToRight']='Tävlingslogga (Höger)';
 $lang['TVViewIdCard']='Visa som ID-kort';
 $lang['TVViewIdCardDescr']='När matcher visas ställer denna in så att skyttarnas namn och klubb visas på två rader.<br>Resultatet visas mellan skyttarna.';
+$lang['VLayout']='Vertikal';
 $lang['Width']='Bredd';
 $lang['Y-Badge']='Individuellt diplom';
 $lang['Z-Badge']='Lagdiplom';
diff --git a/src/Common/Languages/sv/Common.php b/src/Common/Languages/sv/Common.php
index 4660c08e..d81e17ff 100644
--- a/src/Common/Languages/sv/Common.php
+++ b/src/Common/Languages/sv/Common.php
@@ -1,7 +1,7 @@
 <?php
 $lang['0_Phase']='Guld';
 $lang['0_PhaseNM']='Guldfinal';
-$lang['14_Phase']='1/14-del';
+$lang['14_Phase']='1/14';
 $lang['16_Phase']='1/16';
 $lang['1_Phase']='Brons';
 $lang['1_PhaseNM']='Bronsfinal';
@@ -10,6 +10,8 @@
 $lang['32_Phase']='1/32';
 $lang['48_Phase']='1/48';
 $lang['4_Phase']='1/4';
+$lang['50M']='50 Men';
+$lang['50W']='50 Women';
 $lang['64_Phase']='1/64';
 $lang['8_Phase']='1/8';
 $lang['AccreditationBoothSetup']='Inställning för ackrediteringsbås';
@@ -21,7 +23,7 @@
 $lang['AI']='Instinktiv';
 $lang['AllEvents']='Alla';
 $lang['AllMainReviews']='Huvudspråk kommentarer';
-$lang['AllowMultiTeam']='Skapa automatiskt [Multiple] lag';
+$lang['AllowMultiTeam']='Skapa automatiskt [Multipla] lag';
 $lang['AllowPartialTeams']='Tillåt även ofullständiga lag';
 $lang['AllSecReviews']='Andra språk kommentarer';
 $lang['All_Phases']='Alla delar';
@@ -73,7 +75,7 @@
 $lang['CountryCode']='Klubbkod';
 $lang['CountryNameParent1']='Första nivån';
 $lang['CountryNameParent2']='Andra nivån';
-$lang['CrackError']='Ingen tävling vald- gå tillbaka till startsidan och öppna en.';
+$lang['CrackError']='Ingen tävling vald- gå tillbaka till <b><a href="/index.php">startsidan </a></b> och öppna en.';
 $lang['CW']='Kadett damer';
 $lang['DateFmt']='d-m-Y';
 $lang['DateFmtDB']='%d-%m-%Y';
@@ -122,6 +124,10 @@
 $lang['Finish']='Slut';
 $lang['FirstPhase']='Första delen';
 $lang['FopSetup']='Layout tävlingsomr. (FOP)';
+$lang['Gender0']='Man';
+$lang['Gender1']='Kvinna';
+$lang['GenderShort0']='M';
+$lang['GenderShort1']='K';
 $lang['GF']='Young Girls';
 $lang['GM']='Young Boy';
 $lang['HELP']='HJÄLP!';
@@ -137,6 +143,8 @@
 $lang['IndFinEventWithoutShootOff']='OBS!<br>I följande klasser finns skyttar kvar att särskilja innan stegarna kan visas!';
 $lang['IndImport']='Importera data till individuella stegarna';
 $lang['Individual']='Individuell';
+$lang['IndTeam-0']='Individuell';
+$lang['IndTeam-1']='Lag';
 $lang['InitFinalGrids']='Skapa stegar';
 $lang['InitPools']='Skapa stegar';
 $lang['ISK-Configuration']='Hantera enheter';
@@ -194,6 +202,7 @@
 $lang['MenuLM_Category Result List']='Resultatlista per klass';
 $lang['MenuLM_Change Components']='Ändra lagsammansättning';
 $lang['MenuLM_ChangeNationsNames']='Ändra nations-/klubbnamn';
+$lang['MenuLM_ChangePassword']='Ändra lösenord';
 $lang['MenuLM_Check Data Update']='Check Data Update';
 $lang['MenuLM_Check shoot-off before eliminations']='Kontrollera särskjutning innan eliminering';
 $lang['MenuLM_Check shoot-off before final phases']='Kontrollera särskjutning innan finaler';
@@ -266,6 +275,7 @@
 $lang['MenuLM_ListLoad']='Uppladdning lista(kalkylblad)';
 $lang['MenuLM_Lock manage']='Inställningar för nätverksåtkomst';
 $lang['MenuLM_Lock setup']='Blockera redigering';
+$lang['MenuLM_Logout']='Logga ut';
 $lang['MenuLM_LueFill']='Create LookUp from File';
 $lang['MenuLM_Manage Events']='Hantera tävling';
 $lang['MenuLM_ManAwards']='Prisutdelning';
@@ -328,7 +338,7 @@
 $lang['MenuLM_TargetAssignmentSecond']='Tavelhantering del 2';
 $lang['MenuLM_TargetAssignmentThird']='Tavelhantering del 3';
 $lang['MenuLM_TargetFromRank']='Tavelplacering enligt ranking';
-$lang['MenuLM_Targets']='Tapetval';
+$lang['MenuLM_Targets']='Tapet-/målval';
 $lang['MenuLM_Team Final Setup']='Inställningar Lagfinaler';
 $lang['MenuLM_Team Finals']='Lagfinaler';
 $lang['MenuLM_Team Spot']='Team Spot';
@@ -336,6 +346,7 @@
 $lang['MenuLM_TV Channels']='Ställ in "TV Output" kanaler';
 $lang['MenuLM_TV Output']='TV Output';
 $lang['MenuLM_TVAdvanced']='TV Output (Advanced)';
+$lang['MenuLM_Twitter']='X';
 $lang['MenuLM_Update']='Uppdatera IANSEO';
 $lang['MenuLM_UpdateWeb']='ianseo live (särskild tjänst)';
 $lang['MenuLM_Versioning']='Ställ in version';
@@ -360,7 +371,7 @@
 $lang['MsgAttentionFinReset']='<b>VARNING!</b><br>Du kan inte ångra detta!!!<br>Alla data i individuella final- och lagstegar kommer att raderas.<br>Denna procedur används endast om det har rättats till fel i kvalet eller shoot-off.<br>Vill du fortsätta?';
 $lang['MsgImportError']='Error!<br>Cannot Import Data!';
 $lang['MsgImportOk']='Import slutförd';
-$lang['MsgInitFinalGridsError']='<b>VARNING!</b><br>Stegarna är redan inställda, vill du fortsätta?<br>Registrerade poäng kommer att raderas.';
+$lang['MsgInitFinalGridsError']='<b>VARNING!</b><br>Stegarna är redan inställda, vill du fortsätta?<br>Poäng registrerade i stegen kommer att raderas.';
 $lang['MsgInitFinalGridsOk']='Initiering lyckades';
 $lang['MsgMakeFinReset']='Final Brackets Re-Initialized!<br>Redo all the preliminary operation before insert new data!';
 $lang['MsgNeedInitGrids']='FEL!<br>Stegarna är inte inställda!';
@@ -415,6 +426,7 @@
 $lang['Score1Page1Match']='Matchprotokoll';
 $lang['ScoreDrawing']='Tomma skjutkort (Ett per sida)';
 $lang['ScoreFilled']='Skriv ut skjutkort med ifyllda pilvärden och sammanräkning';
+$lang['ScoreIncAllNames']='Inkludera alla <u>möjliga</u> motståndare';
 $lang['ScoreIncEmpty']='Skriv ut matcher även när motståndare saknas';
 $lang['Scorer']='Markör';
 $lang['SelectAll']='Välj alla';
@@ -433,8 +445,8 @@
 $lang['SpottingTeam']='Team Spot';
 $lang['Status_0']='Får delta';
 $lang['Status_1']='Tillåts delta efter kontroll';
-$lang['Status_5']='Okänd status fram till tävlingsdagen';
-$lang['Status_6']='Drar sig ur';
+$lang['Status_5']='Saknar giltig licens';
+$lang['Status_6']='DNF - bryter';
 $lang['Status_7']='Ej ackrediterad – DNS';
 $lang['Status_8']='Tillåts ej delta - ofullständig dokumentation';
 $lang['Status_9']='Tillåts ej delta';
@@ -446,6 +458,7 @@
 $lang['TargetType']='Tapet/mål';
 $lang['TB']='Shoot off';
 $lang['Team']='Lag';
+$lang['TeamComponents']='Lagmedlemmar';
 $lang['TeamDefinition']='Lagdefinition';
 $lang['TeamEventList']='Lagfinaler/elimineringar';
 $lang['TeamFinal']='Lagfinaler';
diff --git a/src/Common/Languages/sv/Errors.php b/src/Common/Languages/sv/Errors.php
index 396d3a0f..1fc4e0cd 100644
--- a/src/Common/Languages/sv/Errors.php
+++ b/src/Common/Languages/sv/Errors.php
@@ -4,11 +4,18 @@
 $lang['BarCodeSession']='Kontrollera inställningarna. Omgång är inte inställd.';
 $lang['BarCodeSettings']='Kontrollera inställningarna.';
 $lang['ClassFromToError']='Från och till får bara innehålla siffror';
+$lang['EndsArrowsMisMatch']='$a som har fel inställningar för serier/pilar';
+$lang['EntriesNoCategory']='Anmälda som saknar klass';
+$lang['EntriesNoCountry']='Anmälda som saknar Klubb/Land';
 $lang['ErrCodeExists']='Ansökan är redan gjord för denna tävlingskod!<br>Om du inte fått bekräftelsemail, prova att byta kod och ansök igen.';
+$lang['ErrEmptyFields']='Uppgifter saknas eller är felaktiga.';
 $lang['ErrNoError']='Ansökan lyckades! Du kommer strax att få ett mail med koden. Tävlingen är inte aktiverad just nu. Du kommer att få ett mail när den är aktiverad.';
 $lang['ErrNoName']='Namn saknas';
 $lang['ErrUnknownNation']='Okänt land';
+$lang['EventIncompleteSetting']='$a med saknade klassinställningar';
 $lang['LockedProcedure']='Processen är låst. Öppna tävlingen igen för att fortsätta.';
+$lang['NoDistancesSet']='Klasser som saknar avståndsinställningar';
 $lang['NoPrivilege']='Behörighet saknas. Redigering är låst.';
 $lang['NoSameOrders']='Ordningstalet kan inte vara samma som på en annan del i kanalen.';
+$lang['NoTargetSet']='Klasser som saknar tapet-/mål-inställningar';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/sv/Help.php b/src/Common/Languages/sv/Help.php
index d1d4a1a0..b0c3928f 100644
--- a/src/Common/Languages/sv/Help.php
+++ b/src/Common/Languages/sv/Help.php
@@ -1,4 +1,5 @@
 <?php
+$lang['AuthTourCode']='Kommaseparerad lista med tävlingskoder som användaren har tillgång till.<br>Tillåten joker "%"';
 $lang['AutoImportSettings']='<b><u>OBS! Endast för experter</u></b><br>Om du ändrar dessa inställningar till manuellt, får du inte publicera några resultat förrän du uppdaterat rankingen manuellt.<br> Det är viktigt att du uppdaterar ranking som du ställt om till "manuellt" <b>INNAN</b> du skickar till ianseo.net, eller publicerar/skriver ut.';
 $lang['ChangeComponents']='<p>Börja med att klicka ur den skytt du vill ta bort ur laget innan du klicka i en ny.</p>&#9654&nbsp;Skyttens poäng är inräknad i lagets kvalpoäng.<br>&#9655&nbsp;Skyttens poäng är inte medräknad i lagets kvalpoäng.';
 $lang['GetBarcodeSeparator']='Efter att du skrivit ut Streckkodskommandon, scanna «SEPARATOR» koden för att aktivera rätt inställningar för streckkodsläsaren.';
@@ -9,4 +10,6 @@
 Om du skriver något inringat av taggen &lt;qrcode&gt;...&lt;/qrcode&gt;, kommer detta att omvandlas till en QR-kod.';
 $lang['ScoreBarCodeShortcuts']='<b>OBS!</b> Välj omgång och avstånd innan du scannar/skriver.<br>Tänk på att scanna streckkoden för aktuellt avstånd.<br>Scanna streckkoden på skjutkortet.<br>
 Saknar du scanner kan du fylla i manuellt i rutan "scanna streckkod".<br>Skriv @ följt av tavelnummer, tryck enter.<br>Eller, skriv # följt av skyttens namn, tryck enter.<br>';
+$lang['UserName']='Unikt användarnamn. Minst 6 tecken.';
+$lang['UserPassword']='Lämna tomt för att behålla nuvarande lösenord.';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/sv/IOC_Codes.php b/src/Common/Languages/sv/IOC_Codes.php
index a2fe3225..a70d21f4 100644
--- a/src/Common/Languages/sv/IOC_Codes.php
+++ b/src/Common/Languages/sv/IOC_Codes.php
@@ -12,7 +12,6 @@
 $lang['ASA']='Amerikanska Samoaöarna';
 $lang['AUS']='Australien';
 $lang['AUT']='Österrike';
-$lang['Award-Anthem']='Mina damer och herrar, var goda och stå upp för nationalsången för';
 $lang['Award-Applause']='Mina damer och herrar, kan vi ge en varm applåd till alla våra deltagare.';
 $lang['Award-Intro']='Mina damer och herrar, medaljceremonin för';
 $lang['Award-MedalGiver']='Medaljerna presenteras av $a';
@@ -41,16 +40,13 @@
 $lang['BUL']='Bulgarien';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Centralafrikanska Republiken';
-$lang['CAM']='Kambodja';
 $lang['CAN']='Kanada';
 $lang['CAY']='Caymanöarna';
 $lang['CGO']='Republiken Kongo';
 $lang['CHA']='Tchad';
 $lang['CHI']='Chile';
-$lang['CHN']='Kina';
 $lang['CIV']='Elfenbenskusten';
 $lang['CMR']='Kamerun';
-$lang['COD']='Kongos demokratiska republik';
 $lang['COK']='Cooköarna';
 $lang['COL']='Columbia';
 $lang['COM']='Komorerna';
@@ -59,7 +55,6 @@
 $lang['CRO']='Kroatien';
 $lang['CUB']='Kuba';
 $lang['CYP']='Cypern';
-$lang['CZE']='Tjeckien';
 $lang['DEN']='Danmark';
 $lang['DJI']='Djibouti';
 $lang['DMA']='Dominica';
@@ -90,17 +85,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Ungern';
 $lang['INA']='Indonesien';
 $lang['IND']='Indien';
-$lang['IRI']='Iran';
 $lang['IRL']='Irland';
 $lang['IRQ']='Irak';
 $lang['ISL']='Island';
 $lang['ISR']='Israel';
-$lang['ISV']='Amerikanska Jungfruöarna';
 $lang['ITA']='Italien';
 $lang['IVB']='Brittiska Jungfruöarna';
 $lang['JAM']='Jamaica';
@@ -113,7 +105,6 @@
 $lang['KOR']='Sydkorea';
 $lang['KSA']='Saudiarabien';
 $lang['KUW']='Kuwait';
-$lang['LAO']='Laos';
 $lang['LAT']='Lettland';
 $lang['LBA']='Libyen';
 $lang['LBR']='Liberia';
@@ -127,7 +118,6 @@
 $lang['MAR']='Marocko';
 $lang['MAS']='Malaysia';
 $lang['MAW']='Malavi';
-$lang['MDA']='Moldavien';
 $lang['MDV']='Maldiverna';
 $lang['Medal-1']='Guld medaljen';
 $lang['Medal-2']='Silver medaljen';
@@ -136,7 +126,6 @@
 $lang['MEX']='Mexiko';
 $lang['MGL']='Mongoliet';
 $lang['MHL']='Marshallöarna';
-$lang['MKD']='Makedonien';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Montenegro';
@@ -165,7 +154,6 @@
 $lang['PNG']='Papua Nya Guinea';
 $lang['POL']='Polen';
 $lang['POR']='Portugal';
-$lang['PRK']='Nordkorea';
 $lang['PUR']='Puerto Rico';
 $lang['QAT']='Qatar';
 $lang['ROU']='Rumänien';
@@ -191,13 +179,11 @@
 $lang['SVK']='Slovakien';
 $lang['SWE']='Sverige';
 $lang['SWZ']='Swaziland';
-$lang['SYR']='Syrien';
 $lang['TAN']='Tanzania';
 $lang['TGA']='Tonga';
 $lang['THA']='Thailand';
 $lang['TJK']='Tajikistan';
 $lang['TKM']='Turkmenistan';
-$lang['TLS']='Östtimor';
 $lang['TOG']='Togo';
 $lang['TPE']='Chinese Taipei';
 $lang['TRI']='Trinidad och Tobago';
diff --git a/src/Common/Languages/sv/ISK-App.php b/src/Common/Languages/sv/ISK-App.php
index 586124ec..50c02edb 100644
--- a/src/Common/Languages/sv/ISK-App.php
+++ b/src/Common/Languages/sv/ISK-App.php
@@ -126,7 +126,7 @@
 $lang['SettingsElimFirstTarget']='Första mål';
 $lang['SettingsEventSelection']='Tävlingskonfiguration';
 $lang['SettingsFunctionsCategory']='Övriga funktioner';
-$lang['SettingsFunctionsResetSettings']='Återställ alla inställningar';
+$lang['SettingsFunctionsResetSettings']='Nollställ alla inställningar';
 $lang['SettingsGenerateQr']='Skapa';
 $lang['SettingsGpsCategory']='GPS-position';
 $lang['SettingsGpsFrequency']='Frekvens';
@@ -162,7 +162,7 @@
 $lang['SettingsQrCodesDevice']='Enhet';
 $lang['SettingsQrCodesPayload']='QR-data';
 $lang['SettingsQrCodesScorecard']='Skjutkort';
-$lang['SettingsReset']='Återställ';
+$lang['SettingsReset']='Nollställ';
 $lang['SettingsSaveConfig']='Spara';
 $lang['SettingsScanSendQr']='Skanna';
 $lang['SettingsScanSendQrError']='Kunde inte hantera QR-koden';
@@ -189,7 +189,7 @@
 $lang['ShootoffClosestNew']='Ny shoot-off';
 $lang['ShootoffClosestTitle']='Närmast till center krävs';
 $lang['ShootoffNewConfirmation']='Shoot-off bekräftelse';
-$lang['ShootoffNewIsNeeded']='Krävs en till shoot-off för att avgöra vinnaren?';
+$lang['ShootoffNewIsNeeded']='Krävs det en till shoot-off för att avgöra vinnaren?';
 $lang['SignatureClear']='Ta bort';
 $lang['SignatureIncorrectCodeMessage']='QR-koden stämmer inte för denna skytt. Är du säker på att du har scannat koden för {{n}}? V.g. scanna rätt QR-kod.';
 $lang['SignatureIncorrectCodeTitle']='Felaktig kod';
diff --git a/src/Common/Languages/sv/Install.php b/src/Common/Languages/sv/Install.php
index d888a84d..3edb079a 100644
--- a/src/Common/Languages/sv/Install.php
+++ b/src/Common/Languages/sv/Install.php
@@ -9,8 +9,12 @@
 $lang['Credits-Coordination']='IT Project Coordination';
 $lang['Credits-CoreGroup']='IANSEO Core Group';
 $lang['Credits-Credits']='Credits';
+$lang['Credits-Documentation']='Dokumentation & Support';
+$lang['Credits-FitarcoCredits']='Vad är Ianseo? Ianseo är ett system för resultathantering på en bågskyttetävling.<br>Ianseo är ett Open Source projekt möjliggjort med stöd av det Italienska bågskytteförbundet, som beslutat att dela med sig systemet gratis till att börja med i Europa.<br>Systemet har sedan spridits och används över hela världen, och används på alla nivåer allt ifrån enkla klubbtävlingar till Världscuppstävlingar och Olympiska spel.<br>
+Systemet har utvecklats ifrån att endast hantera skyttarnas poäng till att sköta allt från avgiftsadministration och materialkontroll till publicering av TV-grafik i direktsändningar. Utöver detta finner du säkert fler funktioner, mer eller mindre användbara för just din tävling.';
 $lang['Credits-HHT']='HHT Integration';
 $lang['Credits-IanseoTeam']='Ianseo & Ianseo Team';
+$lang['Credits-IanseoWorld']='I.A.N.S.E.O, en grupp av experter, har erfarenheter som sträcker sig enda tillbaka till 1970-talet.Sedan 2006 arbetar gruppen som ett team som involverats i allt högre grad inom bågskyttet. Till att börja med tävlingar inom Italien till att idag ansvara för systemet i World Archerys regi under allt från Olympiska spel till Världscupstävlingar.';
 $lang['Credits-License']='IANSEO is released under GNU GENERAL PUBLIC LICENSE version 3 (GPLV3)';
 $lang['Credits-Translators']='IANSEO Translation Team';
 $lang['Database name']='Databasnamn';
@@ -40,7 +44,7 @@
 $lang['ModuleSetNo']='The Norwegian Ruleset has been made thanks to a contribution of the Norwegian Archery Federation (<a href="http://www.bueskyting.no/" target="_blank">Norges Bueskytterforbund</a>).';
 $lang['ModuleSetSE']='The Swedish Ruleset has been made thanks to a contribution of the Swedish Archery Federation (Svenska Bågskytteförbundet).';
 $lang['Mysql-description']='Data can be written and read in two separate servers,<br/>provided the read server is a synchronous replica (slave) of the first.<br/>If in doubt leave the right column blank!';
-$lang['Mysql-root-description']='If user and database are to be created from scratch,<br/>you can provide the password of the ROOT user of the servers.<br/><B>WARNING!!!</B> PASSWORDS WILL BE TRANSMITTED IN CLEAR TEXT<br/>OVER THE INTERNET SO IT MIGHT BE WISER<br/>TO CREATE THE USERS WITH OTHER TOOLS!!!';
+$lang['Mysql-root-description']='If user and database are to be created from scratch,<br>you can provide the password of the ROOT user of the servers.<br><b>WARNING!!!</b> PASSWORDS WILL BE TRANSMITTED IN CLEAR TEXT<br>OVER THE INTERNET SO IT MIGHT BE WISER<br>TO CREATE THE USERS WITH OTHER TOOLS!!!';
 $lang['NoData']='No data provided...';
 $lang['NoDowngrade']='It is not possible to downgrade your installation. If you do want so, please install a fresh version of Ianseo <b>ON A DIFFERENT DATABASE</b>.';
 $lang['NorgesRunden']='Norges Runden';
@@ -53,7 +57,6 @@
 $lang['Parameter']='Parameter';
 $lang['Password']='Lösenord';
 $lang['PHP settings']='PHP-inställningar';
-$lang['PHP too old']='Your PHP installation is too old. The minimum version number for IANSEO is 5.0.';
 $lang['PHP version']='PHP-version';
 $lang['php.ini file']='php.ini file';
 $lang['Prepare']='Förbereder för uppdatering.';
diff --git a/src/Common/Languages/sv/ODF.php b/src/Common/Languages/sv/ODF.php
index b4845b57..ebeb53be 100644
--- a/src/Common/Languages/sv/ODF.php
+++ b/src/Common/Languages/sv/ODF.php
@@ -2,4 +2,6 @@
 $lang['DocumentVersion']='Version';
 $lang['IntEVENT']='Namn';
 $lang['IntSCHED']='Schema';
+$lang['IrmHelp']='IRM: När du ställer in IRM status kommer ianseo att ställa in rankingen så att skytten hamnar längst ner på resultatlistorna. DNF (no rank) --> 29.999; DNS ––> 30.000; DSQ ––> 31.000; DQB ––> 32.000. Om du återställer en inställd IRM status måste du uppdatera rankingen och kontrollera att <b>ALLT</b> blivit rätt i resultatlistorna.';
+$lang['WinnerMatchName']='Vinnare av match $a';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/sv/RunArchery.php b/src/Common/Languages/sv/RunArchery.php
index 9d46378b..c2513285 100644
--- a/src/Common/Languages/sv/RunArchery.php
+++ b/src/Common/Languages/sv/RunArchery.php
@@ -2,6 +2,7 @@
 $lang['AdjustedTime']='Korrigering';
 $lang['ArrowShort']='Pil';
 $lang['ArrowsShot']='Skjutna pilar';
+$lang['Bib']='Licensnr.';
 $lang['CompetitionRounds']='Ronder';
 $lang['CreateTeams']='Återskapa Lag';
 $lang['PhaseName-2']='Semifinaler';
diff --git a/src/Common/Languages/sv/Tournament.php b/src/Common/Languages/sv/Tournament.php
index 77749975..9b4cd34c 100644
--- a/src/Common/Languages/sv/Tournament.php
+++ b/src/Common/Languages/sv/Tournament.php
@@ -25,7 +25,6 @@
 $lang['AclISKServer']='Hantera enheter';
 $lang['AclModules']='Moduler';
 $lang['ACLNoAccess']='Ingen åtkomst';
-$lang['AclNotes']='<b>Observera att:</b><ul><li>Inställningarna är tävlingsspecifika, de påverkar inte andra tävlingar på servern.</li><li>När restriktioner är aktiverade kommer icke listade klienter(datorer etc) inte att ha tillgång till tävlingen. <u>Detta gäller inte appen</u></li><li>Klienter som försöker ansluta till tävlingen dyker upp i listan ovan, och kan ges behörighet.</li><li>localhost (127.0.0.1 eller ::1) kan inte spärras.</li><li>Tänk på att <b>inte</b> aktivera restriktioner om du inte har tillgång till servern utan att först ha listat din IP-adress <u>Börja med att aktivera registrering av IP-adresser,</u><br>ppdatera sidan så att din IP-adress läggs till. Klicka på den gröna bocken till vänster om din IP-adress</li><li>Om du råkar låsa dig ute från tävlingen, så kan restriktionerna avaktiveras genom att gå in på servern skriva: <b>{$a}</b> </li> <li>Du kan manuellt ställa in ett spann av IP-adresser genom att använda * exempelvis (192.168.0.* eller 172.16.*)<br>Anslutna datorer i en grupp får begränsade behörigheter som kan ändras här.</li></ul>';
 $lang['AclOdf']='Hantera ODF';
 $lang['AclParticipants']='Deltagare';
 $lang['AclQualification']='Kval. omg.';
@@ -105,7 +104,7 @@
 $lang['Badge4PerPage']='4 badge per sida';
 $lang['BadgeConfirmPrinted']='Konfirmera utskrift';
 $lang['BadgeConfirmPrintedDescr']='Tryck endast om badge är korrekt utskrivna';
-$lang['BadgeIncludePhoto']='Infoga foto på badgen?';
+$lang['BadgeIncludePhoto']='Infoga foto på badgen';
 $lang['BadgeNames']='Namn (Ej utskrivna först)';
 $lang['BadgeNoData']='Inget att skriva ut';
 $lang['BadgeOnlyNotPrinted']='Endast ej tidigare utskriven badge?';
@@ -170,7 +169,7 @@
 $lang['CatOC']='Tävlingskommitté';
 $lang['ChairmanJudge']='Huvuddomare';
 $lang['ChairmanJudgeDeputy']='Vice huvuddomare';
-$lang['ChairmanJury']='Chef tävlingsjury';
+$lang['ChairmanJury']='Ordförande tävlingsjury';
 $lang['ChangeLookUpTable']='Välj';
 $lang['ChangeNationsNames']='Ändra nations-/klubbnamn';
 $lang['Channel']='Kanal';
@@ -205,7 +204,7 @@
 $lang['Coach']='Coach';
 $lang['CoalesceScorecards']='Slå ihop scorekort';
 $lang['CoalesceScorecardsTip']='Vid en eller två skyttar per tavla paras skyttarna ihop 2 och 2 per scorekort';
-$lang['Code']='Idrotts-ID';
+$lang['Code']='Licensnr.';
 $lang['CoinToss']='Singla slant';
 $lang['CoinTossShort']='Slantsingling';
 $lang['Collation']='Collation';
@@ -251,17 +250,17 @@
 $lang['DeleteTourConfirm']='Fyll i följande kod och klicka på "Radera tävling" för att radera tävlingen:';
 $lang['DeleteTournament']='Radera tävling';
 $lang['Deleting']='Raderar...';
-$lang['DescCaption']='Varje TAB separerad rad som börjar med ##CAPTION## följt av IdrottsID och Ackrediteringsrubrik, kommer att visa Ackrediteringsrubriken istället för klass på ackrediteringsbadge, startnummerlapp etc.';
-$lang['DescDOB']='Varje TAB separerad rad som börjar med ##DOB## följt av IdrottID och födelsedatum (ex. 01-16-1994) kommer att sätta/uppdatera skyttens födelsedata.';
-$lang['DescEmail']='Varje TAB separerad rad som börjar med ##EMAIL## följt av IdrottsID och en en epost adress, uppdaterar skyttens info med den epostadressen';
-$lang['DescID-OC']='Varje TAB separerad rad som börjar med ##ID-OC## följt av IdrottsID och Lokalt ID kommer att ställa in detta för skytten. Kan användas som exempelvis startnummer, anmälningsnummer etc.';
+$lang['DescCaption']='Varje TAB separerad rad som börjar med ##CAPTION## följt av Licensnr. och Ackrediteringsrubrik, kommer att visa Ackrediteringsrubriken istället för klass på ackrediteringsbadge, startnummerlapp etc.';
+$lang['DescDOB']='Varje TAB separerad rad som börjar med ##DOB## följt av Licensnr. och födelsedatum (ex. 01-16-1994) kommer att sätta/uppdatera skyttens födelsedata.';
+$lang['DescEmail']='Varje TAB separerad rad som börjar med ##EMAIL## följt av Licensnr. och en en epost adress, uppdaterar skyttens info med den epostadressen';
+$lang['DescID-OC']='Varje TAB separerad rad som börjar med ##ID-OC## följt av Licensnr. och Lokalt ID kommer att ställa in detta för skytten. Kan användas som exempelvis startnummer, anmälningsnummer etc.';
 $lang['DescPhotoName']='Se kod';
 $lang['Descr']='Namn/beskrivn.';
 $lang['DescSession']='Varje TAB separerad rad som börjar med ##SESSION## följt av omgång(nummer), Omgångens namn och antal tavlor kommer att uppdatera inställningen för den omgången.';
-$lang['DescSubClass']='Varje TAB separerad rad som börjar med ##SUBCLASS## följt av&nbsp;IdrottsID och&nbsp;subklasskod, ställer in subklassen för skytten.';
-$lang['DescTarget']='Varje TAB separerad rad som börjar med ##TARGET## följt av IdrottsID&nbsp;<i>&lt;tab&gt;</i>&nbsp;skjutstil (en bokstav)&nbsp;<i>&lt;tab&gt;</i>&nbsp;klass&nbsp;<i>&lt;tab&gt;</i>&nbsp;tapetval (0=standard, 1=andraval), kommer att ställa in/uppdatera tapetvalet för skytten.';
-$lang['DescTargetNo']='Varje TAB separerad rad som börjar med ##TARGETNO## följt av IdrottsID, Omgång(nummer) och tavelplacering kommer att ställa in tavelplacering för den skytten.';
-$lang['DescWheelchair']='Varje TAB separerad rad som börjar med ##WHEELCHAIR## följt av IdrottsID kommer att ändra inställningen för skytten så att tavelplaceringen gör det möjligt för skytten att sitta kvar då två skjutlag används.';
+$lang['DescSubClass']='Varje TAB separerad rad som börjar med ##SUBCLASS## följt av Licensnr. och subklasskod, ställer in subklassen för skytten.';
+$lang['DescTarget']='Varje TAB separerad rad som börjar med ##TARGET## följt av Licensnr. <i>&lt;tab&gt;</i> skjutstil (en bokstav) <i>&lt;tab&gt;</i> klass <i>&lt;tab&gt;</i> tapetval (0=standard, 1=andraval), kommer att ställa in/uppdatera tapetvalet för skytten.';
+$lang['DescTargetNo']='Varje TAB separerad rad som börjar med ##TARGETNO## följt av Licensnr.<i>&lt;tab&gt;</i>&nbsp; Omgång(nummer)<i>&lt;tab&gt;</i>&nbsp; och <i>&lt;tab&gt;</i>&nbsp;tavelplacering kommer att ställa in tavelplacering för den skytten.';
+$lang['DescWheelchair']='Varje TAB separerad rad som börjar med ##WHEELCHAIR## följt av Licensnr. kommer att ändra inställningen för skytten så att tavelplaceringen gör det möjligt för skytten att sitta kvar då två skjutlag används.';
 $lang['DestroyTarget']='Destroy Target';
 $lang['Details']='Detaljer';
 $lang['Distance']='Avstånd';
@@ -353,13 +352,14 @@
 $lang['FirstPhaseInOut']='Kvalificerade (inte kvalificerade)';
 $lang['FirstPhaseMatchesBye']='# matcher (och bye)';
 $lang['FirstTarget']='Första tavlan';
-$lang['Flags']='Nationsflagga/logga';
+$lang['Flags']='Nations-, klubb- flaggor/logos';
 $lang['FlightsCategory']='Klass';
 $lang['FlightsDescription']='Namn/beskrivning';
 $lang['FlightsEnd']='Serie/mål $a';
 $lang['FlightsReset']='Återställ';
 $lang['FOP-ODS']='Layout tävlingsomr. (ODS)';
 $lang['ForceAccreditation']='Tvinga ackreditering';
+$lang['ForceOldPhotos']='Inkludera gamla foton';
 $lang['ForcePayment']='Tvinga betalningstatus';
 $lang['FourScoresNFAA']='4 skjutkort per sida (NFAA)';
 $lang['Freetext']='Text att visa på kanalen/skärmen';
@@ -390,7 +390,7 @@
 $lang['ImportedTour']='Tävling importerad';
 $lang['IncompatibleVersions']='Kunde inte importera tävlingen pga att den är exporterad från en nyare version av ianseo.<br/>Uppdatera din version på $a, eller med "Uppdatera ianseo" i menyn Moduler.';
 $lang['IndClEvent']='Indivíduellt kval';
-$lang['IndFin']='Individual - Elim. & Final Round';
+$lang['IndFin']='Individuell - Eliminering & Final';
 $lang['IndFinEvent']='Individuell final';
 $lang['IndoorTourCategory']='Inomhustävling';
 $lang['IndQual']='Kval individuellt';
@@ -398,6 +398,7 @@
 $lang['InnerTens']='X';
 $lang['Invalid Password']='Felaktigt lösenord';
 $lang['IOCcode']='IOC Nationskod';
+$lang['IRM-7']='DNF-Skytten bröt (ingen ranking/placering)';
 $lang['IrmUpdateIndividual']='Kom ihåg att uppdatera den individuella rankingen manuellt.';
 $lang['IsParamWarning']='Inställningar InfoSystem!<br/><b>ENDAST</b> avancerade användare!';
 $lang['Judge']='Domare';
@@ -407,7 +408,7 @@
 $lang['LastTarget']='Sista tavlan';
 $lang['LastUpdate']='Senaste uppdatering';
 $lang['LegendSO']='Särskjutning & slantsingling';
-$lang['LegendStatus']='Förklaring "Skyttarnas status" - Deltagande i tävlingen';
+$lang['LegendStatus']='"Skyttarnas status" för deltagande i tävlingen.';
 $lang['Length']='Minuter';
 $lang['ListCountries']='Nationslista';
 $lang['ListLoad']='Ladda upp skyttar.';
@@ -422,8 +423,9 @@
 $lang['LocalRule']='Regeluppsättning (land)';
 $lang['LocalRuleAlert']='ATTENTION!\n\nRemember to select the correct Local Rule, if any, in the next combo box!';
 $lang['LocalSubRule']='Underregel';
-$lang['Location']='Område';
+$lang['Location']='Område/plats';
 $lang['LocRuleDefaultNo']='Standard';
+$lang['Login']='Logga in';
 $lang['LogisticResp']='Logistikansvarig';
 $lang['LogoB']='Logo sidfot (Bilddimension för A4 är 19:1, letter 20:1)';
 $lang['LogoL']='Logo uppe vänster';
@@ -445,6 +447,7 @@
 $lang['ManageByes']='Hantera Bye';
 $lang['ManAthStatus']='Hantering av skytts status';
 $lang['ManColors']='Färghantering';
+$lang['MandatoryLoginACL']='Kräv inloggning från icke registrerad IP-adress.';
 $lang['ManDistances']='Avståndshantering';
 $lang['ManDivClass']='Klasshantering';
 $lang['ManMatchArr4Phase']='Hantering av aktuell fas antal pilar per set';
@@ -476,7 +479,7 @@
 $lang['Missing Credentials']='Fyll i rätt tävlings ID (publiceringskod 4 siffror),<br>och lösenord';
 $lang['Missing Tournament']='Saknad tävling';
 $lang['MissingScorecards']='Saknade skjutkort i Omgång $a, avstånd $a';
-$lang['MixedTeamFinEvent']='Mixed lagfinal';
+$lang['MixedTeamFinEvent']='Mixad lagfinal';
 $lang['MoveWinner2NextPhase']='Flytta vinnare till nästa del';
 $lang['MoveWinner2PoolA']='Flytta vinnare till vinnare Pool A';
 $lang['MoveWinner2PoolB']='Flytta vinnare till vinnare Pool B';
@@ -492,9 +495,10 @@
 $lang['MsgSelOneValue']='Snälla, välj ett värde!';
 $lang['MsgSyncFile']='<h4>Läs in licensfil. Senaste versionen av licensfil hämtar du från din tävlingssida på </h4><h3><a href="https://resultat.bagskytte.se" target=new>https://resultat.bagskytte.se</a></h3>';
 $lang['MsgSyncNet']='Ladda uppdatering via Internet';
-$lang['MsgSyncronize']='Uppdatera licensfil och skyttarnas status';
+$lang['MsgSyncronize']='Synkronisera licenser, foton och klubblogos.';
 $lang['Multimedia']='Multimedia';
 $lang['Name']='Namn';
+$lang['Nameplates']='Namnskyltar';
 $lang['NationShort']='Klubb/land';
 $lang['Natl-Nation']='Land';
 $lang['New']='Ny';
@@ -513,7 +517,7 @@
 $lang['NoPay']='Gratis';
 $lang['NoPictureAvailable']='Inget foto registrerat';
 $lang['NoRowSelected']='Inga rader valda';
-$lang['NoSession']='No Session';
+$lang['NoSession']='Ingen omgång';
 $lang['NoStaffOnField']='Inga funktionärer';
 $lang['NotAllShootoffResolved']='Följande finalstegar sparades inte på grund av att det finns shootoffs kvar att lösa: $a';
 $lang['NoTeamUpdate']='Uppdatera INTE Lag';
@@ -527,8 +531,9 @@
 $lang['NumberOfEntriesByEvent']='Antal deltagare per tävlingsmoment';
 $lang['NumResult']='Antal placerade (0: Alla)';
 $lang['NumSession']='Antal omgångar';
-$lang['OnlineId']='Publiceringskod.<br>(Tävlingsnr. på ianseo.net)';
+$lang['OnlineId']='Publiceringskod.<br>(Tävlingsnummer på ianseo.net)';
 $lang['OnlyAccredited']='Endast ackrediterade';
+$lang['OnlyMissing']='Endast saknade';
 $lang['OnlyPaid']='Endast de som betalat';
 $lang['OnlyToday']='Visa bara dagens matcher';
 $lang['OnlyWithoutPhoto']='Visa endast de som saknar foto';
@@ -569,9 +574,9 @@
 $lang['PhaseBlock_6']='Tävlingsinformationen';
 $lang['PhaseBlock_8']='Ackreditering';
 $lang['PhasesDetails']='Inställningar för finaldelarna';
-$lang['PhaseTimeDescription']='När du ställt in datum och tid för en finaldel, kan du snabbt ställa in datum och tid för nästkommande del genom att skriva «+» följt av antal minuter efter den förra delen du vill att denna ska starta. Klicka sedan på "Ställ in på alla matcher i denna del"<br>När du ska ställa in schema för nästa klass kan du enkelt välja lämplig inställning ur menyn under "Ställ in på alla matcher i denna del", och klicka på "Ställ in på alla matcher i denna del"';
+$lang['PhaseTimeDescription']='När du ställt in datum och tid för en finaldel, kan du snabbt ställa in datum och tid för nästkommande del genom att skriva «+» följt av antal minuter efter den förra delens starttid du vill att denna ska starta. Klicka sedan på "Ställ in på alla matcher i denna del"<br>När du ska ställa in schema för nästa klass kan du enkelt välja lämplig inställning ur menyn under "Ställ in på alla matcher i denna del", och klicka på "Ställ in på alla matcher i denna del"';
 $lang['Phone']='Telefonnummer (med landskod)';
-$lang['Photo']='Bild';
+$lang['Photo']='Bild/foto';
 $lang['PhotoBadTypeError']='Felaktigt format!';
 $lang['PhotoDelete']='Radera foto';
 $lang['PhotoDimError']='Max dimension: Width: $a[0] px, Height: $a[1] px!';
@@ -628,6 +633,7 @@
 $lang['RequestDisclaimer']='Inskickad ansökan innebär inte att tävlingen automatiskt blir godkänd för publicering.<br>Du kommer att få ett bekräftelsemail när tävlingen godkänts.<br>Tjänsten levereras "as is", och kan läggas ner utan förvarning.<br>Om en publicerad tävling saknar resultat efter att tävlingen avslutats, kan den komma att raderas utan förvarning.<br><br>Om du tänker använda <b>Scorekeeper NG PRO</b>, så köper du PRO-kod genom att klicka på länken i mailet du fått från ianseo.';
 $lang['RequestedDescription']='These fields MUST be present in the file. Field separator is a Tab, record separator is a newline.';
 $lang['RequestEmail']='Mailadress till resultatansvarig:';
+$lang['ResetBadges']='Återställ utskriftsstatus';
 $lang['ResetBeforeSO']='Återställ ranking till ställningen FÖRE Shootoff';
 $lang['ResetElimError']='Varning! Fel vid återställningen av elimineringen';
 $lang['ResultAbs']='Kvalificering - komplett';
@@ -678,10 +684,13 @@
 $lang['SearchResults']='Sök resultat';
 $lang['Secondary']='Sekundär';
 $lang['SecondPhase']='Del två';
+$lang['SelectedClub-0']='Visa 1a Klubb-/Landsnamn';
+$lang['SelectedClub-1']='Visa 2a Klubb-/Landsnamn';
+$lang['SelectedClub-2']='Visa 3e Klubb-/Landsnamn';
 $lang['SelectSession']='Välj omgång';
 $lang['Send2Ianseo']='Publicera på www.ianseo.net';
 $lang['SendData']='Sänd data';
-$lang['SendLogos']='Publicera bilder/loggor och rubriker för tävlingen.';
+$lang['SendLogos']='Publicera rubriker och bilder för tävlingen.';
 $lang['SeparateClasses']='Separera klasser';
 $lang['SeparateDivisions']='Separera skjutstilar';
 $lang['ServerFile']='Sökväg till Fil på servern';
@@ -700,8 +709,8 @@
 $lang['SetTotal']='Set Total';
 $lang['Sex']='Kön';
 $lang['ShootOffArrows']='Särskjutningspilar';
-$lang['ShortFemale']='D';
-$lang['ShortMale']='H';
+$lang['ShortFemale']='W';
+$lang['ShortMale']='M';
 $lang['ShortTable']='Standard tabell';
 $lang['ShortUnisex']='U';
 $lang['ShotOff']='Shoot Off';
@@ -709,12 +718,17 @@
 $lang['ShowAgeClass']='Visa åldersklass';
 $lang['ShowCaption']='Visa Ackrediteringsrubrik';
 $lang['ShowChildren']='Visa underliggande stegar';
+$lang['ShowCountry2']='Visa 2a Klubb/Land';
+$lang['ShowCountry3']='Visa 3e Klubb/Land';
+$lang['ShowDisable']='Visa Rullstol';
 $lang['ShowIanseoMenu']='Visa i@nseomenyer';
 $lang['ShowLocalCode']='Visa lokalt ID';
 $lang['ShowMissing']='Visa saknade skjutkort';
 $lang['ShowPdfFlags']='Inkludera loggor/flaggor i PDF';
 $lang['showRecords']='Visa rekord';
 $lang['ShowSetEnds']='Inkludera set-serier';
+$lang['ShowSubClass']='Visa Subklass';
+$lang['ShowTourCode']='Visa Tävlingskod';
 $lang['Sign/guide-board']='Skylt/infolapp';
 $lang['SignedTotal']='Signerad total';
 $lang['SingleArrow']='Pil för pil';
@@ -744,13 +758,15 @@
 $lang['StartlistTeam']='Deltagarlista sorterad efter klass';
 $lang['StatClasses']='Statistik(åldersklasser och skjutstilar)';
 $lang['StatCountries']='Statistik(nation/förening)';
-$lang['StatEvents']='Statistik (Skyttar fördelat på klasser och omgångar)';
+$lang['StatEvents']='Statistik (Klasser och finaler)';
 $lang['Status']='Status';
 $lang['StdORIS']='Standard ORIS layout';
 $lang['StickersBarcode']='Print Barcode';
 $lang['StickersBarcodeDescr']='Toggles printing of the athlete\'s bar code';
 $lang['StickersBotMargin']='Bottenmarginal';
 $lang['StickersBotMarginDescr']='Bottenmarginal mellan sista märket och papprets kant';
+$lang['StickersCodes']='Licensnr.';
+$lang['StickersCodesDescr']='Begränsa utskriften till följande Licensnr.';
 $lang['StickersCols']='Kolumner';
 $lang['StickersColsDescr']='Number of labels in 1 row';
 $lang['StickersInterCols']='Spacing between columns';
@@ -795,7 +811,7 @@
 $lang['TargetAssExclude']='Exkludera redan tavelplacerade klasser';
 $lang['TargetAssigned']='Tavla $a tilldelad';
 $lang['TargetAssignment']='Skriv ut tavelplaceringar';
-$lang['TargetAssignmentDescription']='Ange tavelnummer där matchen skjuts.<br/>Om du sätter ett "+" tecken efter siffran, kommer ianseo att fylla i tavelnummer för resterande matcher i den delen.<br/>Om du sätter ett "-" tecken efter siffran, kommer ianseo att fylla i tavelnummer för resterande <u>icke bye matcher i den delen.</u><br/>Om du sätter ett "*" tecken efter siffran, kommer ianseo att fylla i tavelnummer för resterande matcher i den delen, och lämna en tavlas mellanrum efter två intilliggande tavlor.';
+$lang['TargetAssignmentDescription']='Ange tavelnummer där matchen skjuts.<br>Om du sätter ett "+" tecken efter siffran och trycker på tab, kommer ianseo att fylla i tavelnummer för resterande matcher i den delen.<br>Om du sätter ett "-" tecken efter siffran och trycker på tab, kommer ianseo att fylla i tavelnummer för resterande <u>icke bye matcher i den delen.</u><br>Om du sätter ett "*" tecken efter siffran och trycker på tab, kommer ianseo att fylla i tavelnummer för resterande matcher i den delen, och lämna en tavlas mellanrum efter två intilliggande tavlor.</tab></tab></tab>';
 $lang['TargetDoAssignment']='Tavelplacering';
 $lang['TargetFrom']='Från tavla';
 $lang['TargetJudgeSignature']='Domares signatur';
@@ -811,7 +827,7 @@
 $lang['TeamCreationMode_2']='Alltid 2a laget';
 $lang['TeamCreationMode_3']='Alltid 3e laget';
 $lang['TeamFin']='Lag - eliminering och final';
-$lang['TeamFinEvent']='Lagfinal';
+$lang['TeamFinEvent']='Lagfinaler';
 $lang['TeamManagerSignature']='Signatur Lagansvarig';
 $lang['TeamPlace']='Lag/klubb-skylt (engelsk version)';
 $lang['TeamPlaceLocal']='Lag/klubb-skylt (svensk/engelsk)';
@@ -832,7 +848,7 @@
 $lang['TooManyElimSO']='Det är för många särskjutningspilar!';
 $lang['Total1']='Total (1/2)';
 $lang['Total2']='Total (2/2)';
-$lang['TotalMissingScorecars']='$a saknade skjutkort';
+$lang['TotalMissingScorecars']='$a saknade Tavlor/patruller';
 $lang['TotalPoints']='Totala setpoäng';
 $lang['TotalProg']='Summa';
 $lang['TotalShort']='Tot.';
@@ -854,7 +870,7 @@
 $lang['TourRecordSetup']='Inställningar för rekord';
 $lang['TourRuleReset']='Återställ till grundinställningar';
 $lang['TourRuleResetDescr']='Det här återställer tävlingen till grundinställningarna för den valda ronden: Skjutstilar, klasser, avstånd, taveltyper mm...<br><b>Klicka i denna efter att du ändrat i menyn ovan. Om du VERKLIGEN vill ändra inställningarna, trycker du på "Spara"</b>';
-$lang['TourShortName']='Rubrik som visas i <br>appens övre fält';
+$lang['TourShortName']='Rubrik som visas i <br>appens rubrikfält';
 $lang['TourTimeZone']='Tidszon';
 $lang['TourType']='Tävling';
 $lang['TourTypeName']='Tournament Type Name';
@@ -1043,7 +1059,9 @@
 $lang['UserDetails']='Användardetaljer (beskrivn.)';
 $lang['UserEnabled']='Aktiverad';
 $lang['UserName']='Användarnamn';
-$lang['UserPassword']='Lösenord';
+$lang['UserPassword']='Nytt lösenord.';
+$lang['UserPasswordOld']='Nuvarande lösenord.';
+$lang['UserPasswordRetype']='Upprepa nytt lösenord.';
 $lang['UseSubClasses']='Ställ in för vald subklass';
 $lang['ValidClass']='Tillåtna klasser';
 $lang['ValidDivisions']='Tillåtna skjutstilar (lämna tomt för alla)';
@@ -1068,4 +1086,5 @@
 $lang['XNineLabel']='XNine Label';
 $lang['YearEnd']='Till år';
 $lang['YearStart']='Från år';
+$lang['Z-Session']='Övriga texter i schemat';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/tlh/IOC_Codes.php b/src/Common/Languages/tlh/IOC_Codes.php
index c38273d8..e8f3e1b4 100644
--- a/src/Common/Languages/tlh/IOC_Codes.php
+++ b/src/Common/Languages/tlh/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']=' ';
 $lang['AUS']='';
 $lang['AUT']='';
-$lang['Award-Anthem']=',     ';
-$lang['Award-Anthem-TPE']=',    ';
 $lang['Award-Applause']=',    ()';
 $lang['Award-Intro']=',   {$a}';
 $lang['Award-MedalGiver']='   $a';
@@ -42,16 +40,12 @@
 $lang['BUL']='';
 $lang['BUR']=' ';
 $lang['CAF']='  ';
-$lang['CAM']='';
 $lang['CAN']='';
 $lang['CAY']=' ';
 $lang['CGO']='  ';
 $lang['CHA']='';
 $lang['CHI']='';
-$lang['CHN']='';
-$lang['CIV']=' ';
 $lang['CMR']='';
-$lang['COD']='   ';
 $lang['COK']=' ';
 $lang['COL']='';
 $lang['COM']='';
@@ -60,7 +54,6 @@
 $lang['CRO']='';
 $lang['CUB']='';
 $lang['CYP']='';
-$lang['CZE']='';
 $lang['DEN']='';
 $lang['DJI']='';
 $lang['DMA']='';
@@ -91,17 +84,14 @@
 $lang['GUM']='';
 $lang['GUY']='';
 $lang['HAI']='';
-$lang['HKG']=' ';
 $lang['HON']='';
 $lang['HUN']='';
 $lang['INA']='';
 $lang['IND']='';
-$lang['IRI']='';
 $lang['IRL']='';
 $lang['IRQ']='';
 $lang['ISL']='';
 $lang['ISR']='';
-$lang['ISV']=' ';
 $lang['ITA']='';
 $lang['IVB']=' ';
 $lang['JAM']='';
@@ -114,7 +104,6 @@
 $lang['KOR']='  ';
 $lang['KSA']=' ';
 $lang['KUW']='';
-$lang['LAO']='';
 $lang['LAT']='';
 $lang['LBA']='';
 $lang['LBR']='';
@@ -128,7 +117,6 @@
 $lang['MAR']='';
 $lang['MAS']='';
 $lang['MAW']='';
-$lang['MDA']='';
 $lang['MDV']='';
 $lang['Medal-1']=' ';
 $lang['Medal-2']=' ';
@@ -165,7 +153,6 @@
 $lang['PNG']='  ';
 $lang['POL']='';
 $lang['POR']='';
-$lang['PRK']=' ';
 $lang['PUR']=' ';
 $lang['QAT']='';
 $lang['ROU']='';
@@ -190,13 +177,11 @@
 $lang['SUR']='';
 $lang['SVK']='';
 $lang['SWE']='';
-$lang['SYR']='';
 $lang['TAN']='';
 $lang['TGA']='';
 $lang['THA']='';
 $lang['TJK']='';
 $lang['TKM']='';
-$lang['TLS']=' ';
 $lang['TOG']='';
 $lang['TPE']=' ';
 $lang['TRI']='';
diff --git a/src/Common/Languages/tlh/Install.php b/src/Common/Languages/tlh/Install.php
index f88ddde4..bde87820 100644
--- a/src/Common/Languages/tlh/Install.php
+++ b/src/Common/Languages/tlh/Install.php
@@ -73,7 +73,6 @@
 $lang['Parameter']='';
 $lang['Password']='';
 $lang['PHP settings']=' ';
-$lang['PHP too old']='  .    : ..';
 $lang['PHP version']='';
 $lang['php.ini file']='. ';
 $lang['Prepare']='   ';
diff --git a/src/Common/Languages/tlh/Tournament.php b/src/Common/Languages/tlh/Tournament.php
index f5276a5b..681994eb 100644
--- a/src/Common/Languages/tlh/Tournament.php
+++ b/src/Common/Languages/tlh/Tournament.php
@@ -103,7 +103,6 @@
 $lang['BadgeIncludePhoto']='  ?';
 $lang['BadgeNames']=' (  )';
 $lang['BadgeNoData']='   ';
-$lang['BadgeOnlyNotPrinted']='    ?';
 $lang['BadgeOnlyPrintAccredited']='    ?';
 $lang['BadgeOnlyPrintPhoto']='    ?';
 $lang['BadgeOptions']='';
@@ -164,8 +163,6 @@
 $lang['CatJudge']='';
 $lang['CatJury']='';
 $lang['CatOC']='';
-$lang['ChairmanJudge']='';
-$lang['ChairmanJury']=' ';
 $lang['ChangeLookUpTable']=' ';
 $lang['ChangeNationsNames']='  ';
 $lang['Channel']='';
@@ -260,7 +257,6 @@
 $lang['EliminationType']=' ';
 $lang['ElimSO']='   ';
 $lang['Email']='';
-$lang['EnableAccess']='/ ';
 $lang['Ends']='';
 $lang['EndUpdate']='  ';
 $lang['Entries']='';
@@ -899,7 +895,6 @@
 $lang['TeamCreationMode_2']=' ';
 $lang['TeamCreationMode_3']=' ';
 $lang['TeamFin']=' -  ';
-$lang['TeamFinEvent']=' ';
 $lang['TeamLoaded']='     {$a}';
 $lang['TeamPlace']=' ';
 $lang['TeamPlaceLocal']='  ()';
diff --git a/src/Common/Languages/tr/Errors.php b/src/Common/Languages/tr/Errors.php
index 2e6e5938..91892a72 100644
--- a/src/Common/Languages/tr/Errors.php
+++ b/src/Common/Languages/tr/Errors.php
@@ -4,9 +4,15 @@
 $lang['Anomalies']='Sorunlar';
 $lang['BarCodeSession']='Ayarlarda bir hata var: Bir oturum ayarlamayı deneyin!';
 $lang['BarCodeSettings']='Ayarlardsa bir hata var';
+$lang['CategoresNotDefined']='Eksik Kategori tanımları';
 $lang['ClassFromToError']='Başlangıç ve Bitiş aralıkları sayısal değer olmalı';
 $lang['ClubNotFound']='Kulüp kodu mevcut kulüpler arasında bulunamadı. Lütfen önce veritabanını güncelleyin!';
+$lang['ConflictingCategories']='Filtre tanımı, bu kategoriler için önceki filtrelerle çakışıyor: $a!';
+$lang['DecodeError']='Kod Çözme Hatası';
+$lang['DiameterMandatory']='Hedef yüzünün çapı zorunludur';
 $lang['DirectoryNotWriteable']='$a dizini web sunucusu tarafından yazılamaz durumda. Lütfen dizin izinlerini herkes tarafından yazılabilir olacak şekilde değiştirin.';
+$lang['DistanceOutRange']='Mesafe menzil dışında';
+$lang['DivClasNumberNotEmpty']='En az bir kategori ve bir sınıf (ve takımlarda kaç okçu olacağını) seçmelisiniz.';
 $lang['EmptyBody']='Gövde Boş: bu alan zorunludur!';
 $lang['EmptyFrom']='E-posta Boş: bu alan zorunludur!';
 $lang['EmptySubject']='Konu Boş: bu alan zorunludur!';
@@ -22,4 +28,10 @@
 $lang['ImageSaveError']='Görsel kaydedilmedi';
 $lang['MissingData']='Veri Eksik';
 $lang['NameNotEmpty']='İsim boş bırakılamaz';
+$lang['TargetRangeMismatch']='Hedef Aralıkları, bir tire (eksi işareti) ile ayrılmış 2 hedef sayısından (harf yok) oluşmalıdır; ilki ikincisinden düşük olmalıdır, örneğin 23-44';
+$lang['TextSmtpDelete']='Lütfen Ianseo\'nun bu kurulumunda SMTP ayarlarını kaldırmak istediğinizi onaylayın';
+$lang['TooManyArrows']='Toplamda çok fazla ok var: maksimum $a';
+$lang['TooManyDistancesMatch']='Birden fazla mesafe ayarı bulunan kategoriler';
+$lang['WrongData']='Yanlış veri girildi';
+$lang['WrongPort']='Bu port desteklenmiyor!';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/tr/IOC_Codes.php b/src/Common/Languages/tr/IOC_Codes.php
index 2b1d4889..a1f7d085 100644
--- a/src/Common/Languages/tr/IOC_Codes.php
+++ b/src/Common/Languages/tr/IOC_Codes.php
@@ -12,8 +12,6 @@
 $lang['ASA']='Amerikan Samoası';
 $lang['AUS']='Avustralya';
 $lang['AUT']='Avusturya';
-$lang['Award-Anthem']='Bayanlar baylar, lütfen <ülke adı> milli marşı için ayağa kalkın';
-$lang['Award-Anthem-TPE']='Bayanlar baylar, lütfen <ülke adı> marşı için ayağa kalkın';
 $lang['Award-Applause']='Bayanlar baylar, sporcularımızı tebrik ediyor ve onları alkışlıyoruz';
 $lang['Award-Intro']='Bayanlar baylar, {$a} ödül töreni';
 $lang['Award-MedalGiver']='Madalyaları $a takdim edecek';
@@ -42,16 +40,12 @@
 $lang['BUL']='Bulgaristan';
 $lang['BUR']='Burkina Faso';
 $lang['CAF']='Orta Afrika Cumhuriyeti';
-$lang['CAM']='Kamboçya';
 $lang['CAN']='Kanada';
 $lang['CAY']='Cayman Adaları';
 $lang['CGO']='Kongo Cumhuriyeti';
 $lang['CHA']='Çad';
 $lang['CHI']='Şili';
-$lang['CHN']='Çin';
-$lang['CIV']='Fildişi Sahili';
 $lang['CMR']='Kamerun';
-$lang['COD']='Demokratik Kongo Cumhuriyeti';
 $lang['COK']='Cook Adaları';
 $lang['COL']='Kolombiya';
 $lang['COM']='Komorlar';
@@ -60,7 +54,6 @@
 $lang['CRO']='Hırvatistan';
 $lang['CUB']='Küba';
 $lang['CYP']='Kıbrıs';
-$lang['CZE']='Çek Cumhuriyeti';
 $lang['DEN']='Danimarka';
 $lang['DJI']='Cibuti';
 $lang['DMA']='Dominik';
@@ -91,17 +84,14 @@
 $lang['GUM']='Guam';
 $lang['GUY']='Guyana';
 $lang['HAI']='Haiti';
-$lang['HKG']='Hong Kong';
 $lang['HON']='Honduras';
 $lang['HUN']='Macaristan';
 $lang['INA']='Endonezya';
 $lang['IND']='Hindistan Cumhuriyeti';
-$lang['IRI']='İran';
 $lang['IRL']='İrlanda';
 $lang['IRQ']='Irak';
 $lang['ISL']='İzlanda';
 $lang['ISR']='İsrail';
-$lang['ISV']='ABD Virgin Adaları';
 $lang['ITA']='İtalya';
 $lang['IVB']='Britanya Virgin Adaları';
 $lang['JAM']='Jamaika';
@@ -114,7 +104,6 @@
 $lang['KOR']='Kore Cumhuriyeti';
 $lang['KSA']='Suudi Arabistan';
 $lang['KUW']='Kuveyt';
-$lang['LAO']='Laos';
 $lang['LAT']='Letonya';
 $lang['LBA']='Libya';
 $lang['LBR']='Liberya';
@@ -128,7 +117,6 @@
 $lang['MAR']='Fas';
 $lang['MAS']='Malezya';
 $lang['MAW']='Malavi';
-$lang['MDA']='Moldova';
 $lang['MDV']='Maldivler';
 $lang['Medal-1']='Altın Madalya';
 $lang['Medal-2']='Gümüş Madalya';
@@ -137,7 +125,6 @@
 $lang['MEX']='Meksika';
 $lang['MGL']='Moğolistan';
 $lang['MHL']='Marshall Adaları';
-$lang['MKD']='Kuzey Makedonya';
 $lang['MLI']='Mali';
 $lang['MLT']='Malta';
 $lang['MNE']='Karadağ';
@@ -166,7 +153,6 @@
 $lang['PNG']='Papua Yeni Gine';
 $lang['POL']='Polonya';
 $lang['POR']='Portekiz';
-$lang['PRK']='Kuzey Kore';
 $lang['PUR']='Porto Riko';
 $lang['QAT']='Katar';
 $lang['ROU']='Romanya';
@@ -193,13 +179,11 @@
 $lang['SVK']='Slovakya';
 $lang['SWE']='İsveç';
 $lang['SWZ']='Svaziland';
-$lang['SYR']='Suriye';
 $lang['TAN']='Tanzanya';
 $lang['TGA']='Tonga';
 $lang['THA']='Tayland';
 $lang['TJK']='Tacikistan';
 $lang['TKM']='Türkmenistan';
-$lang['TLS']='Doğu Timor';
 $lang['TOG']='Togo';
 $lang['TPE']='Çin Taipei';
 $lang['TRI']='Trinidad ve Tobago';
diff --git a/src/Common/Languages/tr/ISK-App.php b/src/Common/Languages/tr/ISK-App.php
new file mode 100644
index 00000000..dbfc4975
--- /dev/null
+++ b/src/Common/Languages/tr/ISK-App.php
@@ -0,0 +1,112 @@
+<?php
+$lang['0_Phase']='Altın';
+$lang['12_Phase']='1/12';
+$lang['14_Phase']='1/14';
+$lang['16_Phase']='1/16';
+$lang['1_Phase']='Bronz';
+$lang['24_Phase']='1/24';
+$lang['2_Phase']='Yarı finaller';
+$lang['32_Phase']='1/32';
+$lang['48_Phase']='1/48';
+$lang['4_Phase']='Çeyrek finaller';
+$lang['63_Phase']='Davis Takım Maçları';
+$lang['64_Phase']='1/64';
+$lang['7_Phase']='1/7';
+$lang['8_Phase']='1/8';
+$lang['AboutAppDeveloper']='Uygulamayı geliştiren';
+$lang['AboutPrivacy']='Ianseo Gizlilik Politikası';
+$lang['AboutProducer']='Tasarlayan & geliştiren';
+$lang['AboutTitle']='Skorekeeper Hakkında';
+$lang['AboutUX']='UX tasarımı desteği';
+$lang['AppPageAbout']='Hakkında';
+$lang['AppPageHelp']='Yardım';
+$lang['AppPageSettings']='Ayarlar';
+$lang['AppPageStart']='Başlangıç sayfası';
+$lang['BarcodeErrorMessage']='Bu geçerli bir barkod değil';
+$lang['BarcodeErrorTitle']='Barkod hatası';
+$lang['BarcodeScanPrompt']='Barkodu merkeze denk getirin';
+$lang['EnterPinCodeInvalidValue']='Geçersiz onay kodu';
+$lang['EnterPinCodeMessage']='Bu özelliği kullanabilmek için onay kodunu girin';
+$lang['EnterPinCodeTitle']='Onay kodu gerekli';
+$lang['EnterPinCodeValue']='Kod';
+$lang['FabReconnect']='Tekrar bağlan';
+$lang['GenericCancel']='İptal';
+$lang['GenericDelete']='Sil';
+$lang['GenericNext']='Sonraki';
+$lang['GenericNo']='Hayır';
+$lang['GenericOk']='Tamam';
+$lang['GenericPrevious']='Önceki';
+$lang['GenericYes']='Evet';
+$lang['HelpContactHead']='İletişim';
+$lang['HelpIntro1RR']='Robin Turu';
+$lang['HelpIntro2Elim']='Elemeler';
+$lang['HelpIntro2MI']='Bireysel maçlar';
+$lang['HelpIntro2MT']='Takım maçları';
+$lang['HelpIntro2Qual']='Sıralama Turları';
+$lang['HelpScorecardHead']='Skor kartı';
+$lang['HelpSettingsHead']='Ayarlar';
+$lang['HelpStartHead']='Başla';
+$lang['MainDistance']='Mesafe';
+$lang['MainEnd']='Seri';
+$lang['MainNotInUse']='Cihaz etkin değil';
+$lang['MainSignatureTitle']='Skor Girişi Tamamlandı';
+$lang['MainTargets']='Atanan hedef(ler)';
+$lang['MainTotal']='Toplam';
+$lang['MainWaitingConfig']='Sonuç Sistemleri Ekibine Verin';
+$lang['MainWinner']='K A Z A N A N';
+$lang['MenuAppVersion']='Versiyon:';
+$lang['MenuCloseMenu']='Menüyü kapat';
+$lang['ScorecardCompTotal']='Toplam';
+$lang['ScorecardDistTotal']='Mesa';
+$lang['ScorecardEnd']='Seri';
+$lang['ScorecardEndTotal']='Seri';
+$lang['ScorecardSetPoints']='Set';
+$lang['ScorecardTarget']='Hed';
+$lang['ScoreTotalsCloseButton']='Kapat';
+$lang['ScoreTotalsConfirmButton']='Onayla';
+$lang['ScoringDistanceDoneTitle']='Mesafe (tur) tamamlandı';
+$lang['ScoringDistTotal']='Toplam';
+$lang['ScoringEndTotal']='Seri';
+$lang['ScoringMissingPointsTitle']='Eksik Puanlar';
+$lang['SettingsChooseValue']='Değer seçin';
+$lang['SettingsCompetitionType']='Yarışma Türü';
+$lang['SettingsConnectionCategory']='Bağlantı';
+$lang['SettingsConnectionCompCode']='Yarışma Kodu';
+$lang['SettingsConnectionSocketAddress']='Soket Adresi';
+$lang['SettingsConnectionSocketPort']='Soket Portu';
+$lang['SettingsConnectionUrl']='URL';
+$lang['SettingsCouldNotGetCompInfo']='Yarışma bilgilerine ulaşılamadı';
+$lang['SettingsCouldNotGetConfigInfo']='Yapılandırma bilgileri alınamadı';
+$lang['SettingsCouldNotGetDistanceInfo']='Mesafe bilgisi alınamadı';
+$lang['SettingsCouldNotGetEventInfo']='Etkinlik bilgileri alınamadı';
+$lang['SettingsCouldNotGetMatchInfo']='Maç bilgileri alınamadı';
+$lang['SettingsDeviceNotAllowed']='Bu yarışma için cihaza izin verilmiyor. Yarışma yapılandırma bilgilerini doğrulayın veya etkinlik organizatörüyle iletişime geçin.';
+$lang['SettingsDeviceUnknownError']='Bilinmeyen bir nedenden dolayı Ianseo tarafından cihaza izin verilmiyor';
+$lang['SettingsElimFirstTarget']='İlk Hedef';
+$lang['SettingsEventSelection']='Etkinlik Seçimi';
+$lang['SettingsFunctionsCategory']='Diğer fonksiyonlar';
+$lang['SettingsFunctionsResetSettings']='Ayarları varsayılana sıfırla';
+$lang['SettingsGenerateQr']='Oluştur';
+$lang['SettingsGpsCategory']='GPS Lokasyonu';
+$lang['SettingsGpsFrequency']='Frekans';
+$lang['SettingsGpsMinute']='dakika';
+$lang['SettingsGpsMinutes']='dakika';
+$lang['SettingsGpsSeconds']='saniye';
+$lang['SettingsGpsSendPosition']='Cihaz konumunu gönder';
+$lang['SettingsLanguageCategory']='Dil';
+$lang['SettingsLanguageCurrent']='Mevcut Dil';
+$lang['SettingsLanguageUpdate']='Dilleri Güncelle';
+$lang['SettingsManualAllDistances']='Tümü';
+$lang['SettingsManualDistance']='Mesafe';
+$lang['SettingsManualMatch']='Maç';
+$lang['SettingsManualPhase']='Aşama';
+$lang['SettingsManualRRLevel']='Seviye';
+$lang['SettingsManualRRRound']='Raund';
+$lang['SettingsManualSession']='Oturum';
+$lang['SettingsManualTarget']='Hedef';
+$lang['SettingsOtherAskForSignature']='Imza İste';
+$lang['SettingsOtherSignatureNone']='Hayır';
+$lang['SettingsOtherSignatureScan']='Okçu ID tarama';
+$lang['SettingsOtherSignatureScreen']='Ekran Üzeri İmza';
+$lang['SettingsQrCodesDevice']='Cihaz';
+?>
\ No newline at end of file
diff --git a/src/Common/Languages/tr/ISK.php b/src/Common/Languages/tr/ISK.php
index 178c8ea5..c8ee8a35 100644
--- a/src/Common/Languages/tr/ISK.php
+++ b/src/Common/Languages/tr/ISK.php
@@ -1,5 +1,7 @@
 <?php
 $lang['0_Phase']='Altın';
+$lang['12_Phase']='1/12';
+$lang['14_Phase']='1/14';
 $lang['16_Phase']='1/16';
 $lang['1_Phase']='Bronz';
 $lang['24_Phase']='1/24';
@@ -7,7 +9,9 @@
 $lang['32_Phase']='1/32';
 $lang['48_Phase']='1/48';
 $lang['4_Phase']='Çeyrek Final';
+$lang['63_Phase']='Davis Takım Maçları';
 $lang['64_Phase']='1/64';
+$lang['7_Phase']='1/7';
 $lang['8_Phase']='1/8';
 $lang['About']='Hakkında';
 $lang['AlertNoScoreTitle']='Eksik Skor';
@@ -21,6 +25,7 @@
 $lang['ChangeLang']='Dil Değiştir';
 $lang['ClearAll']='Hepsini Sil';
 $lang['ClearAllDesc']='Hepsini Sil - Girilen bütün skorlarını Sil';
+$lang['ClearingCache']='Serilere ait geçmiş dosyaları temizleniyor.';
 $lang['ClearLastDesc']='Son Girilen Skoru Sil';
 $lang['Close']='Menüyü Kapat';
 $lang['ClosestArrow']='Merkeze yakın';
@@ -34,22 +39,41 @@
 $lang['EditScores']='Skor Düzelt';
 $lang['Elimination']='Eleme';
 $lang['End']='Seri';
+$lang['EndLocked']='Bu seri kilitlendi ve değiştirilemez.';
 $lang['EndSummary']='Seri Özeti';
 $lang['EndTotal']='Seri<br/>Toplamı';
 $lang['Event']='Yarışma';
 $lang['Exit']='Çıkış';
+$lang['FieldControl']='Saha Kontrolü';
 $lang['FirstTarget']='1. Hedef';
 $lang['Help']='Yardım';
 $lang['IpAddr']='IP Adresi';
+$lang['LastEndDist']='Bu turun son serisi tamamlandı. Diğer tura devam etmek için TAMAM\'a (OK) basın, aynı turda kalmak istiyorsanız İPTAL\'e (Cancel) basın.';
+$lang['LastEndSession']='Bu oturum için son seri tamamlandı. Atılacak başka bir seri kalmadı. Skorkartı kontrol edebilir ya da kuruluma dönebilirsiniz.';
+$lang['LockAll']='Tüm Oturumları Kilitle';
+$lang['LRSwipeLabel']='Sol/Sağ Kaydırma Duyarlılığı';
+$lang['ManageLockedSessions']='Kilitli Oturumu Yönet';
 $lang['ManualEntry']='Manuel Giriş';
 $lang['Match']='Maç';
 $lang['MatchNum']='Maç';
+$lang['MatchSummary']='Maç Özeti';
 $lang['Menu']='Menü';
+$lang['NetworkConn']='Ağa Bağlanıldı';
+$lang['NetworkId']='Ağ Kimliği';
 $lang['NextArcher']='Sonraki Sporcu';
 $lang['NextArcherDesc']='Sonraki Sporcu (Sonraki Okçunun Skorunu Gir)';
+$lang['NextDistAlert']='Sonraki tura devam etmek istediğinize emin misiniz?';
+$lang['No']='Hayır';
+$lang['NoArrowScored']='Merkeze yakın olan ok işsretlenmeden önce bir ok değeri girilmeli.';
+$lang['NoAthletes']='Sporcu bulunamadı';
+$lang['NoDist']='Tur bulunamadı.';
+$lang['NoTargetTypes']='Hedef türü bulunamadı.';
 $lang['Number']='Numara';
 $lang['Ok']='Tamam';
+$lang['OnlyPro']='Bu yaroşmada sadece Scorekeeper Pro uygulamaları kullanılabilir.';
 $lang['Points']='Puan';
+$lang['PrevDistAlert']='Bir önceki tura dönmek istediğinize emin misiniz?';
+$lang['ProEnd']='Seriyi Seçin';
 $lang['Reset']='Sıfırla';
 $lang['Save']='Kaydet';
 $lang['Score']='Skor';
diff --git a/src/Common/Languages/tr/Ianseo.php b/src/Common/Languages/tr/Ianseo.php
index 8e28ca35..7f1c8a1f 100644
--- a/src/Common/Languages/tr/Ianseo.php
+++ b/src/Common/Languages/tr/Ianseo.php
@@ -7,4 +7,9 @@
 $lang['Cert-Level4']='Master Kurs';
 $lang['Cert-Level5']='Ianseo Ekibi';
 $lang['CertificateManagement']='Sertifika Yönetimi';
+$lang['GenerateFile']='Dosya Oluştur';
+$lang['ResetItems']='Ögeleri Sıfırla.<br>Bu eylem onay gerektirmez ve geri alınamaz!<br>Sıralama turlarını sıfırlamak o sıralamaya bağlı olan tüm turları sıfırlayacaktır!';
+$lang['ResetResult']='Talep edilen oturumlar sıfırlandı';
+$lang['ResetSessions']='Sıfırlamayı Onayla';
+$lang['ShuffleResults']='Sonuçları Karıştır';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/tr/Tournament.php b/src/Common/Languages/tr/Tournament.php
index 7bef988e..bad529f4 100644
--- a/src/Common/Languages/tr/Tournament.php
+++ b/src/Common/Languages/tr/Tournament.php
@@ -16,6 +16,7 @@
 $lang['AccreditationBooth']='Sadece Akreditasyon Boothu';
 $lang['AccreditationCards']='Akreditasyon Kartlarının dağıtımı bekleniyor.';
 $lang['AclAccreditation']='Akreditasyon';
+$lang['AclAPI']='API';
 $lang['AclCompetition']='Yarışma';
 $lang['AclEliminations']='Elemeler';
 $lang['AclIndividuals']='Bireysel Finaller';
@@ -37,8 +38,10 @@
 $lang['ActualFlag']='Kullanılmış Bayrak';
 $lang['AddMaxRows']='Tüm uygun satırları ekle';
 $lang['AddTournament']='Turnuva Ekle';
+$lang['AdvancedParams']='Gelişmiş Parametreler';
 $lang['AfterDistance']='Şu mesafeden SONRAKİ sıralama:';
 $lang['AfterXDistance']='$a metreden SONRAKİ sıralama';
+$lang['AgeClass']='Yaş Sınıfı';
 $lang['AllDistances']='Tümü';
 $lang['AllEvents']='Tüm Karşılaşmalar';
 $lang['AllRound']='Tüm Turlar';
@@ -50,6 +53,7 @@
 $lang['Announcer']='Sunucu/Konuşmacı';
 $lang['ArcherNotFound']='Sporcu bulunamadı!';
 $lang['ArcherSignature']='Sporcu/Temsilcisi';
+$lang['Areas']='Erişim Alanları';
 $lang['Area_0']='Tüm alanlara girebilir';
 $lang['Area_0*']='Tüm Alanlara girebilir, ancak yarışma alanına sadece özel durumlarda girebilir';
 $lang['Area_1']='Yarışma Sahası';
@@ -60,11 +64,14 @@
 $lang['Area_5']='Televizyon Alanları';
 $lang['Area_6']='Vip Alanı';
 $lang['Area_7']='$a Alanları';
+$lang['Arr4Set']='Set Başına Ok';
 $lang['ArrowPhaseLegend1']='Eleme Turları için Ok/Seri detayları';
 $lang['ArrowPhaseLegend2']='Final Turları için Ok/Seri detayları';
 $lang['Arrows']='Oklar';
 $lang['Arrows4End']='Ok/Seri: $a';
 $lang['ArrowsPerEnd']='Ok/Seri';
+$lang['AthButtLegend1']='Hedef Başına Rakip';
+$lang['Award']='Ödül';
 $lang['AwardName']='Ödül Adı';
 $lang['Awards']='Ödül';
 $lang['AwardSecondLanguage']='İkinci Dil';
@@ -72,20 +79,32 @@
 $lang['BadgeSessions']='Oturumlar';
 $lang['BF_Phase']='Bronz Madalya';
 $lang['Birthdays']='Doğum Günü';
+$lang['BlockedPhase']='Aşama kilitli';
+$lang['BlockSet']='Düzenlemeyi Kilitle';
+$lang['BlockSetup']='Yarışma Alanında Ayarları Kilitle';
+$lang['BlockUnset']='Düzenlemeyi Etkinleştir';
+$lang['Block_Manage']='Ağ Erişim Kuralları';
+$lang['Block_TemplateName']='Açıklama';
+$lang['BytesSession']='Oturum';
 $lang['BytesTotal']='Toplam';
 $lang['Camera']='Kamera';
 $lang['CamPreview']='Önizleme';
 $lang['CatDos']='Atış Yöneticisi';
 $lang['CatJudge']='Hakemler';
+$lang['ChangeNationsNames']='Ulus Adlarını Değiştir';
 $lang['Close2Center']='Merkeze yakın';
 $lang['Club-Nation']='Kulüp';
 $lang['CmdAdd']='Ekle';
 $lang['CmdDelete']='Sil';
+$lang['CmdImport']='İçe aktar';
+$lang['CmdSend']='Gönder';
 $lang['CoinToss']='Yazı Tura';
 $lang['CoinTossShort']='YT';
+$lang['CompetitionOfficials']='Yarışma Görevlileri';
 $lang['CompleteSchedule']='Yarışma Programı';
 $lang['CompVenue']='Saha';
 $lang['CountryClubNames']='Ülke/Kulüp isimleri';
+$lang['CR-short']='CR';
 $lang['DailySchedule']='Günlük Program';
 $lang['Date']='Tarih';
 $lang['DateTimeSignature']='Tarih ve Saat';
@@ -95,6 +114,8 @@
 $lang['Descr']='Açıklama';
 $lang['Distance']='Mesafe';
 $lang['Distances']='Mesafeler';
+$lang['Div-C']='Makaralı Yay';
+$lang['Div-R']='Klasik Yay';
 $lang['DNF']='Tamamlamadı';
 $lang['DNS']='Başlamadı';
 $lang['DOB']='Doğum tarihi';
@@ -126,6 +147,8 @@
 $lang['FlightsCategory']='Kategori';
 $lang['FlightsDescription']='Açıklama';
 $lang['FlightsDistTotal']='Toplam $a';
+$lang['FlightsManagement']='Bayrak Yönetimi';
+$lang['FlightsReset']='Sıfırla';
 $lang['FlightsTotals']='Toplamlar';
 $lang['From']='Başlangıç';
 $lang['F_Phase']='Altın Madalya';
@@ -134,16 +157,20 @@
 $lang['I-Session']='Bireysel Maçlar';
 $lang['Image']='Resim';
 $lang['IndQual']='Bireysel - Sıralama Turu';
+$lang['InitEliminations']='Elemeleri Başlat';
 $lang['IRM-10']='DNS-Başlamadı';
 $lang['IRM-5']='DNF-Tamamlamadı';
 $lang['IRM-7']='DNF-Tamamlamadı (sıralama yok)';
 $lang['Judge']='Hakem';
 $lang['LegendSO']='Beraberlik Atışı / Yazı Tura Kısaltması';
 $lang['LocalRule']='Yarışma Kuralı';
+$lang['LogoB']='Alt Resim';
 $lang['LogoL']='Sol Üst Resim';
 $lang['LogoManagement']='Resim Yönetimi';
 $lang['LogoR']='Sağ Üst Resim';
+$lang['MailTitle']='Ad';
 $lang['ManDistances']='Mesafeleri Yönet';
+$lang['ManStaffOnField']='Saha Ekibi Yönetimi';
 $lang['Match']='Maç';
 $lang['MatchesSchedule']='Maç Programları';
 $lang['MatchName-0']='Altın Madalya Maçı';
@@ -158,16 +185,21 @@
 $lang['MedalSqClass']='Sınıf & Kategori Sonuçları - Tskım Madalyaları';
 $lang['MissingPhoto']='Fotoğraf Eksik';
 $lang['MixedTeamFinEvent']='Karışık Takım Finali';
+$lang['MsgLookup5']='Seri';
 $lang['Name']='Ad';
 $lang['New']='Yeni';
 $lang['NoAcc']='Akredite Edilmemiş';
+$lang['NoStaffOnField']='Saha Ekibi Yok';
 $lang['NumberOfEntriesByCountry']='Kulüp Bazında Katılım Sayısı';
 $lang['NumberOfEntriesByEvent']='Etkinlik Bazında Katılım Sayısı';
 $lang['Options']='Seçenekler';
 $lang['OR-Record']='Olimpiyat rekoru';
+$lang['OR-short']='OR';
 $lang['Order']='Sırala';
 $lang['PaperSize']='Kağıt Boyutu';
 $lang['PhaseBlock_1']='Sıralama';
+$lang['PhaseBlock_11']='Robin Turu';
+$lang['PhaseBlock_2']='Eleme';
 $lang['PhaseBlock_3']='Bireysel final';
 $lang['PhaseBlock_4']='Takım finali';
 $lang['PhaseBlock_5']='Son Rapor';
@@ -177,6 +209,7 @@
 $lang['PrintLanguage']='Çıktı Dili';
 $lang['Q-Session']='Sıralama Atışları';
 $lang['QF_Phase']='Çeyrek Final';
+$lang['R-Session']='Robin Turu';
 $lang['RankFinals']='Final Sıralaması';
 $lang['RealCountry']='Kulüp';
 $lang['Reference']='Referans';
@@ -209,6 +242,7 @@
 $lang['ShotOff']='Beraberlik Atışı';
 $lang['ShotOffShort']='BA';
 $lang['ShowMissing']='Eksik Skor Kartlarını Göster';
+$lang['StaffOnField']='Yarışma Görevlileri';
 $lang['StartlistAlpha']='Katılımcı Listesi Alfabetik Sıralı';
 $lang['StartlistCategory']='Katılımcı Listesi Gruplandırılmış Kategoriye Göre';
 $lang['StartlistCountry']='Katılımcı Listesi (kulüp,ülke)';
@@ -219,6 +253,8 @@
 $lang['StatClasses']='İstatistik (Sınıf ve Kategori)';
 $lang['StatCountries']='İstatistik (Kulüp)';
 $lang['StatEvents']='İstatistik (Ödül ve Etkinlik)';
+$lang['StatRecordsBroken']='Kırılmış Rekorlar';
+$lang['StatRecordsStanding']='Mevcut Rekorlar';
 $lang['Status']='Durum';
 $lang['StickersTopMargin']='Üst Kenar Boşluğu';
 $lang['StickersUnitInches']='inç';
@@ -264,10 +300,24 @@
 $lang['Type_FITA+50']='FITA + 50m Atışı';
 $lang['Type_NorH']='Avcı';
 $lang['Unisex']='Unisex';
+$lang['UserEnabled']='Etkinleştirilmiş';
+$lang['UserName']='Kullanıcı adı';
+$lang['VersionFile']='Dosya';
+$lang['VersionMajVersion']='Ana Versiyon';
+$lang['VersionMinVersion']='Alt Versiyon';
 $lang['VersionPrintDateTime']='Çıktı Tarih ve Saati';
+$lang['VertScoreAllDist']='Dikey Skor Kartı Tüm Mesafeler (Lancaster)';
+$lang['ViewTeamComponents']='Takım rakiplerini göster';
+$lang['WaCategory']='WA Kategorisi';
+$lang['WaIdShort']='Sporcu ID';
 $lang['WarmUp']='Deneme Atışı';
+$lang['WarmUpMins']='Deneme Atışı (dak.)';
 $lang['WarmupTargets']='Deneme Atış Hedefleri';
 $lang['Warning']='Dikkat!';
+$lang['WheelChair']='Tekerlekli Sandalye';
 $lang['WR-Record']='Dünya rekoru';
 $lang['WR-short']='WR';
+$lang['YearEnd']='Bitiş Yılı';
+$lang['YearStart']='Başlangıç Yılı';
+$lang['YourFollowingMatches']='Maçınızın sonucuna bağlı olarak olası eşleşmelerin listesi';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/uk/Boinx.php b/src/Common/Languages/uk/Boinx.php
index aee0f0b0..ff4dc1f5 100644
--- a/src/Common/Languages/uk/Boinx.php
+++ b/src/Common/Languages/uk/Boinx.php
@@ -3,11 +3,15 @@
 $lang['BoinxSchedule']='Планувальник шарів Boinx';
 $lang['CssArrowCommon']='Стріли';
 $lang['CssFlexArrowsDiv']='По одній Стрілі Див.';
+$lang['CssPointsCommon']='Очки';
 $lang['CssSetsCommon']='Встановіть Очки';
+$lang['CssSoPointsCommon']='Очки';
 $lang['CssVegasFreeTextText']='Текст';
 $lang['CssVegasFreeTextTitle']='Заголовок';
 $lang['CssVegasInOutName']='Назва';
+$lang['CssVegasInOutPoints']='Очки';
 $lang['CssVegasSOName']='Назва';
+$lang['CssVegasSOPoints']='Очки';
 $lang['CssVegasSOTarget']='Щит';
 $lang['ScheduleAwards']='Церемонія нагородження';
 $lang['ScheduleFeed']='RSS-канали';
diff --git a/src/Common/Languages/uk/Errors.php b/src/Common/Languages/uk/Errors.php
index c1a5264f..2ed2799a 100644
--- a/src/Common/Languages/uk/Errors.php
+++ b/src/Common/Languages/uk/Errors.php
@@ -1,5 +1,6 @@
 <?php
 $lang['Anomalies']='Аномалії';
+$lang['EntriesNoCategory']='Записи без Категорії';
 $lang['ErrEmptyFields']='Порожні поля';
 $lang['ErrGenericError']='Загальна помилка';
 $lang['ErrNoError']='Без помилок! Ви отримали електронний лист із кодом. На даний момент змагання не активовано: ви отримаєте електронний лист, коли він відбудеться.';
diff --git a/src/Common/Languages/uk/ISK-App.php b/src/Common/Languages/uk/ISK-App.php
index 73713b1f..4e10744b 100644
--- a/src/Common/Languages/uk/ISK-App.php
+++ b/src/Common/Languages/uk/ISK-App.php
@@ -1,214 +1,4 @@
 <?php
-$lang['0_Phase']='Золото';
-$lang['12_Phase']='1/12';
-$lang['14_Phase']='1/14';
-$lang['16_Phase']='1/16';
-$lang['1_Phase']='Бронза';
-$lang['24_Phase']='1/24';
-$lang['2_Phase']='Півфінал';
-$lang['32_Phase']='1/32';
-$lang['48_Phase']='1/48';
-$lang['4_Phase']='Чвертьфінал';
-$lang['63_Phase']='Командні матчі Девіса';
-$lang['64_Phase']='1/64';
-$lang['7_Phase']='1/7';
-$lang['8_Phase']='1/8';
-$lang['AboutAppDeveloper']='Додаток розробив';
-$lang['AboutProducer']='Дизайн і розробка';
-$lang['AboutTitle']='Про Scorekeeper';
-$lang['AboutUX']='UX дизайн у співпраці з';
-$lang['AppPageAbout']='Про';
-$lang['AppPageHelp']='Допомога';
-$lang['AppPageSettings']='Налаштування';
-$lang['AppPageStart']='Стартова сторінка';
-$lang['AppTitle']='Scorekeeper NG';
-$lang['BarcodeErrorMessage']='Це недійсний штрих-код';
-$lang['BarcodeErrorTitle']='Помилка штрих-коду';
-$lang['BarcodeScanPrompt']='Центруйте штрих-код у шукачі';
-$lang['DeviceId']='ID пристрою';
-$lang['EnterPinCodeInvalidValue']='Недійсний код авторизації';
-$lang['EnterPinCodeMessage']='Введіть код авторизації, щоб використовувати цю функцію';
-$lang['EnterPinCodeTitle']='Потрібен код авторизації';
-$lang['EnterPinCodeValue']='Код';
-$lang['FabReconnect']='Повторне підключення';
-$lang['GenericCancel']='Скасувати';
-$lang['GenericDelete']='Видалити';
-$lang['GenericNext']='Далі';
-$lang['GenericNo']='Ні';
-$lang['GenericOk']='OK';
-$lang['GenericPrevious']='Попередній';
-$lang['GenericYes']='Так';
-$lang['HelpContactHead']='Контакти';
-$lang['HelpContactText']='Якщо у вас виникли проблеми з додатком і вам потрібна допомога, ви можете зв\'язатися з нами, надіславши електронний лист на адресу';
-$lang['HelpIntro13D']='3D стрільба з лука';
-$lang['HelpIntro1Field']='Field Archery';
-$lang['HelpIntro1Head']='Scorekeeper NG';
-$lang['HelpIntro1RR']='Кругові';
-$lang['HelpIntro1TargetIn']='Стрільба з лука по мішенях у приміщенні';
-$lang['HelpIntro1TargetOut']='Стрільба з лука на відкритому повітрі';
-$lang['HelpIntro1Text']='це нове покоління додатків для стрільби з лука! Це додаток-супутник програмного забезпечення для стрільби з лука Ianseo, який дозволяє підраховувати:';
-$lang['HelpIntro2Elim']='Елімінації';
-$lang['HelpIntro2MI']='Індивідуальні матчі';
-$lang['HelpIntro2MT']='Командні матчі';
-$lang['HelpIntro2Qual']='Кваліфікації';
-$lang['HelpIntro2Text']='Додаток дозволяє оцінювати всі аспекти змагань зі стрільби з лука, включаючи:';
-$lang['HelpIntro3Lite']='Lite';
-$lang['HelpIntro3LiteText']='- базові функції підрахунку результатів у додатку, відсутність адміністрування пристроїв у Ianseo';
-$lang['HelpIntro3Live']='Live';
-$lang['HelpIntro3LiveText']='- базові функції підрахунку результатів, адміністрування пристрою та результати в реальному часі в Ianseo, а також розширений зв\'язок із пристроями (лише для досвідчених користувачів)';
-$lang['HelpIntro3Pro']='Pro';
-$lang['HelpIntro3ProText']='- базові функції підрахунку результатів у додатку, а також адміністрування пристрою та результати в реальному часі в Ianseo';
-$lang['HelpIntro3Text']='Scorekeeper NG однаково добре працює з Lite, Pro або Live змаганнями в Ianseo. Залежно від типу змагання, додаток увімкне або вимкне можливість використання деяких розширених функцій.';
-$lang['HelpIntro4Text']='Додаток містить п\'ять основних функцій:';
-$lang['HelpMainHead']='Головне';
-$lang['HelpMainText']='Це головний екран, який використовують спортсмени, коли додаток налаштовано та підключено до Ianseo. Тут відображається інформація про змагання, поточна сесія та список спортсменів, налаштованих для заданого щита Для кожного спортсмена відображаються поточна серія, тип мішені, значення стріл і підсумки. Торкнувшись спортсмена, відобразиться екран підрахунку очок. Також можна перейти до картки результатів і переглянути інформацію про всіх спортсменів і дистанції.';
-$lang['HelpScorecardHead']='Картка запису результатів';
-$lang['HelpScorecardText']='Картка запису результатів відображає відстріляні стріли із підсумками. Вона може відображати всіх спортсменів і дистанції або одного спортсмена залежно від того, чи вибрано на головній сторінці чи сторінці підрахунку очок.';
-$lang['HelpScoringHead']='Підрахунок результатів';
-$lang['HelpScoringText']='Цей екран дозволяє спортсменам підраховувати свої стріли для певної серії або змінювати попередні значення стріл. Поточну серію виділено, щоб легко визначити, які стріли потрібно ввести. Якщо потрібно стріляти на кілька дистанцій, які були налаштовані для пристрою, вони відображатимуться під час змагання. За потреби можна перемикатися між підрахунком стріли та карткою результатів лучника.';
-$lang['HelpSettingsHead']='Налаштування';
-$lang['HelpSettingsText']='Ця функція дозволяє налаштувати спосіб підключення пристрою до Ianseo. Після налаштування пристрій автоматично спробує підключитися за допомогою наданих параметрів. Індикатор статусу з\'єднання чітко відображає поточний стан з\'єднання, вказуючи, чи пристрій перебуває в мережі, офлайн або намагається встановити з\'єднання. За бажанням також можна завантажити додаткові мови. Існують додаткові розширені параметри залежно від типу змагань.';
-$lang['HelpStartHead']='Cтарт';
-$lang['HelpStartText']='Це дозволить вам розпочати налаштування програми. Ви можете відсканувати QR-код, створений Ianseo, щоб легко налаштувати змагання у додатку. Це автоматично вибере правильний тип змагання, параметри підключення до сервера, а також будь-які додаткові параметри, налаштовані в Ianseo. При бажанні також можна налаштувати пристрій вручну.';
-$lang['MainDistance']='Дистанція';
-$lang['MainEnd']='Серія';
-$lang['MainInvalidKey']='Недійсний ліцензійний ключ';
-$lang['MainNotInUse']='Пристрій не використовується';
-$lang['MainSignatureMessage']='Підрахунок очок завершено. Хочете підписати свою картку запису результатів і завершити цей раунд?';
-$lang['MainSignatureTitle']='Підрахунок очок завершено';
-$lang['MainTargets']='Призначено Щит(и)';
-$lang['MainTotal']='Загалом';
-$lang['MainWaitingConfig']='Передайте команді вводу результатів Ianseo';
-$lang['MenuAppVersion']='Версія:';
-$lang['MenuCloseMenu']='Закрити меню';
-$lang['MenuDeviceId']='ID пристрою:';
-$lang['MenuExitApp']='Вийти з програми';
-$lang['ScorecardArrows']='Значення Стріл';
-$lang['ScorecardCompTotal']='Загалом';
-$lang['ScorecardDistTotal']='Дист';
-$lang['ScorecardEnd']='Серія';
-$lang['ScorecardEndTotal']='Серія';
-$lang['ScorecardSetPoints']='Встановити';
-$lang['ScorecardTarget']='Щит';
-$lang['ScoreTotalsCloseButton']='Закрити';
-$lang['ScoreTotalsConfirmButton']='Підтвердити';
-$lang['ScoreTotalsConfirmOrReview']='Одна або кілька результатів не збігаються. Змініть значення та натисніть «Підтвердити», щоб підтвердити ще раз, або натисніть «Закрити», щоб повернутися та перевірити свої бали.';
-$lang['ScoreTotalsMessage']='Будь ласка, введіть результати з паперової картки результатів';
-$lang['ScoreTotalsMissingValues']='Будь ласка, введіть усі необхідні значення';
-$lang['ScoreTotalsScore']='Загальний результат';
-$lang['ScoreTotalsTitle']='Підтвердження результатів';
-$lang['ScoringDeleteArrow']='Видалити Стрілу';
-$lang['ScoringDeleteEnd']='Видалити Серію';
-$lang['ScoringDeleteEndConfirmMessage']='Ви дійсно хочете видалити всі стріли вибраної серії?';
-$lang['ScoringDeleteEndConfirmTitle']='Підтвердження видалення';
-$lang['ScoringDistanceDoneMessage']='Всі стріли вже введені. За потреби можна змінити введені стріли.';
-$lang['ScoringDistanceDoneTitle']='Дистанція завершена';
-$lang['ScoringDistTotal']='Загалом';
-$lang['ScoringEndTotal']='Серія';
-$lang['ScoringMissingPointsMessage']='У спортсмена не вистачає одного чи кількох значень стріл. Все одно продовжити?';
-$lang['ScoringMissingPointsTitle']='Відсутні очки';
-$lang['SettingsChooseValue']='Виберіть значення';
-$lang['SettingsCompetitionType']='Вид змагання';
-$lang['SettingsConnectionCategory']='Підключення';
-$lang['SettingsConnectionCompCode']='Код змагання';
-$lang['SettingsConnectionUrl']='Url';
-$lang['SettingsCouldNotGetCompInfo']='Не вдалося отримати інформацію про змагання';
-$lang['SettingsCouldNotGetConfigInfo']='Не вдалося отримати інформацію про конфігурацію';
-$lang['SettingsCouldNotGetDistanceInfo']='Не вдалося отримати інформацію про дистанцію';
-$lang['SettingsCouldNotGetEventInfo']='Не вдалося отримати інформацію про етап';
-$lang['SettingsCouldNotGetMatchInfo']='Не вдалося отримати інформацію про матч';
-$lang['SettingsCouldNotSendHandshake']='Не вдалося надіслати запит рукостискання';
-$lang['SettingsDeviceNotAllowed']='Пристрій не допускається до цього змагання. Перевірте інформацію про конфігурацію змагань або зверніться до організатора заходу.';
-$lang['SettingsDeviceUnknownError']='Пристрій не дозволено Ianseo з невідомої причини';
-$lang['SettingsElimFirstTarget']='Перший щит';
-$lang['SettingsEventSelection']='Вибір етапу';
-$lang['SettingsFunctionsCategory']='Інші функції';
-$lang['SettingsFunctionsResetSettings']='Скинути налаштування до значень за замовчуванням';
-$lang['SettingsGenerateQr']='Генерувати';
-$lang['SettingsGpsCategory']='Геолокація GPS';
-$lang['SettingsGpsFrequency']='Частота';
-$lang['SettingsGpsMinute']='хвилина';
-$lang['SettingsGpsMinutes']='хвилини';
-$lang['SettingsGpsSeconds']='секунд';
-$lang['SettingsGpsSendPosition']='Надіслати позицію пристрою';
-$lang['SettingsLanguageCategory']='Мова';
-$lang['SettingsLanguageCurrent']='Поточна Мова';
-$lang['SettingsLanguageUpdate']='Оновити мову';
-$lang['SettingsManualAllDistances']='Всі';
-$lang['SettingsManualDistance']='Дистанція';
-$lang['SettingsManualEvent']='Етап';
-$lang['SettingsManualGroup']='Група';
-$lang['SettingsManualMatch']='Матч';
-$lang['SettingsManualPhase']='Фаза';
-$lang['SettingsManualSession']='Зміна';
-$lang['SettingsManualStage']='Етап';
-$lang['SettingsManualTarget']='Щит';
-$lang['SettingsOtherAskForSignature']='Запит підпису';
-$lang['SettingsOtherAskForTotals']='Запит результатів після закінчення';
-$lang['SettingsOtherCategory']='Інші параметри';
-$lang['SettingsOtherHideTotals']='Приховати підсумки під час підрахунку очок';
-$lang['SettingsOtherSignatureNone']='Ні';
-$lang['SettingsOtherSignatureScan']='Сканувати ID спортсмена';
-$lang['SettingsOtherSignatureScreen']='Підпис на екрані';
-$lang['SettingsOtherSpotting']='Режим спостереження';
-$lang['SettingsQrCodesCategory']='QR-коди';
-$lang['SettingsQrCodesDevice']='Пристрій';
-$lang['SettingsQrCodesScorecard']='Картка запису результатів';
-$lang['SettingsReset']='Скинути';
-$lang['SettingsSaveConfig']='Зберегти';
-$lang['SettingsShowAdvanced']='Просунутий';
-$lang['SettingsStageE1']='Елімінаційний Раунд 1';
-$lang['SettingsStageE2']='Елімінаційний Раунд 2';
-$lang['SettingsStageMI']='Матчі - Індивідуальні';
-$lang['SettingsStageMT']='Матчі - Команди';
-$lang['SettingsStageQ']='Кваліфікації';
-$lang['SettingsTitle']='Налаштування';
-$lang['SettingsWifiAdd']='Додати WiFi';
-$lang['SettingsWifiAddNew']='Додайте новий SSID WiFi';
-$lang['SettingsWifiCategory']='WiFi';
-$lang['SettingsWifiEdit']='Редагувати WiFi';
-$lang['SettingsWifiManage']='Керуйте з\'єднанням WiFi';
-$lang['SetupManually']='Ручне налаштування';
-$lang['SetupNeedHelp']='Тобі потрібна допомога?';
-$lang['SetupUsingBarcode']='Налаштуйте додаток за допомогою QR-коду';
-$lang['ShootoffClosestArcher']='є найближчим';
-$lang['ShootoffClosestNew']='Нова Перестрілка';
-$lang['ShootoffClosestTitle']='Потрібно найближче до центру';
-$lang['ShootoffNewConfirmation']='Підтвердження перестрілки';
-$lang['ShootoffNewIsNeeded']='Чи потрібна ще одна перестрілка, щоб визначити переможця матчу?';
-$lang['SignatureClear']='Очистити';
-$lang['SignatureIncorrectCodeMessage']='Відсканований код невірний для цього спортсмена. Ви впевнені, що просканували код для {{n}}? Відскануйте правильний код.';
-$lang['SignatureIncorrectCodeTitle']='Неправильний штрих-код';
-$lang['SignatureReturnDev']='Поверніть пристрій команді Ianseo, яка вводить результати';
-$lang['SignatureSaved']='Збережено!';
-$lang['SignatureSaveSign']='Збережіть свій підпис';
-$lang['SignatureScanCode']='Сканувати код підтвердження';
-$lang['SignatureSignature']='Підпис';
-$lang['SignatureSuccess']='OK';
-$lang['SignatureTextArcher']='Підпис спортсмена';
-$lang['SignatureTextScorer']='Підпис спортсмена, який вводить результати';
-$lang['SignatureTitle']='Підпишіть свою картку запису результатів';
-$lang['SignatureTitleFinished']='Введення в карту запису результатів завершена';
-$lang['SignatureUndo']='Скасувати';
-$lang['SignatureVerification']='Перевірка';
-$lang['SignatureVerificationFailed']='Не вдалося перевірити код. Перевірте підключення до мережі та повторіть спробу.';
-$lang['SignatureVerified']='Перевірено!';
-$lang['UpdateLangAdditional']='Додаткові Мови';
-$lang['UpdateLangGetAll']='Отримання доступних мов...';
-$lang['UpdateLangGetSingle']='Завантаження мови...';
-$lang['UpdateLangInstalled']='Встановлені Мови';
-$lang['UpdateLangTitle']='Оновити мову';
-$lang['WiFiCannotAdd']='WIFI: не вдається додати Wi-Fi {{n}}';
-$lang['WiFiCannotConnect']='WIFI: не вдається підключитися до Wi-Fi {{n}}5';
-$lang['WiFiCannotDetermineStatus']='WIFI: Не вдається визначити статус пристрою WiFi';
-$lang['WiFiCannotEnable']='WIFI: не вдається ввімкнути пристрій WiFi';
-$lang['WiFiCannotRemove']='WIFI: неможливо видалити WiFi до додавання {{n}}';
-$lang['WiFiConnected']='WIFI: підключено до Wi-Fi {{n}}';
-$lang['WiFiDeviceEnabled']='WIFI: пристрій включено';
-$lang['WiFiDeviceNotEnabled']='WIFI: пристрій НЕ ввімкнено';
-$lang['WifiPassword']='Пароль';
-$lang['WifiSsid']='SSID';
-$lang['WifiTargetFrom']='Щит від';
-$lang['WifiTargetTo']='Щит до';
-$lang['WiFiTurnOnManually']='Не вдається ввімкнути WiFi. Будь ласка, увімкніть вручну!';
+$lang['HelpIntro1RR']='КРУГОВІ';
+$lang['SettingsManualRRLevel']='Рівень';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/uk/Install.php b/src/Common/Languages/uk/Install.php
index da42fcc7..449b8ab5 100644
--- a/src/Common/Languages/uk/Install.php
+++ b/src/Common/Languages/uk/Install.php
@@ -7,6 +7,7 @@
 $lang['AcceptGPL-Logo']='Більше інформації';
 $lang['AcceptGPL-ReadTXT']='Прочитати ліцензію';
 $lang['AcceptGPL-Start']='Щоб установити, оновити та використовувати Ianseo, поставте прапорець у наступному полі:';
+$lang['cmdForceUpdate']='Примусове оновлення';
 $lang['Credits-BeiterCredits']='Модуль штрих-коду випущено безкоштовно для всієї спільноти I@NSEO завдяки підтримці компанії Beiter Archery Products і доброті пана Андреаса Лоренца';
 $lang['Credits-Coordination']='Координація ІТ-проекту';
 $lang['Credits-DebugManager']='Відділ налагодження';
@@ -44,13 +45,13 @@
 $lang['SetOutdoor']='На відкритому повітрі';
 $lang['Setup-Select']='Виберіть правильне локальне правило';
 $lang['Status']='Статус';
+$lang['UpdateInProgress']='Оновлення вже триває, зачекайте...';
 $lang['UpdatePrepared']='Вашу установку буде автоматично оновлено. Перед початком не забудьте створити резервну копію всіх змагань. Процес оновлення може зайняти тривалий час, залежно від підключення та елементів, які потрібно оновити.<br/>Пам\'ятайте, що будь-який неоригінальний файл буде видалено, окрім вмісту папки «Modules/Custom».';
 $lang['Updating']='Оновлення локальної інсталяції Ianseo';
 $lang['UpdatingLanguages']='Оновлення встановлених мов';
 $lang['UpgradeFinished']='Процес оновлення завершено.';
 $lang['WhatIanseoDoes01']='<b>Відповідність правилам World Archery:</b> Ianseo завжди в курсі правил World Archery. Розробники також доступні для налаштувань відповідно до національних правил і специфічних правил змагань!';
 $lang['WhatIanseoDoes02']='<b>Допомога та підтримка:</b> якщо вам потрібна допомога, надішліть електронний лист на $a: ви отримаєте відповідь безпосередньо від основних розробників Ianseo!';
-$lang['WhatIanseoDoes03']='<b>Навчання та курси на місці:</b> Ianseo доступний для керування спеціальними курсами на місці. Два рівня: без і з електронними пристроями. Перший спрямований на знання всіх аспектів ianseo від підготовки до змагань і розкладу до онлайн-публікації та місцевого поширення результатів. Другий спрямований на отримання всіх специфічних знань для проведення змагань «стріла за стрілою».';
 $lang['WhatIanseoDoes04']='<b>Пожертвуйте!</b> Ianseo є безкоштовним із відкритим кодом... якщо вам це подобається, допоможіть нам підтримувати програмне забезпечення та сервер в актуальному стані: натисніть кнопку «Пожертвувати» на домашній сторінці $a!';
 $lang['WhatIanseoDoes05']='<b>Соціальні мережі:</b> Ianseo також на $a!';
 $lang['WhatIanseoDoesTitle']='Що Ianseo може зробити для ваших змагань';
diff --git a/src/Common/Languages/uk/RoundRobin.php b/src/Common/Languages/uk/RoundRobin.php
index 498768bd..117911ca 100644
--- a/src/Common/Languages/uk/RoundRobin.php
+++ b/src/Common/Languages/uk/RoundRobin.php
@@ -1,10 +1,40 @@
 <?php
+$lang['BestRanked']='Найкращий рейтинг';
+$lang['BestRanked_0']='Загальні кругові очки, а потім нічия';
+$lang['BestRanked_1']='Нічия, а потім загальні кругові очки';
 $lang['Components']='Компоненти';
+$lang['CopyFrom']='Копіювати для...';
+$lang['DifferentEventSoManagementButton']='Управління статусом КРУГОВІ';
 $lang['Group']='Група';
+$lang['GroupArchers']='Спортсменів в групі';
+$lang['GroupAssignment']='Налаштування груп';
+$lang['GroupName']='Назва группи';
 $lang['GroupNum']='Група {$a}';
+$lang['Groups']='Группа';
+$lang['Item']='Номер';
+$lang['ItemName']='Ім\'я спортсмена';
+$lang['Level']='Рівень';
+$lang['LevelName']='Назва рівня';
+$lang['LevelNum']='Рівень {$a}';
+$lang['LevelNumShort']='Р-нь {$a}';
+$lang['Levels']='Рівні';
+$lang['LevelShort']='Р-нь';
+$lang['QualifiedArchers']='Кваліфіковані спортсмени';
 $lang['RegularBrackets']='Звичайні Сітки';
+$lang['Round']='Раунд';
+$lang['RoundNum']='Раунд {$a}';
+$lang['Rounds']='Раунди';
+$lang['Setup']='Налаштування';
+$lang['SetupChangeWarning']='Зміни в налаштуваннях цього рівня скинуть наступні рівні та призначення груп. Продовжуйте, лише якщо ви знаєте, що робите!';
+$lang['Source']='Початковій рівень + группа';
+$lang['SourceRank']='Початковий ранг';
+$lang['TargetAssignment']='Налаштування шитів';
+$lang['TargetAssignmentDescription']='Номер щита, після якого йде «++», працює як «+», але повторює ті самі щити на всіх рівнях, починаючи з поточного;<br>Номер щита, після якого йде "**", працює як "*", але для всіх раундів';
+$lang['TieAllowed']='Нічия дозволена';
 $lang['TieBreak-1-Short']='TB1';
 $lang['TieBreak-2-Short']='TB2';
 $lang['TiebreakSystem-2']='Рахунок в Сеті';
 $lang['TiebreakSystem-4']='Перестрілка';
+$lang['TiePoints']='Очки за нічию';
+$lang['WinPoints']='Очки для переможця';
 ?>
\ No newline at end of file
diff --git a/src/Common/Languages/uk/RunArchery.php b/src/Common/Languages/uk/RunArchery.php
index fc408997..579d718d 100644
--- a/src/Common/Languages/uk/RunArchery.php
+++ b/src/Common/Languages/uk/RunArchery.php
@@ -1,5 +1,6 @@
 <?php
 $lang['ArrowShort']='Стр.';
+$lang['CompetitionRounds']='Раунди';
 $lang['FinalRank']='Фінальний Ранг';
 $lang['PhaseName-0']='Кваліфікація';
 $lang['PhaseName-1']='Фінали';
diff --git a/src/Common/Languages/uk/Tournament.php b/src/Common/Languages/uk/Tournament.php
index 4a8ed109..2d368e31 100644
--- a/src/Common/Languages/uk/Tournament.php
+++ b/src/Common/Languages/uk/Tournament.php
@@ -26,7 +26,7 @@
 $lang['AclQualification']='Кваліфікація';
 $lang['ACLReadOnly']='Обмежений Доступ (лише читання)';
 $lang['ACLReadWrite']='Повний Доступ (читання та запис)';
-$lang['AclRobin']='Кругові';
+$lang['AclRobin']='КРУГОВІ';
 $lang['AclRoot']='Супер користувач';
 $lang['AclSpeaker']='Спікер';
 $lang['AclTeams']='Командні Фінали';
@@ -87,7 +87,6 @@
 $lang['BadgeConfirmPrinted']='Підтвердити друк';
 $lang['BadgeIncludePhoto']='Включити фотографії в бейдж?';
 $lang['BadgeNames']='Повне ім\'я (спершу не друкується)';
-$lang['BadgeOnlyNotPrinted']='ТІЛЬКИ Бейджі ще не надруковані?';
 $lang['BadgeOnlyPrintAccredited']='ТІЛЬКИ Бейджі акредитованих учасників?';
 $lang['BadgeOnlyPrintPhoto']='ТІЛЬКИ Бейджі з фото?';
 $lang['BadgeOptions']='Опції';
@@ -128,8 +127,10 @@
 $lang['ChangeLookUpTable']='Змінити таблицю пошуку';
 $lang['ChangeNationsNames']='Змінити назви областей';
 $lang['Channel']='Канал';
+$lang['CheckGoldsInMatch']='Перевіряти 10-ки в нічиїй';
 $lang['CheckTargetUpdate']='Перевірити оновлення даних';
 $lang['CheckWaIds']='Перевірити WA ID відповідних спортсменів';
+$lang['CheckXNinesInMatch']='Перевіряти Х в нічиїй';
 $lang['Classes']='Категорії';
 $lang['ClickToRequestCode']='Натисніть, щоб отримати Код';
 $lang['Close2Center']='Ближче до центру';
@@ -205,7 +206,6 @@
 $lang['ElimArrows']='Елімінаційні Стріли';
 $lang['ElimEnds']='Елімінаційні Серії';
 $lang['EliminationShort']='Елім.';
-$lang['EnableAccess']='Увімкнути/вимкнути Правила';
 $lang['Ends']='Серій';
 $lang['EndsOffset']='Зміщення Серій';
 $lang['EndsToShoot']='Серія для Зміщення';
@@ -273,6 +273,7 @@
 $lang['I-Session']='Індивідуальні матчі';
 $lang['Image']='Зображення';
 $lang['ImgInfo']='Дозволений тип зображення: PNG і JPG - Макс. розмір 256KB';
+$lang['IncompatibleVersions']='Не вдалося імпортувати турнір, оскільки він новіший, ніж Ianseo.<br/>Оновіть Ianseo до останньої версії з $a.';
 $lang['IndClEvent']='Інд. Квал.';
 $lang['IndFin']='Індив. - Елім. та Фін. Раунди';
 $lang['IndFinEvent']='Інд. Фінал';
@@ -325,6 +326,7 @@
 $lang['ManualTargetAssignment']='Призначення щитів вручну';
 $lang['Match']='Матч';
 $lang['Match4Target']='Кількість матчів на щиті';
+$lang['MatchDateTime']='Дата/час матчу';
 $lang['MatchesSchedule']='Розклад матчів';
 $lang['MatchMins']='Тривалість матчу (хв.)';
 $lang['MatchName-0']='Матч за Золоту медаль';
@@ -404,7 +406,7 @@
 $lang['PersonList']='Список людей';
 $lang['PhaseBlock_0']='Офіційні особи змагання';
 $lang['PhaseBlock_1']='Кваліфікація';
-$lang['PhaseBlock_11']='Кругові';
+$lang['PhaseBlock_11']='КРУГОВІ';
 $lang['PhaseBlock_2']='Елімінація';
 $lang['PhaseBlock_3']='Індивідуальні фінали';
 $lang['PhaseBlock_4']='Ком. фінал';
@@ -420,6 +422,7 @@
 $lang['PhotoDelete']='Видалити фото';
 $lang['PhotoRetake']='Перезняти Фото';
 $lang['PhotoUploaded']='Фото оновлено!';
+$lang['Points']='Очки';
 $lang['PointsAsGold']='Значення для "золотого сектору"';
 $lang['PointsAsXNine']='Значення для Х/9';
 $lang['Poule']='Група';
@@ -443,7 +446,7 @@
 $lang['QR-Code']='QR-код';
 $lang['QrCode']='QR-код з деталями спортсмена';
 $lang['QualSessionShort']='Квал. зміни';
-$lang['R-Session']='Кругові';
+$lang['R-Session']='КРУГОВІ';
 $lang['RA-Session']='Ран арчері';
 $lang['RaiseFlag']='Підняти Прапори';
 $lang['RankByDistance']='Ранг по дистанціям';
@@ -465,6 +468,8 @@
 $lang['ResultSqAbs']='Кваліфікаційний Раунд Командний';
 $lang['ResultSqClass']='Результати по Категоріям і Дивізіонам - Командні';
 $lang['ReverseNameFunction']='Зворотна назва та функція';
+$lang['Round']='Раунд';
+$lang['Round#']='Раунд $a';
 $lang['Row-1']='Перший рядок';
 $lang['Row-2']='Другий рядок';
 $lang['RunningTotal']='Підсумок';
@@ -596,7 +601,6 @@
 $lang['TeamCreationMode_2']='Завжди друга команда';
 $lang['TeamCreationMode_3']='Завжди третя команда';
 $lang['TeamFin']='Ком. - Елім. та Фін. Раунди';
-$lang['TeamFinEvent']='Ком. Фінал';
 $lang['TeamLoaded']='Командні матчі завантажено для розкладу {$a}';
 $lang['TeamPlace']='Таблички місця команд';
 $lang['TeamPlaceLocal']='Таблички місця команд (локалізовані)';
@@ -605,6 +609,7 @@
 $lang['TicketGetScore']='Лист для проміжних результатів';
 $lang['TieWinner']='Переможець у нічию';
 $lang['Time']='Час початку';
+$lang['TimeAt']='Час';
 $lang['TimeStampSignature']='Мітка часу підпису (ЧЧ:ММ)';
 $lang['TipDate']='Вставте «-» для видалення дати Вставте «d+N» для введення N-го дня змагань Вставте «d» встановлює місяць і рік як сьогодні Вставте «d-m» встановлює рік як сьогодні Вставте дату у форматі «РРРР-мм-дд», якщо невпевнений';
 $lang['Title']='Заголовок';
@@ -729,7 +734,6 @@
 $lang['Unset-DSQ']='Видалити DSQ';
 $lang['UploadFile']='Завантаження файлу (PDF)';
 $lang['UserEnabled']='Увімкнено';
-$lang['UserPassword']='Пароль';
 $lang['UseSubClasses']='Застосовувати до конкретних підкласів';
 $lang['ValidClass']='Призначаються класи';
 $lang['ValidDivisions']='Дозволено Дів. (порожній для всіх)';
diff --git a/src/Common/Languages/zh-cn/Api.php b/src/Common/Languages/zh-cn/Api.php
index 0a268eec..436ac912 100644
--- a/src/Common/Languages/zh-cn/Api.php
+++ b/src/Common/Languages/zh-cn/Api.php
@@ -77,7 +77,7 @@
 $lang['IskSpuriousScore-Empty']='设备$a[0]已在位置$a[1]计分';
 $lang['IskSpuriousScore-End']='设备$a[0]在第$a[1]组计分';
 $lang['IskSpuriousScore-Match']='设备$a[0]在$a[1]比赛计分';
-$lang['IskTargetTitle']='$a靶位';
+$lang['IskTargetTitle']='{$a}靶位';
 $lang['LockToEnds']='以下组限制计分（无代表非限制计分）';
 $lang['ManageGroupTarget']='团队和目标管理';
 $lang['Masters']='大师赛';
diff --git a/src/Common/Languages/zh-cn/Common.php b/src/Common/Languages/zh-cn/Common.php
index 63dd7a90..4efde10b 100644
--- a/src/Common/Languages/zh-cn/Common.php
+++ b/src/Common/Languages/zh-cn/Common.php
@@ -11,7 +11,7 @@
 $lang['64_Phase']='1/64';
 $lang['8_Phase']='1/8';
 $lang['Advanced']='晋级';
-$lang['AfterXArrows']='$a支箭后';
+$lang['AfterXArrows']='{$a}支箭后';
 $lang['AllMainReviews']='主要语言评论';
 $lang['AllowPartialTeams']='允许未完成队伍';
 $lang['AllSecReviews']='第二语言评论';
diff --git a/src/Common/Languages/zh-cn/IOC_Codes.php b/src/Common/Languages/zh-cn/IOC_Codes.php
index dfb34494..bf4db77d 100644
--- a/src/Common/Languages/zh-cn/IOC_Codes.php
+++ b/src/Common/Languages/zh-cn/IOC_Codes.php
@@ -1,6 +1,4 @@
 <?php
-$lang['Award-Anthem']='女士们，先生们，请起立。现在播放（国家）国歌';
-$lang['Award-Anthem-TPE']='女士们，先生们，请起立。现在播放（家）歌';
 $lang['Award-Applause']='女士们，先生们，向我们的运动员献上最热情的掌声。';
 $lang['Award-Intro']='女士们，先生们，（{$a}）颁奖仪式';
 $lang['Award-MedalGiver']='为我们颁发奖牌的是：$a';
diff --git a/src/Common/Languages/zh-cn/Tournament.php b/src/Common/Languages/zh-cn/Tournament.php
index 3d8e7a2a..2fb03eb1 100644
--- a/src/Common/Languages/zh-cn/Tournament.php
+++ b/src/Common/Languages/zh-cn/Tournament.php
@@ -36,7 +36,7 @@
 $lang['Area_4']='媒体区';
 $lang['Area_5']='电视区';
 $lang['Area_6']='VIP区';
-$lang['Area_7']='$a区';
+$lang['Area_7']='{$a}区';
 $lang['Arr4Set']='每局箭';
 $lang['Arrows']='箭';
 $lang['Arrows4End']='箭/组: $a';
@@ -81,7 +81,7 @@
 $lang['DeleteTournament']='删除联赛';
 $lang['Descr']='描述';
 $lang['DestroyTarget']='毁坏靶位';
-$lang['Details']='$a细节';
+$lang['Details']='$a{细节}';
 $lang['Distance']='距离';
 $lang['Distances']='距离';
 $lang['DistanceShort']='距离';
@@ -200,7 +200,6 @@
 $lang['Targets']='靶位';
 $lang['TeamClEvent']='团体资格赛';
 $lang['TeamFin']='团体 - 淘汰及决赛轮';
-$lang['TeamFinEvent']='团体决赛';
 $lang['TeamQual']='团体 - 资格赛轮';
 $lang['TitleTourMenu']='选择竞赛';
 $lang['To']='到';
diff --git a/src/Common/Languages/zh-tw/zh-tw.png b/src/Common/Languages/zh-tw/zh-tw.png
index c4991cec..55d90bde 100644
Binary files a/src/Common/Languages/zh-tw/zh-tw.png and b/src/Common/Languages/zh-tw/zh-tw.png differ
diff --git a/src/Common/Languages/zh-tw/zh-tw.svg b/src/Common/Languages/zh-tw/zh-tw.svg
index aad0c81f..9998fa68 100644
--- a/src/Common/Languages/zh-tw/zh-tw.svg
+++ b/src/Common/Languages/zh-tw/zh-tw.svg
@@ -1,9 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1200" height="800">
-<rect fill="#de2910" width="1200" height="800"/>
-<path fill="#ffde00" d="M -16.579605,99.600735 L -14.211014,91.497509 L -21.164052,86.709214 L -12.725491,86.457843 L -10.320158,78.365447 L -7.4734319,86.313318 L 0.96618286,86.100237 L -5.7130042,91.263662 L -2.9023678,99.224367 L -9.877059,94.467668 L -16.579605,99.600735 z" transform="matrix(9.9335156,0.2774683,-0.2774683,9.9335156,324.2925,-695.2415)"/>
-<path fill="#ffde00" id="star" d="M 365.85517,332.68952 L 394.16199,344.06521 L 413.83419,320.74812 L 411.76256,351.18478 L 440.01746,362.6888 L 410.43031,370.124 L 408.2206,400.55095 L 392.00637,374.70949 L 362.38579,382.01038 L 381.952,358.60428 L 365.85517,332.68952 z"/>
-<path fill="#ffde00" d="M 519.07788,179.31289 L 489.0245,174.07112 L 474.63005,200.96875 L 470.32831,170.76647 L 440.299,165.3884 L 467.69375,151.96416 L 463.52906,121.74267 L 484.7617,143.64832 L 512.21709,130.34849 L 497.94483,157.31116 L 519.07788,179.31289 z"/>
-<path fill="#ffde00" d="M 455.25916,315.97951 L 464.63255,286.94812 L 440,268.95036 L 470.50703,268.89379 L 480.01205,239.90523 L 489.49303,268.90166 L 520,268.9835 L 495.35255,286.96085 L 504.70188,316 L 479.98793,298.11418 L 455.25916,315.97951 z"/>
-<use xlink:href="#star" transform="matrix(0.9986295,5.2335955e-2,-5.2335955e-2,0.9986295,19.400048,-300.53681)"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="900"
+   height="600"
+   viewBox="0 0 900 600"
+   enable-background="new 0 0 900 600"
+   xml:space="preserve"><defs
+     id="defs59" /><rect
+     width="900"
+     height="600"
+     id="rect3"
+     style="fill:#ffffff;fill-opacity:1"
+     x="0"
+     y="0" /><g
+     id="g13"><path
+       d="m 686.676,277.504 c 0,-66.792 -51.373,-121.569 -116.787,-126.915 c -17.61,-49.223 -64.67,-84.403 -119.9,-84.403 c -55.257,0 -102.275,35.181 -119.886,84.403 c -65.415,5.346 -116.814,60.123 -116.814,126.915 c 0,39.217 17.776,74.315 45.695,97.659 c -2.536,9.991 -3.873,20.492 -3.873,31.267 c 0,70.334 57.009,127.356 127.356,127.356 c 24.805,0 47.955,-7.083 67.522,-19.36 c 19.568,12.277 42.691,19.36 67.536,19.36 c 70.32,0 127.344,-57.022 127.344,-127.356 c 0,-10.774 -1.339,-21.275 -3.874,-31.267 c 27.906,-23.344 45.681,-58.441 45.681,-97.659 l 0,0 z"
+       id="path15"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><path
+       d="m 451.725,190.979 c -32.534,0 -58.923,26.402 -58.923,58.91 c 0,32.562 26.389,58.952 58.923,58.952 c 32.563,0 58.952,-26.39 58.952,-58.952 c 0,-32.508 -26.389,-58.91 -58.952,-58.91 l 0,0 z m -0.014,87.339 c -15.682,0 -28.4,-12.707 -28.4,-28.43 c 0,-15.668 12.719,-28.415 28.4,-28.415 c 15.71,0 28.442,12.746 28.442,28.415 c 10e-4,15.723 -12.732,28.43 -28.442,28.43 l 0,0 z"
+       id="path17"
+       style="clip-rule:evenodd;fill:#003283;fill-rule:evenodd" /><path
+       d="m 686.676,277.504 c 0,-66.792 -51.373,-121.569 -116.787,-126.915 c -17.61,-49.223 -64.67,-84.403 -119.9,-84.403 c -55.257,0 -102.275,35.181 -119.886,84.403 c -65.415,5.346 -116.814,60.123 -116.814,126.915 c 0,39.217 17.776,74.315 45.695,97.659 c -2.536,9.991 -3.873,20.492 -3.873,31.267 c 0,70.334 57.009,127.356 127.356,127.356 c 24.805,0 47.955,-7.083 67.522,-19.36 c 19.568,12.277 42.691,19.36 67.536,19.36 c 70.32,0 127.344,-57.022 127.344,-127.356 c 0,-10.774 -1.339,-21.275 -3.874,-31.267 c 27.906,-23.344 45.681,-58.441 45.681,-97.659 l 0,0 z m -67.949,85.864 c 5.637,12.953 8.75,27.215 8.75,42.234 c 0,58.621 -47.5,106.108 -106.106,106.108 c -26.403,0 -50.587,-9.66 -69.149,-25.617 C 433.647,502.05 409.49,511.71 383.074,511.71 c -58.621,0 -106.107,-47.487 -106.107,-106.108 c 0,-14.371 2.88,-28.069 8.048,-40.594 c -29.931,-18.784 -49.857,-52.035 -49.857,-89.972 c 0,-58.607 47.486,-106.107 106.094,-106.107 c 2.205,0 4.354,0.042 6.504,0.221 C 359.385,123.165 401.029,89.143 450.61,89.143 c 49.566,0 91.21,34.022 102.84,80.007 c 2.149,-0.179 4.342,-0.221 6.505,-0.221 c 58.607,0 106.106,47.5 106.106,106.107 c 0,36.821 -18.823,69.301 -47.334,88.332 l 0,0 z"
+       id="path19"
+       style="clip-rule:evenodd;fill:#003283;fill-rule:evenodd" /><path
+       d="m 651.797,277.752 c 0,-53.702 -43.488,-97.191 -97.19,-97.191 c -3.06,0 -6.159,0.179 -9.177,0.427 c -9.688,-43.448 -48.479,-75.873 -94.82,-75.873 c -46.356,0 -85.134,32.425 -94.808,75.873 c -3.004,-0.248 -6.063,-0.427 -9.122,-0.427 c -53.702,0 -97.192,43.489 -97.192,97.191 c 0,35.912 19.499,67.273 48.533,84.101 c -5.153,11.85 -8.019,24.846 -8.019,38.583 c 0,53.701 43.545,97.191 97.205,97.191 c 24.97,0 47.748,-9.439 64.973,-24.9 c 17.212,15.461 39.989,24.9 64.96,24.9 c 53.659,0 97.15,-43.49 97.15,-97.191 c 0,-14.248 -3.06,-27.808 -8.614,-40.044 c 27.699,-17.102 46.121,-47.707 46.121,-82.64 l 0,0 z m -62.615,76.521 c 8.792,13.435 13.917,29.462 13.917,46.687 c 0,47.128 -38.198,85.325 -85.312,85.325 c -26.61,0 -50.312,-12.14 -65.965,-31.169 c -15.655,19.029 -39.384,31.169 -65.952,31.169 c -47.155,0 -85.354,-38.197 -85.354,-85.325 c 0,-16.716 4.823,-32.342 13.132,-45.516 C 283.111,342.476 261.669,312.16 261.669,276.897 c 0,-47.155 38.198,-85.354 85.354,-85.354 c 6.711,0 13.285,0.812 19.595,2.288 c 4.438,-42.939 40.734,-76.439 84.858,-76.439 c 43.917,0 80.089,33.197 84.788,75.873 c 5.513,-1.116 11.189,-1.722 17.005,-1.722 c 47.113,0 85.313,38.198 85.313,85.354 c 10e-4,34.272 -20.201,63.817 -49.4,77.376 l 0,0 z"
+       id="path21"
+       style="clip-rule:evenodd;fill:#e41f20;fill-rule:evenodd" /><polygon
+       points="459.498,217.464 452.442,194.906 444.684,217.464 444.684,217.464 "
+       id="polygon23"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="442.231,217.946 424.813,201.878 429.402,225.346 429.402,225.346 "
+       id="polygon25"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="427.514,226.945 404.432,221.776 420.1,239.815 420.1,239.815 "
+       id="polygon27"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="419.288,242.144 396.716,249.199 419.288,256.958 419.288,256.958 "
+       id="polygon29"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="419.755,259.41 403.743,276.814 427.169,272.239 427.169,272.239 "
+       id="polygon31"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="428.795,274.141 423.586,297.223 441.611,281.542 441.611,281.542 "
+       id="polygon33"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="443.954,282.369 451.023,304.927 458.767,282.369 458.767,282.369 "
+       id="polygon35"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="461.22,281.886 478.653,297.912 474.078,274.485 474.078,274.485 "
+       id="polygon37"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="475.951,272.846 499.06,278.014 483.337,260.017 483.337,260.017 "
+       id="polygon39"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="484.164,257.688 506.763,250.633 484.164,242.874 484.164,242.874 "
+       id="polygon41"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="483.723,240.422 499.75,223.017 476.323,227.592 476.323,227.592 "
+       id="polygon43"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><polygon
+       points="474.683,225.69 479.85,202.608 461.854,218.291 461.854,218.291 "
+       id="polygon45"
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><path
+       d="m 409.544,366.854 c 0,-20.754 -16.784,-37.552 -37.551,-37.552 c -20.753,0 -37.55,16.798 -37.55,37.552 c 0,20.752 16.797,37.551 37.55,37.551 c 1.131,0 2.205,-0.042 3.28,-0.125 c -0.083,-0.991 -0.124,-1.984 -0.124,-2.976 c 0,-1.116 0.041,-2.246 0.124,-3.321 c -1.075,0.139 -2.149,0.179 -3.28,0.179 c -17.266,0 -31.293,-13.999 -31.293,-31.308 c 0,-17.268 14.027,-31.309 31.293,-31.309 c 17.321,0 31.309,14.041 31.309,31.309 c 0,13.903 -9.04,25.658 -21.565,29.75 c -0.221,1.518 -0.345,3.102 -0.345,4.7 c 0,0.646 0.041,1.294 0.054,1.888 c 16.179,-4.175 28.098,-18.851 28.098,-36.338 l 0,0 z"
+       id="path47"
+       style="fill:#0083ce" /><path
+       d="m 572.301,366.854 c 0,20.752 -16.784,37.551 -37.551,37.551 c -19.636,0 -35.73,-15.035 -37.413,-34.244 c 2.232,0.221 4.383,0.689 6.45,1.379 c 2.287,15.075 15.295,26.622 30.963,26.622 c 17.322,0 31.309,-13.999 31.309,-31.308 c 0,-17.268 -13.986,-31.309 -31.309,-31.309 c -16.618,0 -30.22,13.008 -31.213,29.364 c -2.024,-0.509 -4.092,-0.854 -6.2,-1.033 c 1.503,-19.332 17.694,-34.574 37.413,-34.574 c 20.767,10e-4 37.551,16.799 37.551,37.552 l 0,0 z"
+       id="path49"
+       style="fill:#e61446" /><path
+       d="m 525.326,403.192 c -0.992,16.439 -14.595,29.42 -31.268,29.42 c -17.268,0 -31.281,-14.015 -31.281,-31.308 c 0,-13.918 9.04,-25.673 21.554,-29.765 c 0.219,-1.544 0.343,-3.088 0.343,-4.686 c 0,-0.648 0,-1.295 -0.04,-1.944 c -16.179,4.23 -28.127,18.907 -28.127,36.395 c 0,20.739 16.826,37.563 37.552,37.563 c 19.732,0 35.911,-15.24 37.469,-34.588 c -2.152,-0.178 -4.219,-0.522 -6.202,-1.087 l 0,0 z m -31.268,-33.196 c 15.724,0 28.731,11.548 30.964,26.608 c 2.066,0.689 4.217,1.172 6.464,1.379 c -1.682,-19.195 -17.791,-34.229 -37.428,-34.229 c -1.075,0 -2.149,0.04 -3.226,0.123 c 0.084,0.992 0.084,1.985 0.084,2.978 c 0,1.115 -0.042,2.231 -0.124,3.307 c 1.075,-0.125 2.191,-0.166 3.266,-0.166 l 0,0 z"
+       id="path51"
+       style="fill:#009c45" /><path
+       d="m 450.14,404.28 c -1.529,19.348 -17.72,34.588 -37.44,34.588 c -20.766,0 -37.55,-16.824 -37.55,-37.563 c 0,-17.487 11.919,-32.164 28.097,-36.395 c 0.042,0.649 0.056,1.296 0.056,1.944 c 0,1.598 -0.124,3.142 -0.344,4.686 c -12.526,4.092 -21.566,15.847 -21.566,29.765 c 0,17.293 14.015,31.308 31.308,31.308 c 16.619,0 30.247,-12.98 31.24,-29.378 c 1.997,0.522 4.065,0.866 6.199,1.045 l 0,0 z m -40.719,-34.119 c 0.083,-1.075 0.124,-2.191 0.124,-3.307 c 0,-0.992 0,-1.985 -0.096,-2.978 c 1.074,-0.083 2.149,-0.123 3.251,-0.123 c 19.637,0 35.732,15.034 37.414,34.229 c -2.232,-0.207 -4.396,-0.689 -6.463,-1.379 c -2.26,-15.061 -15.242,-26.608 -30.951,-26.608 c -1.102,10e-4 -2.204,0.042 -3.279,0.166 l 0,0 z"
+       id="path53"
+       style="fill:#f7b000" /><path
+       d="m 453.393,398.162 c -15.723,0 -28.704,-11.547 -30.963,-26.622 c -2.068,-0.689 -4.217,-1.158 -6.464,-1.379 c 1.681,19.209 17.791,34.244 37.427,34.244 c 1.075,0 2.164,-0.042 3.252,-0.125 c -0.096,-0.991 -0.139,-1.984 -0.139,-2.976 c 0,-1.116 0.069,-2.246 0.152,-3.321 c -1.075,0.139 -2.15,0.179 -3.265,0.179 l 0,0 z m 0,-68.859 c -19.747,0 -35.925,15.242 -37.427,34.574 c 2.108,0.18 4.175,0.524 6.188,1.033 c 1.006,-16.356 14.606,-29.364 31.239,-29.364 c 17.281,0 31.28,14.041 31.28,31.309 c 0,13.903 -9.025,25.658 -21.538,29.75 c -0.234,1.518 -0.358,3.102 -0.358,4.7 c 0,0.646 0,1.294 0.042,1.888 c 16.191,-4.176 28.139,-18.852 28.139,-36.338 c 0,-20.754 -16.839,-37.552 -37.565,-37.552 l 0,0 z"
+       id="path55"
+       style="fill:#000006" /></g></svg>
\ No newline at end of file
diff --git a/src/Common/Lib/ArrTargets.inc.php b/src/Common/Lib/ArrTargets.inc.php
index 322d69e5..469a8057 100644
--- a/src/Common/Lib/ArrTargets.inc.php
+++ b/src/Common/Lib/ArrTargets.inc.php
@@ -904,7 +904,7 @@ function GetMaxScores($EventCode, $MatchNo=0, $TeamEvent=0, $TourId=-1){
 }
 
 
-function GetTarget($TourId, $TrgName='') {
+function GetTarget($TourId, $TrgName='', $Value=false) {
 	global $LetterPoint;
 	if($TrgName) {
 		$q=safe_r_SQL("select Targets.* from Targets where TarDescr='$TrgName'");
@@ -919,16 +919,30 @@ function GetTarget($TourId, $TrgName='') {
 	foreach(range('Z','B') as $key) {
 		if($MyRow->{$key.'_size'}) {
 			// fills the accepted arrows array
-			$ret[] = $LetterPoint[$key]['P'];
+            if($Value) {
+                $ret[] = $LetterPoint[$key]['N'];
+            } else {
+                $ret[] = $LetterPoint[$key]['P'];
+            }
 		}
 	}
 	foreach(range('9','1') as $key) {
 		if($MyRow->{$key.'_size'}) {
 			// fills the accepted arrows array
-			$ret[] = $LetterPoint[$key]['P'];
+            if($Value) {
+                $ret[] = $LetterPoint[$key]['N'];
+            } else {
+                $ret[] = $LetterPoint[$key]['P'];
+            }
 		}
 	}
-	$ret[] = $LetterPoint['A']['P'];
+    if($Value) {
+        $ret[] = $LetterPoint['A']['N'];
+        arsort($ret);
+        $ret=array_unique($ret);
+    } else {
+        $ret[] = $LetterPoint['A']['P'];
+    }
 
 	return $ret;
 }
diff --git a/src/Common/Lib/CommonLib.php b/src/Common/Lib/CommonLib.php
index 4de19127..000ba673 100644
--- a/src/Common/Lib/CommonLib.php
+++ b/src/Common/Lib/CommonLib.php
@@ -530,8 +530,8 @@ function get_photo_ianseo($r, $h=0, $side=false, $Extra='', $force=false, $direc
  				$startY=(($WorkH - (count($texts)*$WorkH/5))/2)+$WorkH/7;
  				foreach($texts as $i=>$t) {
  					$dim=imagettfbbox($WorkH/10, 12, $font, $t);
- 					$x=($w+$dim[0]-$dim[2])/2;
- 					$y=$startY+$i*$WorkH/5;
+ 					$x=intval(($w+$dim[0]-$dim[2])/2);
+ 					$y=intval($startY+$i*$WorkH/5);
 	 				imagettftext($im, $WorkH/10, 12, $x, $y, $blue, $font, $t);
  				}
 				ob_start();
@@ -646,6 +646,8 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 		$Options->TOURID=$_SESSION['TourId'];
 	}
 
+    $Today=getToday();
+
 	$ret=array();
 	$aSQL=[];
 	if(!$Options->TYPE or in_array('Q', $Options->TYPE)) {
@@ -671,7 +673,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 			LEFT JOIN DistanceInformation on DiTournament=SesTournament and DiType=SesType and DiSession=SesOrder
 			LEFT JOIN Scheduler ON SchTournament=SesTournament AND SchSesType=SesType AND SchSesOrder=SesOrder
 			WHERE SesTournament={$Options->TOURID} AND SesType='Q' $SubQuery
-			" . ($Options->ONLYTODAY ? " AND (date(convert_tz(SchDay, ToTimeZone, '+00:00'))=UTC_DATE() or date(convert_tz(DiDay, ToTimeZone, '+00:00'))=UTC_DATE())" : "") ."
+			" . ($Options->ONLYTODAY ? " AND (SchDay='$Today' or DiDay='$Today')" : "") ."
 			GROUP BY SesOrder, SesType";
     }
 
@@ -687,7 +689,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 			left JOIN Session on EvTournament=SesTournament and ElSession=SesOrder AND SesType='E'
 			LEFT JOIN Scheduler ON SchTournament=EvTournament AND SchSesType='E' AND SchSesOrder=ElSession
 			WHERE EvTournament={$Options->TOURID}
-			" . ($Options->ONLYTODAY ? "AND date(convert_tz(SchDay, ToTimeZone, '+00:00'))=UTC_DATE()" : "") ."
+			" . ($Options->ONLYTODAY ? "AND SchDay='$Today'" : "") ."
 			" . ($Options->UNFINISHED ? "AND EvE1ShootOff=0" : "") ."
 			GROUP BY EvCode";
 
@@ -702,7 +704,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 			left JOIN Session on SesTournament=ElTournament and ElSession=SesOrder AND SesType='E'
 			LEFT JOIN Scheduler ON SchTournament=EvTournament AND SchSesType='E' AND SchSesOrder=ElSession
 			WHERE EvTournament={$Options->TOURID}
-			" . ($Options->ONLYTODAY ? "AND date(convert_tz(SchDay, ToTimeZone, '+00:00'))=UTC_DATE()" : "") ."
+			" . ($Options->ONLYTODAY ? "AND SchDay='$Today'" : "") ."
 			" . ($Options->UNFINISHED ? "AND EvE2ShootOff=0" : "") ."
 			GROUP BY EvCode";
 	}
@@ -718,7 +720,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
                 inner join Events on EvTournament=f1.FinTournament and EvCode=f1.FinEvent and EvTeamEvent=0
 				inner join Grids on GrMatchNo=f1.FinMatchNo
 				where f1.FinTournament={$Options->TOURID} and f1.FinMatchNo%2=0 and 
-				((greatest(f1.FinAthlete, f2.FinAthlete)=0 and GrPhase<EvFinalFirstPhase) OR (greatest(f1.FinWinLose,f2.FinWinLose, f1.FinTie, f2.FinTie)=0 and greatest(f1.FinAthlete,f2.FinAthlete)>0))
+				((greatest(f1.FinAthlete, f2.FinAthlete)=0 and GrPhase<=EvFinalFirstPhase) OR (greatest(f1.FinWinLose,f2.FinWinLose, f1.FinTie, f2.FinTie)=0 and greatest(f1.FinAthlete,f2.FinAthlete)>0))
 				group by f1.FinEvent, f1.FinMatchNo 
 				)";
 		}
@@ -731,7 +733,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 			inner join Grids on GrMatchNo=FsMatchNo
 			inner join Events on EvCode=FsEvent and EvTournament=FsTournament and EvTeamEvent=FsTeamEvent $SubQuery
 			WHERE FSTournament={$Options->TOURID} and FSScheduledDate>0 and FsTeamEvent=0 "
-            . ($Options->ONLYTODAY ? "AND date(convert_tz(FSScheduledDate, ToTimeZone, '+00:00'))=utc_date() " : "")
+            . ($Options->ONLYTODAY ? "AND FSScheduledDate='$Today' " : "")
             . ($Options->TYPE=='I' ? "AND EvTeamEvent=0 " : "")
             ."GROUP BY CONCAT('I', FSScheduledDate, FSScheduledTime)";
 	}
@@ -747,7 +749,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 				inner join Events on EvTournament=f1.tfTournament and EvCode=f1.tfEvent and EvTeamEvent=1
 				inner join Grids on GrMatchNo=f1.tfMatchNo
 				where f1.tfTournament={$Options->TOURID} and f1.TfMatchNo%2=0 and 
-				((greatest(f1.TfTeam, f2.TfTeam)=0 and GrPhase<EvFinalFirstPhase) OR (greatest(f1.TfWinLose,f2.TfWinLose, f1.TfTie, f2.TfTie)=0 and greatest(f1.TfTeam, f2.TfTeam)>0)) 
+				((greatest(f1.TfTeam, f2.TfTeam)=0 and GrPhase<=EvFinalFirstPhase) OR (greatest(f1.TfWinLose,f2.TfWinLose, f1.TfTie, f2.TfTie)=0 and greatest(f1.TfTeam, f2.TfTeam)>0)) 
 				group by f1.TfEvent, f1.TfMatchNo
 				)";
 		}
@@ -760,7 +762,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 			inner join Grids on GrMatchNo=FsMatchNo
 			inner join Events on EvCode=FsEvent and EvTournament=FsTournament and EvTeamEvent=FsTeamEvent $SubQuery
 			WHERE FSTournament={$Options->TOURID} and FSScheduledDate>0 and FsTeamEvent=1
-			" . ($Options->ONLYTODAY ? "AND date(convert_tz(FSScheduledDate, ToTimeZone, '+00:00'))=UTC_DATE()" : "") ."
+			" . ($Options->ONLYTODAY ? "AND FSScheduledDate='$Today'" : "") ."
 			" . ($Options->TYPE=='T' ? "AND EvTeamEvent=1" : "") ."
 			GROUP BY CONCAT('T', FSScheduledDate, FSScheduledTime)";
 	}
@@ -780,6 +782,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 		           and f2.RrMatchTournament=f1.RrMatchTournament
 		           and f2.RrMatchMatchNo=f1.RrMatchMatchNo+1 
 				where f1.RrMatchTournament={$Options->TOURID} and f1.RrMatchMatchNo%2=0 and greatest(f1.RrMatchWinLose,f2.RrMatchWinLose, f1.RrMatchTie, f2.RrMatchTie)=0 and greatest(f1.RrMatchAthlete, f2.RrMatchAthlete)>0
+                " . ($Options->ONLYTODAY ? "AND f1.RRMatchScheduledDate='$Today'" : "") ."
 				group by f1.RrMatchTeam, f1.RrMatchEvent
 				)";
 		}
@@ -793,7 +796,7 @@ function getApiScheduledSessions($ScheduleOptions=[]) {
 			inner join RoundRobinLevel on RrLevTournament=RrMatchTournament and RrLevTeam=RrMatchTeam and RrLevLevel=RrMatchLevel
 			inner join Events on EvCode=RrMatchEvent and EvTournament=RrMatchTournament and EvTeamEvent=RrMatchTeam
 			WHERE RrMatchTournament={$Options->TOURID} and RrMatchScheduledDate>0 $SubQuery
-			" . ($Options->ONLYTODAY ? "AND date(convert_tz(RRMatchScheduledDate, ToTimeZone, '+00:00'))=UTC_DATE()" : "") ."
+			" . ($Options->ONLYTODAY ? "AND RRMatchScheduledDate='$Today'" : "") ."
 			GROUP BY RrMatchScheduledDate, RRMatchScheduledTime";
 	}
 
@@ -1483,195 +1486,229 @@ function CheckCredentials($OnlineId, $OnlineAuth, $Return, $LicenseVoucher='') {
 function get_Countries() {
 	// get list from WA Countries
 	$Flags=array(
-		'AFG' => 'Afghanistan',
-		'ALB' => 'Albania',
-		'ALG' => 'Algeria',
-		'AND' => 'Andorra',
-		'ARG' => 'Argentina',
-		'ARM' => 'Armenia',
-		'ARU' => 'Aruba',
-		'ASA' => 'American Samoa',
-		'AUS' => 'Australia',
-		'AUT' => 'Austria',
-		'AZE' => 'Azerbaijan',
-		'BAH' => 'Bahamas',
-		'BAN' => 'Bangladesh',
-		'BAR' => 'Barbados',
-		'BEL' => 'Belgium',
-		'BEN' => 'Benin',
-		'BER' => 'Bermuda',
-		'BHU' => 'Bhutan',
-		'BIH' => 'Bosnia and Herzegovina',
-		'BLR' => 'Belarus',
-		'BOL' => 'Bolivia',
-		'BRA' => 'Brazil',
-		'BUL' => 'Bulgaria',
-		'BUR' => 'Burkina Faso',
-		'CAF' => 'Central African Republic',
-		'CAM' => 'Cambodia',
-		'CAN' => 'Canada',
-		'CHA' => 'Chad',
-		'CHI' => 'Chile',
-		'CHN' => 'PR China',
-		'CIV' => 'Cote d Ivoire',
-		'CMR' => 'Cameroon',
-		'COD' => 'DR Congo',
-		'COL' => 'Colombia',
-		'COM' => 'Comoros',
-		'CRC' => 'Costa Rica',
-		'CRO' => 'Croatia',
-		'CUB' => 'Cuba',
-		'CYP' => 'Cyprus',
-		'CZE' => 'Czech Republic',
-		'DEN' => 'Denmark',
-		'DJI' => 'Djibouti',
-		'DMA' => 'Dominica',
-		'DOM' => 'Dominican Republic',
-		'ECU' => 'Ecuador',
-		'EGY' => 'Egypt',
-		'ERI' => 'Eritrea',
-		'ESA' => 'El Salvador',
-		'ESP' => 'Spain',
-		'EST' => 'Estonia',
-		'FIJ' => 'Fiji',
-		'FIN' => 'Finland',
-		'FLK' => 'Falkland Island',
-		'FPO' => 'Tahiti',
-		'FRA' => 'France',
-		'FRO' => 'Faroe Islands',
-		'GAB' => 'Gabon',
-		'GBR' => 'Great Britain',
-		'GEO' => 'Georgia',
-		'GER' => 'Germany',
-		'GHA' => 'Ghana',
-		'GLP' => 'Guadalupe',
-		'GRE' => 'Greece',
-		'GUA' => 'Guatemala',
-		'GUI' => 'Guinea',
-		'GUM' => 'Guam',
-		'GUY' => 'Guyana',
-		'HAI' => 'Haiti',
-		'HKG' => 'Hong Kong, China',
-		'HON' => 'Honduras',
-		'HUN' => 'Hungary',
-		'INA' => 'Indonesia',
-		'IND' => 'India',
-		'IOA' => 'Int. Olympic Archer',
-		'IPA' => 'Int. Paralympic Archer',
-		'IRI' => 'IR Iran',
-		'IRL' => 'Ireland',
-		'IRQ' => 'Iraq',
-		'ISL' => 'Iceland',
-		'ISR' => 'Israel',
-		'ISV' => 'Virgin Islands, US',
-		'ITA' => 'Italy',
-		'IVB' => 'British Virgin Islands',
-		'JOR' => 'Jordan',
-		'JPN' => 'Japan',
-		'KAZ' => 'Kazakhstan',
-		'KEN' => 'Kenya',
-		'KGZ' => 'Kyrgyzstan',
-		'KIR' => 'Kiribati',
-		'KOR' => 'Korea',
-		'KOS' => 'Kosovo',
-		'KSA' => 'Saudi Arabia',
-		'KUW' => 'Kuwait',
-		'LAO' => 'Laos',
-		'LAT' => 'Latvia',
-		'LBA' => 'Libya',
-		'LBR' => 'Liberia',
-		'LES' => 'Lesotho',
-		'LIB' => 'Lebanon',
-		'LIE' => 'Liechtenstein',
-		'LTU' => 'Lithuania',
-		'LUX' => 'Luxembourg',
-		'MAC' => 'Macau, China',
-		'MAD' => 'Madagascar',
-		'MAR' => 'Morocco',
-		'MAS' => 'Malaysia',
-		'MAW' => 'Malawi',
-		'MDA' => 'Moldova',
-		'MEX' => 'Mexico',
-		'MGL' => 'Mongolia',
-		'MKD' => 'North Macedonia',
-		'MLI' => 'Mali',
-		'MLT' => 'Malta',
-		'MNE' => 'Montenegro',
-		'MON' => 'Monaco',
-		'MRI' => 'Mauritius',
-		'MTN' => 'Mauritania',
-		'MTQ' => 'Martinique',
-		'MYA' => 'Myanmar',
-		'NAM' => 'Namibia',
-		'NCA' => 'Nicaragua',
-		'NCL' => 'New Caledonia',
-		'NED' => 'Netherlands',
-		'NEP' => 'Nepal',
-		'NFK' => 'Norfolk Island',
-		'NGR' => 'Nigeria',
-		'NIG' => 'Niger',
-		'NIU' => 'Niue',
-		'NMI' => 'Northern Mariana Islands',
-		'NOR' => 'Norway',
-		'NZL' => 'New Zealand',
-		'PAK' => 'Pakistan',
-		'PAN' => 'Panama',
-		'PAR' => 'Paraguay',
-		'PER' => 'Peru',
-		'PHI' => 'Philippines',
-		'PLW' => 'Palau',
-		'PNG' => 'Papua New Guinea',
-		'POL' => 'Poland',
-		'POR' => 'Portugal',
-		'PRK' => 'DPR Korea',
-		'PUR' => 'Puerto Rico',
-		'QAT' => 'Qatar',
-		'ROU' => 'Romania',
-		'RSA' => 'South Africa',
-		'RUS' => 'Russia',
-		'RWA' => 'Rwanda',
-		'SAM' => 'Samoa',
-		'SCG' => 'Serbia and Montenegro',
-		'SEN' => 'Senegal',
-		'SGP' => 'Singapore',
-		'SKN' => 'Saint Kitts and Nevis',
-		'SLE' => 'Sierra Leone',
-		'SLO' => 'Slovenia',
-		'SMR' => 'San Marino',
-		'SOL' => 'Solomon Islands',
-		'SOM' => 'Somalia',
-		'SRB' => 'Serbia',
-		'SRI' => 'Sri Lanka',
-		'SUD' => 'Sudan',
-		'SUI' => 'Switzerland',
-		'SUN' => 'USSR',
-		'SUR' => 'Suriname',
-		'SVK' => 'Slovakia',
-		'SWE' => 'Sweden',
-		'SYR' => 'Syria',
-		'TGA' => 'Tonga',
-		'THA' => 'Thailand',
-		'TJK' => 'Tajikistan',
-		'TKM' => 'Turkmenistan',
-		'TOG' => 'Togo',
-		'TPE' => 'Chinese Taipei',
-		'TTO' => 'Trinidad and Tobago',
-		'TUN' => 'Tunisia',
-		'TUR' => 'Turkey',
-		'UAE' => 'UAE',
-		'UGA' => 'Uganda',
-		'UKR' => 'Ukraine',
-		'URU' => 'Uruguay',
-		'USA' => 'USA',
-		'UZB' => 'Uzbekistan',
-		'VAN' => 'Vanuatu',
-		'VEN' => 'Venezuela',
-		'VIE' => 'Vietnam',
-		'VIN' => 'St Vincent and the Grenadines',
-		'YEM' => 'Yemen',
-		'YUG' => 'Yugoslavia',
-		'ZAM' => 'Zambia',
-		'ZIM' => 'Zimbabwe',
+        'AFG' => 'Afghanistan',
+        'ALB' => 'Albania',
+        'ALG' => 'Algeria',
+        'AND' => 'Andorra',
+        'ANG' => 'Angola',
+        'ANT' => 'Antigua and Barbuda',
+        'ARG' => 'Argentina',
+        'ARM' => 'Armenia',
+        'ARU' => 'Aruba',
+        'ASA' => 'American Samoa',
+        'AUS' => 'Australia',
+        'AUT' => 'Austria',
+        'AZE' => 'Azerbaijan',
+        'BAH' => 'Bahamas',
+        'BAN' => 'Bangladesh',
+        'BAR' => 'Barbados',
+        'BDI' => 'Burundi',
+        'BEL' => 'Belgium',
+        'BEN' => 'Benin',
+        'BER' => 'Bermuda',
+        'BHU' => 'Bhutan',
+        'BIH' => 'Bosnia and Herzegovina',
+        'BIZ' => 'Belize',
+        'BLR' => 'Belarus',
+        'BOL' => 'Bolivia',
+        'BOT' => 'Botswana',
+        'BRA' => 'Brazil',
+        'BRN' => 'Bahrain',
+        'BRU' => 'Brunei',
+        'BUL' => 'Bulgaria',
+        'BUR' => 'Burkina Faso',
+        'CAF' => 'Central African Republic',
+        'CAM' => 'Cambodia',
+        'CAN' => 'Canada',
+        'CAY' => 'Cayman Islands',
+        'CGO' => 'Republic of the Congo',
+        'CHA' => 'Chad',
+        'CHI' => 'Chile',
+        'CHN' => 'PR China',
+        'CIV' => 'Côte d\'Ivoire',
+        'CMR' => 'Cameroon',
+        'COD' => 'Democratic Republic of the Congo',
+        'COK' => 'Cook Islands',
+        'COL' => 'Colombia',
+        'COM' => 'Comoros',
+        'CPV' => 'Cape Verde',
+        'CRC' => 'Costa Rica',
+        'CRO' => 'Croatia',
+        'CUB' => 'Cuba',
+        'CYP' => 'Cyprus',
+        'CZE' => 'Czechia',
+        'DEN' => 'Denmark',
+        'DJI' => 'Djibouti',
+        'DMA' => 'Dominica',
+        'DOM' => 'Dominican Republic',
+        'ECU' => 'Ecuador',
+        'EGY' => 'Egypt',
+        'ERI' => 'Eritrea',
+        'ESA' => 'El Salvador',
+        'ESP' => 'Spain',
+        'EST' => 'Estonia',
+        'ETH' => 'Ethiopia',
+        'FIJ' => 'Fiji',
+        'FIN' => 'Finland',
+        'FRA' => 'France',
+        'FSM' => 'Federated States of Micronesia',
+        'GAB' => 'Gabon',
+        'GAM' => 'The Gambia',
+        'GBR' => 'Great Britain',
+        'GBS' => 'Guinea-Bissau',
+        'GEO' => 'Georgia',
+        'GEQ' => 'Equatorial Guinea',
+        'GER' => 'Germany',
+        'GHA' => 'Ghana',
+        'GRE' => 'Greece',
+        'GRN' => 'Grenada',
+        'GUA' => 'Guatemala',
+        'GUI' => 'Guinea',
+        'GUM' => 'Guam',
+        'GUY' => 'Guyana',
+        'HAI' => 'Haiti',
+        'HKG' => 'Hong Kong, China',
+        'HON' => 'Honduras',
+        'HUN' => 'Hungary',
+        'INA' => 'Indonesia',
+        'IND' => 'India',
+        'IRI' => 'IR Iran',
+        'IRL' => 'Ireland',
+        'IRQ' => 'Iraq',
+        'ISL' => 'Iceland',
+        'ISR' => 'Israel',
+        'ISV' => 'Virgin Islands, US',
+        'ITA' => 'Italy',
+        'IVB' => 'British Virgin Islands',
+        'JAM' => 'Jamaica',
+        'JOR' => 'Jordan',
+        'JPN' => 'Japan',
+        'KAZ' => 'Kazakhstan',
+        'KEN' => 'Kenya',
+        'KGZ' => 'Kyrgyzstan',
+        'KIR' => 'Kiribati',
+        'KOR' => 'South Korea',
+        'KOS' => 'Kosovo',
+        'KSA' => 'Saudi Arabia',
+        'KUW' => 'Kuwait',
+        'LAO' => 'Laos',
+        'LAT' => 'Latvia',
+        'LBA' => 'Libya',
+        'LBN' => 'Lebanon',
+        'LBR' => 'Liberia',
+        'LCA' => 'Saint Lucia',
+        'LES' => 'Lesotho',
+        'LIE' => 'Liechtenstein',
+        'LTU' => 'Lithuania',
+        'LUX' => 'Luxembourg',
+        'MAD' => 'Madagascar',
+        'MAR' => 'Morocco',
+        'MAS' => 'Malaysia',
+        'MAW' => 'Malawi',
+        'MDA' => 'Moldova',
+        'MDV' => 'Maldives',
+        'MEX' => 'Mexico',
+        'MGL' => 'Mongolia',
+        'MHL' => 'Marshall Islands',
+        'MKD' => 'North Macedonia',
+        'MLI' => 'Mali',
+        'MLT' => 'Malta',
+        'MNE' => 'Montenegro',
+        'MON' => 'Monaco',
+        'MOZ' => 'Mozambique',
+        'MRI' => 'Mauritius',
+        'MTN' => 'Mauritania',
+        'MYA' => 'Myanmar',
+        'NAM' => 'Namibia',
+        'NCA' => 'Nicaragua',
+        'NED' => 'Netherlands',
+        'NEP' => 'Nepal',
+        'NGR' => 'Nigeria',
+        'NIG' => 'Niger',
+        'NOR' => 'Norway',
+        'NRU' => 'Nauru',
+        'NZL' => 'New Zealand',
+        'OMA' => 'Oman',
+        'PAK' => 'Pakistan',
+        'PAN' => 'Panama',
+        'PAR' => 'Paraguay',
+        'PER' => 'Peru',
+        'PHI' => 'Philippines',
+        'PLE' => 'Palestine',
+        'PLW' => 'Palau',
+        'PNG' => 'Papua New Guinea',
+        'POL' => 'Poland',
+        'POR' => 'Portugal',
+        'PRK' => 'DPR Korea',
+        'PUR' => 'Puerto Rico',
+        'QAT' => 'Qatar',
+        'ROU' => 'Romania',
+        'RSA' => 'South Africa',
+        'RUS' => 'Russia',
+        'RWA' => 'Rwanda',
+        'SAM' => 'Samoa',
+        'SEN' => 'Senegal',
+        'SEY' => 'Seychelles',
+        'SGP' => 'Singapore',
+        'SKN' => 'Saint Kitts and Nevis',
+        'SLE' => 'Sierra Leone',
+        'SLO' => 'Slovenia',
+        'SMR' => 'San Marino',
+        'SOL' => 'Solomon Islands',
+        'SOM' => 'Somalia',
+        'SRB' => 'Serbia',
+        'SRI' => 'Sri Lanka',
+        'SSD' => 'South Sudan',
+        'STP' => 'São Tomé and Príncipe',
+        'SUD' => 'Sudan',
+        'SUI' => 'Switzerland',
+        'SUR' => 'Suriname',
+        'SVK' => 'Slovakia',
+        'SWE' => 'Sweden',
+        'SWZ' => 'Eswatini',
+        'SYR' => 'Syria',
+        'TAN' => 'Tanzania',
+        'TGA' => 'Tonga',
+        'THA' => 'Thailand',
+        'TJK' => 'Tajikistan',
+        'TKM' => 'Turkmenistan',
+        'TLS' => 'East Timor',
+        'TOG' => 'Togo',
+        'TPE' => 'Chinese Taipei',
+        'TTO' => 'Trinidad and Tobago',
+        'TUN' => 'Tunisia',
+        'TUR' => 'Türkiye',
+        'TUV' => 'Tuvalu',
+        'UAE' => 'United Arab Emirates',
+        'UGA' => 'Uganda',
+        'UKR' => 'Ukraine',
+        'URU' => 'Uruguay',
+        'USA' => 'United States of America',
+        'UZB' => 'Uzbekistan',
+        'VAN' => 'Vanuatu',
+        'VEN' => 'Venezuela',
+        'VIE' => 'Vietnam',
+        'VIN' => 'Saint Vincent and the Grenadines',
+        'YEM' => 'Yemen',
+        'ZAM' => 'Zambia',
+        'ZIM' => 'Zimbabwe',
+// Kept for Historical reason
+        'FLK' => 'Falkland Island',
+        'FPO' => 'Tahiti',
+        'FRO' => 'Faroe Islands',
+        'GLP' => 'Guadalupe',
+        'IOA' => 'Int. Olympic Archer',
+        'IPA' => 'Int. Paralympic Archer',
+        'LIB' => 'Lebanon',
+        'MAC' => 'Macau, China',
+        'MTQ' => 'Martinique',
+        'NCL' => 'New Caledonia',
+        'NFK' => 'Norfolk Island',
+        'NIU' => 'Niue',
+        'NMI' => 'Northern Mariana Islands',
+        'SCG' => 'Serbia and Montenegro',
+        'SUN' => 'USSR',
+        'YUG' => 'Yugoslavia',
 	);
 	return $Flags;
 }
@@ -1751,4 +1788,103 @@ function OdfCapitalise($Name, $Type='A') {
 	}
 
 	return $Name;
+}
+
+function ordinal($number) {
+    $ends = array('th','st','nd','rd','th','th','th','th','th','th');
+    if ((($number % 100) >= 11) && (($number%100) <= 13))
+        return $number. 'th';
+    else
+        return $number. $ends[$number % 10];
+}
+
+function intToRoman($num) {
+	// This function takes integer as input and return a string with roman representation of given integer. If integer not in between 1 and 3999 return given integer because there is no roman representation of number outside of that range
+	$num=intval($num);
+    if(!$num) {
+        return '';
+    }
+    if($num>3999){
+		return $num;
+	}
+
+	if($num<=0){
+		return $num;
+	}
+
+    // Define an array mapping integers to their Roman numeral counterparts
+    $map = [
+        'M'  => 1000,
+        'CM' => 900,
+        'D'  => 500,
+        'CD' => 400,
+        'C'  => 100,
+        'XC' => 90,
+        'L'  => 50,
+        'XL' => 40,
+        'X'  => 10,
+        'IX' => 9,
+        'V'  => 5,
+        'IV' => 4,
+        'I'  => 1
+    ];
+
+    $result = '';
+
+    // Loop through the map and append the Roman numeral while reducing the integer
+    foreach ($map as $roman => $value) {
+        // While the current value can be subtracted from num
+        while ($num >= $value) {
+            $result .= $roman;
+            $num -= $value;
+        }
+    }
+
+    return $result;
+}
+
+/**
+ * @param $Type one of the following: <ul><li>A[ll]: (default) returns all available fonts</li><li>S[ystem]: returns the fonts located in tcpdf/fonts</li><li>E[xtra]: returns the extra fonts located in module, if present </li></ul>
+ * @return void
+ */
+function getFonts($Type='All') {
+    global $CFG;
+    require_once('Common/Lib/FontMeta.php');
+    require_once('Common/Lib/FontInfo.php');
+    $aFonts=array();
+    $Type=strtoupper($Type[0]);
+    if($Type=='A' or $Type=='S') {
+        foreach(glob($CFG->FONT_PATH.'*.ttf') as $f) {
+//            $ff=new FontMeta($f);
+//            $aFonts[basename($f)]=['name'=>ucfirst($ff->getPostscriptName()), 'file'=>$f];
+            $ff=new FontInfo($f);
+            $aFonts[basename($f)]=['name'=>ucfirst($ff->getFontName()), 'file'=>$f, 'type'=>'S'];
+        }
+        foreach(glob($CFG->INCLUDE_PATH.'/Modules/FontManagement/fonts/*.otf') as $f) {
+//            $ff=new FontMeta($f);
+//            $aFonts[basename($f)]=['name'=>ucfirst($ff->getPostscriptName()), 'file'=>$f];
+            $ff=new FontInfo($f);
+            $aFonts[basename($f)]=['name'=>ucfirst($ff->getFontName()), 'file'=>$f, 'type'=>'E'];
+        }
+    }
+
+    if($Type=='A' or ($Type=='E' and is_dir($CFG->INCLUDE_PATH.'/Modules/FontManagement'))) {
+        foreach(glob($CFG->INCLUDE_PATH.'/Modules/FontManagement/fonts/*.ttf') as $f) {
+//            $ff=new FontMeta($f);
+//            $aFonts[basename($f)]=['name'=>ucfirst($ff->getPostscriptName()), 'file'=>$f];
+            $ff=new FontInfo($f);
+            $aFonts[basename($f)]=['name'=>ucfirst($ff->getFontName()), 'file'=>$f, 'type'=>'E'];
+        }
+        foreach(glob($CFG->INCLUDE_PATH.'/Modules/FontManagement/fonts/*.otf') as $f) {
+//            $ff=new FontMeta($f);
+//            $aFonts[basename($f)]=['name'=>ucfirst($ff->getPostscriptName()), 'file'=>$f];
+            $ff=new FontInfo($f);
+            $aFonts[basename($f)]=['name'=>ucfirst($ff->getFontName()), 'file'=>$f, 'type'=>'E'];
+        }
+    }
+
+    uasort($aFonts, function($a, $b) {
+        return $a['name'] <=> $b['name'];
+    });
+    return $aFonts;
 }
\ No newline at end of file
diff --git a/src/Common/Lib/FontInfo.php b/src/Common/Lib/FontInfo.php
new file mode 100644
index 00000000..08779c47
--- /dev/null
+++ b/src/Common/Lib/FontInfo.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * @class
+ * Retrieves information such as the proper name from a font TTF or OTF font file.
+ * @source http://stackoverflow.com/questions/5668901/php-how-to-read-title-of-font-from-ttf-file
+ */
+class FontInfo
+{
+
+    /**
+     * Contains information in the TTF 'name' table.
+     */
+    private $_arrInfo = null;
+
+    /**
+     * Constructor.
+     * @param strFontPath Path to the font file.
+     */
+    function __construct($strFontPath)
+    {
+        $this->_arrInfo = $this->getFontInfo($strFontPath);
+    }
+
+    /**
+     * Gets the information about the font at the specified path.
+     * @param strFontPath
+     * @return
+     */
+    private function getFontInfo($strFontPath)
+    {
+        $arrFontTags=[];
+        // Open the file and read its contents.
+        $obintJFile = fopen($strFontPath, "r");
+        $strText = fread($obintJFile, filesize($strFontPath));
+        fclose($obintJFile);
+
+        $intOffsetStorage=0;
+
+        // Grab information.
+        $intNumberOfTables = hexdec($this->dec2ord($strText[4]) . $this->dec2ord($strText[5]));
+        for ($intI = 0; $intI < $intNumberOfTables; $intI++) {
+            $strTag = $strText[12 + $intI * 16] . $strText[12 + $intI * 16 + 1] . $strText[12 + $intI * 16 + 2] . $strText[12 + $intI * 16 + 3];
+
+            if ($strTag == "name") {
+                $intOffset = hexdec(
+                    $this->dec2ord($strText[12 + $intI * 16 + 8]) . $this->dec2ord($strText[12 + $intI * 16 + 8 + 1]) .
+                    $this->dec2ord($strText[12 + $intI * 16 + 8 + 2]) . $this->dec2ord($strText[12 + $intI * 16 + 8 + 3])
+                );
+                $intOffsetStorage = hexdec($this->dec2ord($strText[$intOffset + 4]) . $this->dec2ord($strText[$intOffset + 5]));
+                $intNumberOfNameRecords = hexdec($this->dec2ord($strText[$intOffset + 2]) . $this->dec2ord($strText[$intOffset + 3]));
+            }
+        }
+
+        $intStorageDecimal = $intOffsetStorage + $intOffset;
+        $strStorageHexadecimal = strtoupper(dechex($intStorageDecimal));
+
+        for ($intJ = 0; $intJ < $intNumberOfNameRecords; $intJ++) {
+            //$platform_id_dec = hexdec( $this->dec2ord( $this->text[$this->ntOffset+6+$intJ*12+0]).$this->dec2ord( $this->text[$this->ntOffset+6+$intJ*12+1]));
+            $intNameId = hexdec($this->dec2ord($strText[$intOffset + 6 + $intJ * 12 + 6]) . $this->dec2ord($strText[$intOffset + 6 + $intJ * 12 + 7]));
+            $intStringLength = hexdec($this->dec2ord($strText[$intOffset + 6 + $intJ * 12 + 8]) . $this->dec2ord($strText[$intOffset + 6 + $intJ * 12 + 9]));
+            $intStringOffset = hexdec($this->dec2ord($strText[$intOffset + 6 + $intJ * 12 + 10]) . $this->dec2ord($strText[$intOffset + 6 + $intJ * 12 + 11]));
+
+            if (!empty($intNameId) && empty($arrFontTags[$intNameId])) {
+                $arrFontTags[$intNameId]='';
+                for ($intL = 0; $intL < $intStringLength; $intL++) {
+                    if (ord($strText[$intStorageDecimal + $intStringOffset + $intL]) == "0") {
+                        continue;
+                    } else {
+                        $arrFontTags[$intNameId] .= $strText[$intStorageDecimal + $intStringOffset + $intL];
+                    }
+                }
+            }
+        }
+
+        return $arrFontTags;
+    }
+
+    /**
+     * Converts decimal to hex using the ascii value.
+     * @param intDecimal
+     * @return
+     */
+    protected function dec2ord($intDecimal)
+    {
+        return $this->dec2hex(ord($intDecimal));
+    }
+
+    /**
+     * Performs hexadecimal to decimal conversion with proper padding.
+     * @param intDecimal
+     * @return
+     */
+    protected function dec2hex($intDecimal)
+    {
+        return str_repeat("0", 2 - strlen(($strHexadecimal = strtoupper(dechex($intDecimal))))) . $strHexadecimal;
+    }
+
+    /**
+     * Gets the copyright.
+     * @return
+     */
+    public function getCopyright()
+    {
+        return $this->_arrInfo[0];
+    }
+
+    /**
+     * Gets the font family.
+     * @return
+     */
+    public function getFontFamily()
+    {
+        return $this->_arrInfo[1];
+    }
+
+    /**
+     * Gets the sub font family.
+     * @return
+     */
+    public function getFontSubFamily()
+    {
+        return $this->_arrInfo[2];
+    }
+
+    /**
+     * Gets the font id.
+     * @return
+     */
+    public function getFontId()
+    {
+        return $this->_arrInfo[3];
+    }
+
+    /**
+     * Gets the font name.
+     * @return
+     */
+    public function getFontName()
+    {
+        return $this->_arrInfo[4];
+    }
+
+}
\ No newline at end of file
diff --git a/src/Common/Lib/Fun_Export.php b/src/Common/Lib/Fun_Export.php
new file mode 100644
index 00000000..85101a3c
--- /dev/null
+++ b/src/Common/Lib/Fun_Export.php
@@ -0,0 +1,400 @@
+<?php
+
+function export_tournament($TourId, $Complete=false, $InfoSystem='') {
+	$Gara=array();
+	// Inizia prendendo il torneo...
+	$Select = "SELECT * FROM Tournament WHERE ToId=" . StrSafe_DB($TourId) . " ";
+	$Rs=safe_r_sql($Select);
+
+	if (!$Rs || safe_num_rows($Rs)!=1)
+	{
+		print get_text('CrackError');
+		exit;
+	}
+
+	$Gara['Tournament']=safe_fetch_assoc($Rs);
+
+	// prendo le Countries
+	$Select = "SELECT * FROM Countries WHERE CoTournament=" . StrSafe_DB($TourId) . " ";
+	$Rs=safe_r_sql($Select);
+	while($MyRow=safe_fetch_assoc($Rs)){
+		$Gara['Countries'][$MyRow['CoId']]=$MyRow;
+	}
+
+	// prendo le entries
+	$Select = "SELECT * FROM Entries WHERE EnTournament=" . StrSafe_DB($TourId) . " ";
+	$Rs=safe_r_sql($Select);
+	while($MyRow=safe_fetch_assoc($Rs)){
+		$Gara['Entries'][$MyRow['EnId']]=$MyRow;
+	}
+
+	// define which keys are not to be exported!
+	$NotExportableKeys=array();
+	$NotExportableKeys['ModulesParameters'][]="!(MpModule='Mailing' and MpParameter='SmtpServer')";
+	$NotExportableKeys['ModulesParameters'][]="!(MpModule='SendToIanseo' and MpParameter='Credentials')";
+
+	$tabs=array(
+		'AccColors' => 'Ac',
+		'AccEntries' => 'AE',
+		'AccPrice' => 'AP',
+		'ACL' => 'Acl',
+		'AclDetails' => 'AclDt',
+        'AclTemplates' => 'AclTe',
+		'AvailableTarget' => 'At',
+		'Awards' => 'Aw',
+		'Awarded' => 'Aw',
+		'BackNumber' => 'Bn',
+		'CasScore' => 'CaS',
+		'CasTeam' => 'Ca',
+		'CasTeamFinal' => 'CTF',
+		'CasTeamTarget' => 'CTT',
+		'Classes' => 'Cl',
+		'ClassWaEquivalents' => 'ClWaEq',
+		'ClubTeam' => 'CT',
+		'ClubTeamScore' => 'CTS',
+		'Divisions' => 'Div',
+		'DistanceInformation' => 'Di',
+		'DocumentVersions' => 'Dv',
+		'Eliminations' => 'El',
+		'Emails' => 'Em',
+		'EventClass' => 'Ec',
+		'Events' => 'Ev',
+		'FinalReportA' => 'Fra',
+		'Finals' => 'Fin',
+		'FinOdfTiming' => 'FinOdf',
+		'FinSchedule' => 'FS',
+		'FinWarmup' => 'Fw',
+        'GateLog' => 'GL',
+		'HeartBeat'=>'Hb',
+		'HhtData' => 'Hd',
+		'HhtEvents' => 'He',
+		'HhtSetup' => 'Hs',
+		'IdCardElements' => 'Ice',
+		'IdCards' => 'Ic',
+		'Images' => 'Im',
+        'IskData' => 'IskDt',
+		'Individuals' => 'Ind',
+		'Logs' => 'Log',
+		'ModulesParameters' => 'Mp',
+// 		'OnLineIds' => 'Oli', // This table is rewritten everytime so no need to export/import it
+		'OdfDocuments' => 'OdfDoc',
+		'OdfTranslations' => 'OdfTr',
+		'OdfMessageStatus' => 'Oms',
+		'Rankings' => 'Rank',
+		'RecBroken' => 'RecBro',
+		'RecTournament' => 'Rt',
+		'Reviews' => 'Rev',
+		"RoundRobinGrids" => "RrGrid",
+		"RoundRobinGroup" => "RrGr",
+		"RoundRobinLevel" => "RrLev",
+		"RoundRobinMatches" => "RrMatch",
+		"RoundRobinParticipants" => "RrPart",
+		'RunArchery' => 'Ra',
+		'RunArcheryRank' => 'Rar',
+		'RunArcheryParticipants' => 'Rap',
+		'Scheduler'=>'Sch',
+		'Session'=>'Ses',
+		'SubClass' => 'Sc',
+		'TargetFaces' => 'Tf',
+		'TargetGroups' => 'Tg',
+		'TeamComponent' => 'Tc',
+		'TeamDavis' => 'TeDa',
+		'TeamFinals' => 'Tf',
+		'TeamFinComponent' => 'Tfc',
+        'TeamFinComponentLog' => 'Tfcl',
+		'Teams' => 'Te',
+		'TournamentDistances' => 'Td',
+		'TournamentInvolved' => 'Ti',
+		'TourRecords' => 'Tr',
+		'TVContents' => 'TVC',
+		'TVParams' => 'TVP',
+		'TVRules' => 'TVR',
+		'TVSequence' => 'TVS',
+		'VegasAwards'=>'Va',
+	);
+
+	//if(!$InfoSystem) {
+// 		$tabs['']='';
+//	}
+
+	// Tabs where there is an EnID
+	$tabsEnId=array(
+			'AccEntries' => 'AEId',
+			'Awarded' => 'AwEntry',
+			'ElabQualifications' => 'EqId',
+			'Eliminations' => 'ElId',
+			'ExtraData' => 'EdId',
+			'Finals' => array('FinAthlete','FinCoach'),
+            'GateLog' => 'GLEntry',
+			'HhtData' => 'HdEnId',
+			'Individuals' => 'IndId',
+			'Logs' => 'LogEntry',
+			'Photos' => 'PhEnId',
+			'Qualifications' => 'QuId',
+			'RecBroken' => 'RecBroAthlete',
+			'RunArchery'=>'RaArcher',
+			'TeamComponent' => 'TcId',
+			'TeamFinals' => 'TfCoach',
+			'TeamFinComponent' => 'TfcId',
+            'TeamFinComponentLog' => array('TfclIdPrev','TfclIdNext'),
+			'Vegas'=>'VeId',
+	);
+
+	// Tabs where there is an CoID
+	$tabsCoId=array(
+			'CasTeam' => 'CaTeam',
+			'ClubTeam' => 'CTTeam',
+			'ExtraDataCountries' => 'EdcId',
+			'RecBroken' => 'RecBroTeam',
+			'TeamComponent' => 'TcCoId',
+			'TeamFinComponent' => 'TfcCoId',
+            'TeamFinComponentLog' => 'TfclCoId',
+			'TeamFinals' => 'TfTeam',
+			'Teams' => 'TeCoId',
+			'TournamentInvolved' => 'TiCountry',
+	);
+
+	$RoundRobins=[
+		"RoundRobinMatches" => ['RrMatchTeam', 'RrMatchAthlete'],
+		"RoundRobinParticipants" => ['RrPartTeam', 'RrPartParticipant'],
+		"RunArchery" => ['RaTeam', 'RaEntry'],
+		"RunArcheryRank" => ['RarTeam', 'RarEntry'],
+		"RunArcheryParticipants" => ['RapTeam', 'RapEntry'],
+	];
+
+	$Gara['Photos']=array();
+	$Gara['Flags']=array();
+
+	// check if there are local Records NOT maintained from WA
+	$Gara['RecAreas']=array();
+	$q=safe_r_sql("select RecAreas.* from RecAreas inner join TourRecords on TrRecCode=ReArCode and TrTournament={$TourId} where ReArWaMaintenance=0");
+	while($r=safe_fetch($q)) {
+		$Gara['RecAreas'][]=$r;
+	}
+
+	if($Complete) {
+		// Adds localized Flags
+		$Select
+			= "SELECT distinct Flags.* FROM Entries
+					inner join Countries on EnCountry=CoId
+					inner join Flags on CoCode=FlCode and FlTournament = {$TourId}
+					WHERE EnTournament={$TourId}
+					ORDER BY FlCode, FlTournament DESC";
+		$Rs=safe_r_sql($Select);
+		$oldCode='';
+		while($MyRow=safe_fetch_assoc($Rs)){
+			if($oldCode!=$MyRow["FlCode"])
+				$Gara['Flags'][]=$MyRow;
+			$oldCode=$MyRow["FlCode"];
+		}
+
+		// and Pictures
+		$Select
+			= "SELECT Photos.* FROM Photos inner join Entries on Entries.EnId=Photos.PhEnId WHERE Entries.EnTournament=" . StrSafe_DB($TourId) . " ";
+		$Rs=safe_r_sql($Select);
+		while($MyRow=safe_fetch_assoc($Rs)){
+			$Gara['Photos'][]=$MyRow;
+		}
+	}
+
+	$noIds=array(
+		'AccPrice' => 'APId',
+		);
+
+	// prendo le Tabelle definite nell'array che si estraggono sul Tournament
+	foreach($tabs as $tab=>$code) {
+		$Gara[$tab]=array();
+		$Select = "SELECT * FROM $tab WHERE {$code}Tournament=" . StrSafe_DB($TourId) . " ";
+		if(!empty($NotExportableKeys[$tab])) {
+			$Select.= " and ".implode(' AND ', $NotExportableKeys[$tab]);
+		}
+		$Rs=safe_r_sql($Select);
+		while($MyRow=safe_fetch_assoc($Rs)){
+			if(isset($noIds[$tab])) unset($MyRow[$noIds[$tab]]);
+			$Gara[$tab][]=$MyRow;
+		}
+	}
+
+	// ExtraData
+	$Gara['ExtraData']=array();
+	$Select
+	= "SELECT ExtraData.* FROM ExtraData inner join Entries on Entries.EnId=ExtraData.EdId WHERE Entries.EnTournament=" . StrSafe_DB($TourId) . " ";
+	$Rs=safe_r_sql($Select);
+	while($MyRow=safe_fetch_assoc($Rs)){
+		$Gara['ExtraData'][]=$MyRow;
+	}
+
+	// ExtraDataCountries
+	$Gara['ExtraDataCountries']=array();
+	$Select
+	= "SELECT ExtraDataCountries.* FROM ExtraDataCountries inner join Countries on CoId=EdcId WHERE CoTournament=" . StrSafe_DB($TourId) . " ";
+	$Rs=safe_r_sql($Select);
+	while($MyRow=safe_fetch_assoc($Rs)){
+		$Gara['ExtraDataCountries'][]=$MyRow;
+	}
+
+	// ElabQualifications
+	$Gara['ElabQualifications']=array();
+	$Select
+		= "SELECT ElabQualifications.* FROM ElabQualifications inner join Entries on Entries.EnId=ElabQualifications.EqId WHERE Entries.EnTournament=" . StrSafe_DB($TourId) . " ";
+	$Rs=safe_r_sql($Select);
+	while($MyRow=safe_fetch_assoc($Rs)){
+		$Gara['ElabQualifications'][]=$MyRow;
+	}
+
+	// Qualifications
+	$Gara['Qualifications']=array();
+	$Select
+		= "SELECT Qualifications.* FROM Qualifications inner join Entries on Entries.EnId=Qualifications.QuId WHERE Entries.EnTournament=" . StrSafe_DB($TourId) . " ";
+	$Rs=safe_r_sql($Select);
+	while($MyRow=safe_fetch_assoc($Rs)){
+		$Gara['Qualifications'][]=$MyRow;
+	}
+
+	// Vegas
+	$Gara['Vegas']=array();
+	$Select
+		= "SELECT Vegas.* FROM Vegas inner join Entries on EnId=VeId WHERE EnTournament=" . StrSafe_DB($TourId) . " ";
+	$Rs=safe_r_sql($Select);
+	while($MyRow=safe_fetch_assoc($Rs)){
+		$Gara['Vegas'][]=$MyRow;
+	}
+
+	if($InfoSystem) {
+		// protects Tournament images
+		$Gara['Tournament']['ToImgL']=' '.bin2hex($Gara['Tournament']['ToImgL']);
+		$Gara['Tournament']['ToImgR']=' '.bin2hex($Gara['Tournament']['ToImgR']);
+		$Gara['Tournament']['ToImgB']=' '.bin2hex($Gara['Tournament']['ToImgB']);
+		$Gara['Tournament']['ToImgB2']=' '.bin2hex($Gara['Tournament']['ToImgB2']);
+		// gets all data in an array
+		$switches=array();
+		$q=safe_r_SQL("Select * from OnLineIds where OliServer='$InfoSystem' and OliTournament={$_SESSION['TourId']}");
+		while($r=safe_fetch($q)) {
+			$switches[$r->OliType][$r->OliId]=$r->OliOnlineId;
+		}
+
+		// removes not defined entries/countries
+		//adjust Entries
+		$NewEntries=array();
+		foreach($Gara['Entries'] as $Id => $Entry) {
+			if(empty($switches['E'][$Id])
+					or empty($switches['C'][$Entry['EnCountry']])
+					or (empty($switches['C'][$Entry['EnCountry2']]) and $Entry['EnCountry2'])
+					or (empty($switches['C'][$Entry['EnCountry3']]) and $Entry['EnCountry3'])
+					) {
+				unset($switches['E'][$Id]); // missing entry, deletes the entry
+				continue; // skip the new entries
+			}
+			$Entry['EnId']=$switches['E'][$Id];
+			$Entry['EnOnlineId']=$switches['E'][$Id];
+			$Entry['EnTournament']=$switches['T'][$_SESSION['TourId']];
+			$Entry['EnCountry']=$switches['C'][$Entry['EnCountry']];
+			if($Entry['EnCountry2']) $Entry['EnCountry2']=$switches['C'][$Entry['EnCountry2']];
+			if($Entry['EnCountry3']) $Entry['EnCountry3']=$switches['C'][$Entry['EnCountry3']];
+			$NewEntries[$Entry['EnId']]=$Entry;
+		}
+		$Gara['Entries']=$NewEntries;
+
+		// adjust Countries
+		$NewEntries=array();
+		foreach($Gara['Countries'] as $Id => $Entry) {
+			if(empty($switches['C'][$Id])) {
+				unset($switches['C'][$Id]); // missing country, deletes the entry
+				continue; // skip the new entries
+			}
+			$Entry['CoId']=$switches['C'][$Id];
+			$Entry['CoOnlineId']=$switches['C'][$Id];
+			$Entry['CoTournament']=$switches['T'][$_SESSION['TourId']];
+			$NewEntries[$Entry['CoId']]=$Entry;
+		}
+		$Gara['Countries']=$NewEntries;
+
+		// adjust EnId
+		foreach($tabsEnId as $tab => $Ids) {
+			if(is_array($Ids)) {
+				foreach($Ids as $Id) {
+					foreach($Gara[$tab] as $k=>$v) {
+						if($v[$Id] and !empty($switches['E'][$v[$Id]])) {
+							// the user has an Online ID
+							$Gara[$tab][$k][$Id]=$switches['E'][$v[$Id]];
+						} elseif($tab!='Finals') {
+							// unset the record... will be send later on the next cycle
+							unset($Gara[$tab][$k]);
+						}
+					}
+				}
+			} else {
+				foreach($Gara[$tab] as $k=>$v) {
+					if($v[$Ids] and !empty($switches['E'][$v[$Ids]])) {
+						// the user has an Online ID
+						$Gara[$tab][$k][$Ids]=$switches['E'][$v[$Ids]];
+					} elseif($tab!='Finals' and $tab!='Eliminations' and $tab!='TeamFinals') {
+						// unset the record... will be send later on the next cycle
+						unset($Gara[$tab][$k]);
+					}
+				}
+			}
+		}
+
+		// adjust CoId
+		foreach($tabsCoId as $tab => $Id) {
+			foreach($Gara[$tab] as $k=>$v) {
+				if($v[$Id] and !empty($switches['C'][$v[$Id]])) {
+					// the user has an Online ID
+					$Gara[$tab][$k][$Id]=$switches['C'][$v[$Id]];
+				} elseif($tab!='TeamFinals') {
+					// unset the record... will be send later on the next cycle
+					unset($Gara[$tab][$k]);
+				}
+			}
+		}
+
+		// Adjust mixed tables
+		foreach($RoundRobins as $tab => $flags) {
+			foreach($Gara[$tab] as $k=>$v) {
+				if($v[$flags[0]]) {
+					// it is a team ID
+					if($v[$flags[1]] and !empty($switches['C'][$v[$flags[1]]])) {
+						// the user has an Online ID
+						$Gara[$tab][$k][$flags[1]]=$switches['C'][$v[$flags[1]]];
+//					} elseif($tab!='TeamFinals') {
+//						// unset the record... will be send later on the next cycle
+//						unset($Gara[$tab][$k]);
+					}
+				} else {
+					// it is an entry ID
+					if($v[$flags[1]] and !empty($switches['E'][$v[$flags[1]]])) {
+						// the user has an Online ID
+						$Gara[$tab][$k][$flags[1]]=$switches['E'][$v[$flags[1]]];
+//					} elseif($tab!='Finals' and $tab!='Eliminations') {
+//						// unset the record... will be send later on the next cycle
+//						unset($Gara[$tab][$k]);
+					}
+				}
+			}
+		}
+
+        // adjust the array-based IDs
+        foreach($Gara['TeamFinals'] as $k=>$line) {
+            if($line['TfShootingArchers']) {
+                $newArchers=[];
+                foreach(json_decode($line['TfShootingArchers']) as $a=>$b) {
+                    if(!empty($switches['E'][$b])) {
+                        $newArchers["$a"]=$switches['E'][$b];
+                    }
+                }
+                $Gara['TeamFinals'][$k]['TfShootingArchers']=json_encode($newArchers);
+            }
+        }
+
+		// adjust ToId
+		if($Complete) $tabs['Flags']='Fl';
+		foreach($tabs as $tab => $Id) {
+			foreach($Gara[$tab] as $k=>$v) {
+				$Gara[$tab][$k][$Id.'Tournament']=$switches['T'][$_SESSION['TourId']];
+			}
+		}
+	}
+
+	return $Gara;
+}
diff --git a/src/Common/Lib/Fun_Scheduler.php b/src/Common/Lib/Fun_Scheduler.php
index df60e42d..5618cb40 100644
--- a/src/Common/Lib/Fun_Scheduler.php
+++ b/src/Common/Lib/Fun_Scheduler.php
@@ -353,8 +353,8 @@ function GetSchedule() {
 				inner join Tournament on ToId=SchTournament
 				where SchTournament=$this->TourId
 					and SchDay>0 and SchStart>0
-					".($this->SingleDay ? " and date(convert_tz(SchDay, ToTimeZone, '+00:00'))='$this->SingleDay'" : '')."
-					".($this->FromDay ? " and date(convert_tz(SchDay, ToTimeZone, '+00:00'))>='$this->FromDay'" : '')."
+					".($this->SingleDay ? " and SchDay='$this->SingleDay'" : '')."
+					".($this->FromDay ? " and SchDay>='$this->FromDay'" : '')."
 					";
 		}
 
@@ -426,14 +426,14 @@ function GetSchedule() {
 					
 					where DiTournament=$this->TourId
 						and DiDay>0 and (DiStart>0 or DiWarmStart>0)
-						" .($this->SingleDay ? " and date(convert_tz(DiDay, ToTimeZone, '+00:00'))='$this->SingleDay'" : '') ."
-						" .($this->FromDay ? " and date(convert_tz(DiDay, ToTimeZone, '+00:00'))>='$this->FromDay'" : '') ."
+						" .($this->SingleDay ? " and DiDay='$this->SingleDay'" : '') ."
+						" .($this->FromDay ? " and DiDay>='$this->FromDay'" : '') ."
 						" .(strlen($this->SesFilter) ? " and DiSession='$this->SesFilter'" : '') ."  
 					group by DiDistance, DiSession, DiType 
 					order by DiDay, DiStart, DiWarmStart, DiSession, DiDistance";
 			} else {
 				for($i=1; $i<=8; $i++) {
-					$DistanceNames.=" left join (select TdTournament as Td{$i}Tournament, group_concat(distinct Td{$i} separator '£££') as Td{$i}, QuSession as Td{$i}Session from TournamentDistances inner join Entries on EnTournament=TdTournament and concat(EnDivision,EnClass) like TdClasses inner join Qualifications on QuId=EnId where TdTournament={$this->TourId} group by Td{$i}, Td{$i}Session) Td{$i} on Td{$i}Tournament=DiTournament and DiDistance={$i} and Td{$i}Session=DiSession \n";
+					$DistanceNames.=" left join (select TdTournament as Td{$i}Tournament, group_concat(distinct Td{$i} order by Td{$i} desc separator '£££') as Td{$i}, QuSession as Td{$i}Session from TournamentDistances inner join Entries on EnTournament=TdTournament and concat(EnDivision,EnClass) like TdClasses inner join Qualifications on QuId=EnId where TdTournament={$this->TourId} group by Td{$i}Session) Td{$i} on Td{$i}Tournament=DiTournament and DiDistance={$i} and Td{$i}Session=DiSession \n";
 				}
 
 				$SQL[]="select distinct
@@ -468,8 +468,8 @@ function GetSchedule() {
 					$DistanceNames
 					where DiTournament=$this->TourId
 						and DiDay>0 and (DiStart>0 or DiWarmStart>0)
-						".($this->SingleDay ? " and date(convert_tz(DiDay, ToTimeZone, '+00:00'))='$this->SingleDay'" : '')."
-						".($this->FromDay ? " and date(convert_tz(DiDay, ToTimeZone, '+00:00'))>='$this->FromDay'" : '')."
+						".($this->SingleDay ? " and DiDay='$this->SingleDay'" : '')."
+						".($this->FromDay ? " and DiDay>='$this->FromDay'" : '')."
 						".(strlen($this->SesFilter) ? " and DiSession='$this->SesFilter'" : '')."
 					order by DiDay, DiStart, DiWarmStart, DiSession, DiDistance";
 			}
@@ -511,8 +511,8 @@ function GetSchedule() {
 				inner join DistanceInformation on SesTournament=DiTournament and SesOrder=DiSession and ElElimPhase=DiDistance and DiType='E'
 				where DiTournament=$this->TourId
 					and DiDay>0 and (DiStart>0 or DiWarmStart>0)
-					".($this->SingleDay ? " and date(convert_tz(DiDay, ToTimeZone, '+00:00'))='$this->SingleDay'" : '')."
-					".($this->FromDay ? " and date(convert_tz(DiDay, ToTimeZone, '+00:00'))>='$this->FromDay'" : '')."
+					".($this->SingleDay ? " and DiDay='$this->SingleDay'" : '')."
+					".($this->FromDay ? " and DiDay>='$this->FromDay'" : '')."
 				order by DiDay, DiStart, DiWarmStart, DiSession, DiDistance";
 		}
 
@@ -587,8 +587,8 @@ function GetSchedule() {
 				where SesTournament=$this->TourId
 					and SesName!=''
 					and SesDtStart>0
-					".($this->SingleDay ? " and date(convert_tz(SesDtStart, ToTimeZone, '+00:00'))='$this->SingleDay'" : '')."
-					".($this->FromDay ? " and date(convert_tz(SesDtStart, ToTimeZone, '+00:00'))>='$this->FromDay'" : '')."
+					".($this->SingleDay ? " and date(SesDtStart)='$this->SingleDay'" : '')."
+					".($this->FromDay ? " and date(SesDtStart)>='$this->FromDay'" : '')."
 				order by SesDtStart";
 
 			$SQL[]="select distinct
@@ -625,8 +625,8 @@ function GetSchedule() {
 				left join FinWarmup on FsEvent=FwEvent and FsTeamEvent=FwTeamEvent and FsTournament=FwTournament and FsScheduledDate=FwDay and FsScheduledTime=FwMatchTime
 				where FsTournament=$this->TourId
 					and FsScheduledDate>0 and (FsScheduledTime>0 or FwTime>0)
-					".($this->SingleDay ? " and date(convert_tz(FsScheduledDate, ToTimeZone, '+00:00'))='$this->SingleDay'" : '')."
-					".($this->FromDay ? " and date(convert_tz(FsScheduledDate, ToTimeZone, '+00:00'))>='$this->FromDay'" : '')."
+					".($this->SingleDay ? " and FSScheduledDate='$this->SingleDay'" : '')."
+					".($this->FromDay ? " and FSScheduledDate>='$this->FromDay'" : '')."
 				group by /*if(EvElimType>=3, FsMatchNo, 0), */FsTeamEvent, FsScheduledDate, FsScheduledTime, Locations, if(EvWinnerFinalRank>1, EvWinnerFinalRank*100-GrPhase, GrPhase), FwTime
 				order by FsTeamEvent, FsScheduledDate, FsScheduledTime, EvFirstRank, GrPhase, FwTime
 				";
@@ -637,9 +637,9 @@ function GetSchedule() {
 			$LocationFields=sprintf($LocField, 'RrMatchTarget*1');
 			$Date="RrMatchScheduledDate>0";
 			if($this->SingleDay) {
-				$Date="date(convert_tz(RrMatchScheduledDate, ToTimeZone, '+00:00'))='$this->SingleDay'";
+				$Date="RRMatchScheduledDate='$this->SingleDay'";
 			} elseif($this->FromDay) {
-				$Date="date(convert_tz(RrMatchScheduledDate, ToTimeZone, '+00:00'))>='$this->FromDay'";
+				$Date="RRMatchScheduledDate>='$this->FromDay'";
 			}
 			$SQL[]="select distinct
                 concat_ws('-',group_concat(distinct RrMatchEvent order by EvProgr separator '-'), (RrMatchLevel*1000000)+(RrMatchGroup*10000)+(RrMatchRound*100), sum(RrMatchMatchNo)) as UID,
@@ -685,9 +685,9 @@ function GetSchedule() {
 			$LocationFields=sprintf($LocField, '0');
 			$Date="RarStartlist>0";
 			if($this->SingleDay) {
-				$Date="date(convert_tz(RarStartlist, ToTimeZone, '+00:00'))='$this->SingleDay'";
+				$Date="date(RarStartlist)='$this->SingleDay'";
 			} elseif($this->FromDay) {
-				$Date="date(convert_tz(RarStartlist, ToTimeZone, '+00:00'))>='$this->FromDay'";
+				$Date="date(RarStartlist)>='$this->FromDay'";
 			}
 			$SQL[]="select distinct
                 concat_ws('-', RarTeam, RarEvent, RarPhase, RarPool, RarGroup) as UID,
@@ -778,7 +778,7 @@ function getScheduleHTML($Type='IS', $Title='') {
 								.'|'.$Time
 								.'|'.$Session
 								.'|'.$Distance
-								.'|'.round($Item->Order, 4);
+								.'|'.round((float) $Item->Order, 4);
 							if($Item->Comments) {
 								$SingleKey="{$Item->Duration}-{$Item->Title}-{$Item->SubTitle}-{$Item->Comments}";
 								if(in_array($SingleKey, $Singles)) continue;
@@ -910,11 +910,19 @@ function getScheduleHTML($Type='IS', $Title='') {
                                                     if($Item->Text!=$OldText) {
                                                         $txt=$Item->Text.'<br/>'.$txt;
                                                     }
-												} elseif($Item==@end(end(end(end($this->Groups[$Item->Type][$Session]))))) {
-													$txt=$Item->DistanceName.implode('<br/>', $lnk);
+//												} elseif($Item==@end(end(end(end($this->Groups[$Item->Type][$Session]))))) {
 												} else {
-													$txt=$Item->DistanceName;
-													// more distances defined so format is different...
+                                                    $txt=$Item->DistanceName;
+                                                    foreach($this->Groups[$Item->Type][$Session] as $k1=>$v1) {
+                                                        if(!empty($v1[$Date][$Time])) {
+                                                            foreach($v1[$Date][$Time] as $tmp) {
+                                                                if($tmp==$Item) {
+                                                                    $txt.='<br/>'.implode('<br/>', $lnk);
+                                                                    break 2;
+                                                                }
+                                                            }
+                                                        }
+                                                    }
 												}
 
                                                 if($Item->RowLocation) {
diff --git a/src/Common/Menu.php b/src/Common/Menu.php
index d9dbed62..421ec520 100644
--- a/src/Common/Menu.php
+++ b/src/Common/Menu.php
@@ -116,9 +116,6 @@ function get_which_menu($on=false) {
             $ret['COMP']['EXPT'][] = get_text('MenuLM_Export Tournament') . '|' . $CFG->ROOT_DIR . 'Tournament/TournamentExport.php';
             $ret['COMP']['EXPT'][] = get_text('MenuLM_Export Tournament Photo') . '|' . $CFG->ROOT_DIR . 'Tournament/TournamentExport.php?Complete=1';
             if (ProgramRelease == 'HEAD') $ret['COMP']['EXPT'][] = get_text('MenuLM_Export Entries') . '|' . $CFG->ROOT_DIR . 'Partecipants/EntriesExchange.php';
-            if($_SESSION['TourType']==6 AND $_SESSION['TourRealWhenFrom']>='2023-10-27' AND $_SESSION['TourRealWhenTo']<='2024-02-05') {
-                $ret['COMP']['EXPT'][] = get_text('MenuLM_ExportIndoorWorldSeries') . '|' . $CFG->ROOT_DIR . 'Qualification/ExportIWS.php';
-            }
             $ret['COMP'][] = MENU_DIVIDER;
         }
         if ($acl[AclInternetPublish] == AclReadWrite) {
@@ -457,14 +454,6 @@ function get_which_menu($on=false) {
 			$ret['API'][] = get_text('ISKMenuHeader') .'';
 
 			switch($_SESSION['UseApi']) {
-				case 2:
-				case 1:
-				    // MUST stay here!!!
-			        @include_once('Api/ISK/menu.php');
-					break;
-				case 3:
-			        @include_once('Api/ISK-Live/menu.php');
-					break;
                 case 11:
                 case 12:
                 case 13:
@@ -663,238 +652,24 @@ function get_which_run_menu($on=false) {
         if ($acl[AclQualification] == AclReadWrite) {
             $ret['RUN']['SCOR'][] = get_text('MenuLM_Input Score') . '|' . $CFG->ROOT_DIR . 'RunArchery/index.php';
             $ret['RUN']['SCOR'][] = get_text('MenuLM_Standard Table') . '|' . $CFG->ROOT_DIR . 'RunArchery/index.php';
-            // $ret['RUN']['SCOR'][] = get_text('MenuLM_Extended Table') . '|' . $CFG->ROOT_DIR . 'RunArchery/index_all.php';
-            // $ret['RUN']['SCOR'][] = get_text('MenuLM_Arrow by Arrow (Advanced user)') . '|' . $CFG->ROOT_DIR . 'RunArchery/WriteArrows.php';
-            // $ret['RUN']['SCOR'][] = get_text('MenuLM_Arrow by Arrow (Scorecards)') . '|' . $CFG->ROOT_DIR . 'RunArchery/WriteScoreCard.php';
-            // $ret['RUN']['SCOR'][] = MENU_DIVIDER;
-            // $ret['RUN']['SCOR'][] = get_text('MenuLM_Check Data Update') . '|' . $CFG->ROOT_DIR . 'RunArchery/CheckTargetUpdate.php';
-            // $ret['RUN']['SCOR'][] = get_text('SnapshotConf') . '|' . $CFG->ROOT_DIR . 'RunArchery/SnapshotConf.php';
 	        $ret['RUN'][] = MENU_DIVIDER;
         }
         if ($acl[AclQualification] >= AclReadOnly) {
-            // $ret['RUN'][] = get_text('MenuLM_Export Text File') . '|' . $CFG->ROOT_DIR . 'RunArchery/ExportTSV.php';
-            // $ret['RUN'][] = MENU_DIVIDER;
             $ret['RUN'][] = get_text('MenuLM_Scorecard Printout') . '|' . $CFG->ROOT_DIR . 'RunArchery/PrintScore.php';
             $ret['RUN'][] = get_text('MenuLM_NewBacknumbers') . '|' . $CFG->ROOT_DIR . 'Accreditation/IdCards.php?CardType=Q';
-            // $ret['RUN'][] = get_text('MenuLM_Qualification Field of Play Layout') . '|' . $CFG->ROOT_DIR . 'RunArchery/FopSetup.php|||PrintOut';
-            // $ret['RUN'][] = MENU_DIVIDER;
-            // $ret['RUN'][] = get_text('MenuLM_Personal Rank') . '|' . $CFG->ROOT_DIR . 'RunArchery/RankPersonal1.php';
-            // $ret['RUN'][] = MENU_DIVIDER;
-            // if($_SESSION['TourType']>=6 AND $_SESSION['TourType']<=8 AND $_SESSION['TourLocRule']=='IT') {
-            //     $ret['RUN'][] = get_text('SubClassRank','Tournament') . '|' . $CFG->ROOT_DIR . 'RunArchery/PrnIndividual.php?SubClassRank=on&SubClassClassRank=on|||PrintOut';
-            // }
+
             $ret['RUN'][] = get_text('Rankings') . '|' . $CFG->ROOT_DIR . 'RunArchery/PrintOut.php';
             $ret['RUN'][] = get_text('MenuLM_OdsExport') . '|' . $CFG->ROOT_DIR . 'RunArchery/Export.php';
-            // $ret['RUN'][] = get_text('MenuLM_Qualification Round') . '|' . $CFG->ROOT_DIR . 'RunArchery/PrintOutAbs.php';
         }
-
-		// /** QUALIFICATIONS MENU **/
-		// $ret['QUAL'][] = get_text('MenuLM_Qualification') .'';
-        // if ($acl[AclQualification] == AclReadWrite) {
-        //     $ret['QUAL']['SCOR'][] = get_text('MenuLM_Input Score');
-        //     $ret['QUAL']['SCOR'][] = get_text('MenuLM_Standard Table') . '|' . $CFG->ROOT_DIR . 'Qualification/index.php';
-        //     $ret['QUAL']['SCOR'][] = get_text('MenuLM_Extended Table') . '|' . $CFG->ROOT_DIR . 'Qualification/index_all.php';
-        //     $ret['QUAL']['SCOR'][] = get_text('MenuLM_Arrow by Arrow (Advanced user)') . '|' . $CFG->ROOT_DIR . 'Qualification/WriteArrows.php';
-        //     $ret['QUAL']['SCOR'][] = get_text('MenuLM_Arrow by Arrow (Scorecards)') . '|' . $CFG->ROOT_DIR . 'Qualification/WriteScoreCard.php';
-        //     $ret['QUAL']['SCOR'][] = MENU_DIVIDER;
-        //     $ret['QUAL']['SCOR'][] = get_text('MenuLM_Check Data Update') . '|' . $CFG->ROOT_DIR . 'Qualification/CheckTargetUpdate.php';
-        //     $ret['QUAL']['SCOR'][] = get_text('SnapshotConf') . '|' . $CFG->ROOT_DIR . 'Qualification/SnapshotConf.php';
-        //     $ret['QUAL'][] = MENU_DIVIDER;
-        // }
-        // if ($acl[AclQualification] >= AclReadOnly) {
-        //     $ret['QUAL'][] = get_text('MenuLM_Export Text File') . '|' . $CFG->ROOT_DIR . 'Qualification/ExportTSV.php';
-        //     $ret['QUAL'][] = MENU_DIVIDER;
-        //     $ret['QUAL'][] = get_text('MenuLM_Scorecard Printout') . '|' . $CFG->ROOT_DIR . 'Qualification/PrintScore.php';
-        //     $ret['QUAL'][] = get_text('MenuLM_NewBacknumbers') . '|' . $CFG->ROOT_DIR . 'Accreditation/IdCards.php?CardType=Q';
-        //     $ret['QUAL'][] = get_text('MenuLM_Qualification Field of Play Layout') . '|' . $CFG->ROOT_DIR . 'Qualification/FopSetup.php|||PrintOut';
-        //     $ret['QUAL'][] = MENU_DIVIDER;
-        //     $ret['QUAL'][] = get_text('MenuLM_Personal Rank') . '|' . $CFG->ROOT_DIR . 'Qualification/RankPersonal1.php';
-        //     $ret['QUAL'][] = MENU_DIVIDER;
-        //     if($_SESSION['TourType']>=6 AND $_SESSION['TourType']<=8 AND $_SESSION['TourLocRule']=='IT') {
-        //         $ret['QUAL'][] = get_text('SubClassRank','Tournament') . '|' . $CFG->ROOT_DIR . 'Qualification/PrnIndividual.php?SubClassRank=on&SubClassClassRank=on|||PrintOut';
-        //     }
-        //     $ret['QUAL'][] = get_text('MenuLM_Category Result List') . '|' . $CFG->ROOT_DIR . 'Qualification/PrintOut.php';
-        //     $ret['QUAL'][] = get_text('MenuLM_Qualification Round') . '|' . $CFG->ROOT_DIR . 'Qualification/PrintOutAbs.php';
-        // }
-
-		/** ELIMINATION MENU **/
-// 		if($_SESSION['MenuElimDo']) {
-// 			$ret['ELIM'][] = get_text('MenuLM_Eliminations') .'';
-//             if ($acl[AclEliminations] == AclReadWrite) {
-//                 $tmp = get_text('MenuLM_Check shoot-off before eliminations') . '';
-//                 if ($_SESSION['MenuElim1']) {
-//                     $tmp .= ' <b class="ShootOffMenu">(Round 1: ' . implode('-', $_SESSION['MenuElim1']) . ')</b>';
-//                 }
-//                 if ($_SESSION['MenuElim2']) {
-//                     $tmp .= ' <b class="ShootOffMenu">(Round 2: ' . implode('-', $_SESSION['MenuElim2']) . ')</b>';
-//                 }
-//                 $tmp .= '|' . $CFG->ROOT_DIR . 'Final/Individual/AbsIndividual.php';
-//                 $ret['ELIM'][] = $tmp;
-//                 $ret['ELIM'][] = MENU_DIVIDER;
-//             }
-//             if ($acl[AclEliminations] >= AclReadOnly) {
-//                 $ret['ELIM'][] = get_text('MenuLM_Scorecard Printout') . '|' . $CFG->ROOT_DIR . 'Elimination/PrintScore.php';
-//                 $ret['ELIM'][] = get_text('MenuLM_NewBacknumbers') . '|' . $CFG->ROOT_DIR . 'Accreditation/IdCards.php?CardType=E';
-//                 $ret['ELIM'][] = MENU_DIVIDER;
-//             }
-//             if ($acl[AclEliminations] == AclReadWrite) {
-//                 $ret['ELIM'][] = get_text('MenuLM_Target Assignment') . '|' . $CFG->ROOT_DIR . 'Elimination/SetTarget.php';
-//             }
-// 			if($_SESSION['MenuElimOn']) {
-//                 if ($acl[AclEliminations] == AclReadWrite) {
-//                     $ret['ELIM']['SCOR'][] = get_text('MenuLM_Input Score');
-//                     $ret['ELIM']['SCOR'][] = get_text('MenuLM_Standard Table') . '|' . $CFG->ROOT_DIR . 'Elimination/index.php';
-//                     $ret['ELIM']['SCOR'][] = get_text('MenuLM_Arrow by Arrow (Advanced user)') . '|' . $CFG->ROOT_DIR . 'Elimination/WriteArrows.php';
-//                     $ret['ELIM']['SCOR'][] = get_text('MenuLM_Arrow by Arrow (Scorecards)') . '|' . $CFG->ROOT_DIR . 'Elimination/WriteScoreCard.php';
-//                     $ret['ELIM'][] = MENU_DIVIDER;
-//                 }
-//                 if ($acl[AclEliminations] >= AclReadOnly) {
-//                     $ret['ELIM'][] = get_text('MenuLM_Printout') . '|' . $CFG->ROOT_DIR . 'Elimination/PrintOut.php';
-//                 }
-// 			}
-// 		}
-//
-// 		if($_SESSION['MenuElimPoolDo']) {
-// 			$ret['ELIMP'][] = get_text('MenuLM_Pools') .'';
-//             if ($acl[AclEliminations] == AclReadWrite) {
-//                 $tmp = get_text('MenuLM_Check shoot-off before eliminations') . '';
-//                 if ($_SESSION['MenuElimPool']) {
-//                     $tmp .= ' <b class="ShootOffMenu">(Pool: ' . implode('-', $_SESSION['MenuElimPool']) . ')</b>';
-//                 }
-//                 $tmp .= '|' . $CFG->ROOT_DIR . 'Final/Individual/AbsIndividual.php';
-//                 $ret['ELIMP'][] = $tmp;
-//                 $ret['ELIMP'][] = MENU_DIVIDER;
-//             }
-//             if ($acl[AclEliminations] >= AclReadOnly) {
-//                 $ret['ELIMP'][] = get_text('MenuLM_Scorecard Printout') . '|' . $CFG->ROOT_DIR . 'Final/Individual/PrintScore.php';
-//                 $ret['ELIMP'][] = get_text('MenuLM_NewBacknumbers') . '|' . $CFG->ROOT_DIR . 'Accreditation/IdCards.php?CardType=I';
-//                 $ret['ELIMP'][] = MENU_DIVIDER;
-//             }
-//             if ($acl[AclEliminations] == AclReadWrite) {
-//                 $ret['ELIMP'][] = get_text('MenuLM_Target Assignment') . '|' . $CFG->ROOT_DIR . 'Elimination/SetTarget.php';
-//             }
-// 			if($_SESSION['MenuElimOn']) {
-//                 if ($acl[AclEliminations] == AclReadWrite) {
-//                     $ret['ELIMP'][] = get_text('MenuLM_Spotting') . '|' . $CFG->ROOT_DIR . 'Final/Spotting.php';
-//                     $ret['ELIMP'][] = MENU_DIVIDER;
-//                     $ret['ELIMP']['SCOR'][] = get_text('MenuLM_Input Score');
-//                     $ret['ELIMP']['SCOR'][] = get_text('MenuLM_Data insert (Table view)') . '|' . $CFG->ROOT_DIR . 'Final/Individual/InsertPoint1.php';
-//                 }
-//                 if ($acl[AclEliminations] >= AclReadOnly) {
-//                     $ret['ELIMP'][] = get_text('MenuLM_Printout') . '|' . $CFG->ROOT_DIR . 'Elimination/PrintOut.php';
-//                 }
-// 			}
-// 		}
-//
-//
-// 		/** INDIVIDUAL FINAL MENU **/
-// 		if($_SESSION['MenuFinIDo']) {
-// 			$ret['FIN'][] = get_text('MenuLM_Individual Finals') .'';
-//             if($acl[AclIndividuals] == AclReadWrite) {
-//                 $tmp = get_text('MenuLM_Check shoot-off before final phases') . '';
-//                 if ($_SESSION['MenuFinI']) {
-//                     $tmp .= ' <b class="ShootOffMenu">(' . implode('-', $_SESSION['MenuFinI']) . ')</b>';
-//                 }
-//                 $tmp .= '|' . $CFG->ROOT_DIR . 'Final/Individual/AbsIndividual.php';
-//                 $ret['FIN'][] = $tmp;
-//             }
-//             if($acl[AclIndividuals] >= AclReadOnly) {
-//                 $ret['FIN'][] = get_text('MenuLM_PrnShootOff') . '|' . $CFG->ROOT_DIR . 'Qualification/PrnShootoff.php|||PrintOut';
-//                 $ret['FIN'][] = MENU_DIVIDER;
-//                 $ret['FIN'][] = get_text('MenuLM_Export Text File') . '|' . $CFG->ROOT_DIR . 'Final/ExportTSV.php';
-//                 $ret['FIN'][] = MENU_DIVIDER;
-//                 $ret['FIN'][] = get_text('MenuLM_Scorecard Printout') . '|' . $CFG->ROOT_DIR . 'Final/Individual/PrintScore.php';
-// // 			$ret['FIN'][] = get_text('MenuLM_Back Number Printout') .'|'.$CFG->ROOT_DIR.'Final/Individual/PrintBackNo.php';
-//                 $ret['FIN'][] = get_text('MenuLM_NewBacknumbers') . '|' . $CFG->ROOT_DIR . 'Accreditation/IdCards.php?CardType=I';
-//             }
-// 			if($_SESSION['MenuFinIOn']) {
-//                 if($acl[AclIndividuals] == AclReadWrite) {
-//                     $ret['FIN'][] = MENU_DIVIDER;
-//                     $ret['FIN'][] = get_text('MenuLM_Data insert (Bracket view)') . '|' . $CFG->ROOT_DIR . 'Final/Individual/InsertPoint_Bra.php';
-//                     $ret['FIN'][] = get_text('MenuLM_Data insert (Table view)') . '|' . $CFG->ROOT_DIR . 'Final/Individual/InsertPoint1.php';
-//                     $ret['FIN'][] = get_text('MenuLM_Arrow by Arrow (Advanced user)') . '|' . $CFG->ROOT_DIR . 'Final/WriteArrows.php';
-//                     $ret['FIN'][] = get_text('MenuLM_Spotting') . '|' . $CFG->ROOT_DIR . 'Final/Spotting.php';
-//                 }
-//                 if($acl[AclIndividuals] >= AclReadOnly) {
-//                     $ret['FIN'][] = MENU_DIVIDER;
-//                     $ret['FIN'][] = get_text('MenuLM_Printout') . '|' . $CFG->ROOT_DIR . 'Final/PrintOut.php';
-//                 }
-// 			}
-// 		}
-
 		/** PRINTOUT MENU **/
 		$ret['PRNT'][] = get_text('MenuLM_Printout') .'';
-        // if ($acl[AclParticipants] >= AclReadOnly) {
-        //     $ret['PRNT'][] = get_text('MenuLM_Participant Lists') . '|' . $CFG->ROOT_DIR . 'Partecipants/PrintOut.php';
-        //     $ret['PRNT'][] = get_text('MenuLM_Statistics') . '|' . $CFG->ROOT_DIR . 'Partecipants/PrintOutStat.php';
-        //     $ret['PRNT'][] = MENU_DIVIDER;
-        // }
         if ($acl[AclQualification] >= AclReadOnly) {
             $ret['PRNT'][] = get_text('Rankings') . '|' . $CFG->ROOT_DIR . 'RunArchery/PrintOut.php';
             $ret['PRNT'][] = MENU_DIVIDER;
         }
-        // if ($acl[AclIndividuals] >= AclReadOnly OR $acl[AclTeams] >= AclReadOnly) {
-        //     $ret['PRNT'][] = get_text('MenuLM_Final Rounds') . '|' . $CFG->ROOT_DIR . 'Final/PrintOut.php';
-        //     $ret['PRNT'][] = MENU_DIVIDER;
-        // }
-        // if ($acl[AclQualification] == AclReadWrite OR $acl[AclEliminations] == AclReadWrite OR $acl[AclIndividuals] == AclReadWrite OR $acl[AclTeams] == AclReadWrite) {
-        //     $ret['PRNT'][] = get_text('MenuLM_Header for Result Printouts') . '|' . $CFG->ROOT_DIR . 'Tournament/PrintoutComments.php';
-        //     $ret['PRNT'][] = MENU_DIVIDER;
-        // }
-        // if ($acl[AclCompetition] == AclReadWrite) {
-        //     $ret['PRNT'][] = get_text('MenuLM_ManAwards') . '|' . $CFG->ROOT_DIR . 'Tournament/ManAwards.php';
-        // }
-        // if ($acl[AclCompetition] >= AclReadOnly) {
-        //     $ret['PRNT'][] = get_text('MenuLM_CheckAwards') . '|' . $CFG->ROOT_DIR . 'Tournament/PDFAward-check.php|||PrintOut';
-        //     $ret['PRNT'][] = get_text('MenuLM_PrintAwardsPositions') . '|' . $CFG->ROOT_DIR . 'Tournament/PDFAward-Positions.php|||PrintOut';
-        //     $ret['PRNT'][] = get_text('MenuLM_PrintAwards') . '|' . $CFG->ROOT_DIR . 'Tournament/PDFAward.php|||PrintOut';
-        //     $ret['PRNT'][] = MENU_DIVIDER;
-        // }
         if ($acl[AclCompetition] == AclReadWrite) {
             $ret['PRNT'][] = get_text('MenuLM_Print Sign') . '|' . $CFG->ROOT_DIR . 'Common/Sign';
         }
-		//
-		// /** HHT MENU **/
-        // if ($_SESSION['MenuHHT'] AND ($acl[AclQualification] == AclReadWrite OR $acl[AclIndividuals] == AclReadWrite OR $acl[AclTeams] == AclReadWrite)) {
-		// 	$ret['HHT'][] = get_text('MenuLM_HTT') .'';
-		// 	$ret['HHT'][] = get_text('MenuLM_HTT Communication Setup') .'|'.$CFG->ROOT_DIR.'HHT/Configuration.php';
-		// 	$ret['HHT'][] = MENU_DIVIDER;
-		// 	$ret['HHT'][] = get_text('MenuLM_HTT Setup') .'|'.$CFG->ROOT_DIR.'HHT/InitHTT.php';
-		// 	$ret['HHT'][] = get_text('MenuLM_Athletes Setup') .'|'.$CFG->ROOT_DIR.'HHT/InitAthletes.php';
-		// 	$ret['HHT'][] = get_text('MenuLM_Scores Setup') .'|'.$CFG->ROOT_DIR.'HHT/InitScores.php';
-		// 	$ret['HHT'][] = get_text('MenuLM_Setup HTT Sequence') .'|'.$CFG->ROOT_DIR.'HHT/Sequence.php';
-		// 	$ret['HHT'][] = get_text('MenuLM_Collect Data') .'|'.$CFG->ROOT_DIR.'HHT/Collect.php';
-		// 	$ret['HHT'][] = get_text('MenuLM_Get Info') .'|'.$CFG->ROOT_DIR.'HHT/GetInfo.php';
-		// }
-		//
-		// if(!empty($_SESSION['UseApi'])) {
-		// 	$ret['API'][] = get_text('ISKMenuHeader') .'';
-		//
-		// 	switch($_SESSION['UseApi']) {
-		// 		case 2:
-		// 		case 1:
-		// 		    // MUST stay here!!!
-		// 	        @include_once('Api/ISK/menu.php');
-		// 			break;
-		// 		case 3:
-		// 	        @include_once('Api/ISK-Live/menu.php');
-		// 			break;
-		// 	}
-		// }
-		//
-		// /** OUTPUT MENU **/
-		// $ret['MEDI'][] = get_text('MenuLM_Output') .'';
-        // if ($acl[AclOutput] >= AclReadOnly) {
-        //     $ret['MEDI'][] = get_text('MenuLM_TV Output') . '|' . $CFG->ROOT_DIR . 'TV/';
-        //     $ret['MEDI'][] = get_text('MenuLM_TV Channels') . '|' . $CFG->ROOT_DIR . 'TV/ChannelSetup.php';
-        //     $ret['MEDI'][] = MENU_DIVIDER;
-        //     $ret['MEDI'][] = get_text('MenuLM_Spotting') . '|' . $CFG->ROOT_DIR . 'Final/Viewer/|||_blank';
-	    //     //if(ProgramRelease=='HEAD' or ProgramRelease=='TESTING') {
-        //     //    $ret['MEDI'][] = 'Judges\' Output (EXPERIMENTAL)|' . $CFG->ROOT_DIR . 'Final/Viewer/|||_blank';
-	    //     //}
-        //     $ret['MEDI'][] = 'ShowTvLiveScore|' . $CFG->ROOT_DIR . 'Final/ShowTVScore.php?TourId=' . $_SESSION['TourCode'] . '|||TV';
-        // }
-
 	} else {
 		// MENU OFF!!!
 
diff --git a/src/Common/OrisFunctions.php b/src/Common/OrisFunctions.php
index b19b0421..55f695dc 100644
--- a/src/Common/OrisFunctions.php
+++ b/src/Common/OrisFunctions.php
@@ -615,6 +615,7 @@ function getStatEntriesByEvent($ORIS='') {
 	$Data->Description='Number of Entries by Event';
 	$Data->IndexName='Number of Entries by Event';
 	$Data->Continue=get_text('Continue');
+	$Data->LastUpdate='';
 	$Data->Data=array();
 
 	if($ORIS) {
@@ -624,6 +625,9 @@ function getStatEntriesByEvent($ORIS='') {
 		$MyQuery = getStatEntriesByEventQuery('IF');
 		$Rs=safe_r_sql($MyQuery);
 		while ($Row=safe_fetch($Rs)) {
+            if($Row->EnTimestamp>$Data->LastUpdate) {
+                $Data->LastUpdate=$Row->EnTimestamp;
+            }
 			$Data->Data[$Row->Code]=array(
 				'Name' => $Row->EventName,
 				'Number' => $Row->Quanti,
@@ -710,6 +714,9 @@ function getStatEntriesByEvent($ORIS='') {
 		$QR['Data']=array();
 		$Rs=safe_r_sql($MyQuery);
 		while ($Row=safe_fetch($Rs)) {
+            if($Row->EnTimestamp>$Data->LastUpdate) {
+                $Data->LastUpdate=$Row->EnTimestamp;
+            }
 			if(!in_array($Row->Divisione, $QR['Div'])) {
 				$QR['Div'][] = $Row->Divisione;
 			}
@@ -832,6 +839,7 @@ function getStatEntriesByCountries($ORIS='', $Athletes=false) {
 	$Data->Header=array("NOC","Men#","Women#","Total\nCompetitors#","","Officials#", "Total#");
 	$Data->HeaderWidth=array(array(10,40),15,15,25,10,15,15,5);
 	$Data->Phase='';
+	$Data->LastUpdate='';
 	$Data->StatCountries=get_text('StatCountries','Tournament');
 	$Data->Continue=get_text('Continue');
 	$Data->TotalShort=get_text('TotalShort','Tournament');
@@ -855,6 +863,9 @@ function getStatEntriesByCountries($ORIS='', $Athletes=false) {
 
 
 	while ($MyRow=safe_fetch($Rs)) {
+        if($MyRow->EnTimestamp>$Data->LastUpdate) {
+            $Data->LastUpdate=$MyRow->EnTimestamp;
+        }
 		$Data->Data['Items'][$MyRow->NationCode]=$MyRow;
 	}
 
@@ -871,8 +882,9 @@ function getCompetitionOfficials($ORIS=false) {
     $Data->HeaderWidth=array(55,60,array(10,50),15);
     $Data->Phase='';
     $Data->Data=array();
+    $Data->LastUpdate='';
 
-    $Sql = "SELECT TiName, TiGivenName, TiGender, ItDescription, CoCode, CoNameComplete,
+    $Sql = "SELECT TiName, TiGivenName, TiGender, TiTimeStamp, ItDescription, CoCode, CoNameComplete,
         concat(DvMajVersion, '.', DvMinVersion) as DocVersion, date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate, DvNotes as DocNotes
 	FROM TournamentInvolved
 	LEFT JOIN InvolvedType ON TiType=ItId
@@ -886,6 +898,9 @@ function getCompetitionOfficials($ORIS=false) {
     $Data->DocVersionNotes='';
     $q=safe_r_sql($Sql);
     while ($r=safe_fetch($q)) {
+        if($r->TiTimeStamp>$Data->LastUpdate) {
+            $Data->LastUpdate=$r->TiTimeStamp;
+        }
 		$r->ItDescription=get_text($r->ItDescription, 'Tournament');
         $Data->Data['Items'][$r->ItDescription][]=$r;
         if(!empty($r->DocVersion)) {
@@ -954,6 +969,7 @@ function getStartListByCountries($ORIS=false, $Athletes=false, $orderByName=fals
 	$Data->DocVersion='';
 	$Data->DocVersionDate='';
 	$Data->DocVersionNotes='';
+	$Data->LastUpdate='';
 
 	if($ORIS) {
 		$Data->Data['Fields']['TargetNo']='Target';
@@ -976,6 +992,9 @@ function getStartListByCountries($ORIS=false, $Athletes=false, $orderByName=fals
 	while ($MyRow=safe_fetch($Rs)) {
 	    if(!empty($MyRow->EvCodeParent)) continue;
 		if(!empty($MyRow->EventName)) $MyRow->EventName=get_text($MyRow->EventName,'','',true);
+        if($MyRow->EnTimestamp>$Data->LastUpdate) {
+            $Data->LastUpdate=$MyRow->EnTimestamp;
+        }
 		$MyRow->DivDescription=get_text($MyRow->DivDescription,'','',true);
 		$MyRow->ClDescription=get_text($MyRow->ClDescription,'','',true);
 		$MyRow->TfName=get_text($MyRow->TfName,'Tournament','',true);
@@ -1008,7 +1027,8 @@ function getStandingRecords($ORIS=true) {
 	$Data->DocVersion='';
 	$Data->DocVersionDate='';
 	$Data->DocVersionNotes='';
-	$Data->RecordAs=$_SESSION['TourRealWhenFrom'];
+	$Data->RecordAs='';
+	$Data->LastUpdate='';
 	$Data->SubSections=array();
 	$Data->Data=array();
 
@@ -1038,7 +1058,10 @@ function getStandingRecords($ORIS=true) {
 		if($MyRow->RtRecDate=='0000-00-00') {
 			$MyRow->RtRecDate='';
 		}
-		if($MyRow->RtRecLastUpdated<$Data->RecordAs) {
+		if($MyRow->RtRecLastUpdated>$Data->LastUpdate) {
+			$Data->LastUpdate=$MyRow->RtRecLastUpdated;
+		}
+		if(substr($MyRow->RtRecLastUpdated, 0, 10)>$Data->RecordAs) {
 			$Data->RecordAs=substr($MyRow->RtRecLastUpdated, 0, 10);
 		}
 		if(!empty($MyRow->EventName)) {
@@ -1054,7 +1077,10 @@ function getStandingRecords($ORIS=true) {
 			$Data->DocVersionNotes=$MyRow->DocNotes;
 		}
 	}
-
+    $Data->RecordAs=min($_SESSION['TourRealWhenFrom'], $Data->RecordAs);
+    if(substr($Data->LastUpdate,0,10)>$_SESSION['TourRealWhenFrom']) {
+        $Data->LastUpdate=$_SESSION['TourRealWhenFrom'];
+    }
 	return $Data;
 }
 
@@ -1077,6 +1103,7 @@ function getBrokenRecords($ORIS=true) {
 	$Data->DocVersionDate='';
 	$Data->DocVersionNotes='';
 	$Data->RecordAs=$_SESSION['TourRealWhenTo'];
+	$Data->LastUpdate='';
 	$Data->SubSections=array();
 	$Data->Data=array();
 
@@ -1101,8 +1128,8 @@ function getBrokenRecords($ORIS=true) {
 
 	$Rs=safe_r_sql($MyQuery);
 	$Record=array();
-	if($CheckDate=(date('Y-m-d')<$Data->RecordAs)) {
-		$Data->RecordAs=date('Y-m-d');
+	if($CheckDate=(getToday()<$Data->RecordAs)) {
+		$Data->RecordAs=getToday();
 	}
 	//error_reporting(E_ALL);
 	while ($MyRow=safe_fetch($Rs)) {
@@ -1110,6 +1137,9 @@ function getBrokenRecords($ORIS=true) {
 		//	// in case full scores the X are marked so check the Xs of the new record
 		//	continue;
 		//}
+        if($MyRow->RecordDate>$Data->LastUpdate) {
+            $Data->LastUpdate=$MyRow->RecordDate;
+        }
 		switch($MyRow->Phase) {
 			case '1':
 				if(!$MyRow->RtRecXNine) {
@@ -1146,6 +1176,9 @@ function getBrokenRecords($ORIS=true) {
 			$Data->DocVersionNotes=$MyRow->DocNotes;
 		}
 	}
+    if($Data->LastUpdate) {
+        $Data->RecordAs=substr($Data->LastUpdate, 0, 10);
+    }
 
 	return $Data;
 }
@@ -1160,6 +1193,7 @@ function getCountriesList($ORIS='') {
 	$Data->IndexName='List of Countries';
 	$Data->HeaderWidth=array(10,20,160);
 	$Data->Phase='';
+	$Data->LastUpdate='';
 	$Data->Data=array();
 
 	$Data->Data['Fields'] = array(
@@ -1179,13 +1213,16 @@ function getCountriesList($ORIS='') {
 	//echo $MyQuery;exit;
 	$Rs=safe_r_sql($MyQuery);
 	while ($MyRow=safe_fetch($Rs)) {
+        if($MyRow->EnTimestamp>$Data->LastUpdate) {
+            $Data->LastUpdate=$MyRow->EnTimestamp;
+        }
 		$Data->Data['Items'][$MyRow->NationCode][]=$MyRow;
 	}
 
 	return $Data;
 }
 
-function getStartListAlphabetical($ORIS='') {
+function getStartListAlphabetical($ORIS='', $Athlete=false) {
 	$Data=new StdClass();
 
 	$Data->Code='C32B';
@@ -1200,6 +1237,7 @@ function getStartListAlphabetical($ORIS='') {
 	$Data->DocVersion='';
 	$Data->DocVersionDate='';
 	$Data->DocVersionNotes='';
+	$Data->LastUpdate='';
 
 	$Locations=array();
 	if($FopLocations=Get_Tournament_Option('FopLocations')) {
@@ -1249,7 +1287,7 @@ function getStartListAlphabetical($ORIS='') {
 		$Data->IndexName=get_text('StartlistAlpha','Tournament');
 		$Data->Header=array(get_text('Name', 'Tournament'), get_text('Country'), get_text('Nation'), get_text('DOB', 'Tournament')."   #", get_text('Target'), get_text("Event"));
 	}
-	$MyQuery = getStartListAlphaQuery($ORIS);
+	$MyQuery = getStartListAlphaQuery($ORIS, $Athlete);
 
 	$OldLetter='';
 	$Group=0;
@@ -1257,6 +1295,9 @@ function getStartListAlphabetical($ORIS='') {
 	//echo $MyQuery;exit;
 	$Rs=safe_r_sql($MyQuery);
 	while ($MyRow=safe_fetch($Rs)) {
+        if($MyRow->EnTimestamp>$Data->LastUpdate) {
+            $Data->LastUpdate=$MyRow->EnTimestamp;
+        }
 		if(isset($Locations[intval($MyRow->TargetButt)])) {
 			$MyRow->Location=$Locations[intval($MyRow->TargetButt)];
 		}
@@ -1296,6 +1337,7 @@ function getStartListCategory($ORIS=false, $orderByTeam=0, $Events=array()) {
 	$Data->DocVersion='';
 	$Data->DocVersionDate='';
 	$Data->DocVersionNotes='';
+	$Data->LastUpdate='';
 
 	$Data->Data['Fields'] = array(
 			'SesName' => get_text('Session'),
@@ -1352,6 +1394,9 @@ function getStartListCategory($ORIS=false, $orderByTeam=0, $Events=array()) {
 
 	$Rs=safe_r_sql($MyQuery);
 	while ($MyRow=safe_fetch($Rs)) {
+        if($MyRow->EnTimestamp>$Data->LastUpdate) {
+            $Data->LastUpdate=$MyRow->EnTimestamp;
+        }
 		if($OldCategory != $MyRow->EventCode) {
 			$Group++;
 			$OldCategory = $MyRow->EventCode;
@@ -2051,7 +2096,7 @@ function getMedalStand($ORIS=false, $TourId=0) {
 		if($section['meta']['medals']) {
 			$Data->OdfTotalEvents++;
 			foreach($section['items'] as $item) {
-				if($item['rank']!=0) {
+				if(is_numeric($item['rank']) and $item['rank']!=0) {
 					if(empty($CountryList[$item['countryCode']])) {
 						$CountryList[$item['countryCode']] = clone $tmp;
 						$CountryList[$item['countryCode']]->Name = $item['countryName'];
@@ -2096,7 +2141,7 @@ function getMedalStand($ORIS=false, $TourId=0) {
 		if($section['meta']['medals']) {
 			$Data->OdfTotalEvents++;
 			foreach($section['items'] as $item) {
-				if($item['rank']!=0) {
+				if(is_numeric($item['rank']) and $item['rank']!=0) {
 					if(empty($CountryList[$item['countryCode']])) {
 						$CountryList[$item['countryCode']] = clone $tmp;
 						$CountryList[$item['countryCode']]->Name = $item['countryName'];
diff --git a/src/Common/PhotoResize.php b/src/Common/PhotoResize.php
index 7192f4e6..c19366f8 100644
--- a/src/Common/PhotoResize.php
+++ b/src/Common/PhotoResize.php
@@ -39,13 +39,13 @@ function photoresize($file, $direct=false, $String=false) {
 					$ratio=min($width/MAX_WIDTH, $height/MAX_HEIGHT);
 
 					// we resize the image to fit the greater value
-					$new_width=$width/$ratio;
-					$new_height=$height/$ratio;
+					$new_width=intval($width/$ratio);
+					$new_height=intval($height/$ratio);
 					$im2=imagecreatetruecolor( MAX_WIDTH, MAX_HEIGHT);
 					$bgcolor=imagecolorallocate($im2, 255, 255, 255);
 					imagefill($im2, 0,0,$bgcolor);
 
-					if(!imagecopyresampled( $im2, $im, (MAX_WIDTH-$new_width)/2, (MAX_HEIGHT-$new_height)/2,0,0, $new_width, $new_height, $width, $height)) {
+					if(!imagecopyresampled( $im2, $im, intval((MAX_WIDTH-$new_width)/2), intval((MAX_HEIGHT-$new_height)/2),0,0, $new_width, $new_height, $width, $height)) {
 						$errMsg=get_text('PhotoDimError','Tournament',array(MAX_WIDTH,MAX_HEIGHT));
 					} else {
 						// check now the proportions
diff --git a/src/Common/Rank/Obj_Rank.php b/src/Common/Rank/Obj_Rank.php
index de46afac..4cf06a39 100644
--- a/src/Common/Rank/Obj_Rank.php
+++ b/src/Common/Rank/Obj_Rank.php
@@ -77,7 +77,7 @@ public function __construct($opts=null)
 				$this->tournament=$_SESSION['TourId'];
 			}
 
-			$q=safe_r_sql("select ToTimeZone, ToOptions, ToCode, year(ToWhenTo) as ToYear, ToBlock & 1024 as Flighted, RecAreas.* 
+			$q=safe_r_sql("select ToTimeZone, ToOptions, ToCode, year(ToWhenTo) as ToYear, ((ToBlock & 1024) AND ToLocRule='NFAA')  as Flighted, RecAreas.* 
 				from Tournament 
 			    left join (select distinct RecAreas.*, TrTournament from RecAreas inner join TourRecords on TrRecCode=ReArCode and TrTournament=$this->tournament) RecAreas on TrTournament=ToId 
 				where ToId=$this->tournament");
diff --git a/src/Common/Rank/Obj_Rank_Abs.php b/src/Common/Rank/Obj_Rank_Abs.php
index 58483456..28e52673 100644
--- a/src/Common/Rank/Obj_Rank_Abs.php
+++ b/src/Common/Rank/Obj_Rank_Abs.php
@@ -188,9 +188,9 @@ public function read(){
 
 			if (array_key_exists('cutRank',$this->opts)) {
 				if(is_numeric($this->opts['cutRank']) && $this->opts['cutRank']>0) {
-					$EnFilter.= "AND Ind{$dd}Rank<={$this->opts['cutRank']} ";
+					$EnFilter.= "AND (Ind{$dd}Rank<={$this->opts['cutRank']} AND Ind{$dd}Rank!=0)";
 				} elseif (strtolower($this->opts['cutRank'])=='cut') {
-					$EnFilter.= "AND Ind{$dd}Rank<=EvNumQualified ";
+					$EnFilter.= "AND (Ind{$dd}Rank<=EvNumQualified AND Ind{$dd}Rank!=0)";
 				}
 			}
 
@@ -242,7 +242,7 @@ public function read(){
 					QuD1Gold, QuD2Gold, QuD3Gold, QuD4Gold, QuD5Gold, QuD6Gold, QuD7Gold, QuD8Gold,
 					QuD1Xnine, QuD2Xnine, QuD3Xnine, QuD4Xnine, QuD5Xnine, QuD6Xnine, QuD7Xnine, QuD8Xnine,
 					QuD1Arrowstring,QuD2Arrowstring,QuD3Arrowstring,QuD4Arrowstring,QuD5Arrowstring,QuD6Arrowstring,QuD7Arrowstring,QuD8Arrowstring,
-					QuScore, QuNotes, QuConfirm, IndNotes, (EvShootOff OR EvE1ShootOff OR EvE2ShootOff) as ShootOffSolved,
+					QuScore, QuNotes, QuConfirm, QuArrow, IndNotes, (EvShootOff OR EvE1ShootOff OR EvE2ShootOff) as ShootOffSolved,
 					IF(EvRunning=1,IFNULL(ROUND(QuScore/QuHits,3),0),0) as RunningScore,
 					EvCode,EvEventName,EvRunning, EvFinalFirstPhase, EvElim1, EvElim2, EvIsPara, coalesce(OdfTrOdfCode,'') as OdfUnitCode, EvOdfCode,
 					{$tmp} AS Arrows_Shot,
@@ -341,7 +341,7 @@ public function read(){
 			if(!empty($this->opts['runningDist']) && $this->opts['runningDist']>0) {
 				$q .= "OrderScore DESC, OrderGold DESC, OrderXnine DESC, FirstName, Name ";
 			} else {
-				$q .= "RunningScore DESC, Ind{$dd}Rank=0, Ind{$dd}Rank ASC, FirstName, Name ";
+				$q .= "Ind{$dd}Rank=0, Ind{$dd}Rank ASC, FirstName, Name ";
 			}
 			$r=safe_r_sql($q);
 
@@ -353,30 +353,23 @@ public function read(){
 			$this->data['sections']=array();
 
 			if (safe_num_rows($r)>0) {
-				$curEvent='';
+                $curEvent='';
 
-				$section=null;
+                $section=null;
 
-				$runningOldScore=-1;
-				$runningPos=0;
-				$runningRank=0;
+                $oldScore=-1;
+                $oldGold=-1;
+                $oldXnine=-1;
+                $myPos=0;
+                $myRank=0;
 
-				$oldScore=-1;
-				$oldGold=-1;
-				$oldXnine=-1;
-				$myPos=0;
-				$myRank=0;
-
-				while ($myRow=safe_fetch($r))
-				{
-					if ($curEvent!=$myRow->EvCode)
-					{
+				while ($myRow=safe_fetch($r)) {
+					if ($curEvent!=$myRow->EvCode) {
 					/*
 					 *  se non sono all'inizio, prima di iniziare una sezione devo prendere quella appena fatta
 					 *  e accodarla alle altre
 					 */
-						if ($curEvent!='')
-						{
+						if ($curEvent!='') {
 							foreach($section["meta"]["arrowsShot"] as $k => $v) {
 								if($v) $section["meta"]["sesArrows"][$k] = get_text('AfterXArrows', 'Common', $v);
 							}
@@ -388,8 +381,7 @@ public function read(){
 						$curEvent=$myRow->EvCode;
 
 					// inizializzo i meta che son comuni a tutta la classifica
-						if ($this->data['meta']['numDist']==-1)
-						{
+						if ($this->data['meta']['numDist']==-1) {
 							$this->data['meta']['numDist']=$myRow->ToNumDist;
 							$this->data['meta']['double']=$myRow->ToDouble;
 						}
@@ -446,8 +438,7 @@ public function read(){
 							'hits' => get_text('Arrows','Tournament')
 						);
 
-						if ($this->opts['dist']==0 && empty($this->opts['runningDist']))
-						{
+						if ($this->opts['dist']==0 && empty($this->opts['runningDist'])) {
 							$fields=$fields+array(
 								'tiebreak' => get_text('TieArrows'),
 								'tiebreakClosest' => get_text('Close2Center', 'Tournament'),
@@ -502,31 +493,21 @@ public function read(){
 						$oldXnine=-1;
 						$myPos=0;
 						$myRank=0;
-
-						$runningOldScore=-1;
-						$runningPos=0;
-						$runningRank=0;
-					}
-
-					if($myRow->EvRunning==1)
-					{
-						$runningPos++;
-						if($runningOldScore!=$myRow->RunningScore)
-							$runningRank=$runningPos;
-						$runningOldScore=$myRow->RunningScore;
 					}
 
-					$myPos++;
-					if(!($oldScore==$myRow->OrderScore && $oldGold==$myRow->OrderGold && $oldXnine==$myRow->OrderXnine))
-						$myRank = $myPos;
-					$oldScore = $myRow->OrderScore;
-					$oldGold = $myRow->OrderGold;
-					$oldXnine = $myRow->OrderXnine;
-
+                    if(!empty($this->opts['runningDist']) && $this->opts['runningDist']>0) {
+                        $myPos++;
+                        if (!($oldScore == $myRow->OrderScore && $oldGold == $myRow->OrderGold && $oldXnine == $myRow->OrderXnine)) {
+                            $myRank = $myPos;
+                        }
+                        $oldScore = $myRow->OrderScore;
+                        $oldGold = $myRow->OrderGold;
+                        $oldXnine = $myRow->OrderXnine;
+                    }
 
 				// creo un elemento per la sezione
 					if($myRow->IrmShowRank) {
-						$tmpRank= (!empty($this->opts['runningDist']) && $this->opts['runningDist']>0 ? $myRank : ($myRow->EvRunning==1 ? $runningRank: $myRow->Rank));
+						$tmpRank= (!empty($this->opts['runningDist']) && $this->opts['runningDist']>0 ? $myRank : $myRow->Rank);
 					} else {
                         $tmpRank = $myRow->IrmType;
 					}
@@ -568,6 +549,7 @@ public function read(){
 						'gold' => $myRow->IrmShowRank ? (!empty($this->opts['runningDist']) && $this->opts['runningDist']>0 ? $myRow->OrderGold : $myRow->Gold) : '',
 						'xnine' => $myRow->IrmShowRank ? (!empty($this->opts['runningDist']) && $this->opts['runningDist']>0 ? $myRow->OrderXnine : $myRow->XNine) : '',
 						'hits' => $myRow->IrmShowRank ? $myRow->Hits : '',
+						'miss' => $myRow->IrmShowRank ? $myRow->Hits-$myRow->QuArrow : '',
 						'notes' => trim($myRow->QuNotes. ' ' . $myRow->IndNotes),
 						'record' => $this->ManageBitRecord($myRow->RecBitLevel, $myRow->CoCaCode, $myRow->CoMaCode, $myRow->EvIsPara),
 						'irm' => $myRow->IndIrmType,
@@ -575,7 +557,7 @@ public function read(){
 						'recordGap' => ($myRow->Arrows_Shot*10)-$myRow->Score,
 					);
 
-					if ($this->opts['dist']==0 && empty($this->opts['runningDist'])) {
+					if ($this->opts['dist']==0 AND empty($this->opts['runningDist'])) {
 						$item=$item+array(
 							'tiebreak' => trim($myRow->IndTiebreak),
                             'tiebreakClosest' => $myRow->IndTbClosest,
@@ -603,12 +585,10 @@ public function read(){
 					$item=$item+$distFields;
 
 					//Gestisco il numero di frecce tirate per sessione
-					if(empty($section["meta"]["arrowsShot"][$myRow->Session]) || $section["meta"]["arrowsShot"][$myRow->Session]<=$myRow->Arrows_Shot)
-						$section["meta"]["arrowsShot"][$myRow->Session] = $myRow->Arrows_Shot;
-
+					if($myRow->IndIrmType==0 AND (empty($section["meta"]["arrowsShot"][$myRow->Session]) OR $section["meta"]["arrowsShot"][$myRow->Session]<=$myRow->Arrows_Shot)) {
+                        $section["meta"]["arrowsShot"][$myRow->Session] = $myRow->Arrows_Shot;
+                    }
 
-				// e lo aggiungo alla sezione
-					//print_r($item);
 					$section['items'][]=$item;
 
 					if ($myRow->IndTimestamp>$this->data['meta']['lastUpdate']) {
diff --git a/src/Common/Rank/Obj_Rank_AbsTeam.php b/src/Common/Rank/Obj_Rank_AbsTeam.php
index 8f901837..d12504ba 100644
--- a/src/Common/Rank/Obj_Rank_AbsTeam.php
+++ b/src/Common/Rank/Obj_Rank_AbsTeam.php
@@ -190,9 +190,9 @@ public function read()
 			$TeamFilter='';
 			if (array_key_exists('cutRank',$this->opts)) {
 				if(is_numeric($this->opts['cutRank']) && $this->opts['cutRank']>0) {
-					$TeamFilter.= " AND Teams.teRank<={$this->opts['cutRank']} ";
+					$TeamFilter.= " AND (Teams.teRank<={$this->opts['cutRank']} AND Teams.teRank!=0)";
 				} elseif (strtolower($this->opts['cutRank'])=='cut') {
-					$TeamFilter.= " AND Teams.teRank<=EvNumQualified ";
+					$TeamFilter.= " AND (Teams.teRank<=EvNumQualified  AND Teams.teRank!=0)";
 				}
 			}
 
@@ -280,7 +280,7 @@ public function read()
 					{$filter}
 					{$TeamFilter}
 				ORDER BY
-					EvProgr,TeEvent, RunningScore DESC, if(IrmShowRank=1, 0, TeIrmType), TeRank ASC, TeGold DESC, TeXnine DESC, CoCode, TeSubTeam, EnSex desc, EnFirstName, tc.TcOrder
+					EvProgr,TeEvent, if(IrmShowRank=1, 0, TeIrmType), TeRank ASC, TeGold DESC, TeXnine DESC, CoCode, TeSubTeam, EnSex desc, EnFirstName, tc.TcOrder
 			";
 
 			$r=safe_r_sql($q);
diff --git a/src/Common/Rank/Obj_Rank_AbsTeam_calc.php b/src/Common/Rank/Obj_Rank_AbsTeam_calc.php
index 7b59a5ba..d789f3d7 100644
--- a/src/Common/Rank/Obj_Rank_AbsTeam_calc.php
+++ b/src/Common/Rank/Obj_Rank_AbsTeam_calc.php
@@ -104,10 +104,12 @@ public function calculate()
 
 			$q="
 				SELECT
-					TeTournament,TeCoId,TeSubTeam,TeEvent,
-					IFNULL(IF(EvRunning=1, TeScore/TeHits,TeScore),0) as TeScore, TeGold, TeXnine,
-					IF(EvFinalFirstPhase=0,99999,coalesce(RrQualified, EvNumQualified)) AS QualifiedNo, EvFinalFirstPhase, 
-					TeRank AS ActualRank
+					TeTournament,TeCoId,TeSubTeam,TeEvent, IF(EvFinalFirstPhase=0,99999,coalesce(RrQualified, EvNumQualified)) AS QualifiedNo, EvFinalFirstPhase, TeRank AS ActualRank,
+                    TeScore, TeGold, TeXnine,
+					IF(EvRunning=1,IFNULL(ROUND(TeScore/TeHits,3),0),TeScore) AS TeScore, 
+                    IF(EvRunning=1,IFNULL(ROUND(TeGold/TeHits,3),0),TeGold) AS TeGold,
+                    IF(EvRunning=1,IFNULL(ROUND(TeXnine/TeHits,3),0),TeXnine) AS TeXnine,
+                    TeHits AS Hits 
 				 FROM Teams
 			    INNER JOIN Events ON TeEvent=EvCode AND TeTournament=EvTournament AND EvTeamEvent=1
 			    inner join IrmTypes on IrmId=TeIrmType and IrmShowRank=1
@@ -116,9 +118,8 @@ public function calculate()
 				 	TeTournament={$this->tournament} AND TeFinEvent=1 AND TeScore<>'0'
 				 	{$filter}
 				 ORDER BY
-				 	{$orderBy}
-			";
-			//print $q;exit;
+				 	{$orderBy}";
+
 
 			$r=safe_r_sql($q);
 
@@ -287,12 +288,7 @@ public function setRow($items=array()) {
 			$affected=0;
 
 			foreach ($items as $item) {
-				/*print '<pre>';
-				print_r($item);
-				print '</pre>';*/
-
 				$paramsOk=true;
-
 				$canUp=false;
 
 		/*
diff --git a/src/Common/Rank/Obj_Rank_Abs_calc.php b/src/Common/Rank/Obj_Rank_Abs_calc.php
index a495e780..30f6b54a 100644
--- a/src/Common/Rank/Obj_Rank_Abs_calc.php
+++ b/src/Common/Rank/Obj_Rank_Abs_calc.php
@@ -117,12 +117,17 @@ public function calculate() {
 					set $sql
 					where IndTournament={$this->tournament}");
 
-			$q="SELECT
-					IndId AS `athId`,IndEvent AS `EventCode`,
-					Qu{$dd}Score AS Score,Qu{$dd}Gold AS Gold,Qu{$dd}Xnine AS XNine, Qu{$dd}Hits AS Hits, IndRank as actualRank,
-					EvFinalFirstPhase, EvElim1, EvElim2, EvElimType,
-					IF(EvFinalFirstPhase=0,999999,coalesce(RrQualified, IF(EvElimType=0, EvNumQualified, IF(EvElim1=0,EvElim2,EvElim1)))) as QualifiedNo, EvFirstQualified
-				FROM Events
+			$q="SELECT IndId AS `athId`,IndEvent AS `EventCode`, IndRank as actualRank, EvFinalFirstPhase, EvElim1, EvElim2, EvElimType,
+                IF(EvFinalFirstPhase=0,999999,coalesce(RrQualified, IF(EvElimType=0, EvNumQualified, IF(EvElim1=0,EvElim2,EvElim1)))) as QualifiedNo, EvFirstQualified, ";
+            if($this->opts['dist']==0) {
+                $q .= "IF(EvRunning=1,IFNULL(ROUND(QuScore/QuHits,3),0),QuScore) AS Score, 
+                IF(EvRunning=1,IFNULL(ROUND(QuGold/QuHits,3),0),QuGold) AS Gold,
+                IF(EvRunning=1,IFNULL(ROUND(QuXnine/QuHits,3),0),QuXnine) AS XNine,
+                QuHits AS Hits ";
+            } else {
+                $q .= "Qu{$dd}Score AS Score, Qu{$dd}Gold AS Gold, Qu{$dd}Xnine AS XNine, Qu{$dd}Hits AS Hits ";
+            }
+            $q .= "FROM Events
 				INNER JOIN Individuals ON EvCode=IndEvent AND EvTournament=IndTournament AND EvTeamEvent=0
 			    inner join IrmTypes on IrmId=IndIrmType and IrmShowRank=1
 				INNER JOIN Qualifications ON IndId=QuId
@@ -132,8 +137,7 @@ public function calculate() {
 			        AND (QuScore != 0 OR QuHits !=0) 
 					{$filter}
 				ORDER BY
-					IndEvent,Qu{$dd}Score DESC,Qu{$dd}Gold DESC,Qu{$dd}Xnine DESC
-			";
+					IndEvent, Score DESC, Gold DESC, XNine DESC";
 				//print $q.'<br><br>';
 			$r=safe_r_sql($q);
 
diff --git a/src/Common/Rank/Obj_Rank_DivClass.php b/src/Common/Rank/Obj_Rank_DivClass.php
index b4314ba7..1680cc25 100644
--- a/src/Common/Rank/Obj_Rank_DivClass.php
+++ b/src/Common/Rank/Obj_Rank_DivClass.php
@@ -126,6 +126,10 @@ protected function safeFilter()
 				$filter[]="EnId=" . intval($this->opts['enid']) . " ";
 			}
 
+			if (!empty($this->opts['enids'])) {
+				$filter[]="EnId in (" . implode(',',$this->opts['enids']) . ") ";
+			}
+
 			if (!empty($this->opts['encode'])) {
 				if (is_array($this->opts['encode'])) {
 					$filter[]="EnCode IN (" . implode(',', StrSafe_DB($this->opts['encode'])) . ")";
@@ -228,7 +232,7 @@ public function read()
 					QuD1Xnine, QuD2Xnine, QuD3Xnine, QuD4Xnine, QuD5Xnine, QuD6Xnine, QuD7Xnine, QuD8Xnine,
 					QuD1ArrowString, QuD2ArrowString, QuD3ArrowString, QuD4ArrowString, QuD5ArrowString, QuD6ArrowString, QuD7ArrowString, QuD8ArrowString,
 					{$tmp} AS Arrows_Shot, ToNumEnds, DiEnds, DiArrows, FdiDetails,
-					QuIrmType, IrmType, IrmShowRank, QuNotes,
+					QuIrmType, IrmType, IrmShowRank, QuNotes, QuArrow,
 					{$MyRank} AS `Rank`, " . (!empty($comparedTo) ? 'IFNULL(QopClRank,0)' : '0') . " as OldRank, Qu{$dd}Score AS Score, Qu{$dd}Gold AS Gold,Qu{$dd}Xnine AS XNine, Qu{$dd}Hits AS Hits, ";
 
 			if(!empty($this->opts['runningDist']) && $this->opts['runningDist']>0)
@@ -454,6 +458,7 @@ public function read()
 						'gold' => (!empty($this->opts['runningDist']) && $this->opts['runningDist']>0 ? $myRow->OrderGold : $myRow->Gold),
 						'xnine' => (!empty($this->opts['runningDist']) && $this->opts['runningDist']>0 ? $myRow->OrderXnine : $myRow->XNine),
 						'hits' => $myRow->Hits,
+                        'miss' => $myRow->IrmShowRank ? $myRow->Hits-$myRow->QuArrow : '',
 						'arrowsShot' => $myRow->Arrows_Shot,
 						'irm' => $myRow->QuIrmType,
 						'irmText' => $myRow->IrmType,
diff --git a/src/Common/Rank/Obj_Rank_GridInd.php b/src/Common/Rank/Obj_Rank_GridInd.php
index 3172f068..550fa90a 100644
--- a/src/Common/Rank/Obj_Rank_GridInd.php
+++ b/src/Common/Rank/Obj_Rank_GridInd.php
@@ -188,6 +188,7 @@ public function getQuery($OrderByTarget=false) {
 					. " upper(a.EnFirstName) FamilyNameUpper,"
 					. " a.EnName GivenName,"
 					. " a.EnTvFamilyName TvFamilyName,"
+					. " a.EnTvGivenName TvGivenName,"
 					. " a.EnTvInitials TvInitials,"
 					. " CoId CountryId,"
 					. " CoCode CountryCode,"
@@ -274,6 +275,7 @@ public function getQuery($OrderByTarget=false) {
 					. " IF(EvFinalFirstPhase=48, GrPosition2, if(GrPosition>EvNumQualified, 0, GrPosition)) OppPosition,"
 					. " a.EnName OppGivenName,"
                     . " a.EnTvFamilyName OppTvFamilyName,"
+                    . " a.EnTvGivenName OppTvGivenName,"
                     . " a.EnTvInitials OppTvInitials,"
 					. " CoId OppCountryId,"
 					. " CoCode OppCountryCode,"
@@ -483,7 +485,7 @@ public function read() {
 						'elimType' => $myRow->EvElimType,
 						'targetType' => $myRow->TarDescr,
 						'targetTypeId' => $myRow->TarId,
-						'targetTypeValues' => GetTarget($this->tournament, $myRow->TarDescr),
+						'targetTypeValues' => GetTarget($this->tournament, $myRow->TarDescr, true),
 						'targetSize' => $myRow->TargetSize,
 						'distance' => $myRow->Distance,
 						'version' => $myRow->DocVersion,
@@ -593,6 +595,7 @@ public function read() {
 					'familyNameUpper' => $myRow->FamilyNameUpper,
 					'givenName' => $myRow->GivenName,
                     'tvFamilyName' => $myRow->TvFamilyName,
+                    'tvGivenName' => $myRow->TvGivenName,
                     'tvInitials' => $myRow->TvInitials,
 					'nameOrder' => $myRow->NameOrder,
 					'gender' => $myRow->Gender,
@@ -655,6 +658,7 @@ public function read() {
 					'oppFamilyNameUpper' => $myRow->OppFamilyNameUpper,
 					'oppGivenName' => $myRow->OppGivenName,
 					'oppTvFamilyName' => $myRow->OppTvFamilyName,
+					'oppTvGivenName' => $myRow->OppTvGivenName,
 					'oppTvInitials' => $myRow->OppTvInitials,
 					'oppNameOrder' => $myRow->OppNameOrder,
 					'oppGender' => $myRow->OppGender,
diff --git a/src/Common/Rank/Obj_Rank_GridTeam.php b/src/Common/Rank/Obj_Rank_GridTeam.php
index 069fcc67..123908de 100644
--- a/src/Common/Rank/Obj_Rank_GridTeam.php
+++ b/src/Common/Rank/Obj_Rank_GridTeam.php
@@ -446,7 +446,7 @@ public function read()
 						'elimMaxScore' => $myRow->EvElimArrows*10,
 						'targetType' => $myRow->TarDescr,
 						'targetTypeId' => $myRow->TarId,
-						'targetTypeValues' => GetTarget($this->tournament, $myRow->TarDescr),
+						'targetTypeValues' => GetTarget($this->tournament, $myRow->TarDescr, true),
 						'targetSize' => $myRow->TargetSize,
 						'distance' => $myRow->Distance,
 						'version' => $myRow->DocVersion,
diff --git a/src/Common/ScoreEditor/AjaxGetScore.php b/src/Common/ScoreEditor/AjaxGetScore.php
index 8eb60315..ab1c3abe 100644
--- a/src/Common/ScoreEditor/AjaxGetScore.php
+++ b/src/Common/ScoreEditor/AjaxGetScore.php
@@ -211,7 +211,7 @@
 				$myReview=safe_fetch($rs);
 
 				$out.='<tr><td colspan="' . (5+$cols). '" class="Center">' . get_text($m==1 ? 'RevMainLang' : 'RevSecLang') . '</td></tr>' . "\n";
-				$out.='<tr><td colspan="' . (5+$cols). '" class="Center"><textarea style="width:' . ($_SESSION["WINWIDTH"]*0.45). 'px; height:' . ($_SESSION["WINHEIGHT"]*0.45). 'px;"  id="Lang' . $m . '">' . ($myReview ? $myReview->{'RevLanguage'.$m} : '') . '</textarea></td></tr>' . "\n";
+				$out.='<tr><td colspan="' . (5+$cols). '" class="Center"><textarea style="width:45%; height:45%;"  id="Lang' . $m . '">' . ($myReview ? $myReview->{'RevLanguage'.$m} : '') . '</textarea></td></tr>' . "\n";
 			}
 			$out.='</table>' . "\n";
 			$scores[$m]=$out;
diff --git a/src/Common/StartListQueries.php b/src/Common/StartListQueries.php
index d3c8ed63..a0a4b2d1 100644
--- a/src/Common/StartListQueries.php
+++ b/src/Common/StartListQueries.php
@@ -5,7 +5,7 @@ function getStatEntriesByEventQuery($Type='QR') {
 			$Sql="Select count(*) Quanti, count(distinct EnCountry) Countries, EvCode, EvEventName, EvTeamEvent, EvProgr, EvFirstQualified, EvNumQualified,
 				concat(DvMajVersion, '.', DvMinVersion) as DocVersion,
 				date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate,
-				DvNotes as DocNotes
+				DvNotes as DocNotes, max(EnTimestamp) as EnTimestamp
 				from Entries
 				inner join Individuals on IndId=EnId and IndTournament=EnTournament
 				inner join Events on EvCode=IndEvent and EvTournament=EnTournament and EvTeamEvent=0
@@ -18,7 +18,7 @@ function getStatEntriesByEventQuery($Type='QR') {
 			$Sql = "SELECT EvCode as Code, EvEventName as EventName, EvFinalFirstPhase as FirstPhase, COUNT(EnId) as Quanti, count(distinct EnCountry) Countries,
 				concat(DvMajVersion, '.', DvMinVersion) as DocVersion, EvFirstQualified, EvNumQualified,
 				date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate,
-				DvNotes as DocNotes
+				DvNotes as DocNotes, max(EnTimestamp) as EnTimestamp
 				FROM Events
 				INNER JOIN Individuals ON EvCode=IndEvent AND EvTournament=IndTournament
 				INNER JOIN Entries ON EnId=IndId AND EnTournament=IndTournament 
@@ -41,7 +41,7 @@ function getStatEntriesByEventQuery($Type='QR') {
 			$Sql = "SELECT EnDivision as Divisione, EnClass as Classe, SUM(EnIndClEvent) as QuantiInd, IFNULL(numTeam,0) AS QuantiSq,
 				concat(DvMajVersion, '.', DvMinVersion) as DocVersion,
 				date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate,
-				DvNotes as DocNotes
+				DvNotes as DocNotes, max(EnTimestamp) as EnTimestamp
 				FROM Entries
 				inner join Divisions on EnDivision=DivId and DivAthlete=1 and DivTournament=" . StrSafe_DB($_SESSION['TourId']) . "
 				inner join Classes on EnClass=ClId and ClAthlete=1 and ClTournament=" . StrSafe_DB($_SESSION['TourId']) . "
@@ -86,7 +86,7 @@ function getStatEntriesByCountriesQuery($ORIS=false, $Athletes=false) {
 				CoCode as NationCode, CoName as NationName,
 				concat(DvMajVersion, '.', DvMinVersion) as DocVersion,
 				date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate,
-				DvNotes as DocNotes
+				DvNotes as DocNotes, max(EnTimestamp) as EnTimestamp
 			FROM Entries
 			INNER JOIN Countries ON EnCountry = CoId
 			LEFT JOIN DocumentVersions on EnTournament=DvTournament AND DvFile = 'EN'
@@ -114,7 +114,7 @@ function getStatEntriesByCountriesQuery($ORIS=false, $Athletes=false) {
 		$Sql .= "CoCode as NationCode, CoName as NationName,
 				concat(DvMajVersion, '.', DvMinVersion) as DocVersion,
 				date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate,
-				DvNotes as DocNotes
+				DvNotes as DocNotes, max(EnTimestamp) as EnTimestamp
 			FROM Entries
 			INNER JOIN Countries ON EnCountry = CoId
 			LEFT JOIN DocumentVersions on EnTournament=DvTournament AND DvFile = 'EN'
@@ -628,11 +628,11 @@ function getCountryList() {
 		$TmpWhere = substr($TmpWhere,0,-3);
 	}
 
-	$MyQuery = "SELECT DISTINCT
+	$MyQuery = "SELECT
 			upper(CoCode) AS NationCode, CoNameComplete AS Nation,
 			concat(DvMajVersion, '.', DvMinVersion) as DocVersion,
 			date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate,
-				DvNotes as DocNotes
+				DvNotes as DocNotes, max(EnTimestamp) as EnTimestamp
 			FROM Entries AS e
 			INNER JOIN Countries AS c ON e.EnCountry=c.CoId AND e.EnTournament=c.CoTournament
 			INNER JOIN Qualifications AS q ON e.EnId=q.QuId
@@ -644,7 +644,8 @@ function getCountryList() {
 	if($TmpWhere != "") {
 		$MyQuery .= "AND (" . $TmpWhere . ")";
 	}
-	$MyQuery.= "ORDER BY CoCode";
+	$MyQuery.= "group by CoCode
+		ORDER BY CoCode";
 
 	return $MyQuery;
 }
@@ -678,11 +679,12 @@ function getStartListCountryQuery($ORIS=false, $Athletes=false, $orderByName=fal
 				concat(upper(EnFirstName), ' ', EnName) AS Athlete, DATE_FORMAT(EnDob,'%d %b %Y') as DOB, QuSession AS Session, SUBSTRING(QuTargetNo,2) AS TargetNo,
 				upper(CoCode) AS NationCode, upper(CoName) AS Nation, if(CoNameComplete!='', CoNameComplete, CoName) AS NationComplete,
 				IFNULL(GROUP_CONCAT(EvEventName SEPARATOR ', '), if(DivAthlete and ClAthlete, CONCAT('|',DivDescription, '| |', ClDescription), ClDescription)) as EventName,
-				IFNULL(GROUP_CONCAT(RankRanking order by EvProgr SEPARATOR ', '), '') as Ranking,
+				IFNULL(GROUP_CONCAT(DISTINCT RankRanking order by EvProgr SEPARATOR ', '), '') as Ranking,
 				cNumber, PhPhoto is not null as HasPhoto, EnBadgePrinted>0 as HasAccreditation, PhToRetake, PhEnId, 
 				concat(DvMajVersion, '.', DvMinVersion) as DocVersion,
 				date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate,
-				DvNotes as DocNotes, edmail.EdEmail, edmail.EdExtra, edbib.EdExtra as Bib2, EnDob, '' as TfName
+				DvNotes as DocNotes, edmail.EdEmail, edmail.EdExtra, edbib.EdExtra as Bib2, EnDob, '' as TfName,
+				EnTimestamp
 			FROM Entries AS e
 			INNER JOIN Countries AS c ON e.EnCountry=c.CoId AND e.EnTournament=c.CoTournament
 			INNER JOIN Qualifications AS q ON e.EnId=q.QuId
@@ -757,7 +759,7 @@ function getStartListCountryQuery($ORIS=false, $Athletes=false, $orderByName=fal
             . ", GROUP_CONCAT(EvCodeParent order by EvProgr SEPARATOR '')  as EvCodeParent"
             . ", GROUP_CONCAT(RankRanking) as Ranking"
         	. ", IF(EnCountry2=0,0,1) as secTeam "
-			. ", TfName, PhPhoto is not null as HasPhoto, edmail.EdEmail, edmail.EdExtra, edbib.EdExtra as Bib2, EnDob ";
+			. ", TfName, EnTimestamp, PhPhoto is not null as HasPhoto, edmail.EdEmail, edmail.EdExtra, edbib.EdExtra as Bib2, EnDob ";
 	$MyQuery.= "FROM Entries AS e ";
 	$MyQuery.= "inner JOIN Tournament ON ToId=EnTournament ";
 	$MyQuery.= "LEFT JOIN Individuals ON IndId=EnId and IndTournament=EnTournament ";
@@ -820,7 +822,7 @@ function getStartListCountryQuery($ORIS=false, $Athletes=false, $orderByName=fal
             . ", GROUP_CONCAT(EvCodeParent order by EvProgr SEPARATOR '')  as EvCodeParent"
             . ", GROUP_CONCAT(RankRanking) as Ranking"
             . ", 2 as secTeam "
-			. ", TfName, PhPhoto is not null as HasPhoto, edmail.EdEmail, edmail.EdExtra, edbib.EdExtra as Bib2, EnDob ";
+			. ", TfName, EnTimestamp, PhPhoto is not null as HasPhoto, edmail.EdEmail, edmail.EdExtra, edbib.EdExtra as Bib2, EnDob ";
 	$MyQuery.= "FROM Entries AS e ";
 	$MyQuery.= "inner JOIN Tournament ON ToId=EnTournament ";
 	$MyQuery.= "LEFT JOIN Individuals ON IndId=EnId and IndTournament=EnTournament ";
@@ -884,7 +886,7 @@ function getStartListCountryQuery($ORIS=false, $Athletes=false, $orderByName=fal
             . ", GROUP_CONCAT(EvCodeParent order by EvProgr SEPARATOR '')  as EvCodeParent"
             . ", GROUP_CONCAT(RankRanking) as Ranking"
             . ", 3 as secTeam "
-			. ", TfName, PhPhoto is not null as HasPhoto, edmail.EdEmail, edmail.EdExtra, edbib.EdExtra as Bib2, EnDob ";
+			. ", TfName, EnTimestamp, PhPhoto is not null as HasPhoto, edmail.EdEmail, edmail.EdExtra, edbib.EdExtra as Bib2, EnDob ";
 	$MyQuery.= "FROM Entries AS e ";
 	$MyQuery.= "inner JOIN Tournament ON ToId=EnTournament ";
 	$MyQuery.= "LEFT JOIN Individuals ON IndId=EnId and IndTournament=EnTournament ";
@@ -1083,7 +1085,7 @@ function getBrokenRecordsQuery($ORIS=true) {
 	return "(".implode(') UNION (', $SQL).") order by TeamEvent, ReArBitLevel desc, OrderBy, Phase, SubPhase, RtRecDistance desc, NewRecord desc";
 }
 
-function getStartListAlphaQuery($ORIS=false) {
+function getStartListAlphaQuery($ORIS=false, $Athlete=false) {
 	$TmpWhere="";
 	if(isset($_REQUEST["ArcherName"]) && preg_match("/^[-,0-9A-Z]*$/i",str_replace(" ","",$_REQUEST["ArcherName"]))) {
 		foreach(explode(",",$_REQUEST["ArcherName"]) as $Value) {
@@ -1097,7 +1099,8 @@ function getStartListAlphaQuery($ORIS=false) {
 		$TmpWhere = substr($TmpWhere,0,-3);
 	}
 
-	$Collation = ($_SESSION['TourCollation'] ? "COLLATE utf8_{$_SESSION['TourCollation']}_ci" : '');
+//	$Collation = ($_SESSION['TourCollation'] ? "COLLATE utf8_{$_SESSION['TourCollation']}_ci" : '');
+	$Collation = '';
 
 	$MyQuery = "SELECT distinct 
 			upper(substr(EnFirstname $Collation,1,1)) as FirstLetter, 
@@ -1121,11 +1124,11 @@ function getStartListAlphaQuery($ORIS=false) {
 			EnIndFEvent AS `IF`, 
 			EnTeamFEvent as `TF`, 
 			EnTeamMixEvent as `TM`, 
-			EvCode, 
+			EvCode, EnTimestamp,
 			IFNULL(EvCode,CONCAT(TRIM(EnDivision),TRIM(EnClass))) as EventCode, 
 			DATE_FORMAT(EnDob,'%d %b %Y') as DOB, 
 			IFNULL(GROUP_CONCAT(EvEventName order by EvProgr SEPARATOR ', '), if(DivAthlete and ClAthlete, CONCAT('|',DivDescription, '| |', ClDescription), ClDescription)) as EventName , 
-			IFNULL(GROUP_CONCAT(RankRanking order by EvProgr SEPARATOR ', '), '') as Ranking , 
+			IFNULL(GROUP_CONCAT(DISTINCT RankRanking order by EvProgr SEPARATOR ', '), '') as Ranking , 
 			TfName, 
 			concat(DvMajVersion, '.', DvMinVersion) as DocVersion, 
 			date_format(DvPrintDateTime, '%e %b %Y %H:%i UTC') as DocVersionDate, 
@@ -1168,6 +1171,9 @@ function getStartListAlphaQuery($ORIS=false) {
 		WHERE EnTournament = " . StrSafe_DB($_SESSION['TourId']) ;
 	if(isset($_REQUEST["Session"]) and is_numeric($_REQUEST["Session"])) $MyQuery .= " AND QuSession = " . StrSafe_DB($_REQUEST["Session"]) ;
 	if(!empty($_REQUEST["Divisions"])) $MyQuery .= " AND concat(EnDivision, EnClass) like '{$_REQUEST["Divisions"]}'";
+	if($Athlete) {
+		$MyQuery .= " AND DivAthlete=1 and ClAthlete=1";
+	}
 	if($TmpWhere) $MyQuery .= " AND (" . $TmpWhere . ")";
 	$MyQuery.= " GROUP BY FirstLetter, SesName, Bib, Athlete, Session, TargetNo, NationCode, Nation, NationCode2, Nation2, NationCode3, Nation3,
 		DivDescription, ClDescription, EnSubTeam, ClassCode, DivCode, IsAthlete, AgeClass, SubClass, Status, `IC`, `TC`, `IF`, `TF`, `TM`,
@@ -1189,7 +1195,8 @@ function getStartListCategoryQuery($ORIS=false, $orderByTeam=0, $Events=array())
 		$TmpWhere=" EvCode in (".implode(',', StrSafe_DB($Events)).") ";
 	}
 
-	$Collation = ($_SESSION['TourCollation'] ? "COLLATE utf8_{$_SESSION['TourCollation']}_ci" : '');
+//	$Collation = ($_SESSION['TourCollation'] ? "COLLATE utf8_{$_SESSION['TourCollation']}_ci" : '');
+	$Collation = '';
 
 	$MyQuery = "SELECT distinct
 			" . ($ORIS ? ' EvCode as EventCode ' :" IFNULL(EvCode,CONCAT(TRIM(EnDivision),TRIM(EnClass))) as EventCode") . ", 
@@ -1232,7 +1239,7 @@ function getStartListCategoryQuery($ORIS=false, $orderByTeam=0, $Events=array())
 			DATE_FORMAT(EnDob,'%d %b %Y') as DOB, 
 			IFNULL(GROUP_CONCAT(EvEventName order by EvProgr SEPARATOR ', '),CONCAT('|',DivDescription, '| |', ClDescription)) as EventName , 
 			TfName, 
-			cNumber, 
+			cNumber, EnTimestamp,
 			ifnull(GROUP_CONCAT(RankRanking order by EvProgr SEPARATOR ', '), '') as Ranking
 		FROM Entries AS e
 		INNER JOIN Tournament on EnTournament=ToId
diff --git a/src/Common/Styles/Blue_screen.css b/src/Common/Styles/Blue_screen.css
index 54014095..e6e6b38b 100644
--- a/src/Common/Styles/Blue_screen.css
+++ b/src/Common/Styles/Blue_screen.css
@@ -202,8 +202,8 @@ table.Tabella td.Top { vertical-align: top;}
 table.Tabella td.Bold {  font-weight:bold;}
 table.Tabella td.FontMedium { font-size:140%;}
 table.Tabella td.LiveSpotting {vertical-align:top; text-align:center;}
-table.Tabella td.Title { background-color:var(--header-dark); text-align:center; font-weight:bold; padding-left:2px; padding-right:2px; font-weight:bold; color: var(--row-main-text)}
-table.Tabella td.Caption { background-color:var(--bg-cell-header);  text-align:center; font-weight:bold; padding-left:2px; padding-right:2px; font-weight:bold; color: var(--header-dark)}
+table.Tabella td.Title { background-color:var(--header-dark); text-align:center; font-weight:bold; padding-left:2px; padding-right:2px; color: var(--row-main-text)}
+table.Tabella td.Caption { background-color:var(--bg-cell-header);  text-align:center; font-weight:bold; padding-left:2px; padding-right:2px; color: var(--header-dark)}
 /*table.Startlist td.Small  { width=50px; padding-left:2px; padding-right:2px; padding-top:2px; padding-bottom:2px; font-size:10px; color: var(--black)}*/
 table.Tabella td.Divider {background-color: var(--header-dark); height:2px}
 table.Tabella td.Light {background-color:var(--text-white)}
@@ -225,7 +225,7 @@ tr.active td {background-color:var(--bg-yellow);}
 
 .LetteraGrande { font-size:150%; font-weight:bold; }
 .bold {font-weight:bold; }
-.small {font-size: smaller }
+.small {font-size: smaller!important; }
 
 table.Tabella2 {margin:auto; background-color:var(--row-background); border: 2px; border-color:var(--table-background); border-collapse:separate; border-spacing:1px; }
 table.Tabella2 td { padding:1px;}
@@ -287,9 +287,16 @@ a:hover {text-decoration:underline; }
 .LinkRevert {font-weight:bold; color: var(--text-white); text-decoration:none;}
 .LinkRevert:hover {text-decoration:underline;}
 
-.medium {width: 75%; margin: 0 auto}
-.half {width: 50%;}
+.medium {width: 100%; margin: 0 auto}
+.half {width: 100%;}
 
+@media screen and (min-width: 600px) {
+	.half {width:75%;}
+}
+@media screen and (min-width: 900px) {
+	.medium {width:75%;}
+	.half {width:50%;}
+}
 .htt_number
 {
 	float:left;
@@ -390,6 +397,7 @@ body.loading .modal {
 .alert-warning {background-color: #ffe0a0; border:1px solid #bfa575;}
 .alert-danger {background-color:lightpink; border:1px solid hotpink;}
 .alert-success {background-color:lightgreen; border:1px solid darkgreen;}
+.alert-info {color:white; background-color:var(--text-info); border:1px solid var(--text-info-hover);}
 
 
 .ml-1, .m-1, .mx-1 {margin-left:0.25em;}
@@ -434,6 +442,12 @@ body.loading .modal {
 .w-90 {width: 90% !important}
 .w-95 {width: 95% !important}
 .w-100 {width: 100% !important}
+.wmin-3ch {min-width:3ch;}
+.wmin-5ch {min-width:5ch;}
+.wmin-7ch {min-width:7ch;}
+.wmin-10ch {min-width:10ch;}
+.wmin-15ch {min-width:15ch;}
+.wmin-20ch {min-width:20ch;}
 
 .h-0 {height: 0; vertical-align: top;}
 
@@ -458,3 +472,27 @@ div.Center  {text-align: center; margin: auto}
 @MEDIA print {
 	.print_debug {display:none;}
 }
+
+/* Define the spin animation */
+@keyframes spin {
+	0% {
+		transform: rotate(0deg);
+	}
+	100% {
+		transform: rotate(360deg);
+	}
+}
+
+/* Basic styles for the spinner */
+#SpinningIanseo {
+	position:fixed;
+	display:flex;
+	align-items: center;
+	justify-content: center;
+	width: 100px;
+	height: 100px;
+	top:calc( 50% - 50px);
+	left:calc( 50% - 50px);
+	animation: spin 2s linear infinite;
+}
+.text-right {text-align: right;}
\ No newline at end of file
diff --git a/src/Common/Templates/head-BS.php b/src/Common/Templates/head-BS.php
index 6a974ce0..0ba20b52 100644
--- a/src/Common/Templates/head-BS.php
+++ b/src/Common/Templates/head-BS.php
@@ -25,6 +25,10 @@
 echo '</title>';
 
 if(!empty($JS_SCRIPT)) {
+    require_once(dirname(__DIR__).'/Lib/CommonLib.php');
+    $JS_SCRIPT[]= phpVars2js([
+        'wwwdir'=>$CFG->ROOT_DIR,
+    ]);
 	foreach($JS_SCRIPT as $script) echo "$script\n";
 }
 
diff --git a/src/Common/Templates/head.php b/src/Common/Templates/head.php
index 4e41c68d..3b865382 100644
--- a/src/Common/Templates/head.php
+++ b/src/Common/Templates/head.php
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <?php
-
+global $CFG;
+require_once(dirname(__DIR__).'/Lib/CommonLib.php');
 echo '<html translate="no">
     <head>
     <meta name="google" content="notranslate">
@@ -34,12 +35,16 @@
     $JS_SCRIPT=array();
 }
 
+$local_JS[]= phpVars2js([
+    'wwwdir'=>$CFG->ROOT_DIR,
+]);
 if(!empty($IncludeJquery)) {
 	$local_JS[]= '<script src="'.$CFG->ROOT_DIR.'Common/js/jquery-3.6.4.min.js"></script>';
 	$local_JS[]= '<script src="'.$CFG->ROOT_DIR.'Common/js/jquery-confirm.min.js"></script>';
 	$local_JS[]= '<link href="'.$CFG->ROOT_DIR.'Common/css/jquery-confirm.min.css" rel="stylesheet" type="text/css">';
 }
 $local_JS[]= '<script src="'.$CFG->ROOT_DIR.'Common/js/Fun_ResizeImg.inc.js"></script>';
+$local_JS[]= '<script src="'.$CFG->ROOT_DIR.'Common/js/Fun_JS.inc.js"></script>';
 
 $JS_SCRIPT = array_merge($local_JS, $JS_SCRIPT);
 
diff --git a/src/Common/TourOn.php b/src/Common/TourOn.php
index f3d1eeb6..6e3f9918 100644
--- a/src/Common/TourOn.php
+++ b/src/Common/TourOn.php
@@ -22,7 +22,22 @@
 }
 
 if($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
-    if(!in_array(getCodeFromId($_REQUEST['ToId']),$_SESSION["AUTH_COMP"])){
+    $AuthFiler = array();
+    if($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
+        $compList = array();
+        foreach ($_SESSION["AUTH_COMP"] as $comp) {
+            if(preg_match('/%/',$comp)) {
+                $AuthFiler[] = 'ToCode LIKE ' . StrSafe_DB($comp);
+            } else {
+                $compList[] = $comp;
+            }
+        }
+        if(count($compList)) {
+            $AuthFiler[] = 'FIND_IN_SET(ToCode, \'' . implode(',', $compList) . '\') != 0 ';
+        }
+    }
+    $q = safe_r_SQL("SELECT ToId FROM Tournament WHERE ToId=" .$_REQUEST['ToId'] . ' AND (' . (count($AuthFiler) ? implode(' OR ', $AuthFiler) : 'FALSE'). ')');
+    if(safe_num_rows($q)!=1){
         CD_redirect($CFG->ROOT_DIR);
         exit;
     }
diff --git a/src/Common/UpdateDb-2023.inc.php b/src/Common/UpdateDb-2023.inc.php
index c0a18897..2e2bef2e 100644
--- a/src/Common/UpdateDb-2023.inc.php
+++ b/src/Common/UpdateDb-2023.inc.php
@@ -201,41 +201,41 @@
 }
 
 if($version<'2023-11-19 10:00:00') {
-    safe_w_sql("alter table Finals add FinGolds tinyint not null after FinScore, add FinXNines tinyint not null after FinGolds");
-    safe_w_sql("alter table TeamFinals add TfGolds tinyint not null after TfScore, add TfXNines tinyint not null after TfGolds");
-    safe_w_sql("alter table Events add EvCodeParentWinnerBranch tinyint not null after EvCodeParent, add EvCheckGolds tinyint not null after EvXNineChars, add EvCheckXNines tinyint not null after EvCheckGolds");
+    safe_w_sql("alter table Finals add FinGolds tinyint not null after FinScore, add FinXNines tinyint not null after FinGolds",false,array(1146, 1060));
+    safe_w_sql("alter table TeamFinals add TfGolds tinyint not null after TfScore, add TfXNines tinyint not null after TfGolds",false,array(1146, 1060));
+    safe_w_sql("alter table Events add EvCodeParentWinnerBranch tinyint not null after EvCodeParent, add EvCheckGolds tinyint not null after EvXNineChars, add EvCheckXNines tinyint not null after EvCheckGolds",false,array(1146, 1060));
     db_save_version('2023-11-19 10:00:00');
 }
 
 if($version<'2023-11-26 10:00:00') {
-    safe_w_sql("alter table Qualifications add QuTieWeight bigint unsigned not null after QuTie, change QuTieBreak QuTieBreak varchar(50) not null, add index (QuScore, QuGold, QuXnine, QuTieWeight)");
+    safe_w_sql("alter table Qualifications add QuTieWeight bigint unsigned not null after QuTie, change QuTieBreak QuTieBreak varchar(50) not null, add index (QuScore, QuGold, QuXnine, QuTieWeight)",false,array(1146, 1060));
     db_save_version('2023-11-26 10:00:00');
 }
 
 if($version<'2023-11-27 10:00:00') {
-    safe_w_sql("alter table Qualifications add QuTieWeightDecoded varchar(80) not null after QuTieWeight");
-    safe_w_sql("alter table Individuals add IndTieWeightDecoded varchar(80) not null after IndTbDecoded");
+    safe_w_sql("alter table Qualifications add QuTieWeightDecoded varchar(80) not null after QuTieWeight",false,array(1146, 1060));
+    safe_w_sql("alter table Individuals add IndTieWeightDecoded varchar(80) not null after IndTbDecoded",false,array(1146, 1060));
     db_save_version('2023-11-27 10:00:00');
 }
 
 if($version<'2023-11-27 10:00:01') {
-    safe_w_sql("alter table Qualifications add QuTieWeightDrops text not null after QuTieWeight");
+    safe_w_sql("alter table Qualifications add QuTieWeightDrops text not null after QuTieWeight",false,array(1146, 1060));
     db_save_version('2023-11-27 10:00:01');
 }
 if($version<'2023-11-28 10:00:01') {
-    safe_w_sql("alter table Events change EvCodeParentWinnerBranch EvCodeParentWinnerBranch tinyint not null");
-    safe_w_sql("alter table RoundRobinMatches add RrMatchGolds tinyint unsigned not null, add RrMatchXNines tinyint unsigned not null");
+    safe_w_sql("alter table Events change EvCodeParentWinnerBranch EvCodeParentWinnerBranch tinyint not null",false,array(1146, 1060));
+    safe_w_sql("alter table RoundRobinMatches add RrMatchGolds tinyint unsigned not null, add RrMatchXNines tinyint unsigned not null",false,array(1146, 1060));
     db_save_version('2023-11-28 10:00:01');
 }
 
 if($version<'2023-12-18 10:00:01') {
-    safe_w_sql("ALTER TABLE TeamEligibleComponent ADD TecSubTeam TINYINT NOT NULL AFTER TecCoId;");
-    safe_w_sql("alter table RoundRobinLevel add RrLevCheckGolds tinyint not null after RrLevTieBreakSystem2, add RrLevCheckXNines tinyint not null after RrLevCheckGolds");
+    safe_w_sql("ALTER TABLE TeamEligibleComponent ADD TecSubTeam TINYINT NOT NULL AFTER TecCoId;",false,array(1146, 1060));
+    safe_w_sql("alter table RoundRobinLevel add RrLevCheckGolds tinyint not null after RrLevTieBreakSystem2, add RrLevCheckXNines tinyint not null after RrLevCheckGolds",false,array(1146, 1060));
     db_save_version('2023-12-18 10:00:01');
 }
 
 if($version<'2023-12-18 17:00:01') {
-    safe_w_sql("alter table RoundRobinMatches add RrMatchSwapped tinyint not null after RrMatchMatchNo");
+    safe_w_sql("alter table RoundRobinMatches add RrMatchSwapped tinyint not null after RrMatchMatchNo",false,array(1146, 1060));
     db_save_version('2023-12-18 17:00:01');
 }
 
@@ -247,6 +247,6 @@
 }
 
 if($version<'2023-12-31 10:00:00') {
-    safe_w_sql("alter table Individuals add IndFinTieWeightDecoded varchar(80) not null after IndTieWeightDecoded");
+    safe_w_sql("alter table Individuals add IndFinTieWeightDecoded varchar(80) not null after IndTieWeightDecoded",false,array(1146, 1060));
     db_save_version('2023-12-31 10:00:00');
 }
diff --git a/src/Common/UpdateDb-check.php b/src/Common/UpdateDb-check.php
index bdef6445..cfbbc622 100644
--- a/src/Common/UpdateDb-check.php
+++ b/src/Common/UpdateDb-check.php
@@ -8,7 +8,7 @@
     DelParameter('UUID');
 }
 
-$newversion='2024-05-13 15:25:00';
+$newversion='2024-09-22 10:00:04';
 
 // Check if the DB is up to date
 if(in_array($CFG->DOCUMENT_PATH . 'Common'.DIRECTORY_SEPARATOR.'config.inc.php', get_included_files())) {
diff --git a/src/Common/UpdateDb.inc.php b/src/Common/UpdateDb.inc.php
index 4aef86ff..fdaa7d8b 100644
--- a/src/Common/UpdateDb.inc.php
+++ b/src/Common/UpdateDb.inc.php
@@ -131,15 +131,104 @@
     db_save_version('2024-05-13 15:25:00');
 }
 
+if($version<'2024-06-08 15:25:00') {
+    safe_w_sql("alter table RoundRobinMatches add index (RrMatchTournament, RrMatchTeam, RrMatchEvent), add index (RrMatchTournament, RrMatchScheduledDate, RrMatchScheduledTime)", false, array(1146, 1060));
+    db_save_version('2024-06-08 15:25:00');
+}
+
+if($version<'2024-08-26 07:00:02') {
+    safe_w_sql("UPDATE `LookUpPaths` SET `LupPath` = 'https://dirigeant.ffta.fr/ianseo/download/parametres_ianseo.ffta' WHERE `LookUpPaths`.`LupIocCode` = 'FRA'");
+    safe_w_sql("REPLACE INTO `LookUpPaths` (`LupIocCode`, `LupOrigin`, `LupPath`, `LupPhotoPath`, `LupFlagsPath`, `LupLastUpdate`, `LupRankingPath`, `LupClubNamesPath`, `LupRecordsPath`) VALUES ('SWE', 'SWE', '', 'https://resultat.bagskytte.se/Archer/GetIanseoImage', 'https://resultat.bagskytte.se/Club/GetIanseoImage', '0000-00-00 00:00:00', '', '', '')");
+    safe_w_sql("ALTER TABLE `TournamentInvolved` ADD `TiTimeStamp` DATETIME NOT NULL AFTER `TiGender`;", false, array(1146, 1060));
+    safe_w_sql("UPDATE  `TournamentInvolved` INNER JOIN `Tournament` ON `TiTournament`=`ToId` SET  `TiTimeStamp`=`ToWhenFrom` WHERE `TiTimeStamp`='0000-00-00'");
+    db_save_version('2024-08-26 07:00:02');
+}
+
+if($version<'2024-09-20 08:00:07') {
+    safe_w_sql("DROP TABLE IF EXISTS `AclFeatures`");
+    safe_w_sql("ALTER TABLE `AclDetails` ADD `AclDtSubFeature` TINYINT NOT NULL AFTER `AclDtFeature`", false, array(1146, 1060));
+    safe_w_sql("ALTER TABLE `AclDetails` DROP PRIMARY KEY, ADD PRIMARY KEY (`AclDtTournament`, `AclDtIP`, `AclDtFeature`, `AclDtSubFeature`) USING BTREE;", false, array(1146, 1060));
+    safe_w_sql("CREATE TABLE `AclTemplates` (
+        `AclTeTournament` INT NOT NULL , 
+        `AclTePattern` VARCHAR(150) NOT NULL , 
+        `AclTeNick` VARCHAR(50) NOT NULL ,
+        `AclTeFeatures` TEXT NOT NULL ,  
+        `AclTeEnabled` TINYINT NOT NULL , 
+        PRIMARY KEY (`AclTeTournament`, `AclTePattern`)) ENGINE = InnoDB",false,array(1146, 1050, 1060));
+    safe_w_sql("CREATE TABLE `AclUsers` (
+        `AclUsUser` VARCHAR(16) NOT NULL , 
+        `AclUsName` VARCHAR(100) NOT NULL , 
+        `AclUsPwd` VARCHAR(64) NOT NULL , 
+        `AclUsEnabled` TINYINT NOT NULL , 
+        `AclUsAuthAdmin` TINYINT NOT NULL,
+        PRIMARY KEY (`AclUsUser`)) ENGINE = InnoDB",false,array(1146, 1050, 1060));
+
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=22 where `AclDtFeature`=9");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=23 where `AclDtFeature`=2");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=24 where `AclDtFeature`=7");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=25 where `AclDtFeature`=3");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=26 where `AclDtFeature`=4");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=27 where `AclDtFeature`=16");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=28 where `AclDtFeature`=5");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=29 where `AclDtFeature`=6");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=30 where `AclDtFeature`=13");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=31 where `AclDtFeature`=14");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=32 where `AclDtFeature`=11");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=33 where `AclDtFeature`=12");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=34 where `AclDtFeature`=8");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=35 where `AclDtFeature`=10");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=36 where `AclDtFeature`=15");
+    safe_w_sql("UPDATE `AclDetails` set `AclDtFeature`=`AclDtFeature`-20 where `AclDtFeature`>20");
+
+    safe_w_sql("INSERT IGNORE INTO AclTemplates (`AclTeTournament`, `AclTePattern`, `AclTeNick`, `AclTeFeatures`, `AclTeEnabled`)
+        SELECT `AclTournament`, `AclIP`, `AclNick`, GROUP_CONCAT(CONCAT_WS('|', AclDtFeature, AclDtSubFeature, AclDtLevel) ORDER BY AclDtFeature, AclDtSubFeature SEPARATOR '#') as `Features`, AclEnabled
+        FROM `ACL` 
+        INNER JOIN AclDetails on AclTournament=AclDTTournament and AclIP=AclDtIP
+        WHERE `AclIP` LIKE '%*%' 
+        GROUP BY  `AclTournament`, `AclIP`",false,array(1146, 1060));
+    safe_w_sql("DELETE FROM `ACL` WHERE `AclIP` LIKE '%*%'",false,array(1146, 1060));
+    safe_w_sql("INSERT IGNORE INTO AclTemplates (`AclTeTournament`, `AclTePattern`, `AclTeNick`, `AclTeFeatures`, `AclTeEnabled`)
+        SELECT `AclTournament`, `AclNick`, 'REGEXP', GROUP_CONCAT(CONCAT_WS('|', AclDtFeature, AclDtSubFeature, AclDtLevel) ORDER BY AclDtFeature, AclDtSubFeature SEPARATOR '#') as `Features`, AclEnabled
+        FROM `ACL` 
+        INNER JOIN AclDetails on AclTournament=AclDTTournament and AclIP=AclDtIP
+        WHERE `AclIP` LIKE '0.0.0.%'
+        GROUP BY  `AclTournament`, `AclIP`",false,array(1146, 1060));
+    safe_w_sql("DELETE FROM `ACL` WHERE `AclIP` LIKE '0.0.0.%'",false,array(1146, 1060));
+    db_save_version('2024-09-20 08:00:07');
+}
+
+if($version<'2024-09-22 10:00:04') {
+    safe_w_sql("DROP TABLE IF EXISTS `AclUserFeatures`",false,array(1051));
+    safe_w_sql("CREATE TABLE `AclUserFeatures` (
+        `AclUFUser` VARCHAR(16) NOT NULL ,
+        `AclUFPattern` VARCHAR(150) NOT NULL , 
+        `AclUFFeature` TEXT NOT NULL , 
+        PRIMARY KEY (`AclUFUser`, `AclUFPattern`)) ENGINE = InnoDB",false,array(1146, 1050, 1060));
+    $userList = getParameter("AuthUsers", false, array(), true);
+    foreach ($userList as $user) {
+        safe_w_sql("INSERT INTO AclUsers (`AclUsUser`, `AclUsName`, `AclUsPwd`, `AclUsEnabled`, `AclUsAuthAdmin`) 
+            VALUES (".StrSafe_DB($user["u"]).", ".StrSafe_DB($user["d"]).", '".hash("sha256",$user["p"])."', ".intval($user["e"]).", ".intval($user["r"]).")
+            ON DUPLICATE KEY UPDATE  `AclUsName`=".StrSafe_DB($user["d"]).", `AclUsPwd`='".hash("sha256",$user["p"])."', `AclUsEnabled`=".intval($user["e"]).", `AclUsAuthAdmin`=".intval($user["r"]),false,array(1146, 1050, 1060));
+        foreach ($user["c"] as $comp) {
+            safe_w_sql("INSERT INTO `AclUserFeatures` (`AclUFUser`, `AclUFPattern`, `AclUFFeature`) VALUES (".StrSafe_DB($user["u"]).", ".StrSafe_DB($comp).", '')
+                ON DUPLICATE KEY UPDATE `AclUFPattern`=".StrSafe_DB($comp).", `AclUFFeature`=''",false,array(1146, 1050, 1060));
+        }
+    }
+    safe_w_sql("DELETE FROM Parameters WHERE ParId=" . StrSafe_DB("AuthUsers"),false,array(1146, 1050, 1060));
+
+
+    db_save_version('2024-09-22 10:00:04');
+}
+
 /*
 
 // TEMPLATE
 IMPORTANT: InfoSystem related things MUST be changed in the lib.php file!!!
 REMEMBER TO CHANGE ALSO Common/Lib/UpdateTournament.inc.php!!!
 
-if($version<'2024-04-13 15:25:00') {
-    safe_w_sql("alter table Parameters change ParId ParId varchar(32) not null");
-	db_save_version('2024-04-13 15:25:00');
+if($version<'2024-06-08 15:25:00') {
+    safe_w_sql("alter table RoundRobinMatches add index (RrMatchTournament, RrMatchTeam, RrMatchEvent)");
+	db_save_version('2024-06-08 15:25:00');
 }
 
 */
diff --git a/src/Common/UpdateFunctions.inc.php b/src/Common/UpdateFunctions.inc.php
index 65b0d446..03901729 100644
--- a/src/Common/UpdateFunctions.inc.php
+++ b/src/Common/UpdateFunctions.inc.php
@@ -860,4 +860,45 @@ function updateSevereBug_20240114($ToId) {
         inner join `Tournament` on ToId=TfTournament and ToLocRule!='LANC'
         SET TfGolds='', TfGoldsChars=''
         WHERE  TfTournament=$ToId AND `TfGolds` LIKE '11' AND `TfXNine` = '' AND `TfGoldsChars` LIKE 'M' AND `TfXNineChars` = ''",false,array(1146, 1060));
+}
+
+function updateTournamentInvolvedTS_20240826($ToId) {
+    safe_w_sql("UPDATE `TournamentInvolved` 
+        INNER JOIN `Tournament` ON `TiTournament`=`ToId` 
+        SET `TiTimeStamp`=`ToWhenFrom` 
+        WHERE `ToId`=$ToId AND `TiTimeStamp`='0000-00-00'");
+}
+
+function updateAclTemplates_20240920($ToId) {
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=22 where `AclDtFeature`=9 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=23 where `AclDtFeature`=2 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=24 where `AclDtFeature`=7 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=25 where `AclDtFeature`=3 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=26 where `AclDtFeature`=4 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=27 where `AclDtFeature`=16 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=28 where `AclDtFeature`=5 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=29 where `AclDtFeature`=6 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=30 where `AclDtFeature`=13 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=31 where `AclDtFeature`=14 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=32 where `AclDtFeature`=11 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=33 where `AclDtFeature`=12 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=34 where `AclDtFeature`=8 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=35 where `AclDtFeature`=10 AND `AclDtTournament`=$ToId");
+    safe_w_sql("update `AclDetails` set `AclDtFeature`=36 where `AclDtFeature`=15 AND `AclDtTournament`=$ToId");
+    safe_w_sql("UPDATE `AclDetails` set `AclDtFeature`=`AclDtFeature`-20 where `AclDtFeature`>20 AND `AclDtTournament`=$ToId");
+
+    safe_w_sql("INSERT IGNORE INTO AclTemplates (`AclTeTournament`, `AclTePattern`, `AclTeNick`, `AclTeFeatures`, `AclTeEnabled`)
+        SELECT `AclTournament`, `AclIP`, `AclNick`, GROUP_CONCAT(CONCAT_WS('|', AclDtFeature, AclDtSubFeature, AclDtLevel) ORDER BY AclDtFeature, AclDtSubFeature SEPARATOR '#') as `Features`, AclEnabled
+        FROM `ACL` 
+        INNER JOIN AclDetails on AclTournament=AclDTTournament and AclIP=AclDtIP
+        WHERE `AclTournament`=$ToId AND `AclIP` LIKE '%*%'  
+        GROUP BY  `AclTournament`, `AclIP`",false,array(1146, 1060));
+    safe_w_sql("DELETE FROM `ACL` WHERE `AclTournament`=$ToId AND `AclIP` LIKE '%*%'",false,array(1146, 1060));
+    safe_w_sql("INSERT IGNORE INTO AclTemplates (`AclTeTournament`, `AclTePattern`, `AclTeNick`, `AclTeFeatures`, `AclTeEnabled`)
+        SELECT `AclTournament`, `AclNick`, 'REGEXP', GROUP_CONCAT(CONCAT_WS('|', AclDtFeature, AclDtSubFeature, AclDtLevel) ORDER BY AclDtFeature, AclDtSubFeature SEPARATOR '#') as `Features`, AclEnabled
+        FROM `ACL` 
+        INNER JOIN AclDetails on AclTournament=AclDTTournament and AclIP=AclDtIP
+        WHERE `AclTournament`=$ToId AND `AclIP` LIKE '0.0.0.%'
+        GROUP BY  `AclTournament`, `AclIP`",false,array(1146, 1060));
+    safe_w_sql("DELETE FROM `ACL` WHERE `AclTournament`=$ToId AND `AclIP` LIKE '0.0.0.%'",false,array(1146, 1060));
 }
\ No newline at end of file
diff --git a/src/Common/UpdatePreOpen.inc.php b/src/Common/UpdatePreOpen.inc.php
index c632c455..9a1d7d6c 100644
--- a/src/Common/UpdatePreOpen.inc.php
+++ b/src/Common/UpdatePreOpen.inc.php
@@ -177,6 +177,16 @@ function UpdatePreOpen($TournamentID) {
         to_save_version($TournamentID, '2024-01-14 12:55:00');
     }
 
+    if($version<'2024-08-26 07:00:02') {
+        updateTournamentInvolvedTS_20240826($TournamentID);
+        to_save_version($TournamentID, '2024-08-26 07:00:02');
+    }
+
+    if($version<'2024-09-20 08:00:07') {
+        updateAclTemplates_20240920($TournamentID);
+        to_save_version($TournamentID, '2024-09-20 08:00:07');
+    }
+
     to_save_version($TournamentID, $DbVersion);
 }
 
diff --git a/src/Common/composer.json b/src/Common/composer.json
new file mode 100644
index 00000000..055912ee
--- /dev/null
+++ b/src/Common/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "phpoffice/phpspreadsheet": "^2.2"
+    }
+}
diff --git a/src/Common/composer.lock b/src/Common/composer.lock
new file mode 100644
index 00000000..9f117130
--- /dev/null
+++ b/src/Common/composer.lock
@@ -0,0 +1,522 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "a41da3e3be9e5d05b86d8a6c746ff796",
+    "packages": [
+        {
+            "name": "maennchen/zipstream-php",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maennchen/ZipStream-PHP.git",
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-zlib": "*",
+                "php-64bit": "^8.1"
+            },
+            "require-dev": {
+                "ext-zip": "*",
+                "friendsofphp/php-cs-fixer": "^3.16",
+                "guzzlehttp/guzzle": "^7.5",
+                "mikey179/vfsstream": "^1.6",
+                "php-coveralls/php-coveralls": "^2.5",
+                "phpunit/phpunit": "^10.0",
+                "vimeo/psalm": "^5.0"
+            },
+            "suggest": {
+                "guzzlehttp/psr7": "^2.4",
+                "psr/http-message": "^2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ZipStream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paul Duncan",
+                    "email": "pabs@pablotron.org"
+                },
+                {
+                    "name": "Jonatan Männchen",
+                    "email": "jonatan@maennchen.ch"
+                },
+                {
+                    "name": "Jesse Donat",
+                    "email": "donatj@gmail.com"
+                },
+                {
+                    "name": "András Kolesár",
+                    "email": "kolesar@kolesar.hu"
+                }
+            ],
+            "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.",
+            "keywords": [
+                "stream",
+                "zip"
+            ],
+            "support": {
+                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/maennchen",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/zipstream",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-06-21T14:59:35+00:00"
+        },
+        {
+            "name": "markbaker/complex",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MarkBaker/PHPComplex.git",
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "squizlabs/php_codesniffer": "^3.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Complex\\": "classes/src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Baker",
+                    "email": "mark@lange.demon.co.uk"
+                }
+            ],
+            "description": "PHP Class for working with complex numbers",
+            "homepage": "https://github.com/MarkBaker/PHPComplex",
+            "keywords": [
+                "complex",
+                "mathematics"
+            ],
+            "support": {
+                "issues": "https://github.com/MarkBaker/PHPComplex/issues",
+                "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2"
+            },
+            "time": "2022-12-06T16:21:08+00:00"
+        },
+        {
+            "name": "markbaker/matrix",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MarkBaker/PHPMatrix.git",
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c",
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpdocumentor/phpdocumentor": "2.*",
+                "phploc/phploc": "^4.0",
+                "phpmd/phpmd": "2.*",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "sebastian/phpcpd": "^4.0",
+                "squizlabs/php_codesniffer": "^3.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Matrix\\": "classes/src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Baker",
+                    "email": "mark@demon-angel.eu"
+                }
+            ],
+            "description": "PHP Class for working with matrices",
+            "homepage": "https://github.com/MarkBaker/PHPMatrix",
+            "keywords": [
+                "mathematics",
+                "matrix",
+                "vector"
+            ],
+            "support": {
+                "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
+                "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1"
+            },
+            "time": "2022-12-02T22:17:43+00:00"
+        },
+        {
+            "name": "phpoffice/phpspreadsheet",
+            "version": "2.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
+                "reference": "a3c5c9e7ce3a2a8577bfa9e69960fbccbd2d4a9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a3c5c9e7ce3a2a8577bfa9e69960fbccbd2d4a9e",
+                "reference": "a3c5c9e7ce3a2a8577bfa9e69960fbccbd2d4a9e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-dom": "*",
+                "ext-fileinfo": "*",
+                "ext-gd": "*",
+                "ext-iconv": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-simplexml": "*",
+                "ext-xml": "*",
+                "ext-xmlreader": "*",
+                "ext-xmlwriter": "*",
+                "ext-zip": "*",
+                "ext-zlib": "*",
+                "maennchen/zipstream-php": "^2.1 || ^3.0",
+                "markbaker/complex": "^3.0",
+                "markbaker/matrix": "^3.0",
+                "php": "^8.1",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+                "dompdf/dompdf": "^2.0 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "mitoteam/jpgraph": "^10.3",
+                "mpdf/mpdf": "^8.1.1",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpstan/phpstan": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.6 || ^10.5",
+                "squizlabs/php_codesniffer": "^3.7",
+                "tecnickcom/tcpdf": "^6.5"
+            },
+            "suggest": {
+                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+                "ext-intl": "PHP Internationalization Functions",
+                "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
+                "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
+                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maarten Balliauw",
+                    "homepage": "https://blog.maartenballiauw.be"
+                },
+                {
+                    "name": "Mark Baker",
+                    "homepage": "https://markbakeruk.net"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "https://rootslabs.net"
+                },
+                {
+                    "name": "Erik Tilt"
+                },
+                {
+                    "name": "Adrien Crivelli"
+                }
+            ],
+            "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+            "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
+            "keywords": [
+                "OpenXML",
+                "excel",
+                "gnumeric",
+                "ods",
+                "php",
+                "spreadsheet",
+                "xls",
+                "xlsx"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.2.1"
+            },
+            "time": "2024-07-29T07:56:06+00:00"
+        },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client"
+            },
+            "time": "2023-09-23T14:17:50+00:00"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory"
+            },
+            "time": "2024-04-15T12:06:14+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00"
+        },
+        {
+            "name": "psr/simple-cache",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
+            },
+            "time": "2021-10-29T13:26:27+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.6.0"
+}
diff --git a/src/Common/distro.inc.php b/src/Common/distro.inc.php
index ba89baa9..c606176e 100644
--- a/src/Common/distro.inc.php
+++ b/src/Common/distro.inc.php
@@ -1,6 +1,6 @@
 <?php
 define('ProgramRelease', 'STABLE');
-define('ProgramBuild', 'rev 1241');
+define('ProgramBuild', 'rev 1');
 define('MinTimeOut', '120');
 //Add the Timezone Check if not setup by system
 if(strlen(ini_get('date.timezone')))
diff --git a/src/Common/js/Fun_JS.inc.js b/src/Common/js/Fun_JS.inc.js
index c96c9fbb..e9a40bc7 100644
--- a/src/Common/js/Fun_JS.inc.js
+++ b/src/Common/js/Fun_JS.inc.js
@@ -239,6 +239,19 @@ function doAlert(msg) {
 	});
 }
 
+function showTitle(obj) {
+	if(obj.title) {
+		$.alert({
+			content: obj.title,
+			title: '',
+			boxWidth: '33%',
+			useBootstrap: false,
+			escapeKey: true,
+			backgroundDismiss: true,
+		});
+	}
+}
+
 function editCss(data) {
 	let css= {
 		display: '',
@@ -462,3 +475,17 @@ function toggleColor(obj) {
 	$('#'+$(obj).attr('ref')+'-color').prop('disabled', !obj.checked);
 	$('#'+$(obj).attr('ref')+'-alpha').prop('disabled', !obj.checked);
 }
+
+function exportAllCompetitions() {
+	window.open(wwwdir+'Update/ExportAllCompetitions.php');
+}
+
+function toggleSpinningIanseo(show=false) {
+	if(show) {
+		if($('#SpinningIanseo').length==0) {
+			$('body').append('<div id="SpinningIanseo"><img src="'+wwwdir+'Common/Images/ianseo.svg"></div>');
+		}
+	} else {
+		$('#SpinningIanseo').remove();
+	}
+}
\ No newline at end of file
diff --git a/src/Common/pdf/IanseoPdf.php b/src/Common/pdf/IanseoPdf.php
index a6b1d1a8..dd078ede 100644
--- a/src/Common/pdf/IanseoPdf.php
+++ b/src/Common/pdf/IanseoPdf.php
@@ -221,7 +221,7 @@ function Footer() {
 	    	$this->SetXY(IanseoPdf::sideMargin,$this->h - $this->savedBottomMargin);
 		    $this->MultiCell(($this->w-20), 5, $this->getGroupPageNo() . "/" . $this->getPageGroupAlias() ,0, "C", 0);    //Page number
 		    $this->SetXY(($this->w-105),$this->h - $this->savedBottomMargin + 1);    //Position at 1.5 cm from bottom
-			$this->MultiCell(95, 5, $this->Titolo . " - " . $this->docUpdate . ($this->Version ? " (v. $this->Version)" : ''),0, "R", 0);    //Page number
+			$this->MultiCell(95, 5, $this->Titolo . " - " . $this->docUpdate .$this->TzOffset. ($this->Version ? " (v. $this->Version)" : ''),0, "R", 0);    //Page number
 		}
 	}
 
diff --git a/src/Common/pdf/OrisPDF.inc.php b/src/Common/pdf/OrisPDF.inc.php
index b7acaea2..66eb5ad5 100644
--- a/src/Common/pdf/OrisPDF.inc.php
+++ b/src/Common/pdf/OrisPDF.inc.php
@@ -43,8 +43,8 @@ function __construct($DocNumber, $DocTitle, $headers='') {
         }
 		$this->Title=$DocTitle;
 		$this->Number=$DocNumber;
-		$this->Event='';
-		$this->EvPhase='';
+		/*$this->Event='';
+		$this->EvPhase='';*/
 		if(isset($_REQUEST["ReportCreated"]) && preg_match("/^[0-9]{12}$/i", $_REQUEST["ReportCreated"])) {
             $this->utsReportCreated = mktime(substr($_REQUEST["ReportCreated"], 8, 2), substr($_REQUEST["ReportCreated"], 10, 2), 0, substr($_REQUEST["ReportCreated"], 4, 2), substr($_REQUEST["ReportCreated"], 6, 2), substr($_REQUEST["ReportCreated"], 0, 4));
         } else {
@@ -60,6 +60,12 @@ function __construct($DocNumber, $DocTitle, $headers='') {
 	}
 
 	public function setDocUpdate($newDate) {
+        if(!$newDate) {
+            return;
+        }
+        if(strlen($newDate)==10) {
+            $newDate.=' 00:00:00';
+        }
 		$this->utsReportCreated = mktime(substr($newDate,11,2),substr($newDate,14,2),0,substr($newDate,5,2),substr($newDate,8,2),substr($newDate,0,4));
 	}
 
@@ -395,7 +401,10 @@ function samePage($rowNo, $rowHeight=3.5, $y='', $addPage=true) {
 	}
 
 	function setOrisCode($newCode='', $newTitle='', $force=false) {
-		if($newCode != '' or $force) {
+        // should print the correct Oris Code BEFORE opening the new page
+        $this->endPage();
+
+        if($newCode != '' or $force) {
 			$this->Number=$newCode;
 		}
 		if($newTitle != '' or $force) {
@@ -557,10 +566,10 @@ function OrisScorecard($Data, $Bottom=0, $Phase=null, $Section=null, $Meta=null,
 	    //After: Coach?
         if(!empty($Data['coach']) OR !empty($Data['oppCoach'])) {
             $this->Cell($HeadWidthTitle, $CellHeight, $Meta['fields']['coach'] . ':');
-            $this->Cell($HeadWidthData, $CellHeight, $Data['coach']);
+            $this->Cell($HeadWidthData, $CellHeight, $Data['coach'] . ($Data['countryCode']!=$Data['coachCountry'] ? ' ('.$Data['coachCountry'].')' : '' ));
             $this->Cell($InterspaceWidth, $CellHeight, '');
             $this->Cell($HeadWidthTitle, $CellHeight, $Meta['fields']['coach'] . ':');
-            $this->Cell($HeadWidthData, $CellHeight, $Data['oppCoach']);
+            $this->Cell($HeadWidthData, $CellHeight, $Data['oppCoach'] . ($Data['oppCountryCode']!=$Data['oppCoachCountry'] ? ' ('.$Data['oppCoachCountry'].')' : '' ));
             $this->ln();
         }
 	    // empty line
diff --git a/src/Common/pdf/ResultPDF.inc.php b/src/Common/pdf/ResultPDF.inc.php
index 676e38b3..84ed5316 100644
--- a/src/Common/pdf/ResultPDF.inc.php
+++ b/src/Common/pdf/ResultPDF.inc.php
@@ -192,7 +192,7 @@ function DrawStatusLegend()
 		global $Arr_StrStatus;
 	//Legenda per la possibilit� di partecipazione (STATUS)
 		$this->SetXY(10,$this->GetY()+10);
-		if(!$this->SamePage(5+ceil(count($Arr_StrStatus)/2)*4))
+		if(!$this->SamePage(5+ceil(count($Arr_StrStatus??[])/2)*4))
 			$this->AddPage();
 	   	$this->SetFont($this->FontStd,'B',$this->FontSizeLines);
 		$this->Cell(190, 5, $this->LegendStatus, 1, 1, 'C', 1);
@@ -748,7 +748,7 @@ function writeDataRowPrnTeamAbs($item, $endQualified, $running) {
 			$this->Cell(8, 4,  $a['subclass'], 1, ($running ? 1 : 0), 'C', 0);
 			$this->SetFont($this->FontFix,'',$this->FontSizeHead);
 			if(!$running) {
-				$this->Cell(9, 4, number_format($a['quscore'], 0, '', $this->NumberThousandsSeparator), 1, 1, 'R', 0);
+				$this->Cell(9, 4, number_format(intval($a['quscore']), 0, '', $this->NumberThousandsSeparator), 1, 1, 'R', 0);
 			}
 			$this->SetX(72 - ($running ? 5 : 0));
 		}
diff --git a/src/Common/pdf/ScorePDF.inc.php b/src/Common/pdf/ScorePDF.inc.php
index 3d6dabd0..6df2e7ff 100644
--- a/src/Common/pdf/ScorePDF.inc.php
+++ b/src/Common/pdf/ScorePDF.inc.php
@@ -600,7 +600,7 @@ function DrawScoreField($TopX, $TopY, $Width, $Height, $CurDist=0, $Data=array()
 		global $CFG;
 		static $ArrowEnds=array();
 
-        if($FillWithArrows=$this->FillWithArrows) {
+        if($FillWithArrows=$this->FillWithArrows and $this->IsRedding) {
             if($CurDist>1) {
                 foreach(range(1, $CurDist-1) as $k) {
                     if(strlen(trim(str_replace(' ', '', $Data['Arr'.$k])))!=$Data['NumArrows'.$k]) {
diff --git a/src/Common/pdf/chunks/Alphabetical.inc.php b/src/Common/pdf/chunks/Alphabetical.inc.php
index 8cdab981..6833e69a 100644
--- a/src/Common/pdf/chunks/Alphabetical.inc.php
+++ b/src/Common/pdf/chunks/Alphabetical.inc.php
@@ -2,6 +2,7 @@
 $TargetFace=(isset($_REQUEST['tf']) && $_REQUEST['tf']==1);
 
 $pdf->HideCols = $PdfData->HideCols;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $StartLetter = ".";
 $ShowStatusLegend = false;
diff --git a/src/Common/pdf/chunks/Alphabetical_48.inc.php b/src/Common/pdf/chunks/Alphabetical_48.inc.php
index f623dca9..2546000d 100644
--- a/src/Common/pdf/chunks/Alphabetical_48.inc.php
+++ b/src/Common/pdf/chunks/Alphabetical_48.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $pdf->HideCols = $PdfData->HideCols;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $ShowStatusLegend = false;
 $OldHeader='';
diff --git a/src/Common/pdf/chunks/BracketIndividual.inc.php b/src/Common/pdf/chunks/BracketIndividual.inc.php
index 7206e633..941c511b 100644
--- a/src/Common/pdf/chunks/BracketIndividual.inc.php
+++ b/src/Common/pdf/chunks/BracketIndividual.inc.php
@@ -11,6 +11,7 @@
 
 $pdf->SetLineWidth(0.125);
 $pdf->setCellPaddings(0.5,0,0.5,0);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? '');
 
 //Costanti
 $PaginaUtile=$pdf->GetPageHeight()-56; // 35 top margin + 20 bottom margin
@@ -222,7 +223,7 @@
 				$pdf->SetXY($LineXstart,$OrgY);
 			}
 
-			if($ShowSchedule and $Match['scheduledTime']!='00:00' and $Match['scheduledDate']!='00-00-0000' and (trim($Match['scheduledTime']) or trim($Match['scheduledDate'])) and !($Match['score'] or $Match['setScore']) and !($Match['oppScore'] or $Match['oppSetScore']) and !$Match['tie'] and !$Match['oppTie']) {
+			if($ShowSchedule and $Match['scheduledTime']!='00:00' and $Match['scheduledDate']!='00-00-0000' and (trim($Match['scheduledTime']??'') or trim($Match['scheduledDate']??'')) and !($Match['score'] or $Match['setScore']) and !($Match['oppScore'] or $Match['oppSetScore']) and !$Match['tie'] and !$Match['oppTie']) {
 				if($FirstPhase && $section['meta']['firstPhase']<24) {
 					$pdf->SetY($OrgY-3, false);
 					$pdf->SetFont($pdf->FontStd,'I',6);
diff --git a/src/Common/pdf/chunks/BracketTeam.inc.php b/src/Common/pdf/chunks/BracketTeam.inc.php
index abde70c2..afe60a15 100644
--- a/src/Common/pdf/chunks/BracketTeam.inc.php
+++ b/src/Common/pdf/chunks/BracketTeam.inc.php
@@ -7,6 +7,7 @@
 
 $pdf->SetLineWidth(0.125);
 $pdf->setCellPaddings(0.5,0,0.5,0);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? '');
 
 //error_reporting(E_ALL);
 
diff --git a/src/Common/pdf/chunks/Category.inc.php b/src/Common/pdf/chunks/Category.inc.php
index 35ba0604..6343e298 100644
--- a/src/Common/pdf/chunks/Category.inc.php
+++ b/src/Common/pdf/chunks/Category.inc.php
@@ -3,6 +3,7 @@
 $TargetFace=(isset($_REQUEST['tf']) && $_REQUEST['tf']==1);
 
 $pdf->HideCols = $PdfData->HideCols;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $StartLetter = ".";
 $ShowStatusLegend = false;
diff --git a/src/Common/pdf/chunks/Category_48.inc.php b/src/Common/pdf/chunks/Category_48.inc.php
index dabc2757..01a4422b 100644
--- a/src/Common/pdf/chunks/Category_48.inc.php
+++ b/src/Common/pdf/chunks/Category_48.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $pdf->HideCols = $PdfData->HideCols;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $ShowStatusLegend = false;
 $OldHeader='';
diff --git a/src/Common/pdf/chunks/Country-emails.inc.php b/src/Common/pdf/chunks/Country-emails.inc.php
index b8a30618..7c282e6b 100644
--- a/src/Common/pdf/chunks/Country-emails.inc.php
+++ b/src/Common/pdf/chunks/Country-emails.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $CellH=8;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $LastCellW=$pdf->getPageWidth()-20-$NatAtlCell*2-$TgtCell*2;
 
diff --git a/src/Common/pdf/chunks/Country-standard.inc.php b/src/Common/pdf/chunks/Country-standard.inc.php
index 348ec0cd..67af81cf 100644
--- a/src/Common/pdf/chunks/Country-standard.inc.php
+++ b/src/Common/pdf/chunks/Country-standard.inc.php
@@ -1,5 +1,6 @@
 <?php
 
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 	foreach($PdfData->Data['Items'] as $Country => $Rows) {
 		if($SinglePage and !$FirstTime) {
 			$pdf->AddPage();
diff --git a/src/Common/pdf/chunks/Country.inc.php b/src/Common/pdf/chunks/Country.inc.php
index fcc37ebd..2a007e1b 100644
--- a/src/Common/pdf/chunks/Country.inc.php
+++ b/src/Common/pdf/chunks/Country.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $pdf->HideCols = $PdfData->HideCols;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $SinglePage=isset($_REQUEST['SinglePage']);
 $TargetFace=(isset($_REQUEST['tf']) && $_REQUEST['tf']==1);
diff --git a/src/Common/pdf/chunks/Country_48.inc.php b/src/Common/pdf/chunks/Country_48.inc.php
index 7ecab15b..a4a95710 100644
--- a/src/Common/pdf/chunks/Country_48.inc.php
+++ b/src/Common/pdf/chunks/Country_48.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $pdf->HideCols = $PdfData->HideCols;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $ShowStatusLegend = false;
 $OldHeader='';
diff --git a/src/Common/pdf/chunks/OrisAlphabetical.inc.php b/src/Common/pdf/chunks/OrisAlphabetical.inc.php
index 79c533a3..a4ac1541 100644
--- a/src/Common/pdf/chunks/OrisAlphabetical.inc.php
+++ b/src/Common/pdf/chunks/OrisAlphabetical.inc.php
@@ -1,5 +1,6 @@
 <?php
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 $pdf->setPhase('Entries');
 $Version='';
 if($PdfData->DocVersion) {
diff --git a/src/Common/pdf/chunks/OrisBracketIndividual.inc.php b/src/Common/pdf/chunks/OrisBracketIndividual.inc.php
index 34513add..b6cab2e4 100644
--- a/src/Common/pdf/chunks/OrisBracketIndividual.inc.php
+++ b/src/Common/pdf/chunks/OrisBracketIndividual.inc.php
@@ -136,8 +136,8 @@
 
 			$Obj1->ScheduledDate = ($ShowSchedule ? $item['scheduledDate'] : '');
 			$Obj1->ScheduledTime = ($ShowSchedule ? $item['scheduledTime'] : '');
-			$Obj1->Saved = ($item['oppPosition'] and $item['oppPosition']<=$section['meta']['numSaved']) ? $PdfData->rankData['meta']['saved'] : '';
-			$Obj1->DrawMatch=$DrawMatch;
+			$Obj1->Saved = ($PhaseNum>=32 AND $item['oppPosition'] and $item['oppPosition']<=$section['meta']['numSaved']) ? $PdfData->rankData['meta']['saved'] : '';
+            $Obj1->DrawMatch=$DrawMatch;
 			$Obj1->ToDo = ($DrawMatch or $item['saved']);
 
 			// second athlete of match
@@ -174,8 +174,8 @@
 			$Obj2->FSTarget = ($ShowTargetNo ? $item['oppTarget'] : '');
 			$Obj2->ScheduledDate = ($ShowSchedule ? $item['scheduledDate'] : '');
 			$Obj2->ScheduledTime = ($ShowSchedule ? $item['scheduledTime'] : '');
-			$Obj2->Saved = ($item['position'] and $item['position']<=$section['meta']['numSaved']) ? $PdfData->rankData['meta']['saved'] : '';
-			$Obj2->DrawMatch=$DrawMatch;
+			$Obj2->Saved = ($PhaseNum>=32 AND $item['position'] and $item['position']<=$section['meta']['numSaved']) ? $PdfData->rankData['meta']['saved'] : '';
+            $Obj2->DrawMatch=$DrawMatch;
 			$Obj2->ToDo = ($DrawMatch or $item['oppSaved']);
 
 			// what exactly has to print as "score" for side A...
diff --git a/src/Common/pdf/chunks/OrisBracketTeam.inc.php b/src/Common/pdf/chunks/OrisBracketTeam.inc.php
index a6d9a3d2..f1ad7d11 100644
--- a/src/Common/pdf/chunks/OrisBracketTeam.inc.php
+++ b/src/Common/pdf/chunks/OrisBracketTeam.inc.php
@@ -13,7 +13,7 @@
 
 $pdf->NotAwarded = $PdfData->rankData['meta']['notAwarded'];
 $pdf->FinalRank  = $PdfData->rankData['meta']['fields']['finRank'];
-
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 // Variabile per gestire il cambio di Evento
 $PhaseCounter=-1;
diff --git a/src/Common/pdf/chunks/OrisCompetitionOfficials.inc.php b/src/Common/pdf/chunks/OrisCompetitionOfficials.inc.php
index 2746d395..62845b95 100644
--- a/src/Common/pdf/chunks/OrisCompetitionOfficials.inc.php
+++ b/src/Common/pdf/chunks/OrisCompetitionOfficials.inc.php
@@ -3,6 +3,7 @@
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase('');
 $pdf->setEvent($PdfData->Description);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $Version='';
 if($PdfData->DocVersion) {
@@ -23,7 +24,7 @@
             ($first ? "~".$name->ItDescription : ''),
             mb_strtoupper($name->TiName, 'UTF-8') . ' ' . $name->TiGivenName,
             mb_strtoupper($name->CoCode, 'UTF-8'), $name->CoNameComplete,
-            "§".($name->TiGender==0 ? 'M' : 'W')
+            "§".($name->TiGender==0 ? 'M' : 'F')
         );
         $first=false;
         $pdf->printDataRow($tmp);
diff --git a/src/Common/pdf/chunks/OrisComponentLogTeam.inc.php b/src/Common/pdf/chunks/OrisComponentLogTeam.inc.php
index 0252e31d..c2ce5bff 100644
--- a/src/Common/pdf/chunks/OrisComponentLogTeam.inc.php
+++ b/src/Common/pdf/chunks/OrisComponentLogTeam.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-$pdf->setDocUpdate($PdfData->LastUpdate);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 $pdf->setPhase($PdfData->Description);
 
 $First=true;
diff --git a/src/Common/pdf/chunks/OrisCountry.inc.php b/src/Common/pdf/chunks/OrisCountry.inc.php
index d236d5d9..2ab9de1e 100644
--- a/src/Common/pdf/chunks/OrisCountry.inc.php
+++ b/src/Common/pdf/chunks/OrisCountry.inc.php
@@ -2,6 +2,7 @@
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase('Entries');
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $Version='';
 if($PdfData->DocVersion) {
diff --git a/src/Common/pdf/chunks/OrisElimStartList.inc.php b/src/Common/pdf/chunks/OrisElimStartList.inc.php
index 01e92558..497daf06 100644
--- a/src/Common/pdf/chunks/OrisElimStartList.inc.php
+++ b/src/Common/pdf/chunks/OrisElimStartList.inc.php
@@ -3,6 +3,7 @@
 require_once('Common/Lib/CommonLib.php');
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $OldEvent='#@#@#';
 $targetNo=-1;
diff --git a/src/Common/pdf/chunks/OrisListCountry.inc.php b/src/Common/pdf/chunks/OrisListCountry.inc.php
index 46568490..6b3573b2 100644
--- a/src/Common/pdf/chunks/OrisListCountry.inc.php
+++ b/src/Common/pdf/chunks/OrisListCountry.inc.php
@@ -2,6 +2,7 @@
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase('');
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $pdf->setOrisCode($PdfData->Code, $PdfData->Description);
 $pdf->AddPage();
diff --git a/src/Common/pdf/chunks/OrisMedalStand.inc.php b/src/Common/pdf/chunks/OrisMedalStand.inc.php
index 6b13ef32..7546a842 100644
--- a/src/Common/pdf/chunks/OrisMedalStand.inc.php
+++ b/src/Common/pdf/chunks/OrisMedalStand.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $pdf->setPhase($PdfData->Phase);
+$pdf->setDocUpdate($PdfData->LastUpdate);
 
 if($PdfData->Version) {
 	$pdf->setComment(trim("Vers. {$PdfData->Version} ({$PdfData->VersionDate}) {$PdfData->VersionNote}"));
@@ -9,7 +10,6 @@
 $pdf->setOrisCode($PdfData->Code,$PdfData->Description);
 $pdf->AddPage();
 $pdf->Bookmark($PdfData->IndexName, 0);
-$pdf->setDocUpdate($PdfData->LastUpdate);
 $pdf->SetXY(OrisPDF::leftMargin,$pdf->lastY);
 $pdf->SetTopMargin($pdf->lastY);
 
diff --git a/src/Common/pdf/chunks/OrisPoolIndividual.inc.php b/src/Common/pdf/chunks/OrisPoolIndividual.inc.php
index dc987df4..6cd9ad72 100644
--- a/src/Common/pdf/chunks/OrisPoolIndividual.inc.php
+++ b/src/Common/pdf/chunks/OrisPoolIndividual.inc.php
@@ -6,6 +6,7 @@
 $PdfData->HeaderPool[5]='';
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $OldEvent='#@#@#';
 $targetNo=-1;
diff --git a/src/Common/pdf/chunks/OrisPoolStartlist.inc.php b/src/Common/pdf/chunks/OrisPoolStartlist.inc.php
index 1e44f4ff..2d5af131 100644
--- a/src/Common/pdf/chunks/OrisPoolStartlist.inc.php
+++ b/src/Common/pdf/chunks/OrisPoolStartlist.inc.php
@@ -8,6 +8,7 @@
 $targetNo=-1;
 
 $OldMatchPhase=-1;
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $First=true;
 foreach($PdfData->Data['Items'] as $EvCode => $MyRows) {
diff --git a/src/Common/pdf/chunks/OrisQualIndividual.inc.php b/src/Common/pdf/chunks/OrisQualIndividual.inc.php
index e7622a0f..061a5b0d 100644
--- a/src/Common/pdf/chunks/OrisQualIndividual.inc.php
+++ b/src/Common/pdf/chunks/OrisQualIndividual.inc.php
@@ -147,12 +147,12 @@
 				$dataRow[] = '';
 			} else {
 				$tmpNote = '';
-				if($item['so']>0) { //Spareggio
+				if(($item['so']??0)>0) { //Spareggio
 					$tmpNote .=  $pdf->ShotOffShort;
 					if(strlen(trim($item['tiebreak']))) {
 						$tmpNote .= ' ' . $item['tiebreakDecoded'];
 					}
-				} else if($item['rank'] < $section['meta']['qualifiedNo']+$section['meta']['firstQualified'] AND $item['ct']>1) {
+				} else if($item['rank'] < $section['meta']['qualifiedNo']+$section['meta']['firstQualified'] AND ($item['ct']??0)>1) {
 					$tmpNote .=  $pdf->CoinTossShort;
 				}
 				if($item['notes']) {
diff --git a/src/Common/pdf/chunks/OrisQualTeam.inc.php b/src/Common/pdf/chunks/OrisQualTeam.inc.php
index 0bd95dcf..6cbe22a1 100644
--- a/src/Common/pdf/chunks/OrisQualTeam.inc.php
+++ b/src/Common/pdf/chunks/OrisQualTeam.inc.php
@@ -101,19 +101,20 @@
 					}
 					$dataRow[] = trim($tmpNote);
 
-					if($item['so']>0) {
-						$dataRow[] = "T. " . $item['gold'] . ";" . $item['xnine'];
-						$dataRow[] = $item['tiebreakDecoded'] ? $pdf->ShotOffShort . ' ' . $item['tiebreakDecoded'] : $pdf->ShotOffShort;
-
-					} elseif ($item['ct']>1) {
-						$dataRow[] = "T. " . $item['gold'] . ";" . $item['xnine'];
-						$dataRow[] = $pdf->CoinTossShort;
-					} elseif ($item['tie']) {
-						$dataRow[] = "T. " . $item['gold'] . ";" . $item['xnine'];
-						$dataRow[] = " ";
-					} else {
-						$dataRow[]=" ";
-						$dataRow[]=" ";
+					if($item['irm']<10) {
+						if ($item['so'] > 0) {
+							$dataRow[] = "T. " . $item['gold'] . ";" . $item['xnine'];
+							$dataRow[] = $item['tiebreakDecoded'] ? $pdf->ShotOffShort . ' ' . $item['tiebreakDecoded'] : $pdf->ShotOffShort;
+						} elseif ($item['ct'] > 1) {
+							$dataRow[] = "T. " . $item['gold'] . ";" . $item['xnine'];
+							$dataRow[] = $pdf->CoinTossShort;
+						} elseif ($item['tie']) {
+							$dataRow[] = "T. " . $item['gold'] . ";" . $item['xnine'];
+							$dataRow[] = " ";
+						} else {
+							$dataRow[] = " ";
+							$dataRow[] = " ";
+						}
 					}
 
 				} else {
diff --git a/src/Common/pdf/chunks/OrisRecBroken.inc.php b/src/Common/pdf/chunks/OrisRecBroken.inc.php
index f365df35..e27fcc04 100644
--- a/src/Common/pdf/chunks/OrisRecBroken.inc.php
+++ b/src/Common/pdf/chunks/OrisRecBroken.inc.php
@@ -5,6 +5,8 @@
 $pdf->setPhase('As of '.$PdfData->RecordAs);
 $pdf->setEvent($PdfData->Description);
 
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
+
 $Version='';
 if($PdfData->DocVersion) {
 	$Version=trim('Vers. '.$PdfData->DocVersion . " ($PdfData->DocVersionDate) $PdfData->DocVersionNotes");
diff --git a/src/Common/pdf/chunks/OrisRecStanding.inc.php b/src/Common/pdf/chunks/OrisRecStanding.inc.php
index 4a8e8fb4..1959d1bd 100644
--- a/src/Common/pdf/chunks/OrisRecStanding.inc.php
+++ b/src/Common/pdf/chunks/OrisRecStanding.inc.php
@@ -4,6 +4,7 @@
 $pdf->StopHeader=true;
 $pdf->setPhase('As of '.$PdfData->RecordAs);
 $pdf->setEvent($PdfData->Description);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $Version='';
 if($PdfData->DocVersion) {
diff --git a/src/Common/pdf/chunks/OrisRunCountry.inc.php b/src/Common/pdf/chunks/OrisRunCountry.inc.php
index d2d652ee..80e39908 100644
--- a/src/Common/pdf/chunks/OrisRunCountry.inc.php
+++ b/src/Common/pdf/chunks/OrisRunCountry.inc.php
@@ -2,6 +2,7 @@
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase($PdfData->Phase);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $OldEvent='';
 $OldTarget='';
diff --git a/src/Common/pdf/chunks/OrisRunSession.inc.php b/src/Common/pdf/chunks/OrisRunSession.inc.php
index 188c5fe2..7b601b51 100644
--- a/src/Common/pdf/chunks/OrisRunSession.inc.php
+++ b/src/Common/pdf/chunks/OrisRunSession.inc.php
@@ -2,6 +2,7 @@
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase($PdfData->Phase);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $OldEvent='';
 $OldTarget='';
diff --git a/src/Common/pdf/chunks/OrisScoreIndividual.inc.php b/src/Common/pdf/chunks/OrisScoreIndividual.inc.php
index 22bd4419..766d09c2 100644
--- a/src/Common/pdf/chunks/OrisScoreIndividual.inc.php
+++ b/src/Common/pdf/chunks/OrisScoreIndividual.inc.php
@@ -9,7 +9,7 @@
 	$pdf->setEvent($section['meta']['eventName']);
 	$pdf->Records=array(); // $section['records'];
 	$pdf->setPhase($PdfData->ScorePhase);
-	$pdf->setDocUpdate($PdfData->LastUpdate);
+//	$pdf->setDocUpdate($PdfData->LastUpdate);
 	$pdf->setDataHeader(array(),array());
 
 	if($section['meta']['version']) {
@@ -29,12 +29,15 @@
 
 	$CurPlace=0;
 	ksort($section['phases']);
+    $ScoreLastUpdate='';
 	foreach($section['phases'] as $PhaseNum => $Phase) {
 		foreach($Phase['items'] as $item) {
 			if(!($item['bib'] and $item['oppBib'])) {
 				continue;
 			}
 
+            $pdf->setDocUpdate(max($ScoreLastUpdate, $item['lastUpdated'] ?? ''));
+            $ScoreLastUpdate = $item['lastUpdated'];
 			if($AddPage and !$CurPlace) {
 				$pdf->AddPage('P');
 			}
diff --git a/src/Common/pdf/chunks/OrisStartList.inc.php b/src/Common/pdf/chunks/OrisStartList.inc.php
index e498a530..f7ac267b 100644
--- a/src/Common/pdf/chunks/OrisStartList.inc.php
+++ b/src/Common/pdf/chunks/OrisStartList.inc.php
@@ -2,6 +2,7 @@
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase($PdfData->Phase);
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $OldEvent='';
 $OldTarget='';
diff --git a/src/Common/pdf/chunks/OrisStartListEvent.inc.php b/src/Common/pdf/chunks/OrisStartListEvent.inc.php
index 446a3043..ca73fe6b 100644
--- a/src/Common/pdf/chunks/OrisStartListEvent.inc.php
+++ b/src/Common/pdf/chunks/OrisStartListEvent.inc.php
@@ -2,6 +2,7 @@
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase($PdfData->Phase);
+$pdf->setDocUpdate($PdfData->LastUpdate);
 
 $OldEvent='';
 $OldTarget='';
diff --git a/src/Common/pdf/chunks/OrisStatByCountry.inc.php b/src/Common/pdf/chunks/OrisStatByCountry.inc.php
index e666c59f..3ea397ba 100644
--- a/src/Common/pdf/chunks/OrisStatByCountry.inc.php
+++ b/src/Common/pdf/chunks/OrisStatByCountry.inc.php
@@ -1,6 +1,7 @@
 <?php
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase('');
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $pdf->setOrisCode($PdfData->Code, $PdfData->Description);
 $pdf->AddPage();
@@ -39,7 +40,8 @@
 		);
 }
 $pdf->lastY += 2;
-$pdf->Line(10, $pdf->lastY, array_sum($PdfData->HeaderWidth)+60, $pdf->lastY);
+
+$pdf->Line(10, $pdf->lastY, array_multisum($PdfData->HeaderWidth)+60, $pdf->lastY);
 $pdf->lastY += 2;
 $tmp=array(
 		"",
@@ -52,3 +54,11 @@
 		number_format(($Total["M"]+$Total["W"]+$Total["Of"] ),0,'','.') . "#",
 );
 $pdf->printDataRow($tmp);
+
+function array_multisum(array $arr): float {
+    $sum=0;
+    foreach($arr as $child){
+        $sum+=is_array($child) ? array_multisum($child):$child;
+    }
+    return $sum;
+}
\ No newline at end of file
diff --git a/src/Common/pdf/chunks/OrisStatByEvent.inc.php b/src/Common/pdf/chunks/OrisStatByEvent.inc.php
index 50cbeb44..5b62b8a7 100644
--- a/src/Common/pdf/chunks/OrisStatByEvent.inc.php
+++ b/src/Common/pdf/chunks/OrisStatByEvent.inc.php
@@ -2,6 +2,7 @@
 
 $pdf->SetDataHeader($PdfData->Header, $PdfData->HeaderWidth);
 $pdf->setPhase('');
+$pdf->setDocUpdate($PdfData->LastUpdate ?? $PdfData->Timestamp ?? '');
 
 $pdf->setOrisCode($PdfData->Code, $PdfData->Description);
 $pdf->AddPage();
diff --git a/src/Common/pdf/chunks/StartList.inc.php b/src/Common/pdf/chunks/StartList.inc.php
index 9917c3b0..8c20a9ed 100644
--- a/src/Common/pdf/chunks/StartList.inc.php
+++ b/src/Common/pdf/chunks/StartList.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $pdf->HideCols = $PdfData->HideCols;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $ShowStatusLegend = false;
 $CurSession=-1;
diff --git a/src/Common/pdf/chunks/StartList_48.inc.php b/src/Common/pdf/chunks/StartList_48.inc.php
index fcb2c22f..26fa09b7 100644
--- a/src/Common/pdf/chunks/StartList_48.inc.php
+++ b/src/Common/pdf/chunks/StartList_48.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 $pdf->HideCols = $PdfData->HideCols;
+$pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 $ShowStatusLegend = false;
 $OldHeader='';
diff --git a/src/Common/pdf/chunks/StatByCountry.inc.php b/src/Common/pdf/chunks/StatByCountry.inc.php
index cb9ccf2c..ad6305ce 100644
--- a/src/Common/pdf/chunks/StatByCountry.inc.php
+++ b/src/Common/pdf/chunks/StatByCountry.inc.php
@@ -2,19 +2,21 @@
 
 $FirstTime=true;
 if (isset($PdfData->Data['Items']) && count($PdfData->Data['Items'])>0) {
-	$mainHeaderList = array();
+    $pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
+
+    $mainHeaderList = array();
     $cnt = 1;
-	foreach($PdfData->Data['Fields'] as $field) {
-		if(strstr($field,'|') !== false) {
-			list($div,$cl) = explode('|',$field);
-			if(!array_key_exists($div,$mainHeaderList)) {
+    foreach($PdfData->Data['Fields'] as $field) {
+        if(strstr($field,'|') !== false) {
+            list($div,$cl) = explode('|',$field);
+            if(!array_key_exists($div,$mainHeaderList)) {
                 $mainHeaderList[$div]=array();
-				$cnt++;
-			}
+                $cnt++;
+            }
             $mainHeaderList[$div][$cl]=0;
-			$cnt++;
-		}
-	}
+            $cnt++;
+        }
+    }
     $pages=array();
     $maxColNo = ($pdf->getPageWidth()< $pdf->getPageHeight() ? 25 : 35);
     if($cnt<=$maxColNo) {
diff --git a/src/Common/pdf/chunks/StatByEvent.inc.php b/src/Common/pdf/chunks/StatByEvent.inc.php
index 13afc4df..4a5528a2 100644
--- a/src/Common/pdf/chunks/StatByEvent.inc.php
+++ b/src/Common/pdf/chunks/StatByEvent.inc.php
@@ -4,6 +4,7 @@
 // starts with Qualification Round
 if (isset($PdfData->Data['QR']) && count($PdfData->Data['QR']['Data'])>0) {
 	$DivSize=($pdf->getPageWidth()-35)/count($PdfData->Data['QR']['Div']);
+    $pdf->setDocUpdate($PdfData->Timestamp ?? $PdfData->LastUpdate ?? '');
 
 	$FirstTime=true;
 
diff --git a/src/Common/tcpdf/CHANGELOG.TXT b/src/Common/tcpdf/CHANGELOG.TXT
index e90bd161..4a845350 100644
--- a/src/Common/tcpdf/CHANGELOG.TXT
+++ b/src/Common/tcpdf/CHANGELOG.TXT
@@ -1,3 +1,63 @@
+6.7.5 (2024-04-20)
+	- Update GitHub actions
+	- fix: CSV-2024-22640 (#712)
+
+6.7.4 (2024-03-24)
+	- Upgrade tcpdf tag encryption algorithm.
+	- Fix regression issue #699.
+	- Fix security issue.
+	- [BREAKING CHANGE] The tcpdf HTML tag syntax has changed, see example_049.php.
+	- New K_ALLOWED_TCPDF_TAGS configuration constant to set the allowed methods for the tcdpf HTML tag.
+	- Raised minimum PHP version to PHP 5.5.0.
+
+6.6.5 (2023-09-02)
+	- Fix corrupted file.
+	- Fix GitHub automation tests.
+	- Fix SPDX license ID (#591)
+	- Fix warning "array offset on value of type null" (#620)
+	- Improve the README about the status of this library (#589)
+	- Fix deprecation warning with PHP 8.1 (#614)
+	- Fixes for PHP 8.2 in tcpdf_fonts.php (#632)
+	- Fix some php 8+ edge cases (#630)
+	- Fix composite glyph output (#581)
+	- Fix "access array offset on value of type bool" with PDF/A (#583)
+	- Fix non-numeric value warning (#627)
+	- Fix issues with S25 barcode (#611)
+	- Fix return type annotations (#613)
+	- Fix some inconsistencies in type hints (#598)
+
+6.6.2 (2022-12-17)
+	- Ensure pregSplit return type is always array.
+	- Add ability to run tests on various operating systems (#566)
+	- Avoid a deprecated error from PHP8.1 (#573)
+
+6.6.1 (2022-12-12)
+	- Add PHPStan and fix level 1 errors (#307)
+
+6.6.0 (2022-12-06)
+	- Multi-byte character support for filename during output (#561). (#562)
+	- Fix garbage collection (#509)
+	- FIX: PDF417 corrupt output problem, solution set bcmath scale parameter to zero (#534)
+	- Fix TypeError: count() in PHP8 (#556)
+	- Fix-getHTMLFontUnits (#547)
+	- Improved embedded image in HTML allowing src="data:..." format (#552)
+	- Fix image abscissa when in RTL (#510)
+	- fix: php 8.1 notices (#548)
+	- Optimize PNG files (#563)
+	- Update documentation for a known issue. (#569)
+	- Fix for PHP 8.1 (#571)
+
+6.5.0 (2022-08-12)
+	- encodeUrlQuery takes into account the port (#493)
+	- Fixing undefined offset error in writeHTML() when last DOM element ha…
+	- correct some type hints (#495)
+	- fix: php 8.1 notices (#481)
+	- Fixed: null check for PHP 8.1 (#476)
+	- Fix Infinite Loop in Multicell with Auto Page Breaks Off (#473)
+	- GetCssBorderStyle Has Problem When !important Is Specified (#467)
+	- Support Apache 2.4 directives in htaccess file (#530)
+	- Remove examples from dist package (#542)
+
 6.4.4 (2021-12-31)
 	- PHP 8.1 fixes
 
diff --git a/src/Common/tcpdf/LICENSE.TXT b/src/Common/tcpdf/LICENSE.TXT
index 49147d01..ec7968a7 100644
--- a/src/Common/tcpdf/LICENSE.TXT
+++ b/src/Common/tcpdf/LICENSE.TXT
@@ -7,7 +7,7 @@
   published by the Free Software Foundation, either version 3 of the
   License, or (at your option) any later version.
   
-  2002-2019 Nicola Asuni - Tecnick.com LTD
+  2002-2024 Nicola Asuni - Tecnick.com LTD
 
 **********************************************************************
 **********************************************************************
diff --git a/src/Common/tcpdf/README.md b/src/Common/tcpdf/README.md
index 0fb94009..f59f6633 100644
--- a/src/Common/tcpdf/README.md
+++ b/src/Common/tcpdf/README.md
@@ -6,15 +6,14 @@
 
 * **category**    Library
 * **author**      Nicola Asuni <info@tecnick.com>
-* **copyright**   2002-2021 Nicola Asuni - Tecnick.com LTD
+* **copyright**   2002-2024 Nicola Asuni - Tecnick.com LTD
 * **license**     http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
 * **link**        http://www.tcpdf.org
 * **source**      https://github.com/tecnickcom/TCPDF
 
 
-## IMPORTANT
-A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this version will not receive any additional development or support.
-This version should be considered obsolete, new projects should use the new version as soon it will become stable.
+## NOTE
+A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this library is in support only mode.
 
 
 
diff --git a/src/Common/tcpdf/VERSION b/src/Common/tcpdf/VERSION
index 49df80bf..c56facf8 100644
--- a/src/Common/tcpdf/VERSION
+++ b/src/Common/tcpdf/VERSION
@@ -1 +1 @@
-6.4.4
+6.7.5
diff --git a/src/Common/tcpdf/composer.json b/src/Common/tcpdf/composer.json
index c31514bb..7389d090 100644
--- a/src/Common/tcpdf/composer.json
+++ b/src/Common/tcpdf/composer.json
@@ -12,8 +12,8 @@
         "barcodes"
     ],
     "homepage": "http://www.tcpdf.org/",
-    "version": "6.4.4",
-    "license": "LGPL-3.0-only",
+    "version": "6.7.5",
+    "license": "LGPL-3.0-or-later",
     "authors": [
         {
             "name": "Nicola Asuni",
@@ -22,7 +22,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.5.0"
     },
     "autoload": {
         "classmap": [
@@ -43,5 +43,10 @@
             "include/barcodes/pdf417.php",
             "include/barcodes/qrcode.php"
         ]
+    },
+    "archive": {
+        "exclude": [
+            "/examples"
+        ]
     }
 }
diff --git a/src/Common/tcpdf/config/tcpdf_config.php b/src/Common/tcpdf/config/tcpdf_config.php
index 92317b12..9888a677 100644
--- a/src/Common/tcpdf/config/tcpdf_config.php
+++ b/src/Common/tcpdf/config/tcpdf_config.php
@@ -212,6 +212,14 @@
  */
 define('K_TCPDF_CALLS_IN_HTML', false);
 
+/**
+ * List of TCPDF methods that are allowed to be called using HTML syntax.
+ * Note: each method name must end with surrounded with | (pipe) character.
+ * The constant K_TCPDF_CALLS_IN_HTML must be set to true.
+ * IMPORTANT: For security reason, disable this feature if you are allowing user HTML content.
+ */
+define('K_ALLOWED_TCPDF_TAGS', '');
+
 /**
  * If true and PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
  */
diff --git a/src/Common/tcpdf/include/barcodes/datamatrix.php b/src/Common/tcpdf/include/barcodes/datamatrix.php
index 38bd625f..d1cc6d2a 100644
--- a/src/Common/tcpdf/include/barcodes/datamatrix.php
+++ b/src/Common/tcpdf/include/barcodes/datamatrix.php
@@ -778,7 +778,7 @@ protected function getHighLevelEncoding($data) {
 							if (isset($this->chset['SH1'][$chr])) {
 								$temp_cw[] = 0; // shift 1
 								$shiftset = $this->chset['SH1'];
-							} elseif (isset($chr, $this->chset['SH2'][$chr])) {
+							} elseif (isset($this->chset['SH2'][$chr])) {
 								$temp_cw[] = 1; // shift 2
 								$shiftset = $this->chset['SH2'];
 							} elseif (($enc == ENC_C40) AND isset($this->chset['S3C'][$chr])) {
diff --git a/src/Common/tcpdf/include/barcodes/pdf417.php b/src/Common/tcpdf/include/barcodes/pdf417.php
index 742802e1..bda24822 100644
--- a/src/Common/tcpdf/include/barcodes/pdf417.php
+++ b/src/Common/tcpdf/include/barcodes/pdf417.php
@@ -943,8 +943,8 @@ protected function getCompaction($mode, $code, $addmode=true) {
 						// tmp array for the 6 bytes block
 						$cw6 = array();
 						do {
-							$d = bcmod($t, '900');
-							$t = bcdiv($t, '900');
+							$d = bcmod($t, '900', 0);
+							$t = bcdiv($t, '900', 0);
 							// prepend the value to the beginning of the array
 							array_unshift($cw6, $d);
 						} while ($t != '0');
@@ -969,8 +969,8 @@ protected function getCompaction($mode, $code, $addmode=true) {
 					}
 					$t = '1'.$code;
 					do {
-						$d = bcmod($t, '900');
-						$t = bcdiv($t, '900');
+						$d = bcmod($t, '900', 0);
+						$t = bcdiv($t, '900', 0);
 						array_unshift($cw, $d);
 					} while ($t != '0');
 					$code = $rest;
diff --git a/src/Common/tcpdf/include/barcodes/qrcode.php b/src/Common/tcpdf/include/barcodes/qrcode.php
index 751fc6d6..1a64a4cb 100644
--- a/src/Common/tcpdf/include/barcodes/qrcode.php
+++ b/src/Common/tcpdf/include/barcodes/qrcode.php
@@ -884,14 +884,15 @@ protected function init($spec) {
 	protected function getCode() {
 		if ($this->count < $this->dataLength) {
 			$row = $this->count % $this->blocks;
-			$col = intdiv($this->count, $this->blocks);
+			$col = (int)($this->count / $this->blocks);
 			if ($col >= $this->rsblocks[0]['dataLength']) {
 				$row += $this->b1;
 			}
+			$row = (int) $row;
 			$ret = $this->rsblocks[$row]['data'][$col];
 		} elseif ($this->count < $this->dataLength + $this->eccLength) {
 			$row = ($this->count - $this->dataLength) % $this->blocks;
-			$col = intdiv(($this->count - $this->dataLength),$this->blocks);
+			$col = (int)(($this->count - $this->dataLength) / $this->blocks);
 			$ret = $this->rsblocks[$row]['ecc'][$col];
 		} else {
 			return 0;
@@ -1062,7 +1063,7 @@ protected function generateMaskNo($maskNo, $width, $frame) {
 	 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
 		$b = 0;
 		$bitMask = array();
-		$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+		$bitMask = $this->generateMaskNo($maskNo, $width, $s);
 		if ($maskGenOnly) {
 			return;
 		}
@@ -1460,7 +1461,7 @@ protected function toUpper() {
 		$stringLen = strlen($this->dataStr);
 		$p = 0;
 		while ($p < $stringLen) {
-			$mode = $this->identifyMode(substr($this->dataStr, $p), $this->hint);
+			$mode = $this->identifyMode(substr($this->dataStr, $p));
 			if ($mode == QR_MODE_KJ) {
 				$p += 2;
 			} else {
@@ -1692,7 +1693,7 @@ protected function insertStructuredAppendHeader($items, $size, $index, $parity)
 			return -1;
 		}
 		$buf = array($size, $index, $parity);
-		$entry = $this->newInputItem(QR_MODE_ST, 3, buf);
+		$entry = $this->newInputItem(QR_MODE_ST, 3, $buf);
 		array_unshift($items, $entry);
 		return $items;
 	}
diff --git a/src/Common/tcpdf/include/tcpdf_colors.php b/src/Common/tcpdf/include/tcpdf_colors.php
index 7f337f31..5a51594c 100644
--- a/src/Common/tcpdf/include/tcpdf_colors.php
+++ b/src/Common/tcpdf/include/tcpdf_colors.php
@@ -275,7 +275,7 @@ public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol=array('R'
 		$color = strtolower($color);
 		// check for javascript color array syntax
 		if (strpos($color, '[') !== false) {
-			if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\]]/', $color, $m) > 0) {
+			if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\]]/', $color, $m) > 0) {
 				$returncolor = array();
 				switch ($m[1]) {
 					case 'cmyk': {
diff --git a/src/Common/tcpdf/include/tcpdf_fonts.php b/src/Common/tcpdf/include/tcpdf_fonts.php
index c692ef87..a71c84b7 100644
--- a/src/Common/tcpdf/include/tcpdf_fonts.php
+++ b/src/Common/tcpdf/include/tcpdf_fonts.php
@@ -1151,7 +1151,7 @@ public static function _getTrueTypeFontSubset($font, $subsetchars) {
 								$subsetglyphs[$g] = true;
 							}
 						}
-					}	
+					}
 					break;
 				}
 				case 6: { // Format 6: Trimmed table mapping
@@ -1323,43 +1323,43 @@ public static function _getTrueTypeFontSubset($font, $subsetchars) {
 					// set the checkSumAdjustment to 0
 					$table[$tag]['data'] = substr($table[$tag]['data'], 0, 8)."\x0\x0\x0\x0".substr($table[$tag]['data'], 12);
 				}
-				$pad = 4 - ($table[$tag]['length'] % 4);
-				if ($pad != 4) {
-					// the length of a table must be a multiple of four bytes
-					$table[$tag]['length'] += $pad;
-					$table[$tag]['data'] .= str_repeat("\x0", $pad);
-				}
 				$table[$tag]['offset'] = $offset;
 				$offset += $table[$tag]['length'];
+				$numPad = ($offset + 3 & ~3) - $offset;
+				if($numPad > 0) {
+					$table[$tag]['data'] .= str_repeat("\x0", $numPad);
+					$offset += $numPad;
+				}
 				// check sum is not changed (so keep the following line commented)
-				//$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length']);
+				//$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length'] + $numPad);
 			} else {
 				unset($table[$tag]);
 			}
 		}
 		// add loca
+		$table['loca'] = array();
 		$table['loca']['data'] = $loca;
 		$table['loca']['length'] = strlen($loca);
-		$pad = 4 - ($table['loca']['length'] % 4);
-		if ($pad != 4) {
-			// the length of a table must be a multiple of four bytes
-			$table['loca']['length'] += $pad;
-			$table['loca']['data'] .= str_repeat("\x0", $pad);
-		}
 		$table['loca']['offset'] = $offset;
-		$table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length']);
 		$offset += $table['loca']['length'];
+		$numPad = ($offset + 3 & ~3) - $offset;
+		if($numPad > 0) {
+			$table['loca']['data'] .= str_repeat("\x0", $numPad);
+			$offset += $numPad;
+		}
+		$table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length'] + $numPad);
 		// add glyf
+		$table['glyf'] = array();
 		$table['glyf']['data'] = $glyf;
 		$table['glyf']['length'] = strlen($glyf);
-		$pad = 4 - ($table['glyf']['length'] % 4);
-		if ($pad != 4) {
-			// the length of a table must be a multiple of four bytes
-			$table['glyf']['length'] += $pad;
-			$table['glyf']['data'] .= str_repeat("\x0", $pad);
-		}
 		$table['glyf']['offset'] = $offset;
-		$table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length']);
+		$offset += $table['glyf']['length'];
+		$numPad = ($offset + 3 & ~3) - $offset;
+		if($numPad > 0) {
+			$table['glyf']['data'] .= str_repeat("\x0", $numPad);
+			$offset += $numPad;
+		}
+		$table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length'] + $numPad);
 		// rebuild font
 		$font = '';
 		$font .= pack('N', 0x10000); // sfnt version
@@ -1383,7 +1383,7 @@ public static function _getTrueTypeFontSubset($font, $subsetchars) {
 		}
 		// set checkSumAdjustment on head table
 		$checkSumAdjustment = 0xB1B0AFBA - self::_getTTFtableChecksum($font, strlen($font));
-		$font = substr($font, 0, $table['head']['offset'] + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + 12);
+		$font = substr($font, 0, $table['head']['offset'] + $offset + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + $offset + 12);
 		return $font;
 	}
 
@@ -1780,9 +1780,9 @@ public static function arrUTF8ToUTF16BE($unicode, $setbom=false) {
 	 */
 	public static function UTF8ArrayToUniArray($ta, $isunicode=true) {
 		if ($isunicode) {
-			return array_map(array('TCPDF_FONTS', 'unichrUnicode'), $ta);
+			return array_map(get_called_class().'::unichrUnicode', $ta);
 		}
-		return array_map(array('TCPDF_FONTS', 'unichrASCII'), $ta);
+		return array_map(get_called_class().'::unichrASCII', $ta);
 	}
 
 	/**
@@ -1998,10 +1998,11 @@ public static function getUniord($uch) {
 	 * @public static
 	 */
 	public static function UTF8StringToArray($str, $isunicode, &$currentfont) {
+		$str = is_null($str) ? '' : $str;
 		if ($isunicode) {
 			// requires PCRE unicode support turned on
 			$chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
-			$carr = array_map(array('TCPDF_FONTS', 'uniord'), $chars);
+			$carr = array_map(get_called_class().'::uniord', $chars);
 		} else {
 			$chars = str_split($str);
 			$carr = array_map('ord', $chars);
diff --git a/src/Common/tcpdf/include/tcpdf_static.php b/src/Common/tcpdf/include/tcpdf_static.php
index a118d058..04f74461 100644
--- a/src/Common/tcpdf/include/tcpdf_static.php
+++ b/src/Common/tcpdf/include/tcpdf_static.php
@@ -3,11 +3,11 @@
 // File name   : tcpdf_static.php
 // Version     : 1.1.4
 // Begin       : 2002-08-03
-// Last Update : 2019-11-01
+// Last Update : 2023-09-06
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2021 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2023 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.4.4';
+	private static $tcpdf_version = '6.7.5';
 
 	/**
 	 * String alias for total number of pages.
@@ -128,39 +128,6 @@ public static function getTCPDFProducer() {
 		return "\x54\x43\x50\x44\x46\x20".self::getTCPDFVersion()."\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
 	}
 
-	/**
-	 * Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)
-	 * @param boolean $mqr FALSE for off, TRUE for on.
-	 * @since 4.6.025 (2009-08-17)
-	 * @public static
-	 */
-	public static function set_mqr($mqr) {
-		if (!defined('PHP_VERSION_ID')) {
-			$version = PHP_VERSION;
-			define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
-		}
-		if (PHP_VERSION_ID < 50300) {
-			@set_magic_quotes_runtime($mqr);
-		}
-	}
-
-	/**
-	 * Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)
-	 * @return int Returns 0 if magic quotes runtime is off or get_magic_quotes_runtime doesn't exist, 1 otherwise.
-	 * @since 4.6.025 (2009-08-17)
-	 * @public static
-	 */
-	public static function get_mqr() {
-		if (!defined('PHP_VERSION_ID')) {
-			$version = PHP_VERSION;
-			define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
-		}
-		if (PHP_VERSION_ID < 50300) {
-			return @get_magic_quotes_runtime();
-		}
-		return 0;
-	}
-
 	/**
 	 * Check if the URL exist.
 	 * @param string $url URL to check.
@@ -319,7 +286,7 @@ public static function _escape($s) {
 	 */
 	public static function _escapeXML($str) {
 		$replaceTable = array("\0" => '', '&' => '&amp;', '<' => '&lt;', '>' => '&gt;');
-		$str = strtr($str, $replaceTable);
+		$str = strtr($str === null ? '' : $str, $replaceTable);
 		return $str;
 	}
 
@@ -852,9 +819,7 @@ public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
 		if (isset($prop['charLimit'])) {
 			$opt['maxlen'] = intval($prop['charLimit']);
 		}
-		if (!isset($ff)) {
-			$ff = 0; // default value
-		}
+		$ff = 0;
 		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
 		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
 			$ff += 1 << 0;
@@ -1811,7 +1776,11 @@ public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $f
 		$flags = $flags === null ? 0 : $flags;
 		// the bug only happens on PHP 5.2 when using the u modifier
 		if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
-			return preg_split($pattern.$modifiers, $subject, $limit, $flags);
+			$ret = preg_split($pattern.$modifiers, $subject, $limit, $flags);
+			if ($ret === false) {
+				return array();
+			}
+			return is_array($ret) ? $ret : array();
 		}
 		// preg_split is bugged - try alternative solution
 		$ret = array();
@@ -1887,7 +1856,8 @@ public static function encodeUrlQuery($url) {
 		if (isset($urlData['query']) && $urlData['query']) {
 			$urlQueryData = array();
 			parse_str(urldecode($urlData['query']), $urlQueryData);
-			$updatedUrl = $urlData['scheme'] . '://' . $urlData['host'] . $urlData['path'] . '?' . http_build_query($urlQueryData);
+			$port = isset($urlData['port']) ? ':'.$urlData['port'] : '';
+			$updatedUrl = $urlData['scheme'].'://'.$urlData['host'].$port.$urlData['path'].'?'.http_build_query($urlQueryData);
 		} else {
 			$updatedUrl = $url;
 		}
@@ -2154,7 +2124,7 @@ public static function _freadint($f) {
 	 * Array of page formats
 	 * measures are calculated in this way: (inches * 72) or (millimeters * 72 / 25.4)
 	 * @public static
-	 * 
+	 *
      * @var array<string,float[]>
 	 */
 	public static $page_formats = array(
diff --git a/src/Common/tcpdf/tcpdf.php b/src/Common/tcpdf/tcpdf.php
index 40043473..60f93c41 100644
--- a/src/Common/tcpdf/tcpdf.php
+++ b/src/Common/tcpdf/tcpdf.php
@@ -1,13 +1,13 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.4.4
+// Version     : 6.7.5
 // Begin       : 2002-08-03
-// Last Update : 2021-12-31
+// Last Update : 2024-03-18
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2021 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2024 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -104,7 +104,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 6.3.2
+ * @version 6.6.5
  */
 
 // TCPDF configuration
@@ -128,7 +128,7 @@
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.3.2
+ * @version 6.7.5
  * @author Nicola Asuni - info@tecnick.com
  * @IgnoreAnnotation("protected")
  * @IgnoreAnnotation("public")
@@ -574,12 +574,14 @@ class TCPDF {
 	/**
 	 * Minimum distance between header and top page margin.
 	 * @protected
+	 * @var float
 	 */
 	protected $header_margin;
 
 	/**
 	 * Minimum distance between footer and bottom page margin.
 	 * @protected
+	 * @var float
 	 */
 	protected $footer_margin;
 
@@ -836,6 +838,13 @@ class TCPDF {
 	 */
 	protected $file_id;
 
+	/**
+	 * Internal secret used to encrypt data.
+	 * @protected
+	 * @since 6.7.5 (2024-03-21)
+	 */
+	protected $hash_key;
+
 	// --- bookmark ---
 
 	/**
@@ -1878,10 +1887,10 @@ public function __construct($orientation='P', $unit='mm', $format='A4', $unicode
 		// set file ID for trailer
 		$serformat = (is_array($format) ? json_encode($format) : $format);
 		$this->file_id = md5(TCPDF_STATIC::getRandomSeed('TCPDF'.$orientation.$unit.$serformat.$encoding));
+		$this->hash_key = hash_hmac('sha256', TCPDF_STATIC::getRandomSeed($this->file_id), TCPDF_STATIC::getRandomSeed('TCPDF'), false);
 		$this->font_obj_ids = array();
 		$this->page_obj_id = array();
 		$this->form_obj_id = array();
-
 		// set pdf/a mode
 		if ($pdfa != false) {
 			$this->pdfa_mode = true;
@@ -2024,9 +2033,6 @@ public function __construct($orientation='P', $unit='mm', $format='A4', $unicode
 		$this->header_xobj_autoreset = false;
 		$this->custom_xmp = '';
 		$this->custom_xmp_rdf = '';
-		// Call cleanup method after script execution finishes or exit() is called.
-		// NOTE: This will not be executed if the process is killed with a SIGTERM or SIGKILL signal.
-		register_shutdown_function(array($this, '_destroy'), true);
 	}
 
 	/**
@@ -2464,7 +2470,7 @@ public function setLastH($h) {
 	 */
 	public function getCellHeight($fontsize, $padding=TRUE) {
 		$height = ($fontsize * $this->cell_height_ratio);
-		if ($padding) {
+		if ($padding && !empty($this->cell_padding)) {
 			$height += ($this->cell_padding['T'] + $this->cell_padding['B']);
 		}
 		return round($height, 6);
@@ -2530,7 +2536,7 @@ public function getPageDimensions($pagenum=null) {
 	/**
 	 * Returns the page width in units.
 	 * @param int|null $pagenum page number (empty = current page)
-	 * @return int page width.
+	 * @return int|float page width.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
@@ -2546,7 +2552,7 @@ public function getPageWidth($pagenum=null) {
 	/**
 	 * Returns the page height in units.
 	 * @param int|null $pagenum page number (empty = current page)
-	 * @return int page height.
+	 * @return int|float page height.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
@@ -2562,7 +2568,7 @@ public function getPageHeight($pagenum=null) {
 	/**
 	 * Returns the page break margin.
 	 * @param int|null $pagenum page number (empty = current page)
-	 * @return int page break margin.
+	 * @return int|float page break margin.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
@@ -2588,9 +2594,9 @@ public function getScaleFactor() {
 
 	/**
 	 * Defines the left, top and right margins.
-	 * @param float $left Left margin.
-	 * @param float $top Top margin.
-	 * @param float $right Right margin. Default value is the left one.
+	 * @param int|float $left Left margin.
+	 * @param int|float $top Top margin.
+	 * @param int|float|null $right Right margin. Default value is the left one.
 	 * @param boolean $keepmargins if true overwrites the default page margins
 	 * @public
 	 * @since 1.0
@@ -2613,7 +2619,7 @@ public function setMargins($left, $top, $right=null, $keepmargins=false) {
 
 	/**
 	 * Defines the left margin. The method can be called before creating the first page. If the current abscissa gets out of page, it is brought back to the margin.
-	 * @param float $margin The margin.
+	 * @param int|float $margin The margin.
 	 * @public
 	 * @since 1.4
 	 * @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
@@ -2628,7 +2634,7 @@ public function setLeftMargin($margin) {
 
 	/**
 	 * Defines the top margin. The method can be called before creating the first page.
-	 * @param float $margin The margin.
+	 * @param int|float $margin The margin.
 	 * @public
 	 * @since 1.5
 	 * @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
@@ -2643,7 +2649,7 @@ public function setTopMargin($margin) {
 
 	/**
 	 * Defines the right margin. The method can be called before creating the first page.
-	 * @param float $margin The margin.
+	 * @param int|float $margin The margin.
 	 * @public
 	 * @since 1.5
 	 * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
@@ -2657,7 +2663,7 @@ public function setRightMargin($margin) {
 
 	/**
 	 * Set the same internal Cell padding for top, right, bottom, left-
-	 * @param float $pad internal padding.
+	 * @param int|float $pad internal padding.
 	 * @public
 	 * @since 2.1.000 (2008-01-09)
 	 * @see getCellPaddings(), setCellPaddings()
@@ -2673,10 +2679,10 @@ public function setCellPadding($pad) {
 
 	/**
 	 * Set the internal Cell paddings.
-	 * @param float|null $left left padding
-	 * @param float|null $top top padding
-	 * @param float|null $right right padding
-	 * @param float|null $bottom bottom padding
+	 * @param int|float|null $left left padding
+	 * @param int|float|null $top top padding
+	 * @param int|float|null $right right padding
+	 * @param int|float|null $bottom bottom padding
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 * @see getCellPaddings(), SetCellPadding()
@@ -2709,10 +2715,10 @@ public function getCellPaddings() {
 
 	/**
 	 * Set the internal Cell margins.
-	 * @param float|null $left left margin
-	 * @param float|null $top top margin
-	 * @param float|null $right right margin
-	 * @param float|null $bottom bottom margin
+	 * @param int|float|null $left left margin
+	 * @param int|float|null $top top margin
+	 * @param int|float|null $right right margin
+	 * @param int|float|null $bottom bottom margin
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 * @see getCellMargins()
@@ -2745,7 +2751,7 @@ public function getCellMargins() {
 
 	/**
 	 * Adjust the internal Cell padding array to take account of the line width.
-	 * @param string|array|int $brd Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param string|array|int|bool $brd Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
 	 * @return void|array array of adjustments
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
@@ -3375,7 +3381,7 @@ public function getHeaderData() {
 	/**
 	 * Set header margin.
 	 * (minimum distance between header and top page margin)
-	 * @param int $hm distance in user units
+	 * @param float $hm distance in user units
 	 * @public
 	 */
 	public function setHeaderMargin($hm=10) {
@@ -3395,7 +3401,7 @@ public function getHeaderMargin() {
 	/**
 	 * Set footer margin.
 	 * (minimum distance between footer and bottom page margin)
-	 * @param int $fm distance in user units
+	 * @param float $fm distance in user units
 	 * @public
 	 */
 	public function setFooterMargin($fm=10) {
@@ -4105,6 +4111,7 @@ public function setTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false,
 	 * @param float $fontsize Font size in points. The default value is the current size.
 	 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
 	 * @return float[]|float total string length or array of characted widths
+	 * @phpstan-return ($getarray is true ? float[] : float) total string length or array of characted widths
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.2
@@ -4121,6 +4128,7 @@ public function GetStringWidth($s, $fontname='', $fontstyle='', $fontsize=0, $ge
 	 * @param float $fontsize Font size in points. The default value is the current size.
 	 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
 	 * @return float[]|float total string length or array of characted widths
+	 * @phpstan-return ($getarray is true ? float[] : float) total string length or array of characted widths
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 2.4.000 (2008-03-06)
@@ -4283,7 +4291,7 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 			// all fonts must be embedded
 			$family = 'pdfa'.$family;
 		}
-		$tempstyle = strtoupper($style);
+		$tempstyle = strtoupper($style === null ? '' : $style);
 		$style = '';
 		// underline
 		if (strpos($tempstyle, 'U') !== false) {
@@ -4350,6 +4358,22 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 		}
 		// include font file
 		if (!TCPDF_STATIC::empty_string($fontfile) AND (@TCPDF_STATIC::file_exists($fontfile))) {
+			$type=null;
+			$name=null;
+			$desc=null;
+			$up=-null;
+			$ut=null;
+			$cw=null;
+			$cbbox=null;
+			$dw=null;
+			$enc=null;
+			$cidinfo=null;
+			$file=null;
+			$ctg=null;
+			$diff=null;
+			$originalsize=null;
+			$size1=null;
+			$size2=null;
 			include($fontfile);
 		} else {
 			$this->Error('Could not include font definition file: '.$family.'');
@@ -4410,7 +4434,7 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 			$this->Error('Unknow font type: '.$type.'');
 		}
 		// set name if unset
-		if (!isset($name) OR empty($name)) {
+		if (empty($name)) {
 			$name = $fontkey;
 		}
 		// create artificial font style variations if missing (only works with non-embedded fonts)
@@ -4453,7 +4477,7 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 			// we are inside an XObject template
 			$this->xobjects[$this->xobjid]['fonts'][$fontkey] = $this->numfonts;
 		}
-		if (isset($diff) AND (!empty($diff))) {
+		if (!empty($diff)) {
 			//Search existing encodings
 			$d = 0;
 			$nb = count($this->diffs);
@@ -5151,6 +5175,7 @@ public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false
 	 */
 	protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
 		// replace 'NO-BREAK SPACE' (U+00A0) character with a simple space
+		$txt = is_null($txt) ? '' : $txt;
 		$txt = str_replace(TCPDF_FONTS::unichr(160, $this->isunicode), ' ', $txt);
 		$prev_cell_margin = $this->cell_margin;
 		$prev_cell_padding = $this->cell_padding;
@@ -5526,12 +5551,12 @@ protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $
 			$xdk = $xdx * $k;
 			// print text
 			$s .= sprintf('BT %F %F Td [(%s)] TJ ET', $xdk, (($this->h - $basefonty) * $k), $txt2);
-			if (isset($uniblock)) {
+			if (isset($uniblock)) { // @phpstan-ignore-line
 				// print overlapping characters as separate string
 				$xshift = 0; // horizontal shift
 				$ty = (($this->h - $basefonty + (0.2 * $this->FontSize)) * $k);
 				$spw = (($w - $txwidth - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1));
-				foreach ($uniblock as $uk => $uniarr) {
+				foreach ($uniblock as $uk => $uniarr) { // @phpstan-ignore-line
 					if (($uk % 2) == 0) {
 						// x space to skip
 						if ($spacewidth != 0) {
@@ -6395,7 +6420,7 @@ public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $st
 		// calculate maximum width for a single character on string
 		$chrw = $this->GetArrStringWidth($chars, '', '', 0, true);
 		array_walk($chrw, array($this, 'getRawCharWidth'));
-		$maxchwidth = max($chrw);
+		$maxchwidth = ((is_array($chrw) || $chrw instanceof Countable) && count($chrw) > 0) ? max($chrw) : 0;
 		// get array of chars
 		$uchars = TCPDF_FONTS::UTF8ArrayToUniArray($chars, $this->isunicode);
 		// get the number of characters
@@ -6495,14 +6520,16 @@ public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $st
 				$shy = false;
 				// account for margin changes
 				if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND ($this->inPageBody())) {
-					$this->AcceptPageBreak();
-					if ($this->rtl) {
-						$this->x -= $margin['R'];
-					} else {
-						$this->x += $margin['L'];
+					if ($this->AcceptPageBreak())
+					{
+						if ($this->rtl) {
+							$this->x -= $margin['R'];
+						} else {
+							$this->x += $margin['L'];
+						}
+						$this->lMargin += $margin['L'];
+						$this->rMargin += $margin['R'];
 					}
-					$this->lMargin += $margin['L'];
-					$this->rMargin += $margin['R'];
 				}
 				$w = $this->getRemainingWidth();
 				$wmax = ($w - $this->cell_padding['L'] - $this->cell_padding['R']);
@@ -6700,14 +6727,16 @@ public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $st
 					}
 					// account for margin changes
 					if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND ($this->inPageBody())) {
-						$this->AcceptPageBreak();
-						if ($this->rtl) {
-							$this->x -= $margin['R'];
-						} else {
-							$this->x += $margin['L'];
+						if ($this->AcceptPageBreak())
+						{
+							if ($this->rtl) {
+								$this->x -= $margin['R'];
+							} else {
+								$this->x += $margin['L'];
+							}
+							$this->lMargin += $margin['L'];
+							$this->rMargin += $margin['R'];
 						}
-						$this->lMargin += $margin['L'];
-						$this->rMargin += $margin['R'];
 					}
 					$w = $this->getRemainingWidth();
 					$wmax = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
@@ -6854,6 +6883,8 @@ protected function fitBlock($w, $h, $x, $y, $fitonpage=false) {
 		}
 		// resize the block to be contained on the remaining available page or column space
 		if ($fitonpage) {
+			// fallback to avoid division by zero
+			$h = $h == 0 ? 1 : $h;
 			$ratio_wh = ($w / $h);
 			if (($y + $h) > $this->PageBreakTrigger) {
 				$h = $this->PageBreakTrigger - $y;
@@ -7099,8 +7130,6 @@ public function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $
 			} elseif ($type == 'jpg') {
 				$type = 'jpeg';
 			}
-			$mqr = TCPDF_STATIC::get_mqr();
-			TCPDF_STATIC::set_mqr(false);
 			// Specific image handlers (defined on TCPDF_IMAGES CLASS)
 			$mtd = '_parse'.$type;
 			// GD image handler function
@@ -7202,7 +7231,6 @@ public function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $
 				// unable to process image
 				return false;
 			}
-			TCPDF_STATIC::set_mqr($mqr);
 			if ($ismask) {
 				// force grayscale
 				$info['cs'] = 'DeviceGray';
@@ -7230,7 +7258,7 @@ public function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $
 		} elseif ($palign == 'R') {
 			$ximg = $this->w - $this->rMargin - $w;
 		} else {
-			$ximg = $x;
+			$ximg = $this->rtl ? $x - $w : $x;
 		}
 
 		if ($ismask OR $hidden) {
@@ -7614,7 +7642,7 @@ public function setAbsXY($x, $y) {
 	 * Send the document to a given destination: string, local file or browser.
 	 * In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
 	 * The method first calls Close() if necessary to terminate the document.
-	 * @param string $name The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
+	 * @param string $name The name of the file when saved
 	 * @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string (name is ignored).</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li><li>E: return the document as base64 mime multi-part email attachment (RFC 2045)</li></ul>
 	 * @return string
 	 * @public
@@ -7632,10 +7660,7 @@ public function Output($name='doc.pdf', $dest='I') {
 			$dest = $dest ? 'D' : 'F';
 		}
 		$dest = strtoupper($dest);
-		if ($dest[0] != 'F') {
-			$name = preg_replace('/[\s]+/', '_', $name);
-			$name = preg_replace('/[^a-zA-Z0-9_\.-]/', '', $name);
-		}
+
 		if ($this->sign) {
 			// *** apply digital signature to the document ***
 			// get the document content
@@ -7706,7 +7731,8 @@ public function Output($name='doc.pdf', $dest='I') {
 					header('Pragma: public');
 					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
 					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					header('Content-Disposition: inline; filename="'.basename($name).'"');
+					header('Content-Disposition: inline; filename="' . rawurlencode(basename($name)) . '"; ' .
+						'filename*=UTF-8\'\'' . rawurlencode(basename($name)));
 					TCPDF_STATIC::sendOutputData($this->getBuffer(), $this->bufferlen);
 				} else {
 					echo $this->getBuffer();
@@ -7737,7 +7763,8 @@ public function Output($name='doc.pdf', $dest='I') {
 					header('Content-Type: application/pdf');
 				}
 				// use the Content-Disposition header to supply a recommended filename
-				header('Content-Disposition: attachment; filename="'.basename($name).'"');
+				header('Content-Disposition: attachment; filename="' . rawurlencode(basename($name)) . '"; ' .
+					'filename*=UTF-8\'\'' . rawurlencode(basename($name)));
 				header('Content-Transfer-Encoding: binary');
 				TCPDF_STATIC::sendOutputData($this->getBuffer(), $this->bufferlen);
 				break;
@@ -8429,7 +8456,7 @@ protected function _putannotsobjs() {
 								$annots .= ' /Name /Note';
 							}
 							$hasStateModel = isset($pl['opt']['statemodel']);
-							$hasState = isset($pl['opt']['state']); 
+							$hasState = isset($pl['opt']['state']);
 							$statemodels = array('Marked', 'Review');
 							if (!$hasStateModel && !$hasState) {
 								break;
@@ -8867,8 +8894,6 @@ protected function _putfonts() {
 			$this->_newobj();
 			$this->_out('<< /Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.'] >>'."\n".'endobj');
 		}
-		$mqr = TCPDF_STATIC::get_mqr();
-		TCPDF_STATIC::set_mqr(false);
 		foreach ($this->FontFiles as $file => $info) {
 			// search and get font file to embedd
 			$fontfile = TCPDF_FONTS::getFontFullPath($file, $info['fontdir']);
@@ -8922,7 +8947,6 @@ protected function _putfonts() {
 				$this->_out($out);
 			}
 		}
-		TCPDF_STATIC::set_mqr($mqr);
 		foreach ($this->fontkeys as $k) {
 			//Font objects
 			$font = $this->getFontBuffer($k);
@@ -9191,6 +9215,7 @@ protected function _putimages() {
 		foreach ($this->imagekeys as $file) {
 			$info = $this->getImageBuffer($file);
 			// set object for alternate images array
+			$altoid = null;
 			if ((!$this->pdfa_mode) AND isset($info['altimgs']) AND !empty($info['altimgs'])) {
 				$altoid = $this->_newobj();
 				$out = '[';
@@ -9238,7 +9263,7 @@ protected function _putimages() {
 				$out .= ' /Decode [1 0 1 0 1 0 1 0]';
 			}
 			$out .= ' /BitsPerComponent '.$info['bpc'];
-			if (isset($altoid) AND ($altoid > 0)) {
+			if ($altoid > 0) {
 				// reference to alternate images dictionary
 				$out .= ' /Alternates '.$altoid.' 0 R';
 			}
@@ -9913,7 +9938,7 @@ protected function _putcatalog() {
 				}
 				$out .= ' >> >>';
 			}
-			$font = $this->getFontBuffer('helvetica');
+			$font = $this->getFontBuffer((($this->pdfa_mode) ? 'pdfa' : '') .'helvetica');
 			$out .= ' /DA (/F'.$font['i'].' 0 Tf 0 g)';
 			$out .= ' /Q '.(($this->rtl)?'2':'0');
 			//$out .= ' /XFA ';
@@ -11698,7 +11723,7 @@ public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style='', $line_s
 		if ($this->state != 2) {
 			return;
 		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -11728,7 +11753,7 @@ public function Polycurve($x0, $y0, $segments, $style='', $line_style=array(), $
 		if ($this->state != 2) {
 			return;
 		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -11771,7 +11796,7 @@ public function Ellipse($x0, $y0, $rx, $ry=0, $angle=0, $astart=0, $afinish=360,
 		if (TCPDF_STATIC::empty_string($ry) OR ($ry == 0)) {
 			$ry = $rx;
 		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -11990,7 +12015,7 @@ public function Polygon($p, $style='', $line_style=array(), $fill_color=array(),
 			}
 			$nc += 4;
 		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -12193,7 +12218,7 @@ public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner='1111', $s
 			return;
 		}
 		// Rounded
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -15072,9 +15097,7 @@ public function ImageEps($file, $x=null, $y=null, $w=0, $h=0, $link='', $useBoun
 		// translate
 		$this->_out(sprintf('%F %F %F %F %F %F cm', 1, 0, 0, 1, $dx, $dy + ($this->hPt - (2 * $y * $k) - ($y2 - $y1))));
 		// scale
-		if (isset($scale_x)) {
-			$this->_out(sprintf('%F %F %F %F %F %F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
-		}
+		$this->_out(sprintf('%F %F %F %F %F %F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
 		// handle pc/unix/mac line endings
 		$lines = preg_split('/[\r\n]+/si', $data, -1, PREG_SPLIT_NO_EMPTY);
 		$u=0;
@@ -16017,14 +16040,14 @@ protected function getCSSBorderDashStyle($style) {
 	 */
 	protected function getCSSBorderStyle($cssborder) {
 		$bprop = preg_split('/[\s]+/', trim($cssborder));
+		$count = count($bprop);
+		if ($count > 0 && $bprop[$count - 1] === '!important') {
+			unset($bprop[$count - 1]);
+			--$count;
+		}
+
 		$border = array(); // value to be returned
-		switch (count($bprop)) {
-			case 3: {
-				$width = $bprop[0];
-				$style = $bprop[1];
-				$color = $bprop[2];
-				break;
-			}
+		switch ($count) {
 			case 2: {
 				$width = 'medium';
 				$style = $bprop[0];
@@ -16037,12 +16060,18 @@ protected function getCSSBorderStyle($cssborder) {
 				$color = 'black';
 				break;
 			}
-			default: {
+			case 0: {
 				$width = 'medium';
 				$style = 'solid';
 				$color = 'black';
 				break;
 			}
+			default: {
+				$width = $bprop[0];
+				$style = $bprop[1];
+				$color = $bprop[2];
+				break;
+			}
 		}
 		if ($style == 'none') {
 			return array();
@@ -16352,6 +16381,7 @@ public function getHTMLFontUnits($val, $refsize=12, $parent_size=12, $defaultuni
 				break;
 			}
 			default: {
+				$parentSize = $this->getHTMLUnitToUnits($parent_size, $refsize, $defaultunit, true);
 				$size = $this->getHTMLUnitToUnits($val, $parent_size, $defaultunit, true);
 			}
 		}
@@ -16366,6 +16396,53 @@ public function getHTMLFontUnits($val, $refsize=12, $parent_size=12, $defaultuni
 	 * @since 3.2.000 (2008-06-20)
 	 */
 	protected function getHtmlDomArray($html) {
+		// set inheritable properties fot the first void element
+		// possible inheritable properties are: azimuth, border-collapse, border-spacing, caption-side, color, cursor, direction, empty-cells, font, font-family, font-stretch, font-size, font-size-adjust, font-style, font-variant, font-weight, letter-spacing, line-height, list-style, list-style-image, list-style-position, list-style-type, orphans, page, page-break-inside, quotes, speak, speak-header, text-align, text-indent, text-transform, volume, white-space, widows, word-spacing
+		$dom = array(
+			array(
+				'tag' => false,
+				'block' => false,
+				'value' => '',
+				'parent' => 0,
+				'hide' => false,
+				'fontname' => $this->FontFamily,
+				'fontstyle' => $this->FontStyle,
+				'fontsize' => $this->FontSizePt,
+				'font-stretch' => $this->font_stretching,
+				'letter-spacing' => $this->font_spacing,
+				'stroke' => $this->textstrokewidth,
+				'fill' => (($this->textrendermode % 2) == 0),
+				'clip' => ($this->textrendermode > 3),
+				'line-height' => $this->cell_height_ratio,
+				'bgcolor' => false,
+				'fgcolor' => $this->fgcolor, // color
+				'strokecolor' => $this->strokecolor,
+				'align' => '',
+				'listtype' => '',
+				'text-indent' => 0,
+				'text-transform' => '',
+				'border' => array(),
+				'dir' => $this->rtl?'rtl':'ltr',
+				'width' => 0,
+				'height' => 0,
+				'x' => 0,
+				'y' => 0,
+				'w' => 0,
+				'h' => 0,
+				'l' => 0,
+				't' => 0,
+				'r' => 0,
+				'b' => 0,
+				'padding' => array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0),
+				'margin' => array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0),
+				'border-spacing' => array('H' => 0, 'V' => 0),
+				'border-collapse' => 'separate',
+			)
+		);
+
+		if(empty($html)) {
+			return $dom;
+		}
 		// array of CSS styles ( selector => properties).
 		$css = array();
 		// get CSS array defined at previous call
@@ -16510,37 +16587,8 @@ protected function getHtmlDomArray($html) {
 		// count elements
 		$maxel = count($a);
 		$elkey = 0;
-		$key = 0;
-		// create an array of elements
-		$dom = array();
-		$dom[$key] = array();
-		// set inheritable properties fot the first void element
-		// possible inheritable properties are: azimuth, border-collapse, border-spacing, caption-side, color, cursor, direction, empty-cells, font, font-family, font-stretch, font-size, font-size-adjust, font-style, font-variant, font-weight, letter-spacing, line-height, list-style, list-style-image, list-style-position, list-style-type, orphans, page, page-break-inside, quotes, speak, speak-header, text-align, text-indent, text-transform, volume, white-space, widows, word-spacing
-		$dom[$key]['tag'] = false;
-		$dom[$key]['block'] = false;
-		$dom[$key]['value'] = '';
-		$dom[$key]['parent'] = 0;
-		$dom[$key]['hide'] = false;
-		$dom[$key]['fontname'] = $this->FontFamily;
-		$dom[$key]['fontstyle'] = $this->FontStyle;
-		$dom[$key]['fontsize'] = $this->FontSizePt;
-		$dom[$key]['font-stretch'] = $this->font_stretching;
-		$dom[$key]['letter-spacing'] = $this->font_spacing;
-		$dom[$key]['stroke'] = $this->textstrokewidth;
-		$dom[$key]['fill'] = (($this->textrendermode % 2) == 0);
-		$dom[$key]['clip'] = ($this->textrendermode > 3);
-		$dom[$key]['line-height'] = $this->cell_height_ratio;
-		$dom[$key]['bgcolor'] = false;
-		$dom[$key]['fgcolor'] = $this->fgcolor; // color
-		$dom[$key]['strokecolor'] = $this->strokecolor;
-		$dom[$key]['align'] = '';
-		$dom[$key]['listtype'] = '';
-		$dom[$key]['text-indent'] = 0;
-		$dom[$key]['text-transform'] = '';
-		$dom[$key]['border'] = array();
-		$dom[$key]['dir'] = $this->rtl?'rtl':'ltr';
 		$thead = false; // true when we are inside the THEAD tag
-		++$key;
+		$key = 1;
 		$level = array();
 		array_push($level, 0); // root
 		while ($elkey < $maxel) {
@@ -17177,41 +17225,59 @@ protected function getSpaceString() {
 	}
 
 	/**
-	 * Return an hash code used to ensure that the serialized data has been generated by this TCPDF instance.
-	 * @param string $data serialized data
-	 * @return string
-	 * @public static
+	 * Calculates the hash value of the given data.
+	 *
+	 * @param string $data The data to be hashed.
+	 * @return string The hashed value of the data.
 	 */
-	protected function getHashForTCPDFtagParams($data) {
-		return md5(strlen($data).$this->file_id.$data);
+	protected function hashTCPDFtag($data) {
+		return hash_hmac('sha256', $data, $this->hash_key, false);
 	}
 
 	/**
-	 * Serialize an array of parameters to be used with TCPDF tag in HTML code.
-	 * @param array $data parameters array
-	 * @return string containing serialized data
+	 * Serialize data to be used with TCPDF tag in HTML code.
+	 * @param string $method TCPDF method name
+	 * @param array $params Method parameters
+	 * @return string Serialized data
 	 * @public static
 	 */
-	public function serializeTCPDFtagParameters($data) {
+	public function serializeTCPDFtag($method, $params=array()) {
+		$data = array('m' => $method, 'p' => $params);
 		$encoded = urlencode(json_encode($data));
-		return $this->getHashForTCPDFtagParams($encoded).$encoded;
+		$hash = $this->hashTCPDFtag($encoded);
+		return strlen($hash).'+'.$hash.'+'.$encoded;
 	}
 
 	/**
-	 * Unserialize parameters to be used with TCPDF tag in HTML code.
+	 * Unserialize data to be used with TCPDF tag in HTML code.
 	 * @param string $data serialized data
 	 * @return array containing unserialized data
 	 * @protected static
 	 */
-	protected function unserializeTCPDFtagParameters($data) {
-		$hash = substr($data, 0, 32);
-		$encoded = substr($data, 32);
-		if ($hash != $this->getHashForTCPDFtagParams($encoded)) {
+	protected function unserializeTCPDFtag($data) {
+		$hpos = strpos($data, '+');
+		$hlen = intval(substr($data, 0, $hpos));
+		$hash = substr($data, $hpos + 1, $hlen);
+		$encoded = substr($data, $hpos + 2 + $hlen);
+		if ($hash != $this->hashTCPDFtag($encoded)) {
 			$this->Error('Invalid parameters');
 		}
 		return json_decode(urldecode($encoded), true);
 	}
 
+	/**
+	 * Check if a TCPDF tag is allowed
+	 * @param string $method TCPDF method name
+	 * @return boolean
+	 * @protected
+	 */
+	protected function allowedTCPDFtag($method) {
+		if (defined('K_ALLOWED_TCPDF_TAGS')) {
+			return (strpos(K_ALLOWED_TCPDF_TAGS, '|'.$method.'|') !== false);
+		}
+		return false;
+	}
+
 	/**
 	 * Prints a cell (rectangular area) with optional borders, background color and html text string.
 	 * The upper-left corner of the cell corresponds to the current position. After the call, the current position moves to the right or to the next line.<br />
@@ -17225,8 +17291,7 @@ protected function unserializeTCPDFtagParameters($data) {
 	 * @param float|null $y upper-left corner Y coordinate
 	 * @param string $html html text to print. Default value: empty string.
 	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
-Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
+	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
 	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
 	 * @param boolean $reseth if true reset the last cell height (default true).
 	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
@@ -17359,6 +17424,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 					++$key;
 				}
 			}
+			if ($key == $maxel) break;
 			if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) {
 				// check for pagebreak
 				if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) {
@@ -17732,7 +17798,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 							$pend = '';
 						}
 					}
-					if ((isset($plalign) AND ((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
+					if ((((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
 						// calculate shifting amount
 						$tw = $w;
 						if (($plalign == 'J') AND $this->isRTLTextDir() AND ($this->num_columns > 1)) {
@@ -18338,7 +18404,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 							$dom[$trid]['cellpos'][($cellid - 1)]['bgcolor'] = $dom[$parentid]['bgcolor'];
 						}
 						// store border info
-						if (isset($tdborder) AND !empty($tdborder)) {
+						if (!empty($tdborder)) {
 							$dom[$trid]['cellpos'][($cellid - 1)]['border'] = $tdborder;
 						}
 						$prevLastH = $this->lasth;
@@ -18574,7 +18640,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 						$strrest = $this->Write($this->lasth, $dom[$key]['value'], '', $wfill, '', false, 0, true, $firstblock, 0, $wadj);
 						// restore default direction
 						if ($reverse_dir AND ($wadj == 0)) {
-							$this->x = $xws;
+							$this->x = $xws; // @phpstan-ignore-line
 							$this->rtl = !$this->rtl;
 							$reverse_dir = false;
 						}
@@ -18683,7 +18749,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 					$pend = '';
 				}
 			}
-			if ((isset($plalign) AND ((($plalign == 'C') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
+			if ((((($plalign == 'C') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
 				// calculate shifting amount
 				$tw = $w;
 				if ($this->lMargin != $prevlMargin) {
@@ -18990,6 +19056,9 @@ protected function openHTMLTagHandler($dom, $key, $cell) {
 					// data stream
 					$imgsrc = '@'.base64_decode(substr($imgsrc, 1));
 					$type = '';
+				} else if (preg_match('@^data:image/([^;]*);base64,(.*)@', $imgsrc, $reg)) {
+					$imgsrc = '@'.base64_decode($reg[2]);
+					$type = $reg[1];
 				} elseif ( $this->allowLocalFiles && substr($imgsrc, 0, 7) === 'file://') {
                     // get image type from a local file path
                     $imgsrc = substr($imgsrc, 7);
@@ -19483,17 +19552,14 @@ protected function openHTMLTagHandler($dom, $key, $cell) {
 			case 'tcpdf': {
 				if (defined('K_TCPDF_CALLS_IN_HTML') AND (K_TCPDF_CALLS_IN_HTML === true)) {
 					// Special tag used to call TCPDF methods
-					if (isset($tag['attribute']['method'])) {
-						$tcpdf_method = $tag['attribute']['method'];
-						if (method_exists($this, $tcpdf_method)) {
-							if (isset($tag['attribute']['params']) AND (!empty($tag['attribute']['params']))) {
-								$params = $this->unserializeTCPDFtagParameters($tag['attribute']['params']);
-								call_user_func_array(array($this, $tcpdf_method), $params);
-							} else {
-								$this->$tcpdf_method();
-							}
-							$this->newline = true;
+					// This tag is disabled by default by the K_TCPDF_CALLS_IN_HTML constant on TCPDF configuration file.
+					// Please use this feature only if you are in control of the HTML content and you are sure that it does not contain any harmful code.
+					if (!empty($tag['attribute']['data'])) {
+						$tcpdf_tag_data = $this->unserializeTCPDFtag($tag['attribute']['data']);
+						if ($this->allowedTCPDFtag($tcpdf_tag_data['m'])) {
+							call_user_func_array(array($this, $tcpdf_tag_data['m']), $tcpdf_tag_data['p']);
 						}
+						$this->newline = true;
 					}
 				}
 				break;
@@ -19703,7 +19769,7 @@ protected function closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney=0) {
 					$table_el = $dom[($dom[$key]['parent'])];
 				}
 				// for each row
-				if (count($table_el['trids']) > 0) {
+				if (!empty($table_el['trids'])) {
 					unset($xmax);
 				}
 				foreach ($table_el['trids'] as $j => $trkey) {
@@ -21840,25 +21906,23 @@ public function commitTransaction() {
 	 * @since 4.5.029 (2009-03-19)
 	 */
 	public function rollbackTransaction($self=false) {
-		if (isset($this->objcopy)) {
-			$objcopy = $this->objcopy;
-			$this->_destroy(true, true);
-			if ($self) {
-				$objvars = get_object_vars($objcopy);
-				foreach ($objvars as $key => $value) {
-					$this->$key = $value;
-				}
-				$objcopy->_destroy(true, true);
-				/* The unique file_id should not be used during cleanup again */
-				$objcopy->file_id = NULL;
-				unset($objcopy);
-				return $this;
+		if (!isset($this->objcopy)) {
+			return $this;
+		}
+		$file_id = $this->file_id;
+		$objcopy = $this->objcopy;
+		$this->_destroy(true, true);
+		if ($self) {
+			$objvars = get_object_vars($objcopy);
+			foreach ($objvars as $key => $value) {
+				$this->$key = $value;
 			}
-			/* The unique file_id should not be used during cleanup again */
-			$this->file_id = NULL;
-			return $objcopy;
+			$objcopy->_destroy(true, true);
+			unset($objcopy);
+			return $this;
 		}
-		return $this;
+		$this->file_id = $file_id;
+		return $objcopy;
 	}
 
 	// --- MULTI COLUMNS METHODS -----------------------
@@ -22034,7 +22098,7 @@ public function getNumberOfColumns() {
 	public function setTextRenderingMode($stroke=0, $fill=true, $clip=false) {
 		// Ref.: PDF 32000-1:2008 - 9.3.6 Text Rendering Mode
 		// convert text rendering parameters
-		if ($stroke < 0) {
+		if ($stroke < 0 || !is_numeric($stroke)) {
 			$stroke = 0;
 		}
 		if ($fill === true) {
@@ -23883,9 +23947,7 @@ protected function SVGPath($d, $style='') {
 			}
 			$firstcmd = false;
 		} // end foreach
-		if (!empty($op)) {
-			$this->_out($op);
-		}
+		$this->_out($op);
 		return array($xmin, $ymin, ($xmax - $xmin), ($ymax - $ymin));
 	}
 
diff --git a/src/Common/tcpdf/tcpdf_autoconfig.php b/src/Common/tcpdf/tcpdf_autoconfig.php
index 6ec9ce83..2bcfccb8 100644
--- a/src/Common/tcpdf/tcpdf_autoconfig.php
+++ b/src/Common/tcpdf/tcpdf_autoconfig.php
@@ -228,6 +228,10 @@
 	define('K_TCPDF_CALLS_IN_HTML', false);
 }
 
+if (!defined('K_ALLOWED_TCPDF_TAGS')) {
+	define('K_ALLOWED_TCPDF_TAGS', '');
+}
+
 if (!defined('K_TCPDF_THROW_EXCEPTION_ERROR')) {
 	define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
 }
diff --git a/src/Common/tcpdf/tcpdf_barcodes_1d.php b/src/Common/tcpdf/tcpdf_barcodes_1d.php
index 10a79a72..45d35616 100644
--- a/src/Common/tcpdf/tcpdf_barcodes_1d.php
+++ b/src/Common/tcpdf/tcpdf_barcodes_1d.php
@@ -828,7 +828,7 @@ protected function barcode_s25($code, $checksum=false) {
 		$chr['5'] = '11101011101010';
 		$chr['6'] = '10111011101010';
 		$chr['7'] = '10101011101110';
-		$chr['8'] = '10101110111010';
+		$chr['8'] = '11101010111010';
 		$chr['9'] = '10111010111010';
 		if ($checksum) {
 			// add checksum
@@ -838,7 +838,7 @@ protected function barcode_s25($code, $checksum=false) {
 			// add leading zero if code-length is odd
 			$code = '0'.$code;
 		}
-		$seq = '11011010';
+		$seq = '1110111010';
 		$clen = strlen($code);
 		for ($i = 0; $i < $clen; ++$i) {
 			$digit = $code[$i];
@@ -848,7 +848,7 @@ protected function barcode_s25($code, $checksum=false) {
 			}
 			$seq .= $chr[$digit];
 		}
-		$seq .= '1101011';
+		$seq .= '111010111';
 		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
 		return $this->binseq_to_array($seq, $bararray);
 	}
diff --git a/src/Common/tcpdf/tcpdf_import.php b/src/Common/tcpdf/tcpdf_import.php
index cc6fda78..57f9f4f4 100644
--- a/src/Common/tcpdf/tcpdf_import.php
+++ b/src/Common/tcpdf/tcpdf_import.php
@@ -61,7 +61,7 @@ class TCPDF_IMPORT extends TCPDF {
 	/**
 	 * Import an existing PDF document
 	 * @param string $filename Filename of the PDF document to import.
-	 * @return true in case of success, false otherwise
+	 * @return void
 	 * @public
 	 * @since 1.0.000 (2011-05-24)
 	 */
diff --git a/src/Common/vendor/autoload.php b/src/Common/vendor/autoload.php
new file mode 100644
index 00000000..6b05c2eb
--- /dev/null
+++ b/src/Common/vendor/autoload.php
@@ -0,0 +1,25 @@
+<?php
+
+// autoload.php @generated by Composer
+
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit62e10e6c8df9afc192311b196c75bb33::getLoader();
diff --git a/src/Common/vendor/composer/ClassLoader.php b/src/Common/vendor/composer/ClassLoader.php
new file mode 100644
index 00000000..7824d8f7
--- /dev/null
+++ b/src/Common/vendor/composer/ClassLoader.php
@@ -0,0 +1,579 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
+    private $vendorDir;
+
+    // PSR-4
+    /**
+     * @var array<string, array<string, int>>
+     */
+    private $prefixLengthsPsr4 = array();
+    /**
+     * @var array<string, list<string>>
+     */
+    private $prefixDirsPsr4 = array();
+    /**
+     * @var list<string>
+     */
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    /**
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
+     */
+    private $prefixesPsr0 = array();
+    /**
+     * @var list<string>
+     */
+    private $fallbackDirsPsr0 = array();
+
+    /** @var bool */
+    private $useIncludePath = false;
+
+    /**
+     * @var array<string, string>
+     */
+    private $classMap = array();
+
+    /** @var bool */
+    private $classMapAuthoritative = false;
+
+    /**
+     * @var array<string, bool>
+     */
+    private $missingClasses = array();
+
+    /** @var string|null */
+    private $apcuPrefix;
+
+    /**
+     * @var array<string, self>
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param string|null $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
+    }
+
+    /**
+     * @return array<string, list<string>>
+     */
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+        }
+
+        return array();
+    }
+
+    /**
+     * @return array<string, list<string>>
+     */
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    /**
+     * @return list<string>
+     */
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    /**
+     * @return list<string>
+     */
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    /**
+     * @return array<string, string> Array of classname => path
+     */
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array<string, string> $classMap Class to filename map
+     *
+     * @return void
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
+     * @return void
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        $paths = (array) $paths;
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        $paths = (array) $paths;
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
+     *
+     * @return void
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     *
+     * @return void
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     *
+     * @return void
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     *
+     * @return void
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     *
+     * @return void
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return true|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            $includeFile = self::$includeFile;
+            $includeFile($file);
+
+            return true;
+        }
+
+        return null;
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    /**
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     *
+     * @return array<string, self>
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
+}
diff --git a/src/Common/vendor/composer/InstalledVersions.php b/src/Common/vendor/composer/InstalledVersions.php
new file mode 100644
index 00000000..51e734a7
--- /dev/null
+++ b/src/Common/vendor/composer/InstalledVersions.php
@@ -0,0 +1,359 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer;
+
+use Composer\Autoload\ClassLoader;
+use Composer\Semver\VersionParser;
+
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
+ */
+class InstalledVersions
+{
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static $installedByVendor = array();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages[] = array_keys($installed['versions']);
+        }
+
+        if (1 === \count($packages)) {
+            return $packages[0];
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param  string        $packageName
+     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints((string) $constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed['versions'][$packageName]['pretty_version'])) {
+                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            }
+            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            }
+            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            }
+            if (array_key_exists('provided', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['pretty_version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['reference'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['reference'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array[]
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array[] $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static function getInstalled()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor[$vendorDir])) {
+                    $installed[] = self::$installedByVendor[$vendorDir];
+                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
+
+        return $installed;
+    }
+}
diff --git a/src/Common/vendor/composer/LICENSE b/src/Common/vendor/composer/LICENSE
new file mode 100644
index 00000000..62ecfd8d
--- /dev/null
+++ b/src/Common/vendor/composer/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Common/vendor/composer/autoload_classmap.php b/src/Common/vendor/composer/autoload_classmap.php
new file mode 100644
index 00000000..0fb0a2c1
--- /dev/null
+++ b/src/Common/vendor/composer/autoload_classmap.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+);
diff --git a/src/Common/vendor/composer/autoload_namespaces.php b/src/Common/vendor/composer/autoload_namespaces.php
new file mode 100644
index 00000000..15a2ff3a
--- /dev/null
+++ b/src/Common/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/src/Common/vendor/composer/autoload_psr4.php b/src/Common/vendor/composer/autoload_psr4.php
new file mode 100644
index 00000000..ba38f466
--- /dev/null
+++ b/src/Common/vendor/composer/autoload_psr4.php
@@ -0,0 +1,16 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'),
+    'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
+    'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
+    'PhpOffice\\PhpSpreadsheet\\' => array($vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet'),
+    'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
+    'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
+);
diff --git a/src/Common/vendor/composer/autoload_real.php b/src/Common/vendor/composer/autoload_real.php
new file mode 100644
index 00000000..13565101
--- /dev/null
+++ b/src/Common/vendor/composer/autoload_real.php
@@ -0,0 +1,38 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInit62e10e6c8df9afc192311b196c75bb33
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        require __DIR__ . '/platform_check.php';
+
+        spl_autoload_register(array('ComposerAutoloaderInit62e10e6c8df9afc192311b196c75bb33', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        spl_autoload_unregister(array('ComposerAutoloaderInit62e10e6c8df9afc192311b196c75bb33', 'loadClassLoader'));
+
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit62e10e6c8df9afc192311b196c75bb33::getInitializer($loader));
+
+        $loader->register(true);
+
+        return $loader;
+    }
+}
diff --git a/src/Common/vendor/composer/autoload_static.php b/src/Common/vendor/composer/autoload_static.php
new file mode 100644
index 00000000..b1051fa5
--- /dev/null
+++ b/src/Common/vendor/composer/autoload_static.php
@@ -0,0 +1,76 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInit62e10e6c8df9afc192311b196c75bb33
+{
+    public static $prefixLengthsPsr4 = array (
+        'Z' => 
+        array (
+            'ZipStream\\' => 10,
+        ),
+        'P' => 
+        array (
+            'Psr\\SimpleCache\\' => 16,
+            'Psr\\Http\\Message\\' => 17,
+            'Psr\\Http\\Client\\' => 16,
+            'PhpOffice\\PhpSpreadsheet\\' => 25,
+        ),
+        'M' => 
+        array (
+            'Matrix\\' => 7,
+        ),
+        'C' => 
+        array (
+            'Complex\\' => 8,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'ZipStream\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/maennchen/zipstream-php/src',
+        ),
+        'Psr\\SimpleCache\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/simple-cache/src',
+        ),
+        'Psr\\Http\\Message\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/http-factory/src',
+            1 => __DIR__ . '/..' . '/psr/http-message/src',
+        ),
+        'Psr\\Http\\Client\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/http-client/src',
+        ),
+        'PhpOffice\\PhpSpreadsheet\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet',
+        ),
+        'Matrix\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/markbaker/matrix/classes/src',
+        ),
+        'Complex\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/markbaker/complex/classes/src',
+        ),
+    );
+
+    public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInit62e10e6c8df9afc192311b196c75bb33::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit62e10e6c8df9afc192311b196c75bb33::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit62e10e6c8df9afc192311b196c75bb33::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/src/Common/vendor/composer/installed.json b/src/Common/vendor/composer/installed.json
new file mode 100644
index 00000000..e2762354
--- /dev/null
+++ b/src/Common/vendor/composer/installed.json
@@ -0,0 +1,533 @@
+{
+    "packages": [
+        {
+            "name": "maennchen/zipstream-php",
+            "version": "3.1.0",
+            "version_normalized": "3.1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maennchen/ZipStream-PHP.git",
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-zlib": "*",
+                "php-64bit": "^8.1"
+            },
+            "require-dev": {
+                "ext-zip": "*",
+                "friendsofphp/php-cs-fixer": "^3.16",
+                "guzzlehttp/guzzle": "^7.5",
+                "mikey179/vfsstream": "^1.6",
+                "php-coveralls/php-coveralls": "^2.5",
+                "phpunit/phpunit": "^10.0",
+                "vimeo/psalm": "^5.0"
+            },
+            "suggest": {
+                "guzzlehttp/psr7": "^2.4",
+                "psr/http-message": "^2.0"
+            },
+            "time": "2023-06-21T14:59:35+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "ZipStream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paul Duncan",
+                    "email": "pabs@pablotron.org"
+                },
+                {
+                    "name": "Jonatan Männchen",
+                    "email": "jonatan@maennchen.ch"
+                },
+                {
+                    "name": "Jesse Donat",
+                    "email": "donatj@gmail.com"
+                },
+                {
+                    "name": "András Kolesár",
+                    "email": "kolesar@kolesar.hu"
+                }
+            ],
+            "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.",
+            "keywords": [
+                "stream",
+                "zip"
+            ],
+            "support": {
+                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/maennchen",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/zipstream",
+                    "type": "open_collective"
+                }
+            ],
+            "install-path": "../maennchen/zipstream-php"
+        },
+        {
+            "name": "markbaker/complex",
+            "version": "3.0.2",
+            "version_normalized": "3.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MarkBaker/PHPComplex.git",
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "squizlabs/php_codesniffer": "^3.7"
+            },
+            "time": "2022-12-06T16:21:08+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Complex\\": "classes/src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Baker",
+                    "email": "mark@lange.demon.co.uk"
+                }
+            ],
+            "description": "PHP Class for working with complex numbers",
+            "homepage": "https://github.com/MarkBaker/PHPComplex",
+            "keywords": [
+                "complex",
+                "mathematics"
+            ],
+            "support": {
+                "issues": "https://github.com/MarkBaker/PHPComplex/issues",
+                "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2"
+            },
+            "install-path": "../markbaker/complex"
+        },
+        {
+            "name": "markbaker/matrix",
+            "version": "3.0.1",
+            "version_normalized": "3.0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MarkBaker/PHPMatrix.git",
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c",
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpdocumentor/phpdocumentor": "2.*",
+                "phploc/phploc": "^4.0",
+                "phpmd/phpmd": "2.*",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "sebastian/phpcpd": "^4.0",
+                "squizlabs/php_codesniffer": "^3.7"
+            },
+            "time": "2022-12-02T22:17:43+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Matrix\\": "classes/src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Baker",
+                    "email": "mark@demon-angel.eu"
+                }
+            ],
+            "description": "PHP Class for working with matrices",
+            "homepage": "https://github.com/MarkBaker/PHPMatrix",
+            "keywords": [
+                "mathematics",
+                "matrix",
+                "vector"
+            ],
+            "support": {
+                "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
+                "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1"
+            },
+            "install-path": "../markbaker/matrix"
+        },
+        {
+            "name": "phpoffice/phpspreadsheet",
+            "version": "2.2.1",
+            "version_normalized": "2.2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
+                "reference": "a3c5c9e7ce3a2a8577bfa9e69960fbccbd2d4a9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a3c5c9e7ce3a2a8577bfa9e69960fbccbd2d4a9e",
+                "reference": "a3c5c9e7ce3a2a8577bfa9e69960fbccbd2d4a9e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-dom": "*",
+                "ext-fileinfo": "*",
+                "ext-gd": "*",
+                "ext-iconv": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-simplexml": "*",
+                "ext-xml": "*",
+                "ext-xmlreader": "*",
+                "ext-xmlwriter": "*",
+                "ext-zip": "*",
+                "ext-zlib": "*",
+                "maennchen/zipstream-php": "^2.1 || ^3.0",
+                "markbaker/complex": "^3.0",
+                "markbaker/matrix": "^3.0",
+                "php": "^8.1",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+                "dompdf/dompdf": "^2.0 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "mitoteam/jpgraph": "^10.3",
+                "mpdf/mpdf": "^8.1.1",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpstan/phpstan": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.6 || ^10.5",
+                "squizlabs/php_codesniffer": "^3.7",
+                "tecnickcom/tcpdf": "^6.5"
+            },
+            "suggest": {
+                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+                "ext-intl": "PHP Internationalization Functions",
+                "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
+                "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
+                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
+            },
+            "time": "2024-07-29T07:56:06+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maarten Balliauw",
+                    "homepage": "https://blog.maartenballiauw.be"
+                },
+                {
+                    "name": "Mark Baker",
+                    "homepage": "https://markbakeruk.net"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "https://rootslabs.net"
+                },
+                {
+                    "name": "Erik Tilt"
+                },
+                {
+                    "name": "Adrien Crivelli"
+                }
+            ],
+            "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+            "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
+            "keywords": [
+                "OpenXML",
+                "excel",
+                "gnumeric",
+                "ods",
+                "php",
+                "spreadsheet",
+                "xls",
+                "xlsx"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.2.1"
+            },
+            "install-path": "../phpoffice/phpspreadsheet"
+        },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.3",
+            "version_normalized": "1.0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "time": "2023-09-23T14:17:50+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client"
+            },
+            "install-path": "../psr/http-client"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.1.0",
+            "version_normalized": "1.1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "time": "2024-04-15T12:06:14+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory"
+            },
+            "install-path": "../psr/http-factory"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "2.0",
+            "version_normalized": "2.0.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
+            },
+            "install-path": "../psr/http-message"
+        },
+        {
+            "name": "psr/simple-cache",
+            "version": "3.0.0",
+            "version_normalized": "3.0.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "time": "2021-10-29T13:26:27+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
+            },
+            "install-path": "../psr/simple-cache"
+        }
+    ],
+    "dev": true,
+    "dev-package-names": []
+}
diff --git a/src/Common/vendor/composer/installed.php b/src/Common/vendor/composer/installed.php
new file mode 100644
index 00000000..57d01123
--- /dev/null
+++ b/src/Common/vendor/composer/installed.php
@@ -0,0 +1,95 @@
+<?php return array(
+    'root' => array(
+        'name' => '__root__',
+        'pretty_version' => 'dev-develop',
+        'version' => 'dev-develop',
+        'reference' => '3ced0825b4dfe6bc50d3d439ab4e180b396cdf09',
+        'type' => 'library',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => true,
+    ),
+    'versions' => array(
+        '__root__' => array(
+            'pretty_version' => 'dev-develop',
+            'version' => 'dev-develop',
+            'reference' => '3ced0825b4dfe6bc50d3d439ab4e180b396cdf09',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'maennchen/zipstream-php' => array(
+            'pretty_version' => '3.1.0',
+            'version' => '3.1.0.0',
+            'reference' => 'b8174494eda667f7d13876b4a7bfef0f62a7c0d1',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../maennchen/zipstream-php',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'markbaker/complex' => array(
+            'pretty_version' => '3.0.2',
+            'version' => '3.0.2.0',
+            'reference' => '95c56caa1cf5c766ad6d65b6344b807c1e8405b9',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../markbaker/complex',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'markbaker/matrix' => array(
+            'pretty_version' => '3.0.1',
+            'version' => '3.0.1.0',
+            'reference' => '728434227fe21be27ff6d86621a1b13107a2562c',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../markbaker/matrix',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'phpoffice/phpspreadsheet' => array(
+            'pretty_version' => '2.2.1',
+            'version' => '2.2.1.0',
+            'reference' => 'a3c5c9e7ce3a2a8577bfa9e69960fbccbd2d4a9e',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpoffice/phpspreadsheet',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-client' => array(
+            'pretty_version' => '1.0.3',
+            'version' => '1.0.3.0',
+            'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-client',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-factory' => array(
+            'pretty_version' => '1.1.0',
+            'version' => '1.1.0.0',
+            'reference' => '2b4765fddfe3b508ac62f829e852b1501d3f6e8a',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-factory',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-message' => array(
+            'pretty_version' => '2.0',
+            'version' => '2.0.0.0',
+            'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-message',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/simple-cache' => array(
+            'pretty_version' => '3.0.0',
+            'version' => '3.0.0.0',
+            'reference' => '764e0b3939f5ca87cb904f570ef9be2d78a07865',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/simple-cache',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+    ),
+);
diff --git a/src/Common/vendor/composer/platform_check.php b/src/Common/vendor/composer/platform_check.php
new file mode 100644
index 00000000..f71b2f89
--- /dev/null
+++ b/src/Common/vendor/composer/platform_check.php
@@ -0,0 +1,30 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 80100)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 8.1.0". You are running ' . PHP_VERSION . '.';
+}
+
+if (PHP_INT_SIZE !== 8) {
+    $issues[] = 'Your Composer dependencies require a 64-bit build of PHP.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/LICENSE b/src/Common/vendor/maennchen/zipstream-php/LICENSE
new file mode 100644
index 00000000..ebe7fe2f
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/LICENSE
@@ -0,0 +1,24 @@
+MIT License
+
+Copyright (C) 2007-2009 Paul Duncan <pabs@pablotron.org>
+Copyright (C) 2014 Jonatan Männchen <jonatan@maennchen.ch>
+Copyright (C) 2014 Jesse G. Donat <donatj@gmail.com>
+Copyright (C) 2018 Nicolas CARPi <nicolas.carpi@curie.fr>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/Common/vendor/maennchen/zipstream-php/README.md b/src/Common/vendor/maennchen/zipstream-php/README.md
new file mode 100644
index 00000000..8ebb2c3c
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/README.md
@@ -0,0 +1,183 @@
+# ZipStream-PHP
+
+[![Main Branch](https://github.com/maennchen/ZipStream-PHP/actions/workflows/branch_main.yml/badge.svg)](https://github.com/maennchen/ZipStream-PHP/actions/workflows/branch_main.yml)
+[![Coverage Status](https://coveralls.io/repos/github/maennchen/ZipStream-PHP/badge.svg?branch=main)](https://coveralls.io/github/maennchen/ZipStream-PHP?branch=main)
+[![Latest Stable Version](https://poser.pugx.org/maennchen/zipstream-php/v/stable)](https://packagist.org/packages/maennchen/zipstream-php)
+[![Total Downloads](https://poser.pugx.org/maennchen/zipstream-php/downloads)](https://packagist.org/packages/maennchen/zipstream-php)
+[![Financial Contributors on Open Collective](https://opencollective.com/zipstream/all/badge.svg?label=financial+contributors)](https://opencollective.com/zipstream) [![License](https://img.shields.io/github/license/maennchen/zipstream-php.svg)](LICENSE)
+
+## Unstable Branch
+
+The `main` branch is not stable. Please see the
+[releases](https://github.com/maennchen/ZipStream-PHP/releases) for a stable
+version.
+
+## Overview
+
+A fast and simple streaming zip file downloader for PHP. Using this library will
+save you from having to write the Zip to disk. You can directly send it to the
+user, which is much faster. It can work with S3 buckets or any PSR7 Stream.
+
+Please see the [LICENSE](LICENSE) file for licensing and warranty information.
+
+## Installation
+
+Simply add a dependency on maennchen/zipstream-php to your project's
+`composer.json` file if you use Composer to manage the dependencies of your
+project. Use following command to add the package to your project's dependencies:
+
+```bash
+composer require maennchen/zipstream-php
+```
+
+## Usage
+
+For detailed instructions, please check the
+[Documentation](https://maennchen.github.io/ZipStream-PHP/).
+
+```php
+// Autoload the dependencies
+require 'vendor/autoload.php';
+
+// create a new zipstream object
+$zip = new ZipStream\ZipStream(
+    outputName: 'example.zip',
+
+    // enable output of HTTP headers
+    sendHttpHeaders: true,
+);
+
+// create a file named 'hello.txt'
+$zip->addFile(
+    fileName: 'hello.txt',
+    data: 'This is the contents of hello.txt',
+);
+
+// add a file named 'some_image.jpg' from a local file 'path/to/image.jpg'
+$zip->addFileFromPath(
+    fileName: 'some_image.jpg',
+    path: 'path/to/image.jpg',
+);
+
+// finish the zip stream
+$zip->finish();
+```
+
+## Upgrade to version 3.0.0
+
+### General
+
+- Minimum PHP Version: `8.1`
+- Only 64bit Architecture is supported.
+- The class `ZipStream\Option\Method` has been replaced with the enum
+  `ZipStream\CompressionMethod`.
+- Most clases have been flagged as `@internal` and should not be used from the
+  outside.
+  If you're using internal resources to extend this library, please open an
+  issue so that a clean interface can be added & published.
+  The externally available classes & enums are:
+  - `ZipStream\CompressionMethod`
+  - `ZipStream\Exception*`
+  - `ZipStream\ZipStream`
+
+### Archive Options
+
+- The class `ZipStream\Option\Archive` has been replaced in favor of named
+  arguments in the `ZipStream\ZipStream` constuctor.
+- The archive options `largeFileSize` & `largeFileMethod` has been removed. If
+  you want different `compressionMethods` based on the file size, you'll have to
+  implement this yourself.
+- The archive option `httpHeaderCallback` changed the type from `callable` to
+  `Closure`.
+- The archive option `zeroHeader` has been replaced with the option
+  `defaultEnableZeroHeader` and can be overridden for every file. Its default
+  value changed from `false` to `true`.
+- The archive option `statFiles` was removed since the library no longer checks
+  filesizes this way.
+- The archive option `deflateLevel` has been replaced with the option
+  `defaultDeflateLevel` and can be overridden for every file.
+- The first argument (`name`) of the `ZipStream\ZipStream` constuctor has been
+  replaced with the named argument `outputName`.
+- Headers are now also sent if the `outputName` is empty. If you do not want to
+  automatically send http headers, set `sendHttpHeaders` to `false`.
+
+### File Options
+
+- The class `ZipStream\Option\File` has been replaced in favor of named
+  arguments in the `ZipStream\ZipStream->addFile*` functions.
+- The file option `method` has been renamed to `compressionMethod`.
+- The file option `time` has been renamed to `lastModificationDateTime`.
+- The file option `size` has been renamed to `maxSize`.
+
+## Upgrade to version 2.0.0
+
+https://github.com/maennchen/ZipStream-PHP/tree/2.0.0#upgrade-to-version-200
+
+## Upgrade to version 1.0.0
+
+https://github.com/maennchen/ZipStream-PHP/tree/2.0.0#upgrade-to-version-100
+
+## Contributing
+
+ZipStream-PHP is a collaborative project. Please take a look at the
+[.github/CONTRIBUTING.md](.github/CONTRIBUTING.md) file.
+
+## Version Support
+
+Versions are supported according to the table below.
+
+Please do not open any pull requests contradicting the current version support
+status.
+
+Careful: Always check the `README` on `main` for up-to-date information.
+
+| Version | New Features | Bugfixes | Security |
+|---------|--------------|----------|----------|
+| *3*     | ✓            | ✓        | ✓        |
+| *2*     | ✗            | ✓        | ✓        |
+| *1*     | ✗            | ✗        | ✓        |
+| *0*     | ✗            | ✗        | ✗        |
+
+This library aligns itself with the PHP core support. New features and bugfixes
+will only target PHP versions according to their current status.
+
+See: https://www.php.net/supported-versions.php
+
+## About the Authors
+
+- Paul Duncan <pabs@pablotron.org> - https://pablotron.org/
+- Jonatan Männchen <jonatan@maennchen.ch> - https://maennchen.dev
+- Jesse G. Donat <donatj@gmail.com> - https://donatstudios.com
+- Nicolas CARPi <nico-git@deltablot.email> - https://www.deltablot.com
+- Nik Barham <nik@brokencube.co.uk> - https://www.brokencube.co.uk
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute.
+[[Contribute](.github/CONTRIBUTING.md)].
+<a href="https://github.com/maennchen/ZipStream-PHP/graphs/contributors"><img src="https://opencollective.com/zipstream/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/zipstream/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/zipstream"><img src="https://opencollective.com/zipstream/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/zipstream/contribute)]
+
+<a href="https://opencollective.com/zipstream/organization/0/website"><img src="https://opencollective.com/zipstream/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/1/website"><img src="https://opencollective.com/zipstream/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/2/website"><img src="https://opencollective.com/zipstream/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/3/website"><img src="https://opencollective.com/zipstream/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/4/website"><img src="https://opencollective.com/zipstream/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/5/website"><img src="https://opencollective.com/zipstream/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/6/website"><img src="https://opencollective.com/zipstream/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/7/website"><img src="https://opencollective.com/zipstream/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/8/website"><img src="https://opencollective.com/zipstream/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/zipstream/organization/9/website"><img src="https://opencollective.com/zipstream/organization/9/avatar.svg"></a>
diff --git a/src/Common/vendor/maennchen/zipstream-php/composer.json b/src/Common/vendor/maennchen/zipstream-php/composer.json
new file mode 100644
index 00000000..98c536a4
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/composer.json
@@ -0,0 +1,88 @@
+{
+  "name": "maennchen/zipstream-php",
+  "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.",
+  "keywords": ["zip", "stream"],
+  "type": "library",
+  "license": "MIT",
+  "authors": [{
+      "name": "Paul Duncan",
+      "email": "pabs@pablotron.org"
+    },
+    {
+      "name": "Jonatan Männchen",
+      "email": "jonatan@maennchen.ch"
+    },
+    {
+      "name": "Jesse Donat",
+      "email": "donatj@gmail.com"
+    },
+    {
+      "name": "András Kolesár",
+      "email": "kolesar@kolesar.hu"
+    }
+  ],
+  "require": {
+    "php-64bit": "^8.1",
+    "ext-mbstring": "*",
+    "ext-zlib": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^10.0",
+    "guzzlehttp/guzzle": "^7.5",
+    "ext-zip": "*",
+    "mikey179/vfsstream": "^1.6",
+    "php-coveralls/php-coveralls": "^2.5",
+    "friendsofphp/php-cs-fixer": "^3.16",
+    "vimeo/psalm": "^5.0"
+  },
+  "suggest": {
+    "psr/http-message": "^2.0",
+    "guzzlehttp/psr7": "^2.4"
+  },
+  "scripts": {
+    "format": "php-cs-fixer fix",
+    "test": [
+      "@test:unit",
+      "@test:formatted",
+      "@test:lint"
+    ],
+    "test:unit": "phpunit --coverage-clover=coverage.clover.xml --coverage-html cov",
+    "test:unit:slow": "@test:unit --group slow",
+    "test:unit:fast": "@test:unit --exclude-group slow",
+    "test:formatted": "@format --dry-run --stop-on-violation --using-cache=no",
+    "test:lint": "psalm --stats --show-info=true --find-unused-psalm-suppress",
+    "coverage:report": "php-coveralls --coverage_clover=coverage.clover.xml --json_path=coveralls-upload.json --insecure",
+    "install:tools": "phive install --trust-gpg-keys 0x67F861C3D889C656",
+    "docs:generate": "tools/phpdocumentor --sourcecode"
+  },
+  "autoload": {
+    "psr-4": {
+      "ZipStream\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": { "ZipStream\\Test\\": "test/" }
+  },
+  "archive": {
+    "exclude": [
+      "/composer.lock",
+      "/docs",
+      "/.gitattributes",
+      "/.github",
+      "/.gitignore",
+      "/guides",
+      "/.phive",
+      "/.php-cs-fixer.cache",
+      "/.php-cs-fixer.dist.php",
+      "/.phpdoc",
+      "/phpdoc.dist.xml",
+      "/.phpunit.result.cache",
+      "/phpunit.xml.dist",
+      "/psalm.xml",
+      "/test",
+      "/tools",
+      "/.tool-versions",
+      "/vendor"
+    ]
+  }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/ContentLength.rst b/src/Common/vendor/maennchen/zipstream-php/guides/ContentLength.rst
new file mode 100644
index 00000000..21fea34d
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/ContentLength.rst
@@ -0,0 +1,47 @@
+Adding Content-Length header
+=============
+
+Adding a ``Content-Length`` header for ``ZipStream`` can be achieved by
+using the options ``SIMULATION_STRICT`` or ``SIMULATION_LAX`` in the
+``operationMode`` parameter.
+
+In the ``SIMULATION_STRICT`` mode, ``ZipStream`` will not allow to calculate the
+size based on reading the whole file. ``SIMULATION_LAX`` will read the whole
+file if neccessary.
+
+``SIMULATION_STRICT`` is therefore useful to make sure that the size can be
+calculated efficiently.
+
+.. code-block:: php
+    use ZipStream\OperationMode;
+    use ZipStream\ZipStream;
+
+    $zip = new ZipStream(
+        operationMode: OperationMode::SIMULATE_STRICT, // or SIMULATE_LAX
+        defaultEnableZeroHeader: false,
+        sendHttpHeaders: true,
+        outputStream: $stream,
+    );
+
+    // Normally add files
+    $zip->addFile('sample.txt', 'Sample String Data');
+
+    // Use addFileFromCallback and exactSize if you want to defer opening of
+    // the file resource
+    $zip->addFileFromCallback(
+        'sample.txt',
+        exactSize: 18,
+        callback: function () {
+            return fopen('...');
+        }
+    );
+
+    // Read resulting file size
+    $size = $zip->finish();
+    
+    // Tell it to the browser
+    header('Content-Length: '. $size);
+    
+    // Execute the Simulation and stream the actual zip to the client
+    $zip->executeSimulation();
+
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/FlySystem.rst b/src/Common/vendor/maennchen/zipstream-php/guides/FlySystem.rst
new file mode 100644
index 00000000..4e6c6fb8
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/FlySystem.rst
@@ -0,0 +1,34 @@
+Usage with FlySystem
+===============
+
+For saving or uploading the generated zip, you can use the
+`Flysystem <https://flysystem.thephpleague.com>`_ package, and its many
+adapters.
+
+For that you will need to provide another stream than the ``php://output``
+default one, and pass it to Flysystem ``putStream`` method.
+
+.. code-block:: php
+
+    // Open Stream only once for read and write since it's a memory stream and
+    // the content is lost when closing the stream / opening another one
+    $tempStream = fopen('php://memory', 'w+');
+
+    // Create Zip Archive
+    $zipStream = new ZipStream(
+        outputStream: $tempStream,
+        outputName: 'test.zip',
+    );
+    $zipStream->addFile('test.txt', 'text');
+    $zipStream->finish();
+
+    // Store File
+    // (see Flysystem documentation, and all its framework integration)
+    // Can be any adapter (AWS, Google, Ftp, etc.)
+    $adapter = new Local(__DIR__.'/path/to/folder');
+    $filesystem = new Filesystem($adapter);
+
+    $filesystem->writeStream('test.zip', $tempStream)
+
+    // Close Stream
+    fclose($tempStream);
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/Nginx.rst b/src/Common/vendor/maennchen/zipstream-php/guides/Nginx.rst
new file mode 100644
index 00000000..c53d3000
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/Nginx.rst
@@ -0,0 +1,16 @@
+Usage with nginx
+=============
+
+If you are using nginx as a webserver, it will try to buffer the response.
+So you'll want to disable this with a custom header:
+
+.. code-block:: php
+    header('X-Accel-Buffering: no');
+    # or with the Response class from Symfony
+    $response->headers->set('X-Accel-Buffering', 'no');
+
+Alternatively, you can tweak the
+`fastcgi cache parameters <https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_buffers>`_
+within nginx config.
+
+See `original issue <https://github.com/maennchen/ZipStream-PHP/issues/77>`_.
\ No newline at end of file
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/Options.rst b/src/Common/vendor/maennchen/zipstream-php/guides/Options.rst
new file mode 100644
index 00000000..5e92e94d
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/Options.rst
@@ -0,0 +1,66 @@
+Available options
+===============
+
+Here is the full list of options available to you. You can also have a look at
+``src/ZipStream.php`` file.
+
+.. code-block:: php
+
+    use ZipStream\ZipStream;
+
+    require_once 'vendor/autoload.php';
+
+    $zip = new ZipStream(
+        // Define output stream
+        // (argument is eiter a resource or implementing
+        // `Psr\Http\Message\StreamInterface`)
+        //
+        // Setup with `psr/http-message` & `guzzlehttp/psr7` dependencies
+        // required when using `Psr\Http\Message\StreamInterface`.
+        outputStream: $filePointer,
+
+        // Set the deflate level (default is 6; use -1 to disable it)
+        defaultDeflateLevel: 6,
+
+        // Add a comment to the zip file
+        comment: 'This is a comment.',
+
+        // Send http headers (default is true)
+        sendHttpHeaders: false,
+
+        // HTTP Content-Disposition.
+        // Defaults to 'attachment', where FILENAME is the specified filename.
+        // Note that this does nothing if you are not sending HTTP headers.
+        contentDisposition: 'attachment',
+
+        // Output Name for HTTP Content-Disposition
+        // Defaults to no name
+        outputName: "example.zip",
+
+        // HTTP Content-Type.
+        // Defaults to 'application/x-zip'.
+        // Note that this does nothing if you are not sending HTTP headers.
+        contentType: 'application/x-zip',
+
+        // Set the function called for setting headers.
+        // Default is the `header()` of PHP
+        httpHeaderCallback: header(...),
+
+        // Enable streaming files with single read where general purpose bit 3
+        // indicates local file header contain zero values in crc and size
+        // fields, these appear only after file contents in data descriptor
+        // block.
+        // Set to true if your input stream is remote
+        // (used with addFileFromStream()).
+        // Default is false.
+        defaultEnableZeroHeader: false,
+
+        // Enable zip64 extension, allowing very large archives
+        // (> 4Gb or file count > 64k)
+        // Default is true
+        enableZip64: true,
+
+        // Flush output buffer after every write
+        // Default is false
+        flushOutput: true,
+    );
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/PSR7Streams.rst b/src/Common/vendor/maennchen/zipstream-php/guides/PSR7Streams.rst
new file mode 100644
index 00000000..22af71d4
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/PSR7Streams.rst
@@ -0,0 +1,21 @@
+Usage with PSR 7 Streams
+===============
+
+PSR-7 streams are `standardized streams <https://www.php-fig.org/psr/psr-7/>`_.
+
+ZipStream-PHP supports working with these streams with the function
+``addFileFromPsr7Stream``. 
+
+For all parameters of the function see the API documentation.
+
+Example
+---------------
+
+.. code-block:: php
+
+    $stream = $response->getBody();
+    // add a file named 'streamfile.txt' from the content of the stream
+    $zip->addFileFromPsr7Stream(
+        fileName: 'streamfile.txt',
+        stream: $stream,
+    );
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/StreamOutput.rst b/src/Common/vendor/maennchen/zipstream-php/guides/StreamOutput.rst
new file mode 100644
index 00000000..9f3165b7
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/StreamOutput.rst
@@ -0,0 +1,39 @@
+Stream Output
+===============
+
+Stream to S3 Bucket
+---------------
+
+.. code-block:: php
+
+    use Aws\S3\S3Client;
+    use Aws\Credentials\CredentialProvider;
+    use ZipStream\ZipStream;
+
+    $bucket = 'your bucket name';
+    $client = new S3Client([
+        'region' => 'your region',
+        'version' => 'latest',
+        'bucketName' => $bucket,
+        'credentials' => CredentialProvider::defaultProvider(),
+    ]);
+    $client->registerStreamWrapper();
+
+    $zipFile = fopen("s3://$bucket/example.zip", 'w');
+
+    $zip = new ZipStream(
+        enableZip64: false,
+        outputStream: $zipFile,
+    );
+
+    $zip->addFile(
+        fileName: 'file1.txt',
+        data: 'File1 data',
+    );
+    $zip->addFile(
+        fileName: 'file2.txt',
+        data: 'File2 data',
+    );
+    $zip->finish();
+
+    fclose($zipFile);
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/Symfony.rst b/src/Common/vendor/maennchen/zipstream-php/guides/Symfony.rst
new file mode 100644
index 00000000..902552c9
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/Symfony.rst
@@ -0,0 +1,130 @@
+Usage with Symfony
+===============
+
+Overview for using ZipStream in Symfony
+--------
+
+Using ZipStream in Symfony requires use of Symfony's ``StreamedResponse`` when
+used in controller actions.
+
+Wrap your call to the relevant ``ZipStream`` stream method (i.e. ``addFile``,
+``addFileFromPath``, ``addFileFromStream``) in Symfony's ``StreamedResponse``
+function passing in any required arguments for your use case.
+
+Using Symfony's ``StreamedResponse`` will allow Symfony to stream output from
+ZipStream correctly to users' browsers and avoid a corrupted final zip landing
+on the users' end.
+
+Example for using ``ZipStream`` in a controller action to zip stream files
+stored in an AWS S3 bucket by key:
+
+.. code-block:: php
+
+    use Symfony\Component\HttpFoundation\StreamedResponse;
+    use Aws\S3\S3Client;
+    use ZipStream;
+
+    //...
+
+    /**
+    * @Route("/zipstream", name="zipstream")
+    */
+    public function zipStreamAction()
+    {
+        // sample test file on s3
+        $s3keys = array(
+        "ziptestfolder/file1.txt"
+        );
+
+        $s3Client = $this->get('app.amazon.s3'); //s3client service
+        $s3Client->registerStreamWrapper(); //required
+
+        // using StreamedResponse to wrap ZipStream functionality
+        // for files on AWS s3.
+        $response = new StreamedResponse(function() use($s3keys, $s3Client)
+        {
+            // Define suitable options for ZipStream Archive.
+            // this is needed to prevent issues with truncated zip files
+            //initialise zipstream with output zip filename and options.
+            $zip = new ZipStream\ZipStream(
+                outputName: 'test.zip',
+                defaultEnableZeroHeader: true,
+                contentType: 'application/octet-stream',
+            );
+
+            //loop keys - useful for multiple files
+            foreach ($s3keys as $key) {
+                // Get the file name in S3 key so we can save it to the zip
+                //file using the same name.
+                $fileName = basename($key);
+
+                // concatenate s3path.
+                // replace with your bucket name or get from parameters file.
+                $bucket = 'bucketname';
+                $s3path = "s3://" . $bucket . "/" . $key;
+
+                //addFileFromStream
+                if ($streamRead = fopen($s3path, 'r')) {
+                    $zip->addFileFromStream(
+                        fileName: $fileName,
+                        stream: $streamRead,
+                    );
+                } else {
+                    die('Could not open stream for reading');
+                }
+            }
+
+            $zip->finish();
+
+        });
+
+        return $response;
+    }
+
+In the above example, files on AWS S3 are being streamed from S3 to the Symfon
+application via ``fopen`` call when the s3Client has ``registerStreamWrapper``
+applied. This stream is then passed to ``ZipStream`` via the
+``addFileFromStream`` function, which ZipStream then streams as a zip to the
+client browser via Symfony's ``StreamedResponse``. No Zip is created server
+side, which makes this approach a more efficient solution for streaming zips to
+the client browser especially for larger files.
+
+For the above use case you will need to have installed
+`aws/aws-sdk-php-symfony <https://github.com/aws/aws-sdk-php-symfony>`_ to
+support accessing S3 objects in your Symfony web application. This is not
+required for locally stored files on you server you intend to stream via
+``ZipStream``.
+
+See official Symfony documentation for details on
+`Symfony's StreamedResponse <https://symfony.com/doc/current/components/http_foundation.html#streaming-a-response>`_ 
+``Symfony\Component\HttpFoundation\StreamedResponse``.
+
+Note from `S3 documentation <https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/s3-stream-wrapper.html>`_:
+
+    Streams opened in "r" mode only allow data to be read from the stream, and
+    are not seekable by default. This is so that data can be downloaded from
+    Amazon S3 in a truly streaming manner, where previously read bytes do not
+    need to be buffered into memory. If you need a stream to be seekable, you
+    can pass seekable into the stream context options of a function.
+
+Make sure to configure your S3 context correctly!
+
+Uploading a file
+--------
+
+You need to add correct permissions
+(see `#120 <https://github.com/maennchen/ZipStream-PHP/issues/120>`_)
+
+**example code**
+
+
+.. code-block:: php
+
+    $path = "s3://{$adapter->getBucket()}/{$this->getArchivePath()}";
+
+    // the important bit
+    $outputContext = stream_context_create([
+        's3' => ['ACL' => 'public-read'],
+    ]);
+
+    fopen($path, 'w', null, $outputContext);
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/Varnish.rst b/src/Common/vendor/maennchen/zipstream-php/guides/Varnish.rst
new file mode 100644
index 00000000..952d2874
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/Varnish.rst
@@ -0,0 +1,22 @@
+Usage with Varnish
+=============
+
+Serving a big zip with varnish in between can cause random stream close.
+This can be solved by adding attached code to the vcl file.
+
+To avoid the problem, add the following to your varnish config file:
+
+.. code-block::
+    sub vcl_recv {
+        # Varnish can’t intercept the discussion anymore
+        # helps for streaming big zips
+        if (req.url ~ "\.(tar|gz|zip|7z|exe)$") {
+            return (pipe);
+        }
+    }
+    # Varnish can’t intercept the discussion anymore
+    # helps for streaming big zips
+    sub vcl_pipe {
+        set bereq.http.connection = "close";
+        return (pipe);
+    }
diff --git a/src/Common/vendor/maennchen/zipstream-php/guides/index.rst b/src/Common/vendor/maennchen/zipstream-php/guides/index.rst
new file mode 100644
index 00000000..4583ca58
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/guides/index.rst
@@ -0,0 +1,126 @@
+ZipStream PHP
+=============
+
+A fast and simple streaming zip file downloader for PHP. Using this library will
+save you from having to write the Zip to disk. You can directly send it to the
+user, which is much faster. It can work with S3 buckets or any PSR7 Stream.
+
+.. toctree::
+
+   index
+   Symfony
+   Options
+   StreamOutput
+   FlySystem
+   PSR7Streams
+   Nginx
+   Varnish
+   ContentLength
+
+Installation
+---------------
+
+Simply add a dependency on ``maennchen/zipstream-php`` to your project's
+``composer.json`` file if you use Composer to manage the dependencies of your
+project. Use following command to add the package to your project's
+dependencies:
+
+.. code-block:: sh
+   composer require maennchen/zipstream-php
+
+If you want to use``addFileFromPsr7Stream```
+(``Psr\Http\Message\StreamInterface``) or use a stream instead of a
+``resource`` as ``outputStream``, the following dependencies must be installed
+as well:
+
+.. code-block:: sh
+   composer require psr/http-message guzzlehttp/psr7
+
+If ``composer install`` yields the following error, your installation is missing
+the `mbstring extension <https://www.php.net/manual/en/book.mbstring.php>`_,
+either `install it <https://www.php.net/manual/en/mbstring.installation.php>`_
+or run the follwoing command:
+
+.. code-block::
+    Your requirements could not be resolved to an installable set of packages.
+
+    Problem 1
+        - Root composer.json requires PHP extension ext-mbstring * but it is
+          missing from your system. Install or enable PHP's mbstrings extension.
+
+.. code-block:: sh
+   composer require symfony/polyfill-mbstring
+
+Usage Intro
+---------------
+
+Here's a simple example:
+
+.. code-block:: php
+
+   // Autoload the dependencies
+   require 'vendor/autoload.php';
+
+   // create a new zipstream object
+   $zip = new ZipStream\ZipStream(
+      outputName: 'example.zip',
+
+      // enable output of HTTP headers
+      sendHttpHeaders: true,
+   );
+
+   // create a file named 'hello.txt'
+   $zip->addFile(
+      fileName: 'hello.txt',
+      data: 'This is the contents of hello.txt',
+   );
+
+   // add a file named 'some_image.jpg' from a local file 'path/to/image.jpg'
+   $zip->addFileFromPath(
+      fileName: 'some_image.jpg',
+      path: 'path/to/image.jpg',
+   );
+
+   // add a file named 'goodbye.txt' from an open stream resource
+   $filePointer = tmpfile();
+   fwrite($filePointer, 'The quick brown fox jumped over the lazy dog.');
+   rewind($filePointer);
+   $zip->addFileFromStream(
+      fileName: 'goodbye.txt',
+      stream: $filePointer,
+   );
+   fclose($filePointer);
+
+   // add a file named 'streamfile.txt' from the body of a `guzzle` response
+   // Setup with `psr/http-message` & `guzzlehttp/psr7` dependencies required.
+   $zip->addFileFromPsr7Stream(
+      fileName: 'streamfile.txt',
+      stream: $response->getBody(),
+   );
+
+   // finish the zip stream
+   $zip->finish();
+
+You can also add comments, modify file timestamps, and customize (or
+disable) the HTTP headers. It is also possible to specify the storage method
+when adding files, the current default storage method is ``DEFLATE``
+i.e files are stored with Compression mode 0x08.
+
+Known Issues
+---------------
+
+The native Mac OS archive extraction tool prior to macOS 10.15 might not open
+archives in some conditions. A workaround is to disable the Zip64 feature with
+the option ``enableZip64: false``. This limits the archive to 4 Gb and 64k files
+but will allow users on macOS 10.14 and below to open them without issue.
+See `#116 <https://github.com/maennchen/ZipStream-PHP/issues/146>`_.
+
+The linux ``unzip`` utility might not handle properly unicode characters.
+It is recommended to extract with another tool like
+`7-zip <https://www.7-zip.org/>`_.
+See `#146 <https://github.com/maennchen/ZipStream-PHP/issues/146>`_.
+
+It is the responsability of the client code to make sure that files are not
+saved with the same path, as it is not possible for the library to figure it out
+while streaming a zip.
+See `#154 <https://github.com/maennchen/ZipStream-PHP/issues/154>`_.
diff --git a/src/Common/vendor/maennchen/zipstream-php/phpdoc.dist.xml b/src/Common/vendor/maennchen/zipstream-php/phpdoc.dist.xml
new file mode 100644
index 00000000..b98fe1cd
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/phpdoc.dist.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdocumentor
+        configVersion="3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="https://www.phpdoc.org"
+        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/phpDocumentor/phpDocumentor/master/data/xsd/phpdoc.xsd"
+>
+    <title>💾 ZipStream-PHP</title>
+    <paths>
+        <output>docs</output>
+    </paths>
+    <version number="3.0.0">
+        <folder>latest</folder>
+        <api>
+            <source dsn=".">
+                <path>src</path>
+            </source>
+            <output>api</output>
+            <ignore hidden="true" symlinks="true">
+                <path>tests/**/*</path>
+                <path>vendor/**/*</path>
+            </ignore>
+            <extensions>
+                <extension>php</extension>
+            </extensions>
+            <visibility>public</visibility>
+            <default-package-name>ZipStream</default-package-name>
+            <include-source>true</include-source>
+        </api>
+        <guide>
+            <source dsn=".">
+                <path>guides</path>
+            </source>
+            <output>guide</output>
+        </guide>
+    </version>
+    <setting name="guides.enabled" value="true"/>
+    <template name="default" />
+</phpdocumentor>
\ No newline at end of file
diff --git a/src/Common/vendor/maennchen/zipstream-php/phpunit.xml.dist b/src/Common/vendor/maennchen/zipstream-php/phpunit.xml.dist
new file mode 100644
index 00000000..1b02a3af
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/phpunit.xml.dist
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage/>
+  <testsuites>
+    <testsuite name="Application">
+      <directory>test</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
+</phpunit>
diff --git a/src/Common/vendor/maennchen/zipstream-php/psalm.xml b/src/Common/vendor/maennchen/zipstream-php/psalm.xml
new file mode 100644
index 00000000..5d050d14
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/psalm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <!-- Turn off dead code warnings for externally called functions -->
+        <PossiblyUnusedProperty errorLevel="suppress" />
+        <PossiblyUnusedMethod errorLevel="suppress" />
+        <PossiblyUnusedReturnValue errorLevel="suppress" />
+    </issueHandlers>
+</psalm>
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/CentralDirectoryFileHeader.php b/src/Common/vendor/maennchen/zipstream-php/src/CentralDirectoryFileHeader.php
new file mode 100644
index 00000000..ffcfc6e9
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/CentralDirectoryFileHeader.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use DateTimeInterface;
+
+/**
+ * @internal
+ */
+abstract class CentralDirectoryFileHeader
+{
+    private const SIGNATURE = 0x02014b50;
+
+    public static function generate(
+        int $versionMadeBy,
+        int $versionNeededToExtract,
+        int $generalPurposeBitFlag,
+        CompressionMethod $compressionMethod,
+        DateTimeInterface $lastModificationDateTime,
+        int $crc32,
+        int $compressedSize,
+        int $uncompressedSize,
+        string $fileName,
+        string $extraField,
+        string $fileComment,
+        int $diskNumberStart,
+        int $internalFileAttributes,
+        int $externalFileAttributes,
+        int $relativeOffsetOfLocalHeader,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'V', value: self::SIGNATURE),
+            new PackField(format: 'v', value: $versionMadeBy),
+            new PackField(format: 'v', value: $versionNeededToExtract),
+            new PackField(format: 'v', value: $generalPurposeBitFlag),
+            new PackField(format: 'v', value: $compressionMethod->value),
+            new PackField(format: 'V', value: Time::dateTimeToDosTime($lastModificationDateTime)),
+            new PackField(format: 'V', value: $crc32),
+            new PackField(format: 'V', value: $compressedSize),
+            new PackField(format: 'V', value: $uncompressedSize),
+            new PackField(format: 'v', value: strlen($fileName)),
+            new PackField(format: 'v', value: strlen($extraField)),
+            new PackField(format: 'v', value: strlen($fileComment)),
+            new PackField(format: 'v', value: $diskNumberStart),
+            new PackField(format: 'v', value: $internalFileAttributes),
+            new PackField(format: 'V', value: $externalFileAttributes),
+            new PackField(format: 'V', value: $relativeOffsetOfLocalHeader),
+        ) . $fileName . $extraField . $fileComment;
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/CompressionMethod.php b/src/Common/vendor/maennchen/zipstream-php/src/CompressionMethod.php
new file mode 100644
index 00000000..51e43637
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/CompressionMethod.php
@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+enum CompressionMethod: int
+{
+    /**
+     * The file is stored (no compression)
+     */
+    case STORE = 0x00;
+
+    // 0x01: legacy algorithm - The file is Shrunk
+    // 0x02: legacy algorithm - The file is Reduced with compression factor 1
+    // 0x03: legacy algorithm - The file is Reduced with compression factor 2
+    // 0x04: legacy algorithm - The file is Reduced with compression factor 3
+    // 0x05: legacy algorithm - The file is Reduced with compression factor 4
+    // 0x06: legacy algorithm - The file is Imploded
+    // 0x07: Reserved for Tokenizing compression algorithm
+
+    /**
+     * The file is Deflated
+     */
+    case DEFLATE = 0x08;
+
+    // /**
+    //  * Enhanced Deflating using Deflate64(tm)
+    //  */
+    // case DEFLATE_64 = 0x09;
+
+    // /**
+    //  * PKWARE Data Compression Library Imploding (old IBM TERSE)
+    //  */
+    // case PKWARE = 0x0a;
+
+    // // 0x0b: Reserved by PKWARE
+
+    // /**
+    //  * File is compressed using BZIP2 algorithm
+    //  */
+    // case BZIP2 = 0x0c;
+
+    // // 0x0d: Reserved by PKWARE
+
+    // /**
+    //  * LZMA
+    //  */
+    // case LZMA = 0x0e;
+
+    // // 0x0f: Reserved by PKWARE
+
+    // /**
+    //  * IBM z/OS CMPSC Compression
+    //  */
+    // case IBM_ZOS_CMPSC = 0x10;
+
+    // // 0x11: Reserved by PKWARE
+
+    // /**
+    //  * File is compressed using IBM TERSE
+    //  */
+    // case IBM_TERSE = 0x12;
+
+    // /**
+    //  * IBM LZ77 z Architecture
+    //  */
+    // case IBM_LZ77 = 0x13;
+
+    // // 0x14: deprecated (use method 93 for zstd)
+
+    // /**
+    //  * Zstandard (zstd) Compression
+    //  */
+    // case ZSTD = 0x5d;
+
+    // /**
+    //  * MP3 Compression
+    //  */
+    // case MP3 = 0x5e;
+
+    // /**
+    //  * XZ Compression
+    //  */
+    // case XZ = 0x5f;
+
+    // /**
+    //  * JPEG variant
+    //  */
+    // case JPEG = 0x60;
+
+    // /**
+    //  * WavPack compressed data
+    //  */
+    // case WAV_PACK = 0x61;
+
+    // /**
+    //  * PPMd version I, Rev 1
+    //  */
+    // case PPMD_1_1 = 0x62;
+
+    // /**
+    //  * AE-x encryption marker
+    //  */
+    // case AE_X_ENCRYPTION = 0x63;
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/DataDescriptor.php b/src/Common/vendor/maennchen/zipstream-php/src/DataDescriptor.php
new file mode 100644
index 00000000..04146190
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/DataDescriptor.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+/**
+ * @internal
+ */
+abstract class DataDescriptor
+{
+    private const SIGNATURE = 0x08074b50;
+
+    public static function generate(
+        int $crc32UncompressedData,
+        int $compressedSize,
+        int $uncompressedSize,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'V', value: self::SIGNATURE),
+            new PackField(format: 'V', value: $crc32UncompressedData),
+            new PackField(format: 'V', value: $compressedSize),
+            new PackField(format: 'V', value: $uncompressedSize),
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/EndOfCentralDirectory.php b/src/Common/vendor/maennchen/zipstream-php/src/EndOfCentralDirectory.php
new file mode 100644
index 00000000..4320addc
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/EndOfCentralDirectory.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+/**
+ * @internal
+ */
+abstract class EndOfCentralDirectory
+{
+    private const SIGNATURE = 0x06054b50;
+
+    public static function generate(
+        int $numberOfThisDisk,
+        int $numberOfTheDiskWithCentralDirectoryStart,
+        int $numberOfCentralDirectoryEntriesOnThisDisk,
+        int $numberOfCentralDirectoryEntries,
+        int $sizeOfCentralDirectory,
+        int $centralDirectoryStartOffsetOnDisk,
+        string $zipFileComment,
+    ): string {
+        /** @psalm-suppress MixedArgument */
+        return PackField::pack(
+            new PackField(format: 'V', value: static::SIGNATURE),
+            new PackField(format: 'v', value: $numberOfThisDisk),
+            new PackField(format: 'v', value: $numberOfTheDiskWithCentralDirectoryStart),
+            new PackField(format: 'v', value: $numberOfCentralDirectoryEntriesOnThisDisk),
+            new PackField(format: 'v', value: $numberOfCentralDirectoryEntries),
+            new PackField(format: 'V', value: $sizeOfCentralDirectory),
+            new PackField(format: 'V', value: $centralDirectoryStartOffsetOnDisk),
+            new PackField(format: 'v', value: strlen($zipFileComment)),
+        ) . $zipFileComment;
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception.php
new file mode 100644
index 00000000..27f4f301
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+abstract class Exception extends \Exception
+{
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/DosTimeOverflowException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/DosTimeOverflowException.php
new file mode 100644
index 00000000..b8d05080
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/DosTimeOverflowException.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use DateTimeInterface;
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a file wasn't found
+ */
+class DosTimeOverflowException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        public readonly DateTimeInterface $dateTime
+    ) {
+        parent::__construct('The date ' . $dateTime->format(DateTimeInterface::ATOM) . " can't be represented as DOS time / date.");
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php
new file mode 100644
index 00000000..350a7bfe
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a file wasn't found
+ */
+class FileNotFoundException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        public readonly string $path
+    ) {
+        parent::__construct("The file with the path $path wasn't found.");
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php
new file mode 100644
index 00000000..93d0c6c6
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a file wasn't found
+ */
+class FileNotReadableException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        public readonly string $path
+    ) {
+        parent::__construct("The file with the path $path isn't readable.");
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileSizeIncorrectException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileSizeIncorrectException.php
new file mode 100644
index 00000000..11f0b67b
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/FileSizeIncorrectException.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a file is not as large as it was specified.
+ */
+class FileSizeIncorrectException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        public readonly int $expectedSize,
+        public readonly int $actualSize
+    ) {
+        parent::__construct("File is {$actualSize} instead of {$expectedSize} bytes large. Adjust `exactSize` parameter.");
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php
new file mode 100644
index 00000000..09bdafb2
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a counter value exceeds storage size
+ */
+class OverflowException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct()
+    {
+        parent::__construct('File size exceeds limit of 32 bit integer. Please enable "zip64" option.');
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/ResourceActionException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/ResourceActionException.php
new file mode 100644
index 00000000..cbd9b0bb
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/ResourceActionException.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a resource like `fread` returns false
+ */
+class ResourceActionException extends Exception
+{
+    /**
+     * @var ?resource
+     */
+    public $resource;
+
+    /**
+     * @param resource $resource
+     */
+    public function __construct(
+        public readonly string $function,
+        $resource = null,
+    ) {
+        $this->resource = $resource;
+        parent::__construct('Function ' . $function . 'failed on resource.');
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/SimulationFileUnknownException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/SimulationFileUnknownException.php
new file mode 100644
index 00000000..717c1aaf
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/SimulationFileUnknownException.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a strict simulation is executed and the file
+ * information can't be determined without reading the entire file.
+ */
+class SimulationFileUnknownException extends Exception
+{
+    public function __construct()
+    {
+        parent::__construct('The details of the strict simulation file could not be determined without reading the entire file.');
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php
new file mode 100644
index 00000000..c1446735
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a stream can't be read.
+ */
+class StreamNotReadableException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct()
+    {
+        parent::__construct('The stream could not be read.');
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Exception/StreamNotSeekableException.php b/src/Common/vendor/maennchen/zipstream-php/src/Exception/StreamNotSeekableException.php
new file mode 100644
index 00000000..606f11f1
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Exception/StreamNotSeekableException.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a non seekable stream is
+ * provided and zero headers are disabled.
+ */
+class StreamNotSeekableException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct()
+    {
+        parent::__construct('enableZeroHeader must be enable to add non seekable streams');
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/File.php b/src/Common/vendor/maennchen/zipstream-php/src/File.php
new file mode 100644
index 00000000..3f35de46
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/File.php
@@ -0,0 +1,420 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use Closure;
+use DateTimeInterface;
+use DeflateContext;
+use RuntimeException;
+use ZipStream\Exception\FileSizeIncorrectException;
+use ZipStream\Exception\OverflowException;
+use ZipStream\Exception\ResourceActionException;
+use ZipStream\Exception\SimulationFileUnknownException;
+use ZipStream\Exception\StreamNotReadableException;
+use ZipStream\Exception\StreamNotSeekableException;
+
+/**
+ * @internal
+ */
+class File
+{
+    private const CHUNKED_READ_BLOCK_SIZE = 0x1000000;
+
+    private Version $version;
+
+    private int $compressedSize = 0;
+
+    private int $uncompressedSize = 0;
+
+    private int $crc = 0;
+
+    private int $generalPurposeBitFlag = 0;
+
+    private readonly string $fileName;
+
+    /**
+     * @var resource|null
+     */
+    private $stream;
+
+    /**
+     * @param Closure $dataCallback
+     * @psalm-param Closure(): resource $dataCallback
+     */
+    public function __construct(
+        string $fileName,
+        private readonly Closure $dataCallback,
+        private readonly OperationMode $operationMode,
+        private readonly int $startOffset,
+        private readonly CompressionMethod $compressionMethod,
+        private readonly string $comment,
+        private readonly DateTimeInterface $lastModificationDateTime,
+        private readonly int $deflateLevel,
+        private readonly ?int $maxSize,
+        private readonly ?int $exactSize,
+        private readonly bool $enableZip64,
+        private readonly bool $enableZeroHeader,
+        private readonly Closure $send,
+        private readonly Closure $recordSentBytes,
+    ) {
+        $this->fileName = self::filterFilename($fileName);
+        $this->checkEncoding();
+
+        if ($this->enableZeroHeader) {
+            $this->generalPurposeBitFlag |= GeneralPurposeBitFlag::ZERO_HEADER;
+        }
+
+        $this->version = $this->compressionMethod === CompressionMethod::DEFLATE ? Version::DEFLATE : Version::STORE;
+    }
+
+    public function cloneSimulationExecution(): self
+    {
+        return new self(
+            $this->fileName,
+            $this->dataCallback,
+            OperationMode::NORMAL,
+            $this->startOffset,
+            $this->compressionMethod,
+            $this->comment,
+            $this->lastModificationDateTime,
+            $this->deflateLevel,
+            $this->maxSize,
+            $this->exactSize,
+            $this->enableZip64,
+            $this->enableZeroHeader,
+            $this->send,
+            $this->recordSentBytes,
+        );
+    }
+
+    public function process(): string
+    {
+        $forecastSize = $this->forecastSize();
+
+        if ($this->enableZeroHeader) {
+            // No calculation required
+        } elseif ($this->isSimulation() && $forecastSize) {
+            $this->uncompressedSize = $forecastSize;
+            $this->compressedSize = $forecastSize;
+        } else {
+            $this->readStream(send: false);
+            if (rewind($this->unpackStream()) === false) {
+                throw new ResourceActionException('rewind', $this->unpackStream());
+            }
+        }
+
+        $this->addFileHeader();
+
+        $detectedSize = $forecastSize ?? $this->compressedSize;
+
+        if (
+            $this->isSimulation() &&
+            $detectedSize > 0
+        ) {
+            ($this->recordSentBytes)($detectedSize);
+        } else {
+            $this->readStream(send: true);
+        }
+
+        $this->addFileFooter();
+        return $this->getCdrFile();
+    }
+
+    /**
+     * @return resource
+     */
+    private function unpackStream()
+    {
+        if ($this->stream) {
+            return $this->stream;
+        }
+
+        if ($this->operationMode === OperationMode::SIMULATE_STRICT) {
+            throw new SimulationFileUnknownException();
+        }
+
+        $this->stream = ($this->dataCallback)();
+
+        if (!$this->enableZeroHeader && !stream_get_meta_data($this->stream)['seekable']) {
+            throw new StreamNotSeekableException();
+        }
+        if (!(
+            str_contains(stream_get_meta_data($this->stream)['mode'], 'r')
+            || str_contains(stream_get_meta_data($this->stream)['mode'], 'w+')
+            || str_contains(stream_get_meta_data($this->stream)['mode'], 'a+')
+            || str_contains(stream_get_meta_data($this->stream)['mode'], 'x+')
+            || str_contains(stream_get_meta_data($this->stream)['mode'], 'c+')
+        )) {
+            throw new StreamNotReadableException();
+        }
+
+        return $this->stream;
+    }
+
+    private function forecastSize(): ?int
+    {
+        if ($this->compressionMethod !== CompressionMethod::STORE) {
+            return null;
+        }
+        if ($this->exactSize) {
+            return $this->exactSize;
+        }
+        $fstat = fstat($this->unpackStream());
+        if (!$fstat || !array_key_exists('size', $fstat) || $fstat['size'] < 1) {
+            return null;
+        }
+
+        if ($this->maxSize !== null && $this->maxSize < $fstat['size']) {
+            return $this->maxSize;
+        }
+
+        return $fstat['size'];
+    }
+
+    /**
+     * Create and send zip header for this file.
+     */
+    private function addFileHeader(): void
+    {
+        $forceEnableZip64 = $this->enableZeroHeader && $this->enableZip64;
+
+        $footer = $this->buildZip64ExtraBlock($forceEnableZip64);
+
+        $zip64Enabled = $footer !== '';
+
+        if($zip64Enabled) {
+            $this->version = Version::ZIP64;
+        }
+
+        if ($this->generalPurposeBitFlag & GeneralPurposeBitFlag::EFS) {
+            // Put the tricky entry to
+            // force Linux unzip to lookup EFS flag.
+            $footer .= Zs\ExtendedInformationExtraField::generate();
+        }
+
+        $data = LocalFileHeader::generate(
+            versionNeededToExtract: $this->version->value,
+            generalPurposeBitFlag: $this->generalPurposeBitFlag,
+            compressionMethod: $this->compressionMethod,
+            lastModificationDateTime: $this->lastModificationDateTime,
+            crc32UncompressedData: $this->crc,
+            compressedSize: $zip64Enabled
+                ? 0xFFFFFFFF
+                : $this->compressedSize,
+            uncompressedSize: $zip64Enabled
+                ? 0xFFFFFFFF
+                : $this->uncompressedSize,
+            fileName: $this->fileName,
+            extraField: $footer,
+        );
+
+
+        ($this->send)($data);
+    }
+
+    /**
+     * Strip characters that are not legal in Windows filenames
+     * to prevent compatibility issues
+     */
+    private static function filterFilename(
+        /**
+         * Unprocessed filename
+         */
+        string $fileName
+    ): string {
+        // strip leading slashes from file name
+        // (fixes bug in windows archive viewer)
+        $fileName = ltrim($fileName, '/');
+
+        return str_replace(['\\', ':', '*', '?', '"', '<', '>', '|'], '_', $fileName);
+    }
+
+    private function checkEncoding(): void
+    {
+        // Sets Bit 11: Language encoding flag (EFS).  If this bit is set,
+        // the filename and comment fields for this file
+        // MUST be encoded using UTF-8. (see APPENDIX D)
+        if (mb_check_encoding($this->fileName, 'UTF-8') &&
+                mb_check_encoding($this->comment, 'UTF-8')) {
+            $this->generalPurposeBitFlag |= GeneralPurposeBitFlag::EFS;
+        }
+    }
+
+    private function buildZip64ExtraBlock(bool $force = false): string
+    {
+        $outputZip64ExtraBlock = false;
+
+        $originalSize = null;
+        if ($force || $this->uncompressedSize > 0xFFFFFFFF) {
+            $outputZip64ExtraBlock = true;
+            $originalSize = $this->uncompressedSize;
+        }
+
+        $compressedSize = null;
+        if ($force || $this->compressedSize > 0xFFFFFFFF) {
+            $outputZip64ExtraBlock = true;
+            $compressedSize = $this->compressedSize;
+        }
+
+        // If this file will start over 4GB limit in ZIP file,
+        // CDR record will have to use Zip64 extension to describe offset
+        // to keep consistency we use the same value here
+        $relativeHeaderOffset = null;
+        if ($this->startOffset > 0xFFFFFFFF) {
+            $outputZip64ExtraBlock = true;
+            $relativeHeaderOffset = $this->startOffset;
+        }
+
+        if (!$outputZip64ExtraBlock) {
+            return '';
+        }
+
+        if (!$this->enableZip64) {
+            throw new OverflowException();
+        }
+
+        return Zip64\ExtendedInformationExtraField::generate(
+            originalSize: $originalSize,
+            compressedSize: $compressedSize,
+            relativeHeaderOffset: $relativeHeaderOffset,
+            diskStartNumber: null,
+        );
+    }
+
+    private function addFileFooter(): void
+    {
+        if (($this->compressedSize > 0xFFFFFFFF || $this->uncompressedSize > 0xFFFFFFFF) && $this->version !== Version::ZIP64) {
+            throw new OverflowException();
+        }
+
+        if (!$this->enableZeroHeader) {
+            return;
+        }
+
+        if ($this->version === Version::ZIP64) {
+            $footer = Zip64\DataDescriptor::generate(
+                crc32UncompressedData: $this->crc,
+                compressedSize: $this->compressedSize,
+                uncompressedSize: $this->uncompressedSize,
+            );
+        } else {
+            $footer = DataDescriptor::generate(
+                crc32UncompressedData: $this->crc,
+                compressedSize: $this->compressedSize,
+                uncompressedSize: $this->uncompressedSize,
+            );
+        }
+
+        ($this->send)($footer);
+    }
+
+    private function readStream(bool $send): void
+    {
+        $this->compressedSize = 0;
+        $this->uncompressedSize = 0;
+        $hash = hash_init('crc32b');
+
+        $deflate = $this->compressionInit();
+
+        while (
+            !feof($this->unpackStream()) &&
+            ($this->maxSize === null || $this->uncompressedSize < $this->maxSize) &&
+            ($this->exactSize === null || $this->uncompressedSize < $this->exactSize)
+        ) {
+            $readLength = min(
+                ($this->maxSize ?? PHP_INT_MAX) - $this->uncompressedSize,
+                ($this->exactSize ?? PHP_INT_MAX) - $this->uncompressedSize,
+                self::CHUNKED_READ_BLOCK_SIZE
+            );
+
+            $data = fread($this->unpackStream(), $readLength);
+
+            hash_update($hash, $data);
+
+            $this->uncompressedSize += strlen($data);
+
+            if ($deflate) {
+                $data =  deflate_add(
+                    $deflate,
+                    $data,
+                    feof($this->unpackStream()) ? ZLIB_FINISH : ZLIB_NO_FLUSH
+                );
+            }
+
+            $this->compressedSize += strlen($data);
+
+            if ($send) {
+                ($this->send)($data);
+            }
+        }
+
+        if ($this->exactSize && $this->uncompressedSize !== $this->exactSize) {
+            throw new FileSizeIncorrectException(expectedSize: $this->exactSize, actualSize: $this->uncompressedSize);
+        }
+
+        $this->crc = hexdec(hash_final($hash));
+    }
+
+    private function compressionInit(): ?DeflateContext
+    {
+        switch($this->compressionMethod) {
+            case CompressionMethod::STORE:
+                // Noting to do
+                return null;
+            case CompressionMethod::DEFLATE:
+                $deflateContext = deflate_init(
+                    ZLIB_ENCODING_RAW,
+                    ['level' => $this->deflateLevel]
+                );
+
+                if (!$deflateContext) {
+                    // @codeCoverageIgnoreStart
+                    throw new RuntimeException("Can't initialize deflate context.");
+                    // @codeCoverageIgnoreEnd
+                }
+
+                // False positive, resource is no longer returned from this function
+                return $deflateContext;
+            default:
+                // @codeCoverageIgnoreStart
+                throw new RuntimeException('Unsupported Compression Method ' . print_r($this->compressionMethod, true));
+                // @codeCoverageIgnoreEnd
+        }
+    }
+
+    private function getCdrFile(): string
+    {
+        $footer = $this->buildZip64ExtraBlock();
+
+        return CentralDirectoryFileHeader::generate(
+            versionMadeBy: ZipStream::ZIP_VERSION_MADE_BY,
+            versionNeededToExtract:$this->version->value,
+            generalPurposeBitFlag: $this->generalPurposeBitFlag,
+            compressionMethod: $this->compressionMethod,
+            lastModificationDateTime: $this->lastModificationDateTime,
+            crc32: $this->crc,
+            compressedSize: $this->compressedSize > 0xFFFFFFFF
+                ? 0xFFFFFFFF
+                : $this->compressedSize,
+            uncompressedSize: $this->uncompressedSize > 0xFFFFFFFF
+                ? 0xFFFFFFFF
+                : $this->uncompressedSize,
+            fileName: $this->fileName,
+            extraField: $footer,
+            fileComment: $this->comment,
+            diskNumberStart: 0,
+            internalFileAttributes: 0,
+            externalFileAttributes: 32,
+            relativeOffsetOfLocalHeader: $this->startOffset > 0xFFFFFFFF
+                ? 0xFFFFFFFF
+                : $this->startOffset,
+        );
+    }
+
+    private function isSimulation(): bool
+    {
+        return $this->operationMode === OperationMode::SIMULATE_LAX || $this->operationMode === OperationMode::SIMULATE_STRICT;
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/GeneralPurposeBitFlag.php b/src/Common/vendor/maennchen/zipstream-php/src/GeneralPurposeBitFlag.php
new file mode 100644
index 00000000..23a66d88
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/GeneralPurposeBitFlag.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+/**
+ * @internal
+ */
+abstract class GeneralPurposeBitFlag
+{
+    /**
+     * If set, indicates that the file is encrypted.
+     */
+    public const ENCRYPTED = 1 << 0;
+
+    /**
+     * (For Methods 8 and 9 - Deflating)
+     * Normal (-en) compression option was used.
+     */
+    public const DEFLATE_COMPRESSION_NORMAL = 0 << 1;
+
+    /**
+     * (For Methods 8 and 9 - Deflating)
+     * Maximum (-exx/-ex) compression option was used.
+     */
+    public const DEFLATE_COMPRESSION_MAXIMUM = 1 << 1;
+
+    /**
+     * (For Methods 8 and 9 - Deflating)
+     * Fast (-ef) compression option was used.
+     */
+    public const DEFLATE_COMPRESSION_FAST = 10 << 1;
+
+    /**
+     * (For Methods 8 and 9 - Deflating)
+     * Super Fast (-es) compression option was used.
+     */
+    public const DEFLATE_COMPRESSION_SUPERFAST = 11 << 1;
+
+    /**
+     * If the compression method used was type 14,
+     * LZMA, then this bit, if set, indicates
+     * an end-of-stream (EOS) marker is used to
+     * mark the end of the compressed data stream.
+     * If clear, then an EOS marker is not present
+     * and the compressed data size must be known
+     * to extract.
+     */
+    public const LZMA_EOS = 1 << 1;
+
+    /**
+     * If this bit is set, the fields crc-32, compressed
+     * size and uncompressed size are set to zero in the
+     * local header.  The correct values are put in the
+     * data descriptor immediately following the compressed
+     * data.
+     */
+    public const ZERO_HEADER = 1 << 3;
+
+    /**
+     * If this bit is set, this indicates that the file is
+     * compressed patched data.
+     */
+    public const COMPRESSED_PATCHED_DATA = 1 << 5;
+
+    /**
+     * Strong encryption. If this bit is set, you MUST
+     * set the version needed to extract value to at least
+     * 50 and you MUST also set bit 0.  If AES encryption
+     * is used, the version needed to extract value MUST
+     * be at least 51.
+     */
+    public const STRONG_ENCRYPTION = 1 << 6;
+
+    /**
+     * Language encoding flag (EFS).  If this bit is set,
+     * the filename and comment fields for this file
+     * MUST be encoded using UTF-8.
+     */
+    public const EFS = 1 << 11;
+
+    /**
+     * Set when encrypting the Central Directory to indicate
+     * selected data values in the Local Header are masked to
+     * hide their actual values.
+     */
+    public const ENCRYPT_CENTRAL_DIRECTORY = 1 << 13;
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/LocalFileHeader.php b/src/Common/vendor/maennchen/zipstream-php/src/LocalFileHeader.php
new file mode 100644
index 00000000..e08b6561
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/LocalFileHeader.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use DateTimeInterface;
+
+/**
+ * @internal
+ */
+abstract class LocalFileHeader
+{
+    private const SIGNATURE = 0x04034b50;
+
+    public static function generate(
+        int $versionNeededToExtract,
+        int $generalPurposeBitFlag,
+        CompressionMethod $compressionMethod,
+        DateTimeInterface $lastModificationDateTime,
+        int $crc32UncompressedData,
+        int $compressedSize,
+        int $uncompressedSize,
+        string $fileName,
+        string $extraField,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'V', value: self::SIGNATURE),
+            new PackField(format: 'v', value: $versionNeededToExtract),
+            new PackField(format: 'v', value: $generalPurposeBitFlag),
+            new PackField(format: 'v', value: $compressionMethod->value),
+            new PackField(format: 'V', value: Time::dateTimeToDosTime($lastModificationDateTime)),
+            new PackField(format: 'V', value: $crc32UncompressedData),
+            new PackField(format: 'V', value: $compressedSize),
+            new PackField(format: 'V', value: $uncompressedSize),
+            new PackField(format: 'v', value: strlen($fileName)),
+            new PackField(format: 'v', value: strlen($extraField)),
+        ) . $fileName . $extraField;
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/OperationMode.php b/src/Common/vendor/maennchen/zipstream-php/src/OperationMode.php
new file mode 100644
index 00000000..dd650f07
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/OperationMode.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+/**
+ * ZipStream execution operation modes
+ */
+enum OperationMode
+{
+    /**
+     * Stream file into output stream
+     */
+    case NORMAL;
+
+    /**
+     * Simulate the zip to figure out the resulting file size
+     *
+     * This only supports entries where the file size is known beforehand and
+     * deflation is disabled.
+     */
+    case SIMULATE_STRICT;
+
+    /**
+     * Simulate the zip to figure out the resulting file size
+     *
+     * If the file size is not known beforehand or deflation is enabled, the
+     * entry streams will be read and rewound.
+     *
+     * If the entry does not support rewinding either, you will not be able to
+     * use the same stream in a later operation mode like `NORMAL`.
+     */
+    case SIMULATE_LAX;
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/PackField.php b/src/Common/vendor/maennchen/zipstream-php/src/PackField.php
new file mode 100644
index 00000000..3370dd8d
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/PackField.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use RuntimeException;
+
+/**
+ * @internal
+ * TODO: Make class readonly when requiring PHP 8.2 exclusively
+ */
+class PackField
+{
+    public const MAX_V = 0xFFFFFFFF;
+
+    public const MAX_v = 0xFFFF;
+
+    public function __construct(
+        public readonly string $format,
+        public readonly int|string $value
+    ) {
+    }
+
+    /**
+     * Create a format string and argument list for pack(), then call
+     * pack() and return the result.
+     */
+    public static function pack(self ...$fields): string
+    {
+        $fmt = array_reduce($fields, function (string $acc, self $field) {
+            return $acc . $field->format;
+        }, '');
+
+        $args = array_map(function (self $field) {
+            switch($field->format) {
+                case 'V':
+                    if ($field->value > self::MAX_V) {
+                        throw new RuntimeException(print_r($field->value, true) . ' is larger than 32 bits');
+                    }
+                    break;
+                case 'v':
+                    if ($field->value > self::MAX_v) {
+                        throw new RuntimeException(print_r($field->value, true) . ' is larger than 16 bits');
+                    }
+                    break;
+                case 'P': break;
+                default:
+                    break;
+            }
+
+            return $field->value;
+        }, $fields);
+
+        return pack($fmt, ...$args);
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Time.php b/src/Common/vendor/maennchen/zipstream-php/src/Time.php
new file mode 100644
index 00000000..4bfba3cc
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Time.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use DateInterval;
+use DateTimeImmutable;
+use DateTimeInterface;
+use ZipStream\Exception\DosTimeOverflowException;
+
+/**
+ * @internal
+ */
+abstract class Time
+{
+    private const DOS_MINIMUM_DATE = '1980-01-01 00:00:00Z';
+
+    public static function dateTimeToDosTime(DateTimeInterface $dateTime): int
+    {
+        $dosMinimumDate = new DateTimeImmutable(self::DOS_MINIMUM_DATE);
+
+        if ($dateTime->getTimestamp() < $dosMinimumDate->getTimestamp()) {
+            throw new DosTimeOverflowException(dateTime: $dateTime);
+        }
+
+        $dateTime = DateTimeImmutable::createFromInterface($dateTime)->sub(new DateInterval('P1980Y'));
+
+        ['year' => $year,
+            'mon' => $month,
+            'mday' => $day,
+            'hours' => $hour,
+            'minutes' => $minute,
+            'seconds' => $second
+        ] = getdate($dateTime->getTimestamp());
+
+        return
+            ($year << 25) |
+            ($month << 21) |
+            ($day << 16) |
+            ($hour << 11) |
+            ($minute << 5) |
+            ($second >> 1);
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Version.php b/src/Common/vendor/maennchen/zipstream-php/src/Version.php
new file mode 100644
index 00000000..c014f8a1
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Version.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+enum Version: int
+{
+    case STORE = 0x000A; // 1.00
+    case DEFLATE = 0x0014; // 2.00
+    case ZIP64 = 0x002D; // 4.50
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Zip64/DataDescriptor.php b/src/Common/vendor/maennchen/zipstream-php/src/Zip64/DataDescriptor.php
new file mode 100644
index 00000000..041c5579
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Zip64/DataDescriptor.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zip64;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class DataDescriptor
+{
+    private const SIGNATURE = 0x08074b50;
+
+    public static function generate(
+        int $crc32UncompressedData,
+        int $compressedSize,
+        int $uncompressedSize,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'V', value: self::SIGNATURE),
+            new PackField(format: 'V', value: $crc32UncompressedData),
+            new PackField(format: 'P', value: $compressedSize),
+            new PackField(format: 'P', value: $uncompressedSize),
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectory.php b/src/Common/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectory.php
new file mode 100644
index 00000000..08588e49
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectory.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zip64;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class EndOfCentralDirectory
+{
+    private const SIGNATURE = 0x06064b50;
+
+    public static function generate(
+        int $versionMadeBy,
+        int $versionNeededToExtract,
+        int $numberOfThisDisk,
+        int $numberOfTheDiskWithCentralDirectoryStart,
+        int $numberOfCentralDirectoryEntriesOnThisDisk,
+        int $numberOfCentralDirectoryEntries,
+        int $sizeOfCentralDirectory,
+        int $centralDirectoryStartOffsetOnDisk,
+        string $extensibleDataSector,
+    ): string {
+        $recordSize = 44 + strlen($extensibleDataSector); // (length of block - 12) = 44;
+
+        /** @psalm-suppress MixedArgument */
+        return PackField::pack(
+            new PackField(format: 'V', value: static::SIGNATURE),
+            new PackField(format: 'P', value: $recordSize),
+            new PackField(format: 'v', value: $versionMadeBy),
+            new PackField(format: 'v', value: $versionNeededToExtract),
+            new PackField(format: 'V', value: $numberOfThisDisk),
+            new PackField(format: 'V', value: $numberOfTheDiskWithCentralDirectoryStart),
+            new PackField(format: 'P', value: $numberOfCentralDirectoryEntriesOnThisDisk),
+            new PackField(format: 'P', value: $numberOfCentralDirectoryEntries),
+            new PackField(format: 'P', value: $sizeOfCentralDirectory),
+            new PackField(format: 'P', value: $centralDirectoryStartOffsetOnDisk),
+        ) . $extensibleDataSector;
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectoryLocator.php b/src/Common/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectoryLocator.php
new file mode 100644
index 00000000..ef431c34
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectoryLocator.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zip64;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class EndOfCentralDirectoryLocator
+{
+    private const SIGNATURE = 0x07064b50;
+
+    public static function generate(
+        int $numberOfTheDiskWithZip64CentralDirectoryStart,
+        int $zip64centralDirectoryStartOffsetOnDisk,
+        int $totalNumberOfDisks,
+    ): string {
+        /** @psalm-suppress MixedArgument */
+        return PackField::pack(
+            new PackField(format: 'V', value: static::SIGNATURE),
+            new PackField(format: 'V', value: $numberOfTheDiskWithZip64CentralDirectoryStart),
+            new PackField(format: 'P', value: $zip64centralDirectoryStartOffsetOnDisk),
+            new PackField(format: 'V', value: $totalNumberOfDisks),
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php b/src/Common/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php
new file mode 100644
index 00000000..b647ce6c
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zip64;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class ExtendedInformationExtraField
+{
+    private const TAG = 0x0001;
+
+    public static function generate(
+        ?int $originalSize = null,
+        ?int $compressedSize = null,
+        ?int $relativeHeaderOffset = null,
+        ?int $diskStartNumber = null,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'v', value: self::TAG),
+            new PackField(
+                format: 'v',
+                value:
+                    ($originalSize === null ? 0 : 8) +
+                    ($compressedSize === null ? 0 : 8) +
+                    ($relativeHeaderOffset === null ? 0 : 8) +
+                    ($diskStartNumber === null ? 0 : 4)
+            ),
+            ...($originalSize === null ? [] : [
+                new PackField(format: 'P', value: $originalSize),
+            ]),
+            ...($compressedSize === null ? [] : [
+                new PackField(format: 'P', value: $compressedSize),
+            ]),
+            ...($relativeHeaderOffset === null ? [] : [
+                new PackField(format: 'P', value: $relativeHeaderOffset),
+            ]),
+            ...($diskStartNumber === null ? [] : [
+                new PackField(format: 'V', value: $diskStartNumber),
+            ]),
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/ZipStream.php b/src/Common/vendor/maennchen/zipstream-php/src/ZipStream.php
new file mode 100644
index 00000000..cd308a49
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/ZipStream.php
@@ -0,0 +1,864 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use Closure;
+use DateTimeImmutable;
+use DateTimeInterface;
+use GuzzleHttp\Psr7\StreamWrapper;
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+use ZipStream\Exception\FileNotFoundException;
+use ZipStream\Exception\FileNotReadableException;
+use ZipStream\Exception\OverflowException;
+use ZipStream\Exception\ResourceActionException;
+
+/**
+ * Streamed, dynamically generated zip archives.
+ *
+ * ## Usage
+ *
+ * Streaming zip archives is a simple, three-step process:
+ *
+ * 1.  Create the zip stream:
+ *
+ * ```php
+ * $zip = new ZipStream(outputName: 'example.zip');
+ * ```
+ *
+ * 2.  Add one or more files to the archive:
+ *
+ * ```php
+ * // add first file
+ * $zip->addFile(fileName: 'world.txt', data: 'Hello World');
+ *
+ * // add second file
+ * $zip->addFile(fileName: 'moon.txt', data: 'Hello Moon');
+ * ```
+ *
+ * 3.  Finish the zip stream:
+ *
+ * ```php
+ * $zip->finish();
+ * ```
+ *
+ * You can also add an archive comment, add comments to individual files,
+ * and adjust the timestamp of files. See the API documentation for each
+ * method below for additional information.
+ *
+ * ## Example
+ *
+ * ```php
+ * // create a new zip stream object
+ * $zip = new ZipStream(outputName: 'some_files.zip');
+ *
+ * // list of local files
+ * $files = array('foo.txt', 'bar.jpg');
+ *
+ * // read and add each file to the archive
+ * foreach ($files as $path)
+ *   $zip->addFileFormPath(fileName: $path, $path);
+ *
+ * // write archive footer to stream
+ * $zip->finish();
+ * ```
+ */
+class ZipStream
+{
+    /**
+     * This number corresponds to the ZIP version/OS used (2 bytes)
+     * From: https://www.iana.org/assignments/media-types/application/zip
+     * The upper byte (leftmost one) indicates the host system (OS) for the
+     * file.  Software can use this information to determine
+     * the line record format for text files etc.  The current
+     * mappings are:
+     *
+     * 0 - MS-DOS and OS/2 (F.A.T. file systems)
+     * 1 - Amiga                     2 - VAX/VMS
+     * 3 - *nix                      4 - VM/CMS
+     * 5 - Atari ST                  6 - OS/2 H.P.F.S.
+     * 7 - Macintosh                 8 - Z-System
+     * 9 - CP/M                      10 thru 255 - unused
+     *
+     * The lower byte (rightmost one) indicates the version number of the
+     * software used to encode the file.  The value/10
+     * indicates the major version number, and the value
+     * mod 10 is the minor version number.
+     * Here we are using 6 for the OS, indicating OS/2 H.P.F.S.
+     * to prevent file permissions issues upon extract (see #84)
+     * 0x603 is 00000110 00000011 in binary, so 6 and 3
+     *
+     * @internal
+     */
+    public const ZIP_VERSION_MADE_BY = 0x603;
+
+    private bool $ready = true;
+
+    private int $offset = 0;
+
+    /**
+     * @var string[]
+     */
+    private array $centralDirectoryRecords = [];
+
+    /**
+     * @var resource
+     */
+    private $outputStream;
+
+    private readonly Closure $httpHeaderCallback;
+
+    /**
+     * @var File[]
+     */
+    private array $recordedSimulation = [];
+
+    /**
+     * Create a new ZipStream object.
+     *
+     * ##### Examples
+     *
+     * ```php
+     * // create a new zip file named 'foo.zip'
+     * $zip = new ZipStream(outputName: 'foo.zip');
+     *
+     * // create a new zip file named 'bar.zip' with a comment
+     * $zip = new ZipStream(
+     *   outputName: 'bar.zip',
+     *   comment: 'this is a comment for the zip file.',
+     * );
+     * ```
+     *
+     * @param OperationMode $operationMode
+     * The mode can be used to switch between `NORMAL` and `SIMULATION_*` modes.
+     * For details see the `OperationMode` documentation.
+     *
+     * Default to `NORMAL`.
+     *
+     * @param string $comment
+     * Archive Level Comment
+     *
+     * @param StreamInterface|resource|null $outputStream
+     * Override the output of the archive to a different target.
+     *
+     * By default the archive is sent to `STDOUT`.
+     *
+     * @param CompressionMethod $defaultCompressionMethod
+     * How to handle file compression. Legal values are
+     * `CompressionMethod::DEFLATE` (the default), or
+     * `CompressionMethod::STORE`. `STORE` sends the file raw and is
+     * significantly faster, while `DEFLATE` compresses the file and
+     * is much, much slower.
+     *
+     * @param int $defaultDeflateLevel
+     * Default deflation level. Only relevant if `compressionMethod`
+     * is `DEFLATE`.
+     *
+     * See details of [`deflate_init`](https://www.php.net/manual/en/function.deflate-init.php#refsect1-function.deflate-init-parameters)
+     *
+     * @param bool $enableZip64
+     * Enable Zip64 extension, supporting very large
+     * archives (any size > 4 GB or file count > 64k)
+     *
+     * @param bool $defaultEnableZeroHeader
+     * Enable streaming files with single read.
+     *
+     * When the zero header is set, the file is streamed into the output
+     * and the size & checksum are added at the end of the file. This is the
+     * fastest method and uses the least memory. Unfortunately not all
+     * ZIP clients fully support this and can lead to clients reporting
+     * the generated ZIP files as corrupted in combination with other
+     * circumstances. (Zip64 enabled, using UTF8 in comments / names etc.)
+     *
+     * When the zero header is not set, the length & checksum need to be
+     * defined before the file is actually added. To prevent loading all
+     * the data into memory, the data has to be read twice. If the data
+     * which is added is not seekable, this call will fail.
+     *
+     * @param bool $sendHttpHeaders
+     * Boolean indicating whether or not to send
+     * the HTTP headers for this file.
+     *
+     * @param ?Closure $httpHeaderCallback
+     * The method called to send HTTP headers
+     *
+     * @param string|null $outputName
+     * The name of the created archive.
+     *
+     * Only relevant if `$sendHttpHeaders = true`.
+     *
+     * @param string $contentDisposition
+     * HTTP Content-Disposition
+     *
+     * Only relevant if `sendHttpHeaders = true`.
+     *
+     * @param string $contentType
+     * HTTP Content Type
+     *
+     * Only relevant if `sendHttpHeaders = true`.
+     *
+     * @param bool $flushOutput
+     * Enable flush after every write to output stream.
+     *
+     * @return self
+     */
+    public function __construct(
+        private OperationMode $operationMode = OperationMode::NORMAL,
+        private readonly string $comment = '',
+        $outputStream = null,
+        private readonly CompressionMethod $defaultCompressionMethod = CompressionMethod::DEFLATE,
+        private readonly int $defaultDeflateLevel = 6,
+        private readonly bool $enableZip64 = true,
+        private readonly bool $defaultEnableZeroHeader = true,
+        private bool $sendHttpHeaders = true,
+        ?Closure $httpHeaderCallback = null,
+        private readonly ?string $outputName = null,
+        private readonly string $contentDisposition = 'attachment',
+        private readonly string $contentType = 'application/x-zip',
+        private bool $flushOutput = false,
+    ) {
+        $this->outputStream = self::normalizeStream($outputStream);
+        $this->httpHeaderCallback = $httpHeaderCallback ?? header(...);
+    }
+
+    /**
+     * Add a file to the archive.
+     *
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
+     *
+     * ##### Examples
+     *
+     * ```php
+     * // add a file named 'world.txt'
+     * $zip->addFile(fileName: 'world.txt', data: 'Hello World!');
+     *
+     * // add a file named 'bar.jpg' with a comment and a last-modified
+     * // time of two hours ago
+     * $zip->addFile(
+     *   fileName: 'bar.jpg',
+     *   data: $data,
+     *   comment: 'this is a comment about bar.jpg',
+     *   lastModificationDateTime: new DateTime('2 hours ago'),
+     * );
+     * ```
+     *
+     * @param string $data
+     *
+     * contents of file
+     */
+    public function addFile(
+        string $fileName,
+        string $data,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: fn () => $data,
+            comment: $comment,
+            compressionMethod: $compressionMethod,
+            deflateLevel: $deflateLevel,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZeroHeader: $enableZeroHeader,
+        );
+    }
+
+    /**
+     * Add a file at path to the archive.
+     *
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
+     *
+     * ###### Examples
+     *
+     * ```php
+     * // add a file named 'foo.txt' from the local file '/tmp/foo.txt'
+     * $zip->addFileFromPath(
+     *   fileName: 'foo.txt',
+     *   path: '/tmp/foo.txt',
+     * );
+     *
+     * // add a file named 'bigfile.rar' from the local file
+     * // '/usr/share/bigfile.rar' with a comment and a last-modified
+     * // time of two hours ago
+     * $zip->addFile(
+     *   fileName: 'bigfile.rar',
+     *   path: '/usr/share/bigfile.rar',
+     *   comment: 'this is a comment about bigfile.rar',
+     *   lastModificationDateTime: new DateTime('2 hours ago'),
+     * );
+     * ```
+     *
+     * @throws \ZipStream\Exception\FileNotFoundException
+     * @throws \ZipStream\Exception\FileNotReadableException
+     */
+    public function addFileFromPath(
+        /**
+         * name of file in archive (including directory path).
+         */
+        string $fileName,
+
+        /**
+         * path to file on disk (note: paths should be encoded using
+         * UNIX-style forward slashes -- e.g '/path/to/some/file').
+         */
+        string $path,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        if (!is_readable($path)) {
+            if (!file_exists($path)) {
+                throw new FileNotFoundException($path);
+            }
+            throw new FileNotReadableException($path);
+        }
+
+        if ($fileTime = filemtime($path)) {
+            $lastModificationDateTime ??= (new DateTimeImmutable())->setTimestamp($fileTime);
+        }
+
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: function () use ($path) {
+
+                $stream =  fopen($path, 'rb');
+
+                if (!$stream) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('fopen');
+                    // @codeCoverageIgnoreEnd
+                }
+
+                return $stream;
+            },
+            comment: $comment,
+            compressionMethod: $compressionMethod,
+            deflateLevel: $deflateLevel,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZeroHeader: $enableZeroHeader,
+        );
+    }
+
+    /**
+     * Add an open stream (resource) to the archive.
+     *
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
+     *
+     * ##### Examples
+     *
+     * ```php
+     * // create a temporary file stream and write text to it
+     * $filePointer = tmpfile();
+     * fwrite($filePointer, 'The quick brown fox jumped over the lazy dog.');
+     *
+     * // add a file named 'streamfile.txt' from the content of the stream
+     * $archive->addFileFromStream(
+     *   fileName: 'streamfile.txt',
+     *   stream: $filePointer,
+     * );
+     * ```
+     *
+     * @param resource $stream contents of file as a stream resource
+     */
+    public function addFileFromStream(
+        string $fileName,
+        $stream,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: fn () => $stream,
+            comment: $comment,
+            compressionMethod: $compressionMethod,
+            deflateLevel: $deflateLevel,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZeroHeader: $enableZeroHeader,
+        );
+    }
+
+    /**
+     * Add an open stream to the archive.
+     *
+     * ##### Examples
+     *
+     * ```php
+     * $stream = $response->getBody();
+     * // add a file named 'streamfile.txt' from the content of the stream
+     * $archive->addFileFromPsr7Stream(
+     *   fileName: 'streamfile.txt',
+     *   stream: $stream,
+     * );
+     * ```
+     *
+     * @param string $fileName
+     * path of file in archive (including directory)
+     *
+     * @param StreamInterface $stream
+     * contents of file as a stream resource
+     *
+     * @param string $comment
+     * ZIP comment for this file
+     *
+     * @param ?CompressionMethod $compressionMethod
+     * Override `defaultCompressionMethod`
+     *
+     * See {@see __construct()}
+     *
+     * @param ?int $deflateLevel
+     * Override `defaultDeflateLevel`
+     *
+     * See {@see __construct()}
+     *
+     * @param ?DateTimeInterface $lastModificationDateTime
+     * Set last modification time of file.
+     *
+     * Default: `now`
+     *
+     * @param ?int $maxSize
+     * Only read `maxSize` bytes from file.
+     *
+     * The file is considered done when either reaching `EOF`
+     * or the `maxSize`.
+     *
+     * @param ?int $exactSize
+     * Read exactly `exactSize` bytes from file.
+     * If `EOF` is reached before reading `exactSize` bytes, an error will be
+     * thrown. The parameter allows for faster size calculations if the `stream`
+     * does not support `fstat` size or is slow and otherwise known beforehand.
+     *
+     * @param ?bool $enableZeroHeader
+     * Override `defaultEnableZeroHeader`
+     *
+     * See {@see __construct()}
+     */
+    public function addFileFromPsr7Stream(
+        string $fileName,
+        StreamInterface $stream,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: fn () => $stream,
+            comment: $comment,
+            compressionMethod: $compressionMethod,
+            deflateLevel: $deflateLevel,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZeroHeader: $enableZeroHeader,
+        );
+    }
+
+    /**
+     * Add a file based on a callback.
+     *
+     * This is useful when you want to simulate a lot of files without keeping
+     * all of the file handles open at the same time.
+     *
+     * ##### Examples
+     *
+     * ```php
+     * foreach($files as $name => $size) {
+     *   $archive->addFileFromPsr7Stream(
+     *     fileName: 'streamfile.txt',
+     *     exactSize: $size,
+     *     callback: function() use($name): Psr\Http\Message\StreamInterface {
+     *       $response = download($name);
+     *       return $response->getBody();
+     *     }
+     *   );
+     * }
+     * ```
+     *
+     * @param string $fileName
+     * path of file in archive (including directory)
+     *
+     * @param Closure $callback
+     * @psalm-param Closure(): (resource|StreamInterface|string) $callback
+     * A callback to get the file contents in the shape of a PHP stream,
+     * a Psr StreamInterface implementation, or a string.
+     *
+     * @param string $comment
+     * ZIP comment for this file
+     *
+     * @param ?CompressionMethod $compressionMethod
+     * Override `defaultCompressionMethod`
+     *
+     * See {@see __construct()}
+     *
+     * @param ?int $deflateLevel
+     * Override `defaultDeflateLevel`
+     *
+     * See {@see __construct()}
+     *
+     * @param ?DateTimeInterface $lastModificationDateTime
+     * Set last modification time of file.
+     *
+     * Default: `now`
+     *
+     * @param ?int $maxSize
+     * Only read `maxSize` bytes from file.
+     *
+     * The file is considered done when either reaching `EOF`
+     * or the `maxSize`.
+     *
+     * @param ?int $exactSize
+     * Read exactly `exactSize` bytes from file.
+     * If `EOF` is reached before reading `exactSize` bytes, an error will be
+     * thrown. The parameter allows for faster size calculations if the `stream`
+     * does not support `fstat` size or is slow and otherwise known beforehand.
+     *
+     * @param ?bool $enableZeroHeader
+     * Override `defaultEnableZeroHeader`
+     *
+     * See {@see __construct()}
+     */
+    public function addFileFromCallback(
+        string $fileName,
+        Closure $callback,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        $file = new File(
+            dataCallback: function () use ($callback, $maxSize) {
+                $data = $callback();
+
+                if(is_resource($data)) {
+                    return $data;
+                }
+
+                if($data instanceof StreamInterface) {
+                    return StreamWrapper::getResource($data);
+                }
+
+
+                $stream = fopen('php://memory', 'rw+');
+                if ($stream === false) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('fopen');
+                    // @codeCoverageIgnoreEnd
+                }
+                if ($maxSize !== null && fwrite($stream, $data, $maxSize) === false) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('fwrite', $stream);
+                    // @codeCoverageIgnoreEnd
+                } elseif (fwrite($stream, $data) === false) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('fwrite', $stream);
+                    // @codeCoverageIgnoreEnd
+                }
+                if (rewind($stream) === false) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('rewind', $stream);
+                    // @codeCoverageIgnoreEnd
+                }
+
+                return $stream;
+
+            },
+            send: $this->send(...),
+            recordSentBytes: $this->recordSentBytes(...),
+            operationMode: $this->operationMode,
+            fileName: $fileName,
+            startOffset: $this->offset,
+            compressionMethod: $compressionMethod ?? $this->defaultCompressionMethod,
+            comment: $comment,
+            deflateLevel: $deflateLevel ?? $this->defaultDeflateLevel,
+            lastModificationDateTime: $lastModificationDateTime ?? new DateTimeImmutable(),
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZip64: $this->enableZip64,
+            enableZeroHeader: $enableZeroHeader ?? $this->defaultEnableZeroHeader,
+        );
+
+        if($this->operationMode !== OperationMode::NORMAL) {
+            $this->recordedSimulation[] = $file;
+        }
+
+        $this->centralDirectoryRecords[] = $file->process();
+    }
+
+    /**
+     * Add a directory to the archive.
+     *
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
+     *
+     * ##### Examples
+     *
+     * ```php
+     * // add a directory named 'world/'
+     * $zip->addFile(fileName: 'world/');
+     * ```
+     */
+    public function addDirectory(
+        string $fileName,
+        string $comment = '',
+        ?DateTimeInterface $lastModificationDateTime = null,
+    ): void {
+        if (!str_ends_with($fileName, '/')) {
+            $fileName .= '/';
+        }
+
+        $this->addFile(
+            fileName: $fileName,
+            data: '',
+            comment: $comment,
+            compressionMethod: CompressionMethod::STORE,
+            deflateLevel: null,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: 0,
+            exactSize: 0,
+            enableZeroHeader: false,
+        );
+    }
+
+    /**
+     * Executes a previously calculated simulation.
+     *
+     * ##### Example
+     *
+     * ```php
+     * $zip = new ZipStream(
+     *   outputName: 'foo.zip',
+     *   operationMode: OperationMode::SIMULATE_STRICT,
+     * );
+     *
+     * $zip->addFile('test.txt', 'Hello World');
+     *
+     * $size = $zip->finish();
+     *
+     * header('Content-Length: '. $size);
+     *
+     * $zip->executeSimulation();
+     * ```
+     */
+    public function executeSimulation(): void
+    {
+        if($this->operationMode !== OperationMode::NORMAL) {
+            throw new RuntimeException('Zip simulation is not finished.');
+        }
+
+        foreach($this->recordedSimulation as $file) {
+            $this->centralDirectoryRecords[] = $file->cloneSimulationExecution()->process();
+        }
+
+        $this->finish();
+    }
+
+    /**
+     * Write zip footer to stream.
+     *
+     * The clase is left in an unusable state after `finish`.
+     *
+     * ##### Example
+     *
+     * ```php
+     * // write footer to stream
+     * $zip->finish();
+     * ```
+     */
+    public function finish(): int
+    {
+        $centralDirectoryStartOffsetOnDisk = $this->offset;
+        $sizeOfCentralDirectory = 0;
+
+        // add trailing cdr file records
+        foreach ($this->centralDirectoryRecords as $centralDirectoryRecord) {
+            $this->send($centralDirectoryRecord);
+            $sizeOfCentralDirectory += strlen($centralDirectoryRecord);
+        }
+
+        // Add 64bit headers (if applicable)
+        if (count($this->centralDirectoryRecords) >= 0xFFFF ||
+            $centralDirectoryStartOffsetOnDisk > 0xFFFFFFFF ||
+            $sizeOfCentralDirectory > 0xFFFFFFFF) {
+            if (!$this->enableZip64) {
+                throw new OverflowException();
+            }
+
+            $this->send(Zip64\EndOfCentralDirectory::generate(
+                versionMadeBy: self::ZIP_VERSION_MADE_BY,
+                versionNeededToExtract: Version::ZIP64->value,
+                numberOfThisDisk: 0,
+                numberOfTheDiskWithCentralDirectoryStart: 0,
+                numberOfCentralDirectoryEntriesOnThisDisk: count($this->centralDirectoryRecords),
+                numberOfCentralDirectoryEntries: count($this->centralDirectoryRecords),
+                sizeOfCentralDirectory: $sizeOfCentralDirectory,
+                centralDirectoryStartOffsetOnDisk: $centralDirectoryStartOffsetOnDisk,
+                extensibleDataSector: '',
+            ));
+
+            $this->send(Zip64\EndOfCentralDirectoryLocator::generate(
+                numberOfTheDiskWithZip64CentralDirectoryStart: 0x00,
+                zip64centralDirectoryStartOffsetOnDisk: $centralDirectoryStartOffsetOnDisk + $sizeOfCentralDirectory,
+                totalNumberOfDisks: 1,
+            ));
+        }
+
+        // add trailing cdr eof record
+        $numberOfCentralDirectoryEntries = min(count($this->centralDirectoryRecords), 0xFFFF);
+        $this->send(EndOfCentralDirectory::generate(
+            numberOfThisDisk: 0x00,
+            numberOfTheDiskWithCentralDirectoryStart: 0x00,
+            numberOfCentralDirectoryEntriesOnThisDisk: $numberOfCentralDirectoryEntries,
+            numberOfCentralDirectoryEntries: $numberOfCentralDirectoryEntries,
+            sizeOfCentralDirectory: min($sizeOfCentralDirectory, 0xFFFFFFFF),
+            centralDirectoryStartOffsetOnDisk: min($centralDirectoryStartOffsetOnDisk, 0xFFFFFFFF),
+            zipFileComment: $this->comment,
+        ));
+
+        $size = $this->offset;
+
+        // The End
+        $this->clear();
+
+        return $size;
+    }
+
+    /**
+     * @param StreamInterface|resource|null $outputStream
+     * @return resource
+     */
+    private static function normalizeStream($outputStream)
+    {
+        if ($outputStream instanceof StreamInterface) {
+            return StreamWrapper::getResource($outputStream);
+        }
+        if (is_resource($outputStream)) {
+            return $outputStream;
+        }
+        return fopen('php://output', 'wb');
+    }
+
+    /**
+     * Record sent bytes
+     */
+    private function recordSentBytes(int $sentBytes): void
+    {
+        $this->offset += $sentBytes;
+    }
+
+    /**
+     * Send string, sending HTTP headers if necessary.
+     * Flush output after write if configure option is set.
+     */
+    private function send(string $data): void
+    {
+        if (!$this->ready) {
+            throw new RuntimeException('Archive is already finished');
+        }
+
+        if ($this->operationMode === OperationMode::NORMAL && $this->sendHttpHeaders) {
+            $this->sendHttpHeaders();
+            $this->sendHttpHeaders = false;
+        }
+
+        $this->recordSentBytes(strlen($data));
+
+        if ($this->operationMode === OperationMode::NORMAL) {
+            if (fwrite($this->outputStream, $data) === false) {
+                throw new ResourceActionException('fwrite', $this->outputStream);
+            }
+
+            if ($this->flushOutput) {
+                // flush output buffer if it is on and flushable
+                $status = ob_get_status();
+                if (isset($status['flags']) && is_int($status['flags']) && ($status['flags'] & PHP_OUTPUT_HANDLER_FLUSHABLE)) {
+                    ob_flush();
+                }
+
+                // Flush system buffers after flushing userspace output buffer
+                flush();
+            }
+        }
+    }
+
+     /**
+     * Send HTTP headers for this stream.
+     */
+    private function sendHttpHeaders(): void
+    {
+        // grab content disposition
+        $disposition = $this->contentDisposition;
+
+        if ($this->outputName) {
+            // Various different browsers dislike various characters here. Strip them all for safety.
+            $safeOutput = trim(str_replace(['"', "'", '\\', ';', "\n", "\r"], '', $this->outputName));
+
+            // Check if we need to UTF-8 encode the filename
+            $urlencoded = rawurlencode($safeOutput);
+            $disposition .= "; filename*=UTF-8''{$urlencoded}";
+        }
+
+        $headers = [
+            'Content-Type' => $this->contentType,
+            'Content-Disposition' => $disposition,
+            'Pragma' => 'public',
+            'Cache-Control' => 'public, must-revalidate',
+            'Content-Transfer-Encoding' => 'binary',
+        ];
+
+        foreach ($headers as $key => $val) {
+            ($this->httpHeaderCallback)("$key: $val");
+        }
+    }
+
+    /**
+     * Clear all internal variables. Note that the stream object is not
+     * usable after this.
+     */
+    private function clear(): void
+    {
+        $this->centralDirectoryRecords = [];
+        $this->offset = 0;
+
+        if($this->operationMode === OperationMode::NORMAL) {
+            $this->ready = false;
+            $this->recordedSimulation = [];
+        } else {
+            $this->operationMode = OperationMode::NORMAL;
+        }
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/src/Zs/ExtendedInformationExtraField.php b/src/Common/vendor/maennchen/zipstream-php/src/Zs/ExtendedInformationExtraField.php
new file mode 100644
index 00000000..bf621bc0
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/src/Zs/ExtendedInformationExtraField.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zs;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class ExtendedInformationExtraField
+{
+    private const TAG = 0x5653;
+
+    public static function generate(): string
+    {
+        return PackField::pack(
+            new PackField(format: 'v', value: self::TAG),
+            new PackField(format: 'v', value: 0x0000),
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/Assertions.php b/src/Common/vendor/maennchen/zipstream-php/test/Assertions.php
new file mode 100644
index 00000000..900b7cc5
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/Assertions.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+trait Assertions
+{
+    protected function assertFileContains(string $filePath, string $needle): void
+    {
+        $last = '';
+
+        $handle = fopen($filePath, 'r');
+        while (!feof($handle)) {
+            $line = fgets($handle, 1024);
+
+            if(str_contains($last . $line, $needle)) {
+                fclose($handle);
+                return;
+            }
+
+            $last = $line;
+        }
+
+        fclose($handle);
+
+        $this->fail("File {$filePath} must contain {$needle}");
+    }
+
+    protected function assertFileDoesNotContain(string $filePath, string $needle): void
+    {
+        $last = '';
+
+        $handle = fopen($filePath, 'r');
+        while (!feof($handle)) {
+            $line = fgets($handle, 1024);
+
+            if(str_contains($last . $line, $needle)) {
+                fclose($handle);
+
+                $this->fail("File {$filePath} must not contain {$needle}");
+            }
+
+            $last = $line;
+        }
+
+        fclose($handle);
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/CentralDirectoryFileHeaderTest.php b/src/Common/vendor/maennchen/zipstream-php/test/CentralDirectoryFileHeaderTest.php
new file mode 100644
index 00000000..5457b4f4
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/CentralDirectoryFileHeaderTest.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ZipStream\CentralDirectoryFileHeader;
+use ZipStream\CompressionMethod;
+
+class CentralDirectoryFileHeaderTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $dateTime = new DateTimeImmutable('2022-01-01 01:01:01Z');
+
+        $header = CentralDirectoryFileHeader::generate(
+            versionMadeBy: 0x603,
+            versionNeededToExtract: 0x002D,
+            generalPurposeBitFlag: 0x2222,
+            compressionMethod: CompressionMethod::DEFLATE,
+            lastModificationDateTime: $dateTime,
+            crc32: 0x11111111,
+            compressedSize: 0x77777777,
+            uncompressedSize: 0x99999999,
+            fileName: 'test.png',
+            extraField: 'some content',
+            fileComment: 'some comment',
+            diskNumberStart: 0,
+            internalFileAttributes: 0,
+            externalFileAttributes: 32,
+            relativeOffsetOfLocalHeader: 0x1234,
+        );
+
+        $this->assertSame(
+            bin2hex($header),
+            '504b0102' . // 4 bytes; central file header signature
+            '0306' . // 2 bytes; version made by
+            '2d00' . // 2 bytes; version needed to extract
+            '2222' . // 2 bytes; general purpose bit flag
+            '0800' . // 2 bytes; compression method
+            '2008' . // 2 bytes; last mod file time
+            '2154' . // 2 bytes; last mod file date
+            '11111111' . // 4 bytes; crc-32
+            '77777777' . // 4 bytes; compressed size
+            '99999999' . // 4 bytes; uncompressed size
+            '0800' . // 2 bytes; file name length (n)
+            '0c00' . // 2 bytes; extra field length (m)
+            '0c00' . // 2 bytes; file comment length (o)
+            '0000' . // 2 bytes; disk number start
+            '0000' . // 2 bytes; internal file attributes
+            '20000000' . // 4 bytes; external file attributes
+            '34120000' . // 4 bytes; relative offset of local header
+            '746573742e706e67' . // n bytes; file name
+            '736f6d6520636f6e74656e74' . // m bytes; extra field
+            '736f6d6520636f6d6d656e74' // o bytes; file comment
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/DataDescriptorTest.php b/src/Common/vendor/maennchen/zipstream-php/test/DataDescriptorTest.php
new file mode 100644
index 00000000..cc886c74
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/DataDescriptorTest.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\DataDescriptor;
+
+class DataDescriptorTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $this->assertSame(
+            bin2hex(DataDescriptor::generate(
+                crc32UncompressedData: 0x11111111,
+                compressedSize: 0x77777777,
+                uncompressedSize: 0x99999999,
+            )),
+            '504b0708' . // 4 bytes; Optional data descriptor signature = 0x08074b50
+            '11111111' . // 4 bytes; CRC-32 of uncompressed data
+            '77777777' . // 4 bytes; Compressed size
+            '99999999' // 4 bytes; Uncompressed size
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/EndOfCentralDirectoryTest.php b/src/Common/vendor/maennchen/zipstream-php/test/EndOfCentralDirectoryTest.php
new file mode 100644
index 00000000..be0a9074
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/EndOfCentralDirectoryTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\EndOfCentralDirectory;
+
+class EndOfCentralDirectoryTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $this->assertSame(
+            bin2hex(EndOfCentralDirectory::generate(
+                numberOfThisDisk: 0x00,
+                numberOfTheDiskWithCentralDirectoryStart: 0x00,
+                numberOfCentralDirectoryEntriesOnThisDisk: 0x10,
+                numberOfCentralDirectoryEntries: 0x10,
+                sizeOfCentralDirectory: 0x22,
+                centralDirectoryStartOffsetOnDisk: 0x33,
+                zipFileComment: 'foo',
+            )),
+            '504b0506' . // 4 bytes; end of central dir signature 0x06054b50
+            '0000' . // 2 bytes; number of this disk
+            '0000' . // 2 bytes; number of the disk with the start of the central directory
+            '1000' . // 2 bytes; total number of entries in the central directory on this disk
+            '1000' . // 2 bytes; total number of entries in the central directory
+            '22000000' . // 4 bytes; size of the central directory
+            '33000000' . // 4 bytes; offset of start of central directory with respect to the starting disk number
+            '0300' . // 2 bytes; .ZIP file comment length
+            bin2hex('foo')
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php b/src/Common/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php
new file mode 100644
index 00000000..4f1cf5c3
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php
@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+
+class EndlessCycleStream implements StreamInterface
+{
+    private int $offset = 0;
+
+    public function __construct(private readonly string $toRepeat = '0')
+    {
+    }
+
+    public function __toString(): string
+    {
+        throw new RuntimeException('Infinite Stream!');
+    }
+
+    public function close(): void
+    {
+        $this->detach();
+    }
+
+    /**
+     * @return null
+     */
+    public function detach()
+    {
+        return;
+    }
+
+    public function getSize(): ?int
+    {
+        return null;
+    }
+
+    public function tell(): int
+    {
+        return $this->offset;
+    }
+
+    public function eof(): bool
+    {
+        return false;
+    }
+
+    public function isSeekable(): bool
+    {
+        return true;
+    }
+
+    public function seek(int $offset, int $whence = SEEK_SET): void
+    {
+        switch($whence) {
+            case SEEK_SET:
+                $this->offset = $offset;
+                break;
+            case SEEK_CUR:
+                $this->offset += $offset;
+                break;
+            case SEEK_END:
+                throw new RuntimeException('Infinite Stream!');
+                break;
+        }
+    }
+
+    public function rewind(): void
+    {
+        $this->seek(0);
+    }
+
+    public function isWritable(): bool
+    {
+        return false;
+    }
+
+    public function write(string $string): int
+    {
+        throw new RuntimeException('Not writeable');
+    }
+
+    public function isReadable(): bool
+    {
+        return true;
+    }
+
+    public function read(int $length): string
+    {
+        $this->offset += $length;
+        return substr(str_repeat($this->toRepeat, (int) ceil($length / strlen($this->toRepeat))), 0, $length);
+    }
+
+    public function getContents(): string
+    {
+        throw new RuntimeException('Infinite Stream!');
+    }
+
+    public function getMetadata(?string $key = null): array|null
+    {
+        return $key !== null ? null : [];
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/FaultInjectionResource.php b/src/Common/vendor/maennchen/zipstream-php/test/FaultInjectionResource.php
new file mode 100644
index 00000000..3d4440e8
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/FaultInjectionResource.php
@@ -0,0 +1,141 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+class FaultInjectionResource
+{
+    public const NAME = 'zipstream-php-test-broken-resource';
+
+    /** @var resource */
+    public $context;
+
+    private array $injectFaults;
+
+    private string $mode;
+
+    /**
+     * @return resource
+     */
+    public static function getResource(array $injectFaults)
+    {
+        self::register();
+
+        return fopen(self::NAME . '://foobar', 'rw+', false, self::createStreamContext($injectFaults));
+    }
+
+    public function stream_open(string $path, string $mode, int $options, string &$opened_path = null): bool
+    {
+        $options = stream_context_get_options($this->context);
+
+        if (!isset($options[self::NAME]['injectFaults'])) {
+            return false;
+        }
+
+        $this->mode = $mode;
+        $this->injectFaults = $options[self::NAME]['injectFaults'];
+
+        if ($this->shouldFail(__FUNCTION__)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function stream_write(string $data)
+    {
+        if ($this->shouldFail(__FUNCTION__)) {
+            return false;
+        }
+        return true;
+    }
+
+    public function stream_eof()
+    {
+        return true;
+    }
+
+    public function stream_seek(int $offset, int $whence): bool
+    {
+        if ($this->shouldFail(__FUNCTION__)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function stream_tell(): int
+    {
+        if ($this->shouldFail(__FUNCTION__)) {
+            return false;
+        }
+
+        return 0;
+    }
+
+    public static function register(): void
+    {
+        if (!in_array(self::NAME, stream_get_wrappers(), true)) {
+            stream_wrapper_register(self::NAME, __CLASS__);
+        }
+    }
+
+    public function stream_stat(): array
+    {
+        static $modeMap = [
+            'r'  => 33060,
+            'rb' => 33060,
+            'r+' => 33206,
+            'w'  => 33188,
+            'wb' => 33188,
+        ];
+
+        return [
+            'dev'     => 0,
+            'ino'     => 0,
+            'mode'    => $modeMap[$this->mode],
+            'nlink'   => 0,
+            'uid'     => 0,
+            'gid'     => 0,
+            'rdev'    => 0,
+            'size'    => 0,
+            'atime'   => 0,
+            'mtime'   => 0,
+            'ctime'   => 0,
+            'blksize' => 0,
+            'blocks'  => 0,
+        ];
+    }
+
+    public function url_stat(string $path, int $flags): array
+    {
+        return [
+            'dev'     => 0,
+            'ino'     => 0,
+            'mode'    => 0,
+            'nlink'   => 0,
+            'uid'     => 0,
+            'gid'     => 0,
+            'rdev'    => 0,
+            'size'    => 0,
+            'atime'   => 0,
+            'mtime'   => 0,
+            'ctime'   => 0,
+            'blksize' => 0,
+            'blocks'  => 0,
+        ];
+    }
+
+    private static function createStreamContext(array $injectFaults)
+    {
+        return stream_context_create([
+            self::NAME => ['injectFaults' => $injectFaults],
+        ]);
+    }
+
+    private function shouldFail(string $function): bool
+    {
+        return in_array($function, $this->injectFaults, true);
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/LocalFileHeaderTest.php b/src/Common/vendor/maennchen/zipstream-php/test/LocalFileHeaderTest.php
new file mode 100644
index 00000000..196dd0fe
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/LocalFileHeaderTest.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ZipStream\CompressionMethod;
+use ZipStream\LocalFileHeader;
+
+class LocalFileHeaderTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $dateTime = new DateTimeImmutable('2022-01-01 01:01:01Z');
+
+        $header = LocalFileHeader::generate(
+            versionNeededToExtract: 0x002D,
+            generalPurposeBitFlag: 0x2222,
+            compressionMethod: CompressionMethod::DEFLATE,
+            lastModificationDateTime: $dateTime,
+            crc32UncompressedData: 0x11111111,
+            compressedSize: 0x77777777,
+            uncompressedSize: 0x99999999,
+            fileName: 'test.png',
+            extraField: 'some content'
+        );
+
+        $this->assertSame(
+            bin2hex((string) $header),
+            '504b0304' . // 4 bytes; Local file header signature
+            '2d00' . // 2 bytes; Version needed to extract (minimum)
+            '2222' . // 2 bytes; General purpose bit flag
+            '0800' . // 2 bytes; Compression method; e.g. none = 0, DEFLATE = 8
+            '2008' . // 2 bytes; File last modification time
+            '2154' . // 2 bytes; File last modification date
+            '11111111' . // 4 bytes; CRC-32 of uncompressed data
+            '77777777' . // 4 bytes; Compressed size (or 0xffffffff for ZIP64)
+            '99999999' . // 4 bytes; Uncompressed size (or 0xffffffff for ZIP64)
+            '0800' . // 2 bytes; File name length (n)
+            '0c00' . // 2 bytes; Extra field length (m)
+            '746573742e706e67' . // n bytes; File name
+            '736f6d6520636f6e74656e74' // m bytes; Extra field
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/PackFieldTest.php b/src/Common/vendor/maennchen/zipstream-php/test/PackFieldTest.php
new file mode 100644
index 00000000..ecd66bac
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/PackFieldTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use PHPUnit\Framework\TestCase;
+use RuntimeException;
+use ZipStream\PackField;
+
+class PackFieldTest extends TestCase
+{
+    public function testPacksFields(): void
+    {
+        $this->assertSame(
+            bin2hex(PackField::pack(new PackField(format: 'v', value: 0x1122))),
+            '2211',
+        );
+    }
+
+    public function testOverflow2(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+        PackField::pack(new PackField(format: 'v', value: 0xFFFFF));
+    }
+
+    public function testOverflow4(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+        PackField::pack(new PackField(format: 'V', value: 0xFFFFFFFFF));
+    }
+
+    public function testUnknownOperator(): void
+    {
+        $this->assertSame(
+            bin2hex(PackField::pack(new PackField(format: 'a', value: 0x1122))),
+            '34',
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/ResourceStream.php b/src/Common/vendor/maennchen/zipstream-php/test/ResourceStream.php
new file mode 100644
index 00000000..8a414719
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/ResourceStream.php
@@ -0,0 +1,160 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+
+/**
+ * @internal
+ */
+class ResourceStream implements StreamInterface
+{
+    public function __construct(
+        /**
+         * @var resource
+         */
+        private $stream
+    ) {
+    }
+
+    public function __toString(): string
+    {
+        if ($this->isSeekable()) {
+            $this->seek(0);
+        }
+        return (string) stream_get_contents($this->stream);
+    }
+
+    public function close(): void
+    {
+        $stream = $this->detach();
+        if ($stream) {
+            fclose($stream);
+        }
+    }
+
+    public function detach()
+    {
+        $result = $this->stream;
+        // According to the interface, the stream is left in an unusable state;
+        /** @psalm-suppress PossiblyNullPropertyAssignmentValue */
+        $this->stream = null;
+        return $result;
+    }
+
+    public function seek(int $offset, int $whence = SEEK_SET): void
+    {
+        if (!$this->isSeekable()) {
+            throw new RuntimeException();
+        }
+        if (fseek($this->stream, $offset, $whence) !== 0) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+    }
+
+    public function isSeekable(): bool
+    {
+        return (bool)$this->getMetadata('seekable');
+    }
+
+    public function getMetadata(?string $key = null)
+    {
+        $metadata = stream_get_meta_data($this->stream);
+        return $key !== null ? @$metadata[$key] : $metadata;
+    }
+
+    public function getSize(): ?int
+    {
+        $stats = fstat($this->stream);
+        return $stats['size'];
+    }
+
+    public function tell(): int
+    {
+        $position = ftell($this->stream);
+        if ($position === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+        return $position;
+    }
+
+    public function eof(): bool
+    {
+        return feof($this->stream);
+    }
+
+    public function rewind(): void
+    {
+        $this->seek(0);
+    }
+
+    public function write(string $string): int
+    {
+        if (!$this->isWritable()) {
+            throw new RuntimeException();
+        }
+        if (fwrite($this->stream, $string) === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+        return strlen($string);
+    }
+
+    public function isWritable(): bool
+    {
+        $mode = $this->getMetadata('mode');
+        if (!is_string($mode)) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('Could not get stream mode from metadata!');
+            // @codeCoverageIgnoreEnd
+        }
+        return preg_match('/[waxc+]/', $mode) === 1;
+    }
+
+    public function read(int $length): string
+    {
+        if (!$this->isReadable()) {
+            throw new RuntimeException();
+        }
+        $result = fread($this->stream, $length);
+        if ($result === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+        return $result;
+    }
+
+    public function isReadable(): bool
+    {
+        $mode = $this->getMetadata('mode');
+        if (!is_string($mode)) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('Could not get stream mode from metadata!');
+            // @codeCoverageIgnoreEnd
+        }
+        return preg_match('/[r+]/', $mode) === 1;
+    }
+
+    public function getContents(): string
+    {
+        if (!$this->isReadable()) {
+            throw new RuntimeException();
+        }
+        $result = stream_get_contents($this->stream);
+        if ($result === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+        return $result;
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/TimeTest.php b/src/Common/vendor/maennchen/zipstream-php/test/TimeTest.php
new file mode 100644
index 00000000..25aed277
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/TimeTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ZipStream\Exception\DosTimeOverflowException;
+use ZipStream\Time;
+
+class TimeTest extends TestCase
+{
+    public function testNormalDateToDosTime(): void
+    {
+        $this->assertSame(
+            Time::dateTimeToDosTime(new DateTimeImmutable('2014-11-17T17:46:08Z')),
+            1165069764
+        );
+
+        // January 1 1980 - DOS Epoch.
+        $this->assertSame(
+            Time::dateTimeToDosTime(new DateTimeImmutable('1980-01-01T00:00:00+00:00')),
+            2162688
+        );
+    }
+
+    public function testTooEarlyDateToDosTime(): void
+    {
+        $this->expectException(DosTimeOverflowException::class);
+
+        // January 1 1980 is the minimum DOS Epoch.
+        Time::dateTimeToDosTime(new DateTimeImmutable('1970-01-01T00:00:00+00:00'));
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/Util.php b/src/Common/vendor/maennchen/zipstream-php/test/Util.php
new file mode 100644
index 00000000..4ec743e7
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/Util.php
@@ -0,0 +1,135 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use function fgets;
+use function pclose;
+use function popen;
+use function preg_match;
+
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+use function strtolower;
+
+use ZipArchive;
+
+trait Util
+{
+    protected function getTmpFileStream(): array
+    {
+        $tmp = tempnam(sys_get_temp_dir(), 'zipstreamtest');
+        $stream = fopen($tmp, 'wb+');
+
+        return [$tmp, $stream];
+    }
+
+    protected function cmdExists(string $command): bool
+    {
+        if (strtolower(\substr(PHP_OS, 0, 3)) === 'win') {
+            $fp = popen("where $command", 'r');
+            $result = fgets($fp, 255);
+            $exists = !preg_match('#Could not find files#', $result);
+            pclose($fp);
+        } else { // non-Windows
+            $fp = popen("which $command", 'r');
+            $result = fgets($fp, 255);
+            $exists = !empty($result);
+            pclose($fp);
+        }
+
+        return $exists;
+    }
+
+    protected function dumpZipContents(string $path): string
+    {
+        if (!$this->cmdExists('hexdump')) {
+            return '';
+        }
+
+        $output = [];
+
+        if (!exec("hexdump -C \"$path\" | head -n 50", $output)) {
+            return '';
+        }
+
+        return "\nHexdump:\n" . implode("\n", $output);
+    }
+
+    protected function validateAndExtractZip(string $zipPath): string
+    {
+        $tmpDir = $this->getTmpDir();
+
+        $zipArchive = new ZipArchive();
+        $result = $zipArchive->open($zipPath);
+
+        if ($result !== true) {
+            $codeName = $this->zipArchiveOpenErrorCodeName($result);
+            $debugInformation = $this->dumpZipContents($zipPath);
+
+            $this->fail("Failed to open {$zipPath}. Code: $result ($codeName)$debugInformation");
+
+            return $tmpDir;
+        }
+
+        $this->assertSame(0, $zipArchive->status);
+        $this->assertSame(0, $zipArchive->statusSys);
+
+        $zipArchive->extractTo($tmpDir);
+        $zipArchive->close();
+
+        return $tmpDir;
+    }
+
+    protected function zipArchiveOpenErrorCodeName(int $code): string
+    {
+        switch($code) {
+            case ZipArchive::ER_EXISTS: return 'ER_EXISTS';
+            case ZipArchive::ER_INCONS: return 'ER_INCONS';
+            case ZipArchive::ER_INVAL: return 'ER_INVAL';
+            case ZipArchive::ER_MEMORY: return 'ER_MEMORY';
+            case ZipArchive::ER_NOENT: return 'ER_NOENT';
+            case ZipArchive::ER_NOZIP: return 'ER_NOZIP';
+            case ZipArchive::ER_OPEN: return 'ER_OPEN';
+            case ZipArchive::ER_READ: return 'ER_READ';
+            case ZipArchive::ER_SEEK: return 'ER_SEEK';
+            default: return 'unknown';
+        }
+    }
+
+    protected function getTmpDir(): string
+    {
+        $tmp = tempnam(sys_get_temp_dir(), 'zipstreamtest');
+        unlink($tmp);
+        mkdir($tmp) or $this->fail('Failed to make directory');
+
+        return $tmp;
+    }
+
+    /**
+     * @return string[]
+     */
+    protected function getRecursiveFileList(string $path, bool $includeDirectories = false): array
+    {
+        $data = [];
+        $path = (string)realpath($path);
+        $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
+
+        $pathLen = strlen($path);
+        foreach ($files as $file) {
+            $filePath = $file->getRealPath();
+
+            if (is_dir($filePath) && !$includeDirectories) {
+                continue;
+            }
+
+            $data[] = substr($filePath, $pathLen + 1);
+        }
+
+        sort($data);
+
+        return $data;
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/Zip64/DataDescriptorTest.php b/src/Common/vendor/maennchen/zipstream-php/test/Zip64/DataDescriptorTest.php
new file mode 100644
index 00000000..49fb2ccb
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/Zip64/DataDescriptorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zip64;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zip64\DataDescriptor;
+
+class DataDescriptorTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $descriptor = DataDescriptor::generate(
+            crc32UncompressedData: 0x11111111,
+            compressedSize: (0x77777777 << 32) +  0x66666666,
+            uncompressedSize: (0x99999999 << 32) + 0x88888888,
+        );
+
+        $this->assertSame(
+            bin2hex($descriptor),
+            '504b0708' . // 4 bytes; Optional data descriptor signature = 0x08074b50
+            '11111111' . // 4 bytes; CRC-32 of uncompressed data
+            '6666666677777777' . // 8 bytes; Compressed size
+            '8888888899999999' // 8 bytes; Uncompressed size
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryLocatorTest.php b/src/Common/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryLocatorTest.php
new file mode 100644
index 00000000..271a2986
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryLocatorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zip64;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zip64\EndOfCentralDirectoryLocator;
+
+class EndOfCentralDirectoryLocatorTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $descriptor = EndOfCentralDirectoryLocator::generate(
+            numberOfTheDiskWithZip64CentralDirectoryStart: 0x11111111,
+            zip64centralDirectoryStartOffsetOnDisk: (0x22222222 << 32) + 0x33333333,
+            totalNumberOfDisks: 0x44444444,
+        );
+
+        $this->assertSame(
+            bin2hex($descriptor),
+            '504b0607' . // 4 bytes; zip64 end of central dir locator signature - 0x07064b50
+            '11111111' . // 4 bytes; number of the disk with the start of the zip64 end of central directory
+            '3333333322222222' . // 28 bytes; relative offset of the zip64 end of central directory record
+            '44444444' // 4 bytes;total number of disks
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryTest.php b/src/Common/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryTest.php
new file mode 100644
index 00000000..b86fb178
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryTest.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zip64;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zip64\EndOfCentralDirectory;
+
+class EndOfCentralDirectoryTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $descriptor = EndOfCentralDirectory::generate(
+            versionMadeBy: 0x3333,
+            versionNeededToExtract: 0x4444,
+            numberOfThisDisk: 0x55555555,
+            numberOfTheDiskWithCentralDirectoryStart: 0x66666666,
+            numberOfCentralDirectoryEntriesOnThisDisk: (0x77777777 << 32) + 0x88888888,
+            numberOfCentralDirectoryEntries: (0x99999999 << 32) + 0xAAAAAAAA,
+            sizeOfCentralDirectory: (0xBBBBBBBB << 32) + 0xCCCCCCCC,
+            centralDirectoryStartOffsetOnDisk: (0xDDDDDDDD << 32) + 0xEEEEEEEE,
+            extensibleDataSector: 'foo',
+        );
+
+        $this->assertSame(
+            bin2hex($descriptor),
+            '504b0606' . // 4 bytes;zip64 end of central dir signature - 0x06064b50
+            '2f00000000000000' . // 8 bytes; size of zip64 end of central directory record
+            '3333' . // 2 bytes; version made by
+            '4444' . // 2 bytes; version needed to extract
+            '55555555' . // 4 bytes; number of this disk
+            '66666666' . // 4 bytes; number of the disk with the start of the central directory
+            '8888888877777777' . // 8 bytes; total number of entries in the central directory on this disk
+            'aaaaaaaa99999999' . // 8 bytes; total number of entries in the central directory
+            'ccccccccbbbbbbbb' . // 8 bytes; size of the central directory
+            'eeeeeeeedddddddd' . // 8 bytes; offset of start of central directory with respect to the starting disk number
+            bin2hex('foo')
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/Zip64/ExtendedInformationExtraFieldTest.php b/src/Common/vendor/maennchen/zipstream-php/test/Zip64/ExtendedInformationExtraFieldTest.php
new file mode 100644
index 00000000..904783d8
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/Zip64/ExtendedInformationExtraFieldTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zip64;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zip64\ExtendedInformationExtraField;
+
+class ExtendedInformationExtraFieldTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $extraField = ExtendedInformationExtraField::generate(
+            originalSize: (0x77777777 << 32) + 0x66666666,
+            compressedSize: (0x99999999 << 32) + 0x88888888,
+            relativeHeaderOffset: (0x22222222 << 32) + 0x11111111,
+            diskStartNumber: 0x33333333,
+        );
+
+        $this->assertSame(
+            bin2hex($extraField),
+            '0100' . // 2 bytes; Tag for this "extra" block type
+            '1c00' . // 2 bytes; Size of this "extra" block
+            '6666666677777777' . // 8 bytes; Original uncompressed file size
+            '8888888899999999' . // 8 bytes; Size of compressed data
+            '1111111122222222' . // 8 bytes; Offset of local header record
+            '33333333' // 4 bytes; Number of the disk on which this file starts
+        );
+    }
+
+    public function testSerializesEmptyCorrectly(): void
+    {
+        $extraField = ExtendedInformationExtraField::generate();
+
+        $this->assertSame(
+            bin2hex($extraField),
+            '0100' . // 2 bytes; Tag for this "extra" block type
+            '0000' // 2 bytes; Size of this "extra" block
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/ZipStreamTest.php b/src/Common/vendor/maennchen/zipstream-php/test/ZipStreamTest.php
new file mode 100644
index 00000000..6e690202
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/ZipStreamTest.php
@@ -0,0 +1,1284 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use DateTimeImmutable;
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\StreamWrapper;
+use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+use ZipArchive;
+use ZipStream\CompressionMethod;
+use ZipStream\Exception\FileNotFoundException;
+use ZipStream\Exception\FileNotReadableException;
+use ZipStream\Exception\FileSizeIncorrectException;
+use ZipStream\Exception\OverflowException;
+use ZipStream\Exception\ResourceActionException;
+use ZipStream\Exception\SimulationFileUnknownException;
+use ZipStream\Exception\StreamNotReadableException;
+use ZipStream\Exception\StreamNotSeekableException;
+use ZipStream\OperationMode;
+use ZipStream\PackField;
+use ZipStream\ZipStream;
+
+class ZipStreamTest extends TestCase
+{
+    use Util;
+    use Assertions;
+
+    public function testAddFile(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
+
+        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
+        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+    }
+
+    public function testAddFileUtf8NameComment(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $name = 'árvíztűrő tükörfúrógép.txt';
+        $content = 'Sample String Data';
+        $comment =
+            'Filename has every special characters ' .
+            'from Hungarian language in lowercase. ' .
+            'In uppercase: ÁÍŰŐÜÖÚÓÉ';
+
+        $zip->addFile(fileName: $name, data: $content, comment: $comment);
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame([$name], $files);
+        $this->assertStringEqualsFile($tmpDir . '/' . $name, $content);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($tmp);
+        $this->assertSame($comment, $zipArchive->getCommentName($name));
+    }
+
+    public function testAddFileUtf8NameNonUtfComment(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $name = 'á.txt';
+        $content = 'any';
+        $comment = mb_convert_encoding('á', 'ISO-8859-2', 'UTF-8');
+
+        // @see https://libzip.org/documentation/zip_file_get_comment.html
+        //
+        // mb_convert_encoding hasn't CP437.
+        // nearly CP850 (DOS-Latin-1)
+        $guessComment = mb_convert_encoding($comment, 'UTF-8', 'CP850');
+
+        $zip->addFile(fileName: $name, data: $content, comment: $comment);
+
+        $zip->finish();
+        fclose($stream);
+
+        $zipArch = new ZipArchive();
+        $zipArch->open($tmp);
+        $this->assertSame($guessComment, $zipArch->getCommentName($name));
+        $this->assertSame($comment, $zipArch->getCommentName($name, ZipArchive::FL_ENC_RAW));
+    }
+
+    public function testAddFileWithStorageMethod(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile(fileName: 'sample.txt', data: 'Sample String Data', compressionMethod: CompressionMethod::STORE);
+        $zip->addFile(fileName: 'test/sample.txt', data: 'More Simple Sample Data');
+        $zip->finish();
+        fclose($stream);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($tmp);
+
+        $sample1 = $zipArchive->statName('sample.txt');
+        $sample12 = $zipArchive->statName('test/sample.txt');
+        $this->assertSame($sample1['comp_method'], CompressionMethod::STORE->value);
+        $this->assertSame($sample12['comp_method'], CompressionMethod::DEFLATE->value);
+
+        $zipArchive->close();
+    }
+
+    public function testAddFileFromPath(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        fwrite($streamExample, 'Sample String Data');
+        fclose($streamExample);
+        $zip->addFileFromPath(fileName: 'sample.txt', path: $tmpExample);
+
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        fwrite($streamExample, 'More Simple Sample Data');
+        fclose($streamExample);
+        $zip->addFileFromPath(fileName: 'test/sample.txt', path: $tmpExample);
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
+
+        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
+        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+    }
+
+    public function testAddFileFromPathFileNotFoundException(): void
+    {
+        $this->expectException(FileNotFoundException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        // Get ZipStream Object
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        // Trigger error by adding a file which doesn't exist
+        $zip->addFileFromPath(fileName: 'foobar.php', path: '/foo/bar/foobar.php');
+    }
+
+    public function testAddFileFromPathFileNotReadableException(): void
+    {
+        $this->expectException(FileNotReadableException::class);
+
+
+        [, $stream] = $this->getTmpFileStream();
+
+
+        // create new virtual filesystem
+        $root = vfsStream::setup('vfs');
+        // create a virtual file with no permissions
+        $file = vfsStream::newFile('foo.txt', 0)->at($root)->setContent('bar');
+
+        // Get ZipStream Object
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFileFromPath('foo.txt', $file->url());
+    }
+
+    public function testAddFileFromPathWithStorageMethod(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        fwrite($streamExample, 'Sample String Data');
+        fclose($streamExample);
+        $zip->addFileFromPath(fileName: 'sample.txt', path: $tmpExample, compressionMethod: CompressionMethod::STORE);
+
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        fwrite($streamExample, 'More Simple Sample Data');
+        fclose($streamExample);
+        $zip->addFileFromPath('test/sample.txt', $tmpExample);
+
+        $zip->finish();
+        fclose($stream);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($tmp);
+
+        $sample1 = $zipArchive->statName('sample.txt');
+        $this->assertSame(CompressionMethod::STORE->value, $sample1['comp_method']);
+
+        $sample2 = $zipArchive->statName('test/sample.txt');
+        $this->assertSame(CompressionMethod::DEFLATE->value, $sample2['comp_method']);
+
+        $zipArchive->close();
+    }
+
+    public function testAddLargeFileFromPath(): void
+    {
+        foreach ([CompressionMethod::DEFLATE, CompressionMethod::STORE] as $compressionMethod) {
+            foreach ([false, true] as $zeroHeader) {
+                foreach ([false, true] as $zip64) {
+                    if ($zeroHeader && $compressionMethod === CompressionMethod::DEFLATE) {
+                        continue;
+                    }
+                    $this->addLargeFileFileFromPath(
+                        compressionMethod: $compressionMethod,
+                        zeroHeader: $zeroHeader,
+                        zip64: $zip64
+                    );
+                }
+            }
+        }
+    }
+
+    public function testAddFileFromStream(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        // In this test we can't use temporary stream to feed data
+        // because zlib.deflate filter gives empty string before PHP 7
+        // it works fine with file stream
+        $streamExample = fopen(__FILE__, 'rb');
+        $zip->addFileFromStream('sample.txt', $streamExample);
+        fclose($streamExample);
+
+        $streamExample2 = fopen('php://temp', 'wb+');
+        fwrite($streamExample2, 'More Simple Sample Data');
+        rewind($streamExample2); // move the pointer back to the beginning of file.
+        $zip->addFileFromStream('test/sample.txt', $streamExample2); //, $fileOptions);
+        fclose($streamExample2);
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
+
+        $this->assertStringEqualsFile(__FILE__, file_get_contents($tmpDir . '/sample.txt'));
+        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+    }
+
+    public function testAddFileFromStreamUnreadableInput(): void
+    {
+        $this->expectException(StreamNotReadableException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+        [$tmpInput] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $streamUnreadable = fopen($tmpInput, 'w');
+
+        $zip->addFileFromStream('sample.json', $streamUnreadable);
+    }
+
+    public function testAddFileFromStreamBrokenOutputWrite(): void
+    {
+        $this->expectException(ResourceActionException::class);
+
+        $outputStream = FaultInjectionResource::getResource(['stream_write']);
+
+        $zip = new ZipStream(
+            outputStream: $outputStream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'foobar');
+    }
+
+    public function testAddFileFromStreamBrokenInputRewind(): void
+    {
+        $this->expectException(ResourceActionException::class);
+
+        [,$stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: false,
+        );
+
+        $fileStream = FaultInjectionResource::getResource(['stream_seek']);
+
+        $zip->addFileFromStream('sample.txt', $fileStream, maxSize: 0);
+    }
+
+    public function testAddFileFromStreamUnseekableInputWithoutZeroHeader(): void
+    {
+        $this->expectException(StreamNotSeekableException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: false,
+        );
+
+        if (file_exists('/dev/null')) {
+            $streamUnseekable = fopen('/dev/null', 'w+');
+        } elseif (file_exists('NUL')) {
+            $streamUnseekable = fopen('NUL', 'w+');
+        } else {
+            $this->markTestSkipped('Needs file /dev/null');
+        }
+
+        $zip->addFileFromStream('sample.txt', $streamUnseekable, maxSize: 2);
+    }
+
+    public function testAddFileFromStreamUnseekableInputWithZeroHeader(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: true,
+            defaultCompressionMethod: CompressionMethod::STORE,
+        );
+
+        $streamUnseekable = StreamWrapper::getResource(new class ('test') extends EndlessCycleStream {
+            public function isSeekable(): bool
+            {
+                return false;
+            }
+
+            public function seek(int $offset, int $whence = SEEK_SET): void
+            {
+                throw new RuntimeException('Not seekable');
+            }
+        });
+
+        $zip->addFileFromStream('sample.txt', $streamUnseekable, maxSize: 7);
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt'], $files);
+
+        $this->assertSame(filesize($tmpDir . '/sample.txt'), 7);
+    }
+
+    public function testAddFileFromStreamWithStorageMethod(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $streamExample = fopen('php://temp', 'wb+');
+        fwrite($streamExample, 'Sample String Data');
+        rewind($streamExample); // move the pointer back to the beginning of file.
+        $zip->addFileFromStream('sample.txt', $streamExample, compressionMethod: CompressionMethod::STORE);
+        fclose($streamExample);
+
+        $streamExample2 = fopen('php://temp', 'bw+');
+        fwrite($streamExample2, 'More Simple Sample Data');
+        rewind($streamExample2); // move the pointer back to the beginning of file.
+        $zip->addFileFromStream('test/sample.txt', $streamExample2, compressionMethod: CompressionMethod::DEFLATE);
+        fclose($streamExample2);
+
+        $zip->finish();
+        fclose($stream);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($tmp);
+
+        $sample1 = $zipArchive->statName('sample.txt');
+        $this->assertSame(CompressionMethod::STORE->value, $sample1['comp_method']);
+
+        $sample2 = $zipArchive->statName('test/sample.txt');
+        $this->assertSame(CompressionMethod::DEFLATE->value, $sample2['comp_method']);
+
+        $zipArchive->close();
+    }
+
+    public function testAddFileFromPsr7Stream(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $body = 'Sample String Data';
+        $response = new Response(200, [], $body);
+
+        $zip->addFileFromPsr7Stream('sample.json', $response->getBody());
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileFromPsr7Stream(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x100000000,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertFileIsReadable($tmpDir . '/sample.json');
+        $this->assertStringStartsWith('000000', file_get_contents(filename: $tmpDir . '/sample.json', length: 20));
+    }
+
+    public function testContinueFinishedZip(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+        $zip->finish();
+
+        $zip->addFile('sample.txt', '1234');
+    }
+
+    /**
+     * @group slow
+     */
+    public function testManyFilesWithoutZip64(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+        );
+
+        for ($i = 0; $i <= 0xFFFF; $i++) {
+            $zip->addFile('sample' . $i, '');
+        }
+
+        $zip->finish();
+    }
+
+    /**
+     * @group slow
+     */
+    public function testManyFilesWithZip64(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+        );
+
+        for ($i = 0; $i <= 0xFFFF; $i++) {
+            $zip->addFile('sample' . $i, '');
+        }
+
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(count($files), 0x10000);
+    }
+
+    /**
+     * @group slow
+     */
+    public function testLongZipWithout64(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+            defaultCompressionMethod: CompressionMethod::STORE,
+        );
+
+        for ($i = 0; $i < 4; $i++) {
+            $zip->addFileFromPsr7Stream(
+                fileName: 'sample' . $i,
+                stream: new EndlessCycleStream('0'),
+                maxSize: 0xFFFFFFFF,
+                compressionMethod: CompressionMethod::STORE,
+                lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+            );
+        }
+    }
+
+    /**
+     * @group slow
+     */
+    public function testLongZipWith64(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+            defaultCompressionMethod: CompressionMethod::STORE,
+        );
+
+        for ($i = 0; $i < 4; $i++) {
+            $zip->addFileFromPsr7Stream(
+                fileName: 'sample' . $i,
+                stream: new EndlessCycleStream('0'),
+                maxSize: 0x5FFFFFFF,
+                compressionMethod: CompressionMethod::STORE,
+                lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+            );
+        }
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample0', 'sample1', 'sample2', 'sample3'], $files);
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileWithoutZip64WithZeroHeader(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+            defaultEnableZeroHeader: true,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x100000000,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddsZip64HeaderWhenNeeded(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+            defaultEnableZeroHeader: false,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x100000000,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
+
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(['sample.json'], $files);
+        $this->assertFileContains($tmp, PackField::pack(
+            new PackField(format: 'V', value: 0x06064b50)
+        ));
+    }
+
+    /**
+     * @group slow
+     */
+    public function testDoesNotAddZip64HeaderWhenNotNeeded(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+            defaultEnableZeroHeader: false,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x10,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
+
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(['sample.json'], $files);
+        $this->assertFileDoesNotContain($tmp, PackField::pack(
+            new PackField(format: 'V', value: 0x06064b50)
+        ));
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileWithoutZip64WithoutZeroHeader(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+            defaultEnableZeroHeader: false,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x100000000,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
+    }
+
+    public function testAddFileFromPsr7StreamWithOutputToPsr7Stream(): void
+    {
+        [$tmp, $resource] = $this->getTmpFileStream();
+        $psr7OutputStream = new ResourceStream($resource);
+
+
+        $zip = new ZipStream(
+            outputStream: $psr7OutputStream,
+            sendHttpHeaders: false,
+        );
+
+        $body = 'Sample String Data';
+        $response = new Response(200, [], $body);
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: $response->getBody(),
+            compressionMethod: CompressionMethod::STORE,
+        );
+        $zip->finish();
+        $psr7OutputStream->close();
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
+
+    public function testAddFileFromPsr7StreamWithFileSizeSet(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $body = 'Sample String Data';
+        $fileSize = strlen($body);
+        // Add fake padding
+        $fakePadding = "\0\0\0\0\0\0";
+        $response = new Response(200, [], $body . $fakePadding);
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: $response->getBody(),
+            compressionMethod: CompressionMethod::STORE,
+            maxSize: $fileSize
+        );
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
+
+    public function testCreateArchiveHeaders(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $headers = [];
+
+        $httpHeaderCallback = function (string $header) use (&$headers) {
+            $headers[] = $header;
+        };
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: true,
+            outputName: 'example.zip',
+            httpHeaderCallback: $httpHeaderCallback,
+        );
+
+        $zip->addFile(
+            fileName: 'sample.json',
+            data: 'foo',
+        );
+        $zip->finish();
+        fclose($stream);
+
+        $this->assertContains('Content-Type: application/x-zip', $headers);
+        $this->assertContains("Content-Disposition: attachment; filename*=UTF-8''example.zip", $headers);
+        $this->assertContains('Pragma: public', $headers);
+        $this->assertContains('Cache-Control: public, must-revalidate', $headers);
+        $this->assertContains('Content-Transfer-Encoding: binary', $headers);
+    }
+
+    public function testCreateArchiveWithFlushOptionSet(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            flushOutput: true,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
+
+        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
+        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+    }
+
+    public function testCreateArchiveWithOutputBufferingOffAndFlushOptionSet(): void
+    {
+        // WORKAROUND (1/2): remove phpunit's output buffer in order to run test without any buffering
+        ob_end_flush();
+        $this->assertSame(0, ob_get_level());
+
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            flushOutput: true,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
+
+        // WORKAROUND (2/2): add back output buffering so that PHPUnit doesn't complain that it is missing
+        ob_start();
+    }
+
+    public function testAddEmptyDirectory(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addDirectory('foo');
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir, includeDirectories: true);
+
+        $this->assertContains('foo', $files);
+
+        $this->assertFileExists($tmpDir . DIRECTORY_SEPARATOR . 'foo');
+        $this->assertDirectoryExists($tmpDir . DIRECTORY_SEPARATOR . 'foo');
+    }
+
+    public function testAddFileSimulate(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultEnableZeroHeader: true,
+                outputStream: $stream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data');
+            $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+            return $zip->finish();
+        };
+
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithMaxSize(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $stream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data', maxSize: 0);
+
+            return $zip->finish();
+        };
+
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithFstat(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $stream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data');
+            $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+            return $zip->finish();
+        };
+
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithExactSizeZero(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $stream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data', exactSize: 18);
+
+            return $zip->finish();
+        };
+
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithExactSizeInitial(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: false,
+                outputStream: $stream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data', exactSize: 18);
+
+            return $zip->finish();
+        };
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithZeroSizeInFstat(): void
+    {
+        [, $stream] = $this->getTmpFileStream();
+
+        $create = function (OperationMode $operationMode) use ($stream): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: false,
+                outputStream: $stream,
+            );
+
+            $zip->addFileFromPsr7Stream('sample.txt', new class () implements StreamInterface {
+                public $pos = 0;
+
+                public function __toString(): string
+                {
+                    return 'test';
+                }
+
+                public function close(): void
+                {
+                }
+
+                public function detach()
+                {
+                }
+
+                public function getSize(): ?int
+                {
+                    return null;
+                }
+
+                public function tell(): int
+                {
+                    return $this->pos;
+                }
+
+                public function eof(): bool
+                {
+                    return $this->pos >= 4;
+                }
+
+                public function isSeekable(): bool
+                {
+                    return true;
+                }
+
+                public function seek(int $offset, int $whence = SEEK_SET): void
+                {
+                    $this->pos = $offset;
+                }
+
+                public function rewind(): void
+                {
+                    $this->pos = 0;
+                }
+
+                public function isWritable(): bool
+                {
+                    return false;
+                }
+
+                public function write(string $string): int
+                {
+                    return 0;
+                }
+
+                public function isReadable(): bool
+                {
+                    return true;
+                }
+
+                public function read(int $length): string
+                {
+                    $data = substr('test', $this->pos, $length);
+                    $this->pos += strlen($data);
+                    return $data;
+                }
+
+                public function getContents(): string
+                {
+                    return $this->read(4);
+                }
+
+                public function getMetadata(?string $key = null)
+                {
+                    return $key !== null ? null : [];
+                }
+            });
+
+            return $zip->finish();
+        };
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
+
+    public function testAddFileSimulateWithWrongExactSize(): void
+    {
+        $this->expectException(FileSizeIncorrectException::class);
+
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_LAX,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data', exactSize: 1000);
+    }
+
+    public function testAddFileSimulateStrictZero(): void
+    {
+        $this->expectException(SimulationFileUnknownException::class);
+
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: true
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+    }
+
+    public function testAddFileSimulateStrictInitial(): void
+    {
+        $this->expectException(SimulationFileUnknownException::class);
+
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: false
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+    }
+
+    public function testAddFileCallbackStrict(): void
+    {
+        $this->expectException(SimulationFileUnknownException::class);
+
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: false
+        );
+
+        $zip->addFileFromCallback('sample.txt', callback: function () {
+            return '';
+        });
+    }
+
+    public function testAddFileCallbackLax(): void
+    {
+
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_LAX,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFileFromCallback('sample.txt', callback: function () {
+            return 'Sample String Data';
+        });
+
+        $size = $zip->finish();
+
+        $this->assertEquals($size, 142);
+    }
+
+    public function testExecuteSimulation(): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_LAX,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+            outputStream: $stream,
+        );
+
+        $zip->addFileFromCallback(
+            'sample.txt',
+            exactSize: 18,
+            callback: function () {
+                return 'Sample String Data';
+            }
+        );
+
+        $size = $zip->finish();
+
+        $this->assertEquals(filesize($tmp), 0);
+
+        $zip->executeSimulation();
+        fclose($stream);
+
+        clearstatcache();
+
+        $this->assertEquals(filesize($tmp), $size);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt'], $files);
+    }
+
+    public function testExecuteSimulationBeforeFinish(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+
+        [, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_LAX,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+            outputStream: $stream,
+        );
+
+        $zip->executeSimulation();
+    }
+
+    private function addLargeFileFileFromPath(CompressionMethod $compressionMethod, $zeroHeader, $zip64): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
+
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: $zeroHeader,
+            enableZip64: $zip64,
+        );
+
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        for ($i = 0; $i <= 10000; $i++) {
+            fwrite($streamExample, sha1((string)$i));
+            if ($i % 100 === 0) {
+                fwrite($streamExample, "\n");
+            }
+        }
+        fclose($streamExample);
+        $shaExample = sha1_file($tmpExample);
+        $zip->addFileFromPath('sample.txt', $tmpExample);
+        unlink($tmpExample);
+
+        $zip->finish();
+        fclose($stream);
+
+        $tmpDir = $this->validateAndExtractZip($tmp);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt'], $files);
+
+        $this->assertSame(sha1_file($tmpDir . '/sample.txt'), $shaExample, "SHA-1 Mismatch Method: {$compressionMethod->value}");
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/Zs/ExtendedInformationExtraFieldTest.php b/src/Common/vendor/maennchen/zipstream-php/test/Zs/ExtendedInformationExtraFieldTest.php
new file mode 100644
index 00000000..2b8dbed4
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/Zs/ExtendedInformationExtraFieldTest.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zs;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zs\ExtendedInformationExtraField;
+
+class ExtendedInformationExtraFieldTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $extraField = ExtendedInformationExtraField::generate();
+
+        $this->assertSame(
+            bin2hex((string) $extraField),
+            '5356' . // 2 bytes; Tag for this "extra" block type
+            '0000' // 2 bytes; TODO: Document
+        );
+    }
+}
diff --git a/src/Common/vendor/maennchen/zipstream-php/test/bootstrap.php b/src/Common/vendor/maennchen/zipstream-php/test/bootstrap.php
new file mode 100644
index 00000000..13c7a0e6
--- /dev/null
+++ b/src/Common/vendor/maennchen/zipstream-php/test/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+date_default_timezone_set('UTC');
+
+require __DIR__ . '/../vendor/autoload.php';
diff --git a/src/Common/vendor/markbaker/complex/README.md b/src/Common/vendor/markbaker/complex/README.md
new file mode 100644
index 00000000..76347af1
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/README.md
@@ -0,0 +1,173 @@
+PHPComplex
+==========
+
+---
+
+PHP Class Library for working with Complex numbers
+
+[![Build Status](https://github.com/MarkBaker/PHPComplex/workflows/main/badge.svg)](https://github.com/MarkBaker/PHPComplex/actions)
+[![Total Downloads](https://img.shields.io/packagist/dt/markbaker/complex)](https://packagist.org/packages/markbaker/complex)
+[![Latest Stable Version](https://img.shields.io/github/v/release/MarkBaker/PHPComplex)](https://packagist.org/packages/markbaker/complex)
+[![License](https://img.shields.io/github/license/MarkBaker/PHPComplex)](https://packagist.org/packages/markbaker/complex)
+
+
+[![Complex Numbers](https://imgs.xkcd.com/comics/complex_numbers_2x.png)](https://xkcd.com/2028/)
+
+---
+
+The library currently provides the following operations:
+
+ - addition
+ - subtraction
+ - multiplication
+ - division
+    - division by
+    - division into
+
+together with functions for 
+
+ - theta (polar theta angle)
+ - rho (polar distance/radius)
+ - conjugate
+ * negative
+ - inverse (1 / complex)
+ - cos (cosine)
+ - acos (inverse cosine)
+ - cosh (hyperbolic cosine)
+ - acosh (inverse hyperbolic cosine)
+ - sin (sine)
+ - asin (inverse sine)
+ - sinh (hyperbolic sine)
+ - asinh (inverse hyperbolic sine)
+ - sec (secant)
+ - asec (inverse secant)
+ - sech (hyperbolic secant)
+ - asech (inverse hyperbolic secant)
+ - csc (cosecant)
+ - acsc (inverse cosecant)
+ - csch (hyperbolic secant)
+ - acsch (inverse hyperbolic secant)
+ - tan (tangent)
+ - atan (inverse tangent)
+ - tanh (hyperbolic tangent)
+ - atanh (inverse hyperbolic tangent)
+ - cot (cotangent)
+ - acot (inverse cotangent)
+ - coth (hyperbolic cotangent)
+ - acoth (inverse hyperbolic cotangent)
+ - sqrt (square root)
+ - exp (exponential)
+ - ln (natural log)
+ - log10 (base-10 log)
+ - log2 (base-2 log)
+ - pow (raised to the power of a real number)
+ 
+ 
+---
+
+# Installation
+
+```shell
+composer require markbaker/complex:^1.0
+```
+
+# Important BC Note
+
+If you've previously been using procedural calls to functions and operations using this library, then from version 3.0 you should use [MarkBaker/PHPComplexFunctions](https://github.com/MarkBaker/PHPComplexFunctions) instead (available on packagist as [markbaker/complex-functions](https://packagist.org/packages/markbaker/complex-functions)).
+
+You'll need to replace `markbaker/complex`in your `composer.json` file with the new library, but otherwise there should be no difference in the namespacing, or in the way that you have called the Complex functions in the past, so no actual code changes are required.
+
+```shell
+composer require markbaker/complex-functions:^3.0
+```
+
+You should not reference this library (`markbaker/complex`) in your `composer.json`, composer wil take care of that for you.
+
+# Usage
+
+To create a new complex object, you can provide either the real, imaginary and suffix parts as individual values, or as an array of values passed passed to the constructor; or a string representing the value. e.g
+
+```php
+$real = 1.23;
+$imaginary = -4.56;
+$suffix = 'i';
+
+$complexObject = new Complex\Complex($real, $imaginary, $suffix);
+```
+or as an array
+```php
+$real = 1.23;
+$imaginary = -4.56;
+$suffix = 'i';
+
+$arguments = [$real, $imaginary, $suffix];
+
+$complexObject = new Complex\Complex($arguments);
+```
+or as a string
+```php
+$complexString = '1.23-4.56i';
+
+$complexObject = new Complex\Complex($complexString);
+```
+
+Complex objects are immutable: whenever you call a method or pass a complex value to a function that returns a complex value, a new Complex object will be returned, and the original will remain unchanged.
+This also allows you to chain multiple methods as you would for a fluent interface (as long as they are methods that will return a Complex result).
+
+## Performing Mathematical Operations
+
+To perform mathematical operations with Complex values, you can call the appropriate method against a complex value, passing other values as arguments
+
+```php
+$complexString1 = '1.23-4.56i';
+$complexString2 = '2.34+5.67i';
+
+$complexObject = new Complex\Complex($complexString1);
+echo $complexObject->add($complexString2);
+```
+
+or use the static Operation methods
+```php
+$complexString1 = '1.23-4.56i';
+$complexString2 = '2.34+5.67i';
+
+echo Complex\Operations::add($complexString1, $complexString2);
+```
+If you want to perform the same operation against multiple values (e.g. to add three or more complex numbers), then you can pass multiple arguments to any of the operations.
+
+You can pass these arguments as Complex objects, or as an array, or string that will parse to a complex object.
+
+## Using functions
+
+When calling any of the available functions for a complex value, you can either call the relevant method for the Complex object
+```php
+$complexString = '1.23-4.56i';
+
+$complexObject = new Complex\Complex($complexString);
+echo $complexObject->sinh();
+```
+
+or use the static Functions methods
+```php
+$complexString = '1.23-4.56i';
+
+echo Complex\Functions::sinh($complexString);
+```
+As with operations, you can pass these arguments as Complex objects, or as an array or string that will parse to a complex object.
+
+
+In the case of the `pow()` function (the only implemented function that requires an additional argument) you need to pass both arguments when calling the function
+
+```php
+$complexString = '1.23-4.56i';
+
+$complexObject = new Complex\Complex($complexString);
+echo Complex\Functions::pow($complexObject, 2);
+```
+or pass the additional argument when calling the method
+```php
+$complexString = '1.23-4.56i';
+
+$complexObject = new Complex\Complex($complexString);
+echo $complexObject->pow(2);
+```
diff --git a/src/Common/vendor/markbaker/complex/classes/src/Complex.php b/src/Common/vendor/markbaker/complex/classes/src/Complex.php
new file mode 100644
index 00000000..25414ee6
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/classes/src/Complex.php
@@ -0,0 +1,388 @@
+<?php
+
+/**
+ *
+ * Class for the management of Complex numbers
+ *
+ * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
+ * @license    https://opensource.org/licenses/MIT    MIT
+ */
+namespace Complex;
+
+/**
+ * Complex Number object.
+ *
+ * @package Complex
+ *
+ * @method float abs()
+ * @method Complex acos()
+ * @method Complex acosh()
+ * @method Complex acot()
+ * @method Complex acoth()
+ * @method Complex acsc()
+ * @method Complex acsch()
+ * @method float argument()
+ * @method Complex asec()
+ * @method Complex asech()
+ * @method Complex asin()
+ * @method Complex asinh()
+ * @method Complex atan()
+ * @method Complex atanh()
+ * @method Complex conjugate()
+ * @method Complex cos()
+ * @method Complex cosh()
+ * @method Complex cot()
+ * @method Complex coth()
+ * @method Complex csc()
+ * @method Complex csch()
+ * @method Complex exp()
+ * @method Complex inverse()
+ * @method Complex ln()
+ * @method Complex log2()
+ * @method Complex log10()
+ * @method Complex negative()
+ * @method Complex pow(int|float $power)
+ * @method float rho()
+ * @method Complex sec()
+ * @method Complex sech()
+ * @method Complex sin()
+ * @method Complex sinh()
+ * @method Complex sqrt()
+ * @method Complex tan()
+ * @method Complex tanh()
+ * @method float theta()
+ * @method Complex add(...$complexValues)
+ * @method Complex subtract(...$complexValues)
+ * @method Complex multiply(...$complexValues)
+ * @method Complex divideby(...$complexValues)
+ * @method Complex divideinto(...$complexValues)
+ */
+class Complex
+{
+    /**
+     * @constant    Euler's Number.
+     */
+    const EULER = 2.7182818284590452353602874713526624977572;
+
+    /**
+     * @constant    Regexp to split an input string into real and imaginary components and suffix
+     */
+    const NUMBER_SPLIT_REGEXP =
+        '` ^
+            (                                   # Real part
+                [-+]?(\d+\.?\d*|\d*\.?\d+)          # Real value (integer or float)
+                ([Ee][-+]?[0-2]?\d{1,3})?           # Optional real exponent for scientific format
+            )
+            (                                   # Imaginary part
+                [-+]?(\d+\.?\d*|\d*\.?\d+)          # Imaginary value (integer or float)
+                ([Ee][-+]?[0-2]?\d{1,3})?           # Optional imaginary exponent for scientific format
+            )?
+            (                                   # Imaginary part is optional
+                ([-+]?)                             # Imaginary (implicit 1 or -1) only
+                ([ij]?)                             # Imaginary i or j - depending on whether mathematical or engineering
+            )
+        $`uix';
+
+    /**
+     * @var    float    $realPart    The value of of this complex number on the real plane.
+     */
+    protected $realPart = 0.0;
+
+    /**
+     * @var    float    $imaginaryPart    The value of of this complex number on the imaginary plane.
+     */
+    protected $imaginaryPart = 0.0;
+
+    /**
+     * @var    string    $suffix    The suffix for this complex number (i or j).
+     */
+    protected $suffix;
+
+
+    /**
+     * Validates whether the argument is a valid complex number, converting scalar or array values if possible
+     *
+     * @param     mixed    $complexNumber   The value to parse
+     * @return    array
+     * @throws    Exception    If the argument isn't a Complex number or cannot be converted to one
+     */
+    private static function parseComplex($complexNumber)
+    {
+        // Test for real number, with no imaginary part
+        if (is_numeric($complexNumber)) {
+            return [$complexNumber, 0, null];
+        }
+
+        // Fix silly human errors
+        $complexNumber = str_replace(
+            ['+-', '-+', '++', '--'],
+            ['-', '-', '+', '+'],
+            $complexNumber
+        );
+
+        // Basic validation of string, to parse out real and imaginary parts, and any suffix
+        $validComplex = preg_match(
+            self::NUMBER_SPLIT_REGEXP,
+            $complexNumber,
+            $complexParts
+        );
+
+        if (!$validComplex) {
+            // Neither real nor imaginary part, so test to see if we actually have a suffix
+            $validComplex = preg_match('/^([\-\+]?)([ij])$/ui', $complexNumber, $complexParts);
+            if (!$validComplex) {
+                throw new Exception('Invalid complex number');
+            }
+            // We have a suffix, so set the real to 0, the imaginary to either 1 or -1 (as defined by the sign)
+            $imaginary = 1;
+            if ($complexParts[1] === '-') {
+                $imaginary = 0 - $imaginary;
+            }
+            return [0, $imaginary, $complexParts[2]];
+        }
+
+        // If we don't have an imaginary part, identify whether it should be +1 or -1...
+        if (($complexParts[4] === '') && ($complexParts[9] !== '')) {
+            if ($complexParts[7] !== $complexParts[9]) {
+                $complexParts[4] = 1;
+                if ($complexParts[8] === '-') {
+                    $complexParts[4] = -1;
+                }
+            } else {
+                // ... or if we have only the real and no imaginary part
+                //  (in which case our real should be the imaginary)
+                $complexParts[4] = $complexParts[1];
+                $complexParts[1] = 0;
+            }
+        }
+
+        // Return real and imaginary parts and suffix as an array, and set a default suffix if user input lazily
+        return [
+            $complexParts[1],
+            $complexParts[4],
+            !empty($complexParts[9]) ? $complexParts[9] : 'i'
+        ];
+    }
+
+
+    public function __construct($realPart = 0.0, $imaginaryPart = null, $suffix = 'i')
+    {
+        if ($imaginaryPart === null) {
+            if (is_array($realPart)) {
+                // We have an array of (potentially) real and imaginary parts, and any suffix
+                list ($realPart, $imaginaryPart, $suffix) = array_values($realPart) + [0.0, 0.0, 'i'];
+            } elseif ((is_string($realPart)) || (is_numeric($realPart))) {
+                // We've been given a string to parse to extract the real and imaginary parts, and any suffix
+                list($realPart, $imaginaryPart, $suffix) = self::parseComplex($realPart);
+            }
+        }
+
+        if ($imaginaryPart != 0.0 && empty($suffix)) {
+            $suffix = 'i';
+        } elseif ($imaginaryPart == 0.0 && !empty($suffix)) {
+            $suffix = '';
+        }
+
+        // Set parsed values in our properties
+        $this->realPart = (float) $realPart;
+        $this->imaginaryPart = (float) $imaginaryPart;
+        $this->suffix = strtolower($suffix ?? '');
+    }
+
+    /**
+     * Gets the real part of this complex number
+     *
+     * @return Float
+     */
+    public function getReal(): float
+    {
+        return $this->realPart;
+    }
+
+    /**
+     * Gets the imaginary part of this complex number
+     *
+     * @return Float
+     */
+    public function getImaginary(): float
+    {
+        return $this->imaginaryPart;
+    }
+
+    /**
+     * Gets the suffix of this complex number
+     *
+     * @return String
+     */
+    public function getSuffix(): string
+    {
+        return $this->suffix;
+    }
+
+    /**
+     * Returns true if this is a real value, false if a complex value
+     *
+     * @return Bool
+     */
+    public function isReal(): bool
+    {
+        return $this->imaginaryPart == 0.0;
+    }
+
+    /**
+     * Returns true if this is a complex value, false if a real value
+     *
+     * @return Bool
+     */
+    public function isComplex(): bool
+    {
+        return !$this->isReal();
+    }
+
+    public function format(): string
+    {
+        $str = "";
+        if ($this->imaginaryPart != 0.0) {
+            if (\abs($this->imaginaryPart) != 1.0) {
+                $str .= $this->imaginaryPart . $this->suffix;
+            } else {
+                $str .= (($this->imaginaryPart < 0.0) ? '-' : '') . $this->suffix;
+            }
+        }
+        if ($this->realPart != 0.0) {
+            if (($str) && ($this->imaginaryPart > 0.0)) {
+                $str = "+" . $str;
+            }
+            $str = $this->realPart . $str;
+        }
+        if (!$str) {
+            $str = "0.0";
+        }
+
+        return $str;
+    }
+
+    public function __toString(): string
+    {
+        return $this->format();
+    }
+
+    /**
+     * Validates whether the argument is a valid complex number, converting scalar or array values if possible
+     *
+     * @param     mixed    $complex   The value to validate
+     * @return    Complex
+     * @throws    Exception    If the argument isn't a Complex number or cannot be converted to one
+     */
+    public static function validateComplexArgument($complex): Complex
+    {
+        if (is_scalar($complex) || is_array($complex)) {
+            $complex = new Complex($complex);
+        } elseif (!is_object($complex) || !($complex instanceof Complex)) {
+            throw new Exception('Value is not a valid complex number');
+        }
+
+        return $complex;
+    }
+
+    /**
+     * Returns the reverse of this complex number
+     *
+     * @return    Complex
+     */
+    public function reverse(): Complex
+    {
+        return new Complex(
+            $this->imaginaryPart,
+            $this->realPart,
+            ($this->realPart == 0.0) ? null : $this->suffix
+        );
+    }
+
+    public function invertImaginary(): Complex
+    {
+        return new Complex(
+            $this->realPart,
+            $this->imaginaryPart * -1,
+            ($this->imaginaryPart == 0.0) ? null : $this->suffix
+        );
+    }
+
+    public function invertReal(): Complex
+    {
+        return new Complex(
+            $this->realPart * -1,
+            $this->imaginaryPart,
+            ($this->imaginaryPart == 0.0) ? null : $this->suffix
+        );
+    }
+
+    protected static $functions = [
+        'abs',
+        'acos',
+        'acosh',
+        'acot',
+        'acoth',
+        'acsc',
+        'acsch',
+        'argument',
+        'asec',
+        'asech',
+        'asin',
+        'asinh',
+        'atan',
+        'atanh',
+        'conjugate',
+        'cos',
+        'cosh',
+        'cot',
+        'coth',
+        'csc',
+        'csch',
+        'exp',
+        'inverse',
+        'ln',
+        'log2',
+        'log10',
+        'negative',
+        'pow',
+        'rho',
+        'sec',
+        'sech',
+        'sin',
+        'sinh',
+        'sqrt',
+        'tan',
+        'tanh',
+        'theta',
+    ];
+
+    protected static $operations = [
+        'add',
+        'subtract',
+        'multiply',
+        'divideby',
+        'divideinto',
+    ];
+
+    /**
+     * Returns the result of the function call or operation
+     *
+     * @return    Complex|float
+     * @throws    Exception|\InvalidArgumentException
+     */
+    public function __call($functionName, $arguments)
+    {
+        $functionName = strtolower(str_replace('_', '', $functionName));
+
+        // Test for function calls
+        if (in_array($functionName, self::$functions, true)) {
+            return Functions::$functionName($this, ...$arguments);
+        }
+        // Test for operation calls
+        if (in_array($functionName, self::$operations, true)) {
+            return Operations::$functionName($this, ...$arguments);
+        }
+        throw new Exception('Complex Function or Operation does not exist');
+    }
+}
diff --git a/src/Common/vendor/markbaker/complex/classes/src/Exception.php b/src/Common/vendor/markbaker/complex/classes/src/Exception.php
new file mode 100644
index 00000000..a2beb732
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/classes/src/Exception.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * Exception.
+ *
+ * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
+ * @license    https://opensource.org/licenses/MIT    MIT
+ */
+namespace Complex;
+
+class Exception extends \Exception
+{
+}
diff --git a/src/Common/vendor/markbaker/complex/classes/src/Functions.php b/src/Common/vendor/markbaker/complex/classes/src/Functions.php
new file mode 100644
index 00000000..ff38c237
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/classes/src/Functions.php
@@ -0,0 +1,823 @@
+<?php
+
+namespace Complex;
+
+use InvalidArgumentException;
+
+class Functions
+{
+    /**
+     * Returns the absolute value (modulus) of a complex number.
+     * Also known as the rho of the complex number, i.e. the distance/radius
+     *   from the centrepoint to the representation of the number in polar coordinates.
+     *
+     * This function is a synonym for rho()
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    float            The absolute (or rho) value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     *
+     * @see    rho
+     *
+     */
+    public static function abs($complex): float
+    {
+        return self::rho($complex);
+    }
+
+    /**
+     * Returns the inverse cosine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse cosine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function acos($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        $invsqrt = self::sqrt(Operations::subtract(1, Operations::multiply($complex, $complex)));
+        $adjust = new Complex(
+            $complex->getReal() - $invsqrt->getImaginary(),
+            $complex->getImaginary() + $invsqrt->getReal()
+        );
+        $log = self::ln($adjust);
+
+        return new Complex(
+            $log->getImaginary(),
+            -1 * $log->getReal()
+        );
+    }
+
+    /**
+     * Returns the inverse hyperbolic cosine of a complex number.
+     *
+     * Formula from Wolfram Alpha:
+     *   cosh^(-1)z = ln(z + sqrt(z + 1) sqrt(z - 1)).
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic cosine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function acosh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal() && ($complex->getReal() > 1)) {
+            return new Complex(\acosh($complex->getReal()));
+        }
+
+        $acosh = self::ln(
+            Operations::add(
+                $complex,
+                Operations::multiply(
+                    self::sqrt(Operations::add($complex, 1)),
+                    self::sqrt(Operations::subtract($complex, 1))
+                )
+            )
+        );
+
+        return $acosh;
+    }
+
+    /**
+     * Returns the inverse cotangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse cotangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function acot($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::atan(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse hyperbolic cotangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic cotangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function acoth($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::atanh(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse cosecant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse cosecant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function acsc($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::asin(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse hyperbolic cosecant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic cosecant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function acsch($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::asinh(self::inverse($complex));
+    }
+
+    /**
+     * Returns the argument of a complex number.
+     * Also known as the theta of the complex number, i.e. the angle in radians
+     *   from the real axis to the representation of the number in polar coordinates.
+     *
+     * This function is a synonym for theta()
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    float            The argument (or theta) value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     *
+     * @see    theta
+     */
+    public static function argument($complex): float
+    {
+        return self::theta($complex);
+    }
+
+    /**
+     * Returns the inverse secant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse secant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function asec($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::acos(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse hyperbolic secant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic secant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function asech($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::acosh(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse sine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse sine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function asin($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        $invsqrt = self::sqrt(Operations::subtract(1, Operations::multiply($complex, $complex)));
+        $adjust = new Complex(
+            $invsqrt->getReal() - $complex->getImaginary(),
+            $invsqrt->getImaginary() + $complex->getReal()
+        );
+        $log = self::ln($adjust);
+
+        return new Complex(
+            $log->getImaginary(),
+            -1 * $log->getReal()
+        );
+    }
+
+    /**
+     * Returns the inverse hyperbolic sine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic sine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function asinh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal() && ($complex->getReal() > 1)) {
+            return new Complex(\asinh($complex->getReal()));
+        }
+
+        $asinh = clone $complex;
+        $asinh = $asinh->reverse()
+            ->invertReal();
+        $asinh = self::asin($asinh);
+
+        return $asinh->reverse()
+            ->invertImaginary();
+    }
+
+    /**
+     * Returns the inverse tangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse tangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function atan($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\atan($complex->getReal()));
+        }
+
+        $t1Value = new Complex(-1 * $complex->getImaginary(), $complex->getReal());
+        $uValue = new Complex(1, 0);
+
+        $d1Value = clone $uValue;
+        $d1Value = Operations::subtract($d1Value, $t1Value);
+        $d2Value = Operations::add($t1Value, $uValue);
+        $uResult = $d1Value->divideBy($d2Value);
+        $uResult = self::ln($uResult);
+
+        $realMultiplier = -0.5;
+        $imaginaryMultiplier = 0.5;
+
+        if (abs($uResult->getImaginary()) === M_PI) {
+            // If we have an imaginary value at the max or min (PI or -PI), then we need to ensure
+            //    that the primary is assigned for the correct quadrant.
+            $realMultiplier = (
+                ($uResult->getImaginary() === M_PI && $uResult->getReal() > 0.0) ||
+                ($uResult->getImaginary() === -M_PI && $uResult->getReal() < 0.0)
+            ) ? 0.5 : -0.5;
+        }
+
+        return new Complex(
+            $uResult->getImaginary() * $realMultiplier,
+            $uResult->getReal() * $imaginaryMultiplier,
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the inverse hyperbolic tangent of a complex number.
+     *
+     * Formula from Wolfram Alpha:
+     *  tanh^(-1)z = 1/2 [ln(1 + z) - ln(1 - z)].
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic tangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function atanh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            $real = $complex->getReal();
+            if ($real >= -1.0 && $real <= 1.0) {
+                return new Complex(\atanh($real));
+            } else {
+                return new Complex(\atanh(1 / $real), (($real < 0.0) ? M_PI_2 : -1 * M_PI_2));
+            }
+        }
+
+        $atanh = Operations::multiply(
+            Operations::subtract(
+                self::ln(Operations::add(1.0, $complex)),
+                self::ln(Operations::subtract(1.0, $complex))
+            ),
+            0.5
+        );
+
+        return $atanh;
+    }
+
+    /**
+     * Returns the complex conjugate of a complex number
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The conjugate of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function conjugate($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return new Complex(
+            $complex->getReal(),
+            -1 * $complex->getImaginary(),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the cosine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The cosine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function cos($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\cos($complex->getReal()));
+        }
+
+        return self::conjugate(
+            new Complex(
+                \cos($complex->getReal()) * \cosh($complex->getImaginary()),
+                \sin($complex->getReal()) * \sinh($complex->getImaginary()),
+                $complex->getSuffix()
+            )
+        );
+    }
+
+    /**
+     * Returns the hyperbolic cosine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic cosine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function cosh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\cosh($complex->getReal()));
+        }
+
+        return new Complex(
+            \cosh($complex->getReal()) * \cos($complex->getImaginary()),
+            \sinh($complex->getReal()) * \sin($complex->getImaginary()),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the cotangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The cotangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function cot($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::inverse(self::tan($complex));
+    }
+
+    /**
+     * Returns the hyperbolic cotangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic cotangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function coth($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::inverse(self::tanh($complex));
+    }
+
+    /**
+     * Returns the cosecant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The cosecant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function csc($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::inverse(self::sin($complex));
+    }
+
+    /**
+     * Returns the hyperbolic cosecant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic cosecant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function csch($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::inverse(self::sinh($complex));
+    }
+
+    /**
+     * Returns the exponential of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The exponential of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function exp($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (($complex->getReal() == 0.0) && (\abs($complex->getImaginary()) == M_PI)) {
+            return new Complex(-1.0, 0.0);
+        }
+
+        $rho = \exp($complex->getReal());
+
+        return new Complex(
+            $rho * \cos($complex->getImaginary()),
+            $rho * \sin($complex->getImaginary()),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the inverse of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function inverse($complex): Complex
+    {
+        $complex = clone Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            throw new InvalidArgumentException('Division by zero');
+        }
+
+        return $complex->divideInto(1.0);
+    }
+
+    /**
+     * Returns the natural logarithm of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The natural logarithm of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException  If the real and the imaginary parts are both zero
+     */
+    public static function ln($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
+            throw new InvalidArgumentException();
+        }
+
+        return new Complex(
+            \log(self::rho($complex)),
+            self::theta($complex),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the base-2 logarithm of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The base-2 logarithm of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException  If the real and the imaginary parts are both zero
+     */
+    public static function log2($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
+            throw new InvalidArgumentException();
+        } elseif (($complex->getReal() > 0.0) && ($complex->getImaginary() == 0.0)) {
+            return new Complex(\log($complex->getReal(), 2), 0.0, $complex->getSuffix());
+        }
+
+        return self::ln($complex)
+            ->multiply(\log(Complex::EULER, 2));
+    }
+
+    /**
+     * Returns the common logarithm (base 10) of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The common logarithm (base 10) of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException  If the real and the imaginary parts are both zero
+     */
+    public static function log10($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
+            throw new InvalidArgumentException();
+        } elseif (($complex->getReal() > 0.0) && ($complex->getImaginary() == 0.0)) {
+            return new Complex(\log10($complex->getReal()), 0.0, $complex->getSuffix());
+        }
+
+        return self::ln($complex)
+            ->multiply(\log10(Complex::EULER));
+    }
+
+    /**
+     * Returns the negative of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The negative value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     *
+     * @see    rho
+     *
+     */
+    public static function negative($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return new Complex(
+            -1 * $complex->getReal(),
+            -1 * $complex->getImaginary(),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns a complex number raised to a power.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @param     float|integer    $power      The power to raise this value to
+     * @return    Complex          The complex argument raised to the real power.
+     * @throws    Exception        If the power argument isn't a valid real
+     */
+    public static function pow($complex, $power): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (!is_numeric($power)) {
+            throw new Exception('Power argument must be a real number');
+        }
+
+        if ($complex->getImaginary() == 0.0 && $complex->getReal() >= 0.0) {
+            return new Complex(\pow($complex->getReal(), $power));
+        }
+
+        $rValue = \sqrt(($complex->getReal() * $complex->getReal()) + ($complex->getImaginary() * $complex->getImaginary()));
+        $rPower = \pow($rValue, $power);
+        $theta = $complex->argument() * $power;
+        if ($theta == 0) {
+            return new Complex(1);
+        }
+
+        return new Complex($rPower * \cos($theta), $rPower * \sin($theta), $complex->getSuffix());
+    }
+
+    /**
+     * Returns the rho of a complex number.
+     * This is the distance/radius from the centrepoint to the representation of the number in polar coordinates.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    float            The rho value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function rho($complex): float
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return \sqrt(
+            ($complex->getReal() * $complex->getReal()) +
+            ($complex->getImaginary() * $complex->getImaginary())
+        );
+    }
+
+    /**
+     * Returns the secant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The secant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function sec($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::inverse(self::cos($complex));
+    }
+
+    /**
+     * Returns the hyperbolic secant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic secant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function sech($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::inverse(self::cosh($complex));
+    }
+
+    /**
+     * Returns the sine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The sine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function sin($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\sin($complex->getReal()));
+        }
+
+        return new Complex(
+            \sin($complex->getReal()) * \cosh($complex->getImaginary()),
+            \cos($complex->getReal()) * \sinh($complex->getImaginary()),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the hyperbolic sine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic sine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function sinh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\sinh($complex->getReal()));
+        }
+
+        return new Complex(
+            \sinh($complex->getReal()) * \cos($complex->getImaginary()),
+            \cosh($complex->getReal()) * \sin($complex->getImaginary()),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the square root of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The Square root of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function sqrt($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        $theta = self::theta($complex);
+        $delta1 = \cos($theta / 2);
+        $delta2 = \sin($theta / 2);
+        $rho = \sqrt(self::rho($complex));
+
+        return new Complex($delta1 * $rho, $delta2 * $rho, $complex->getSuffix());
+    }
+
+    /**
+     * Returns the tangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The tangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function tan($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\tan($complex->getReal()));
+        }
+
+        $real = $complex->getReal();
+        $imaginary = $complex->getImaginary();
+        $divisor = 1 + \pow(\tan($real), 2) * \pow(\tanh($imaginary), 2);
+        if ($divisor == 0.0) {
+            throw new InvalidArgumentException('Division by zero');
+        }
+
+        return new Complex(
+            \pow(self::sech($imaginary)->getReal(), 2) * \tan($real) / $divisor,
+            \pow(self::sec($real)->getReal(), 2) * \tanh($imaginary) / $divisor,
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the hyperbolic tangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic tangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function tanh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+        $real = $complex->getReal();
+        $imaginary = $complex->getImaginary();
+        $divisor = \cos($imaginary) * \cos($imaginary) + \sinh($real) * \sinh($real);
+        if ($divisor == 0.0) {
+            throw new InvalidArgumentException('Division by zero');
+        }
+
+        return new Complex(
+            \sinh($real) * \cosh($real) / $divisor,
+            0.5 * \sin(2 * $imaginary) / $divisor,
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the theta of a complex number.
+     *   This is the angle in radians from the real axis to the representation of the number in polar coordinates.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    float            The theta value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function theta($complex): float
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0) {
+            if ($complex->isReal()) {
+                return 0.0;
+            } elseif ($complex->getImaginary() < 0.0) {
+                return M_PI / -2;
+            }
+            return M_PI / 2;
+        } elseif ($complex->getReal() > 0.0) {
+            return \atan($complex->getImaginary() / $complex->getReal());
+        } elseif ($complex->getImaginary() < 0.0) {
+            return -(M_PI - \atan(\abs($complex->getImaginary()) / \abs($complex->getReal())));
+        }
+
+        return M_PI - \atan($complex->getImaginary() / \abs($complex->getReal()));
+    }
+}
diff --git a/src/Common/vendor/markbaker/complex/classes/src/Operations.php b/src/Common/vendor/markbaker/complex/classes/src/Operations.php
new file mode 100644
index 00000000..b13a8734
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/classes/src/Operations.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace Complex;
+
+use InvalidArgumentException;
+
+class Operations
+{
+    /**
+     * Adds two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to add
+     * @return    Complex
+     */
+    public static function add(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+
+            $real = $result->getReal() + $complex->getReal();
+            $imaginary = $result->getImaginary() + $complex->getImaginary();
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Divides two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to divide
+     * @return    Complex
+     */
+    public static function divideby(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+            if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+                throw new InvalidArgumentException('Division by zero');
+            }
+
+            $delta1 = ($result->getReal() * $complex->getReal()) +
+                ($result->getImaginary() * $complex->getImaginary());
+            $delta2 = ($result->getImaginary() * $complex->getReal()) -
+                ($result->getReal() * $complex->getImaginary());
+            $delta3 = ($complex->getReal() * $complex->getReal()) +
+                ($complex->getImaginary() * $complex->getImaginary());
+
+            $real = $delta1 / $delta3;
+            $imaginary = $delta2 / $delta3;
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Divides two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to divide
+     * @return    Complex
+     */
+    public static function divideinto(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+            if ($result->getReal() == 0.0 && $result->getImaginary() == 0.0) {
+                throw new InvalidArgumentException('Division by zero');
+            }
+
+            $delta1 = ($complex->getReal() * $result->getReal()) +
+                ($complex->getImaginary() * $result->getImaginary());
+            $delta2 = ($complex->getImaginary() * $result->getReal()) -
+                ($complex->getReal() * $result->getImaginary());
+            $delta3 = ($result->getReal() * $result->getReal()) +
+                ($result->getImaginary() * $result->getImaginary());
+
+            $real = $delta1 / $delta3;
+            $imaginary = $delta2 / $delta3;
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Multiplies two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to multiply
+     * @return    Complex
+     */
+    public static function multiply(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+
+            $real = ($result->getReal() * $complex->getReal()) -
+                ($result->getImaginary() * $complex->getImaginary());
+            $imaginary = ($result->getReal() * $complex->getImaginary()) +
+                ($result->getImaginary() * $complex->getReal());
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Subtracts two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to subtract
+     * @return    Complex
+     */
+    public static function subtract(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+
+            $real = $result->getReal() - $complex->getReal();
+            $imaginary = $result->getImaginary() - $complex->getImaginary();
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Common/vendor/markbaker/complex/composer.json b/src/Common/vendor/markbaker/complex/composer.json
new file mode 100644
index 00000000..246683ca
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/composer.json
@@ -0,0 +1,40 @@
+{
+    "name": "markbaker/complex",
+    "type": "library",
+    "description": "PHP Class for working with complex numbers",
+    "keywords": ["complex", "mathematics"],
+    "homepage": "https://github.com/MarkBaker/PHPComplex",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Mark Baker",
+            "email": "mark@lange.demon.co.uk"
+        }
+    ],
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "markbaker/ukraine": true
+        }
+    },
+    "require": {
+        "php": "^7.2 || ^8.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+        "squizlabs/php_codesniffer": "^3.7",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-master"
+    },
+    "autoload": {
+        "psr-4": {
+            "Complex\\": "classes/src/"
+        }
+    },
+    "scripts": {
+        "style": "phpcs --report-width=200 --standard=PSR2 --report=summary,full classes/src/ unitTests/classes/src -n",
+        "versions": "phpcs --report-width=200 --standard=PHPCompatibility --report=summary,full classes/src/ --runtime-set testVersion 7.2- -n"
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Common/vendor/markbaker/complex/examples/complexTest.php b/src/Common/vendor/markbaker/complex/examples/complexTest.php
new file mode 100644
index 00000000..9a5e1238
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/examples/complexTest.php
@@ -0,0 +1,154 @@
+<?php
+
+use Complex\Complex as Complex;
+
+include(__DIR__ . '/../vendor/autoload.php');
+
+echo 'Create', PHP_EOL;
+
+$x = new Complex(123);
+echo $x, PHP_EOL;
+
+$x = new Complex(123, 456);
+echo $x, PHP_EOL;
+
+$x = new Complex(array(123,456,'j'));
+echo $x, PHP_EOL;
+
+$x = new Complex('1.23e-4--2.34e-5i');
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Add', PHP_EOL;
+
+$x = new Complex(123);
+$x->add(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->add(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->add(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->add(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->add(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->add(new Complex(0, -1));
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Subtract', PHP_EOL;
+
+$x = new Complex(123);
+$x->subtract(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->subtract(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->subtract(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->subtract(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->subtract(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->subtract(new Complex(0, -1));
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Multiply', PHP_EOL;
+
+$x = new Complex(123);
+$x->multiply(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->multiply(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->multiply(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->multiply(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->multiply(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->multiply(new Complex(0, -1));
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Divide By', PHP_EOL;
+
+$x = new Complex(123);
+$x->divideBy(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->divideBy(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->divideBy(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->divideBy(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->divideBy(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->divideBy(new Complex(0, -1));
+echo $x, PHP_EOL;
+
+
+echo PHP_EOL, 'Divide Into', PHP_EOL;
+
+$x = new Complex(123);
+$x->divideInto(456);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456);
+$x->divideInto(789.012);
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->divideInto(new Complex(-987.654, -32.1));
+echo $x, PHP_EOL;
+
+$x = new Complex(123.456, 78.90);
+$x->divideInto(-987.654);
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->divideInto(new Complex(0, 1));
+echo $x, PHP_EOL;
+
+$x = new Complex(-987.654, -32.1);
+$x->divideInto(new Complex(0, -1));
+echo $x, PHP_EOL;
diff --git a/src/Common/vendor/markbaker/complex/examples/testFunctions.php b/src/Common/vendor/markbaker/complex/examples/testFunctions.php
new file mode 100644
index 00000000..bad1c03d
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/examples/testFunctions.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Complex;
+
+include(__DIR__ . '/../vendor/autoload.php');
+
+echo 'Function Examples', PHP_EOL;
+
+$functions = array(
+    'abs',
+    'acos',
+    'acosh',
+    'acsc',
+    'acsch',
+    'argument',
+    'asec',
+    'asech',
+    'asin',
+    'asinh',
+    'conjugate',
+    'cos',
+    'cosh',
+    'csc',
+    'csch',
+    'exp',
+    'inverse',
+    'ln',
+    'log2',
+    'log10',
+    'rho',
+    'sec',
+    'sech',
+    'sin',
+    'sinh',
+    'sqrt',
+    'theta'
+);
+
+for ($real = -3.5; $real <= 3.5; $real += 0.5) {
+    for ($imaginary = -3.5; $imaginary <= 3.5; $imaginary += 0.5) {
+        foreach ($functions as $function) {
+            $complexFunction = __NAMESPACE__ . '\\Functions::' . $function;
+            $complex = new Complex($real, $imaginary);
+            try {
+                echo $function, '(', $complex, ') = ', $complexFunction($complex), PHP_EOL;
+            } catch (\Exception $e) {
+                echo $function, '(', $complex, ') ERROR: ', $e->getMessage(), PHP_EOL;
+            }
+        }
+        echo PHP_EOL;
+    }
+}
diff --git a/src/Common/vendor/markbaker/complex/examples/testOperations.php b/src/Common/vendor/markbaker/complex/examples/testOperations.php
new file mode 100644
index 00000000..2b7e0ba4
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/examples/testOperations.php
@@ -0,0 +1,35 @@
+<?php
+
+use Complex\Complex as Complex;
+use Complex\Operations;
+
+include(__DIR__ . '/../vendor/autoload.php');
+
+$values = [
+    new Complex(123),
+    new Complex(456, 123),
+    new Complex(0.0, 456),
+];
+
+foreach ($values as $value) {
+    echo $value, PHP_EOL;
+}
+
+echo 'Addition', PHP_EOL;
+
+$result = Operations::add(...$values);
+echo '=> ', $result, PHP_EOL;
+
+echo PHP_EOL;
+
+echo 'Subtraction', PHP_EOL;
+
+$result = Operations::subtract(...$values);
+echo '=> ', $result, PHP_EOL;
+
+echo PHP_EOL;
+
+echo 'Multiplication', PHP_EOL;
+
+$result = Operations::multiply(...$values);
+echo '=> ', $result, PHP_EOL;
diff --git a/src/Common/vendor/markbaker/complex/license.md b/src/Common/vendor/markbaker/complex/license.md
new file mode 100644
index 00000000..5b4b1561
--- /dev/null
+++ b/src/Common/vendor/markbaker/complex/license.md
@@ -0,0 +1,25 @@
+The MIT License (MIT)
+=====================
+
+Copyright © `2017` `Mark Baker`
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/src/Common/vendor/markbaker/matrix/README.md b/src/Common/vendor/markbaker/matrix/README.md
new file mode 100644
index 00000000..d0dc9145
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/README.md
@@ -0,0 +1,215 @@
+PHPMatrix
+==========
+
+---
+
+PHP Class for handling Matrices
+
+[![Build Status](https://github.com/MarkBaker/PHPMatrix/workflows/main/badge.svg)](https://github.com/MarkBaker/PHPMatrix/actions)
+[![Total Downloads](https://img.shields.io/packagist/dt/markbaker/matrix)](https://packagist.org/packages/markbaker/matrix)
+[![Latest Stable Version](https://img.shields.io/github/v/release/MarkBaker/PHPMatrix)](https://packagist.org/packages/markbaker/matrix)
+[![License](https://img.shields.io/github/license/MarkBaker/PHPMatrix)](https://packagist.org/packages/markbaker/matrix)
+
+
+[![Matrix Transform](https://imgs.xkcd.com/comics/matrix_transform.png)](https://xkcd.com/184/)
+
+Matrix Transform
+
+---
+
+This library currently provides the following operations:
+
+ - addition
+ - direct sum
+ - subtraction
+ - multiplication
+ - division (using [A].[B]<sup>-1</sup>)
+    - division by
+    - division into
+
+together with functions for 
+
+ - adjoint
+ - antidiagonal
+ - cofactors
+ - determinant
+ - diagonal
+ - identity
+ - inverse
+ - minors
+ - trace
+ - transpose
+ - solve
+
+   Given Matrices A and B, calculate X for A.X = B
+   
+and classes for
+
+ - Decomposition
+   - LU Decomposition with partial row pivoting,
+
+     such that [P].[A] = [L].[U] and [A] = [P]<sup>|</sup>.[L].[U]
+   - QR Decomposition
+
+     such that [A] = [Q].[R]
+
+## TO DO
+
+ - power() function
+ - Decomposition
+   - Cholesky Decomposition
+   - EigenValue Decomposition 
+     - EigenValues
+     - EigenVectors
+
+---
+
+# Installation
+
+```shell
+composer require markbaker/matrix:^3.0
+```
+
+# Important BC Note
+
+If you've previously been using procedural calls to functions and operations using this library, then from version 3.0 you should use [MarkBaker/PHPMatrixFunctions](https://github.com/MarkBaker/PHPMatrixFunctions) instead (available on packagist as [markbaker/matrix-functions](https://packagist.org/packages/markbaker/matrix-functions)).
+
+You'll need to replace `markbaker/matrix`in your `composer.json` file with the new library, but otherwise there should be no difference in the namespacing, or in the way that you have called the Matrix functions in the past, so no actual code changes are required.
+
+```shell
+composer require markbaker/matrix-functions:^1.0
+```
+
+You should not reference this library (`markbaker/matrix`) in your `composer.json`, composer wil take care of that for you.
+
+# Usage
+
+To create a new Matrix object, provide an array as the constructor argument
+
+```php
+$grid = [
+    [16,  3,  2, 13],
+    [ 5, 10, 11,  8],
+    [ 9,  6,  7, 12],
+    [ 4, 15, 14,  1],
+];
+
+$matrix = new Matrix\Matrix($grid);
+```
+The `Builder` class provides helper methods for creating specific matrices, specifically an identity matrix of a specified size; or a matrix of a specified dimensions, with every cell containing a set value.
+```php
+$matrix = Matrix\Builder::createFilledMatrix(1, 5, 3);
+```
+Will create a matrix of 5 rows and 3 columns, filled with a `1` in every cell; while
+```php
+$matrix = Matrix\Builder::createIdentityMatrix(3);
+```
+will create a 3x3 identity matrix.
+
+
+Matrix objects are immutable: whenever you call a method or pass a grid to a function that returns a matrix value, a new Matrix object will be returned, and the original will remain unchanged. This also allows you to chain multiple methods as you would for a fluent interface (as long as they are methods that will return a Matrix result).
+
+## Performing Mathematical Operations
+
+To perform mathematical operations with Matrices, you can call the appropriate method against a matrix value, passing other values as arguments
+
+```php
+$matrix1 = new Matrix\Matrix([
+    [2, 7, 6],
+    [9, 5, 1],
+    [4, 3, 8],
+]);
+$matrix2 = new Matrix\Matrix([
+    [1, 2, 3],
+    [4, 5, 6],
+    [7, 8, 9],
+]);
+
+var_dump($matrix1->multiply($matrix2)->toArray());
+```
+or pass all values to the appropriate static method
+```php
+$matrix1 = new Matrix\Matrix([
+    [2, 7, 6],
+    [9, 5, 1],
+    [4, 3, 8],
+]);
+$matrix2 = new Matrix\Matrix([
+    [1, 2, 3],
+    [4, 5, 6],
+    [7, 8, 9],
+]);
+
+var_dump(Matrix\Operations::multiply($matrix1, $matrix2)->toArray());
+```
+You can pass in the arguments as Matrix objects, or as arrays.
+
+If you want to perform the same operation against multiple values (e.g. to add three or more matrices), then you can pass multiple arguments to any of the operations.
+
+## Using functions
+
+When calling any of the available functions for a matrix value, you can either call the relevant method for the Matrix object
+```php
+$grid = [
+    [16,  3,  2, 13],
+    [ 5, 10, 11,  8],
+    [ 9,  6,  7, 12],
+    [ 4, 15, 14,  1],
+];
+
+$matrix = new Matrix\Matrix($grid);
+
+echo $matrix->trace();
+```
+or you can call the static method, passing the Matrix object or array as an argument 
+```php
+$grid = [
+    [16,  3,  2, 13],
+    [ 5, 10, 11,  8],
+    [ 9,  6,  7, 12],
+    [ 4, 15, 14,  1],
+];
+
+$matrix = new Matrix\Matrix($grid);
+echo Matrix\Functions::trace($matrix);
+```
+```php
+$grid = [
+    [16,  3,  2, 13],
+    [ 5, 10, 11,  8],
+    [ 9,  6,  7, 12],
+    [ 4, 15, 14,  1],
+];
+
+echo Matrix\Functions::trace($grid);
+```
+
+## Decomposition
+
+The library also provides classes for matrix decomposition. You can access these using
+```php
+$grid = [
+    [1, 2],
+    [3, 4],
+];
+
+$matrix = new Matrix\Matrix($grid);
+
+$decomposition = new Matrix\Decomposition\QR($matrix);
+$Q = $decomposition->getQ();
+$R = $decomposition->getR();
+```
+
+or alternatively us the `Decomposition` factory, identifying which form of decomposition you want to use
+```php
+$grid = [
+    [1, 2],
+    [3, 4],
+];
+
+$matrix = new Matrix\Matrix($grid);
+
+$decomposition = Matrix\Decomposition\Decomposition::decomposition(Matrix\Decomposition\Decomposition::QR, $matrix);
+$Q = $decomposition->getQ();
+$R = $decomposition->getR();
+```
diff --git a/src/Common/vendor/markbaker/matrix/buildPhar.php b/src/Common/vendor/markbaker/matrix/buildPhar.php
new file mode 100644
index 00000000..e1b8f96f
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/buildPhar.php
@@ -0,0 +1,62 @@
+<?php
+
+# required: PHP 5.3+ and zlib extension
+
+// ini option check
+if (ini_get('phar.readonly')) {
+    echo "php.ini: set the 'phar.readonly' option to 0 to enable phar creation\n";
+    exit(1);
+}
+
+// output name
+$pharName = 'Matrix.phar';
+
+// target folder
+$sourceDir = __DIR__ . DIRECTORY_SEPARATOR . 'classes' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR;
+
+// default meta information
+$metaData = array(
+    'Author'      => 'Mark Baker <mark@lange.demon.co.uk>',
+    'Description' => 'PHP Class for working with Matrix numbers',
+    'Copyright'   => 'Mark Baker (c) 2013-' . date('Y'),
+    'Timestamp'   => time(),
+    'Version'     => '0.1.0',
+    'Date'        => date('Y-m-d')
+);
+
+// cleanup
+if (file_exists($pharName)) {
+    echo "Removed: {$pharName}\n";
+    unlink($pharName);
+}
+
+echo "Building phar file...\n";
+
+// the phar object
+$phar = new Phar($pharName, null, 'Matrix');
+$phar->buildFromDirectory($sourceDir);
+$phar->setStub(
+<<<'EOT'
+<?php
+    spl_autoload_register(function ($className) {
+        include 'phar://' . $className . '.php';
+    });
+
+    try {
+        Phar::mapPhar();
+    } catch (PharException $e) {
+        error_log($e->getMessage());
+        exit(1);
+    }
+
+    include 'phar://functions/sqrt.php';
+
+    __HALT_COMPILER();
+EOT
+);
+$phar->setMetadata($metaData);
+$phar->compressFiles(Phar::GZ);
+
+echo "Complete.\n";
+
+exit();
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Builder.php b/src/Common/vendor/markbaker/matrix/classes/src/Builder.php
new file mode 100644
index 00000000..161bb688
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Builder.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ *
+ * Class for the creating "special" Matrices
+ *
+ * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
+ * @license    https://opensource.org/licenses/MIT    MIT
+ */
+
+namespace Matrix;
+
+/**
+ * Matrix Builder class.
+ *
+ * @package Matrix
+ */
+class Builder
+{
+    /**
+     * Create a new matrix of specified dimensions, and filled with a specified value
+     * If the column argument isn't provided, then a square matrix will be created
+     *
+     * @param mixed $fillValue
+     * @param int $rows
+     * @param int|null $columns
+     * @return Matrix
+     * @throws Exception
+     */
+    public static function createFilledMatrix($fillValue, $rows, $columns = null)
+    {
+        if ($columns === null) {
+            $columns = $rows;
+        }
+
+        $rows = Matrix::validateRow($rows);
+        $columns = Matrix::validateColumn($columns);
+
+        return new Matrix(
+            array_fill(
+                0,
+                $rows,
+                array_fill(
+                    0,
+                    $columns,
+                    $fillValue
+                )
+            )
+        );
+    }
+
+    /**
+     * Create a new identity matrix of specified dimensions
+     * This will always be a square matrix, with the number of rows and columns matching the provided dimension
+     *
+     * @param int $dimensions
+     * @return Matrix
+     * @throws Exception
+     */
+    public static function createIdentityMatrix($dimensions, $fillValue = null)
+    {
+        $grid = static::createFilledMatrix($fillValue, $dimensions)->toArray();
+
+        for ($x = 0; $x < $dimensions; ++$x) {
+            $grid[$x][$x] = 1;
+        }
+
+        return new Matrix($grid);
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/Decomposition.php b/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/Decomposition.php
new file mode 100644
index 00000000..f0144487
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/Decomposition.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Matrix\Decomposition;
+
+use Matrix\Exception;
+use Matrix\Matrix;
+
+class Decomposition
+{
+    const LU = 'LU';
+    const QR = 'QR';
+
+    /**
+     * @throws Exception
+     */
+    public static function decomposition($type, Matrix $matrix)
+    {
+        switch (strtoupper($type)) {
+            case self::LU:
+                return new LU($matrix);
+            case self::QR:
+                return new QR($matrix);
+            default:
+                throw new Exception('Invalid Decomposition');
+        }
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/LU.php b/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/LU.php
new file mode 100644
index 00000000..10fd9f78
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/LU.php
@@ -0,0 +1,260 @@
+<?php
+
+namespace Matrix\Decomposition;
+
+use Matrix\Exception;
+use Matrix\Matrix;
+
+class LU
+{
+    private $luMatrix;
+    private $rows;
+    private $columns;
+
+    private $pivot = [];
+
+    public function __construct(Matrix $matrix)
+    {
+        $this->luMatrix = $matrix->toArray();
+        $this->rows = $matrix->rows;
+        $this->columns = $matrix->columns;
+
+        $this->buildPivot();
+    }
+
+    /**
+     * Get lower triangular factor.
+     *
+     * @return Matrix Lower triangular factor
+     */
+    public function getL(): Matrix
+    {
+        $lower = [];
+
+        $columns = min($this->rows, $this->columns);
+        for ($row = 0; $row < $this->rows; ++$row) {
+            for ($column = 0; $column < $columns; ++$column) {
+                if ($row > $column) {
+                    $lower[$row][$column] = $this->luMatrix[$row][$column];
+                } elseif ($row === $column) {
+                    $lower[$row][$column] = 1.0;
+                } else {
+                    $lower[$row][$column] = 0.0;
+                }
+            }
+        }
+
+        return new Matrix($lower);
+    }
+
+    /**
+     * Get upper triangular factor.
+     *
+     * @return Matrix Upper triangular factor
+     */
+    public function getU(): Matrix
+    {
+        $upper = [];
+
+        $rows = min($this->rows, $this->columns);
+        for ($row = 0; $row < $rows; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                if ($row <= $column) {
+                    $upper[$row][$column] = $this->luMatrix[$row][$column];
+                } else {
+                    $upper[$row][$column] = 0.0;
+                }
+            }
+        }
+
+        return new Matrix($upper);
+    }
+
+    /**
+     * Return pivot permutation vector.
+     *
+     * @return Matrix Pivot matrix
+     */
+    public function getP(): Matrix
+    {
+        $pMatrix = [];
+
+        $pivots = $this->pivot;
+        $pivotCount = count($pivots);
+        foreach ($pivots as $row => $pivot) {
+            $pMatrix[$row] = array_fill(0, $pivotCount, 0);
+            $pMatrix[$row][$pivot] = 1;
+        }
+
+        return new Matrix($pMatrix);
+    }
+
+    /**
+     * Return pivot permutation vector.
+     *
+     * @return array Pivot vector
+     */
+    public function getPivot(): array
+    {
+        return $this->pivot;
+    }
+
+    /**
+     *    Is the matrix nonsingular?
+     *
+     * @return bool true if U, and hence A, is nonsingular
+     */
+    public function isNonsingular(): bool
+    {
+        for ($diagonal = 0; $diagonal < $this->columns; ++$diagonal) {
+            if ($this->luMatrix[$diagonal][$diagonal] === 0.0) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function buildPivot(): void
+    {
+        for ($row = 0; $row < $this->rows; ++$row) {
+            $this->pivot[$row] = $row;
+        }
+
+        for ($column = 0; $column < $this->columns; ++$column) {
+            $luColumn = $this->localisedReferenceColumn($column);
+
+            $this->applyTransformations($column, $luColumn);
+
+            $pivot = $this->findPivot($column, $luColumn);
+            if ($pivot !== $column) {
+                $this->pivotExchange($pivot, $column);
+            }
+
+            $this->computeMultipliers($column);
+
+            unset($luColumn);
+        }
+    }
+
+    private function localisedReferenceColumn($column): array
+    {
+        $luColumn = [];
+
+        for ($row = 0; $row < $this->rows; ++$row) {
+            $luColumn[$row] = &$this->luMatrix[$row][$column];
+        }
+
+        return $luColumn;
+    }
+
+    private function applyTransformations($column, array $luColumn): void
+    {
+        for ($row = 0; $row < $this->rows; ++$row) {
+            $luRow = $this->luMatrix[$row];
+            // Most of the time is spent in the following dot product.
+            $kmax = min($row, $column);
+            $sValue = 0.0;
+            for ($kValue = 0; $kValue < $kmax; ++$kValue) {
+                $sValue += $luRow[$kValue] * $luColumn[$kValue];
+            }
+            $luRow[$column] = $luColumn[$row] -= $sValue;
+        }
+    }
+
+    private function findPivot($column, array $luColumn): int
+    {
+        $pivot = $column;
+        for ($row = $column + 1; $row < $this->rows; ++$row) {
+            if (abs($luColumn[$row]) > abs($luColumn[$pivot])) {
+                $pivot = $row;
+            }
+        }
+
+        return $pivot;
+    }
+
+    private function pivotExchange($pivot, $column): void
+    {
+        for ($kValue = 0; $kValue < $this->columns; ++$kValue) {
+            $tValue = $this->luMatrix[$pivot][$kValue];
+            $this->luMatrix[$pivot][$kValue] = $this->luMatrix[$column][$kValue];
+            $this->luMatrix[$column][$kValue] = $tValue;
+        }
+
+        $lValue = $this->pivot[$pivot];
+        $this->pivot[$pivot] = $this->pivot[$column];
+        $this->pivot[$column] = $lValue;
+    }
+
+    private function computeMultipliers($diagonal): void
+    {
+        if (($diagonal < $this->rows) && ($this->luMatrix[$diagonal][$diagonal] != 0.0)) {
+            for ($row = $diagonal + 1; $row < $this->rows; ++$row) {
+                $this->luMatrix[$row][$diagonal] /= $this->luMatrix[$diagonal][$diagonal];
+            }
+        }
+    }
+
+    private function pivotB(Matrix $B): array
+    {
+        $X = [];
+        foreach ($this->pivot as $rowId) {
+            $row = $B->getRows($rowId + 1)->toArray();
+            $X[] = array_pop($row);
+        }
+
+        return $X;
+    }
+
+    /**
+     * Solve A*X = B.
+     *
+     * @param Matrix $B a Matrix with as many rows as A and any number of columns
+     *
+     * @throws Exception
+     *
+     * @return Matrix X so that L*U*X = B(piv,:)
+     */
+    public function solve(Matrix $B): Matrix
+    {
+        if ($B->rows !== $this->rows) {
+            throw new Exception('Matrix row dimensions are not equal');
+        }
+
+        if ($this->rows !== $this->columns) {
+            throw new Exception('LU solve() only works on square matrices');
+        }
+
+        if (!$this->isNonsingular()) {
+            throw new Exception('Can only perform operation on singular matrix');
+        }
+
+        // Copy right hand side with pivoting
+        $nx = $B->columns;
+        $X = $this->pivotB($B);
+
+        // Solve L*Y = B(piv,:)
+        for ($k = 0; $k < $this->columns; ++$k) {
+            for ($i = $k + 1; $i < $this->columns; ++$i) {
+                for ($j = 0; $j < $nx; ++$j) {
+                    $X[$i][$j] -= $X[$k][$j] * $this->luMatrix[$i][$k];
+                }
+            }
+        }
+
+        // Solve U*X = Y;
+        for ($k = $this->columns - 1; $k >= 0; --$k) {
+            for ($j = 0; $j < $nx; ++$j) {
+                $X[$k][$j] /= $this->luMatrix[$k][$k];
+            }
+            for ($i = 0; $i < $k; ++$i) {
+                for ($j = 0; $j < $nx; ++$j) {
+                    $X[$i][$j] -= $X[$k][$j] * $this->luMatrix[$i][$k];
+                }
+            }
+        }
+
+        return new Matrix($X);
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/QR.php b/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/QR.php
new file mode 100644
index 00000000..4b6106f6
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Decomposition/QR.php
@@ -0,0 +1,191 @@
+<?php
+
+namespace Matrix\Decomposition;
+
+use Matrix\Exception;
+use Matrix\Matrix;
+
+class QR
+{
+    private $qrMatrix;
+    private $rows;
+    private $columns;
+
+    private $rDiagonal = [];
+
+    public function __construct(Matrix $matrix)
+    {
+        $this->qrMatrix = $matrix->toArray();
+        $this->rows = $matrix->rows;
+        $this->columns = $matrix->columns;
+
+        $this->decompose();
+    }
+
+    public function getHouseholdVectors(): Matrix
+    {
+        $householdVectors = [];
+        for ($row = 0; $row < $this->rows; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                if ($row >= $column) {
+                    $householdVectors[$row][$column] = $this->qrMatrix[$row][$column];
+                } else {
+                    $householdVectors[$row][$column] = 0.0;
+                }
+            }
+        }
+
+        return new Matrix($householdVectors);
+    }
+
+    public function getQ(): Matrix
+    {
+        $qGrid = [];
+
+        $rowCount = $this->rows;
+        for ($k = $this->columns - 1; $k >= 0; --$k) {
+            for ($i = 0; $i < $this->rows; ++$i) {
+                $qGrid[$i][$k] = 0.0;
+            }
+            $qGrid[$k][$k] = 1.0;
+            if ($this->columns > $this->rows) {
+                $qGrid = array_slice($qGrid, 0, $this->rows);
+            }
+
+            for ($j = $k; $j < $this->columns; ++$j) {
+                if (isset($this->qrMatrix[$k], $this->qrMatrix[$k][$k]) && $this->qrMatrix[$k][$k] != 0.0) {
+                    $s = 0.0;
+                    for ($i = $k; $i < $this->rows; ++$i) {
+                        $s += $this->qrMatrix[$i][$k] * $qGrid[$i][$j];
+                    }
+                    $s = -$s / $this->qrMatrix[$k][$k];
+                    for ($i = $k; $i < $this->rows; ++$i) {
+                        $qGrid[$i][$j] += $s * $this->qrMatrix[$i][$k];
+                    }
+                }
+            }
+        }
+
+        array_walk(
+            $qGrid,
+            function (&$row) use ($rowCount) {
+                $row = array_reverse($row);
+                $row = array_slice($row, 0, $rowCount);
+            }
+        );
+
+        return new Matrix($qGrid);
+    }
+
+    public function getR(): Matrix
+    {
+        $rGrid = [];
+
+        for ($row = 0; $row < $this->columns; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                if ($row < $column) {
+                    $rGrid[$row][$column] = $this->qrMatrix[$row][$column] ?? 0.0;
+                } elseif ($row === $column) {
+                    $rGrid[$row][$column] = $this->rDiagonal[$row] ?? 0.0;
+                } else {
+                    $rGrid[$row][$column] = 0.0;
+                }
+            }
+        }
+
+        if ($this->columns > $this->rows) {
+            $rGrid = array_slice($rGrid, 0, $this->rows);
+        }
+
+        return new Matrix($rGrid);
+    }
+
+    private function hypo($a, $b): float
+    {
+        if (abs($a) > abs($b)) {
+            $r = $b / $a;
+            $r = abs($a) * sqrt(1 + $r * $r);
+        } elseif ($b != 0.0) {
+            $r = $a / $b;
+            $r = abs($b) * sqrt(1 + $r * $r);
+        } else {
+            $r = 0.0;
+        }
+
+        return $r;
+    }
+
+    /**
+     * QR Decomposition computed by Householder reflections.
+     */
+    private function decompose(): void
+    {
+        for ($k = 0; $k < $this->columns; ++$k) {
+            // Compute 2-norm of k-th column without under/overflow.
+            $norm = 0.0;
+            for ($i = $k; $i < $this->rows; ++$i) {
+                $norm = $this->hypo($norm, $this->qrMatrix[$i][$k]);
+            }
+            if ($norm != 0.0) {
+                // Form k-th Householder vector.
+                if ($this->qrMatrix[$k][$k] < 0.0) {
+                    $norm = -$norm;
+                }
+                for ($i = $k; $i < $this->rows; ++$i) {
+                    $this->qrMatrix[$i][$k] /= $norm;
+                }
+                $this->qrMatrix[$k][$k] += 1.0;
+                // Apply transformation to remaining columns.
+                for ($j = $k + 1; $j < $this->columns; ++$j) {
+                    $s = 0.0;
+                    for ($i = $k; $i < $this->rows; ++$i) {
+                        $s += $this->qrMatrix[$i][$k] * $this->qrMatrix[$i][$j];
+                    }
+                    $s = -$s / $this->qrMatrix[$k][$k];
+                    for ($i = $k; $i < $this->rows; ++$i) {
+                        $this->qrMatrix[$i][$j] += $s * $this->qrMatrix[$i][$k];
+                    }
+                }
+            }
+            $this->rDiagonal[$k] = -$norm;
+        }
+    }
+
+    public function isFullRank(): bool
+    {
+        for ($j = 0; $j < $this->columns; ++$j) {
+            if ($this->rDiagonal[$j] == 0.0) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Least squares solution of A*X = B.
+     *
+     * @param Matrix $B a Matrix with as many rows as A and any number of columns
+     *
+     * @throws Exception
+     *
+     * @return Matrix matrix that minimizes the two norm of Q*R*X-B
+     */
+    public function solve(Matrix $B): Matrix
+    {
+        if ($B->rows !== $this->rows) {
+            throw new Exception('Matrix row dimensions are not equal');
+        }
+
+        if (!$this->isFullRank()) {
+            throw new Exception('Can only perform this operation on a full-rank matrix');
+        }
+
+        // Compute Y = transpose(Q)*B
+        $Y = $this->getQ()->transpose()
+            ->multiply($B);
+        // Solve R*X = Y;
+        return $this->getR()->inverse()
+            ->multiply($Y);
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Div0Exception.php b/src/Common/vendor/markbaker/matrix/classes/src/Div0Exception.php
new file mode 100644
index 00000000..eba28f8a
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Div0Exception.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * Exception.
+ *
+ * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
+ * @license    https://opensource.org/licenses/MIT    MIT
+ */
+namespace Matrix;
+
+class Div0Exception extends Exception
+{
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Exception.php b/src/Common/vendor/markbaker/matrix/classes/src/Exception.php
new file mode 100644
index 00000000..55a428ca
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Exception.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * Exception.
+ *
+ * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
+ * @license    https://opensource.org/licenses/MIT    MIT
+ */
+namespace Matrix;
+
+class Exception extends \Exception
+{
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Functions.php b/src/Common/vendor/markbaker/matrix/classes/src/Functions.php
new file mode 100644
index 00000000..cdb49c6a
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Functions.php
@@ -0,0 +1,376 @@
+<?php
+
+namespace Matrix;
+
+class Functions
+{
+    /**
+     * Validates an array of matrix, converting an array to a matrix if required.
+     *
+     * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
+     * @return Matrix The new matrix
+     * @throws Exception If argument isn't a valid matrix or array.
+     */
+    private static function validateMatrix($matrix)
+    {
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Must be Matrix or array');
+        }
+
+        return $matrix;
+    }
+
+    /**
+     * Calculate the adjoint of the matrix
+     *
+     * @param Matrix $matrix The matrix whose adjoint we wish to calculate
+     * @return Matrix
+     *
+     * @throws Exception
+     */
+    private static function getAdjoint(Matrix $matrix)
+    {
+        return self::transpose(
+            self::getCofactors($matrix)
+        );
+    }
+
+    /**
+     * Return the adjoint of this matrix
+     * The adjugate, classical adjoint, or adjunct of a square matrix is the transpose of its cofactor matrix.
+     * The adjugate has sometimes been called the "adjoint", but today the "adjoint" of a matrix normally refers
+     *     to its corresponding adjoint operator, which is its conjugate transpose.
+     *
+     * @param Matrix|array $matrix The matrix whose adjoint we wish to calculate
+     * @return Matrix
+     * @throws Exception
+     **/
+    public static function adjoint($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception('Adjoint can only be calculated for a square matrix');
+        }
+
+        return self::getAdjoint($matrix);
+    }
+
+    /**
+     * Calculate the cofactors of the matrix
+     *
+     * @param Matrix $matrix The matrix whose cofactors we wish to calculate
+     * @return Matrix
+     *
+     * @throws Exception
+     */
+    private static function getCofactors(Matrix $matrix)
+    {
+        $cofactors = self::getMinors($matrix);
+        $dimensions = $matrix->rows;
+
+        $cof = 1;
+        for ($i = 0; $i < $dimensions; ++$i) {
+            $cofs = $cof;
+            for ($j = 0; $j < $dimensions; ++$j) {
+                $cofactors[$i][$j] *= $cofs;
+                $cofs = -$cofs;
+            }
+            $cof = -$cof;
+        }
+
+        return new Matrix($cofactors);
+    }
+
+    /**
+     * Return the cofactors of this matrix
+     *
+     * @param Matrix|array $matrix The matrix whose cofactors we wish to calculate
+     * @return Matrix
+     *
+     * @throws Exception
+     */
+    public static function cofactors($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception('Cofactors can only be calculated for a square matrix');
+        }
+
+        return self::getCofactors($matrix);
+    }
+
+    /**
+     * @param Matrix $matrix
+     * @param int $row
+     * @param int $column
+     * @return float
+     * @throws Exception
+     */
+    private static function getDeterminantSegment(Matrix $matrix, $row, $column)
+    {
+        $tmpMatrix = $matrix->toArray();
+        unset($tmpMatrix[$row]);
+        array_walk(
+            $tmpMatrix,
+            function (&$row) use ($column) {
+                unset($row[$column]);
+            }
+        );
+
+        return self::getDeterminant(new Matrix($tmpMatrix));
+    }
+
+    /**
+     * Calculate the determinant of the matrix
+     *
+     * @param Matrix $matrix The matrix whose determinant we wish to calculate
+     * @return float
+     *
+     * @throws Exception
+     */
+    private static function getDeterminant(Matrix $matrix)
+    {
+        $dimensions = $matrix->rows;
+        $determinant = 0;
+
+        switch ($dimensions) {
+            case 1:
+                $determinant = $matrix->getValue(1, 1);
+                break;
+            case 2:
+                $determinant = $matrix->getValue(1, 1) * $matrix->getValue(2, 2) -
+                    $matrix->getValue(1, 2) * $matrix->getValue(2, 1);
+                break;
+            default:
+                for ($i = 1; $i <= $dimensions; ++$i) {
+                    $det = $matrix->getValue(1, $i) * self::getDeterminantSegment($matrix, 0, $i - 1);
+                    if (($i % 2) == 0) {
+                        $determinant -= $det;
+                    } else {
+                        $determinant += $det;
+                    }
+                }
+                break;
+        }
+
+        return $determinant;
+    }
+
+    /**
+     * Return the determinant of this matrix
+     *
+     * @param Matrix|array $matrix The matrix whose determinant we wish to calculate
+     * @return float
+     * @throws Exception
+     **/
+    public static function determinant($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception('Determinant can only be calculated for a square matrix');
+        }
+
+        return self::getDeterminant($matrix);
+    }
+
+    /**
+     * Return the diagonal of this matrix
+     *
+     * @param Matrix|array $matrix The matrix whose diagonal we wish to calculate
+     * @return Matrix
+     * @throws Exception
+     **/
+    public static function diagonal($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception('Diagonal can only be extracted from a square matrix');
+        }
+
+        $dimensions = $matrix->rows;
+        $grid = Builder::createFilledMatrix(0, $dimensions, $dimensions)
+            ->toArray();
+
+        for ($i = 0; $i < $dimensions; ++$i) {
+            $grid[$i][$i] = $matrix->getValue($i + 1, $i + 1);
+        }
+
+        return new Matrix($grid);
+    }
+
+    /**
+     * Return the antidiagonal of this matrix
+     *
+     * @param Matrix|array $matrix The matrix whose antidiagonal we wish to calculate
+     * @return Matrix
+     * @throws Exception
+     **/
+    public static function antidiagonal($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception('Anti-Diagonal can only be extracted from a square matrix');
+        }
+
+        $dimensions = $matrix->rows;
+        $grid = Builder::createFilledMatrix(0, $dimensions, $dimensions)
+            ->toArray();
+
+        for ($i = 0; $i < $dimensions; ++$i) {
+            $grid[$i][$dimensions - $i - 1] = $matrix->getValue($i + 1, $dimensions - $i);
+        }
+
+        return new Matrix($grid);
+    }
+
+    /**
+     * Return the identity matrix
+     * The identity matrix, or sometimes ambiguously called a unit matrix, of size n is the n × n square matrix
+     *   with ones on the main diagonal and zeros elsewhere
+     *
+     * @param Matrix|array $matrix The matrix whose identity we wish to calculate
+     * @return Matrix
+     * @throws Exception
+     **/
+    public static function identity($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception('Identity can only be created for a square matrix');
+        }
+
+        $dimensions = $matrix->rows;
+
+        return Builder::createIdentityMatrix($dimensions);
+    }
+
+    /**
+     * Return the inverse of this matrix
+     *
+     * @param Matrix|array $matrix The matrix whose inverse we wish to calculate
+     * @return Matrix
+     * @throws Exception
+     **/
+    public static function inverse($matrix, string $type = 'inverse')
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception(ucfirst($type) . ' can only be calculated for a square matrix');
+        }
+
+        $determinant = self::getDeterminant($matrix);
+        if ($determinant == 0.0) {
+            throw new Div0Exception(ucfirst($type) . ' can only be calculated for a matrix with a non-zero determinant');
+        }
+
+        if ($matrix->rows == 1) {
+            return new Matrix([[1 / $matrix->getValue(1, 1)]]);
+        }
+
+        return self::getAdjoint($matrix)
+            ->multiply(1 / $determinant);
+    }
+
+    /**
+     * Calculate the minors of the matrix
+     *
+     * @param Matrix $matrix The matrix whose minors we wish to calculate
+     * @return array[]
+     *
+     * @throws Exception
+     */
+    protected static function getMinors(Matrix $matrix)
+    {
+        $minors = $matrix->toArray();
+        $dimensions = $matrix->rows;
+        if ($dimensions == 1) {
+            return $minors;
+        }
+
+        for ($i = 0; $i < $dimensions; ++$i) {
+            for ($j = 0; $j < $dimensions; ++$j) {
+                $minors[$i][$j] = self::getDeterminantSegment($matrix, $i, $j);
+            }
+        }
+
+        return $minors;
+    }
+
+    /**
+     * Return the minors of the matrix
+     * The minor of a matrix A is the determinant of some smaller square matrix, cut down from A by removing one or
+     *     more of its rows or columns.
+     * Minors obtained by removing just one row and one column from square matrices (first minors) are required for
+     *     calculating matrix cofactors, which in turn are useful for computing both the determinant and inverse of
+     *     square matrices.
+     *
+     * @param Matrix|array $matrix The matrix whose minors we wish to calculate
+     * @return Matrix
+     * @throws Exception
+     **/
+    public static function minors($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception('Minors can only be calculated for a square matrix');
+        }
+
+        return new Matrix(self::getMinors($matrix));
+    }
+
+    /**
+     * Return the trace of this matrix
+     * The trace is defined as the sum of the elements on the main diagonal (the diagonal from the upper left to the lower right)
+     *     of the matrix
+     *
+     * @param Matrix|array $matrix The matrix whose trace we wish to calculate
+     * @return float
+     * @throws Exception
+     **/
+    public static function trace($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        if (!$matrix->isSquare()) {
+            throw new Exception('Trace can only be extracted from a square matrix');
+        }
+
+        $dimensions = $matrix->rows;
+        $result = 0;
+        for ($i = 1; $i <= $dimensions; ++$i) {
+            $result += $matrix->getValue($i, $i);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return the transpose of this matrix
+     *
+     * @param Matrix|\a $matrix The matrix whose transpose we wish to calculate
+     * @return Matrix
+     **/
+    public static function transpose($matrix)
+    {
+        $matrix = self::validateMatrix($matrix);
+
+        $array = array_values(array_merge([null], $matrix->toArray()));
+        $grid = call_user_func_array(
+            'array_map',
+            $array
+        );
+
+        return new Matrix($grid);
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Matrix.php b/src/Common/vendor/markbaker/matrix/classes/src/Matrix.php
new file mode 100644
index 00000000..95f55e75
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Matrix.php
@@ -0,0 +1,423 @@
+<?php
+
+/**
+ *
+ * Class for the management of Matrices
+ *
+ * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
+ * @license    https://opensource.org/licenses/MIT    MIT
+ */
+
+namespace Matrix;
+
+use Generator;
+use Matrix\Decomposition\LU;
+use Matrix\Decomposition\QR;
+
+/**
+ * Matrix object.
+ *
+ * @package Matrix
+ *
+ * @property-read int $rows The number of rows in the matrix
+ * @property-read int $columns The number of columns in the matrix
+ * @method Matrix antidiagonal()
+ * @method Matrix adjoint()
+ * @method Matrix cofactors()
+ * @method float determinant()
+ * @method Matrix diagonal()
+ * @method Matrix identity()
+ * @method Matrix inverse()
+ * @method Matrix minors()
+ * @method float trace()
+ * @method Matrix transpose()
+ * @method Matrix add(...$matrices)
+ * @method Matrix subtract(...$matrices)
+ * @method Matrix multiply(...$matrices)
+ * @method Matrix divideby(...$matrices)
+ * @method Matrix divideinto(...$matrices)
+ * @method Matrix directsum(...$matrices)
+ */
+class Matrix
+{
+    protected $rows;
+    protected $columns;
+    protected $grid = [];
+
+    /*
+     * Create a new Matrix object from an array of values
+     *
+     * @param array $grid
+     */
+    final public function __construct(array $grid)
+    {
+        $this->buildFromArray(array_values($grid));
+    }
+
+    /*
+     * Create a new Matrix object from an array of values
+     *
+     * @param array $grid
+     */
+    protected function buildFromArray(array $grid): void
+    {
+        $this->rows = count($grid);
+        $columns = array_reduce(
+            $grid,
+            function ($carry, $value) {
+                return max($carry, is_array($value) ? count($value) : 1);
+            }
+        );
+        $this->columns = $columns;
+
+        array_walk(
+            $grid,
+            function (&$value) use ($columns) {
+                if (!is_array($value)) {
+                    $value = [$value];
+                }
+                $value = array_pad(array_values($value), $columns, null);
+            }
+        );
+
+        $this->grid = $grid;
+    }
+
+    /**
+     * Validate that a row number is a positive integer
+     *
+     * @param int $row
+     * @return int
+     * @throws Exception
+     */
+    public static function validateRow(int $row): int
+    {
+        if ((!is_numeric($row)) || (intval($row) < 1)) {
+            throw new Exception('Invalid Row');
+        }
+
+        return (int)$row;
+    }
+
+    /**
+     * Validate that a column number is a positive integer
+     *
+     * @param int $column
+     * @return int
+     * @throws Exception
+     */
+    public static function validateColumn(int $column): int
+    {
+        if ((!is_numeric($column)) || (intval($column) < 1)) {
+            throw new Exception('Invalid Column');
+        }
+
+        return (int)$column;
+    }
+
+    /**
+     * Validate that a row number falls within the set of rows for this matrix
+     *
+     * @param int $row
+     * @return int
+     * @throws Exception
+     */
+    protected function validateRowInRange(int $row): int
+    {
+        $row = static::validateRow($row);
+        if ($row > $this->rows) {
+            throw new Exception('Requested Row exceeds matrix size');
+        }
+
+        return $row;
+    }
+
+    /**
+     * Validate that a column number falls within the set of columns for this matrix
+     *
+     * @param int $column
+     * @return int
+     * @throws Exception
+     */
+    protected function validateColumnInRange(int $column): int
+    {
+        $column = static::validateColumn($column);
+        if ($column > $this->columns) {
+            throw new Exception('Requested Column exceeds matrix size');
+        }
+
+        return $column;
+    }
+
+    /**
+     * Return a new matrix as a subset of rows from this matrix, starting at row number $row, and $rowCount rows
+     * A $rowCount value of 0 will return all rows of the matrix from $row
+     * A negative $rowCount value will return rows until that many rows from the end of the matrix
+     *
+     * Note that row numbers start from 1, not from 0
+     *
+     * @param int $row
+     * @param int $rowCount
+     * @return static
+     * @throws Exception
+     */
+    public function getRows(int $row, int $rowCount = 1): Matrix
+    {
+        $row = $this->validateRowInRange($row);
+        if ($rowCount === 0) {
+            $rowCount = $this->rows - $row + 1;
+        }
+
+        return new static(array_slice($this->grid, $row - 1, (int)$rowCount));
+    }
+
+    /**
+     * Return a new matrix as a subset of columns from this matrix, starting at column number $column, and $columnCount columns
+     * A $columnCount value of 0 will return all columns of the matrix from $column
+     * A negative $columnCount value will return columns until that many columns from the end of the matrix
+     *
+     * Note that column numbers start from 1, not from 0
+     *
+     * @param int $column
+     * @param int $columnCount
+     * @return Matrix
+     * @throws Exception
+     */
+    public function getColumns(int $column, int $columnCount = 1): Matrix
+    {
+        $column = $this->validateColumnInRange($column);
+        if ($columnCount < 1) {
+            $columnCount = $this->columns + $columnCount - $column + 1;
+        }
+
+        $grid = [];
+        for ($i = $column - 1; $i < $column + $columnCount - 1; ++$i) {
+            $grid[] = array_column($this->grid, $i);
+        }
+
+        return (new static($grid))->transpose();
+    }
+
+    /**
+     * Return a new matrix as a subset of rows from this matrix, dropping rows starting at row number $row,
+     *     and $rowCount rows
+     * A negative $rowCount value will drop rows until that many rows from the end of the matrix
+     * A $rowCount value of 0 will remove all rows of the matrix from $row
+     *
+     * Note that row numbers start from 1, not from 0
+     *
+     * @param int $row
+     * @param int $rowCount
+     * @return static
+     * @throws Exception
+     */
+    public function dropRows(int $row, int $rowCount = 1): Matrix
+    {
+        $this->validateRowInRange($row);
+        if ($rowCount === 0) {
+            $rowCount = $this->rows - $row + 1;
+        }
+
+        $grid = $this->grid;
+        array_splice($grid, $row - 1, (int)$rowCount);
+
+        return new static($grid);
+    }
+
+    /**
+     * Return a new matrix as a subset of columns from this matrix, dropping columns starting at column number $column,
+     *     and $columnCount columns
+     * A negative $columnCount value will drop columns until that many columns from the end of the matrix
+     * A $columnCount value of 0 will remove all columns of the matrix from $column
+     *
+     * Note that column numbers start from 1, not from 0
+     *
+     * @param int $column
+     * @param int $columnCount
+     * @return static
+     * @throws Exception
+     */
+    public function dropColumns(int $column, int $columnCount = 1): Matrix
+    {
+        $this->validateColumnInRange($column);
+        if ($columnCount < 1) {
+            $columnCount = $this->columns + $columnCount - $column + 1;
+        }
+
+        $grid = $this->grid;
+        array_walk(
+            $grid,
+            function (&$row) use ($column, $columnCount) {
+                array_splice($row, $column - 1, (int)$columnCount);
+            }
+        );
+
+        return new static($grid);
+    }
+
+    /**
+     * Return a value from this matrix, from the "cell" identified by the row and column numbers
+     * Note that row and column numbers start from 1, not from 0
+     *
+     * @param int $row
+     * @param int $column
+     * @return mixed
+     * @throws Exception
+     */
+    public function getValue(int $row, int $column)
+    {
+        $row = $this->validateRowInRange($row);
+        $column = $this->validateColumnInRange($column);
+
+        return $this->grid[$row - 1][$column - 1];
+    }
+
+    /**
+     * Returns a Generator that will yield each row of the matrix in turn as a vector matrix
+     *     or the value of each cell if the matrix is a column vector
+     *
+     * @return Generator|Matrix[]|mixed[]
+     */
+    public function rows(): Generator
+    {
+        foreach ($this->grid as $i => $row) {
+            yield $i + 1 => ($this->columns == 1)
+                ? $row[0]
+                : new static([$row]);
+        }
+    }
+
+    /**
+     * Returns a Generator that will yield each column of the matrix in turn as a vector matrix
+     *     or the value of each cell if the matrix is a row vector
+     *
+     * @return Generator|Matrix[]|mixed[]
+     */
+    public function columns(): Generator
+    {
+        for ($i = 0; $i < $this->columns; ++$i) {
+            yield $i + 1 => ($this->rows == 1)
+                ? $this->grid[0][$i]
+                : new static(array_column($this->grid, $i));
+        }
+    }
+
+    /**
+     * Identify if the row and column dimensions of this matrix are equal,
+     *     i.e. if it is a "square" matrix
+     *
+     * @return bool
+     */
+    public function isSquare(): bool
+    {
+        return $this->rows === $this->columns;
+    }
+
+    /**
+     * Identify if this matrix is a vector
+     *     i.e. if it comprises only a single row or a single column
+     *
+     * @return bool
+     */
+    public function isVector(): bool
+    {
+        return $this->rows === 1 || $this->columns === 1;
+    }
+
+    /**
+     * Return the matrix as a 2-dimensional array
+     *
+     * @return array
+     */
+    public function toArray(): array
+    {
+        return $this->grid;
+    }
+
+    /**
+     * Solve A*X = B.
+     *
+     * @param Matrix $B Right hand side
+     *
+     * @throws Exception
+     *
+     * @return Matrix ... Solution if A is square, least squares solution otherwise
+     */
+    public function solve(Matrix $B): Matrix
+    {
+        if ($this->columns === $this->rows) {
+            return (new LU($this))->solve($B);
+        }
+
+        return (new QR($this))->solve($B);
+    }
+
+    protected static $getters = [
+        'rows',
+        'columns',
+    ];
+
+    /**
+     * Access specific properties as read-only (no setters)
+     *
+     * @param string $propertyName
+     * @return mixed
+     * @throws Exception
+     */
+    public function __get(string $propertyName)
+    {
+        $propertyName = strtolower($propertyName);
+
+        // Test for function calls
+        if (in_array($propertyName, self::$getters)) {
+            return $this->$propertyName;
+        }
+
+        throw new Exception('Property does not exist');
+    }
+
+    protected static $functions = [
+        'adjoint',
+        'antidiagonal',
+        'cofactors',
+        'determinant',
+        'diagonal',
+        'identity',
+        'inverse',
+        'minors',
+        'trace',
+        'transpose',
+    ];
+
+    protected static $operations = [
+        'add',
+        'subtract',
+        'multiply',
+        'divideby',
+        'divideinto',
+        'directsum',
+    ];
+
+    /**
+     * Returns the result of the function call or operation
+     *
+     * @param string $functionName
+     * @param mixed[] $arguments
+     * @return Matrix|float
+     * @throws Exception
+     */
+    public function __call(string $functionName, $arguments)
+    {
+        $functionName = strtolower(str_replace('_', '', $functionName));
+
+        // Test for function calls
+        if (in_array($functionName, self::$functions, true)) {
+            return Functions::$functionName($this, ...$arguments);
+        }
+        // Test for operation calls
+        if (in_array($functionName, self::$operations, true)) {
+            return Operations::$functionName($this, ...$arguments);
+        }
+        throw new Exception('Function or Operation does not exist');
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Operations.php b/src/Common/vendor/markbaker/matrix/classes/src/Operations.php
new file mode 100644
index 00000000..e3d88d64
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Operations.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace Matrix;
+
+use Matrix\Operators\Addition;
+use Matrix\Operators\DirectSum;
+use Matrix\Operators\Division;
+use Matrix\Operators\Multiplication;
+use Matrix\Operators\Subtraction;
+
+class Operations
+{
+    public static function add(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Addition operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Addition arguments must be Matrix or array');
+        }
+
+        $result = new Addition($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function directsum(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('DirectSum operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('DirectSum arguments must be Matrix or array');
+        }
+
+        $result = new DirectSum($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function divideby(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Division operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Division arguments must be Matrix or array');
+        }
+
+        $result = new Division($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function divideinto(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Division operation requires at least 2 arguments');
+        }
+
+        $matrix = array_pop($matrixValues);
+        $matrixValues = array_reverse($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Division arguments must be Matrix or array');
+        }
+
+        $result = new Division($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function multiply(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Multiplication operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Multiplication arguments must be Matrix or array');
+        }
+
+        $result = new Multiplication($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function subtract(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Subtraction operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Subtraction arguments must be Matrix or array');
+        }
+
+        $result = new Subtraction($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Operators/Addition.php b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Addition.php
new file mode 100644
index 00000000..543f56e9
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Addition.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Matrix\Operators;
+
+use Matrix\Matrix;
+use Matrix\Exception;
+
+class Addition extends Operator
+{
+    /**
+     * Execute the addition
+     *
+     * @param mixed $value The matrix or numeric value to add to the current base value
+     * @throws Exception If the provided argument is not appropriate for the operation
+     * @return $this The operation object, allowing multiple additions to be chained
+     **/
+    public function execute($value): Operator
+    {
+        if (is_array($value)) {
+            $value = new Matrix($value);
+        }
+
+        if (is_object($value) && ($value instanceof Matrix)) {
+            return $this->addMatrix($value);
+        } elseif (is_numeric($value)) {
+            return $this->addScalar($value);
+        }
+
+        throw new Exception('Invalid argument for addition');
+    }
+
+    /**
+     * Execute the addition for a scalar
+     *
+     * @param mixed $value The numeric value to add to the current base value
+     * @return $this The operation object, allowing multiple additions to be chained
+     **/
+    protected function addScalar($value): Operator
+    {
+        for ($row = 0; $row < $this->rows; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                $this->matrix[$row][$column] += $value;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Execute the addition for a matrix
+     *
+     * @param Matrix $value The numeric value to add to the current base value
+     * @return $this The operation object, allowing multiple additions to be chained
+     * @throws Exception If the provided argument is not appropriate for the operation
+     **/
+    protected function addMatrix(Matrix $value): Operator
+    {
+        $this->validateMatchingDimensions($value);
+
+        for ($row = 0; $row < $this->rows; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                $this->matrix[$row][$column] += $value->getValue($row + 1, $column + 1);
+            }
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Operators/DirectSum.php b/src/Common/vendor/markbaker/matrix/classes/src/Operators/DirectSum.php
new file mode 100644
index 00000000..cc51ef96
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Operators/DirectSum.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Matrix\Operators;
+
+use Matrix\Matrix;
+use Matrix\Exception;
+
+class DirectSum extends Operator
+{
+    /**
+     * Execute the addition
+     *
+     * @param mixed $value The matrix or numeric value to add to the current base value
+     * @return $this The operation object, allowing multiple additions to be chained
+     * @throws Exception If the provided argument is not appropriate for the operation
+     */
+    public function execute($value): Operator
+    {
+        if (is_array($value)) {
+            $value = new Matrix($value);
+        }
+
+        if ($value instanceof Matrix) {
+            return $this->directSumMatrix($value);
+        }
+
+        throw new Exception('Invalid argument for addition');
+    }
+
+    /**
+     * Execute the direct sum for a matrix
+     *
+     * @param Matrix $value The numeric value to concatenate/direct sum with the current base value
+     * @return $this The operation object, allowing multiple additions to be chained
+     **/
+    private function directSumMatrix($value): Operator
+    {
+        $originalColumnCount = count($this->matrix[0]);
+        $originalRowCount = count($this->matrix);
+        $valColumnCount = $value->columns;
+        $valRowCount = $value->rows;
+        $value = $value->toArray();
+
+        for ($row = 0; $row < $this->rows; ++$row) {
+            $this->matrix[$row] = array_merge($this->matrix[$row], array_fill(0, $valColumnCount, 0));
+        }
+
+        $this->matrix = array_merge(
+            $this->matrix,
+            array_fill(0, $valRowCount, array_fill(0, $originalColumnCount, 0))
+        );
+
+        for ($row = $originalRowCount; $row < $originalRowCount + $valRowCount; ++$row) {
+            array_splice(
+                $this->matrix[$row],
+                $originalColumnCount,
+                $valColumnCount,
+                $value[$row - $originalRowCount]
+            );
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Operators/Division.php b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Division.php
new file mode 100644
index 00000000..dbfec9d3
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Division.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Matrix\Operators;
+
+use Matrix\Div0Exception;
+use Matrix\Exception;
+use \Matrix\Matrix;
+use \Matrix\Functions;
+
+class Division extends Multiplication
+{
+    /**
+     * Execute the division
+     *
+     * @param mixed $value The matrix or numeric value to divide the current base value by
+     * @throws Exception If the provided argument is not appropriate for the operation
+     * @return $this The operation object, allowing multiple divisions to be chained
+     **/
+    public function execute($value, string $type = 'division'): Operator
+    {
+        if (is_array($value)) {
+            $value = new Matrix($value);
+        }
+
+        if (is_object($value) && ($value instanceof Matrix)) {
+            $value = Functions::inverse($value, $type);
+
+            return $this->multiplyMatrix($value, $type);
+        } elseif (is_numeric($value)) {
+            return $this->multiplyScalar(1 / $value, $type);
+        }
+
+        throw new Exception('Invalid argument for division');
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Operators/Multiplication.php b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Multiplication.php
new file mode 100644
index 00000000..0761e466
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Multiplication.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Matrix\Operators;
+
+use Matrix\Matrix;
+use \Matrix\Builder;
+use Matrix\Exception;
+use Throwable;
+
+class Multiplication extends Operator
+{
+    /**
+     * Execute the multiplication
+     *
+     * @param mixed $value The matrix or numeric value to multiply the current base value by
+     * @throws Exception If the provided argument is not appropriate for the operation
+     * @return $this The operation object, allowing multiple multiplications to be chained
+     **/
+    public function execute($value, string $type = 'multiplication'): Operator
+    {
+        if (is_array($value)) {
+            $value = new Matrix($value);
+        }
+
+        if (is_object($value) && ($value instanceof Matrix)) {
+            return $this->multiplyMatrix($value, $type);
+        } elseif (is_numeric($value)) {
+            return $this->multiplyScalar($value, $type);
+        }
+
+        throw new Exception("Invalid argument for $type");
+    }
+
+    /**
+     * Execute the multiplication for a scalar
+     *
+     * @param mixed $value The numeric value to multiply with the current base value
+     * @return $this The operation object, allowing multiple mutiplications to be chained
+     **/
+    protected function multiplyScalar($value, string $type = 'multiplication'): Operator
+    {
+        try {
+            for ($row = 0; $row < $this->rows; ++$row) {
+                for ($column = 0; $column < $this->columns; ++$column) {
+                    $this->matrix[$row][$column] *= $value;
+                }
+            }
+        } catch (Throwable $e) {
+            throw new Exception("Invalid argument for $type");
+        }
+
+        return $this;
+    }
+
+    /**
+     * Execute the multiplication for a matrix
+     *
+     * @param Matrix $value The numeric value to multiply with the current base value
+     * @return $this The operation object, allowing multiple mutiplications to be chained
+     * @throws Exception If the provided argument is not appropriate for the operation
+     **/
+    protected function multiplyMatrix(Matrix $value, string $type = 'multiplication'): Operator
+    {
+        $this->validateReflectingDimensions($value);
+
+        $newRows = $this->rows;
+        $newColumns = $value->columns;
+        $matrix = Builder::createFilledMatrix(0, $newRows, $newColumns)
+            ->toArray();
+        try {
+            for ($row = 0; $row < $newRows; ++$row) {
+                for ($column = 0; $column < $newColumns; ++$column) {
+                    $columnData = $value->getColumns($column + 1)->toArray();
+                    foreach ($this->matrix[$row] as $key => $valueData) {
+                        $matrix[$row][$column] += $valueData * $columnData[$key][0];
+                    }
+                }
+            }
+        } catch (Throwable $e) {
+            throw new Exception("Invalid argument for $type");
+        }
+        $this->matrix = $matrix;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Operators/Operator.php b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Operator.php
new file mode 100644
index 00000000..39e36c61
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Operator.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Matrix\Operators;
+
+use Matrix\Matrix;
+use Matrix\Exception;
+
+abstract class Operator
+{
+    /**
+     * Stored internally as a 2-dimension array of values
+     *
+     * @property mixed[][] $matrix
+     **/
+    protected $matrix;
+
+    /**
+     * Number of rows in the matrix
+     *
+     * @property integer $rows
+     **/
+    protected $rows;
+
+    /**
+     * Number of columns in the matrix
+     *
+     * @property integer $columns
+     **/
+    protected $columns;
+
+    /**
+     * Create an new handler object for the operation
+     *
+     * @param Matrix $matrix The base Matrix object on which the operation will be performed
+     */
+    public function __construct(Matrix $matrix)
+    {
+        $this->rows = $matrix->rows;
+        $this->columns = $matrix->columns;
+        $this->matrix = $matrix->toArray();
+    }
+
+    /**
+     * Compare the dimensions of the matrices being operated on to see if they are valid for addition/subtraction
+     *
+     * @param Matrix $matrix The second Matrix object on which the operation will be performed
+     * @throws Exception
+     */
+    protected function validateMatchingDimensions(Matrix $matrix): void
+    {
+        if (($this->rows != $matrix->rows) || ($this->columns != $matrix->columns)) {
+            throw new Exception('Matrices have mismatched dimensions');
+        }
+    }
+
+    /**
+     * Compare the dimensions of the matrices being operated on to see if they are valid for multiplication/division
+     *
+     * @param Matrix $matrix The second Matrix object on which the operation will be performed
+     * @throws Exception
+     */
+    protected function validateReflectingDimensions(Matrix $matrix): void
+    {
+        if ($this->columns != $matrix->rows) {
+            throw new Exception('Matrices have mismatched dimensions');
+        }
+    }
+
+    /**
+     * Return the result of the operation
+     *
+     * @return Matrix
+     */
+    public function result(): Matrix
+    {
+        return new Matrix($this->matrix);
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/classes/src/Operators/Subtraction.php b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Subtraction.php
new file mode 100644
index 00000000..b7e14fad
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/classes/src/Operators/Subtraction.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Matrix\Operators;
+
+use Matrix\Matrix;
+use Matrix\Exception;
+
+class Subtraction extends Operator
+{
+    /**
+     * Execute the subtraction
+     *
+     * @param mixed $value The matrix or numeric value to subtract from the current base value
+     * @throws Exception If the provided argument is not appropriate for the operation
+     * @return $this The operation object, allowing multiple subtractions to be chained
+     **/
+    public function execute($value): Operator
+    {
+        if (is_array($value)) {
+            $value = new Matrix($value);
+        }
+
+        if (is_object($value) && ($value instanceof Matrix)) {
+            return $this->subtractMatrix($value);
+        } elseif (is_numeric($value)) {
+            return $this->subtractScalar($value);
+        }
+
+        throw new Exception('Invalid argument for subtraction');
+    }
+
+    /**
+     * Execute the subtraction for a scalar
+     *
+     * @param mixed $value The numeric value to subtracted from the current base value
+     * @return $this The operation object, allowing multiple additions to be chained
+     **/
+    protected function subtractScalar($value): Operator
+    {
+        for ($row = 0; $row < $this->rows; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                $this->matrix[$row][$column] -= $value;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Execute the subtraction for a matrix
+     *
+     * @param Matrix $value The numeric value to subtract from the current base value
+     * @return $this The operation object, allowing multiple subtractions to be chained
+     * @throws Exception If the provided argument is not appropriate for the operation
+     **/
+    protected function subtractMatrix(Matrix $value): Operator
+    {
+        $this->validateMatchingDimensions($value);
+
+        for ($row = 0; $row < $this->rows; ++$row) {
+            for ($column = 0; $column < $this->columns; ++$column) {
+                $this->matrix[$row][$column] -= $value->getValue($row + 1, $column + 1);
+            }
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/composer.json b/src/Common/vendor/markbaker/matrix/composer.json
new file mode 100644
index 00000000..e86a1e05
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/composer.json
@@ -0,0 +1,52 @@
+{
+    "name": "markbaker/matrix",
+    "type": "library",
+    "description": "PHP Class for working with matrices",
+    "keywords": ["matrix", "vector", "mathematics"],
+    "homepage": "https://github.com/MarkBaker/PHPMatrix",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Mark Baker",
+            "email": "mark@demon-angel.eu"
+        }
+    ],
+    "require": {
+        "php": "^7.1 || ^8.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+        "phpdocumentor/phpdocumentor": "2.*",
+        "phpmd/phpmd": "2.*",
+        "sebastian/phpcpd": "^4.0",
+        "phploc/phploc": "^4.0",
+        "squizlabs/php_codesniffer": "^3.7",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-master"
+    },
+    "autoload": {
+        "psr-4": {
+            "Matrix\\": "classes/src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "MatrixTest\\": "unitTests/classes/src/"
+        }
+    },
+    "scripts": {
+        "style": "phpcs --report-width=200 --standard=PSR2 --report=summary,full classes/src/ unitTests/classes/src -n",
+        "test": "phpunit -c phpunit.xml.dist",
+        "mess": "phpmd classes/src/ xml codesize,unusedcode,design,naming -n",
+        "lines": "phploc classes/src/ -n",
+        "cpd": "phpcpd classes/src/ -n",
+        "versions": "phpcs --report-width=200 --standard=PHPCompatibility --report=summary,full classes/src/ --runtime-set testVersion 7.2- -n",
+        "coverage": "phpunit -c phpunit.xml.dist --coverage-text --coverage-html ./build/coverage"
+    },
+    "minimum-stability": "dev",
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/examples/test.php b/src/Common/vendor/markbaker/matrix/examples/test.php
new file mode 100644
index 00000000..071dae91
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/examples/test.php
@@ -0,0 +1,33 @@
+<?php
+
+use Matrix\Matrix;
+use Matrix\Decomposition\QR;
+
+include __DIR__ . '/../vendor/autoload.php';
+
+$grid = [
+    [0, 1],
+    [-1, 0],
+];
+
+$targetGrid = [
+    [-1],
+    [2],
+];
+
+$matrix = new Matrix($grid);
+$target = new Matrix($targetGrid);
+
+$decomposition = new QR($matrix);
+
+$X = $decomposition->solve($target);
+
+echo 'X', PHP_EOL;
+var_export($X->toArray());
+echo PHP_EOL;
+
+$resolve = $matrix->multiply($X);
+
+echo 'Resolve', PHP_EOL;
+var_export($resolve->toArray());
+echo PHP_EOL;
diff --git a/src/Common/vendor/markbaker/matrix/infection.json.dist b/src/Common/vendor/markbaker/matrix/infection.json.dist
new file mode 100644
index 00000000..eddaa70a
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/infection.json.dist
@@ -0,0 +1,17 @@
+{
+    "timeout": 1,
+    "source": {
+        "directories": [
+            "classes\/src"
+        ]
+    },
+    "logs": {
+        "text": "build/infection/text.log",
+        "summary": "build/infection/summary.log",
+        "debug": "build/infection/debug.log",
+        "perMutator": "build/infection/perMutator.md"
+    },
+    "mutators": {
+        "@default": true
+    }
+}
diff --git a/src/Common/vendor/markbaker/matrix/license.md b/src/Common/vendor/markbaker/matrix/license.md
new file mode 100644
index 00000000..7329058f
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/license.md
@@ -0,0 +1,25 @@
+The MIT License (MIT)
+=====================
+
+Copyright © `2018` `Mark Baker`
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/src/Common/vendor/markbaker/matrix/phpstan.neon b/src/Common/vendor/markbaker/matrix/phpstan.neon
new file mode 100644
index 00000000..3d90d492
--- /dev/null
+++ b/src/Common/vendor/markbaker/matrix/phpstan.neon
@@ -0,0 +1,6 @@
+parameters:
+    ignoreErrors:
+        - '#Property [A-Za-z\\]+::\$[A-Za-z]+ has no typehint specified#'
+        - '#Method [A-Za-z\\]+::[A-Za-z]+\(\) has no return typehint specified#'
+        - '#Method [A-Za-z\\]+::[A-Za-z]+\(\) has parameter \$[A-Za-z0-9]+ with no typehint specified#'
+    checkMissingIterableValueType: false
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/CHANGELOG.md b/src/Common/vendor/phpoffice/phpspreadsheet/CHANGELOG.md
new file mode 100644
index 00000000..2fdf34f2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/CHANGELOG.md
@@ -0,0 +1,1591 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com)
+and this project adheres to [Semantic Versioning](https://semver.org).
+
+## 2024-07-29 - 2.2.1
+
+### Security Fix
+
+- Prevent XXE when loading files [PR #4119](https://github.com/PHPOffice/PhpSpreadsheet/pull/4119)
+
+### Fixed
+
+- Add Sheet may leave Active Sheet uninitialized. [Issue #4112](https://github.com/PHPOffice/PhpSpreadsheet/issues/4112) [PR #4114](https://github.com/PHPOffice/PhpSpreadsheet/pull/4114)
+- Reference to Defined Name Specifying Worksheet. [Issue #206](https://github.com/PHPOffice/PhpSpreadsheet/issues/296) [PR #4096](https://github.com/PHPOffice/PhpSpreadsheet/pull/4096)
+- Xls Reader Print/Show Gridlines. [Issue #912](https://github.com/PHPOffice/PhpSpreadsheet/issues/912) [PR #4098](https://github.com/PHPOffice/PhpSpreadsheet/pull/4098)
+- ODS Reader Allow Omission of Page Settings Tags. [Issue #4099](https://github.com/PHPOffice/PhpSpreadsheet/issues/4099) [PR #4101](https://github.com/PHPOffice/PhpSpreadsheet/pull/4101)
+
+## 2024-07-24 - 2.2.0
+
+### Added
+
+- Xlsx Reader Optionally Ignore Rows With No Cells. [Issue #3982](https://github.com/PHPOffice/PhpSpreadsheet/issues/3982) [PR #4035](https://github.com/PHPOffice/PhpSpreadsheet/pull/4035)
+- Means to change style without affecting current cell/sheet. [PR #4073](https://github.com/PHPOffice/PhpSpreadsheet/pull/4073)
+- Option for CSV output file to have varying numbers of columns for each row. [Issue #1415](https://github.com/PHPOffice/PhpSpreadsheet/issues/1415) [PR #4076](https://github.com/PHPOffice/PhpSpreadsheet/pull/4076)
+
+### Changed
+
+- On read, Xlsx Reader had been breaking up union ranges into separate individual ranges. It will now try to preserve range as it was read in. [PR #4042](https://github.com/PHPOffice/PhpSpreadsheet/pull/4042)
+- Xlsx/Xls spreadsheet calculation and formatting of dates will use base date of spreadsheet even when spreadsheets with different base dates are simultaneously open. [Issue #1036](https://github.com/PHPOffice/PhpSpreadsheet/issues/1036) [Issue #1635](https://github.com/PHPOffice/PhpSpreadsheet/issues/1635) [PR #4071](https://github.com/PHPOffice/PhpSpreadsheet/pull/4071) 
+
+### Deprecated
+
+- Writer\Xls\Style\ColorMap is no longer needed.
+
+### Moved
+
+- Nothing
+
+### Fixed
+
+- Incorrect Reader CSV with BOM. [Issue #4028](https://github.com/PHPOffice/PhpSpreadsheet/issues/4028) [PR #4029](https://github.com/PHPOffice/PhpSpreadsheet/pull/4029)
+- POWER Null/Bool Args. [PR #4031](https://github.com/PHPOffice/PhpSpreadsheet/pull/4031)
+- Do Not Output Alignment and Protection for Conditional Format. [Issue #4025](https://github.com/PHPOffice/PhpSpreadsheet/issues/4025) [PR #4027](https://github.com/PHPOffice/PhpSpreadsheet/pull/4027)
+- Conditional Color Scale Improvements. [Issue #4049](https://github.com/PHPOffice/PhpSpreadsheet/issues/4049) [PR #4050](https://github.com/PHPOffice/PhpSpreadsheet/pull/4050)
+- Mpdf and Tcpdf Borders on Merged Cells. [Issue #3557](https://github.com/PHPOffice/PhpSpreadsheet/issues/3557) [PR #4047](https://github.com/PHPOffice/PhpSpreadsheet/pull/4047)
+- Xls Conditional Format Improvements. [PR #4030](https://github.com/PHPOffice/PhpSpreadsheet/pull/4030) [PR #4033](https://github.com/PHPOffice/PhpSpreadsheet/pull/4033)
+- Conditional Range Unions and Intersections [Issue #4039](https://github.com/PHPOffice/PhpSpreadsheet/issues/4039) [PR #4042](https://github.com/PHPOffice/PhpSpreadsheet/pull/4042)
+- Ods comments with newlines. [Issue #4081](https://github.com/PHPOffice/PhpSpreadsheet/issues/4081) [PR #4086](https://github.com/PHPOffice/PhpSpreadsheet/pull/4086)
+- Propagate errors in Text functions. [Issue #2581](https://github.com/PHPOffice/PhpSpreadsheet/issues/2581) [PR #4080](https://github.com/PHPOffice/PhpSpreadsheet/pull/4080)
+- Csv Reader allow use of html mimetype. [Issue #4036](https://github.com/PHPOffice/PhpSpreadsheet/issues/4036) [PR #4040](https://github.com/PHPOffice/PhpSpreadsheet/pull/4040)
+- Problem rendering line chart with missing plot label. [PR #4074](https://github.com/PHPOffice/PhpSpreadsheet/pull/4074)
+- More RTL in Xlsx/Html Comments [Issue #4004](https://github.com/PHPOffice/PhpSpreadsheet/issues/4004) [PR #4065](https://github.com/PHPOffice/PhpSpreadsheet/pull/4065)
+- Empty String in sharedStrings. [Issue #4063](https://github.com/PHPOffice/PhpSpreadsheet/issues/4063) [PR #4064](https://github.com/PHPOffice/PhpSpreadsheet/pull/4064)
+- Xlsx Writer RichText and TYPE_STRING. [Issue #476](https://github.com/PHPOffice/PhpSpreadsheet/issues/476) [PR #4094](https://github.com/PHPOffice/PhpSpreadsheet/pull/4094)
+- Ods boolean data. [Issue #460](https://github.com/PHPOffice/PhpSpreadsheet/issues/460) [PR #4093](https://github.com/PHPOffice/PhpSpreadsheet/pull/4093)
+- Html Writer Minor Fixes. [PR #4089](https://github.com/PHPOffice/PhpSpreadsheet/pull/4089)
+- Changes to INDEX function. [Issue #64](https://github.com/PHPOffice/PhpSpreadsheet/issues/64) [PR #4088](https://github.com/PHPOffice/PhpSpreadsheet/pull/4088)
+- Ods Reader and Whitespace Text Nodes. [Issue #804](https://github.com/PHPOffice/PhpSpreadsheet/issues/804) [PR #4087](https://github.com/PHPOffice/PhpSpreadsheet/pull/4087)
+- Ods Xml Reader and Whitespace Text Nodes. [Issue #804](https://github.com/PHPOffice/PhpSpreadsheet/issues/804) [PR #4087](https://github.com/PHPOffice/PhpSpreadsheet/pull/4087)
+- Treat invalid formulas as strings. [Issue #1310](https://github.com/PHPOffice/PhpSpreadsheet/issues/1310) [PR #4073](https://github.com/PHPOffice/PhpSpreadsheet/pull/4073)
+
+## 2024-05-11 - 2.1.0
+
+### MINOR BREAKING CHANGE
+
+- Writing of cell comments to Html will now sanitize all Html tags within the comment, so the tags will be rendered as plaintext and have no other effects when rendered. Styling can be achieved by using the Font property of of the TextRuns which make up the comment, as is already the cases for Xlsx. [PR #3957](https://github.com/PHPOffice/PhpSpreadsheet/pull/3957)
+
+### Added
+
+- Default Style Alignment Property (workaround for bug in non-Excel spreadsheet apps) [Issue #3918](https://github.com/PHPOffice/PhpSpreadsheet/issues/3918) [PR #3924](https://github.com/PHPOffice/PhpSpreadsheet/pull/3924)
+- Additional Support for Date/Time Styles [PR #3939](https://github.com/PHPOffice/PhpSpreadsheet/pull/3939)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Reader/Xml trySimpleXMLLoadString should not have had public visibility, and will be removed.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- IF Empty Arguments. [Issue #3875](https://github.com/PHPOffice/PhpSpreadsheet/issues/3875) [Issue #2146](https://github.com/PHPOffice/PhpSpreadsheet/issues/2146) [PR #3879](https://github.com/PHPOffice/PhpSpreadsheet/pull/3879)
+- Changes to floating point in Php8.4. [Issue #3896](https://github.com/PHPOffice/PhpSpreadsheet/issues/3896) [PR #3897](https://github.com/PHPOffice/PhpSpreadsheet/pull/3897)
+- Handling User-supplied Decimal and Thousands Separators. [Issue #3900](https://github.com/PHPOffice/PhpSpreadsheet/issues/3900) [PR #3903](https://github.com/PHPOffice/PhpSpreadsheet/pull/3903)
+- Improve Performance of CSV Writer. [Issue #3904](https://github.com/PHPOffice/PhpSpreadsheet/issues/3904) [PR #3906](https://github.com/PHPOffice/PhpSpreadsheet/pull/3906)
+- Fix issue with prepending zero in percentage [Issue #3920](https://github.com/PHPOffice/PhpSpreadsheet/issues/3920) [PR #3921](https://github.com/PHPOffice/PhpSpreadsheet/pull/3921)
+- Incorrect SUMPRODUCT Calculation [Issue #3909](https://github.com/PHPOffice/PhpSpreadsheet/issues/3909) [PR #3916](https://github.com/PHPOffice/PhpSpreadsheet/pull/3916)
+- Formula Misidentifying Text as Cell After Insertion/Deletion [Issue #3907](https://github.com/PHPOffice/PhpSpreadsheet/issues/3907) [PR #3915](https://github.com/PHPOffice/PhpSpreadsheet/pull/3915)
+- Unexpected Absolute Address in Xlsx Rels [Issue #3730](https://github.com/PHPOffice/PhpSpreadsheet/issues/3730) [PR #3923](https://github.com/PHPOffice/PhpSpreadsheet/pull/3923)
+- Unallocated Cells Affected by Column/Row Insert/Delete [Issue #3933](https://github.com/PHPOffice/PhpSpreadsheet/issues/3933) [PR #3940](https://github.com/PHPOffice/PhpSpreadsheet/pull/3940)
+- Invalid Builtin Defined Name in Xls Reader [Issue #3935](https://github.com/PHPOffice/PhpSpreadsheet/issues/3935) [PR #3942](https://github.com/PHPOffice/PhpSpreadsheet/pull/3942)
+- Hidden Rows and Columns Tcpdf/Mpdf [PR #3945](https://github.com/PHPOffice/PhpSpreadsheet/pull/3945)
+- RTL Text Alignment in Xlsx Comments [Issue #4004](https://github.com/PHPOffice/PhpSpreadsheet/issues/4004) [PR #4006](https://github.com/PHPOffice/PhpSpreadsheet/pull/4006)
+- Protect Sheet But Allow Sort [Issue #3951](https://github.com/PHPOffice/PhpSpreadsheet/issues/3951) [PR #3956](https://github.com/PHPOffice/PhpSpreadsheet/pull/3956)
+- Default Value for Conditional::$text [PR #3946](https://github.com/PHPOffice/PhpSpreadsheet/pull/3946)
+- Table Filter Buttons [Issue #3988](https://github.com/PHPOffice/PhpSpreadsheet/issues/3988) [PR #3992](https://github.com/PHPOffice/PhpSpreadsheet/pull/3992)
+- Improvements to Xml Reader [Issue #3999](https://github.com/PHPOffice/PhpSpreadsheet/issues/3999) [Issue #4000](https://github.com/PHPOffice/PhpSpreadsheet/issues/4000) [Issue #4001](https://github.com/PHPOffice/PhpSpreadsheet/issues/4001) [Issue #4002](https://github.com/PHPOffice/PhpSpreadsheet/issues/4002) [PR #4003](https://github.com/PHPOffice/PhpSpreadsheet/pull/4003) [PR #4007](https://github.com/PHPOffice/PhpSpreadsheet/pull/4007)
+- Html Reader non-UTF8 [Issue #3995](https://github.com/PHPOffice/PhpSpreadsheet/issues/3995) [Issue #866](https://github.com/PHPOffice/PhpSpreadsheet/issues/866) [Issue #1681](https://github.com/PHPOffice/PhpSpreadsheet/issues/1681) [PR #4019](https://github.com/PHPOffice/PhpSpreadsheet/pull/4019)
+
+## 2.0.0 - 2024-01-04
+
+### BREAKING CHANGE
+
+- Typing was strengthened by leveraging native typing. This should not change any behavior. However, if you implement
+  any interfaces or inherit from any classes, you will need to adapt your typing accordingly. If you use static analysis 
+  tools such as PHPStan or Psalm, new errors might be found. If you find actual bugs because of the new typing, please
+  open a PR that fixes it with a **detailed** explanation of the reason. We'll try to merge and release typing-related
+  fixes quickly in the coming days. [PR #3718](https://github.com/PHPOffice/PhpSpreadsheet/pull/3718)
+- All deprecated things have been removed, for details, see [816b91d0b4](https://github.com/PHPOffice/PhpSpreadsheet/commit/816b91d0b4a0c7285a9e3fc88c58f7730d922044)
+
+### Added
+
+- Split screens (Xlsx and Xml only, not 100% complete). [Issue #3601](https://github.com/PHPOffice/PhpSpreadsheet/issues/3601) [PR #3622](https://github.com/PHPOffice/PhpSpreadsheet/pull/3622)
+- Permit Meta Viewport in Html. [Issue #3565](https://github.com/PHPOffice/PhpSpreadsheet/issues/3565) [PR #3623](https://github.com/PHPOffice/PhpSpreadsheet/pull/3623)
+- Hyperlink support for Ods. [Issue #3660](https://github.com/PHPOffice/PhpSpreadsheet/issues/3660) [PR #3669](https://github.com/PHPOffice/PhpSpreadsheet/pull/3669)
+- ListWorksheetInfo/Names for Html/Csv/Slk. [Issue #3706](https://github.com/PHPOffice/PhpSpreadsheet/issues/3706) [PR #3709](https://github.com/PHPOffice/PhpSpreadsheet/pull/3709)
+- Methods to determine if cell is actually locked, or hidden on formula bar. [PR #3722](https://github.com/PHPOffice/PhpSpreadsheet/pull/3722)
+- Add iterateOnlyExistingCells to Constructors. [Issue #3721](https://github.com/PHPOffice/PhpSpreadsheet/issues/3721) [PR #3727](https://github.com/PHPOffice/PhpSpreadsheet/pull/3727)
+- Support for Conditional Formatting Color Scale. [PR #3738](https://github.com/PHPOffice/PhpSpreadsheet/pull/3738)
+- Support Additional Tags in Helper/Html. [Issue #3751](https://github.com/PHPOffice/PhpSpreadsheet/issues/3751) [PR #3752](https://github.com/PHPOffice/PhpSpreadsheet/pull/3752)
+- Writer ODS : Write Border Style for cells [Issue #3690](https://github.com/PHPOffice/PhpSpreadsheet/issues/3690) [PR #3693](https://github.com/PHPOffice/PhpSpreadsheet/pull/3693)
+- Sheet Background Images [Issue #1649](https://github.com/PHPOffice/PhpSpreadsheet/issues/1649) [PR #3795](https://github.com/PHPOffice/PhpSpreadsheet/pull/3795)
+- Check if Coordinate is Inside Range [PR #3779](https://github.com/PHPOffice/PhpSpreadsheet/pull/3779)
+- Flipping Images [Issue #731](https://github.com/PHPOffice/PhpSpreadsheet/issues/731) [PR #3801](https://github.com/PHPOffice/PhpSpreadsheet/pull/3801)
+- Chart Dynamic Title and Font Properties [Issue #3797](https://github.com/PHPOffice/PhpSpreadsheet/issues/3797) [PR #3800](https://github.com/PHPOffice/PhpSpreadsheet/pull/3800)
+- Chart Axis Display Units and Logarithmic Scale. [Issue #3833](https://github.com/PHPOffice/PhpSpreadsheet/issues/3833) [PR #3836](https://github.com/PHPOffice/PhpSpreadsheet/pull/3836)
+- Partial Support of Fill Handles. [Discussion #3847](https://github.com/PHPOffice/PhpSpreadsheet/discussions/3847) [PR #3855](https://github.com/PHPOffice/PhpSpreadsheet/pull/3855)
+
+### Changed
+
+- **Drop support for PHP 7.4**, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support [PR #3713](https://github.com/PHPOffice/PhpSpreadsheet/pull/3713)
+- RLM Added to NumberFormatter Currency. This happens depending on release of ICU which Php is using (it does not yet happen with any official release). PhpSpreadsheet will continue to use the value returned by Php, but a method is added to keep the result unchanged from release to release. [Issue #3571](https://github.com/PHPOffice/PhpSpreadsheet/issues/3571) [PR #3640](https://github.com/PHPOffice/PhpSpreadsheet/pull/3640)
+- `toFormattedString` will now always return a string. This was introduced with 1.28.0, but was not properly documented at the time. This can affect the results of `toArray`, `namedRangeToArray`, and `rangeToArray`. [PR #3304](https://github.com/PHPOffice/PhpSpreadsheet/pull/3304)
+- Value of constants FORMAT_CURRENCY_EUR and FORMAT_CURRENCY_USD was changed in 1.28.0, but was not properly documented at the time. [Issue #3577](https://github.com/PHPOffice/PhpSpreadsheet/issues/3577)
+- Html Writer will attempt to use Chart coordinates to determine image size. [Issue #3783](https://github.com/PHPOffice/PhpSpreadsheet/issues/3783) [PR #3787](https://github.com/PHPOffice/PhpSpreadsheet/pull/3787)
+
+### Deprecated
+
+- Functions `_translateFormulaToLocale` and `_translateFormulaEnglish` are replaced by versions without leading underscore. [PR #3828](https://github.com/PHPOffice/PhpSpreadsheet/pull/3828)
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Take advantage of mitoteam/jpgraph Extended mode to enable rendering of more graphs. [PR #3603](https://github.com/PHPOffice/PhpSpreadsheet/pull/3603)
+- Column widths, especially for ODS. [Issue #3609](https://github.com/PHPOffice/PhpSpreadsheet/issues/3609) [PR #3610](https://github.com/PHPOffice/PhpSpreadsheet/pull/3610)
+- Avoid NULL in String Function call (partial solution). [Issue #3613](https://github.com/PHPOffice/PhpSpreadsheet/issues/3613) [PR #3617](https://github.com/PHPOffice/PhpSpreadsheet/pull/3617)
+- Preserve transparency in Memory Drawing. [Issue #3624](https://github.com/PHPOffice/PhpSpreadsheet/issues/3624) [PR #3627](https://github.com/PHPOffice/PhpSpreadsheet/pull/3627)
+- Customizable padding for Exact Column Width. [Issue #3626](https://github.com/PHPOffice/PhpSpreadsheet/issues/3626) [PR #3628](https://github.com/PHPOffice/PhpSpreadsheet/pull/3628)
+- Ensure ROW function returns int (problem exposed in unreleased Php). [PR #3641](https://github.com/PHPOffice/PhpSpreadsheet/pull/3641)
+- Minor changes to Mpdf and Html Writers. [PR #3645](https://github.com/PHPOffice/PhpSpreadsheet/pull/3645)
+- Xlsx Reader Namespacing for Tables, Autofilters. [Issue #3665](https://github.com/PHPOffice/PhpSpreadsheet/issues/3665) [PR #3668](https://github.com/PHPOffice/PhpSpreadsheet/pull/3668)
+- Read Code Page for Xls ListWorksheetInfo/Names BIFF5. [Issue #3671](https://github.com/PHPOffice/PhpSpreadsheet/issues/3671) [PR #3672](https://github.com/PHPOffice/PhpSpreadsheet/pull/3672)
+- Read Data from Table on Different Sheet. [Issue #3635](https://github.com/PHPOffice/PhpSpreadsheet/issues/3635) [PR #3659](https://github.com/PHPOffice/PhpSpreadsheet/pull/3659)
+- Html Writer Styles Using Inline Css. [Issue #3678](https://github.com/PHPOffice/PhpSpreadsheet/issues/3678) [PR #3680](https://github.com/PHPOffice/PhpSpreadsheet/pull/3680)
+- Xlsx Read Ignoring Some Comments. [Issue #3654](https://github.com/PHPOffice/PhpSpreadsheet/issues/3654) [PR #3655](https://github.com/PHPOffice/PhpSpreadsheet/pull/3655)
+- Fractional Seconds in Date/Time Values. [PR #3677](https://github.com/PHPOffice/PhpSpreadsheet/pull/3677)
+- SetCalculatedValue Avoid Casting String to Numeric. [Issue #3658](https://github.com/PHPOffice/PhpSpreadsheet/issues/3658) [PR #3685](https://github.com/PHPOffice/PhpSpreadsheet/pull/3685)
+- Several Problems in a Very Complicated Spreadsheet. [Issue #3679](https://github.com/PHPOffice/PhpSpreadsheet/issues/3679) [PR #3681](https://github.com/PHPOffice/PhpSpreadsheet/pull/3681)
+- Inconsistent String Handling for Sum Functions. [Issue #3652](https://github.com/PHPOffice/PhpSpreadsheet/issues/3652) [PR #3653](https://github.com/PHPOffice/PhpSpreadsheet/pull/3653)
+- Recomputation of Relative Addresses in Defined Names. [Issue #3661](https://github.com/PHPOffice/PhpSpreadsheet/issues/3661) [PR #3673](https://github.com/PHPOffice/PhpSpreadsheet/pull/3673)
+- Writer Xls Characters Outside BMP (emojis). [Issue #642](https://github.com/PHPOffice/PhpSpreadsheet/issues/642) [PR #3696](https://github.com/PHPOffice/PhpSpreadsheet/pull/3696)
+- Xlsx Reader Improve Handling of Row and Column Styles. [Issue #3533](https://github.com/PHPOffice/PhpSpreadsheet/issues/3533) [Issue #3534](https://github.com/PHPOffice/PhpSpreadsheet/issues/3534) [PR #3688](https://github.com/PHPOffice/PhpSpreadsheet/pull/3688)
+- Avoid Allocating RowDimension Unneccesarily. [PR #3686](https://github.com/PHPOffice/PhpSpreadsheet/pull/3686)
+- Use Column Style when Row Dimension Exists Without Style. [Issue #3534](https://github.com/PHPOffice/PhpSpreadsheet/issues/3534) [PR #3688](https://github.com/PHPOffice/PhpSpreadsheet/pull/3688)
+- Inconsistency Between Cell Data and Explicitly Declared Type. [Issue #3711](https://github.com/PHPOffice/PhpSpreadsheet/issues/3711) [PR #3715](https://github.com/PHPOffice/PhpSpreadsheet/pull/3715)
+- Unexpected Namespacing in rels File. [Issue #3720](https://github.com/PHPOffice/PhpSpreadsheet/issues/3720) [PR #3722](https://github.com/PHPOffice/PhpSpreadsheet/pull/3722)
+- Break Some Circular References. [PR #3716](https://github.com/PHPOffice/PhpSpreadsheet/pull/3716) [PR #3707](https://github.com/PHPOffice/PhpSpreadsheet/pull/3707)
+- Missing Font Index in Some Xls. [PR #3734](https://github.com/PHPOffice/PhpSpreadsheet/pull/3734)
+- Load Tables even with READ_DATA_ONLY. [PR #3726](https://github.com/PHPOffice/PhpSpreadsheet/pull/3726)
+- Theme File Missing but Referenced in Spreadsheet. [Issue #3770](https://github.com/PHPOffice/PhpSpreadsheet/issues/3770) [PR #3772](https://github.com/PHPOffice/PhpSpreadsheet/pull/3772)
+- Slk Shared Formulas. [Issue #2267](https://github.com/PHPOffice/PhpSpreadsheet/issues/2267) [PR #3776](https://github.com/PHPOffice/PhpSpreadsheet/pull/3776)
+- Html omitting some charts. [Issue #3767](https://github.com/PHPOffice/PhpSpreadsheet/issues/3767) [PR #3771](https://github.com/PHPOffice/PhpSpreadsheet/pull/3771)
+- Case Insensitive Comparison for Sheet Names [PR #3791](https://github.com/PHPOffice/PhpSpreadsheet/pull/3791)
+- Performance improvement for Xlsx Reader. [Issue #3683](https://github.com/PHPOffice/PhpSpreadsheet/issues/3683) [PR #3810](https://github.com/PHPOffice/PhpSpreadsheet/pull/3810)
+- Prevent loop in Shared/File. [Issue #3807](https://github.com/PHPOffice/PhpSpreadsheet/issues/3807) [PR #3809](https://github.com/PHPOffice/PhpSpreadsheet/pull/3809)
+- Consistent handling of decimal/thousands separators between StringHelper and Php setlocale. [Issue #3811](https://github.com/PHPOffice/PhpSpreadsheet/issues/3811) [PR #3815](https://github.com/PHPOffice/PhpSpreadsheet/pull/3815)
+- Clone worksheet with tables or charts. [Issue #3820](https://github.com/PHPOffice/PhpSpreadsheet/issues/3820) [PR #3821](https://github.com/PHPOffice/PhpSpreadsheet/pull/3821)
+- COUNTIFS Does Not Require xlfn. [Issue #3819](https://github.com/PHPOffice/PhpSpreadsheet/issues/3819) [PR #3827](https://github.com/PHPOffice/PhpSpreadsheet/pull/3827)
+- Strip `xlfn.` and `xlws.` from Formula Translations. [Issue #3819](https://github.com/PHPOffice/PhpSpreadsheet/issues/3819) [PR #3828](https://github.com/PHPOffice/PhpSpreadsheet/pull/3828)
+- Recurse directories searching for font file. [Issue #2809](https://github.com/PHPOffice/PhpSpreadsheet/issues/2809) [PR #3830](https://github.com/PHPOffice/PhpSpreadsheet/pull/3830)
+- Reduce memory consumption of Worksheet::rangeToArray() when many empty rows are read. [Issue #3814](https://github.com/PHPOffice/PhpSpreadsheet/issues/3814) [PR #3834](https://github.com/PHPOffice/PhpSpreadsheet/pull/3834)
+- Reduce time used by Worksheet::rangeToArray() when many empty rows are read. [PR #3839](https://github.com/PHPOffice/PhpSpreadsheet/pull/3839)
+- Html Reader Tolerate Invalid Sheet Title. [PR #3845](https://github.com/PHPOffice/PhpSpreadsheet/pull/3845)
+- Do not include unparsed drawings when new drawing added. [Issue #3843](https://github.com/PHPOffice/PhpSpreadsheet/issues/3843) [PR #3846](https://github.com/PHPOffice/PhpSpreadsheet/pull/3846)
+- Do not include unparsed drawings when new drawing added. [Issue #3861](https://github.com/PHPOffice/PhpSpreadsheet/issues/3861) [PR #3862](https://github.com/PHPOffice/PhpSpreadsheet/pull/3862)
+- Excel omits `between` operator for data validation. [Issue #3863](https://github.com/PHPOffice/PhpSpreadsheet/issues/3863) [PR #3865](https://github.com/PHPOffice/PhpSpreadsheet/pull/3865)
+- Use less space when inserting rows and columns. [Issue #3687](https://github.com/PHPOffice/PhpSpreadsheet/issues/3687) [PR #3856](https://github.com/PHPOffice/PhpSpreadsheet/pull/3856)
+- Excel inconsistent handling of MIN/MAX/MINA/MAXA. [Issue #3866](https://github.com/PHPOffice/PhpSpreadsheet/issues/3866) [PR #3868](https://github.com/PHPOffice/PhpSpreadsheet/pull/3868)
+
+## 1.29.0 - 2023-06-15
+
+### Added
+
+- Wizards for defining Number Format masks for Dates and Times, including Durations/Intervals. [PR #3458](https://github.com/PHPOffice/PhpSpreadsheet/pull/3458)
+- Specify data type in html tags. [Issue #3444](https://github.com/PHPOffice/PhpSpreadsheet/issues/3444) [PR #3445](https://github.com/PHPOffice/PhpSpreadsheet/pull/3445)
+- Provide option to ignore hidden rows/columns in `toArray()` methods. [PR #3494](https://github.com/PHPOffice/PhpSpreadsheet/pull/3494)
+- Font/Effects/Theme support for Chart Data Labels and Axis. [PR #3476](https://github.com/PHPOffice/PhpSpreadsheet/pull/3476)
+- Font Themes support. [PR #3486](https://github.com/PHPOffice/PhpSpreadsheet/pull/3486)
+- Ability to Ignore Cell Errors in Excel. [Issue #1141](https://github.com/PHPOffice/PhpSpreadsheet/issues/1141) [PR #3508](https://github.com/PHPOffice/PhpSpreadsheet/pull/3508)
+- Unzipped Gnumeric file [PR #3591](https://github.com/PHPOffice/PhpSpreadsheet/pull/3591)
+
+### Changed
+
+- Xlsx Color schemes read in will be written out (previously Excel 2007-2010 Color scheme was always written); manipulation of those schemes before write, including restoring prior behavior, is provided [PR #3476](https://github.com/PHPOffice/PhpSpreadsheet/pull/3476)
+- Memory and speed optimisations for Read Filters with Xlsx Files and Shared Formulae. [PR #3474](https://github.com/PHPOffice/PhpSpreadsheet/pull/3474)
+- Allow `CellRange` and `CellAddress` objects for the `range` argument in the `rangeToArray()` method. [PR #3494](https://github.com/PHPOffice/PhpSpreadsheet/pull/3494)
+- Stock charts will now read and reproduce `upDownBars` and subsidiary tags; these were previously ignored on read and hard-coded on write. [PR #3515](https://github.com/PHPOffice/PhpSpreadsheet/pull/3515)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Updates Cell formula absolute ranges/references, and Defined Name absolute ranges/references when inserting/deleting rows/columns. [Issue #3368](https://github.com/PHPOffice/PhpSpreadsheet/issues/3368) [PR #3402](https://github.com/PHPOffice/PhpSpreadsheet/pull/3402)
+- EOMONTH() and EDATE() Functions should round date value before evaluation. [Issue #3436](https://github.com/PHPOffice/PhpSpreadsheet/issues/3436) [PR #3437](https://github.com/PHPOffice/PhpSpreadsheet/pull/3437)
+- NETWORKDAYS function erroneously being converted to NETWORK_xlfn.DAYS in Xlsx Writer. [Issue #3461](https://github.com/PHPOffice/PhpSpreadsheet/issues/3461) [PR #3463](https://github.com/PHPOffice/PhpSpreadsheet/pull/3463)
+- Getting a style for a CellAddress instance fails if the worksheet is set in the CellAddress instance. [Issue #3439](https://github.com/PHPOffice/PhpSpreadsheet/issues/3439) [PR #3469](https://github.com/PHPOffice/PhpSpreadsheet/pull/3469)
+- Shared Formulae outside the filter range when reading with a filter are not always being identified. [Issue #3473](https://github.com/PHPOffice/PhpSpreadsheet/issues/3473) [PR #3474](https://github.com/PHPOffice/PhpSpreadsheet/pull/3474)
+- Xls Reader Conditional Styles. [PR #3400](https://github.com/PHPOffice/PhpSpreadsheet/pull/3400)
+- Allow use of # and 0 digit placeholders in fraction masks. [PR #3401](https://github.com/PHPOffice/PhpSpreadsheet/pull/3401)
+- Modify Date/Time check in the NumberFormatter for decimal/fractional times. [PR #3413](https://github.com/PHPOffice/PhpSpreadsheet/pull/3413)
+- Misplaced Xml Writing Chart Label FillColor. [Issue #3397](https://github.com/PHPOffice/PhpSpreadsheet/issues/3397) [PR #3404](https://github.com/PHPOffice/PhpSpreadsheet/pull/3404)
+- TEXT function ignores Time in DateTimeStamp. [Issue #3409](https://github.com/PHPOffice/PhpSpreadsheet/issues/3409) [PR #3411](https://github.com/PHPOffice/PhpSpreadsheet/pull/3411)
+- Xlsx Column Autosize Approximate for CJK. [Issue #3405](https://github.com/PHPOffice/PhpSpreadsheet/issues/3405) [PR #3416](https://github.com/PHPOffice/PhpSpreadsheet/pull/3416)
+- Correct Xlsx Parsing of quotePrefix="0". [Issue #3435](https://github.com/PHPOffice/PhpSpreadsheet/issues/3435) [PR #3438](https://github.com/PHPOffice/PhpSpreadsheet/pull/3438)
+- More Display Options for Chart Axis and Legend. [Issue #3414](https://github.com/PHPOffice/PhpSpreadsheet/issues/3414) [PR #3434](https://github.com/PHPOffice/PhpSpreadsheet/pull/3434)
+- Apply strict type checking to Complex suffix. [PR #3452](https://github.com/PHPOffice/PhpSpreadsheet/pull/3452)
+- Incorrect Font Color Read Xlsx Rich Text Indexed Color Custom Palette. [Issue #3464](https://github.com/PHPOffice/PhpSpreadsheet/issues/3464) [PR #3465](https://github.com/PHPOffice/PhpSpreadsheet/pull/3465)
+- Xlsx Writer Honor Alignment in Default Font. [Issue #3443](https://github.com/PHPOffice/PhpSpreadsheet/issues/3443) [PR #3459](https://github.com/PHPOffice/PhpSpreadsheet/pull/3459)
+- Support Border for Charts. [PR #3462](https://github.com/PHPOffice/PhpSpreadsheet/pull/3462)
+- Error in "this row" structured reference calculation (cached result from first row when using a range) [Issue #3504](https://github.com/PHPOffice/PhpSpreadsheet/issues/3504) [PR #3505](https://github.com/PHPOffice/PhpSpreadsheet/pull/3505)
+- Allow colour palette index references in Number Format masks [Issue #3511](https://github.com/PHPOffice/PhpSpreadsheet/issues/3511) [PR #3512](https://github.com/PHPOffice/PhpSpreadsheet/pull/3512)
+- Xlsx Reader formula with quotePrefix [Issue #3495](https://github.com/PHPOffice/PhpSpreadsheet/issues/3495) [PR #3497](https://github.com/PHPOffice/PhpSpreadsheet/pull/3497)
+- Handle REF error as part of range [Issue #3453](https://github.com/PHPOffice/PhpSpreadsheet/issues/3453) [PR #3467](https://github.com/PHPOffice/PhpSpreadsheet/pull/3467)
+- Handle Absolute Pathnames in Rels File [Issue #3553](https://github.com/PHPOffice/PhpSpreadsheet/issues/3553) [PR #3554](https://github.com/PHPOffice/PhpSpreadsheet/pull/3554)
+- Return Page Breaks in Order [Issue #3552](https://github.com/PHPOffice/PhpSpreadsheet/issues/3552) [PR #3555](https://github.com/PHPOffice/PhpSpreadsheet/pull/3555)
+- Add position attribute for MemoryDrawing in Html [Issue #3529](https://github.com/PHPOffice/PhpSpreadsheet/issues/3529 [PR #3535](https://github.com/PHPOffice/PhpSpreadsheet/pull/3535)
+- Allow Index_number as Array for VLOOKUP/HLOOKUP [Issue #3561](https://github.com/PHPOffice/PhpSpreadsheet/issues/3561 [PR #3570](https://github.com/PHPOffice/PhpSpreadsheet/pull/3570)
+- Add Unsupported Options in Xml Spreadsheet [Issue #3566](https://github.com/PHPOffice/PhpSpreadsheet/issues/3566 [Issue #3568](https://github.com/PHPOffice/PhpSpreadsheet/issues/3568 [Issue #3569](https://github.com/PHPOffice/PhpSpreadsheet/issues/3569 [PR #3567](https://github.com/PHPOffice/PhpSpreadsheet/pull/3567)
+- Changes to NUMBERVALUE, VALUE, DATEVALUE, TIMEVALUE [Issue #3574](https://github.com/PHPOffice/PhpSpreadsheet/issues/3574 [PR #3575](https://github.com/PHPOffice/PhpSpreadsheet/pull/3575)
+- Redo calculation of color tinting [Issue #3550](https://github.com/PHPOffice/PhpSpreadsheet/issues/3550) [PR #3580](https://github.com/PHPOffice/PhpSpreadsheet/pull/3580)
+- Accommodate Slash with preg_quote [PR #3582](https://github.com/PHPOffice/PhpSpreadsheet/pull/3582) [PR #3583](https://github.com/PHPOffice/PhpSpreadsheet/pull/3583) [PR #3584](https://github.com/PHPOffice/PhpSpreadsheet/pull/3584)
+- HyperlinkBase Property and Html Handling of Properties [Issue #3573](https://github.com/PHPOffice/PhpSpreadsheet/issues/3573) [PR #3589](https://github.com/PHPOffice/PhpSpreadsheet/pull/3589)
+- Improvements for Data Validation [Issue #3592](https://github.com/PHPOffice/PhpSpreadsheet/issues/3592) [Issue #3594](https://github.com/PHPOffice/PhpSpreadsheet/issues/3594) [PR #3605](https://github.com/PHPOffice/PhpSpreadsheet/pull/3605)
+
+## 1.28.0 - 2023-02-25
+
+### Added
+
+- Support for configuring a Chart Title's overlay [PR #3325](https://github.com/PHPOffice/PhpSpreadsheet/pull/3325)
+- Wizards for defining Number Format masks for Numbers, Percentages, Scientific, Currency and Accounting [PR #3334](https://github.com/PHPOffice/PhpSpreadsheet/pull/3334)
+- Support for fixed value divisor in fractional Number Format Masks [PR #3339](https://github.com/PHPOffice/PhpSpreadsheet/pull/3339)
+- Allow More Fonts/Fontnames for Exact Width Calculation [PR #3326](https://github.com/PHPOffice/PhpSpreadsheet/pull/3326) [Issue #3190](https://github.com/PHPOffice/PhpSpreadsheet/issues/3190)
+- Allow override of the Value Binder when setting a Cell value [PR #3361](https://github.com/PHPOffice/PhpSpreadsheet/pull/3361)
+
+### Changed
+
+- Improved handling for @ placeholder in Number Format Masks [PR #3344](https://github.com/PHPOffice/PhpSpreadsheet/pull/3344)
+- Improved handling for ? placeholder in Number Format Masks [PR #3394](https://github.com/PHPOffice/PhpSpreadsheet/pull/3394)
+- Improved support for locale settings and currency codes when matching formatted strings to numerics in the Calculation Engine [PR #3373](https://github.com/PHPOffice/PhpSpreadsheet/pull/3373) and [PR #3374](https://github.com/PHPOffice/PhpSpreadsheet/pull/3374) 
+- Improved support for locale settings and matching in the Advanced Value Binder [PR #3376](https://github.com/PHPOffice/PhpSpreadsheet/pull/3376)
+- `toFormattedString` will now always return a string. This can affect the results of `toArray`, `namedRangeToArray`, and `rangeToArray`. [PR #3304](https://github.com/PHPOffice/PhpSpreadsheet/pull/3304)
+- Value of constants FORMAT_CURRENCY_EUR and FORMAT_CURRENCY_USD is changed. [Issue #3577](https://github.com/PHPOffice/PhpSpreadsheet/issues/3577) [PR #3377](https://github.com/PHPOffice/PhpSpreadsheet/pull/3377)
+
+### Deprecated
+
+- Rationalisation of Pre-defined Currency Format Masks [PR #3377](https://github.com/PHPOffice/PhpSpreadsheet/pull/3377)
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Calculation Engine doesn't evaluate Defined Name when default cell A1 is quote-prefixed [Issue #3335](https://github.com/PHPOffice/PhpSpreadsheet/issues/3335) [PR #3336](https://github.com/PHPOffice/PhpSpreadsheet/pull/3336)
+- XLSX Writer - Array Formulas do not include function prefix [Issue #3337](https://github.com/PHPOffice/PhpSpreadsheet/issues/3337) [PR #3338](https://github.com/PHPOffice/PhpSpreadsheet/pull/3338)
+- Permit Max Column for Row Breaks [Issue #3143](https://github.com/PHPOffice/PhpSpreadsheet/issues/3143) [PR #3345](https://github.com/PHPOffice/PhpSpreadsheet/pull/3345)
+- AutoSize Columns should allow for dropdown icon when AutoFilter is for a Table [Issue #3356](https://github.com/PHPOffice/PhpSpreadsheet/issues/3356) [PR #3358](https://github.com/PHPOffice/PhpSpreadsheet/pull/3358) and for Center Alignment of Headers [Issue #3395](https://github.com/PHPOffice/PhpSpreadsheet/issues/3395) [PR #3399](https://github.com/PHPOffice/PhpSpreadsheet/pull/3399)
+- Decimal Precision for Scientific Number Format Mask [Issue #3381](https://github.com/PHPOffice/PhpSpreadsheet/issues/3381) [PR #3382](https://github.com/PHPOffice/PhpSpreadsheet/pull/3382)
+- Xls Writer Parser Handle Boolean Literals as Function Arguments [Issue #3369](https://github.com/PHPOffice/PhpSpreadsheet/issues/3369) [PR #3391](https://github.com/PHPOffice/PhpSpreadsheet/pull/3391)
+- Conditional Formatting Improvements for Xlsx [Issue #3370](https://github.com/PHPOffice/PhpSpreadsheet/issues/3370) [Issue #3202](https://github.com/PHPOffice/PhpSpreadsheet/issues/3302) [PR #3372](https://github.com/PHPOffice/PhpSpreadsheet/pull/3372)
+- Coerce Bool to Int for Mathematical Operations on Arrays [Issue #3389](https://github.com/PHPOffice/PhpSpreadsheet/issues/3389) [Issue #3396](https://github.com/PHPOffice/PhpSpreadsheet/issues/3396) [PR #3392](https://github.com/PHPOffice/PhpSpreadsheet/pull/3392)
+
+## 1.27.1 - 2023-02-08
+
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fix Composer --dev dependency issue with dealerdirect/phpcodesniffer-composer-installer renaming their `master` branch to `main`
+
+
+## 1.27.0 - 2023-01-24
+
+### Added
+
+- Option to specify a range of columns/rows for the Row/Column `isEmpty()` methods [PR #3315](https://github.com/PHPOffice/PhpSpreadsheet/pull/3315)
+- Option for Cell Iterator to return a null value or create and return a new cell when accessing a cell that doesn't exist [PR #3314](https://github.com/PHPOffice/PhpSpreadsheet/pull/3314)
+- Support for Structured References in the Calculation Engine [PR #3261](https://github.com/PHPOffice/PhpSpreadsheet/pull/3261)
+- Limited Support for Form Controls [PR #3130](https://github.com/PHPOffice/PhpSpreadsheet/pull/3130) [Issue #2396](https://github.com/PHPOffice/PhpSpreadsheet/issues/2396) [Issue #1770](https://github.com/PHPOffice/PhpSpreadsheet/issues/1770) [Issue #2388](https://github.com/PHPOffice/PhpSpreadsheet/issues/2388) [Issue #2904](https://github.com/PHPOffice/PhpSpreadsheet/issues/2904) [Issue #2661](https://github.com/PHPOffice/PhpSpreadsheet/issues/2661)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Shared/JAMA is removed. [PR #3260](https://github.com/PHPOffice/PhpSpreadsheet/pull/3260)
+
+### Fixed
+
+- Namespace-Aware Code for SheetViewOptions, SheetProtection [PR #3230](https://github.com/PHPOffice/PhpSpreadsheet/pull/3230)
+- Additional Method for XIRR if Newton-Raphson Doesn't Converge [Issue #689](https://github.com/PHPOffice/PhpSpreadsheet/issues/689) [PR #3262](https://github.com/PHPOffice/PhpSpreadsheet/pull/3262)
+- Better Handling of Composite Charts [Issue #2333](https://github.com/PHPOffice/PhpSpreadsheet/issues/2333) [PR #3265](https://github.com/PHPOffice/PhpSpreadsheet/pull/3265)
+- Update Column Reference for Columns Beginning with Y and Z [Issue #3263](https://github.com/PHPOffice/PhpSpreadsheet/issues/3263) [PR #3264](https://github.com/PHPOffice/PhpSpreadsheet/pull/3264)
+- Honor Fit to 1-Page Height Html/Pdf [Issue #3266](https://github.com/PHPOffice/PhpSpreadsheet/issues/3266) [PR #3279](https://github.com/PHPOffice/PhpSpreadsheet/pull/3279)
+- AND/OR/XOR Handling of Literal Strings [PR #3287](https://github.com/PHPOffice/PhpSpreadsheet/pull/3287)
+- Xls Reader Vertical Break and Writer Page Order [Issue #3305](https://github.com/PHPOffice/PhpSpreadsheet/issues/3305) [PR #3306](https://github.com/PHPOffice/PhpSpreadsheet/pull/3306)
+
+
+## 1.26.0 - 2022-12-21
+
+### Added
+
+- Extended flag options for the Reader `load()` and Writer `save()` methods
+- Apply Row/Column limits (1048576 and XFD) in ReferenceHelper [PR #3213](https://github.com/PHPOffice/PhpSpreadsheet/pull/3213)
+- Allow the creation of In-Memory Drawings from a string of binary image data, or from a stream. [PR #3157](https://github.com/PHPOffice/PhpSpreadsheet/pull/3157)
+- Xlsx Reader support for Pivot Tables [PR #2829](https://github.com/PHPOffice/PhpSpreadsheet/pull/2829)
+- Permit Date/Time Entered on Spreadsheet to be calculated as Float [Issue #1416](https://github.com/PHPOffice/PhpSpreadsheet/issues/1416) [PR #3121](https://github.com/PHPOffice/PhpSpreadsheet/pull/3121)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Direct update of Calculation::suppressFormulaErrors is replaced with setter.
+- Font public static variable defaultColumnWidths replaced with constant DEFAULT_COLUMN_WIDTHS.
+- ExcelError public static variable errorCodes replaced with constant ERROR_CODES.
+- NumberFormat constant FORMAT_DATE_YYYYMMDD2 replaced with existing identical FORMAT_DATE_YYYYMMDD.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fixed handling for `_xlws` prefixed functions from Office365 [Issue #3245](https://github.com/PHPOffice/PhpSpreadsheet/issues/3245) [PR #3247](https://github.com/PHPOffice/PhpSpreadsheet/pull/3247)
+- Conditionals formatting rules applied to rows/columns are removed [Issue #3184](https://github.com/PHPOffice/PhpSpreadsheet/issues/3184) [PR #3213](https://github.com/PHPOffice/PhpSpreadsheet/pull/3213)
+- Treat strings containing currency or accounting values as floats in Calculation Engine operations [Issue #3165](https://github.com/PHPOffice/PhpSpreadsheet/issues/3165) [PR #3189](https://github.com/PHPOffice/PhpSpreadsheet/pull/3189)
+- Treat strings containing percentage values as floats in Calculation Engine operations [Issue #3155](https://github.com/PHPOffice/PhpSpreadsheet/issues/3155) [PR #3156](https://github.com/PHPOffice/PhpSpreadsheet/pull/3156) and [PR #3164](https://github.com/PHPOffice/PhpSpreadsheet/pull/3164)
+- Xlsx Reader Accept Palette of Fewer than 64 Colors [Issue #3093](https://github.com/PHPOffice/PhpSpreadsheet/issues/3093) [PR #3096](https://github.com/PHPOffice/PhpSpreadsheet/pull/3096)
+- Use Locale-Independent Float Conversion for Xlsx Writer Custom Property [Issue #3095](https://github.com/PHPOffice/PhpSpreadsheet/issues/3095) [PR #3099](https://github.com/PHPOffice/PhpSpreadsheet/pull/3099)
+- Allow setting AutoFilter range on a single cell or row [Issue #3102](https://github.com/PHPOffice/PhpSpreadsheet/issues/3102) [PR #3111](https://github.com/PHPOffice/PhpSpreadsheet/pull/3111)
+- Xlsx Reader External Data Validations Flag Missing [Issue #2677](https://github.com/PHPOffice/PhpSpreadsheet/issues/2677) [PR #3078](https://github.com/PHPOffice/PhpSpreadsheet/pull/3078)
+- Reduces extra memory usage on `__destruct()` calls [PR #3092](https://github.com/PHPOffice/PhpSpreadsheet/pull/3092)
+- Additional properties for Trendlines [Issue #3011](https://github.com/PHPOffice/PhpSpreadsheet/issues/3011) [PR #3028](https://github.com/PHPOffice/PhpSpreadsheet/pull/3028)
+- Calculation suppressFormulaErrors fix [Issue #1531](https://github.com/PHPOffice/PhpSpreadsheet/issues/1531) [PR #3092](https://github.com/PHPOffice/PhpSpreadsheet/pull/3092)
+- Permit Date/Time Entered on Spreadsheet to be Calculated as Float [Issue #1416](https://github.com/PHPOffice/PhpSpreadsheet/issues/1416) [PR #3121](https://github.com/PHPOffice/PhpSpreadsheet/pull/3121)
+- Incorrect Handling of Data Validation Formula Containing Ampersand [Issue #3145](https://github.com/PHPOffice/PhpSpreadsheet/issues/3145) [PR #3146](https://github.com/PHPOffice/PhpSpreadsheet/pull/3146)
+- Xlsx Namespace Handling of Drawings, RowAndColumnAttributes, MergeCells [Issue #3138](https://github.com/PHPOffice/PhpSpreadsheet/issues/3138) [PR #3136](https://github.com/PHPOffice/PhpSpreadsheet/pull/3137)
+- Generation3 Copy With Image in Footer [Issue #3126](https://github.com/PHPOffice/PhpSpreadsheet/issues/3126) [PR #3140](https://github.com/PHPOffice/PhpSpreadsheet/pull/3140)
+- MATCH Function Problems with Int/Float Compare and Wildcards [Issue #3141](https://github.com/PHPOffice/PhpSpreadsheet/issues/3141) [PR #3142](https://github.com/PHPOffice/PhpSpreadsheet/pull/3142)
+- Fix ODS Read Filter on number-columns-repeated cell [Issue #3148](https://github.com/PHPOffice/PhpSpreadsheet/issues/3148) [PR #3149](https://github.com/PHPOffice/PhpSpreadsheet/pull/3149)
+- Problems Formatting Very Small and Very Large Numbers [Issue #3128](https://github.com/PHPOffice/PhpSpreadsheet/issues/3128) [PR #3152](https://github.com/PHPOffice/PhpSpreadsheet/pull/3152)
+- XlsxWrite preserve line styles for y-axis, not just x-axis [PR #3163](https://github.com/PHPOffice/PhpSpreadsheet/pull/3163)
+- Xlsx Namespace Handling of Drawings, RowAndColumnAttributes, MergeCells [Issue #3138](https://github.com/PHPOffice/PhpSpreadsheet/issues/3138) [PR #3137](https://github.com/PHPOffice/PhpSpreadsheet/pull/3137)
+- More Detail for Cyclic Error Messages [Issue #3169](https://github.com/PHPOffice/PhpSpreadsheet/issues/3169) [PR #3170](https://github.com/PHPOffice/PhpSpreadsheet/pull/3170)
+- Improved Documentation for Deprecations - many PRs [Issue #3162](https://github.com/PHPOffice/PhpSpreadsheet/issues/3162)
+
+
+## 1.25.2 - 2022-09-25
+
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Composer dependency clash with ezyang/htmlpurifier
+
+
+## 1.25.0 - 2022-09-25
+
+### Added
+
+- Implementation of the new `TEXTBEFORE()`, `TEXTAFTER()` and `TEXTSPLIT()` Excel Functions
+- Implementation of the `ARRAYTOTEXT()` and `VALUETOTEXT()` Excel Functions
+- Support for [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) implementation of
+  JpGraph library to render charts added.
+- Charts: Add Gradients, Transparency, Hidden Axes, Rounded Corners, Trendlines, Date Axes.
+
+### Changed
+
+- Allow variant behaviour when merging cells [Issue #3065](https://github.com/PHPOffice/PhpSpreadsheet/issues/3065)
+  - Merge methods now allow an additional `$behaviour` argument. Permitted values are:
+    - Worksheet::MERGE_CELL_CONTENT_EMPTY - Empty the content of the hidden cells (the default behaviour)
+    - Worksheet::MERGE_CELL_CONTENT_HIDE - Keep the content of the hidden cells
+    - Worksheet::MERGE_CELL_CONTENT_MERGE - Move the content of the hidden cells into the first cell
+
+### Deprecated
+
+- Axis getLineProperty deprecated in favor of getLineColorProperty.
+- Moved majorGridlines and minorGridlines from Chart to Axis. Setting either in Chart constructor or through Chart methods, or getting either using Chart methods is deprecated.
+- Chart::EXCEL_COLOR_TYPE_* copied from Properties to ChartColor; use in Properties is deprecated.
+- ChartColor::EXCEL_COLOR_TYPE_ARGB deprecated in favor of EXCEL_COLOR_TYPE_RGB ("A" component was never allowed).
+- Misspelled Properties::LINE_STYLE_DASH_SQUERE_DOT deprecated in favor of LINE_STYLE_DASH_SQUARE_DOT.
+- Clone not permitted for Spreadsheet. Spreadsheet->copy() can be used instead.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fix update to defined names when inserting/deleting rows/columns [Issue #3076](https://github.com/PHPOffice/PhpSpreadsheet/issues/3076) [PR #3077](https://github.com/PHPOffice/PhpSpreadsheet/pull/3077)
+- Fix DataValidation sqRef when inserting/deleting rows/columns [Issue #3056](https://github.com/PHPOffice/PhpSpreadsheet/issues/3056) [PR #3074](https://github.com/PHPOffice/PhpSpreadsheet/pull/3074)
+- Named ranges not usable as anchors in OFFSET function [Issue #3013](https://github.com/PHPOffice/PhpSpreadsheet/issues/3013)
+- Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
+- cellExists() and getCell() methods should support UTF-8 named cells [Issue #2987](https://github.com/PHPOffice/PhpSpreadsheet/issues/2987) [PR #2988](https://github.com/PHPOffice/PhpSpreadsheet/pull/2988)
+- Spreadsheet copy fixed, clone disabled. [PR #2951](https://github.com/PHPOffice/PhpSpreadsheet/pull/2951)
+- Fix PDF problems with text rotation and paper size. [Issue #1747](https://github.com/PHPOffice/PhpSpreadsheet/issues/1747) [Issue #1713](https://github.com/PHPOffice/PhpSpreadsheet/issues/1713) [PR #2960](https://github.com/PHPOffice/PhpSpreadsheet/pull/2960)
+- Limited support for chart titles as formulas [Issue #2965](https://github.com/PHPOffice/PhpSpreadsheet/issues/2965) [Issue #749](https://github.com/PHPOffice/PhpSpreadsheet/issues/749) [PR #2971](https://github.com/PHPOffice/PhpSpreadsheet/pull/2971)
+- Add Gradients, Transparency, and Hidden Axes to Chart [Issue #2257](https://github.com/PHPOffice/PhpSpreadsheet/issues/2257) [Issue #2229](https://github.com/PHPOffice/PhpSpreadsheet/issues/2929) [Issue #2935](https://github.com/PHPOffice/PhpSpreadsheet/issues/2935) [PR #2950](https://github.com/PHPOffice/PhpSpreadsheet/pull/2950)
+- Chart Support for Rounded Corners and Trendlines [Issue #2968](https://github.com/PHPOffice/PhpSpreadsheet/issues/2968) [Issue #2815](https://github.com/PHPOffice/PhpSpreadsheet/issues/2815) [PR #2976](https://github.com/PHPOffice/PhpSpreadsheet/pull/2976)
+- Add setName Method for Chart [Issue #2991](https://github.com/PHPOffice/PhpSpreadsheet/issues/2991) [PR #3001](https://github.com/PHPOffice/PhpSpreadsheet/pull/3001)
+- Eliminate partial dependency on php-intl in StringHelper [Issue #2982](https://github.com/PHPOffice/PhpSpreadsheet/issues/2982) [PR #2994](https://github.com/PHPOffice/PhpSpreadsheet/pull/2994)
+- Minor changes for Pdf [Issue #2999](https://github.com/PHPOffice/PhpSpreadsheet/issues/2999) [PR #3002](https://github.com/PHPOffice/PhpSpreadsheet/pull/3002) [PR #3006](https://github.com/PHPOffice/PhpSpreadsheet/pull/3006)
+- Html/Pdf Do net set background color for cells using (default) nofill [PR #3016](https://github.com/PHPOffice/PhpSpreadsheet/pull/3016)
+- Add support for Date Axis to Chart [Issue #2967](https://github.com/PHPOffice/PhpSpreadsheet/issues/2967) [PR #3018](https://github.com/PHPOffice/PhpSpreadsheet/pull/3018)
+- Reconcile Differences Between Css and Excel for Cell Alignment [PR #3048](https://github.com/PHPOffice/PhpSpreadsheet/pull/3048)
+- R1C1 Format Internationalization and Better Support for Relative Offsets [Issue #1704](https://github.com/PHPOffice/PhpSpreadsheet/issues/1704) [PR #3052](https://github.com/PHPOffice/PhpSpreadsheet/pull/3052)
+- Minor Fix for Percentage Formatting [Issue #1929](https://github.com/PHPOffice/PhpSpreadsheet/issues/1929) [PR #3053](https://github.com/PHPOffice/PhpSpreadsheet/pull/3053)
+
+## 1.24.1 - 2022-07-18
+
+### Added
+
+- Support for SimpleCache Interface versions 1.0, 2.0 and 3.0
+- Add Chart Axis Option textRotation [Issue #2705](https://github.com/PHPOffice/PhpSpreadsheet/issues/2705) [PR #2940](https://github.com/PHPOffice/PhpSpreadsheet/pull/2940)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fix Encoding issue with Html reader (PHP 8.2 deprecation for mb_convert_encoding) [Issue #2942](https://github.com/PHPOffice/PhpSpreadsheet/issues/2942) [PR #2943](https://github.com/PHPOffice/PhpSpreadsheet/pull/2943)
+- Additional Chart fixes
+  - Pie chart with part separated unwantedly [Issue #2506](https://github.com/PHPOffice/PhpSpreadsheet/issues/2506) [PR #2928](https://github.com/PHPOffice/PhpSpreadsheet/pull/2928)
+  - Chart styling is lost on simple load / save process [Issue #1797](https://github.com/PHPOffice/PhpSpreadsheet/issues/1797) [Issue #2077](https://github.com/PHPOffice/PhpSpreadsheet/issues/2077) [PR #2930](https://github.com/PHPOffice/PhpSpreadsheet/pull/2930)
+  - Can't create contour chart (surface 2d) [Issue #2931](https://github.com/PHPOffice/PhpSpreadsheet/issues/2931) [PR #2933](https://github.com/PHPOffice/PhpSpreadsheet/pull/2933)
+- VLOOKUP Breaks When Array Contains Null Cells [Issue #2934](https://github.com/PHPOffice/PhpSpreadsheet/issues/2934) [PR #2939](https://github.com/PHPOffice/PhpSpreadsheet/pull/2939)
+
+## 1.24.0 - 2022-07-09
+
+Note that this will be the last 1.x branch release before the 2.x release. We will maintain both branches in parallel for a time; but users are requested to update to version 2.0 once that is fully available.
+
+### Added
+
+- Added `removeComment()` method for Worksheet [PR #2875](https://github.com/PHPOffice/PhpSpreadsheet/pull/2875/files)
+- Add point size option for scatter charts [Issue #2298](https://github.com/PHPOffice/PhpSpreadsheet/issues/2298) [PR #2801](https://github.com/PHPOffice/PhpSpreadsheet/pull/2801)
+- Basic support for Xlsx reading/writing Chart Sheets [PR #2830](https://github.com/PHPOffice/PhpSpreadsheet/pull/2830)
+
+  Note that a ChartSheet is still only written as a normal Worksheet containing a single chart, not as an actual ChartSheet.
+
+- Added Worksheet visibility in Ods Reader [PR #2851](https://github.com/PHPOffice/PhpSpreadsheet/pull/2851) and Gnumeric Reader [PR #2853](https://github.com/PHPOffice/PhpSpreadsheet/pull/2853)
+- Added Worksheet visibility in Ods Writer [PR #2850](https://github.com/PHPOffice/PhpSpreadsheet/pull/2850)
+- Allow Csv Reader to treat string as contents of file [Issue #1285](https://github.com/PHPOffice/PhpSpreadsheet/issues/1285) [PR #2792](https://github.com/PHPOffice/PhpSpreadsheet/pull/2792)
+- Allow Csv Reader to store null string rather than leave cell empty [Issue #2840](https://github.com/PHPOffice/PhpSpreadsheet/issues/2840) [PR #2842](https://github.com/PHPOffice/PhpSpreadsheet/pull/2842)
+- Provide new Worksheet methods to identify if a row or column is "empty", making allowance for different definitions of "empty":
+  - Treat rows/columns containing no cell records as empty (default)
+  - Treat cells containing a null value as empty
+  - Treat cells containing an empty string as empty
+
+### Changed
+
+- Modify `rangeBoundaries()`, `rangeDimension()` and `getRangeBoundaries()` Coordinate methods to work with row/column ranges as well as with cell ranges and cells [PR #2926](https://github.com/PHPOffice/PhpSpreadsheet/pull/2926)
+- Better enforcement of value modification to match specified datatype when using `setValueExplicit()`
+- Relax validation of merge cells to allow merge for a single cell reference [Issue #2776](https://github.com/PHPOffice/PhpSpreadsheet/issues/2776)
+- Memory and speed improvements, particularly for the Cell Collection, and the Writers.
+
+  See [the Discussion section on github](https://github.com/PHPOffice/PhpSpreadsheet/discussions/2821) for details of performance across versions
+- Improved performance for removing rows/columns from a worksheet
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Xls Reader resolving absolute named ranges to relative ranges [Issue #2826](https://github.com/PHPOffice/PhpSpreadsheet/issues/2826) [PR #2827](https://github.com/PHPOffice/PhpSpreadsheet/pull/2827)
+- Null value handling in the Excel Math/Trig PRODUCT() function [Issue #2833](https://github.com/PHPOffice/PhpSpreadsheet/issues/2833) [PR #2834](https://github.com/PHPOffice/PhpSpreadsheet/pull/2834)
+- Invalid Print Area defined in Xlsx corrupts internal storage of print area [Issue #2848](https://github.com/PHPOffice/PhpSpreadsheet/issues/2848) [PR #2849](https://github.com/PHPOffice/PhpSpreadsheet/pull/2849)
+- Time interval formatting [Issue #2768](https://github.com/PHPOffice/PhpSpreadsheet/issues/2768) [PR #2772](https://github.com/PHPOffice/PhpSpreadsheet/pull/2772)
+- Copy from Xls(x) to Html/Pdf loses drawings [PR #2788](https://github.com/PHPOffice/PhpSpreadsheet/pull/2788)
+- Html Reader converting cell containing 0 to null string [Issue #2810](https://github.com/PHPOffice/PhpSpreadsheet/issues/2810) [PR #2813](https://github.com/PHPOffice/PhpSpreadsheet/pull/2813)
+- Many fixes for Charts, especially, but not limited to, Scatter, Bubble, and Surface charts. [Issue #2762](https://github.com/PHPOffice/PhpSpreadsheet/issues/2762) [Issue #2299](https://github.com/PHPOffice/PhpSpreadsheet/issues/2299) [Issue #2700](https://github.com/PHPOffice/PhpSpreadsheet/issues/2700) [Issue #2817](https://github.com/PHPOffice/PhpSpreadsheet/issues/2817) [Issue #2763](https://github.com/PHPOffice/PhpSpreadsheet/issues/2763) [Issue #2219](https://github.com/PHPOffice/PhpSpreadsheet/issues/2219) [Issue #2863](https://github.com/PHPOffice/PhpSpreadsheet/issues/2863) [PR #2828](https://github.com/PHPOffice/PhpSpreadsheet/pull/2828) [PR #2841](https://github.com/PHPOffice/PhpSpreadsheet/pull/2841) [PR #2846](https://github.com/PHPOffice/PhpSpreadsheet/pull/2846) [PR #2852](https://github.com/PHPOffice/PhpSpreadsheet/pull/2852) [PR #2856](https://github.com/PHPOffice/PhpSpreadsheet/pull/2856) [PR #2865](https://github.com/PHPOffice/PhpSpreadsheet/pull/2865) [PR #2872](https://github.com/PHPOffice/PhpSpreadsheet/pull/2872) [PR #2879](https://github.com/PHPOffice/PhpSpreadsheet/pull/2879) [PR #2898](https://github.com/PHPOffice/PhpSpreadsheet/pull/2898) [PR #2906](https://github.com/PHPOffice/PhpSpreadsheet/pull/2906) [PR #2922](https://github.com/PHPOffice/PhpSpreadsheet/pull/2922) [PR #2923](https://github.com/PHPOffice/PhpSpreadsheet/pull/2923)
+- Adjust both coordinates for two-cell anchors when rows/columns are added/deleted. [Issue #2908](https://github.com/PHPOffice/PhpSpreadsheet/issues/2908) [PR #2909](https://github.com/PHPOffice/PhpSpreadsheet/pull/2909)
+- Keep calculated string results below 32K. [PR #2921](https://github.com/PHPOffice/PhpSpreadsheet/pull/2921)
+- Filter out illegal Unicode char values FFFE/FFFF. [Issue #2897](https://github.com/PHPOffice/PhpSpreadsheet/issues/2897) [PR #2910](https://github.com/PHPOffice/PhpSpreadsheet/pull/2910)
+- Better handling of REF errors and propagation of all errors in Calculation engine. [PR #2902](https://github.com/PHPOffice/PhpSpreadsheet/pull/2902)
+- Calculating Engine regexp for Column/Row references when there are multiple quoted worksheet references in the formula [Issue #2874](https://github.com/PHPOffice/PhpSpreadsheet/issues/2874) [PR #2899](https://github.com/PHPOffice/PhpSpreadsheet/pull/2899)
+
+## 1.23.0 - 2022-04-24
+
+### Added
+
+- Ods Writer support for Freeze Pane [Issue #2013](https://github.com/PHPOffice/PhpSpreadsheet/issues/2013) [PR #2755](https://github.com/PHPOffice/PhpSpreadsheet/pull/2755)
+- Ods Writer support for setting column width/row height (including the use of AutoSize) [Issue #2346](https://github.com/PHPOffice/PhpSpreadsheet/issues/2346) [PR #2753](https://github.com/PHPOffice/PhpSpreadsheet/pull/2753)
+- Introduced CellAddress, CellRange, RowRange and ColumnRange value objects that can be used as an alternative to a string value (e.g. `'C5'`, `'B2:D4'`, `'2:2'` or `'B:C'`) in appropriate contexts.
+- Implementation of the FILTER(), SORT(), SORTBY() and UNIQUE() Lookup/Reference (array) functions.
+- Implementation of the ISREF() Information function.
+- Added support for reading "formatted" numeric values from Csv files; although default behaviour of reading these values as strings is preserved.
+
+  (i.e a value of "12,345.67" can be read as numeric `12345.67`, not simply as a string `"12,345.67"`, if the `castFormattedNumberToNumeric()` setting is enabled.
+
+  This functionality is locale-aware, using the server's locale settings to identify the thousands and decimal separators.
+
+- Support for two cell anchor drawing of images. [#2532](https://github.com/PHPOffice/PhpSpreadsheet/pull/2532) [#2674](https://github.com/PHPOffice/PhpSpreadsheet/pull/2674)
+- Limited support for Xls Reader to handle Conditional Formatting:
+
+  Ranges and Rules are read, but style is currently limited to font size, weight and color; and to fill style and color.
+
+- Add ability to suppress Mac line ending check for CSV [#2623](https://github.com/PHPOffice/PhpSpreadsheet/pull/2623)
+- Initial support for creating and writing Tables (Xlsx Writer only) [PR #2671](https://github.com/PHPOffice/PhpSpreadsheet/pull/2671)
+
+  See `/samples/Table` for examples of use.
+
+  Note that PreCalculateFormulas needs to be disabled when saving spreadsheets containing tables with formulae (totals or column formulae).
+
+### Changed
+
+- Gnumeric Reader now loads number formatting for cells.
+- Gnumeric Reader now correctly identifies selected worksheet and selected cells in a worksheet.
+- Some Refactoring of the Ods Reader, moving all formula and address translation from Ods to Excel into a separate class to eliminate code duplication and ensure consistency.
+- Make Boolean Conversion in Csv Reader locale-aware when using the String Value Binder.
+
+  This is determined by the Calculation Engine locale setting.
+
+  (i.e. `"Vrai"` wil be converted to a boolean `true` if the Locale is set to `fr`.)
+- Allow `psr/simple-cache` 2.x
+
+### Deprecated
+
+- All Excel Function implementations in `Calculation\Functions` (including the Error functions) have been moved to dedicated classes for groups of related functions. See the docblocks against all the deprecated methods for details of the new methods to call instead. At some point, these old classes will be deleted.
+- Worksheet methods that reference cells "byColumnandRow". All such methods have an equivalent that references the cell by its address (e.g. '`E3'` rather than `5, 3`).
+
+  These functions now accept either a cell address string (`'E3')` or an array with columnId and rowId (`[5, 3]`) or a new `CellAddress` object as their `cellAddress`/`coordinate` argument.
+  This includes the methods:
+  - `setCellValueByColumnAndRow()` use the equivalent `setCellValue()`
+  - `setCellValueExplicitByColumnAndRow()` use the equivalent `setCellValueExplicit()`
+  - `getCellByColumnAndRow()` use the equivalent `getCell()`
+  - `cellExistsByColumnAndRow()` use the equivalent `cellExists()`
+  - `getStyleByColumnAndRow()` use the equivalent `getStyle()`
+  - `setBreakByColumnAndRow()` use the equivalent `setBreak()`
+  - `mergeCellsByColumnAndRow()` use the equivalent `mergeCells()`
+  - `unmergeCellsByColumnAndRow()` use the equivalent `unmergeCells()`
+  - `protectCellsByColumnAndRow()` use the equivalent `protectCells()`
+  - `unprotectCellsByColumnAndRow()` use the equivalent `unprotectCells()`
+  - `setAutoFilterByColumnAndRow()` use the equivalent `setAutoFilter()`
+  - `freezePaneByColumnAndRow()` use the equivalent `freezePane()`
+  - `getCommentByColumnAndRow()` use the equivalent `getComment()`
+  - `setSelectedCellByColumnAndRow()` use the equivalent `setSelectedCells()`
+
+  This change provides more consistency in the methods (not every "by cell address" method has an equivalent "byColumnAndRow" method);
+  and the "by cell address" methods often provide more flexibility, such as allowing a range of cells, or referencing them by passing the defined name of a named range as the argument.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Make allowance for the AutoFilter dropdown icon in the first row of an Autofilter range when using Autosize columns. [Issue #2413](https://github.com/PHPOffice/PhpSpreadsheet/issues/2413) [PR #2754](https://github.com/PHPOffice/PhpSpreadsheet/pull/2754)
+- Support for "chained" ranges (e.g. `A5:C10:C20:F1`) in the Calculation Engine; and also support for using named ranges with the Range operator (e.g. `NamedRange1:NamedRange2`) [Issue #2730](https://github.com/PHPOffice/PhpSpreadsheet/issues/2730) [PR #2746](https://github.com/PHPOffice/PhpSpreadsheet/pull/2746)
+- Update Conditional Formatting ranges and rule conditions when inserting/deleting rows/columns [Issue #2678](https://github.com/PHPOffice/PhpSpreadsheet/issues/2678) [PR #2689](https://github.com/PHPOffice/PhpSpreadsheet/pull/2689)
+- Allow `INDIRECT()` to accept row/column ranges as well as cell ranges [PR #2687](https://github.com/PHPOffice/PhpSpreadsheet/pull/2687)
+- Fix bug when deleting cells with hyperlinks, where the hyperlink was then being "inherited" by whatever cell moved to that cell address.
+- Fix bug in Conditional Formatting in the Xls Writer that resulted in a broken file when there were multiple conditional ranges in a worksheet.
+- Fix Conditional Formatting in the Xls Writer to work with rules that contain string literals, cell references and formulae.
+- Fix for setting Active Sheet to the first loaded worksheet when bookViews element isn't defined [Issue #2666](https://github.com/PHPOffice/PhpSpreadsheet/issues/2666) [PR #2669](https://github.com/PHPOffice/PhpSpreadsheet/pull/2669)
+- Fixed behaviour of XLSX font style vertical align settings [PR #2619](https://github.com/PHPOffice/PhpSpreadsheet/pull/2619)
+- Resolved formula translations to handle separators (row and column) for array functions as well as for function argument separators; and cleanly handle nesting levels.
+
+  Note that this method is used when translating Excel functions between `en_us` and other locale languages, as well as when converting formulae between different spreadsheet formats (e.g. Ods to Excel).
+
+  Nor is this a perfect solution, as there may still be issues when function calls have array arguments that themselves contain function calls; but it's still better than the current logic.
+- Fix for escaping double quotes within a formula [Issue #1971](https://github.com/PHPOffice/PhpSpreadsheet/issues/1971) [PR #2651](https://github.com/PHPOffice/PhpSpreadsheet/pull/2651)
+- Change open mode for output from `wb+` to `wb` [Issue #2372](https://github.com/PHPOffice/PhpSpreadsheet/issues/2372) [PR #2657](https://github.com/PHPOffice/PhpSpreadsheet/pull/2657)
+- Use color palette if supplied [Issue #2499](https://github.com/PHPOffice/PhpSpreadsheet/issues/2499) [PR #2595](https://github.com/PHPOffice/PhpSpreadsheet/pull/2595)
+- Xls reader treat drawing offsets as int rather than float [PR #2648](https://github.com/PHPOffice/PhpSpreadsheet/pull/2648)
+- Handle booleans in conditional styles properly [PR #2654](https://github.com/PHPOffice/PhpSpreadsheet/pull/2654)
+- Fix for reading files in the root directory of a ZipFile, which should not be prefixed by relative paths ("./") as dirname($filename) does by default.
+- Fix invalid style of cells in empty columns with columnDimensions and rows with rowDimensions in added external sheet. [PR #2739](https://github.com/PHPOffice/PhpSpreadsheet/pull/2739)
+- Time Interval Formatting [Issue #2768](https://github.com/PHPOffice/PhpSpreadsheet/issues/2768) [PR #2772](https://github.com/PHPOffice/PhpSpreadsheet/pull/2772)
+
+## 1.22.0 - 2022-02-18
+
+### Added
+
+- Namespacing phase 2 - styles.
+[PR #2471](https://github.com/PHPOffice/PhpSpreadsheet/pull/2471)
+
+- Improved support for passing of array arguments to Excel function implementations to return array results (where appropriate). [Issue #2551](https://github.com/PHPOffice/PhpSpreadsheet/issues/2551)
+
+  This is the first stage in an ongoing process of adding array support to all appropriate function implementations,
+- Support for the Excel365 Math/Trig SEQUENCE() function [PR #2536](https://github.com/PHPOffice/PhpSpreadsheet/pull/2536)
+- Support for the Excel365 Math/Trig RANDARRAY() function [PR #2540](https://github.com/PHPOffice/PhpSpreadsheet/pull/2540)
+
+  Note that the Spill Operator is not yet supported in the Calculation Engine; but this can still be useful for defining array constants.
+- Improved support for Conditional Formatting Rules [PR #2491](https://github.com/PHPOffice/PhpSpreadsheet/pull/2491)
+  - Provide support for a wider range of Conditional Formatting Rules for Xlsx Reader/Writer:
+    - Cells Containing (cellIs)
+    - Specific Text (containing, notContaining, beginsWith, endsWith)
+    - Dates Occurring (all supported timePeriods)
+    - Blanks/NoBlanks
+    - Errors/NoErrors
+    - Duplicates/Unique
+    - Expression
+  - Provision of CF Wizards (for all the above listed rule types) to help create/modify CF Rules without having to manage all the combinations of types/operators, and the complexities of formula expressions, or the text/timePeriod attributes.
+
+    See [documentation](https://phpspreadsheet.readthedocs.io/en/latest/topics/conditional-formatting/) for details
+
+  - Full support of the above CF Rules for the Xlsx Reader and Writer; even when the file being loaded has CF rules listed in the `<extLst><ext><ConditionalFormattings>` element for the worksheet rather than the `<ConditionalFormatting>` element.
+  - Provision of a CellMatcher to identify if rules are matched for a cell, and which matching style will be applied.
+  - Improved documentation and examples, covering all supported CF rule types.
+  - Add support for one digit decimals (FORMAT_NUMBER_0, FORMAT_PERCENTAGE_0). [PR #2525](https://github.com/PHPOffice/PhpSpreadsheet/pull/2525)
+  - Initial work enabling Excel function implementations for handling arrays as arguments when used in "array formulae" [#2562](https://github.com/PHPOffice/PhpSpreadsheet/issues/2562)
+  - Enable most of the Date/Time functions to accept array arguments [#2573](https://github.com/PHPOffice/PhpSpreadsheet/issues/2573)
+  - Array ready functions - Text, Math/Trig, Statistical, Engineering and Logical [#2580](https://github.com/PHPOffice/PhpSpreadsheet/issues/2580)
+
+### Changed
+
+- Additional Russian translations for Excel Functions (courtesy of aleks-samurai).
+- Improved code coverage for NumberFormat. [PR #2556](https://github.com/PHPOffice/PhpSpreadsheet/pull/2556)
+- Extract some methods from the Calculation Engine into dedicated classes [#2537](https://github.com/PHPOffice/PhpSpreadsheet/issues/2537)
+- Eliminate calls to `flattenSingleValue()` that are no longer required when we're checking for array values as arguments [#2590](https://github.com/PHPOffice/PhpSpreadsheet/issues/2590)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fixed `ReferenceHelper@insertNewBefore` behavior when removing column before last column with null value [PR #2541](https://github.com/PHPOffice/PhpSpreadsheet/pull/2541)
+- Fix bug with `DOLLARDE()` and `DOLLARFR()` functions when the dollar value is negative [Issue #2578](https://github.com/PHPOffice/PhpSpreadsheet/issues/2578) [PR #2579](https://github.com/PHPOffice/PhpSpreadsheet/pull/2579)
+- Fix partial function name matching when translating formulae from Russian to English [Issue #2533](https://github.com/PHPOffice/PhpSpreadsheet/issues/2533) [PR #2534](https://github.com/PHPOffice/PhpSpreadsheet/pull/2534)
+- Various bugs related to Conditional Formatting Rules, and errors in the Xlsx Writer for Conditional Formatting [PR #2491](https://github.com/PHPOffice/PhpSpreadsheet/pull/2491)
+- Xlsx Reader merge range fixes. [Issue #2501](https://github.com/PHPOffice/PhpSpreadsheet/issues/2501) [PR #2504](https://github.com/PHPOffice/PhpSpreadsheet/pull/2504)
+- Handle explicit "date" type for Cell in Xlsx Reader. [Issue #2373](https://github.com/PHPOffice/PhpSpreadsheet/issues/2373) [PR #2485](https://github.com/PHPOffice/PhpSpreadsheet/pull/2485)
+- Recalibrate Row/Column Dimensions after removeRow/Column. [Issue #2442](https://github.com/PHPOffice/PhpSpreadsheet/issues/2442) [PR #2486](https://github.com/PHPOffice/PhpSpreadsheet/pull/2486)
+- Refinement for XIRR. [Issue #2469](https://github.com/PHPOffice/PhpSpreadsheet/issues/2469) [PR #2487](https://github.com/PHPOffice/PhpSpreadsheet/pull/2487)
+- Xlsx Reader handle cell with non-null explicit type but null value. [Issue #2488](https://github.com/PHPOffice/PhpSpreadsheet/issues/2488) [PR #2489](https://github.com/PHPOffice/PhpSpreadsheet/pull/2489)
+- Xlsx Reader fix height and width for oneCellAnchorDrawings. [PR #2492](https://github.com/PHPOffice/PhpSpreadsheet/pull/2492)
+- Fix rounding error in NumberFormat::NUMBER_PERCENTAGE, NumberFormat::NUMBER_PERCENTAGE_00. [PR #2555](https://github.com/PHPOffice/PhpSpreadsheet/pull/2555)
+- Don't treat thumbnail file as xml. [Issue #2516](https://github.com/PHPOffice/PhpSpreadsheet/issues/2516) [PR #2517](https://github.com/PHPOffice/PhpSpreadsheet/pull/2517)
+- Eliminating Xlsx Reader warning when no sz tag for RichText. [Issue #2542](https://github.com/PHPOffice/PhpSpreadsheet/issues/2542) [PR #2550](https://github.com/PHPOffice/PhpSpreadsheet/pull/2550)
+- Fix Xlsx/Xls Writer handling of inline strings. [Issue #353](https://github.com/PHPOffice/PhpSpreadsheet/issues/353) [PR #2569](https://github.com/PHPOffice/PhpSpreadsheet/pull/2569)
+- Richtext colors were not being read correctly after namespace change [#2458](https://github.com/PHPOffice/PhpSpreadsheet/issues/2458)
+- Fix discrepancy between the way markdown tables are rendered in ReadTheDocs and in PHPStorm [#2520](https://github.com/PHPOffice/PhpSpreadsheet/issues/2520)
+- Update Russian Functions Text File [#2557](https://github.com/PHPOffice/PhpSpreadsheet/issues/2557)
+- Fix documentation, instantiation example [#2564](https://github.com/PHPOffice/PhpSpreadsheet/issues/2564)
+
+
+## 1.21.0 - 2022-01-06
+
+### Added
+
+- Ability to add a picture to the background of the comment. Supports four image formats: png, jpeg, gif, bmp. New `Comment::setSizeAsBackgroundImage()` to change the size of a comment to the size of a background image. [Issue #1547](https://github.com/PHPOffice/PhpSpreadsheet/issues/1547) [PR #2422](https://github.com/PHPOffice/PhpSpreadsheet/pull/2422)
+- Ability to set default paper size and orientation [PR #2410](https://github.com/PHPOffice/PhpSpreadsheet/pull/2410)
+- Ability to extend AutoFilter to Maximum Row [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+
+### Changed
+
+- Xlsx Writer will evaluate AutoFilter only if it is as yet unevaluated, or has changed since it was last evaluated [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Rounding in `NumberFormatter` [Issue #2385](https://github.com/PHPOffice/PhpSpreadsheet/issues/2385) [PR #2399](https://github.com/PHPOffice/PhpSpreadsheet/pull/2399)
+- Support for themes [Issue #2075](https://github.com/PHPOffice/PhpSpreadsheet/issues/2075) [Issue #2387](https://github.com/PHPOffice/PhpSpreadsheet/issues/2387) [PR #2403](https://github.com/PHPOffice/PhpSpreadsheet/pull/2403)
+- Read spreadsheet with `#` in name [Issue #2405](https://github.com/PHPOffice/PhpSpreadsheet/issues/2405) [PR #2409](https://github.com/PHPOffice/PhpSpreadsheet/pull/2409)
+- Improve PDF support for page size and orientation [Issue #1691](https://github.com/PHPOffice/PhpSpreadsheet/issues/1691) [PR #2410](https://github.com/PHPOffice/PhpSpreadsheet/pull/2410)
+- Wildcard handling issues in text match [Issue #2430](https://github.com/PHPOffice/PhpSpreadsheet/issues/2430) [PR #2431](https://github.com/PHPOffice/PhpSpreadsheet/pull/2431)
+- Respect DataType in `insertNewBefore` [PR #2433](https://github.com/PHPOffice/PhpSpreadsheet/pull/2433)
+- Handle rows explicitly hidden after AutoFilter [Issue #1641](https://github.com/PHPOffice/PhpSpreadsheet/issues/1641) [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+- Special characters in image file name [Issue #1470](https://github.com/PHPOffice/PhpSpreadsheet/issues/1470) [Issue #2415](https://github.com/PHPOffice/PhpSpreadsheet/issues/2415) [PR #2416](https://github.com/PHPOffice/PhpSpreadsheet/pull/2416)
+- Mpdf with very many styles [Issue #2432](https://github.com/PHPOffice/PhpSpreadsheet/issues/2432) [PR #2434](https://github.com/PHPOffice/PhpSpreadsheet/pull/2434)
+- Name clashes between parsed and unparsed drawings [Issue #1767](https://github.com/PHPOffice/PhpSpreadsheet/issues/1767) [Issue #2396](https://github.com/PHPOffice/PhpSpreadsheet/issues/2396) [PR #2423](https://github.com/PHPOffice/PhpSpreadsheet/pull/2423)
+- Fill pattern start and end colors [Issue #2441](https://github.com/PHPOffice/PhpSpreadsheet/issues/2441) [PR #2444](https://github.com/PHPOffice/PhpSpreadsheet/pull/2444)
+- General style specified in wrong case [Issue #2450](https://github.com/PHPOffice/PhpSpreadsheet/issues/2450) [PR #2451](https://github.com/PHPOffice/PhpSpreadsheet/pull/2451)
+- Null passed to `AutoFilter::setRange()` [Issue #2281](https://github.com/PHPOffice/PhpSpreadsheet/issues/2281) [PR #2454](https://github.com/PHPOffice/PhpSpreadsheet/pull/2454)
+- Another undefined index in Xls reader (#2470) [Issue #2463](https://github.com/PHPOffice/PhpSpreadsheet/issues/2463) [PR #2470](https://github.com/PHPOffice/PhpSpreadsheet/pull/2470)
+- Allow single-cell checks on conditional styles, even when the style is configured for a range of cells (#) [PR #2483](https://github.com/PHPOffice/PhpSpreadsheet/pull/2483)
+
+## 1.20.0 - 2021-11-23
+
+### Added
+
+- Xlsx Writer Support for WMF Files [#2339](https://github.com/PHPOffice/PhpSpreadsheet/issues/2339)
+- Use standard temporary file for internal use of HTMLPurifier [#2383](https://github.com/PHPOffice/PhpSpreadsheet/issues/2383)
+
+### Changed
+
+- Drop support for PHP 7.2, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support
+- Use native typing for objects that were already documented as such
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fixed null conversation for strToUpper [#2292](https://github.com/PHPOffice/PhpSpreadsheet/issues/2292)
+- Fixed Trying to access array offset on value of type null (Xls Reader) [#2315](https://github.com/PHPOffice/PhpSpreadsheet/issues/2315)
+- Don't corrupt XLSX files containing data validation [#2377](https://github.com/PHPOffice/PhpSpreadsheet/issues/2377)
+- Non-fixed cells were not updated if shared formula has a fixed cell [#2354](https://github.com/PHPOffice/PhpSpreadsheet/issues/2354)
+- Declare key of generic ArrayObject
+- CSV reader better support for boolean values [#2374](https://github.com/PHPOffice/PhpSpreadsheet/pull/2374)
+- Some ZIP file could not be read [#2376](https://github.com/PHPOffice/PhpSpreadsheet/pull/2376)
+- Fix regression were hyperlinks could not be read [#2391](https://github.com/PHPOffice/PhpSpreadsheet/pull/2391)
+- AutoFilter Improvements [#2393](https://github.com/PHPOffice/PhpSpreadsheet/pull/2393)
+- Don't corrupt file when using chart with fill color [#589](https://github.com/PHPOffice/PhpSpreadsheet/pull/589)
+- Restore imperfect array formula values in xlsx writer [#2343](https://github.com/PHPOffice/PhpSpreadsheet/pull/2343)
+- Restore explicit list of changes to PHPExcel migration document [#1546](https://github.com/PHPOffice/PhpSpreadsheet/issues/1546)
+
+## 1.19.0 - 2021-10-31
+
+### Added
+
+- Ability to set style on named range, and validate input to setSelectedCells [Issue #2279](https://github.com/PHPOffice/PhpSpreadsheet/issues/2279) [PR #2280](https://github.com/PHPOffice/PhpSpreadsheet/pull/2280)
+- Process comments in Sylk file [Issue #2276](https://github.com/PHPOffice/PhpSpreadsheet/issues/2276) [PR #2277](https://github.com/PHPOffice/PhpSpreadsheet/pull/2277)
+- Addition of Custom Properties to Ods Writer, and 32-bit-safe timestamps for Document Properties [PR #2113](https://github.com/PHPOffice/PhpSpreadsheet/pull/2113)
+- Added callback to CSV reader to set user-specified defaults for various properties (especially for escape which has a poor PHP-inherited default of backslash which does not correspond with Excel) [PR #2103](https://github.com/PHPOffice/PhpSpreadsheet/pull/2103)
+- Phase 1 of better namespace handling for Xlsx, resolving many open issues [PR #2173](https://github.com/PHPOffice/PhpSpreadsheet/pull/2173) [PR #2204](https://github.com/PHPOffice/PhpSpreadsheet/pull/2204) [PR #2303](https://github.com/PHPOffice/PhpSpreadsheet/pull/2303)
+- Add ability to extract images if source is a URL [Issue #1997](https://github.com/PHPOffice/PhpSpreadsheet/issues/1997) [PR #2072](https://github.com/PHPOffice/PhpSpreadsheet/pull/2072)
+- Support for passing flags in the Reader `load()` and Writer `save()`methods, and through the IOFactory, to set behaviours [PR #2136](https://github.com/PHPOffice/PhpSpreadsheet/pull/2136)
+    - See [documentation](https://phpspreadsheet.readthedocs.io/en/latest/topics/reading-and-writing-to-file/#readerwriter-flags) for details
+- More flexibility in the StringValueBinder to determine what datatypes should be treated as strings [PR #2138](https://github.com/PHPOffice/PhpSpreadsheet/pull/2138)
+- Helper class for conversion between css size Units of measure (`px`, `pt`, `pc`, `in`, `cm`, `mm`) [PR #2152](https://github.com/PHPOffice/PhpSpreadsheet/issues/2145)
+- Allow Row height and Column Width to be set using different units of measure (`px`, `pt`, `pc`, `in`, `cm`, `mm`), rather than only in points or MS Excel column width units [PR #2152](https://github.com/PHPOffice/PhpSpreadsheet/issues/2145)
+- Ability to stream to an Amazon S3 bucket [Issue #2249](https://github.com/PHPOffice/PhpSpreadsheet/issues/2249)
+- Provided a Size Helper class to validate size values (pt, px, em) [PR #1694](https://github.com/PHPOffice/PhpSpreadsheet/pull/1694)
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- PHP 8.1 will deprecate auto_detect_line_endings. As a result of this change, Csv Reader using some release after PHP8.1 will no longer be able to handle a Csv with Mac line endings.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Unexpected format in Xlsx Timestamp [Issue #2331](https://github.com/PHPOffice/PhpSpreadsheet/issues/2331) [PR #2332](https://github.com/PHPOffice/PhpSpreadsheet/pull/2332)
+- Corrections for HLOOKUP [Issue #2123](https://github.com/PHPOffice/PhpSpreadsheet/issues/2123) [PR #2330](https://github.com/PHPOffice/PhpSpreadsheet/pull/2330)
+- Corrections for Xlsx Read Comments [Issue #2316](https://github.com/PHPOffice/PhpSpreadsheet/issues/2316) [PR #2329](https://github.com/PHPOffice/PhpSpreadsheet/pull/2329)
+- Lowercase Calibri font names [Issue #2273](https://github.com/PHPOffice/PhpSpreadsheet/issues/2273) [PR #2325](https://github.com/PHPOffice/PhpSpreadsheet/pull/2325)
+- isFormula Referencing Sheet with Space in Title [Issue #2304](https://github.com/PHPOffice/PhpSpreadsheet/issues/2304) [PR #2306](https://github.com/PHPOffice/PhpSpreadsheet/pull/2306)
+- Xls Reader Fatal Error due to Undefined Offset [Issue #1114](https://github.com/PHPOffice/PhpSpreadsheet/issues/1114) [PR #2308](https://github.com/PHPOffice/PhpSpreadsheet/pull/2308)
+- Permit Csv Reader delimiter to be set to null [Issue #2287](https://github.com/PHPOffice/PhpSpreadsheet/issues/2287) [PR #2288](https://github.com/PHPOffice/PhpSpreadsheet/pull/2288)
+- Csv Reader did not handle booleans correctly [PR #2232](https://github.com/PHPOffice/PhpSpreadsheet/pull/2232)
+- Problems when deleting sheet with local defined name [Issue #2266](https://github.com/PHPOffice/PhpSpreadsheet/issues/2266) [PR #2284](https://github.com/PHPOffice/PhpSpreadsheet/pull/2284)
+- Worksheet passwords were not always handled correctly [Issue #1897](https://github.com/PHPOffice/PhpSpreadsheet/issues/1897) [PR #2197](https://github.com/PHPOffice/PhpSpreadsheet/pull/2197)
+- Gnumeric Reader will now distinguish between Created and Modified timestamp [PR #2133](https://github.com/PHPOffice/PhpSpreadsheet/pull/2133)
+- Xls Reader will now handle MACCENTRALEUROPE with or without hyphen [Issue #549](https://github.com/PHPOffice/PhpSpreadsheet/issues/549) [PR #2213](https://github.com/PHPOffice/PhpSpreadsheet/pull/2213)
+- Tweaks to input file validation [Issue #1718](https://github.com/PHPOffice/PhpSpreadsheet/issues/1718) [PR #2217](https://github.com/PHPOffice/PhpSpreadsheet/pull/2217)
+- Html Reader did not handle comments correctly [Issue #2234](https://github.com/PHPOffice/PhpSpreadsheet/issues/2234) [PR #2235](https://github.com/PHPOffice/PhpSpreadsheet/pull/2235)
+- Apache OpenOffice Uses Unexpected Case for General format [Issue #2239](https://github.com/PHPOffice/PhpSpreadsheet/issues/2239) [PR #2242](https://github.com/PHPOffice/PhpSpreadsheet/pull/2242)
+- Problems with fraction formatting [Issue #2253](https://github.com/PHPOffice/PhpSpreadsheet/issues/2253) [PR #2254](https://github.com/PHPOffice/PhpSpreadsheet/pull/2254)
+- Xlsx Reader had problems reading file with no styles.xml or empty styles.xml [Issue #2246](https://github.com/PHPOffice/PhpSpreadsheet/issues/2246) [PR #2247](https://github.com/PHPOffice/PhpSpreadsheet/pull/2247)
+- Xlsx Reader did not read Data Validation flags correctly [Issue #2224](https://github.com/PHPOffice/PhpSpreadsheet/issues/2224) [PR #2225](https://github.com/PHPOffice/PhpSpreadsheet/pull/2225)
+- Better handling of empty arguments in Calculation engine [PR #2143](https://github.com/PHPOffice/PhpSpreadsheet/pull/2143)
+- Many fixes for Autofilter [Issue #2216](https://github.com/PHPOffice/PhpSpreadsheet/issues/2216) [PR #2141](https://github.com/PHPOffice/PhpSpreadsheet/pull/2141) [PR #2162](https://github.com/PHPOffice/PhpSpreadsheet/pull/2162) [PR #2218](https://github.com/PHPOffice/PhpSpreadsheet/pull/2218)
+- Locale generator will now use Unix line endings even on Windows [Issue #2172](https://github.com/PHPOffice/PhpSpreadsheet/issues/2172) [PR #2174](https://github.com/PHPOffice/PhpSpreadsheet/pull/2174)
+- Support differences in implementation of Text functions between Excel/Ods/Gnumeric [PR #2151](https://github.com/PHPOffice/PhpSpreadsheet/pull/2151)
+- Fixes to places where PHP8.1 enforces new or previously unenforced restrictions [PR #2137](https://github.com/PHPOffice/PhpSpreadsheet/pull/2137) [PR #2191](https://github.com/PHPOffice/PhpSpreadsheet/pull/2191) [PR #2231](https://github.com/PHPOffice/PhpSpreadsheet/pull/2231)
+- Clone for HashTable was incorrect [PR #2130](https://github.com/PHPOffice/PhpSpreadsheet/pull/2130)
+- Xlsx Reader was not evaluating Document Security Lock correctly [PR #2128](https://github.com/PHPOffice/PhpSpreadsheet/pull/2128)
+- Error in COUPNCD handling end of month [Issue #2116](https://github.com/PHPOffice/PhpSpreadsheet/issues/2116) [PR #2119](https://github.com/PHPOffice/PhpSpreadsheet/pull/2119)
+- Xls Writer Parser did not handle concatenation operator correctly [PR #2080](https://github.com/PHPOffice/PhpSpreadsheet/pull/2080)
+- Xlsx Writer did not handle boolean false correctly [Issue #2082](https://github.com/PHPOffice/PhpSpreadsheet/issues/2082) [PR #2087](https://github.com/PHPOffice/PhpSpreadsheet/pull/2087)
+- SUM needs to treat invalid strings differently depending on whether they come from a cell or are used as literals [Issue #2042](https://github.com/PHPOffice/PhpSpreadsheet/issues/2042) [PR #2045](https://github.com/PHPOffice/PhpSpreadsheet/pull/2045)
+- Html reader could have set illegal coordinates when dealing with embedded tables [Issue #2029](https://github.com/PHPOffice/PhpSpreadsheet/issues/2029) [PR #2032](https://github.com/PHPOffice/PhpSpreadsheet/pull/2032)
+- Documentation for printing gridlines was wrong [PR #2188](https://github.com/PHPOffice/PhpSpreadsheet/pull/2188)
+- Return Value Error - DatabaseAbstruct::buildQuery() return null but must be string [Issue #2158](https://github.com/PHPOffice/PhpSpreadsheet/issues/2158) [PR #2160](https://github.com/PHPOffice/PhpSpreadsheet/pull/2160)
+- Xlsx reader not recognize data validations that references another sheet [Issue #1432](https://github.com/PHPOffice/PhpSpreadsheet/issues/1432) [Issue #2149](https://github.com/PHPOffice/PhpSpreadsheet/issues/2149) [PR #2150](https://github.com/PHPOffice/PhpSpreadsheet/pull/2150) [PR #2265](https://github.com/PHPOffice/PhpSpreadsheet/pull/2265)
+- Don't calculate cell width for autosize columns if a cell contains a null or empty string value [Issue #2165](https://github.com/PHPOffice/PhpSpreadsheet/issues/2165) [PR #2167](https://github.com/PHPOffice/PhpSpreadsheet/pull/2167)
+- Allow negative interest rate values in a number of the Financial functions (`PPMT()`, `PMT()`, `FV()`, `PV()`, `NPER()`, etc) [Issue #2163](https://github.com/PHPOffice/PhpSpreadsheet/issues/2163) [PR #2164](https://github.com/PHPOffice/PhpSpreadsheet/pull/2164)
+- Xls Reader changing grey background to black in Excel template [Issue #2147](https://github.com/PHPOffice/PhpSpreadsheet/issues/2147) [PR #2156](https://github.com/PHPOffice/PhpSpreadsheet/pull/2156)
+- Column width and Row height styles in the Html Reader when the value includes a unit of measure [Issue #2145](https://github.com/PHPOffice/PhpSpreadsheet/issues/2145).
+- Data Validation flags not set correctly when reading XLSX files [Issue #2224](https://github.com/PHPOffice/PhpSpreadsheet/issues/2224) [PR #2225](https://github.com/PHPOffice/PhpSpreadsheet/pull/2225)
+- Reading XLSX files without styles.xml throws an exception [Issue #2246](https://github.com/PHPOffice/PhpSpreadsheet/issues/2246)
+- Improved performance of `Style::applyFromArray()` when applied to several cells [PR #1785](https://github.com/PHPOffice/PhpSpreadsheet/issues/1785).
+- Improve XLSX parsing speed if no readFilter is applied (again) - [#772](https://github.com/PHPOffice/PhpSpreadsheet/issues/772)
+
+## 1.18.0 - 2021-05-31
+
+### Added
+
+- Enhancements to CSV Reader, allowing options to be set when using `IOFactory::load()` with a callback to set delimiter, enclosure, charset etc [PR #2103](https://github.com/PHPOffice/PhpSpreadsheet/pull/2103) - See [documentation](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/docs/topics/reading-and-writing-to-file.md#csv-comma-separated-values) for details.
+- Implemented basic AutoFiltering for Ods Reader and Writer [PR #2053](https://github.com/PHPOffice/PhpSpreadsheet/pull/2053)
+- Implemented basic AutoFiltering for Gnumeric Reader [PR #2055](https://github.com/PHPOffice/PhpSpreadsheet/pull/2055)
+- Improved support for Row and Column ranges in formulae [Issue #1755](https://github.com/PHPOffice/PhpSpreadsheet/issues/1755) [PR #2028](https://github.com/PHPOffice/PhpSpreadsheet/pull/2028)
+- Implemented URLENCODE() Web Function
+- Implemented the CHITEST(), CHISQ.DIST() and CHISQ.INV() and equivalent Statistical functions, for both left- and right-tailed distributions.
+- Support for ActiveSheet and SelectedCells in the ODS Reader and Writer [PR #1908](https://github.com/PHPOffice/PhpSpreadsheet/pull/1908)
+- Support for notContainsText Conditional Style in xlsx [Issue #984](https://github.com/PHPOffice/PhpSpreadsheet/issues/984)
+
+### Changed
+
+- Use of `nb` rather than `no` as the locale code for Norsk Bokmål.
+
+### Deprecated
+
+- All Excel Function implementations in `Calculation\Database`, `Calculation\DateTime`, `Calculation\Engineering`, `Calculation\Financial`, `Calculation\Logical`, `Calculation\LookupRef`, `Calculation\MathTrig`, `Calculation\Statistical`, `Calculation\TextData` and `Calculation\Web` have been moved to dedicated classes for individual functions or groups of related functions. See the docblocks against all the deprecated methods for details of the new methods to call instead. At some point, these old classes will be deleted.
+
+### Removed
+
+- Use of `nb` rather than `no` as the locale language code for Norsk Bokmål.
+
+### Fixed
+
+- Fixed error in COUPNCD() calculation for end of month [Issue #2116](https://github.com/PHPOffice/PhpSpreadsheet/issues/2116) - [PR #2119](https://github.com/PHPOffice/PhpSpreadsheet/pull/2119)
+- Resolve default values when a null argument is passed for HLOOKUP(), VLOOKUP() and ADDRESS() functions [Issue #2120](https://github.com/PHPOffice/PhpSpreadsheet/issues/2120) - [PR #2121](https://github.com/PHPOffice/PhpSpreadsheet/pull/2121)
+- Fixed incorrect R1C1 to A1 subtraction formula conversion (`R[-2]C-R[2]C`) [Issue #2076](https://github.com/PHPOffice/PhpSpreadsheet/pull/2076) [PR #2086](https://github.com/PHPOffice/PhpSpreadsheet/pull/2086)
+- Correctly handle absolute A1 references when converting to R1C1 format [PR #2060](https://github.com/PHPOffice/PhpSpreadsheet/pull/2060)
+- Correct default fill style for conditional without a pattern defined [Issue #2035](https://github.com/PHPOffice/PhpSpreadsheet/issues/2035) [PR #2050](https://github.com/PHPOffice/PhpSpreadsheet/pull/2050)
+- Fixed issue where array key check for existince before accessing arrays in Xlsx.php [PR #1970](https://github.com/PHPOffice/PhpSpreadsheet/pull/1970)
+- Fixed issue with quoted strings in number format mask rendered with toFormattedString() [Issue 1972#](https://github.com/PHPOffice/PhpSpreadsheet/issues/1972) [PR #1978](https://github.com/PHPOffice/PhpSpreadsheet/pull/1978)
+- Fixed issue with percentage formats in number format mask rendered with toFormattedString() [Issue 1929#](https://github.com/PHPOffice/PhpSpreadsheet/issues/1929) [PR #1928](https://github.com/PHPOffice/PhpSpreadsheet/pull/1928)
+- Fixed issue with _ spacing character in number format mask corrupting output from toFormattedString() [Issue 1924#](https://github.com/PHPOffice/PhpSpreadsheet/issues/1924) [PR #1927](https://github.com/PHPOffice/PhpSpreadsheet/pull/1927)
+- Fix for [Issue #1887](https://github.com/PHPOffice/PhpSpreadsheet/issues/1887) - Lose Track of Selected Cells After Save
+- Fixed issue with Xlsx@listWorksheetInfo not returning any data
+- Fixed invalid arguments triggering mb_substr() error in LEFT(), MID() and RIGHT() text functions [Issue #640](https://github.com/PHPOffice/PhpSpreadsheet/issues/640)
+- Fix for [Issue #1916](https://github.com/PHPOffice/PhpSpreadsheet/issues/1916) - Invalid signature check for XML files
+- Fix change in `Font::setSize()` behavior for PHP8 [PR #2100](https://github.com/PHPOffice/PhpSpreadsheet/pull/2100)
+
+## 1.17.1 - 2021-03-01
+
+### Added
+
+- Implementation of the Excel `AVERAGEIFS()` functions as part of a restructuring of Database functions and Conditional Statistical functions.
+- Support for date values and percentages in query parameters for Database functions, and the IF expressions in functions like COUNTIF() and AVERAGEIF(). [#1875](https://github.com/PHPOffice/PhpSpreadsheet/pull/1875)
+- Support for booleans, and for wildcard text search in query parameters for Database functions, and the IF expressions in functions like COUNTIF() and AVERAGEIF(). [#1876](https://github.com/PHPOffice/PhpSpreadsheet/pull/1876)
+- Implemented DataBar for conditional formatting in Xlsx, providing read/write and creation of (type, value, direction, fills, border, axis position, color settings) as DataBar options in Excel. [#1754](https://github.com/PHPOffice/PhpSpreadsheet/pull/1754)
+- Alignment for ODS Writer [#1796](https://github.com/PHPOffice/PhpSpreadsheet/issues/1796)
+- Basic implementation of the PERMUTATIONA() Statistical Function
+
+### Changed
+
+- Formula functions that previously called PHP functions directly are now processed through the Excel Functions classes; resolving issues with PHP8 stricter typing. [#1789](https://github.com/PHPOffice/PhpSpreadsheet/issues/1789)
+
+  The following MathTrig functions are affected:
+  `ABS()`, `ACOS()`, `ACOSH()`, `ASIN()`, `ASINH()`, `ATAN()`, `ATANH()`,
+  `COS()`, `COSH()`, `DEGREES()` (rad2deg), `EXP()`, `LN()` (log), `LOG10()`,
+  `RADIANS()` (deg2rad), `SIN()`, `SINH()`, `SQRT()`, `TAN()`, `TANH()`.
+
+  One TextData function is also affected: `REPT()` (str_repeat).
+- `formatAsDate` correctly matches language metadata, reverting c55272e
+- Formulae that previously crashed on sub function call returning excel error value now return said value.
+  The following functions are affected `CUMPRINC()`, `CUMIPMT()`, `AMORLINC()`,
+  `AMORDEGRC()`.
+- Adapt some function error return value to match excel's error.
+  The following functions are affected `PPMT()`, `IPMT()`.
+
+### Deprecated
+
+- Calling many of the Excel formula functions directly rather than through the Calculation Engine.
+
+  The logic for these Functions is now being moved out of the categorised `Database`, `DateTime`, `Engineering`, `Financial`, `Logical`, `LookupRef`, `MathTrig`, `Statistical`, `TextData` and `Web` classes into small, dedicated classes for individual functions or related groups of functions.
+
+  This makes the logic in these classes easier to maintain; and will reduce the memory footprint required to execute formulae when calling these functions.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Avoid Duplicate Titles When Reading Multiple HTML Files.[Issue #1823](https://github.com/PHPOffice/PhpSpreadsheet/issues/1823) [PR #1829](https://github.com/PHPOffice/PhpSpreadsheet/pull/1829)
+- Fixed issue with Worksheet's `getCell()` method when trying to get a cell by defined name. [#1858](https://github.com/PHPOffice/PhpSpreadsheet/issues/1858)
+- Fix possible endless loop in NumberFormat Masks [#1792](https://github.com/PHPOffice/PhpSpreadsheet/issues/1792)
+- Fix problem resulting from  literal dot inside quotes in number format masks [PR #1830](https://github.com/PHPOffice/PhpSpreadsheet/pull/1830)
+- Resolve Google Sheets Xlsx charts issue. Google Sheets uses oneCellAnchor positioning and does not include *Cache values in the exported Xlsx [PR #1761](https://github.com/PHPOffice/PhpSpreadsheet/pull/1761)
+- Fix for Xlsx Chart axis titles mapping to correct X or Y axis label when only one is present [PR #1760](https://github.com/PHPOffice/PhpSpreadsheet/pull/1760)
+- Fix For Null Exception on ODS Read of Page Settings. [#1772](https://github.com/PHPOffice/PhpSpreadsheet/issues/1772)
+- Fix Xlsx reader overriding manually set number format with builtin number format [PR #1805](https://github.com/PHPOffice/PhpSpreadsheet/pull/1805)
+- Fix Xlsx reader cell alignment [PR #1710](https://github.com/PHPOffice/PhpSpreadsheet/pull/1710)
+- Fix for not yet implemented data-types in Open Document writer [Issue #1674](https://github.com/PHPOffice/PhpSpreadsheet/issues/1674)
+- Fix XLSX reader when having a corrupt numeric cell data type [PR #1664](https://github.com/phpoffice/phpspreadsheet/pull/1664)
+- Fix on `CUMPRINC()`, `CUMIPMT()`, `AMORLINC()`, `AMORDEGRC()` usage. When those functions called one of `YEARFRAC()`, `PPMT()`, `IPMT()` and they would get back an error value (represented as a string), trying to use numeral operands (`+`, `/`, `-`, `*`) on said return value and a number (`float or `int`) would fail.
+
+## 1.16.0 - 2020-12-31
+
+### Added
+
+- CSV Reader - Best Guess for Encoding, and Handle Null-string Escape [#1647](https://github.com/PHPOffice/PhpSpreadsheet/issues/1647)
+
+### Changed
+
+- Updated the CONVERT() function to support all current MS Excel categories and Units of Measure.
+
+### Deprecated
+
+- All Excel Function implementations in `Calculation\Database`, `Calculation\DateTime`, `Calculation\Engineering`, `Calculation\Financial`, `Calculation\Logical`, `Calculation\LookupRef`, `Calculation\MathTrig`, `Calculation\Statistical`, `Calculation\TextData` and `Calculation\Web` have been moved to dedicated classes for individual functions or groups of related functions. See the docblocks against all the deprecated methods for details of the new methods to call instead. At some point, these old classes will be deleted.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Fixed issue with absolute path in worksheets' Target [PR #1769](https://github.com/PHPOffice/PhpSpreadsheet/pull/1769)
+- Fix for Xls Reader when SST has a bad length [#1592](https://github.com/PHPOffice/PhpSpreadsheet/issues/1592)
+- Resolve Xlsx loader issue whe hyperlinks don't have a destination
+- Resolve issues when printer settings resources IDs clash with drawing IDs
+- Resolve issue with SLK long filenames [#1612](https://github.com/PHPOffice/PhpSpreadsheet/issues/1612)
+- ROUNDUP and ROUNDDOWN return incorrect results for values of 0 [#1627](https://github.com/phpoffice/phpspreadsheet/pull/1627)
+- Apply Column and Row Styles to Existing Cells [#1712](https://github.com/PHPOffice/PhpSpreadsheet/issues/1712) [PR #1721](https://github.com/PHPOffice/PhpSpreadsheet/pull/1721)
+- Resolve issues with defined names where worksheet doesn't exist (#1686)[https://github.com/PHPOffice/PhpSpreadsheet/issues/1686] and [#1723](https://github.com/PHPOffice/PhpSpreadsheet/issues/1723) - [PR #1742](https://github.com/PHPOffice/PhpSpreadsheet/pull/1742)
+- Fix for issue [#1735](https://github.com/PHPOffice/PhpSpreadsheet/issues/1735) Incorrect activeSheetIndex after RemoveSheetByIndex - [PR #1743](https://github.com/PHPOffice/PhpSpreadsheet/pull/1743)
+- Ensure that the list of shared formulae is maintained when an xlsx file is chunked with readFilter[Issue #169](https://github.com/PHPOffice/PhpSpreadsheet/issues/1669).
+- Fix for notice during accessing "cached magnification factor" offset [#1354](https://github.com/PHPOffice/PhpSpreadsheet/pull/1354)
+- Fix compatibility with ext-gd on php 8
+
+### Security Fix (CVE-2020-7776)
+
+- Prevent XSS through cell comments in the HTML Writer.
+
+## 1.15.0 - 2020-10-11
+
+### Added
+
+- Implemented Page Order for Xlsx and Xls Readers, and provided Page Settings (Orientation, Scale, Horizontal/Vertical Centering, Page Order, Margins) support for Ods, Gnumeric and Xls Readers [#1559](https://github.com/PHPOffice/PhpSpreadsheet/pull/1559)
+- Implementation of the Excel `LOGNORM.DIST()`, `NORM.S.DIST()`, `GAMMA()` and `GAUSS()` functions. [#1588](https://github.com/PHPOffice/PhpSpreadsheet/pull/1588)
+- Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
+  - Defined Names are now case-insensitive
+  - Distinction between named ranges and named formulae
+  - Correct handling of union and intersection operators in named ranges
+  - Correct evaluation of named range operators in calculations
+  - fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+  - Calculation support for named formulae
+  - Support for nested ranges and formulae (named ranges and formulae that reference other named ranges/formulae) in calculations
+  - Introduction of a helper to convert address formats between R1C1 and A1 (and the reverse)
+  - Proper support for both named ranges and named formulae in all appropriate Readers
+    - **Xlsx** (Previously only simple named ranges were supported)
+    - **Xls** (Previously only simple named ranges were supported)
+    - **Gnumeric** (Previously neither named ranges nor formulae were supported)
+    - **Ods** (Previously neither named ranges nor formulae were supported)
+    - **Xml** (Previously neither named ranges nor formulae were supported)
+  - Proper support for named ranges and named formulae in all appropriate Writers
+    - **Xlsx** (Previously only simple named ranges were supported)
+    - **Xls** (Previously neither named ranges nor formulae were supported) - Still not supported, but some parser issues resolved that previously failed to differentiate between a defined name and a function name
+    - **Ods** (Previously neither named ranges nor formulae were supported)
+- Support for PHP 8.0
+
+### Changed
+
+- Improve Coverage for ODS Reader [#1545](https://github.com/phpoffice/phpspreadsheet/pull/1545)
+- Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
+- fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+- Drop $this->spreadSheet null check from Xlsx Writer [#1646](https://github.com/phpoffice/phpspreadsheet/pull/1646)
+- Improving Coverage for Excel2003 XML Reader [#1557](https://github.com/phpoffice/phpspreadsheet/pull/1557)
+
+### Deprecated
+
+- **IMPORTANT NOTE:** This Introduces a **BC break** in the handling of named ranges. Previously, a named range cell reference of `B2` would be treated identically to a named range cell reference of `$B2` or `B$2` or `$B$2` because the calculation engine treated then all as absolute references. These changes "fix" that, so the calculation engine now handles relative references in named ranges correctly.
+  This change that resolves previously incorrect behaviour in the calculation may affect users who have dynamically defined named ranges using relative references when they should have used absolute references.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544)
+- Calculation/DateTime Failure With PHP8 [#1661](https://github.com/phpoffice/phpspreadsheet/pull/1661)
+- Reader/Gnumeric Failure with PHP8 [#1662](https://github.com/phpoffice/phpspreadsheet/pull/1662)
+- ReverseSort bug, exposed but not caused by PHP8 [#1660](https://github.com/phpoffice/phpspreadsheet/pull/1660)
+- Bug setting Superscript/Subscript to false [#1567](https://github.com/phpoffice/phpspreadsheet/pull/1567)
+
+## 1.14.1 - 2020-07-19
+
+### Added
+
+- nothing
+
+### Fixed
+
+- WEBSERVICE is HTTP client agnostic and must be configured via `Settings::setHttpClient()` [#1562](https://github.com/PHPOffice/PhpSpreadsheet/issues/1562)
+- Borders were not complete on rowspanned columns using HTML reader [#1473](https://github.com/PHPOffice/PhpSpreadsheet/pull/1473)
+
+### Changed
+
+## 1.14.0 - 2020-06-29
+
+### Added
+
+- Add support for IFS() logical function [#1442](https://github.com/PHPOffice/PhpSpreadsheet/pull/1442)
+- Add Cell Address Helper to provide conversions between the R1C1 and A1 address formats [#1558](https://github.com/PHPOffice/PhpSpreadsheet/pull/1558)
+- Add ability to edit Html/Pdf before saving [#1499](https://github.com/PHPOffice/PhpSpreadsheet/pull/1499)
+- Add ability to set codepage explicitly for BIFF5 [#1018](https://github.com/PHPOffice/PhpSpreadsheet/issues/1018)
+- Added support for the WEBSERVICE function [#1409](https://github.com/PHPOffice/PhpSpreadsheet/pull/1409)
+
+### Fixed
+
+- Resolve evaluation of utf-8 named ranges in calculation engine [#1522](https://github.com/PHPOffice/PhpSpreadsheet/pull/1522)
+- Fix HLOOKUP on single row [#1512](https://github.com/PHPOffice/PhpSpreadsheet/pull/1512)
+- Fix MATCH when comparing different numeric types [#1521](https://github.com/PHPOffice/PhpSpreadsheet/pull/1521)
+- Fix exact MATCH on ranges with empty cells [#1520](https://github.com/PHPOffice/PhpSpreadsheet/pull/1520)
+- Fix for Issue [#1516](https://github.com/PHPOffice/PhpSpreadsheet/issues/1516) (Cloning worksheet makes corrupted Xlsx) [#1530](https://github.com/PHPOffice/PhpSpreadsheet/pull/1530)
+- Fix For Issue [#1509](https://github.com/PHPOffice/PhpSpreadsheet/issues/1509) (Can not set empty enclosure for CSV) [#1518](https://github.com/PHPOffice/PhpSpreadsheet/pull/1518)
+- Fix for Issue [#1505](https://github.com/PHPOffice/PhpSpreadsheet/issues/1505) (TypeError : Argument 4 passed to PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet::writeAttributeIf() must be of the type string) [#1525](https://github.com/PHPOffice/PhpSpreadsheet/pull/1525)
+- Fix for Issue [#1495](https://github.com/PHPOffice/PhpSpreadsheet/issues/1495) (Sheet index being changed when multiple sheets are used in formula) [#1500]((https://github.com/PHPOffice/PhpSpreadsheet/pull/1500))
+- Fix for Issue [#1533](https://github.com/PHPOffice/PhpSpreadsheet/issues/1533) (A reference to a cell containing a string starting with "#" leads to errors in the generated xlsx.) [#1534](https://github.com/PHPOffice/PhpSpreadsheet/pull/1534)
+- Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
+- Don't ouput row and columns without any cells in HTML writer [#1235](https://github.com/PHPOffice/PhpSpreadsheet/issues/1235)
+
+## 1.13.0 - 2020-05-31
+
+### Added
+
+- Support writing to streams in all writers [#1292](https://github.com/PHPOffice/PhpSpreadsheet/issues/1292)
+- Support CSV files with data wrapping a lot of lines [#1468](https://github.com/PHPOffice/PhpSpreadsheet/pull/1468)
+- Support protection of worksheet by a specific hash algorithm [#1485](https://github.com/PHPOffice/PhpSpreadsheet/pull/1485)
+
+### Fixed
+
+- Fix Chart samples by updating chart parameter from 0 to DataSeries::EMPTY_AS_GAP [#1448](https://github.com/PHPOffice/PhpSpreadsheet/pull/1448)
+- Fix return type in docblock for the Cells::get() [#1398](https://github.com/PHPOffice/PhpSpreadsheet/pull/1398)
+- Fix RATE, PRICE, XIRR, and XNPV Functions [#1456](https://github.com/PHPOffice/PhpSpreadsheet/pull/1456)
+- Save Excel 2010+ functions properly in XLSX [#1461](https://github.com/PHPOffice/PhpSpreadsheet/pull/1461)
+- Several improvements in HTML writer [#1464](https://github.com/PHPOffice/PhpSpreadsheet/pull/1464)
+- Fix incorrect behaviour when saving XLSX file with drawings [#1462](https://github.com/PHPOffice/PhpSpreadsheet/pull/1462),
+- Fix Crash while trying setting a cell the value "123456\n" [#1476](https://github.com/PHPOffice/PhpSpreadsheet/pull/1481)
+- Improved DATEDIF() function and reduced errors for Y and YM units [#1466](https://github.com/PHPOffice/PhpSpreadsheet/pull/1466)
+- Stricter typing for mergeCells [#1494](https://github.com/PHPOffice/PhpSpreadsheet/pull/1494)
+
+### Changed
+
+- Drop support for PHP 7.1, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support
+- Drop partial migration tool in favor of complete migration via RectorPHP [#1445](https://github.com/PHPOffice/PhpSpreadsheet/issues/1445)
+- Limit composer package to `src/` [#1424](https://github.com/PHPOffice/PhpSpreadsheet/pull/1424)
+
+## 1.12.0 - 2020-04-27
+
+### Added
+
+- Improved the ARABIC function to also handle short-hand roman numerals
+- Added support for the FLOOR.MATH and FLOOR.PRECISE functions [#1351](https://github.com/PHPOffice/PhpSpreadsheet/pull/1351)
+
+### Fixed
+
+- Fix ROUNDUP and ROUNDDOWN for floating-point rounding error [#1404](https://github.com/PHPOffice/PhpSpreadsheet/pull/1404)
+- Fix ROUNDUP and ROUNDDOWN for negative number [#1417](https://github.com/PHPOffice/PhpSpreadsheet/pull/1417)
+- Fix loading styles from vmlDrawings when containing whitespace [#1347](https://github.com/PHPOffice/PhpSpreadsheet/issues/1347)
+- Fix incorrect behavior when removing last row [#1365](https://github.com/PHPOffice/PhpSpreadsheet/pull/1365)
+- MATCH with a static array should return the position of the found value based on the values submitted [#1332](https://github.com/PHPOffice/PhpSpreadsheet/pull/1332)
+- Fix Xlsx Reader's handling of undefined fill color [#1353](https://github.com/PHPOffice/PhpSpreadsheet/pull/1353)
+
+## 1.11.0 - 2020-03-02
+
+### Added
+
+- Added support for the BASE function
+- Added support for the ARABIC function
+- Conditionals - Extend Support for (NOT)CONTAINSBLANKS [#1278](https://github.com/PHPOffice/PhpSpreadsheet/pull/1278)
+
+### Fixed
+
+- Handle Error in Formula Processing Better for Xls [#1267](https://github.com/PHPOffice/PhpSpreadsheet/pull/1267)
+- Handle ConditionalStyle NumberFormat When Reading Xlsx File [#1296](https://github.com/PHPOffice/PhpSpreadsheet/pull/1296)
+- Fix Xlsx Writer's handling of decimal commas [#1282](https://github.com/PHPOffice/PhpSpreadsheet/pull/1282)
+- Fix for issue by removing test code mistakenly left in [#1328](https://github.com/PHPOffice/PhpSpreadsheet/pull/1328)
+- Fix for Xls writer wrong selected cells and active sheet [#1256](https://github.com/PHPOffice/PhpSpreadsheet/pull/1256)
+- Fix active cell when freeze pane is used [#1323](https://github.com/PHPOffice/PhpSpreadsheet/pull/1323)
+- Fix XLSX file loading with autofilter containing '$' [#1326](https://github.com/PHPOffice/PhpSpreadsheet/pull/1326)
+- PHPDoc - Use `@return $this` for fluent methods [#1362](https://github.com/PHPOffice/PhpSpreadsheet/pull/1362)
+
+## 1.10.1 - 2019-12-02
+
+### Changed
+
+- PHP 7.4 compatibility
+
+### Fixed
+
+- FLOOR() function accept negative number and negative significance [#1245](https://github.com/PHPOffice/PhpSpreadsheet/pull/1245)
+- Correct column style even when using rowspan [#1249](https://github.com/PHPOffice/PhpSpreadsheet/pull/1249)
+- Do not confuse defined names and cell refs [#1263](https://github.com/PHPOffice/PhpSpreadsheet/pull/1263)
+- XLSX reader/writer keep decimal for floats with a zero decimal part [#1262](https://github.com/PHPOffice/PhpSpreadsheet/pull/1262)
+- ODS writer prevent invalid numeric value if locale decimal separator is comma [#1268](https://github.com/PHPOffice/PhpSpreadsheet/pull/1268)
+- Xlsx writer actually writes plotVisOnly and dispBlanksAs from chart properties [#1266](https://github.com/PHPOffice/PhpSpreadsheet/pull/1266)
+
+## 1.10.0 - 2019-11-18
+
+### Changed
+
+- Change license from LGPL 2.1 to MIT [#140](https://github.com/PHPOffice/PhpSpreadsheet/issues/140)
+
+### Added
+
+- Implementation of IFNA() logical function
+- Support "showZeros" worksheet option to change how Excel shows and handles "null" values returned from a calculation
+- Allow HTML Reader to accept HTML as a string into an existing spreadsheet [#1212](https://github.com/PHPOffice/PhpSpreadsheet/pull/1212)
+
+### Fixed
+
+- IF implementation properly handles the value `#N/A` [#1165](https://github.com/PHPOffice/PhpSpreadsheet/pull/1165)
+- Formula Parser: Wrong line count for stuff like "MyOtherSheet!A:D" [#1215](https://github.com/PHPOffice/PhpSpreadsheet/issues/1215)
+- Call garbage collector after removing a column to prevent stale cached values
+- Trying to remove a column that doesn't exist deletes the latest column
+- Keep big integer as integer instead of lossely casting to float [#874](https://github.com/PHPOffice/PhpSpreadsheet/pull/874)
+- Fix branch pruning handling of non boolean conditions [#1167](https://github.com/PHPOffice/PhpSpreadsheet/pull/1167)
+- Fix ODS Reader when no DC namespace are defined [#1182](https://github.com/PHPOffice/PhpSpreadsheet/pull/1182)
+- Fixed Functions->ifCondition for allowing <> and empty condition [#1206](https://github.com/PHPOffice/PhpSpreadsheet/pull/1206)
+- Validate XIRR inputs and return correct error values [#1120](https://github.com/PHPOffice/PhpSpreadsheet/issues/1120)
+- Allow to read xlsx files with exotic workbook names like "workbook2.xml" [#1183](https://github.com/PHPOffice/PhpSpreadsheet/pull/1183)
+
+## 1.9.0 - 2019-08-17
+
+### Changed
+
+- Drop support for PHP 5.6 and 7.0, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support
+
+### Added
+
+- When &lt;br&gt; appears in a table cell, set the cell to wrap [#1071](https://github.com/PHPOffice/PhpSpreadsheet/issues/1071) and [#1070](https://github.com/PHPOffice/PhpSpreadsheet/pull/1070)
+- Add MAXIFS, MINIFS, COUNTIFS and Remove MINIF, MAXIF [#1056](https://github.com/PHPOffice/PhpSpreadsheet/issues/1056)
+- HLookup needs an ordered list even if range_lookup is set to false [#1055](https://github.com/PHPOffice/PhpSpreadsheet/issues/1055) and [#1076](https://github.com/PHPOffice/PhpSpreadsheet/pull/1076)
+- Improve performance of IF function calls via ranch pruning to avoid resolution of every branches [#844](https://github.com/PHPOffice/PhpSpreadsheet/pull/844)
+- MATCH function supports `*?~` Excel functionality, when match_type=0 [#1116](https://github.com/PHPOffice/PhpSpreadsheet/issues/1116)
+- Allow HTML Reader to accept HTML as a string [#1136](https://github.com/PHPOffice/PhpSpreadsheet/pull/1136)
+
+### Fixed
+
+- Fix to AVERAGEIF() function when called with a third argument
+- Eliminate duplicate fill none style entries [#1066](https://github.com/PHPOffice/PhpSpreadsheet/issues/1066)
+- Fix number format masks containing literal (non-decimal point) dots [#1079](https://github.com/PHPOffice/PhpSpreadsheet/issues/1079)
+- Fix number format masks containing named colours that were being misinterpreted as date formats; and add support for masks that fully replace the value with a full text string [#1009](https://github.com/PHPOffice/PhpSpreadsheet/issues/1009)
+- Stricter-typed comparison testing in COUNTIF() and COUNTIFS() evaluation [#1046](https://github.com/PHPOffice/PhpSpreadsheet/issues/1046)
+- COUPNUM should not return zero when settlement is in the last period [#1020](https://github.com/PHPOffice/PhpSpreadsheet/issues/1020) and [#1021](https://github.com/PHPOffice/PhpSpreadsheet/pull/1021)
+- Fix handling of named ranges referencing sheets with spaces or "!" in their title
+- Cover `getSheetByName()` with tests for name with quote and spaces [#739](https://github.com/PHPOffice/PhpSpreadsheet/issues/739)
+- Best effort to support invalid colspan values in HTML reader - [#878](https://github.com/PHPOffice/PhpSpreadsheet/pull/878)
+- Fixes incorrect rows deletion [#868](https://github.com/PHPOffice/PhpSpreadsheet/issues/868)
+- MATCH function fix (value search by type, stop search when match_type=-1 and unordered element encountered) [#1116](https://github.com/PHPOffice/PhpSpreadsheet/issues/1116)
+- Fix `getCalculatedValue()` error with more than two INDIRECT [#1115](https://github.com/PHPOffice/PhpSpreadsheet/pull/1115)
+- Writer\Html did not hide columns [#985](https://github.com/PHPOffice/PhpSpreadsheet/pull/985)
+
+## 1.8.2 - 2019-07-08
+
+### Fixed
+
+- Uncaught error when opening ods file and properties aren't defined [#1047](https://github.com/PHPOffice/PhpSpreadsheet/issues/1047)
+- Xlsx Reader Cell datavalidations bug [#1052](https://github.com/PHPOffice/PhpSpreadsheet/pull/1052)
+
+## 1.8.1 - 2019-07-02
+
+### Fixed
+
+- Allow nullable theme for Xlsx Style Reader class [#1043](https://github.com/PHPOffice/PhpSpreadsheet/issues/1043)
+
+## 1.8.0 - 2019-07-01
+
+### Security Fix (CVE-2019-12331)
+
+- Detect double-encoded xml in the Security scanner, and reject as suspicious.
+- This change also broadens the scope of the `libxml_disable_entity_loader` setting when reading XML-based formats, so that it is enabled while the xml is being parsed and not simply while it is loaded.
+  On some versions of PHP, this can cause problems because it is not thread-safe, and can affect other PHP scripts running on the same server. This flag is set to true when instantiating a loader, and back to its original setting when the Reader is no longer in scope, or manually unset.
+- Provide a check to identify whether libxml_disable_entity_loader is thread-safe or not.
+
+  `XmlScanner::threadSafeLibxmlDisableEntityLoaderAvailability()`
+- Provide an option to disable the libxml_disable_entity_loader call through settings. This is not recommended as it reduces the security of the XML-based readers, and should only be used if you understand the consequences and have no other choice.
+
+### Added
+
+- Added support for the SWITCH function [#963](https://github.com/PHPOffice/PhpSpreadsheet/issues/963) and [#983](https://github.com/PHPOffice/PhpSpreadsheet/pull/983)
+- Add accounting number format style [#974](https://github.com/PHPOffice/PhpSpreadsheet/pull/974)
+
+### Fixed
+
+- Whitelist `tsv` extension when opening CSV files [#429](https://github.com/PHPOffice/PhpSpreadsheet/issues/429)
+- Fix a SUMIF warning with some versions of PHP when having different length of arrays provided as input [#873](https://github.com/PHPOffice/PhpSpreadsheet/pull/873)
+- Fix incorrectly handled backslash-escaped space characters in number format
+
+## 1.7.0 - 2019-05-26
+
+- Added support for inline styles in Html reader (borders, alignment, width, height)
+- QuotedText cells no longer treated as formulae if the content begins with a `=`
+- Clean handling for DDE in formulae
+
+### Fixed
+
+- Fix handling for escaped enclosures and new lines in CSV Separator Inference
+- Fix MATCH an error was appearing when comparing strings against 0 (always true)
+- Fix wrong calculation of highest column with specified row [#700](https://github.com/PHPOffice/PhpSpreadsheet/issues/700)
+- Fix VLOOKUP
+- Fix return type hint
+
+## 1.6.0 - 2019-01-02
+
+### Added
+
+- Refactored Matrix Functions to use external Matrix library
+- Possibility to specify custom colors of values for pie and donut charts [#768](https://github.com/PHPOffice/PhpSpreadsheet/pull/768)
+
+### Fixed
+
+- Improve XLSX parsing speed if no readFilter is applied [#772](https://github.com/PHPOffice/PhpSpreadsheet/issues/772)
+- Fix column names if read filter calls in XLSX reader skip columns [#777](https://github.com/PHPOffice/PhpSpreadsheet/pull/777)
+- XLSX reader can now ignore blank cells, using the setReadEmptyCells(false) method. [#810](https://github.com/PHPOffice/PhpSpreadsheet/issues/810)
+- Fix LOOKUP function which was breaking on edge cases [#796](https://github.com/PHPOffice/PhpSpreadsheet/issues/796)
+- Fix VLOOKUP with exact matches [#809](https://github.com/PHPOffice/PhpSpreadsheet/pull/809)
+- Support COUNTIFS multiple arguments [#830](https://github.com/PHPOffice/PhpSpreadsheet/pull/830)
+- Change `libxml_disable_entity_loader()` as shortly as possible [#819](https://github.com/PHPOffice/PhpSpreadsheet/pull/819)
+- Improved memory usage and performance when loading large spreadsheets [#822](https://github.com/PHPOffice/PhpSpreadsheet/pull/822)
+- Improved performance when loading large spreadsheets [#825](https://github.com/PHPOffice/PhpSpreadsheet/pull/825)
+- Improved performance when loading large spreadsheets [#824](https://github.com/PHPOffice/PhpSpreadsheet/pull/824)
+- Fix color from CSS when reading from HTML [#831](https://github.com/PHPOffice/PhpSpreadsheet/pull/831)
+- Fix infinite loop when reading invalid ODS files [#832](https://github.com/PHPOffice/PhpSpreadsheet/pull/832)
+- Fix time format for duration is incorrect [#666](https://github.com/PHPOffice/PhpSpreadsheet/pull/666)
+- Fix iconv unsupported `//IGNORE//TRANSLIT` on IBM i [#791](https://github.com/PHPOffice/PhpSpreadsheet/issues/791)
+
+### Changed
+
+- `master` is the new default branch, `develop` does not exist anymore
+
+## 1.5.2 - 2018-11-25
+
+### Security
+
+- Improvements to the design of the XML Security Scanner [#771](https://github.com/PHPOffice/PhpSpreadsheet/issues/771)
+
+## 1.5.1 - 2018-11-20
+
+### Security
+
+- Fix and improve XXE security scanning for XML-based and HTML Readers [#771](https://github.com/PHPOffice/PhpSpreadsheet/issues/771)
+
+### Added
+
+- Support page margin in mPDF [#750](https://github.com/PHPOffice/PhpSpreadsheet/issues/750)
+
+### Fixed
+
+- Support numeric condition in SUMIF, SUMIFS, AVERAGEIF, COUNTIF, MAXIF and MINIF [#683](https://github.com/PHPOffice/PhpSpreadsheet/issues/683)
+- SUMIFS containing multiple conditions [#704](https://github.com/PHPOffice/PhpSpreadsheet/issues/704)
+- Csv reader avoid notice when the file is empty [#743](https://github.com/PHPOffice/PhpSpreadsheet/pull/743)
+- Fix print area parser for XLSX reader [#734](https://github.com/PHPOffice/PhpSpreadsheet/pull/734)
+- Support overriding `DefaultValueBinder::dataTypeForValue()` without overriding `DefaultValueBinder::bindValue()` [#735](https://github.com/PHPOffice/PhpSpreadsheet/pull/735)
+- Mpdf export can exceed pcre.backtrack_limit [#637](https://github.com/PHPOffice/PhpSpreadsheet/issues/637)
+- Fix index overflow on data values array [#748](https://github.com/PHPOffice/PhpSpreadsheet/pull/748)
+
+## 1.5.0 - 2018-10-21
+
+### Added
+
+- PHP 7.3 support
+- Add the DAYS() function [#594](https://github.com/PHPOffice/PhpSpreadsheet/pull/594)
+
+### Fixed
+
+- Sheet title can contain exclamation mark [#325](https://github.com/PHPOffice/PhpSpreadsheet/issues/325)
+- Xls file cause the exception during open by Xls reader [#402](https://github.com/PHPOffice/PhpSpreadsheet/issues/402)
+- Skip non numeric value in SUMIF [#618](https://github.com/PHPOffice/PhpSpreadsheet/pull/618)
+- OFFSET should allow omitted height and width [#561](https://github.com/PHPOffice/PhpSpreadsheet/issues/561)
+- Correctly determine delimiter when CSV contains line breaks inside enclosures [#716](https://github.com/PHPOffice/PhpSpreadsheet/issues/716)
+
+## 1.4.1 - 2018-09-30
+
+### Fixed
+
+- Remove locale from formatting string [#644](https://github.com/PHPOffice/PhpSpreadsheet/pull/644)
+- Allow iterators to go out of bounds with prev [#587](https://github.com/PHPOffice/PhpSpreadsheet/issues/587)
+- Fix warning when reading xlsx without styles [#631](https://github.com/PHPOffice/PhpSpreadsheet/pull/631)
+- Fix broken sample links on windows due to $baseDir having backslash [#653](https://github.com/PHPOffice/PhpSpreadsheet/pull/653)
+
+## 1.4.0 - 2018-08-06
+
+### Added
+
+- Add excel function EXACT(value1, value2) support [#595](https://github.com/PHPOffice/PhpSpreadsheet/pull/595)
+- Support workbook view attributes for Xlsx format [#523](https://github.com/PHPOffice/PhpSpreadsheet/issues/523)
+- Read and write hyperlink for drawing image [#490](https://github.com/PHPOffice/PhpSpreadsheet/pull/490)
+- Added calculation engine support for the new bitwise functions that were added in MS Excel 2013
+  - BITAND()          Returns a Bitwise 'And' of two numbers
+  - BITOR()           Returns a Bitwise 'Or' of two number
+  - BITXOR()          Returns a Bitwise 'Exclusive Or' of two numbers
+  - BITLSHIFT()       Returns a number shifted left by a specified number of bits
+  - BITRSHIFT()       Returns a number shifted right by a specified number of bits
+- Added calculation engine support for other new functions that were added in MS Excel 2013 and MS Excel 2016
+  - Text Functions
+    - CONCAT()        Synonym for CONCATENATE()
+    - NUMBERVALUE()   Converts text to a number, in a locale-independent way
+    - UNICHAR()       Synonym for CHAR() in PHPSpreadsheet, which has always used UTF-8 internally
+    - UNIORD()        Synonym for ORD() in PHPSpreadsheet, which has always used UTF-8 internally
+    - TEXTJOIN()      Joins together two or more text strings, separated by a delimiter
+  - Logical Functions
+    - XOR()           Returns a logical Exclusive Or of all arguments
+  - Date/Time Functions
+    - ISOWEEKNUM()    Returns the ISO 8601 week number of the year for a given date
+  - Lookup and Reference Functions
+    - FORMULATEXT()   Returns a formula as a string
+  - Financial Functions
+    - PDURATION()     Calculates the number of periods required for an investment to reach a specified value
+    - RRI()           Calculates the interest rate required for an investment to grow to a specified future value
+  - Engineering Functions
+    - ERF.PRECISE()   Returns the error function integrated between 0 and a supplied limit
+    - ERFC.PRECISE()  Synonym for ERFC
+  - Math and Trig Functions
+    - SEC()           Returns the secant of an angle
+    - SECH()          Returns the hyperbolic secant of an angle
+    - CSC()           Returns the cosecant of an angle
+    - CSCH()          Returns the hyperbolic cosecant of an angle
+    - COT()           Returns the cotangent of an angle
+    - COTH()          Returns the hyperbolic cotangent of an angle
+    - ACOT()          Returns the cotangent of an angle
+    - ACOTH()         Returns the hyperbolic cotangent of an angle
+- Refactored Complex Engineering Functions to use external complex number library
+- Added calculation engine support for the new complex number functions that were added in MS Excel 2013
+    - IMCOSH()        Returns the hyperbolic cosine of a complex number
+    - IMCOT()         Returns the cotangent of a complex number
+    - IMCSC()         Returns the cosecant of a complex number
+    - IMCSCH()        Returns the hyperbolic cosecant of a complex number
+    - IMSEC()         Returns the secant of a complex number
+    - IMSECH()        Returns the hyperbolic secant of a complex number
+    - IMSINH()        Returns the hyperbolic sine of a complex number
+    - IMTAN()         Returns the tangent of a complex number
+
+### Fixed
+
+- Fix ISFORMULA() function to work with a cell reference to another worksheet
+- Xlsx reader crashed when reading a file with workbook protection [#553](https://github.com/PHPOffice/PhpSpreadsheet/pull/553)
+- Cell formats with escaped spaces were causing incorrect date formatting [#557](https://github.com/PHPOffice/PhpSpreadsheet/issues/557)
+- Could not open CSV file containing HTML fragment [#564](https://github.com/PHPOffice/PhpSpreadsheet/issues/564)
+- Exclude the vendor folder in migration [#481](https://github.com/PHPOffice/PhpSpreadsheet/issues/481)
+- Chained operations on cell ranges involving borders operated on last cell only [#428](https://github.com/PHPOffice/PhpSpreadsheet/issues/428)
+- Avoid memory exhaustion when cloning worksheet with a drawing [#437](https://github.com/PHPOffice/PhpSpreadsheet/issues/437)
+- Migration tool keep variables containing $PHPExcel untouched [#598](https://github.com/PHPOffice/PhpSpreadsheet/issues/598)
+- Rowspans/colspans were incorrect when adding worksheet using loadIntoExisting [#619](https://github.com/PHPOffice/PhpSpreadsheet/issues/619)
+
+## 1.3.1 - 2018-06-12
+
+### Fixed
+
+- Ranges across Z and AA columns incorrectly threw an exception [#545](https://github.com/PHPOffice/PhpSpreadsheet/issues/545)
+
+## 1.3.0 - 2018-06-10
+
+### Added
+
+- Support to read Xlsm templates with form elements, macros, printer settings, protected elements and back compatibility drawing, and save result without losing important elements of document [#435](https://github.com/PHPOffice/PhpSpreadsheet/issues/435)
+- Expose sheet title maximum length as `Worksheet::SHEET_TITLE_MAXIMUM_LENGTH` [#482](https://github.com/PHPOffice/PhpSpreadsheet/issues/482)
+- Allow escape character to be set in CSV reader [#492](https://github.com/PHPOffice/PhpSpreadsheet/issues/492)
+
+### Fixed
+
+- Subtotal 9 in a group that has other subtotals 9 exclude the totals of the other subtotals in the range [#332](https://github.com/PHPOffice/PhpSpreadsheet/issues/332)
+- `Helper\Html` support UTF-8 HTML input [#444](https://github.com/PHPOffice/PhpSpreadsheet/issues/444)
+- Xlsx loaded an extra empty comment for each real comment [#375](https://github.com/PHPOffice/PhpSpreadsheet/issues/375)
+- Xlsx reader do not read rows and columns filtered out in readFilter at all [#370](https://github.com/PHPOffice/PhpSpreadsheet/issues/370)
+- Make newer Excel versions properly recalculate formulas on document open [#456](https://github.com/PHPOffice/PhpSpreadsheet/issues/456)
+- `Coordinate::extractAllCellReferencesInRange()` throws an exception for an invalid range [#519](https://github.com/PHPOffice/PhpSpreadsheet/issues/519)
+- Fixed parsing of conditionals in COUNTIF functions [#526](https://github.com/PHPOffice/PhpSpreadsheet/issues/526)
+- Corruption errors for saved Xlsx docs with frozen panes [#532](https://github.com/PHPOffice/PhpSpreadsheet/issues/532)
+
+## 1.2.1 - 2018-04-10
+
+### Fixed
+
+- Plain text and richtext mixed in same cell can be read [#442](https://github.com/PHPOffice/PhpSpreadsheet/issues/442)
+
+## 1.2.0 - 2018-03-04
+
+### Added
+
+- HTML writer creates a generator meta tag [#312](https://github.com/PHPOffice/PhpSpreadsheet/issues/312)
+- Support invalid zoom value in XLSX format [#350](https://github.com/PHPOffice/PhpSpreadsheet/pull/350)
+- Support for `_xlfn.` prefixed functions and `ISFORMULA`, `MODE.SNGL`, `STDEV.S`, `STDEV.P` [#390](https://github.com/PHPOffice/PhpSpreadsheet/pull/390)
+
+### Fixed
+
+- Avoid potentially unsupported PSR-16 cache keys [#354](https://github.com/PHPOffice/PhpSpreadsheet/issues/354)
+- Check for MIME type to know if CSV reader can read a file [#167](https://github.com/PHPOffice/PhpSpreadsheet/issues/167)
+- Use proper € symbol for currency format [#379](https://github.com/PHPOffice/PhpSpreadsheet/pull/379)
+- Read printing area correctly when skipping some sheets [#371](https://github.com/PHPOffice/PhpSpreadsheet/issues/371)
+- Avoid incorrectly overwriting calculated value type [#394](https://github.com/PHPOffice/PhpSpreadsheet/issues/394)
+- Select correct cell when calling freezePane [#389](https://github.com/PHPOffice/PhpSpreadsheet/issues/389)
+- `setStrikethrough()` did not set the font [#403](https://github.com/PHPOffice/PhpSpreadsheet/issues/403)
+
+## 1.1.0 - 2018-01-28
+
+### Added
+
+- Support for PHP 7.2
+- Support cell comments in HTML writer and reader [#308](https://github.com/PHPOffice/PhpSpreadsheet/issues/308)
+- Option to stop at a conditional styling, if it matches (only XLSX format) [#292](https://github.com/PHPOffice/PhpSpreadsheet/pull/292)
+- Support for line width for data series when rendering Xlsx [#329](https://github.com/PHPOffice/PhpSpreadsheet/pull/329)
+
+### Fixed
+
+- Better auto-detection of CSV separators [#305](https://github.com/PHPOffice/PhpSpreadsheet/issues/305)
+- Support for shape style ending with `;` [#304](https://github.com/PHPOffice/PhpSpreadsheet/issues/304)
+- Freeze Panes takes wrong coordinates for XLSX [#322](https://github.com/PHPOffice/PhpSpreadsheet/issues/322)
+- `COLUMNS` and `ROWS` functions crashed in some cases [#336](https://github.com/PHPOffice/PhpSpreadsheet/issues/336)
+- Support XML file without styles [#331](https://github.com/PHPOffice/PhpSpreadsheet/pull/331)
+- Cell coordinates which are already a range cause an exception [#319](https://github.com/PHPOffice/PhpSpreadsheet/issues/319)
+
+## 1.0.0 - 2017-12-25
+
+### Added
+
+- Support to write merged cells in ODS format [#287](https://github.com/PHPOffice/PhpSpreadsheet/issues/287)
+- Able to set the `topLeftCell` in freeze panes [#261](https://github.com/PHPOffice/PhpSpreadsheet/pull/261)
+- Support `DateTimeImmutable` as cell value
+- Support migration of prefixed classes
+
+### Fixed
+
+- Can read very small HTML files [#194](https://github.com/PHPOffice/PhpSpreadsheet/issues/194)
+- Written DataValidation was corrupted [#290](https://github.com/PHPOffice/PhpSpreadsheet/issues/290)
+- Date format compatible with both LibreOffice and Excel [#298](https://github.com/PHPOffice/PhpSpreadsheet/issues/298)
+
+### BREAKING CHANGE
+
+- Constant `TYPE_DOUGHTNUTCHART` is now `TYPE_DOUGHNUTCHART`.
+
+## 1.0.0-beta2 - 2017-11-26
+
+### Added
+
+- Support for chart fill color - @CrazyBite [#158](https://github.com/PHPOffice/PhpSpreadsheet/pull/158)
+- Support for read Hyperlink for xml - @GreatHumorist [#223](https://github.com/PHPOffice/PhpSpreadsheet/pull/223)
+- Support for cell value validation according to data validation rules - @SailorMax [#257](https://github.com/PHPOffice/PhpSpreadsheet/pull/257)
+- Support for custom implementation, or configuration, of PDF libraries - @SailorMax [#266](https://github.com/PHPOffice/PhpSpreadsheet/pull/266)
+
+### Changed
+
+- Merge data-validations to reduce written worksheet size - @billblume [#131](https://github.com/PHPOffice/PhpSpreadSheet/issues/131)
+- Throws exception if a XML file is invalid - @GreatHumorist [#222](https://github.com/PHPOffice/PhpSpreadsheet/pull/222)
+- Upgrade to mPDF 7.0+ [#144](https://github.com/PHPOffice/PhpSpreadsheet/issues/144)
+
+### Fixed
+
+- Control characters in cell values are automatically escaped [#212](https://github.com/PHPOffice/PhpSpreadsheet/issues/212)
+- Prevent color changing when copy/pasting xls files written by PhpSpreadsheet to another file - @al-lala [#218](https://github.com/PHPOffice/PhpSpreadsheet/issues/218)
+- Add cell reference automatic when there is no cell reference('r' attribute) in Xlsx file. - @GreatHumorist [#225](https://github.com/PHPOffice/PhpSpreadsheet/pull/225) Refer to [#201](https://github.com/PHPOffice/PhpSpreadsheet/issues/201)
+- `Reader\Xlsx::getFromZipArchive()` function return false if the zip entry could not be located. - @anton-harvey [#268](https://github.com/PHPOffice/PhpSpreadsheet/pull/268)
+
+### BREAKING CHANGE
+
+- Extracted coordinate method to dedicate class [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Column indexes are based on 1, see the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Standardization of array keys used for style, see the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Easier usage of PDF writers, and other custom readers and writers, see the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Easier usage of chart renderers, see the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+- Rename a few more classes to keep them in their related namespaces:
+    - `CalcEngine` => `Calculation\Engine`
+    - `PhpSpreadsheet\Calculation` => `PhpSpreadsheet\Calculation\Calculation`
+    - `PhpSpreadsheet\Cell` => `PhpSpreadsheet\Cell\Cell`
+    - `PhpSpreadsheet\Chart` => `PhpSpreadsheet\Chart\Chart`
+    - `PhpSpreadsheet\RichText` => `PhpSpreadsheet\RichText\RichText`
+    - `PhpSpreadsheet\Style` => `PhpSpreadsheet\Style\Style`
+    - `PhpSpreadsheet\Worksheet` => `PhpSpreadsheet\Worksheet\Worksheet`
+
+## 1.0.0-beta - 2017-08-17
+
+### Added
+
+- Initial implementation of SUMIFS() function
+- Additional codepages
+- MemoryDrawing not working in HTML writer [#808](https://github.com/PHPOffice/PHPExcel/issues/808)
+- CSV Reader can auto-detect the separator used in file [#141](https://github.com/PHPOffice/PhpSpreadsheet/pull/141)
+- HTML Reader supports some basic inline styles [#180](https://github.com/PHPOffice/PhpSpreadsheet/pull/180)
+
+### Changed
+
+- Start following [SemVer](https://semver.org) properly.
+
+### Fixed
+
+- Fix to getCell() method when cell reference includes a worksheet reference - @MarkBaker
+- Ignore inlineStr type if formula element exists - @ncrypthic [#570](https://github.com/PHPOffice/PHPExcel/issues/570)
+- Excel 2007 Reader freezes because of conditional formatting - @rentalhost [#575](https://github.com/PHPOffice/PHPExcel/issues/575)
+- Readers will now parse files containing worksheet titles over 31 characters [#176](https://github.com/PHPOffice/PhpSpreadsheet/pull/176)
+- Fixed PHP8 deprecation warning for libxml_disable_entity_loader() [#1625](https://github.com/phpoffice/phpspreadsheet/pull/1625)
+
+### General
+
+- Whitespace after toRichTextObject() - @MarkBaker [#554](https://github.com/PHPOffice/PHPExcel/issues/554)
+- Optimize vlookup() sort - @umpirsky [#548](https://github.com/PHPOffice/PHPExcel/issues/548)
+- c:max and c:min elements shall NOT be inside c:orientation elements - @vitalyrepin [#869](https://github.com/PHPOffice/PHPExcel/pull/869)
+- Implement actual timezone adjustment into PHPExcel_Shared_Date::PHPToExcel - @sim642 [#489](https://github.com/PHPOffice/PHPExcel/pull/489)
+
+### BREAKING CHANGE
+
+- Introduction of namespaces for all classes, eg: `PHPExcel_Calculation_Functions` becomes `PhpOffice\PhpSpreadsheet\Calculation\Functions`
+- Some classes were renamed for clarity and/or consistency:
+
+For a comprehensive list of all class changes, and a semi-automated migration path, read the [migration guide](./docs/topics/migration-from-PHPExcel.md).
+
+- Dropped `PHPExcel_Calculation_Functions::VERSION()`. Composer or git should be used to know the version.
+- Dropped `PHPExcel_Settings::setPdfRenderer()` and `PHPExcel_Settings::setPdfRenderer()`. Composer should be used to autoload PDF libs.
+- Dropped support for HHVM
+
+## Previous versions of PHPExcel
+
+The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
+
+### Changed
+- Replace ezyang/htmlpurifier (LGPL2.1) with voku/anti-xss (MIT)
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md b/src/Common/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md
new file mode 100644
index 00000000..e89e99ec
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md
@@ -0,0 +1,45 @@
+# Want to contribute?
+
+If you would like to contribute, here are some notes and guidelines:
+
+ - All new development should be on feature/fix branches, which are then merged to the `master` branch once stable and approved; so the `master` branch is always the most up-to-date, working code
+ - If you are going to submit a pull request, please fork from `master`, and submit your pull request back as a fix/feature branch referencing the GitHub issue number
+ - The code must work with all PHP versions that we support.
+   - You can call `composer versions` to test version compatibility. 
+ - Code style should be maintained.
+   - `composer style` will identify any issues with Coding Style`.
+   - `composer fix` will fix most issues with Coding Style.
+ - All code changes must be validated by `composer check`.
+ - Please include Unit Tests to verify that a bug exists, and that this PR fixes it.
+ - Please include Unit Tests to show that a new Feature works as expected.
+ - Please don't "bundle" several changes into a single PR; submit a PR for each discrete change/fix.
+ - Remember to update documentation if necessary.
+
+ - [Helpful article about forking](https://help.github.com/articles/fork-a-repo/ "Forking a GitHub repository")
+ - [Helpful article about pull requests](https://help.github.com/articles/using-pull-requests/ "Pull Requests")
+
+## Unit Tests
+
+When writing Unit Tests, please
+ - Always try to write Unit Tests for both the happy and unhappy paths.
+ - Put all assertions in the Test itself, not in an abstract class that the Test extends (even if this means code duplication between tests).
+ - Include any necessary `setup()` and `tearDown()` in the Test itself.
+ - If you change any global settings (such as system locale, or Compatibility Mode for Excel Function tests), make sure that you reset to the default in the `tearDown()`.
+ - Use the `ExcelError` functions in assertions for Excel Error values in Excel Function implementations.
+   <br />Not only does it reduce the risk of typos; but at some point in the future, ExcelError values will be an object rather than a string, and we won't then need to update all the tests.
+ - Don't over-complicate test code by testing happy and unhappy paths in the same test.
+
+This makes it easier to see exactly what is being tested when reviewing the PR. I want to be able to see it in the PR, not have to hunt in other unchanged classes to see what the test is doing.
+
+## How to release
+
+1. Complete CHANGELOG.md and commit
+2. Create an annotated tag
+    1. `git tag -a 1.2.3`
+    2. Tag subject must be the version number, eg: `1.2.3`
+    3. Tag body must be a copy-paste of the changelog entries.
+3. Push the tag with `git push --tags`, GitHub Actions will create a GitHub release automatically, and the release details will automatically be sent to packagist.
+4. Github seems to remove markdown headings in the Release Notes, so you should edit to restore these.
+
+> **Note:** Tagged releases are made from the `master` branch. Only in an emergency should a tagged release be made from the `release` branch. (i.e. cherry-picked hot-fixes.)
+
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/LICENSE b/src/Common/vendor/phpoffice/phpspreadsheet/LICENSE
new file mode 100644
index 00000000..3ec5723d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 PhpSpreadsheet Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/README.md b/src/Common/vendor/phpoffice/phpspreadsheet/README.md
new file mode 100644
index 00000000..84b4b7be
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/README.md
@@ -0,0 +1,70 @@
+# PhpSpreadsheet
+
+[![Build Status](https://github.com/PHPOffice/PhpSpreadsheet/workflows/main/badge.svg)](https://github.com/PHPOffice/PhpSpreadsheet/actions)
+[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
+[![Total Downloads](https://img.shields.io/packagist/dt/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![Latest Stable Version](https://img.shields.io/github/v/release/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![License](https://img.shields.io/github/license/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![Join the chat at https://gitter.im/PHPOffice/PhpSpreadsheet](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PhpSpreadsheet)
+
+PhpSpreadsheet is a library written in pure PHP and offers a set of classes that
+allow you to read and write various spreadsheet file formats such as Excel and LibreOffice Calc.
+
+## Installation
+
+See the [install instructions](https://phpspreadsheet.readthedocs.io/en/latest/#installation).
+
+## Documentation
+
+Read more about it, including install instructions, in the [official documentation](https://phpspreadsheet.readthedocs.io). Or check out the [API documentation](https://phpoffice.github.io/PhpSpreadsheet).
+
+Please ask your support questions on [StackOverflow](https://stackoverflow.com/questions/tagged/phpspreadsheet), or have a quick chat on [Gitter](https://gitter.im/PHPOffice/PhpSpreadsheet).
+
+## Patreon
+
+I am now running a [Patreon](https://www.patreon.com/MarkBaker) to support the work that I do on PhpSpreadsheet.
+
+Supporters will receive access to articles about working with PhpSpreadsheet, and how to use some of its more advanced features.
+
+Posts already available to Patreon supporters:
+ - The Dating Game
+   - A  look at how MS Excel (and PhpSpreadsheet) handle date and time values.
+- Looping the Loop
+    - Advice on Iterating through the rows and cells in a worksheet.
+
+And for Patrons at levels actively using PhpSpreadsheet:
+ - Behind the Mask
+   - A look at Number Format Masks.
+
+The Next Article (currently Work in Progress):
+ - Formula for Success
+   - How to debug formulae that don't produce the expected result.
+
+
+My aim is to post at least one article each month, taking a detailed look at some feature of MS Excel and how to use that feature in PhpSpreadsheet, or on how to perform different activities in PhpSpreadsheet.
+
+Planned posts for the future include topics like:
+ - Tables
+ - Structured References
+ - AutoFiltering
+ - Array Formulae
+ - Conditional Formatting
+ - Data Validation
+ - Value Binders
+ - Images
+ - Charts
+
+After a period of six months exclusive to Patreon supporters, articles will be incorporated into the public documentation for the library.
+
+## PHPExcel vs PhpSpreadsheet ?
+
+PhpSpreadsheet is the next version of PHPExcel. It breaks compatibility to dramatically improve the code base quality (namespaces, PSR compliance, use of latest PHP language features, etc.).
+
+Because all efforts have shifted to PhpSpreadsheet, PHPExcel will no longer be maintained. All contributions for PHPExcel, patches and new features, should target PhpSpreadsheet `master` branch.
+
+Do you need to migrate? There is [an automated tool](/docs/topics/migration-from-PHPExcel.md) for that.
+
+## License
+
+PhpSpreadsheet is licensed under [MIT](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/LICENSE).
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/composer.json b/src/Common/vendor/phpoffice/phpspreadsheet/composer.json
new file mode 100644
index 00000000..a823d237
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/composer.json
@@ -0,0 +1,120 @@
+{
+    "name": "phpoffice/phpspreadsheet",
+    "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+    "keywords": [
+        "PHP",
+        "OpenXML",
+        "Excel",
+        "xlsx",
+        "xls",
+        "ods",
+        "gnumeric",
+        "spreadsheet"
+    ],
+    "config": {
+        "platform": {
+            "php" : "8.1.99"
+        },
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
+    "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Maarten Balliauw",
+            "homepage": "https://blog.maartenballiauw.be"
+        },
+        {
+            "name": "Mark Baker",
+            "homepage": "https://markbakeruk.net"
+        },
+        {
+            "name": "Franck Lefevre",
+            "homepage": "https://rootslabs.net"
+        },
+        {
+            "name": "Erik Tilt"
+        },
+        {
+            "name": "Adrien Crivelli"
+        }
+    ],
+    "scripts": {
+        "check": [
+            "./bin/check-phpdoc-types",
+            "phpcs samples/ src/ tests/ --report=checkstyle",
+            "phpcs samples/ src/ tests/ --standard=PHPCompatibility --runtime-set testVersion 8.0- -n",
+            "php-cs-fixer fix --ansi --dry-run --diff",
+            "phpunit --color=always",
+            "phpstan analyse --ansi --memory-limit=2048M"
+        ],
+        "style": [
+            "phpcs samples/ src/ tests/ --report=checkstyle",
+            "php-cs-fixer fix --ansi --dry-run --diff"
+        ],
+        "fix": [
+            "phpcbf samples/ src/ tests/ --report=checkstyle",
+            "php-cs-fixer fix"
+        ],
+        "versions": [
+            "phpcs samples/ src/ tests/ --standard=PHPCompatibility --runtime-set testVersion 8.0- -n"
+        ]
+    },
+    "require": {
+        "php": "^8.1",
+        "ext-ctype": "*",
+        "ext-dom": "*",
+        "ext-fileinfo": "*",
+        "ext-gd": "*",
+        "ext-iconv": "*",
+        "ext-libxml": "*",
+        "ext-mbstring": "*",
+        "ext-simplexml": "*",
+        "ext-xml": "*",
+        "ext-xmlreader": "*",
+        "ext-xmlwriter": "*",
+        "ext-zip": "*",
+        "ext-zlib": "*",
+        "maennchen/zipstream-php": "^2.1 || ^3.0",
+        "markbaker/complex": "^3.0",
+        "markbaker/matrix": "^3.0",
+        "psr/http-client": "^1.0",
+        "psr/http-factory": "^1.0",
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
+    },
+    "require-dev": {
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+        "dompdf/dompdf": "^2.0 || ^3.0",
+        "friendsofphp/php-cs-fixer": "^3.2",
+        "mitoteam/jpgraph": "^10.3",
+        "mpdf/mpdf": "^8.1.1",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "phpstan/phpstan": "^1.1",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpunit/phpunit": "^9.6 || ^10.5",
+        "squizlabs/php_codesniffer": "^3.7",
+        "tecnickcom/tcpdf": "^6.5"
+    },
+    "suggest": {
+        "ext-intl": "PHP Internationalization Functions",
+        "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
+        "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer",
+        "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
+    },
+    "autoload": {
+        "psr-4": {
+            "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "PhpOffice\\PhpSpreadsheetTests\\": "tests/PhpSpreadsheetTests",
+            "PhpOffice\\PhpSpreadsheetInfra\\": "infra"
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon b/src/Common/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon
new file mode 100644
index 00000000..364905f7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon
@@ -0,0 +1,2 @@
+parameters:
+	ignoreErrors:
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist b/src/Common/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist
new file mode 100644
index 00000000..06fbbcdd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist
@@ -0,0 +1,29 @@
+includes:
+    - phpstan-baseline.neon
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-phpunit/rules.neon
+
+parameters:
+    level: 8
+    paths:
+        - samples/
+        - src/
+        - tests/
+        - infra/
+        - bin/generate-document
+        - bin/generate-locales
+        - bin/check-phpdoc-types
+    excludePaths:
+        - src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+        - src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
+        - src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
+        - src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
+        - src/PhpSpreadsheet/Writer/ZipStream2.php
+        - src/PhpSpreadsheet/Writer/ZipStream3.php
+    parallel:
+        processTimeout: 300.0
+    ignoreErrors:
+        # Accept a bit anything for assert methods
+        - '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'
+        - '~^Variable \$helper might not be defined\.$~'
+        - identifier: missingType.iterableValue
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/phpunit9.xml.dist b/src/Common/vendor/phpoffice/phpspreadsheet/phpunit9.xml.dist
new file mode 100644
index 00000000..896b7333
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/phpunit9.xml.dist
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="./tests/bootstrap.php" backupGlobals="true" colors="true" cacheResultFile="/tmp/.phpspreadsheet.phpunit.result.cache" convertDeprecationsToExceptions="true">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="memory_limit" value="2048M"/>
+    <ini name="error_reporting" value="E_ALL"/>
+  </php>
+  <testsuite name="PhpSpreadsheet Unit Test Suite">
+    <directory>./tests/PhpSpreadsheetTests</directory>
+  </testsuite>
+</phpunit>
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php
new file mode 100644
index 00000000..7b78b6f5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\ArrayArgumentHelper;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\ArrayArgumentProcessor;
+
+trait ArrayEnabled
+{
+    private static bool $initializationNeeded = true;
+
+    private static ArrayArgumentHelper $arrayArgumentHelper;
+
+    /**
+     * @param array|false $arguments Can be changed to array for Php8.1+
+     */
+    private static function initialiseHelper($arguments): void
+    {
+        if (self::$initializationNeeded === true) {
+            self::$arrayArgumentHelper = new ArrayArgumentHelper();
+            self::$initializationNeeded = false;
+        }
+        self::$arrayArgumentHelper->initialise(($arguments === false) ? [] : $arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts a single argument that can be an array argument.
+     * Example use for:
+     *         DAYOFMONTH() or FACT().
+     */
+    protected static function evaluateSingleArgumentArray(callable $method, array $values): array
+    {
+        $result = [];
+        foreach ($values as $value) {
+            $result[] = $method($value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     and any of them can be an array argument.
+     * Example use for:
+     *         ROUND() or DATE().
+     */
+    protected static function evaluateArrayArguments(callable $method, mixed ...$arguments): array
+    {
+        self::initialiseHelper($arguments);
+        $arguments = self::$arrayArgumentHelper->arguments();
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     but only the first few (up to limit) can be an array arguments.
+     * Example use for:
+     *         NETWORKDAYS() or CONCATENATE(), where the last argument is a matrix (or a series of values) that need
+     *                                         to be treated as a such rather than as an array arguments.
+     */
+    protected static function evaluateArrayArgumentsSubset(callable $method, int $limit, mixed ...$arguments): array
+    {
+        self::initialiseHelper(array_slice($arguments, 0, $limit));
+        $trailingArguments = array_slice($arguments, $limit);
+        $arguments = self::$arrayArgumentHelper->arguments();
+        $arguments = array_merge($arguments, $trailingArguments);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    private static function testFalse(mixed $value): bool
+    {
+        return $value === false;
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     but only the last few (from start) can be an array arguments.
+     * Example use for:
+     *         Z.TEST() or INDEX(), where the first argument 1 is a matrix that needs to be treated as a dataset
+     *                   rather than as an array argument.
+     */
+    protected static function evaluateArrayArgumentsSubsetFrom(callable $method, int $start, mixed ...$arguments): array
+    {
+        $arrayArgumentsSubset = array_combine(
+            range($start, count($arguments) - $start),
+            array_slice($arguments, $start)
+        );
+        if (self::testFalse($arrayArgumentsSubset)) {
+            return ['#VALUE!'];
+        }
+
+        self::initialiseHelper($arrayArgumentsSubset);
+        $leadingArguments = array_slice($arguments, 0, $start);
+        $arguments = self::$arrayArgumentHelper->arguments();
+        $arguments = array_merge($leadingArguments, $arguments);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     and any of them can be an array argument except for the one specified by ignore.
+     * Example use for:
+     *         HLOOKUP() and VLOOKUP(), where argument 1 is a matrix that needs to be treated as a database
+     *                                  rather than as an array argument.
+     */
+    protected static function evaluateArrayArgumentsIgnore(callable $method, int $ignore, mixed ...$arguments): array
+    {
+        $leadingArguments = array_slice($arguments, 0, $ignore);
+        $ignoreArgument = array_slice($arguments, $ignore, 1);
+        $trailingArguments = array_slice($arguments, $ignore + 1);
+
+        self::initialiseHelper(array_merge($leadingArguments, [[null]], $trailingArguments));
+        $arguments = self::$arrayArgumentHelper->arguments();
+
+        array_splice($arguments, $ignore, 1, $ignoreArgument);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php
new file mode 100644
index 00000000..e4bc156a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class BinaryComparison
+{
+    /**
+     * Epsilon Precision used for comparisons in calculations.
+     */
+    private const DELTA = 0.1e-12;
+
+    /**
+     * Compare two strings in the same way as strcmp() except that lowercase come before uppercase letters.
+     *
+     * @param null|string $str1 First string value for the comparison
+     * @param null|string $str2 Second string value for the comparison
+     */
+    private static function strcmpLowercaseFirst(?string $str1, ?string $str2): int
+    {
+        $inversedStr1 = StringHelper::strCaseReverse($str1 ?? '');
+        $inversedStr2 = StringHelper::strCaseReverse($str2 ?? '');
+
+        return strcmp($inversedStr1, $inversedStr2);
+    }
+
+    /**
+     * PHP8.1 deprecates passing null to strcmp.
+     *
+     * @param null|string $str1 First string value for the comparison
+     * @param null|string $str2 Second string value for the comparison
+     */
+    private static function strcmpAllowNull(?string $str1, ?string $str2): int
+    {
+        return strcmp($str1 ?? '', $str2 ?? '');
+    }
+
+    public static function compare(mixed $operand1, mixed $operand2, string $operator): bool
+    {
+        //    Simple validate the two operands if they are string values
+        if (is_string($operand1) && $operand1 > '' && $operand1[0] == Calculation::FORMULA_STRING_QUOTE) {
+            $operand1 = Calculation::unwrapResult($operand1);
+        }
+        if (is_string($operand2) && $operand2 > '' && $operand2[0] == Calculation::FORMULA_STRING_QUOTE) {
+            $operand2 = Calculation::unwrapResult($operand2);
+        }
+
+        // Use case insensitive comparaison if not OpenOffice mode
+        if (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) {
+            if (is_string($operand1)) {
+                $operand1 = StringHelper::strToUpper($operand1);
+            }
+            if (is_string($operand2)) {
+                $operand2 = StringHelper::strToUpper($operand2);
+            }
+        }
+
+        $useLowercaseFirstComparison = is_string($operand1)
+            && is_string($operand2)
+            && Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE;
+
+        return self::evaluateComparison($operand1, $operand2, $operator, $useLowercaseFirstComparison);
+    }
+
+    private static function evaluateComparison(mixed $operand1, mixed $operand2, string $operator, bool $useLowercaseFirstComparison): bool
+    {
+        return match ($operator) {
+            '=' => self::equal($operand1, $operand2),
+            '>' => self::greaterThan($operand1, $operand2, $useLowercaseFirstComparison),
+            '<' => self::lessThan($operand1, $operand2, $useLowercaseFirstComparison),
+            '>=' => self::greaterThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison),
+            '<=' => self::lessThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison),
+            '<>' => self::notEqual($operand1, $operand2),
+            default => throw new Exception('Unsupported binary comparison operator'),
+        };
+    }
+
+    private static function equal(mixed $operand1, mixed $operand2): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = (abs($operand1 - $operand2) < self::DELTA);
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 == $operand2;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) == 0;
+        }
+
+        return $result;
+    }
+
+    private static function greaterThanOrEqual(mixed $operand1, mixed $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = ((abs($operand1 - $operand2) < self::DELTA) || ($operand1 > $operand2));
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 >= $operand2;
+        } elseif ($useLowercaseFirstComparison) {
+            $result = self::strcmpLowercaseFirst($operand1, $operand2) >= 0;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) >= 0;
+        }
+
+        return $result;
+    }
+
+    private static function lessThanOrEqual(mixed $operand1, mixed $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = ((abs($operand1 - $operand2) < self::DELTA) || ($operand1 < $operand2));
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 <= $operand2;
+        } elseif ($useLowercaseFirstComparison) {
+            $result = self::strcmpLowercaseFirst($operand1, $operand2) <= 0;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) <= 0;
+        }
+
+        return $result;
+    }
+
+    private static function greaterThan(mixed $operand1, mixed $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        return self::lessThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison) !== true;
+    }
+
+    private static function lessThan(mixed $operand1, mixed $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        return self::greaterThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison) !== true;
+    }
+
+    private static function notEqual(mixed $operand1, mixed $operand2): bool
+    {
+        return self::equal($operand1, $operand2) !== true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php
new file mode 100644
index 00000000..d372005a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -0,0 +1,5679 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\BranchPruner;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\CyclicReferenceStack;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\Logger;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\Operands;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Token\Stack;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\ReferenceHelper;
+use PhpOffice\PhpSpreadsheet\Shared;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use ReflectionClassConstant;
+use ReflectionMethod;
+use ReflectionParameter;
+use Throwable;
+
+class Calculation
+{
+    /** Constants                */
+    /** Regular Expressions        */
+    //    Numeric operand
+    const CALCULATION_REGEXP_NUMBER = '[-+]?\d*\.?\d+(e[-+]?\d+)?';
+    //    String operand
+    const CALCULATION_REGEXP_STRING = '"(?:[^"]|"")*"';
+    //    Opening bracket
+    const CALCULATION_REGEXP_OPENBRACE = '\(';
+    //    Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
+    const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?(?:_xlws\.)?([\p{L}][\p{L}\p{N}\.]*)[\s]*\(';
+    //    Strip xlfn and xlws prefixes from function name
+    const CALCULATION_REGEXP_STRIP_XLFN_XLWS = '/(_xlfn[.])?(_xlws[.])?(?=[\p{L}][\p{L}\p{N}\.]*[\s]*[(])/';
+    //    Cell reference (cell or range of cells, with or without a sheet reference)
+    const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
+    //    Cell reference (with or without a sheet reference) ensuring absolute/relative
+    const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
+    const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\".(?:[^\"]|\"[^!])?\"))!)?(\$?[a-z]{1,3})):(?![.*])';
+    const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
+    //    Cell reference (with or without a sheet reference) ensuring absolute/relative
+    //    Cell ranges ensuring absolute/relative
+    const CALCULATION_REGEXP_COLUMNRANGE_RELATIVE = '(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
+    const CALCULATION_REGEXP_ROWRANGE_RELATIVE = '(\$?\d{1,7}):(\$?\d{1,7})';
+    //    Defined Names: Named Range of cells, or Named Formulae
+    const CALCULATION_REGEXP_DEFINEDNAME = '((([^\s,!&%^\/\*\+<>=-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?([_\p{L}][_\p{L}\p{N}\.]*)';
+    // Structured Reference (Fully Qualified and Unqualified)
+    const CALCULATION_REGEXP_STRUCTURED_REFERENCE = '([\p{L}_\\\\][\p{L}\p{N}\._]+)?(\[(?:[^\d\]+-])?)';
+    //    Error
+    const CALCULATION_REGEXP_ERROR = '\#[A-Z][A-Z0_\/]*[!\?]?';
+
+    /** constants */
+    const RETURN_ARRAY_AS_ERROR = 'error';
+    const RETURN_ARRAY_AS_VALUE = 'value';
+    const RETURN_ARRAY_AS_ARRAY = 'array';
+
+    const FORMULA_OPEN_FUNCTION_BRACE = '(';
+    const FORMULA_CLOSE_FUNCTION_BRACE = ')';
+    const FORMULA_OPEN_MATRIX_BRACE = '{';
+    const FORMULA_CLOSE_MATRIX_BRACE = '}';
+    const FORMULA_STRING_QUOTE = '"';
+
+    private static string $returnArrayAsType = self::RETURN_ARRAY_AS_VALUE;
+
+    /**
+     * Instance of this class.
+     *
+     * @var ?Calculation
+     */
+    private static ?Calculation $instance = null;
+
+    /**
+     * Instance of the spreadsheet this Calculation Engine is using.
+     */
+    private ?Spreadsheet $spreadsheet;
+
+    /**
+     * Calculation cache.
+     */
+    private array $calculationCache = [];
+
+    /**
+     * Calculation cache enabled.
+     */
+    private bool $calculationCacheEnabled = true;
+
+    private BranchPruner $branchPruner;
+
+    private bool $branchPruningEnabled = true;
+
+    /**
+     * List of operators that can be used within formulae
+     * The true/false value indicates whether it is a binary operator or a unary operator.
+     */
+    private const CALCULATION_OPERATORS = [
+        '+' => true, '-' => true, '*' => true, '/' => true,
+        '^' => true, '&' => true, '%' => false, '~' => false,
+        '>' => true, '<' => true, '=' => true, '>=' => true,
+        '<=' => true, '<>' => true, '∩' => true, '∪' => true,
+        ':' => true,
+    ];
+
+    /**
+     * List of binary operators (those that expect two operands).
+     */
+    private const BINARY_OPERATORS = [
+        '+' => true, '-' => true, '*' => true, '/' => true,
+        '^' => true, '&' => true, '>' => true, '<' => true,
+        '=' => true, '>=' => true, '<=' => true, '<>' => true,
+        '∩' => true, '∪' => true, ':' => true,
+    ];
+
+    /**
+     * The debug log generated by the calculation engine.
+     */
+    private Logger $debugLog;
+
+    private bool $suppressFormulaErrors = false;
+
+    /**
+     * Error message for any error that was raised/thrown by the calculation engine.
+     */
+    public ?string $formulaError = null;
+
+    /**
+     * Reference Helper.
+     */
+    private static ReferenceHelper $referenceHelper;
+
+    /**
+     * An array of the nested cell references accessed by the calculation engine, used for the debug log.
+     */
+    private CyclicReferenceStack $cyclicReferenceStack;
+
+    private array $cellStack = [];
+
+    /**
+     * Current iteration counter for cyclic formulae
+     * If the value is 0 (or less) then cyclic formulae will throw an exception,
+     * otherwise they will iterate to the limit defined here before returning a result.
+     */
+    private int $cyclicFormulaCounter = 1;
+
+    private string $cyclicFormulaCell = '';
+
+    /**
+     * Number of iterations for cyclic formulae.
+     */
+    public int $cyclicFormulaCount = 1;
+
+    /**
+     * The current locale setting.
+     */
+    private static string $localeLanguage = 'en_us'; //    US English    (default locale)
+
+    /**
+     * List of available locale settings
+     * Note that this is read for the locale subdirectory only when requested.
+     *
+     * @var string[]
+     */
+    private static array $validLocaleLanguages = [
+        'en', //    English        (default language)
+    ];
+
+    /**
+     * Locale-specific argument separator for function arguments.
+     */
+    private static string $localeArgumentSeparator = ',';
+
+    private static array $localeFunctions = [];
+
+    /**
+     * Locale-specific translations for Excel constants (True, False and Null).
+     *
+     * @var array<string, string>
+     */
+    private static array $localeBoolean = [
+        'TRUE' => 'TRUE',
+        'FALSE' => 'FALSE',
+        'NULL' => 'NULL',
+    ];
+
+    public static function getLocaleBoolean(string $index): string
+    {
+        return self::$localeBoolean[$index];
+    }
+
+    /**
+     * Excel constant string translations to their PHP equivalents
+     * Constant conversion from text name/value to actual (datatyped) value.
+     *
+     * @var array<string, null|bool>
+     */
+    private static array $excelConstants = [
+        'TRUE' => true,
+        'FALSE' => false,
+        'NULL' => null,
+    ];
+
+    public static function keyInExcelConstants(string $key): bool
+    {
+        return array_key_exists($key, self::$excelConstants);
+    }
+
+    public static function getExcelConstants(string $key): bool|null
+    {
+        return self::$excelConstants[$key];
+    }
+
+    /**
+     * Array of functions usable on Spreadsheet.
+     * In theory, this could be const rather than static;
+     *   however, Phpstan breaks trying to analyze it when attempted.
+     */
+    private static array $phpSpreadsheetFunctions = [
+        'ABS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Absolute::class, 'evaluate'],
+            'argumentCount' => '1',
+        ],
+        'ACCRINT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\AccruedInterest::class, 'periodic'],
+            'argumentCount' => '4-8',
+        ],
+        'ACCRINTM' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\AccruedInterest::class, 'atMaturity'],
+            'argumentCount' => '3-5',
+        ],
+        'ACOS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cosine::class, 'acos'],
+            'argumentCount' => '1',
+        ],
+        'ACOSH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cosine::class, 'acosh'],
+            'argumentCount' => '1',
+        ],
+        'ACOT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cotangent::class, 'acot'],
+            'argumentCount' => '1',
+        ],
+        'ACOTH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cotangent::class, 'acoth'],
+            'argumentCount' => '1',
+        ],
+        'ADDRESS' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Address::class, 'cell'],
+            'argumentCount' => '2-5',
+        ],
+        'AGGREGATE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3+',
+        ],
+        'AMORDEGRC' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Amortization::class, 'AMORDEGRC'],
+            'argumentCount' => '6,7',
+        ],
+        'AMORLINC' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Amortization::class, 'AMORLINC'],
+            'argumentCount' => '6,7',
+        ],
+        'ANCHORARRAY' => [
+            'category' => Category::CATEGORY_UNCATEGORISED,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'AND' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Operations::class, 'logicalAnd'],
+            'argumentCount' => '1+',
+        ],
+        'ARABIC' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Arabic::class, 'evaluate'],
+            'argumentCount' => '1',
+        ],
+        'AREAS' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
+        'ARRAYTOTEXT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Text::class, 'fromArray'],
+            'argumentCount' => '1,2',
+        ],
+        'ASC' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
+        'ASIN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Sine::class, 'asin'],
+            'argumentCount' => '1',
+        ],
+        'ASINH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Sine::class, 'asinh'],
+            'argumentCount' => '1',
+        ],
+        'ATAN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'atan'],
+            'argumentCount' => '1',
+        ],
+        'ATAN2' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'atan2'],
+            'argumentCount' => '2',
+        ],
+        'ATANH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'atanh'],
+            'argumentCount' => '1',
+        ],
+        'AVEDEV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages::class, 'averageDeviations'],
+            'argumentCount' => '1+',
+        ],
+        'AVERAGE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages::class, 'average'],
+            'argumentCount' => '1+',
+        ],
+        'AVERAGEA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages::class, 'averageA'],
+            'argumentCount' => '1+',
+        ],
+        'AVERAGEIF' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Conditional::class, 'AVERAGEIF'],
+            'argumentCount' => '2,3',
+        ],
+        'AVERAGEIFS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Conditional::class, 'AVERAGEIFS'],
+            'argumentCount' => '3+',
+        ],
+        'BAHTTEXT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
+        'BASE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Base::class, 'evaluate'],
+            'argumentCount' => '2,3',
+        ],
+        'BESSELI' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BesselI::class, 'BESSELI'],
+            'argumentCount' => '2',
+        ],
+        'BESSELJ' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BesselJ::class, 'BESSELJ'],
+            'argumentCount' => '2',
+        ],
+        'BESSELK' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BesselK::class, 'BESSELK'],
+            'argumentCount' => '2',
+        ],
+        'BESSELY' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BesselY::class, 'BESSELY'],
+            'argumentCount' => '2',
+        ],
+        'BETADIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Beta::class, 'distribution'],
+            'argumentCount' => '3-5',
+        ],
+        'BETA.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4-6',
+        ],
+        'BETAINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Beta::class, 'inverse'],
+            'argumentCount' => '3-5',
+        ],
+        'BETA.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Beta::class, 'inverse'],
+            'argumentCount' => '3-5',
+        ],
+        'BIN2DEC' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertBinary::class, 'toDecimal'],
+            'argumentCount' => '1',
+        ],
+        'BIN2HEX' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertBinary::class, 'toHex'],
+            'argumentCount' => '1,2',
+        ],
+        'BIN2OCT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertBinary::class, 'toOctal'],
+            'argumentCount' => '1,2',
+        ],
+        'BINOMDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'BINOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'BINOM.DIST.RANGE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'range'],
+            'argumentCount' => '3,4',
+        ],
+        'BINOM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'BITAND' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BitWise::class, 'BITAND'],
+            'argumentCount' => '2',
+        ],
+        'BITOR' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BitWise::class, 'BITOR'],
+            'argumentCount' => '2',
+        ],
+        'BITXOR' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BitWise::class, 'BITXOR'],
+            'argumentCount' => '2',
+        ],
+        'BITLSHIFT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BitWise::class, 'BITLSHIFT'],
+            'argumentCount' => '2',
+        ],
+        'BITRSHIFT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\BitWise::class, 'BITRSHIFT'],
+            'argumentCount' => '2',
+        ],
+        'BYCOL' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'BYROW' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'CEILING' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Ceiling::class, 'ceiling'],
+            'argumentCount' => '1-2', // 2 for Excel, 1-2 for Ods/Gnumeric
+        ],
+        'CEILING.MATH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Ceiling::class, 'math'],
+            'argumentCount' => '1-3',
+        ],
+        'CEILING.PRECISE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Ceiling::class, 'precise'],
+            'argumentCount' => '1,2',
+        ],
+        'CELL' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1,2',
+        ],
+        'CHAR' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\CharacterConvert::class, 'character'],
+            'argumentCount' => '1',
+        ],
+        'CHIDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'distributionRightTail'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'distributionLeftTail'],
+            'argumentCount' => '3',
+        ],
+        'CHISQ.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'distributionRightTail'],
+            'argumentCount' => '2',
+        ],
+        'CHIINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'inverseRightTail'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'inverseLeftTail'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.INV.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'inverseRightTail'],
+            'argumentCount' => '2',
+        ],
+        'CHITEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'test'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\ChiSquared::class, 'test'],
+            'argumentCount' => '2',
+        ],
+        'CHOOSE' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Selection::class, 'CHOOSE'],
+            'argumentCount' => '2+',
+        ],
+        'CHOOSECOLS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2+',
+        ],
+        'CHOOSEROWS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2+',
+        ],
+        'CLEAN' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Trim::class, 'nonPrintable'],
+            'argumentCount' => '1',
+        ],
+        'CODE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\CharacterConvert::class, 'code'],
+            'argumentCount' => '1',
+        ],
+        'COLUMN' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\RowColumnInformation::class, 'COLUMN'],
+            'argumentCount' => '-1',
+            'passCellReference' => true,
+            'passByReference' => [true],
+        ],
+        'COLUMNS' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\RowColumnInformation::class, 'COLUMNS'],
+            'argumentCount' => '1',
+        ],
+        'COMBIN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Combinations::class, 'withoutRepetition'],
+            'argumentCount' => '2',
+        ],
+        'COMBINA' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Combinations::class, 'withRepetition'],
+            'argumentCount' => '2',
+        ],
+        'COMPLEX' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\Complex::class, 'COMPLEX'],
+            'argumentCount' => '2,3',
+        ],
+        'CONCAT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Concatenate::class, 'CONCATENATE'],
+            'argumentCount' => '1+',
+        ],
+        'CONCATENATE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Concatenate::class, 'CONCATENATE'],
+            'argumentCount' => '1+',
+        ],
+        'CONFIDENCE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Confidence::class, 'CONFIDENCE'],
+            'argumentCount' => '3',
+        ],
+        'CONFIDENCE.NORM' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Confidence::class, 'CONFIDENCE'],
+            'argumentCount' => '3',
+        ],
+        'CONFIDENCE.T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'CONVERT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertUOM::class, 'CONVERT'],
+            'argumentCount' => '3',
+        ],
+        'CORREL' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'CORREL'],
+            'argumentCount' => '2',
+        ],
+        'COS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cosine::class, 'cos'],
+            'argumentCount' => '1',
+        ],
+        'COSH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cosine::class, 'cosh'],
+            'argumentCount' => '1',
+        ],
+        'COT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cotangent::class, 'cot'],
+            'argumentCount' => '1',
+        ],
+        'COTH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cotangent::class, 'coth'],
+            'argumentCount' => '1',
+        ],
+        'COUNT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Counts::class, 'COUNT'],
+            'argumentCount' => '1+',
+        ],
+        'COUNTA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Counts::class, 'COUNTA'],
+            'argumentCount' => '1+',
+        ],
+        'COUNTBLANK' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Counts::class, 'COUNTBLANK'],
+            'argumentCount' => '1',
+        ],
+        'COUNTIF' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Conditional::class, 'COUNTIF'],
+            'argumentCount' => '2',
+        ],
+        'COUNTIFS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Conditional::class, 'COUNTIFS'],
+            'argumentCount' => '2+',
+        ],
+        'COUPDAYBS' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Coupons::class, 'COUPDAYBS'],
+            'argumentCount' => '3,4',
+        ],
+        'COUPDAYS' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Coupons::class, 'COUPDAYS'],
+            'argumentCount' => '3,4',
+        ],
+        'COUPDAYSNC' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Coupons::class, 'COUPDAYSNC'],
+            'argumentCount' => '3,4',
+        ],
+        'COUPNCD' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Coupons::class, 'COUPNCD'],
+            'argumentCount' => '3,4',
+        ],
+        'COUPNUM' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Coupons::class, 'COUPNUM'],
+            'argumentCount' => '3,4',
+        ],
+        'COUPPCD' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Coupons::class, 'COUPPCD'],
+            'argumentCount' => '3,4',
+        ],
+        'COVAR' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'COVAR'],
+            'argumentCount' => '2',
+        ],
+        'COVARIANCE.P' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'COVAR'],
+            'argumentCount' => '2',
+        ],
+        'COVARIANCE.S' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'CRITBINOM' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'CSC' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cosecant::class, 'csc'],
+            'argumentCount' => '1',
+        ],
+        'CSCH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Cosecant::class, 'csch'],
+            'argumentCount' => '1',
+        ],
+        'CUBEKPIMEMBER' => [
+            'category' => Category::CATEGORY_CUBE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'CUBEMEMBER' => [
+            'category' => Category::CATEGORY_CUBE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'CUBEMEMBERPROPERTY' => [
+            'category' => Category::CATEGORY_CUBE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'CUBERANKEDMEMBER' => [
+            'category' => Category::CATEGORY_CUBE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'CUBESET' => [
+            'category' => Category::CATEGORY_CUBE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'CUBESETCOUNT' => [
+            'category' => Category::CATEGORY_CUBE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'CUBEVALUE' => [
+            'category' => Category::CATEGORY_CUBE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'CUMIPMT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Cumulative::class, 'interest'],
+            'argumentCount' => '6',
+        ],
+        'CUMPRINC' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Cumulative::class, 'principal'],
+            'argumentCount' => '6',
+        ],
+        'DATE' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Date::class, 'fromYMD'],
+            'argumentCount' => '3',
+        ],
+        'DATEDIF' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Difference::class, 'interval'],
+            'argumentCount' => '2,3',
+        ],
+        'DATESTRING' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'DATEVALUE' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\DateValue::class, 'fromString'],
+            'argumentCount' => '1',
+        ],
+        'DAVERAGE' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DAverage::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DAY' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\DateParts::class, 'day'],
+            'argumentCount' => '1',
+        ],
+        'DAYS' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Days::class, 'between'],
+            'argumentCount' => '2',
+        ],
+        'DAYS360' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Days360::class, 'between'],
+            'argumentCount' => '2,3',
+        ],
+        'DB' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Depreciation::class, 'DB'],
+            'argumentCount' => '4,5',
+        ],
+        'DBCS' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
+        'DCOUNT' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DCount::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DCOUNTA' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DCountA::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DDB' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Depreciation::class, 'DDB'],
+            'argumentCount' => '4,5',
+        ],
+        'DEC2BIN' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertDecimal::class, 'toBinary'],
+            'argumentCount' => '1,2',
+        ],
+        'DEC2HEX' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertDecimal::class, 'toHex'],
+            'argumentCount' => '1,2',
+        ],
+        'DEC2OCT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertDecimal::class, 'toOctal'],
+            'argumentCount' => '1,2',
+        ],
+        'DECIMAL' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'DEGREES' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Angle::class, 'toDegrees'],
+            'argumentCount' => '1',
+        ],
+        'DELTA' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\Compare::class, 'DELTA'],
+            'argumentCount' => '1,2',
+        ],
+        'DEVSQ' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Deviations::class, 'sumSquares'],
+            'argumentCount' => '1+',
+        ],
+        'DGET' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DGet::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DISC' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\Rates::class, 'discount'],
+            'argumentCount' => '4,5',
+        ],
+        'DMAX' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DMax::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DMIN' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DMin::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DOLLAR' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Format::class, 'DOLLAR'],
+            'argumentCount' => '1,2',
+        ],
+        'DOLLARDE' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Dollar::class, 'decimal'],
+            'argumentCount' => '2',
+        ],
+        'DOLLARFR' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Dollar::class, 'fractional'],
+            'argumentCount' => '2',
+        ],
+        'DPRODUCT' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DProduct::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DROP' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-3',
+        ],
+        'DSTDEV' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DStDev::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DSTDEVP' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DStDevP::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DSUM' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DSum::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DURATION' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '5,6',
+        ],
+        'DVAR' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DVar::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'DVARP' => [
+            'category' => Category::CATEGORY_DATABASE,
+            'functionCall' => [Database\DVarP::class, 'evaluate'],
+            'argumentCount' => '3',
+        ],
+        'ECMA.CEILING' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1,2',
+        ],
+        'EDATE' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Month::class, 'adjust'],
+            'argumentCount' => '2',
+        ],
+        'EFFECT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\InterestRate::class, 'effective'],
+            'argumentCount' => '2',
+        ],
+        'ENCODEURL' => [
+            'category' => Category::CATEGORY_WEB,
+            'functionCall' => [Web\Service::class, 'urlEncode'],
+            'argumentCount' => '1',
+        ],
+        'EOMONTH' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Month::class, 'lastDay'],
+            'argumentCount' => '2',
+        ],
+        'ERF' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\Erf::class, 'ERF'],
+            'argumentCount' => '1,2',
+        ],
+        'ERF.PRECISE' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\Erf::class, 'ERFPRECISE'],
+            'argumentCount' => '1',
+        ],
+        'ERFC' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ErfC::class, 'ERFC'],
+            'argumentCount' => '1',
+        ],
+        'ERFC.PRECISE' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ErfC::class, 'ERFC'],
+            'argumentCount' => '1',
+        ],
+        'ERROR.TYPE' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [ExcelError::class, 'type'],
+            'argumentCount' => '1',
+        ],
+        'EVEN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Round::class, 'even'],
+            'argumentCount' => '1',
+        ],
+        'EXACT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Text::class, 'exact'],
+            'argumentCount' => '2',
+        ],
+        'EXP' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Exp::class, 'evaluate'],
+            'argumentCount' => '1',
+        ],
+        'EXPAND' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-4',
+        ],
+        'EXPONDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Exponential::class, 'distribution'],
+            'argumentCount' => '3',
+        ],
+        'EXPON.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Exponential::class, 'distribution'],
+            'argumentCount' => '3',
+        ],
+        'FACT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Factorial::class, 'fact'],
+            'argumentCount' => '1',
+        ],
+        'FACTDOUBLE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Factorial::class, 'factDouble'],
+            'argumentCount' => '1',
+        ],
+        'FALSE' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Boolean::class, 'FALSE'],
+            'argumentCount' => '0',
+        ],
+        'FDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'F.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\F::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'F.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'FILTER' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Filter::class, 'filter'],
+            'argumentCount' => '2-3',
+        ],
+        'FILTERXML' => [
+            'category' => Category::CATEGORY_WEB,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'FIND' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Search::class, 'sensitive'],
+            'argumentCount' => '2,3',
+        ],
+        'FINDB' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Search::class, 'sensitive'],
+            'argumentCount' => '2,3',
+        ],
+        'FINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'F.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'F.INV.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'FISHER' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Fisher::class, 'distribution'],
+            'argumentCount' => '1',
+        ],
+        'FISHERINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Fisher::class, 'inverse'],
+            'argumentCount' => '1',
+        ],
+        'FIXED' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Format::class, 'FIXEDFORMAT'],
+            'argumentCount' => '1-3',
+        ],
+        'FLOOR' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Floor::class, 'floor'],
+            'argumentCount' => '1-2', // Excel requries 2, Ods/Gnumeric 1-2
+        ],
+        'FLOOR.MATH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Floor::class, 'math'],
+            'argumentCount' => '1-3',
+        ],
+        'FLOOR.PRECISE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Floor::class, 'precise'],
+            'argumentCount' => '1-2',
+        ],
+        'FORECAST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'FORECAST'],
+            'argumentCount' => '3',
+        ],
+        'FORECAST.ETS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.ETS.CONFINT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.ETS.SEASONALITY' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-4',
+        ],
+        'FORECAST.ETS.STAT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.LINEAR' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'FORECAST'],
+            'argumentCount' => '3',
+        ],
+        'FORMULATEXT' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Formula::class, 'text'],
+            'argumentCount' => '1',
+            'passCellReference' => true,
+            'passByReference' => [true],
+        ],
+        'FREQUENCY' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'FTEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'F.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'FV' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic::class, 'futureValue'],
+            'argumentCount' => '3-5',
+        ],
+        'FVSCHEDULE' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Single::class, 'futureValue'],
+            'argumentCount' => '2',
+        ],
+        'GAMMA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'gamma'],
+            'argumentCount' => '1',
+        ],
+        'GAMMADIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'GAMMA.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'GAMMAINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'GAMMA.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'GAMMALN' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'ln'],
+            'argumentCount' => '1',
+        ],
+        'GAMMALN.PRECISE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Gamma::class, 'ln'],
+            'argumentCount' => '1',
+        ],
+        'GAUSS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'gauss'],
+            'argumentCount' => '1',
+        ],
+        'GCD' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Gcd::class, 'evaluate'],
+            'argumentCount' => '1+',
+        ],
+        'GEOMEAN' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages\Mean::class, 'geometric'],
+            'argumentCount' => '1+',
+        ],
+        'GESTEP' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\Compare::class, 'GESTEP'],
+            'argumentCount' => '1,2',
+        ],
+        'GETPIVOTDATA' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2+',
+        ],
+        'GROWTH' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'GROWTH'],
+            'argumentCount' => '1-4',
+        ],
+        'HARMEAN' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages\Mean::class, 'harmonic'],
+            'argumentCount' => '1+',
+        ],
+        'HEX2BIN' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertHex::class, 'toBinary'],
+            'argumentCount' => '1,2',
+        ],
+        'HEX2DEC' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertHex::class, 'toDecimal'],
+            'argumentCount' => '1',
+        ],
+        'HEX2OCT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertHex::class, 'toOctal'],
+            'argumentCount' => '1,2',
+        ],
+        'HLOOKUP' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\HLookup::class, 'lookup'],
+            'argumentCount' => '3,4',
+        ],
+        'HOUR' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\TimeParts::class, 'hour'],
+            'argumentCount' => '1',
+        ],
+        'HSTACK' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
+        'HYPERLINK' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Hyperlink::class, 'set'],
+            'argumentCount' => '1,2',
+            'passCellReference' => true,
+        ],
+        'HYPGEOMDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\HyperGeometric::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'HYPGEOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '5',
+        ],
+        'IF' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Conditional::class, 'statementIf'],
+            'argumentCount' => '2-3',
+        ],
+        'IFERROR' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Conditional::class, 'IFERROR'],
+            'argumentCount' => '2',
+        ],
+        'IFNA' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Conditional::class, 'IFNA'],
+            'argumentCount' => '2',
+        ],
+        'IFS' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Conditional::class, 'IFS'],
+            'argumentCount' => '2+',
+        ],
+        'IMABS' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMABS'],
+            'argumentCount' => '1',
+        ],
+        'IMAGINARY' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\Complex::class, 'IMAGINARY'],
+            'argumentCount' => '1',
+        ],
+        'IMARGUMENT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMARGUMENT'],
+            'argumentCount' => '1',
+        ],
+        'IMCONJUGATE' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCONJUGATE'],
+            'argumentCount' => '1',
+        ],
+        'IMCOS' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCOS'],
+            'argumentCount' => '1',
+        ],
+        'IMCOSH' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCOSH'],
+            'argumentCount' => '1',
+        ],
+        'IMCOT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCOT'],
+            'argumentCount' => '1',
+        ],
+        'IMCSC' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCSC'],
+            'argumentCount' => '1',
+        ],
+        'IMCSCH' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMCSCH'],
+            'argumentCount' => '1',
+        ],
+        'IMDIV' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexOperations::class, 'IMDIV'],
+            'argumentCount' => '2',
+        ],
+        'IMEXP' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMEXP'],
+            'argumentCount' => '1',
+        ],
+        'IMLN' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMLN'],
+            'argumentCount' => '1',
+        ],
+        'IMLOG10' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMLOG10'],
+            'argumentCount' => '1',
+        ],
+        'IMLOG2' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMLOG2'],
+            'argumentCount' => '1',
+        ],
+        'IMPOWER' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMPOWER'],
+            'argumentCount' => '2',
+        ],
+        'IMPRODUCT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexOperations::class, 'IMPRODUCT'],
+            'argumentCount' => '1+',
+        ],
+        'IMREAL' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\Complex::class, 'IMREAL'],
+            'argumentCount' => '1',
+        ],
+        'IMSEC' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSEC'],
+            'argumentCount' => '1',
+        ],
+        'IMSECH' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSECH'],
+            'argumentCount' => '1',
+        ],
+        'IMSIN' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSIN'],
+            'argumentCount' => '1',
+        ],
+        'IMSINH' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSINH'],
+            'argumentCount' => '1',
+        ],
+        'IMSQRT' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMSQRT'],
+            'argumentCount' => '1',
+        ],
+        'IMSUB' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexOperations::class, 'IMSUB'],
+            'argumentCount' => '2',
+        ],
+        'IMSUM' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexOperations::class, 'IMSUM'],
+            'argumentCount' => '1+',
+        ],
+        'IMTAN' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ComplexFunctions::class, 'IMTAN'],
+            'argumentCount' => '1',
+        ],
+        'INDEX' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Matrix::class, 'index'],
+            'argumentCount' => '2-4',
+        ],
+        'INDIRECT' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Indirect::class, 'INDIRECT'],
+            'argumentCount' => '1,2',
+            'passCellReference' => true,
+        ],
+        'INFO' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
+        'INT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\IntClass::class, 'evaluate'],
+            'argumentCount' => '1',
+        ],
+        'INTERCEPT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'INTERCEPT'],
+            'argumentCount' => '2',
+        ],
+        'INTRATE' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\Rates::class, 'interest'],
+            'argumentCount' => '4,5',
+        ],
+        'IPMT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Interest::class, 'payment'],
+            'argumentCount' => '4-6',
+        ],
+        'IRR' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Variable\Periodic::class, 'rate'],
+            'argumentCount' => '1,2',
+        ],
+        'ISBLANK' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isBlank'],
+            'argumentCount' => '1',
+        ],
+        'ISERR' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\ErrorValue::class, 'isErr'],
+            'argumentCount' => '1',
+        ],
+        'ISERROR' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\ErrorValue::class, 'isError'],
+            'argumentCount' => '1',
+        ],
+        'ISEVEN' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isEven'],
+            'argumentCount' => '1',
+        ],
+        'ISFORMULA' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isFormula'],
+            'argumentCount' => '1',
+            'passCellReference' => true,
+            'passByReference' => [true],
+        ],
+        'ISLOGICAL' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isLogical'],
+            'argumentCount' => '1',
+        ],
+        'ISNA' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\ErrorValue::class, 'isNa'],
+            'argumentCount' => '1',
+        ],
+        'ISNONTEXT' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isNonText'],
+            'argumentCount' => '1',
+        ],
+        'ISNUMBER' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isNumber'],
+            'argumentCount' => '1',
+        ],
+        'ISO.CEILING' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1,2',
+        ],
+        'ISODD' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isOdd'],
+            'argumentCount' => '1',
+        ],
+        'ISOMITTED' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'ISOWEEKNUM' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Week::class, 'isoWeekNumber'],
+            'argumentCount' => '1',
+        ],
+        'ISPMT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Interest::class, 'schedulePayment'],
+            'argumentCount' => '4',
+        ],
+        'ISREF' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isRef'],
+            'argumentCount' => '1',
+            'passCellReference' => true,
+            'passByReference' => [true],
+        ],
+        'ISTEXT' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'isText'],
+            'argumentCount' => '1',
+        ],
+        'ISTHAIDIGIT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'JIS' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
+        'KURT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Deviations::class, 'kurtosis'],
+            'argumentCount' => '1+',
+        ],
+        'LAMBDA' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'LARGE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Size::class, 'large'],
+            'argumentCount' => '2',
+        ],
+        'LCM' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Lcm::class, 'evaluate'],
+            'argumentCount' => '1+',
+        ],
+        'LEFT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'left'],
+            'argumentCount' => '1,2',
+        ],
+        'LEFTB' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'left'],
+            'argumentCount' => '1,2',
+        ],
+        'LEN' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Text::class, 'length'],
+            'argumentCount' => '1',
+        ],
+        'LENB' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Text::class, 'length'],
+            'argumentCount' => '1',
+        ],
+        'LET' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'LINEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'LINEST'],
+            'argumentCount' => '1-4',
+        ],
+        'LN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Logarithms::class, 'natural'],
+            'argumentCount' => '1',
+        ],
+        'LOG' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Logarithms::class, 'withBase'],
+            'argumentCount' => '1,2',
+        ],
+        'LOG10' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Logarithms::class, 'base10'],
+            'argumentCount' => '1',
+        ],
+        'LOGEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'LOGEST'],
+            'argumentCount' => '1-4',
+        ],
+        'LOGINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\LogNormal::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'LOGNORMDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\LogNormal::class, 'cumulative'],
+            'argumentCount' => '3',
+        ],
+        'LOGNORM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\LogNormal::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'LOGNORM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\LogNormal::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'LOOKUP' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Lookup::class, 'lookup'],
+            'argumentCount' => '2,3',
+        ],
+        'LOWER' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\CaseConvert::class, 'lower'],
+            'argumentCount' => '1',
+        ],
+        'MAKEARRAY' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'MAP' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'MATCH' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\ExcelMatch::class, 'MATCH'],
+            'argumentCount' => '2,3',
+        ],
+        'MAX' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Maximum::class, 'max'],
+            'argumentCount' => '1+',
+        ],
+        'MAXA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Maximum::class, 'maxA'],
+            'argumentCount' => '1+',
+        ],
+        'MAXIFS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Conditional::class, 'MAXIFS'],
+            'argumentCount' => '3+',
+        ],
+        'MDETERM' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'determinant'],
+            'argumentCount' => '1',
+        ],
+        'MDURATION' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '5,6',
+        ],
+        'MEDIAN' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages::class, 'median'],
+            'argumentCount' => '1+',
+        ],
+        'MEDIANIF' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2+',
+        ],
+        'MID' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'mid'],
+            'argumentCount' => '3',
+        ],
+        'MIDB' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'mid'],
+            'argumentCount' => '3',
+        ],
+        'MIN' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Minimum::class, 'min'],
+            'argumentCount' => '1+',
+        ],
+        'MINA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Minimum::class, 'minA'],
+            'argumentCount' => '1+',
+        ],
+        'MINIFS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Conditional::class, 'MINIFS'],
+            'argumentCount' => '3+',
+        ],
+        'MINUTE' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\TimeParts::class, 'minute'],
+            'argumentCount' => '1',
+        ],
+        'MINVERSE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'inverse'],
+            'argumentCount' => '1',
+        ],
+        'MIRR' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Variable\Periodic::class, 'modifiedRate'],
+            'argumentCount' => '3',
+        ],
+        'MMULT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'multiply'],
+            'argumentCount' => '2',
+        ],
+        'MOD' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Operations::class, 'mod'],
+            'argumentCount' => '2',
+        ],
+        'MODE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages::class, 'mode'],
+            'argumentCount' => '1+',
+        ],
+        'MODE.MULT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
+        'MODE.SNGL' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages::class, 'mode'],
+            'argumentCount' => '1+',
+        ],
+        'MONTH' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\DateParts::class, 'month'],
+            'argumentCount' => '1',
+        ],
+        'MROUND' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Round::class, 'multiple'],
+            'argumentCount' => '2',
+        ],
+        'MULTINOMIAL' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Factorial::class, 'multinomial'],
+            'argumentCount' => '1+',
+        ],
+        'MUNIT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'identity'],
+            'argumentCount' => '1',
+        ],
+        'N' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'asNumber'],
+            'argumentCount' => '1',
+        ],
+        'NA' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [ExcelError::class, 'NA'],
+            'argumentCount' => '0',
+        ],
+        'NEGBINOMDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Binomial::class, 'negative'],
+            'argumentCount' => '3',
+        ],
+        'NEGBINOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
+        'NETWORKDAYS' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\NetworkDays::class, 'count'],
+            'argumentCount' => '2-3',
+        ],
+        'NETWORKDAYS.INTL' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-4',
+        ],
+        'NOMINAL' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\InterestRate::class, 'nominal'],
+            'argumentCount' => '2',
+        ],
+        'NORMDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Normal::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'NORM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Normal::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'NORMINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Normal::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'NORM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Normal::class, 'inverse'],
+            'argumentCount' => '3',
+        ],
+        'NORMSDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'cumulative'],
+            'argumentCount' => '1',
+        ],
+        'NORM.S.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'distribution'],
+            'argumentCount' => '1,2',
+        ],
+        'NORMSINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'inverse'],
+            'argumentCount' => '1',
+        ],
+        'NORM.S.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'inverse'],
+            'argumentCount' => '1',
+        ],
+        'NOT' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Operations::class, 'NOT'],
+            'argumentCount' => '1',
+        ],
+        'NOW' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Current::class, 'now'],
+            'argumentCount' => '0',
+        ],
+        'NPER' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic::class, 'periods'],
+            'argumentCount' => '3-5',
+        ],
+        'NPV' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Variable\Periodic::class, 'presentValue'],
+            'argumentCount' => '2+',
+        ],
+        'NUMBERSTRING' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'NUMBERVALUE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Format::class, 'NUMBERVALUE'],
+            'argumentCount' => '1+',
+        ],
+        'OCT2BIN' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertOctal::class, 'toBinary'],
+            'argumentCount' => '1,2',
+        ],
+        'OCT2DEC' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertOctal::class, 'toDecimal'],
+            'argumentCount' => '1',
+        ],
+        'OCT2HEX' => [
+            'category' => Category::CATEGORY_ENGINEERING,
+            'functionCall' => [Engineering\ConvertOctal::class, 'toHex'],
+            'argumentCount' => '1,2',
+        ],
+        'ODD' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Round::class, 'odd'],
+            'argumentCount' => '1',
+        ],
+        'ODDFPRICE' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '8,9',
+        ],
+        'ODDFYIELD' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '8,9',
+        ],
+        'ODDLPRICE' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '7,8',
+        ],
+        'ODDLYIELD' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '7,8',
+        ],
+        'OFFSET' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Offset::class, 'OFFSET'],
+            'argumentCount' => '3-5',
+            'passCellReference' => true,
+            'passByReference' => [true],
+        ],
+        'OR' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Operations::class, 'logicalOr'],
+            'argumentCount' => '1+',
+        ],
+        'PDURATION' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Single::class, 'periods'],
+            'argumentCount' => '3',
+        ],
+        'PEARSON' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'CORREL'],
+            'argumentCount' => '2',
+        ],
+        'PERCENTILE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'PERCENTILE'],
+            'argumentCount' => '2',
+        ],
+        'PERCENTILE.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'PERCENTILE.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'PERCENTILE'],
+            'argumentCount' => '2',
+        ],
+        'PERCENTRANK' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'PERCENTRANK'],
+            'argumentCount' => '2,3',
+        ],
+        'PERCENTRANK.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
+        'PERCENTRANK.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'PERCENTRANK'],
+            'argumentCount' => '2,3',
+        ],
+        'PERMUT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Permutations::class, 'PERMUT'],
+            'argumentCount' => '2',
+        ],
+        'PERMUTATIONA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Permutations::class, 'PERMUTATIONA'],
+            'argumentCount' => '2',
+        ],
+        'PHONETIC' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
+        'PHI' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
+        'PI' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => 'pi',
+            'argumentCount' => '0',
+        ],
+        'PMT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Payments::class, 'annuity'],
+            'argumentCount' => '3-5',
+        ],
+        'POISSON' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Poisson::class, 'distribution'],
+            'argumentCount' => '3',
+        ],
+        'POISSON.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Poisson::class, 'distribution'],
+            'argumentCount' => '3',
+        ],
+        'POWER' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Operations::class, 'power'],
+            'argumentCount' => '2',
+        ],
+        'PPMT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Payments::class, 'interestPayment'],
+            'argumentCount' => '4-6',
+        ],
+        'PRICE' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\Price::class, 'price'],
+            'argumentCount' => '6,7',
+        ],
+        'PRICEDISC' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\Price::class, 'priceDiscounted'],
+            'argumentCount' => '4,5',
+        ],
+        'PRICEMAT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\Price::class, 'priceAtMaturity'],
+            'argumentCount' => '5,6',
+        ],
+        'PROB' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3,4',
+        ],
+        'PRODUCT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Operations::class, 'product'],
+            'argumentCount' => '1+',
+        ],
+        'PROPER' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\CaseConvert::class, 'proper'],
+            'argumentCount' => '1',
+        ],
+        'PV' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic::class, 'presentValue'],
+            'argumentCount' => '3-5',
+        ],
+        'QUARTILE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'QUARTILE'],
+            'argumentCount' => '2',
+        ],
+        'QUARTILE.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'QUARTILE.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'QUARTILE'],
+            'argumentCount' => '2',
+        ],
+        'QUOTIENT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Operations::class, 'quotient'],
+            'argumentCount' => '2',
+        ],
+        'RADIANS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Angle::class, 'toRadians'],
+            'argumentCount' => '1',
+        ],
+        'RAND' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Random::class, 'rand'],
+            'argumentCount' => '0',
+        ],
+        'RANDARRAY' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Random::class, 'randArray'],
+            'argumentCount' => '0-5',
+        ],
+        'RANDBETWEEN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Random::class, 'randBetween'],
+            'argumentCount' => '2',
+        ],
+        'RANK' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'RANK'],
+            'argumentCount' => '2,3',
+        ],
+        'RANK.AVG' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
+        'RANK.EQ' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Percentiles::class, 'RANK'],
+            'argumentCount' => '2,3',
+        ],
+        'RATE' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Constant\Periodic\Interest::class, 'rate'],
+            'argumentCount' => '3-6',
+        ],
+        'RECEIVED' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\Price::class, 'received'],
+            'argumentCount' => '4-5',
+        ],
+        'REDUCE' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'REPLACE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Replace::class, 'replace'],
+            'argumentCount' => '4',
+        ],
+        'REPLACEB' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Replace::class, 'replace'],
+            'argumentCount' => '4',
+        ],
+        'REPT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Concatenate::class, 'builtinREPT'],
+            'argumentCount' => '2',
+        ],
+        'RIGHT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'right'],
+            'argumentCount' => '1,2',
+        ],
+        'RIGHTB' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'right'],
+            'argumentCount' => '1,2',
+        ],
+        'ROMAN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Roman::class, 'evaluate'],
+            'argumentCount' => '1,2',
+        ],
+        'ROUND' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Round::class, 'round'],
+            'argumentCount' => '2',
+        ],
+        'ROUNDBAHTDOWN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'ROUNDBAHTUP' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'ROUNDDOWN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Round::class, 'down'],
+            'argumentCount' => '2',
+        ],
+        'ROUNDUP' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Round::class, 'up'],
+            'argumentCount' => '2',
+        ],
+        'ROW' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\RowColumnInformation::class, 'ROW'],
+            'argumentCount' => '-1',
+            'passCellReference' => true,
+            'passByReference' => [true],
+        ],
+        'ROWS' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\RowColumnInformation::class, 'ROWS'],
+            'argumentCount' => '1',
+        ],
+        'RRI' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Single::class, 'interestRate'],
+            'argumentCount' => '3',
+        ],
+        'RSQ' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'RSQ'],
+            'argumentCount' => '2',
+        ],
+        'RTD' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
+        'SEARCH' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Search::class, 'insensitive'],
+            'argumentCount' => '2,3',
+        ],
+        'SCAN' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'SEARCHB' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Search::class, 'insensitive'],
+            'argumentCount' => '2,3',
+        ],
+        'SEC' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Secant::class, 'sec'],
+            'argumentCount' => '1',
+        ],
+        'SECH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Secant::class, 'sech'],
+            'argumentCount' => '1',
+        ],
+        'SECOND' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\TimeParts::class, 'second'],
+            'argumentCount' => '1',
+        ],
+        'SEQUENCE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'sequence'],
+            'argumentCount' => '1-4',
+        ],
+        'SERIESSUM' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\SeriesSum::class, 'evaluate'],
+            'argumentCount' => '4',
+        ],
+        'SHEET' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '0,1',
+        ],
+        'SHEETS' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '0,1',
+        ],
+        'SIGN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Sign::class, 'evaluate'],
+            'argumentCount' => '1',
+        ],
+        'SIN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Sine::class, 'sin'],
+            'argumentCount' => '1',
+        ],
+        'SINGLE' => [
+            'category' => Category::CATEGORY_UNCATEGORISED,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'SINH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Sine::class, 'sinh'],
+            'argumentCount' => '1',
+        ],
+        'SKEW' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Deviations::class, 'skew'],
+            'argumentCount' => '1+',
+        ],
+        'SKEW.P' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
+        'SLN' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Depreciation::class, 'SLN'],
+            'argumentCount' => '3',
+        ],
+        'SLOPE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'SLOPE'],
+            'argumentCount' => '2',
+        ],
+        'SMALL' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Size::class, 'small'],
+            'argumentCount' => '2',
+        ],
+        'SORT' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Sort::class, 'sort'],
+            'argumentCount' => '1-4',
+        ],
+        'SORTBY' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Sort::class, 'sortBy'],
+            'argumentCount' => '2+',
+        ],
+        'SQRT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Sqrt::class, 'sqrt'],
+            'argumentCount' => '1',
+        ],
+        'SQRTPI' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Sqrt::class, 'pi'],
+            'argumentCount' => '1',
+        ],
+        'STANDARDIZE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Standardize::class, 'execute'],
+            'argumentCount' => '3',
+        ],
+        'STDEV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEV'],
+            'argumentCount' => '1+',
+        ],
+        'STDEV.S' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEV'],
+            'argumentCount' => '1+',
+        ],
+        'STDEV.P' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEVP'],
+            'argumentCount' => '1+',
+        ],
+        'STDEVA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEVA'],
+            'argumentCount' => '1+',
+        ],
+        'STDEVP' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEVP'],
+            'argumentCount' => '1+',
+        ],
+        'STDEVPA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\StandardDeviations::class, 'STDEVPA'],
+            'argumentCount' => '1+',
+        ],
+        'STEYX' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'STEYX'],
+            'argumentCount' => '2',
+        ],
+        'SUBSTITUTE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Replace::class, 'substitute'],
+            'argumentCount' => '3,4',
+        ],
+        'SUBTOTAL' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Subtotal::class, 'evaluate'],
+            'argumentCount' => '2+',
+            'passCellReference' => true,
+        ],
+        'SUM' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Sum::class, 'sumErroringStrings'],
+            'argumentCount' => '1+',
+        ],
+        'SUMIF' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Statistical\Conditional::class, 'SUMIF'],
+            'argumentCount' => '2,3',
+        ],
+        'SUMIFS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Statistical\Conditional::class, 'SUMIFS'],
+            'argumentCount' => '3+',
+        ],
+        'SUMPRODUCT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Sum::class, 'product'],
+            'argumentCount' => '1+',
+        ],
+        'SUMSQ' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\SumSquares::class, 'sumSquare'],
+            'argumentCount' => '1+',
+        ],
+        'SUMX2MY2' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\SumSquares::class, 'sumXSquaredMinusYSquared'],
+            'argumentCount' => '2',
+        ],
+        'SUMX2PY2' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\SumSquares::class, 'sumXSquaredPlusYSquared'],
+            'argumentCount' => '2',
+        ],
+        'SUMXMY2' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\SumSquares::class, 'sumXMinusYSquared'],
+            'argumentCount' => '2',
+        ],
+        'SWITCH' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Conditional::class, 'statementSwitch'],
+            'argumentCount' => '3+',
+        ],
+        'SYD' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Depreciation::class, 'SYD'],
+            'argumentCount' => '4',
+        ],
+        'T' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Text::class, 'test'],
+            'argumentCount' => '1',
+        ],
+        'TAKE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-3',
+        ],
+        'TAN' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'tan'],
+            'argumentCount' => '1',
+        ],
+        'TANH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trig\Tangent::class, 'tanh'],
+            'argumentCount' => '1',
+        ],
+        'TBILLEQ' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\TreasuryBill::class, 'bondEquivalentYield'],
+            'argumentCount' => '3',
+        ],
+        'TBILLPRICE' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\TreasuryBill::class, 'price'],
+            'argumentCount' => '3',
+        ],
+        'TBILLYIELD' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\TreasuryBill::class, 'yield'],
+            'argumentCount' => '3',
+        ],
+        'TDIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StudentT::class, 'distribution'],
+            'argumentCount' => '3',
+        ],
+        'T.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'T.DIST.2T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'T.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'TEXT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Format::class, 'TEXTFORMAT'],
+            'argumentCount' => '2',
+        ],
+        'TEXTAFTER' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'after'],
+            'argumentCount' => '2-6',
+        ],
+        'TEXTBEFORE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'before'],
+            'argumentCount' => '2-6',
+        ],
+        'TEXTJOIN' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Concatenate::class, 'TEXTJOIN'],
+            'argumentCount' => '3+',
+        ],
+        'TEXTSPLIT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Text::class, 'split'],
+            'argumentCount' => '2-6',
+        ],
+        'THAIDAYOFWEEK' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAIDIGIT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAIMONTHOFYEAR' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAINUMSOUND' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAINUMSTRING' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAISTRINGLENGTH' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'THAIYEAR' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '?',
+        ],
+        'TIME' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Time::class, 'fromHMS'],
+            'argumentCount' => '3',
+        ],
+        'TIMEVALUE' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\TimeValue::class, 'fromString'],
+            'argumentCount' => '1',
+        ],
+        'TINV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StudentT::class, 'inverse'],
+            'argumentCount' => '2',
+        ],
+        'T.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StudentT::class, 'inverse'],
+            'argumentCount' => '2',
+        ],
+        'T.INV.2T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'TODAY' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Current::class, 'today'],
+            'argumentCount' => '0',
+        ],
+        'TOCOL' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1-3',
+        ],
+        'TOROW' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1-3',
+        ],
+        'TRANSPOSE' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Matrix::class, 'transpose'],
+            'argumentCount' => '1',
+        ],
+        'TREND' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Trends::class, 'TREND'],
+            'argumentCount' => '1-4',
+        ],
+        'TRIM' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Trim::class, 'spaces'],
+            'argumentCount' => '1',
+        ],
+        'TRIMMEAN' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Averages\Mean::class, 'trim'],
+            'argumentCount' => '2',
+        ],
+        'TRUE' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Boolean::class, 'TRUE'],
+            'argumentCount' => '0',
+        ],
+        'TRUNC' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [MathTrig\Trunc::class, 'evaluate'],
+            'argumentCount' => '1,2',
+        ],
+        'TTEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
+        'T.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
+        'TYPE' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Information\Value::class, 'type'],
+            'argumentCount' => '1',
+        ],
+        'UNICHAR' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\CharacterConvert::class, 'character'],
+            'argumentCount' => '1',
+        ],
+        'UNICODE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\CharacterConvert::class, 'code'],
+            'argumentCount' => '1',
+        ],
+        'UNIQUE' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\Unique::class, 'unique'],
+            'argumentCount' => '1+',
+        ],
+        'UPPER' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\CaseConvert::class, 'upper'],
+            'argumentCount' => '1',
+        ],
+        'USDOLLAR' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Dollar::class, 'format'],
+            'argumentCount' => '2',
+        ],
+        'VALUE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Format::class, 'VALUE'],
+            'argumentCount' => '1',
+        ],
+        'VALUETOTEXT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Format::class, 'valueToText'],
+            'argumentCount' => '1,2',
+        ],
+        'VAR' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Variances::class, 'VAR'],
+            'argumentCount' => '1+',
+        ],
+        'VAR.P' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Variances::class, 'VARP'],
+            'argumentCount' => '1+',
+        ],
+        'VAR.S' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Variances::class, 'VAR'],
+            'argumentCount' => '1+',
+        ],
+        'VARA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Variances::class, 'VARA'],
+            'argumentCount' => '1+',
+        ],
+        'VARP' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Variances::class, 'VARP'],
+            'argumentCount' => '1+',
+        ],
+        'VARPA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Variances::class, 'VARPA'],
+            'argumentCount' => '1+',
+        ],
+        'VDB' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '5-7',
+        ],
+        'VLOOKUP' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [LookupRef\VLookup::class, 'lookup'],
+            'argumentCount' => '3,4',
+        ],
+        'VSTACK' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
+        'WEBSERVICE' => [
+            'category' => Category::CATEGORY_WEB,
+            'functionCall' => [Web\Service::class, 'webService'],
+            'argumentCount' => '1',
+        ],
+        'WEEKDAY' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Week::class, 'day'],
+            'argumentCount' => '1,2',
+        ],
+        'WEEKNUM' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\Week::class, 'number'],
+            'argumentCount' => '1,2',
+        ],
+        'WEIBULL' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Weibull::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'WEIBULL.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\Weibull::class, 'distribution'],
+            'argumentCount' => '4',
+        ],
+        'WORKDAY' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\WorkDay::class, 'date'],
+            'argumentCount' => '2-3',
+        ],
+        'WORKDAY.INTL' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-4',
+        ],
+        'WRAPCOLS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-3',
+        ],
+        'WRAPROWS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-3',
+        ],
+        'XIRR' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Variable\NonPeriodic::class, 'rate'],
+            'argumentCount' => '2,3',
+        ],
+        'XLOOKUP' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'XNPV' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\CashFlow\Variable\NonPeriodic::class, 'presentValue'],
+            'argumentCount' => '3',
+        ],
+        'XMATCH' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
+        'XOR' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Logical\Operations::class, 'logicalXor'],
+            'argumentCount' => '1+',
+        ],
+        'YEAR' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\DateParts::class, 'year'],
+            'argumentCount' => '1',
+        ],
+        'YEARFRAC' => [
+            'category' => Category::CATEGORY_DATE_AND_TIME,
+            'functionCall' => [DateTimeExcel\YearFrac::class, 'fraction'],
+            'argumentCount' => '2,3',
+        ],
+        'YIELD' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '6,7',
+        ],
+        'YIELDDISC' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\Yields::class, 'yieldDiscounted'],
+            'argumentCount' => '4,5',
+        ],
+        'YIELDMAT' => [
+            'category' => Category::CATEGORY_FINANCIAL,
+            'functionCall' => [Financial\Securities\Yields::class, 'yieldAtMaturity'],
+            'argumentCount' => '5,6',
+        ],
+        'ZTEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'zTest'],
+            'argumentCount' => '2-3',
+        ],
+        'Z.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical\Distributions\StandardNormal::class, 'zTest'],
+            'argumentCount' => '2-3',
+        ],
+    ];
+
+    /**
+     *    Internal functions used for special control purposes.
+     */
+    private static array $controlFunctions = [
+        'MKMATRIX' => [
+            'argumentCount' => '*',
+            'functionCall' => [Internal\MakeMatrix::class, 'make'],
+        ],
+        'NAME.ERROR' => [
+            'argumentCount' => '*',
+            'functionCall' => [ExcelError::class, 'NAME'],
+        ],
+        'WILDCARDMATCH' => [
+            'argumentCount' => '2',
+            'functionCall' => [Internal\WildcardMatch::class, 'compare'],
+        ],
+    ];
+
+    public function __construct(?Spreadsheet $spreadsheet = null)
+    {
+        $this->spreadsheet = $spreadsheet;
+        $this->cyclicReferenceStack = new CyclicReferenceStack();
+        $this->debugLog = new Logger($this->cyclicReferenceStack);
+        $this->branchPruner = new BranchPruner($this->branchPruningEnabled);
+        self::$referenceHelper = ReferenceHelper::getInstance();
+    }
+
+    private static function loadLocales(): void
+    {
+        $localeFileDirectory = __DIR__ . '/locale/';
+        $localeFileNames = glob($localeFileDirectory . '*', GLOB_ONLYDIR) ?: [];
+        foreach ($localeFileNames as $filename) {
+            $filename = substr($filename, strlen($localeFileDirectory));
+            if ($filename != 'en') {
+                self::$validLocaleLanguages[] = $filename;
+            }
+        }
+    }
+
+    /**
+     * Get an instance of this class.
+     *
+     * @param ?Spreadsheet $spreadsheet Injected spreadsheet for working with a PhpSpreadsheet Spreadsheet object,
+     *                                    or NULL to create a standalone calculation engine
+     */
+    public static function getInstance(?Spreadsheet $spreadsheet = null): self
+    {
+        if ($spreadsheet !== null) {
+            $instance = $spreadsheet->getCalculationEngine();
+            if (isset($instance)) {
+                return $instance;
+            }
+        }
+
+        if (!self::$instance) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Flush the calculation cache for any existing instance of this class
+     *        but only if a Calculation instance exists.
+     */
+    public function flushInstance(): void
+    {
+        $this->clearCalculationCache();
+        $this->branchPruner->clearBranchStore();
+    }
+
+    /**
+     * Get the Logger for this calculation engine instance.
+     */
+    public function getDebugLog(): Logger
+    {
+        return $this->debugLog;
+    }
+
+    /**
+     * __clone implementation. Cloning should not be allowed in a Singleton!
+     */
+    final public function __clone()
+    {
+        throw new Exception('Cloning the calculation engine is not allowed!');
+    }
+
+    /**
+     * Return the locale-specific translation of TRUE.
+     *
+     * @return string locale-specific translation of TRUE
+     */
+    public static function getTRUE(): string
+    {
+        return self::$localeBoolean['TRUE'];
+    }
+
+    /**
+     * Return the locale-specific translation of FALSE.
+     *
+     * @return string locale-specific translation of FALSE
+     */
+    public static function getFALSE(): string
+    {
+        return self::$localeBoolean['FALSE'];
+    }
+
+    /**
+     * Set the Array Return Type (Array or Value of first element in the array).
+     *
+     * @param string $returnType Array return type
+     *
+     * @return bool Success or failure
+     */
+    public static function setArrayReturnType(string $returnType): bool
+    {
+        if (
+            ($returnType == self::RETURN_ARRAY_AS_VALUE)
+            || ($returnType == self::RETURN_ARRAY_AS_ERROR)
+            || ($returnType == self::RETURN_ARRAY_AS_ARRAY)
+        ) {
+            self::$returnArrayAsType = $returnType;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the Array Return Type (Array or Value of first element in the array).
+     *
+     * @return string $returnType Array return type
+     */
+    public static function getArrayReturnType(): string
+    {
+        return self::$returnArrayAsType;
+    }
+
+    /**
+     * Is calculation caching enabled?
+     */
+    public function getCalculationCacheEnabled(): bool
+    {
+        return $this->calculationCacheEnabled;
+    }
+
+    /**
+     * Enable/disable calculation cache.
+     */
+    public function setCalculationCacheEnabled(bool $calculationCacheEnabled): void
+    {
+        $this->calculationCacheEnabled = $calculationCacheEnabled;
+        $this->clearCalculationCache();
+    }
+
+    /**
+     * Enable calculation cache.
+     */
+    public function enableCalculationCache(): void
+    {
+        $this->setCalculationCacheEnabled(true);
+    }
+
+    /**
+     * Disable calculation cache.
+     */
+    public function disableCalculationCache(): void
+    {
+        $this->setCalculationCacheEnabled(false);
+    }
+
+    /**
+     * Clear calculation cache.
+     */
+    public function clearCalculationCache(): void
+    {
+        $this->calculationCache = [];
+    }
+
+    /**
+     * Clear calculation cache for a specified worksheet.
+     */
+    public function clearCalculationCacheForWorksheet(string $worksheetName): void
+    {
+        if (isset($this->calculationCache[$worksheetName])) {
+            unset($this->calculationCache[$worksheetName]);
+        }
+    }
+
+    /**
+     * Rename calculation cache for a specified worksheet.
+     */
+    public function renameCalculationCacheForWorksheet(string $fromWorksheetName, string $toWorksheetName): void
+    {
+        if (isset($this->calculationCache[$fromWorksheetName])) {
+            $this->calculationCache[$toWorksheetName] = &$this->calculationCache[$fromWorksheetName];
+            unset($this->calculationCache[$fromWorksheetName]);
+        }
+    }
+
+    /**
+     * Enable/disable calculation cache.
+     */
+    public function setBranchPruningEnabled(mixed $enabled): void
+    {
+        $this->branchPruningEnabled = $enabled;
+        $this->branchPruner = new BranchPruner($this->branchPruningEnabled);
+    }
+
+    public function enableBranchPruning(): void
+    {
+        $this->setBranchPruningEnabled(true);
+    }
+
+    public function disableBranchPruning(): void
+    {
+        $this->setBranchPruningEnabled(false);
+    }
+
+    /**
+     * Get the currently defined locale code.
+     */
+    public function getLocale(): string
+    {
+        return self::$localeLanguage;
+    }
+
+    private function getLocaleFile(string $localeDir, string $locale, string $language, string $file): string
+    {
+        $localeFileName = $localeDir . str_replace('_', DIRECTORY_SEPARATOR, $locale)
+            . DIRECTORY_SEPARATOR . $file;
+        if (!file_exists($localeFileName)) {
+            //    If there isn't a locale specific file, look for a language specific file
+            $localeFileName = $localeDir . $language . DIRECTORY_SEPARATOR . $file;
+            if (!file_exists($localeFileName)) {
+                throw new Exception('Locale file not found');
+            }
+        }
+
+        return $localeFileName;
+    }
+
+    /**
+     * Set the locale code.
+     *
+     * @param string $locale The locale to use for formula translation, eg: 'en_us'
+     */
+    public function setLocale(string $locale): bool
+    {
+        //    Identify our locale and language
+        $language = $locale = strtolower($locale);
+        if (str_contains($locale, '_')) {
+            [$language] = explode('_', $locale);
+        }
+        if (count(self::$validLocaleLanguages) == 1) {
+            self::loadLocales();
+        }
+
+        //    Test whether we have any language data for this language (any locale)
+        if (in_array($language, self::$validLocaleLanguages, true)) {
+            //    initialise language/locale settings
+            self::$localeFunctions = [];
+            self::$localeArgumentSeparator = ',';
+            self::$localeBoolean = ['TRUE' => 'TRUE', 'FALSE' => 'FALSE', 'NULL' => 'NULL'];
+
+            //    Default is US English, if user isn't requesting US english, then read the necessary data from the locale files
+            if ($locale !== 'en_us') {
+                $localeDir = implode(DIRECTORY_SEPARATOR, [__DIR__, 'locale', null]);
+
+                //    Search for a file with a list of function names for locale
+                try {
+                    $functionNamesFile = $this->getLocaleFile($localeDir, $locale, $language, 'functions');
+                } catch (Exception $e) {
+                    return false;
+                }
+
+                //    Retrieve the list of locale or language specific function names
+                $localeFunctions = file($functionNamesFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [];
+                foreach ($localeFunctions as $localeFunction) {
+                    [$localeFunction] = explode('##', $localeFunction); //    Strip out comments
+                    if (str_contains($localeFunction, '=')) {
+                        [$fName, $lfName] = array_map('trim', explode('=', $localeFunction));
+                        if ((str_starts_with($fName, '*') || isset(self::$phpSpreadsheetFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
+                            self::$localeFunctions[$fName] = $lfName;
+                        }
+                    }
+                }
+                //    Default the TRUE and FALSE constants to the locale names of the TRUE() and FALSE() functions
+                if (isset(self::$localeFunctions['TRUE'])) {
+                    self::$localeBoolean['TRUE'] = self::$localeFunctions['TRUE'];
+                }
+                if (isset(self::$localeFunctions['FALSE'])) {
+                    self::$localeBoolean['FALSE'] = self::$localeFunctions['FALSE'];
+                }
+
+                try {
+                    $configFile = $this->getLocaleFile($localeDir, $locale, $language, 'config');
+                } catch (Exception) {
+                    return false;
+                }
+
+                $localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [];
+                foreach ($localeSettings as $localeSetting) {
+                    [$localeSetting] = explode('##', $localeSetting); //    Strip out comments
+                    if (str_contains($localeSetting, '=')) {
+                        [$settingName, $settingValue] = array_map('trim', explode('=', $localeSetting));
+                        $settingName = strtoupper($settingName);
+                        if ($settingValue !== '') {
+                            switch ($settingName) {
+                                case 'ARGUMENTSEPARATOR':
+                                    self::$localeArgumentSeparator = $settingValue;
+
+                                    break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            self::$functionReplaceFromExcel = self::$functionReplaceToExcel
+            = self::$functionReplaceFromLocale = self::$functionReplaceToLocale = null;
+            self::$localeLanguage = $locale;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public static function translateSeparator(
+        string $fromSeparator,
+        string $toSeparator,
+        string $formula,
+        int &$inBracesLevel,
+        string $openBrace = self::FORMULA_OPEN_FUNCTION_BRACE,
+        string $closeBrace = self::FORMULA_CLOSE_FUNCTION_BRACE
+    ): string {
+        $strlen = mb_strlen($formula);
+        for ($i = 0; $i < $strlen; ++$i) {
+            $chr = mb_substr($formula, $i, 1);
+            switch ($chr) {
+                case $openBrace:
+                    ++$inBracesLevel;
+
+                    break;
+                case $closeBrace:
+                    --$inBracesLevel;
+
+                    break;
+                case $fromSeparator:
+                    if ($inBracesLevel > 0) {
+                        $formula = mb_substr($formula, 0, $i) . $toSeparator . mb_substr($formula, $i + 1);
+                    }
+            }
+        }
+
+        return $formula;
+    }
+
+    private static function translateFormulaBlock(
+        array $from,
+        array $to,
+        string $formula,
+        int &$inFunctionBracesLevel,
+        int &$inMatrixBracesLevel,
+        string $fromSeparator,
+        string $toSeparator
+    ): string {
+        // Function Names
+        $formula = (string) preg_replace($from, $to, $formula);
+
+        // Temporarily adjust matrix separators so that they won't be confused with function arguments
+        $formula = self::translateSeparator(';', '|', $formula, $inMatrixBracesLevel, self::FORMULA_OPEN_MATRIX_BRACE, self::FORMULA_CLOSE_MATRIX_BRACE);
+        $formula = self::translateSeparator(',', '!', $formula, $inMatrixBracesLevel, self::FORMULA_OPEN_MATRIX_BRACE, self::FORMULA_CLOSE_MATRIX_BRACE);
+        // Function Argument Separators
+        $formula = self::translateSeparator($fromSeparator, $toSeparator, $formula, $inFunctionBracesLevel);
+        // Restore matrix separators
+        $formula = self::translateSeparator('|', ';', $formula, $inMatrixBracesLevel, self::FORMULA_OPEN_MATRIX_BRACE, self::FORMULA_CLOSE_MATRIX_BRACE);
+        $formula = self::translateSeparator('!', ',', $formula, $inMatrixBracesLevel, self::FORMULA_OPEN_MATRIX_BRACE, self::FORMULA_CLOSE_MATRIX_BRACE);
+
+        return $formula;
+    }
+
+    private static function translateFormula(array $from, array $to, string $formula, string $fromSeparator, string $toSeparator): string
+    {
+        // Convert any Excel function names and constant names to the required language;
+        //     and adjust function argument separators
+        if (self::$localeLanguage !== 'en_us') {
+            $inFunctionBracesLevel = 0;
+            $inMatrixBracesLevel = 0;
+            //    If there is the possibility of separators within a quoted string, then we treat them as literals
+            if (str_contains($formula, self::FORMULA_STRING_QUOTE)) {
+                //    So instead we skip replacing in any quoted strings by only replacing in every other array element
+                //       after we've exploded the formula
+                $temp = explode(self::FORMULA_STRING_QUOTE, $formula);
+                $notWithinQuotes = false;
+                foreach ($temp as &$value) {
+                    //    Only adjust in alternating array entries
+                    $notWithinQuotes = $notWithinQuotes === false;
+                    if ($notWithinQuotes === true) {
+                        $value = self::translateFormulaBlock($from, $to, $value, $inFunctionBracesLevel, $inMatrixBracesLevel, $fromSeparator, $toSeparator);
+                    }
+                }
+                unset($value);
+                //    Then rebuild the formula string
+                $formula = implode(self::FORMULA_STRING_QUOTE, $temp);
+            } else {
+                //    If there's no quoted strings, then we do a simple count/replace
+                $formula = self::translateFormulaBlock($from, $to, $formula, $inFunctionBracesLevel, $inMatrixBracesLevel, $fromSeparator, $toSeparator);
+            }
+        }
+
+        return $formula;
+    }
+
+    /** @var ?array */
+    private static ?array $functionReplaceFromExcel;
+
+    /** @var ?array */
+    private static ?array $functionReplaceToLocale;
+
+    /**
+     * @deprecated 1.30.0 use translateFormulaToLocale() instead
+     *
+     * @codeCoverageIgnore
+     */
+    public function _translateFormulaToLocale(string $formula): string
+    {
+        return $this->translateFormulaToLocale($formula);
+    }
+
+    public function translateFormulaToLocale(string $formula): string
+    {
+        $formula = preg_replace(self::CALCULATION_REGEXP_STRIP_XLFN_XLWS, '', $formula) ?? '';
+        // Build list of function names and constants for translation
+        if (self::$functionReplaceFromExcel === null) {
+            self::$functionReplaceFromExcel = [];
+            foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelFunctionName, '/') . '([\s]*\()/ui';
+            }
+            foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelBoolean, '/') . '([^\w\.])/ui';
+            }
+        }
+
+        if (self::$functionReplaceToLocale === null) {
+            self::$functionReplaceToLocale = [];
+            foreach (self::$localeFunctions as $localeFunctionName) {
+                self::$functionReplaceToLocale[] = '$1' . trim($localeFunctionName) . '$2';
+            }
+            foreach (self::$localeBoolean as $localeBoolean) {
+                self::$functionReplaceToLocale[] = '$1' . trim($localeBoolean) . '$2';
+            }
+        }
+
+        return self::translateFormula(
+            self::$functionReplaceFromExcel,
+            self::$functionReplaceToLocale,
+            $formula,
+            ',',
+            self::$localeArgumentSeparator
+        );
+    }
+
+    /** @var ?array */
+    private static ?array $functionReplaceFromLocale;
+
+    /** @var ?array */
+    private static ?array $functionReplaceToExcel;
+
+    /**
+     * @deprecated 1.30.0 use translateFormulaToEnglish() instead
+     *
+     * @codeCoverageIgnore
+     */
+    public function _translateFormulaToEnglish(string $formula): string
+    {
+        return $this->translateFormulaToEnglish($formula);
+    }
+
+    public function translateFormulaToEnglish(string $formula): string
+    {
+        if (self::$functionReplaceFromLocale === null) {
+            self::$functionReplaceFromLocale = [];
+            foreach (self::$localeFunctions as $localeFunctionName) {
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($localeFunctionName, '/') . '([\s]*\()/ui';
+            }
+            foreach (self::$localeBoolean as $excelBoolean) {
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($excelBoolean, '/') . '([^\w\.])/ui';
+            }
+        }
+
+        if (self::$functionReplaceToExcel === null) {
+            self::$functionReplaceToExcel = [];
+            foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
+                self::$functionReplaceToExcel[] = '$1' . trim($excelFunctionName) . '$2';
+            }
+            foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
+                self::$functionReplaceToExcel[] = '$1' . trim($excelBoolean) . '$2';
+            }
+        }
+
+        return self::translateFormula(self::$functionReplaceFromLocale, self::$functionReplaceToExcel, $formula, self::$localeArgumentSeparator, ',');
+    }
+
+    public static function localeFunc(string $function): string
+    {
+        if (self::$localeLanguage !== 'en_us') {
+            $functionName = trim($function, '(');
+            if (isset(self::$localeFunctions[$functionName])) {
+                $brace = ($functionName != $function);
+                $function = self::$localeFunctions[$functionName];
+                if ($brace) {
+                    $function .= '(';
+                }
+            }
+        }
+
+        return $function;
+    }
+
+    /**
+     * Wrap string values in quotes.
+     */
+    public static function wrapResult(mixed $value): mixed
+    {
+        if (is_string($value)) {
+            //    Error values cannot be "wrapped"
+            if (preg_match('/^' . self::CALCULATION_REGEXP_ERROR . '$/i', $value, $match)) {
+                //    Return Excel errors "as is"
+                return $value;
+            }
+
+            //    Return strings wrapped in quotes
+            return self::FORMULA_STRING_QUOTE . $value . self::FORMULA_STRING_QUOTE;
+        } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
+            //    Convert numeric errors to NaN error
+            return ExcelError::NAN();
+        }
+
+        return $value;
+    }
+
+    /**
+     * Remove quotes used as a wrapper to identify string values.
+     */
+    public static function unwrapResult(mixed $value): mixed
+    {
+        if (is_string($value)) {
+            if ((isset($value[0])) && ($value[0] == self::FORMULA_STRING_QUOTE) && (substr($value, -1) == self::FORMULA_STRING_QUOTE)) {
+                return substr($value, 1, -1);
+            }
+            //    Convert numeric errors to NAN error
+        } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
+            return ExcelError::NAN();
+        }
+
+        return $value;
+    }
+
+    /**
+     * Calculate cell value (using formula from a cell ID)
+     * Retained for backward compatibility.
+     *
+     * @param ?Cell $cell Cell to calculate
+     */
+    public function calculate(?Cell $cell = null): mixed
+    {
+        try {
+            return $this->calculateCellValue($cell);
+        } catch (\Exception $e) {
+            throw new Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * Calculate the value of a cell formula.
+     *
+     * @param ?Cell $cell Cell to calculate
+     * @param bool $resetLog Flag indicating whether the debug log should be reset or not
+     */
+    public function calculateCellValue(?Cell $cell = null, bool $resetLog = true): mixed
+    {
+        if ($cell === null) {
+            return null;
+        }
+
+        $returnArrayAsType = self::$returnArrayAsType;
+        if ($resetLog) {
+            //    Initialise the logging settings if requested
+            $this->formulaError = null;
+            $this->debugLog->clearLog();
+            $this->cyclicReferenceStack->clear();
+            $this->cyclicFormulaCounter = 1;
+
+            self::$returnArrayAsType = self::RETURN_ARRAY_AS_ARRAY;
+        }
+
+        //    Execute the calculation for the cell formula
+        $this->cellStack[] = [
+            'sheet' => $cell->getWorksheet()->getTitle(),
+            'cell' => $cell->getCoordinate(),
+        ];
+
+        $cellAddressAttempted = false;
+        $cellAddress = null;
+
+        try {
+            $result = self::unwrapResult($this->_calculateFormulaValue($cell->getValue(), $cell->getCoordinate(), $cell));
+            if ($this->spreadsheet === null) {
+                throw new Exception('null spreadsheet in calculateCellValue');
+            }
+            $cellAddressAttempted = true;
+            $cellAddress = array_pop($this->cellStack);
+            if ($cellAddress === null) {
+                throw new Exception('null cellAddress in calculateCellValue');
+            }
+            $testSheet = $this->spreadsheet->getSheetByName($cellAddress['sheet']);
+            if ($testSheet === null) {
+                throw new Exception('worksheet not found in calculateCellValue');
+            }
+            $testSheet->getCell($cellAddress['cell']);
+        } catch (\Exception $e) {
+            if (!$cellAddressAttempted) {
+                $cellAddress = array_pop($this->cellStack);
+            }
+            if ($this->spreadsheet !== null && is_array($cellAddress) && array_key_exists('sheet', $cellAddress)) {
+                $testSheet = $this->spreadsheet->getSheetByName($cellAddress['sheet']);
+                if ($testSheet !== null && array_key_exists('cell', $cellAddress)) {
+                    $testSheet->getCell($cellAddress['cell']);
+                }
+            }
+
+            throw new Exception($e->getMessage(), $e->getCode(), $e);
+        }
+
+        if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
+            self::$returnArrayAsType = $returnArrayAsType;
+            $testResult = Functions::flattenArray($result);
+            if (self::$returnArrayAsType == self::RETURN_ARRAY_AS_ERROR) {
+                return ExcelError::VALUE();
+            }
+            //    If there's only a single cell in the array, then we allow it
+            if (count($testResult) != 1) {
+                //    If keys are numeric, then it's a matrix result rather than a cell range result, so we permit it
+                $r = array_keys($result);
+                $r = array_shift($r);
+                if (!is_numeric($r)) {
+                    return ExcelError::VALUE();
+                }
+                if (is_array($result[$r])) {
+                    $c = array_keys($result[$r]);
+                    $c = array_shift($c);
+                    if (!is_numeric($c)) {
+                        return ExcelError::VALUE();
+                    }
+                }
+            }
+            $result = array_shift($testResult);
+        }
+        self::$returnArrayAsType = $returnArrayAsType;
+
+        if ($result === null && $cell->getWorksheet()->getSheetView()->getShowZeros()) {
+            return 0;
+        } elseif ((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
+            return ExcelError::NAN();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Validate and parse a formula string.
+     *
+     * @param string $formula Formula to parse
+     */
+    public function parseFormula(string $formula): array|bool
+    {
+        //    Basic validation that this is indeed a formula
+        //    We return an empty array if not
+        $formula = trim($formula);
+        if ((!isset($formula[0])) || ($formula[0] != '=')) {
+            return [];
+        }
+        $formula = ltrim(substr($formula, 1));
+        if (!isset($formula[0])) {
+            return [];
+        }
+
+        //    Parse the formula and return the token stack
+        return $this->internalParseFormula($formula);
+    }
+
+    /**
+     * Calculate the value of a formula.
+     *
+     * @param string $formula Formula to parse
+     * @param ?string $cellID Address of the cell to calculate
+     * @param ?Cell $cell Cell to calculate
+     */
+    public function calculateFormula(string $formula, ?string $cellID = null, ?Cell $cell = null): mixed
+    {
+        //    Initialise the logging settings
+        $this->formulaError = null;
+        $this->debugLog->clearLog();
+        $this->cyclicReferenceStack->clear();
+
+        $resetCache = $this->getCalculationCacheEnabled();
+        if ($this->spreadsheet !== null && $cellID === null && $cell === null) {
+            $cellID = 'A1';
+            $cell = $this->spreadsheet->getActiveSheet()->getCell($cellID);
+        } else {
+            //    Disable calculation cacheing because it only applies to cell calculations, not straight formulae
+            //    But don't actually flush any cache
+            $this->calculationCacheEnabled = false;
+        }
+
+        //    Execute the calculation
+        try {
+            $result = self::unwrapResult($this->_calculateFormulaValue($formula, $cellID, $cell));
+        } catch (\Exception $e) {
+            throw new Exception($e->getMessage());
+        }
+
+        if ($this->spreadsheet === null) {
+            //    Reset calculation cacheing to its previous state
+            $this->calculationCacheEnabled = $resetCache;
+        }
+
+        return $result;
+    }
+
+    public function getValueFromCache(string $cellReference, mixed &$cellValue): bool
+    {
+        $this->debugLog->writeDebugLog('Testing cache value for cell %s', $cellReference);
+        // Is calculation cacheing enabled?
+        // If so, is the required value present in calculation cache?
+        if (($this->calculationCacheEnabled) && (isset($this->calculationCache[$cellReference]))) {
+            $this->debugLog->writeDebugLog('Retrieving value for cell %s from cache', $cellReference);
+            // Return the cached result
+
+            $cellValue = $this->calculationCache[$cellReference];
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public function saveValueToCache(string $cellReference, mixed $cellValue): void
+    {
+        if ($this->calculationCacheEnabled) {
+            $this->calculationCache[$cellReference] = $cellValue;
+        }
+    }
+
+    /**
+     * Parse a cell formula and calculate its value.
+     *
+     * @param string $formula The formula to parse and calculate
+     * @param ?string $cellID The ID (e.g. A3) of the cell that we are calculating
+     * @param ?Cell $cell Cell to calculate
+     * @param bool $ignoreQuotePrefix If set to true, evaluate the formyla even if the referenced cell is quote prefixed
+     */
+    public function _calculateFormulaValue(string $formula, ?string $cellID = null, ?Cell $cell = null, bool $ignoreQuotePrefix = false): mixed
+    {
+        $cellValue = null;
+
+        //  Quote-Prefixed cell values cannot be formulae, but are treated as strings
+        if ($cell !== null && $ignoreQuotePrefix === false && $cell->getStyle()->getQuotePrefix() === true) {
+            return self::wrapResult((string) $formula);
+        }
+
+        if (preg_match('/^=\s*cmd\s*\|/miu', $formula) !== 0) {
+            return self::wrapResult($formula);
+        }
+
+        //    Basic validation that this is indeed a formula
+        //    We simply return the cell value if not
+        $formula = trim($formula);
+        if ($formula[0] != '=') {
+            return self::wrapResult($formula);
+        }
+        $formula = ltrim(substr($formula, 1));
+        if (!isset($formula[0])) {
+            return self::wrapResult($formula);
+        }
+
+        $pCellParent = ($cell !== null) ? $cell->getWorksheet() : null;
+        $wsTitle = ($pCellParent !== null) ? $pCellParent->getTitle() : "\x00Wrk";
+        $wsCellReference = $wsTitle . '!' . $cellID;
+
+        if (($cellID !== null) && ($this->getValueFromCache($wsCellReference, $cellValue))) {
+            return $cellValue;
+        }
+        $this->debugLog->writeDebugLog('Evaluating formula for cell %s', $wsCellReference);
+
+        if (($wsTitle[0] !== "\x00") && ($this->cyclicReferenceStack->onStack($wsCellReference))) {
+            if ($this->cyclicFormulaCount <= 0) {
+                $this->cyclicFormulaCell = '';
+
+                return $this->raiseFormulaError('Cyclic Reference in Formula');
+            } elseif ($this->cyclicFormulaCell === $wsCellReference) {
+                ++$this->cyclicFormulaCounter;
+                if ($this->cyclicFormulaCounter >= $this->cyclicFormulaCount) {
+                    $this->cyclicFormulaCell = '';
+
+                    return $cellValue;
+                }
+            } elseif ($this->cyclicFormulaCell == '') {
+                if ($this->cyclicFormulaCounter >= $this->cyclicFormulaCount) {
+                    return $cellValue;
+                }
+                $this->cyclicFormulaCell = $wsCellReference;
+            }
+        }
+
+        $this->debugLog->writeDebugLog('Formula for cell %s is %s', $wsCellReference, $formula);
+        //    Parse the formula onto the token stack and calculate the value
+        $this->cyclicReferenceStack->push($wsCellReference);
+
+        $cellValue = $this->processTokenStack($this->internalParseFormula($formula, $cell), $cellID, $cell);
+        $this->cyclicReferenceStack->pop();
+
+        // Save to calculation cache
+        if ($cellID !== null) {
+            $this->saveValueToCache($wsCellReference, $cellValue);
+        }
+
+        //    Return the calculated value
+        return $cellValue;
+    }
+
+    /**
+     * Ensure that paired matrix operands are both matrices and of the same size.
+     *
+     * @param mixed $operand1 First matrix operand
+     * @param mixed $operand2 Second matrix operand
+     * @param int $resize Flag indicating whether the matrices should be resized to match
+     *                                        and (if so), whether the smaller dimension should grow or the
+     *                                        larger should shrink.
+     *                                            0 = no resize
+     *                                            1 = shrink to fit
+     *                                            2 = extend to fit
+     */
+    private static function checkMatrixOperands(mixed &$operand1, mixed &$operand2, int $resize = 1): array
+    {
+        //    Examine each of the two operands, and turn them into an array if they aren't one already
+        //    Note that this function should only be called if one or both of the operand is already an array
+        if (!is_array($operand1)) {
+            [$matrixRows, $matrixColumns] = self::getMatrixDimensions($operand2);
+            $operand1 = array_fill(0, $matrixRows, array_fill(0, $matrixColumns, $operand1));
+            $resize = 0;
+        } elseif (!is_array($operand2)) {
+            [$matrixRows, $matrixColumns] = self::getMatrixDimensions($operand1);
+            $operand2 = array_fill(0, $matrixRows, array_fill(0, $matrixColumns, $operand2));
+            $resize = 0;
+        }
+
+        [$matrix1Rows, $matrix1Columns] = self::getMatrixDimensions($operand1);
+        [$matrix2Rows, $matrix2Columns] = self::getMatrixDimensions($operand2);
+        if (($matrix1Rows == $matrix2Columns) && ($matrix2Rows == $matrix1Columns)) {
+            $resize = 1;
+        }
+
+        if ($resize == 2) {
+            //    Given two matrices of (potentially) unequal size, convert the smaller in each dimension to match the larger
+            self::resizeMatricesExtend($operand1, $operand2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
+        } elseif ($resize == 1) {
+            //    Given two matrices of (potentially) unequal size, convert the larger in each dimension to match the smaller
+            self::resizeMatricesShrink($operand1, $operand2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
+        }
+        [$matrix1Rows, $matrix1Columns] = self::getMatrixDimensions($operand1);
+        [$matrix2Rows, $matrix2Columns] = self::getMatrixDimensions($operand2);
+
+        return [$matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns];
+    }
+
+    /**
+     * Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0.
+     *
+     * @param array $matrix matrix operand
+     *
+     * @return int[] An array comprising the number of rows, and number of columns
+     */
+    public static function getMatrixDimensions(array &$matrix): array
+    {
+        $matrixRows = count($matrix);
+        $matrixColumns = 0;
+        foreach ($matrix as $rowKey => $rowValue) {
+            if (!is_array($rowValue)) {
+                $matrix[$rowKey] = [$rowValue];
+                $matrixColumns = max(1, $matrixColumns);
+            } else {
+                $matrix[$rowKey] = array_values($rowValue);
+                $matrixColumns = max(count($rowValue), $matrixColumns);
+            }
+        }
+        $matrix = array_values($matrix);
+
+        return [$matrixRows, $matrixColumns];
+    }
+
+    /**
+     * Ensure that paired matrix operands are both matrices of the same size.
+     *
+     * @param array $matrix1 First matrix operand
+     * @param array $matrix2 Second matrix operand
+     * @param int $matrix1Rows Row size of first matrix operand
+     * @param int $matrix1Columns Column size of first matrix operand
+     * @param int $matrix2Rows Row size of second matrix operand
+     * @param int $matrix2Columns Column size of second matrix operand
+     */
+    private static function resizeMatricesShrink(array &$matrix1, array &$matrix2, int $matrix1Rows, int $matrix1Columns, int $matrix2Rows, int $matrix2Columns): void
+    {
+        if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
+            if ($matrix2Rows < $matrix1Rows) {
+                for ($i = $matrix2Rows; $i < $matrix1Rows; ++$i) {
+                    unset($matrix1[$i]);
+                }
+            }
+            if ($matrix2Columns < $matrix1Columns) {
+                for ($i = 0; $i < $matrix1Rows; ++$i) {
+                    for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
+                        unset($matrix1[$i][$j]);
+                    }
+                }
+            }
+        }
+
+        if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
+            if ($matrix1Rows < $matrix2Rows) {
+                for ($i = $matrix1Rows; $i < $matrix2Rows; ++$i) {
+                    unset($matrix2[$i]);
+                }
+            }
+            if ($matrix1Columns < $matrix2Columns) {
+                for ($i = 0; $i < $matrix2Rows; ++$i) {
+                    for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
+                        unset($matrix2[$i][$j]);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Ensure that paired matrix operands are both matrices of the same size.
+     *
+     * @param array $matrix1 First matrix operand
+     * @param array $matrix2 Second matrix operand
+     * @param int $matrix1Rows Row size of first matrix operand
+     * @param int $matrix1Columns Column size of first matrix operand
+     * @param int $matrix2Rows Row size of second matrix operand
+     * @param int $matrix2Columns Column size of second matrix operand
+     */
+    private static function resizeMatricesExtend(array &$matrix1, array &$matrix2, int $matrix1Rows, int $matrix1Columns, int $matrix2Rows, int $matrix2Columns): void
+    {
+        if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
+            if ($matrix2Columns < $matrix1Columns) {
+                for ($i = 0; $i < $matrix2Rows; ++$i) {
+                    $x = $matrix2[$i][$matrix2Columns - 1];
+                    for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
+                        $matrix2[$i][$j] = $x;
+                    }
+                }
+            }
+            if ($matrix2Rows < $matrix1Rows) {
+                $x = $matrix2[$matrix2Rows - 1];
+                for ($i = 0; $i < $matrix1Rows; ++$i) {
+                    $matrix2[$i] = $x;
+                }
+            }
+        }
+
+        if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
+            if ($matrix1Columns < $matrix2Columns) {
+                for ($i = 0; $i < $matrix1Rows; ++$i) {
+                    $x = $matrix1[$i][$matrix1Columns - 1];
+                    for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
+                        $matrix1[$i][$j] = $x;
+                    }
+                }
+            }
+            if ($matrix1Rows < $matrix2Rows) {
+                $x = $matrix1[$matrix1Rows - 1];
+                for ($i = 0; $i < $matrix2Rows; ++$i) {
+                    $matrix1[$i] = $x;
+                }
+            }
+        }
+    }
+
+    /**
+     * Format details of an operand for display in the log (based on operand type).
+     *
+     * @param mixed $value First matrix operand
+     */
+    private function showValue(mixed $value): mixed
+    {
+        if ($this->debugLog->getWriteDebugLog()) {
+            $testArray = Functions::flattenArray($value);
+            if (count($testArray) == 1) {
+                $value = array_pop($testArray);
+            }
+
+            if (is_array($value)) {
+                $returnMatrix = [];
+                $pad = $rpad = ', ';
+                foreach ($value as $row) {
+                    if (is_array($row)) {
+                        $returnMatrix[] = implode($pad, array_map([$this, 'showValue'], $row));
+                        $rpad = '; ';
+                    } else {
+                        $returnMatrix[] = $this->showValue($row);
+                    }
+                }
+
+                return '{ ' . implode($rpad, $returnMatrix) . ' }';
+            } elseif (is_string($value) && (trim($value, self::FORMULA_STRING_QUOTE) == $value)) {
+                return self::FORMULA_STRING_QUOTE . $value . self::FORMULA_STRING_QUOTE;
+            } elseif (is_bool($value)) {
+                return ($value) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
+            } elseif ($value === null) {
+                return self::$localeBoolean['NULL'];
+            }
+        }
+
+        return Functions::flattenSingleValue($value);
+    }
+
+    /**
+     * Format type and details of an operand for display in the log (based on operand type).
+     *
+     * @param mixed $value First matrix operand
+     */
+    private function showTypeDetails(mixed $value): ?string
+    {
+        if ($this->debugLog->getWriteDebugLog()) {
+            $testArray = Functions::flattenArray($value);
+            if (count($testArray) == 1) {
+                $value = array_pop($testArray);
+            }
+
+            if ($value === null) {
+                return 'a NULL value';
+            } elseif (is_float($value)) {
+                $typeString = 'a floating point number';
+            } elseif (is_int($value)) {
+                $typeString = 'an integer number';
+            } elseif (is_bool($value)) {
+                $typeString = 'a boolean';
+            } elseif (is_array($value)) {
+                $typeString = 'a matrix';
+            } else {
+                if ($value == '') {
+                    return 'an empty string';
+                } elseif ($value[0] == '#') {
+                    return 'a ' . $value . ' error';
+                }
+                $typeString = 'a string';
+            }
+
+            return $typeString . ' with a value of ' . $this->showValue($value);
+        }
+
+        return null;
+    }
+
+    /**
+     * @return false|string False indicates an error
+     */
+    private function convertMatrixReferences(string $formula): false|string
+    {
+        static $matrixReplaceFrom = [self::FORMULA_OPEN_MATRIX_BRACE, ';', self::FORMULA_CLOSE_MATRIX_BRACE];
+        static $matrixReplaceTo = ['MKMATRIX(MKMATRIX(', '),MKMATRIX(', '))'];
+
+        //    Convert any Excel matrix references to the MKMATRIX() function
+        if (str_contains($formula, self::FORMULA_OPEN_MATRIX_BRACE)) {
+            //    If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
+            if (str_contains($formula, self::FORMULA_STRING_QUOTE)) {
+                //    So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
+                //        the formula
+                $temp = explode(self::FORMULA_STRING_QUOTE, $formula);
+                //    Open and Closed counts used for trapping mismatched braces in the formula
+                $openCount = $closeCount = 0;
+                $notWithinQuotes = false;
+                foreach ($temp as &$value) {
+                    //    Only count/replace in alternating array entries
+                    $notWithinQuotes = $notWithinQuotes === false;
+                    if ($notWithinQuotes === true) {
+                        $openCount += substr_count($value, self::FORMULA_OPEN_MATRIX_BRACE);
+                        $closeCount += substr_count($value, self::FORMULA_CLOSE_MATRIX_BRACE);
+                        $value = str_replace($matrixReplaceFrom, $matrixReplaceTo, $value);
+                    }
+                }
+                unset($value);
+                //    Then rebuild the formula string
+                $formula = implode(self::FORMULA_STRING_QUOTE, $temp);
+            } else {
+                //    If there's no quoted strings, then we do a simple count/replace
+                $openCount = substr_count($formula, self::FORMULA_OPEN_MATRIX_BRACE);
+                $closeCount = substr_count($formula, self::FORMULA_CLOSE_MATRIX_BRACE);
+                $formula = str_replace($matrixReplaceFrom, $matrixReplaceTo, $formula);
+            }
+            //    Trap for mismatched braces and trigger an appropriate error
+            if ($openCount < $closeCount) {
+                if ($openCount > 0) {
+                    return $this->raiseFormulaError("Formula Error: Mismatched matrix braces '}'");
+                }
+
+                return $this->raiseFormulaError("Formula Error: Unexpected '}' encountered");
+            } elseif ($openCount > $closeCount) {
+                if ($closeCount > 0) {
+                    return $this->raiseFormulaError("Formula Error: Mismatched matrix braces '{'");
+                }
+
+                return $this->raiseFormulaError("Formula Error: Unexpected '{' encountered");
+            }
+        }
+
+        return $formula;
+    }
+
+    /**
+     *    Binary Operators.
+     *    These operators always work on two values.
+     *    Array key is the operator, the value indicates whether this is a left or right associative operator.
+     */
+    private static array $operatorAssociativity = [
+        '^' => 0, //    Exponentiation
+        '*' => 0, '/' => 0, //    Multiplication and Division
+        '+' => 0, '-' => 0, //    Addition and Subtraction
+        '&' => 0, //    Concatenation
+        '∪' => 0, '∩' => 0, ':' => 0, //    Union, Intersect and Range
+        '>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0, //    Comparison
+    ];
+
+    /**
+     *    Comparison (Boolean) Operators.
+     *    These operators work on two values, but always return a boolean result.
+     */
+    private static array $comparisonOperators = ['>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true];
+
+    /**
+     *    Operator Precedence.
+     *    This list includes all valid operators, whether binary (including boolean) or unary (such as %).
+     *    Array key is the operator, the value is its precedence.
+     */
+    private static array $operatorPrecedence = [
+        ':' => 9, //    Range
+        '∩' => 8, //    Intersect
+        '∪' => 7, //    Union
+        '~' => 6, //    Negation
+        '%' => 5, //    Percentage
+        '^' => 4, //    Exponentiation
+        '*' => 3, '/' => 3, //    Multiplication and Division
+        '+' => 2, '-' => 2, //    Addition and Subtraction
+        '&' => 1, //    Concatenation
+        '>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0, //    Comparison
+    ];
+
+    // Convert infix to postfix notation
+
+    /**
+     * @return array<int, mixed>|false
+     */
+    private function internalParseFormula(string $formula, ?Cell $cell = null): bool|array
+    {
+        if (($formula = $this->convertMatrixReferences(trim($formula))) === false) {
+            return false;
+        }
+
+        //    If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
+        //        so we store the parent worksheet so that we can re-attach it when necessary
+        $pCellParent = ($cell !== null) ? $cell->getWorksheet() : null;
+
+        $regexpMatchString = '/^((?<string>' . self::CALCULATION_REGEXP_STRING
+                                . ')|(?<function>' . self::CALCULATION_REGEXP_FUNCTION
+                                . ')|(?<cellRef>' . self::CALCULATION_REGEXP_CELLREF
+                                . ')|(?<colRange>' . self::CALCULATION_REGEXP_COLUMN_RANGE
+                                . ')|(?<rowRange>' . self::CALCULATION_REGEXP_ROW_RANGE
+                                . ')|(?<number>' . self::CALCULATION_REGEXP_NUMBER
+                                . ')|(?<openBrace>' . self::CALCULATION_REGEXP_OPENBRACE
+                                . ')|(?<structuredReference>' . self::CALCULATION_REGEXP_STRUCTURED_REFERENCE
+                                . ')|(?<definedName>' . self::CALCULATION_REGEXP_DEFINEDNAME
+                                . ')|(?<error>' . self::CALCULATION_REGEXP_ERROR
+                                . '))/sui';
+
+        //    Start with initialisation
+        $index = 0;
+        $stack = new Stack($this->branchPruner);
+        $output = [];
+        $expectingOperator = false; //    We use this test in syntax-checking the expression to determine when a
+        //        - is a negation or + is a positive operator rather than an operation
+        $expectingOperand = false; //    We use this test in syntax-checking the expression to determine whether an operand
+        //        should be null in a function call
+
+        //    The guts of the lexical parser
+        //    Loop through the formula extracting each operator and operand in turn
+        while (true) {
+            // Branch pruning: we adapt the output item to the context (it will
+            // be used to limit its computation)
+            $this->branchPruner->initialiseForLoop();
+
+            $opCharacter = $formula[$index]; //    Get the first character of the value at the current index position
+
+            // Check for two-character operators (e.g. >=, <=, <>)
+            if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && isset($formula[$index + 1], self::$comparisonOperators[$formula[$index + 1]])) {
+                $opCharacter .= $formula[++$index];
+            }
+            //    Find out if we're currently at the beginning of a number, variable, cell/row/column reference,
+            //         function, defined name, structured reference, parenthesis, error or operand
+            $isOperandOrFunction = (bool) preg_match($regexpMatchString, substr($formula, $index), $match);
+
+            $expectingOperatorCopy = $expectingOperator;
+            if ($opCharacter === '-' && !$expectingOperator) {                //    Is it a negation instead of a minus?
+                //    Put a negation on the stack
+                $stack->push('Unary Operator', '~');
+                ++$index; //        and drop the negation symbol
+            } elseif ($opCharacter === '%' && $expectingOperator) {
+                //    Put a percentage on the stack
+                $stack->push('Unary Operator', '%');
+                ++$index;
+            } elseif ($opCharacter === '+' && !$expectingOperator) {            //    Positive (unary plus rather than binary operator plus) can be discarded?
+                ++$index; //    Drop the redundant plus symbol
+            } elseif ((($opCharacter === '~') || ($opCharacter === '∩') || ($opCharacter === '∪')) && (!$isOperandOrFunction)) {
+                //    We have to explicitly deny a tilde, union or intersect because they are legal
+                return $this->raiseFormulaError("Formula Error: Illegal character '~'"); //        on the stack but not in the input expression
+            } elseif ((isset(self::CALCULATION_OPERATORS[$opCharacter]) || $isOperandOrFunction) && $expectingOperator) {    //    Are we putting an operator on the stack?
+                while (
+                    $stack->count() > 0
+                    && ($o2 = $stack->last())
+                    && isset(self::CALCULATION_OPERATORS[$o2['value']])
+                    && @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])
+                ) {
+                    $output[] = $stack->pop(); //    Swap operands and higher precedence operators from the stack to the output
+                }
+
+                //    Finally put our current operator onto the stack
+                $stack->push('Binary Operator', $opCharacter);
+
+                ++$index;
+                $expectingOperator = false;
+            } elseif ($opCharacter === ')' && $expectingOperator) { //    Are we expecting to close a parenthesis?
+                $expectingOperand = false;
+                while (($o2 = $stack->pop()) && $o2['value'] !== '(') { //    Pop off the stack back to the last (
+                    $output[] = $o2;
+                }
+                $d = $stack->last(2);
+
+                // Branch pruning we decrease the depth whether is it a function
+                // call or a parenthesis
+                $this->branchPruner->decrementDepth();
+
+                if (is_array($d) && preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $d['value'], $matches)) {
+                    //    Did this parenthesis just close a function?
+                    try {
+                        $this->branchPruner->closingBrace($d['value']);
+                    } catch (Exception $e) {
+                        return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
+                    }
+
+                    $functionName = $matches[1]; //    Get the function name
+                    $d = $stack->pop();
+                    $argumentCount = $d['value'] ?? 0; //    See how many arguments there were (argument count is the next value stored on the stack)
+                    $output[] = $d; //    Dump the argument count on the output
+                    $output[] = $stack->pop(); //    Pop the function and push onto the output
+                    if (isset(self::$controlFunctions[$functionName])) {
+                        $expectedArgumentCount = self::$controlFunctions[$functionName]['argumentCount'];
+                    } elseif (isset(self::$phpSpreadsheetFunctions[$functionName])) {
+                        $expectedArgumentCount = self::$phpSpreadsheetFunctions[$functionName]['argumentCount'];
+                    } else {    // did we somehow push a non-function on the stack? this should never happen
+                        return $this->raiseFormulaError('Formula Error: Internal error, non-function on stack');
+                    }
+                    //    Check the argument count
+                    $argumentCountError = false;
+                    $expectedArgumentCountString = null;
+                    if (is_numeric($expectedArgumentCount)) {
+                        if ($expectedArgumentCount < 0) {
+                            if ($argumentCount > abs($expectedArgumentCount)) {
+                                $argumentCountError = true;
+                                $expectedArgumentCountString = 'no more than ' . abs($expectedArgumentCount);
+                            }
+                        } else {
+                            if ($argumentCount != $expectedArgumentCount) {
+                                $argumentCountError = true;
+                                $expectedArgumentCountString = $expectedArgumentCount;
+                            }
+                        }
+                    } elseif ($expectedArgumentCount != '*') {
+                        preg_match('/(\d*)([-+,])(\d*)/', $expectedArgumentCount, $argMatch);
+                        switch ($argMatch[2] ?? '') {
+                            case '+':
+                                if ($argumentCount < $argMatch[1]) {
+                                    $argumentCountError = true;
+                                    $expectedArgumentCountString = $argMatch[1] . ' or more ';
+                                }
+
+                                break;
+                            case '-':
+                                if (($argumentCount < $argMatch[1]) || ($argumentCount > $argMatch[3])) {
+                                    $argumentCountError = true;
+                                    $expectedArgumentCountString = 'between ' . $argMatch[1] . ' and ' . $argMatch[3];
+                                }
+
+                                break;
+                            case ',':
+                                if (($argumentCount != $argMatch[1]) && ($argumentCount != $argMatch[3])) {
+                                    $argumentCountError = true;
+                                    $expectedArgumentCountString = 'either ' . $argMatch[1] . ' or ' . $argMatch[3];
+                                }
+
+                                break;
+                        }
+                    }
+                    if ($argumentCountError) {
+                        return $this->raiseFormulaError("Formula Error: Wrong number of arguments for $functionName() function: $argumentCount given, " . $expectedArgumentCountString . ' expected');
+                    }
+                }
+                ++$index;
+            } elseif ($opCharacter === ',') { // Is this the separator for function arguments?
+                try {
+                    $this->branchPruner->argumentSeparator();
+                } catch (Exception $e) {
+                    return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
+                }
+
+                while (($o2 = $stack->pop()) && $o2['value'] !== '(') {        //    Pop off the stack back to the last (
+                    $output[] = $o2; // pop the argument expression stuff and push onto the output
+                }
+                //    If we've a comma when we're expecting an operand, then what we actually have is a null operand;
+                //        so push a null onto the stack
+                if (($expectingOperand) || (!$expectingOperator)) {
+                    $output[] = $stack->getStackItem('Empty Argument', null, 'NULL');
+                }
+                // make sure there was a function
+                $d = $stack->last(2);
+                if (!preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $d['value'] ?? '', $matches)) {
+                    // Can we inject a dummy function at this point so that the braces at least have some context
+                    //     because at least the braces are paired up (at this stage in the formula)
+                    // MS Excel allows this if the content is cell references; but doesn't allow actual values,
+                    //    but at this point, we can't differentiate (so allow both)
+                    return $this->raiseFormulaError('Formula Error: Unexpected ,');
+                }
+
+                /** @var array $d */
+                $d = $stack->pop();
+                ++$d['value']; // increment the argument count
+
+                $stack->pushStackItem($d);
+                $stack->push('Brace', '('); // put the ( back on, we'll need to pop back to it again
+
+                $expectingOperator = false;
+                $expectingOperand = true;
+                ++$index;
+            } elseif ($opCharacter === '(' && !$expectingOperator) {
+                // Branch pruning: we go deeper
+                $this->branchPruner->incrementDepth();
+                $stack->push('Brace', '(', null);
+                ++$index;
+            } elseif ($isOperandOrFunction && !$expectingOperatorCopy) {
+                // do we now have a function/variable/number?
+                $expectingOperator = true;
+                $expectingOperand = false;
+                $val = $match[1];
+                $length = strlen($val);
+
+                if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $val, $matches)) {
+                    $val = (string) preg_replace('/\s/u', '', $val);
+                    if (isset(self::$phpSpreadsheetFunctions[strtoupper($matches[1])]) || isset(self::$controlFunctions[strtoupper($matches[1])])) {    // it's a function
+                        $valToUpper = strtoupper($val);
+                    } else {
+                        $valToUpper = 'NAME.ERROR(';
+                    }
+                    // here $matches[1] will contain values like "IF"
+                    // and $val "IF("
+
+                    $this->branchPruner->functionCall($valToUpper);
+
+                    $stack->push('Function', $valToUpper);
+                    // tests if the function is closed right after opening
+                    $ax = preg_match('/^\s*\)/u', substr($formula, $index + $length));
+                    if ($ax) {
+                        $stack->push('Operand Count for Function ' . $valToUpper . ')', 0);
+                        $expectingOperator = true;
+                    } else {
+                        $stack->push('Operand Count for Function ' . $valToUpper . ')', 1);
+                        $expectingOperator = false;
+                    }
+                    $stack->push('Brace', '(');
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $val, $matches)) {
+                    //    Watch for this case-change when modifying to allow cell references in different worksheets...
+                    //    Should only be applied to the actual cell column, not the worksheet name
+                    //    If the last entry on the stack was a : operator, then we have a cell range reference
+                    $testPrevOp = $stack->last(1);
+                    if ($testPrevOp !== null && $testPrevOp['value'] === ':') {
+                        //    If we have a worksheet reference, then we're playing with a 3D reference
+                        if ($matches[2] === '') {
+                            //    Otherwise, we 'inherit' the worksheet reference from the start cell reference
+                            //    The start of the cell range reference should be the last entry in $output
+                            $rangeStartCellRef = $output[count($output) - 1]['value'] ?? '';
+                            if ($rangeStartCellRef === ':') {
+                                // Do we have chained range operators?
+                                $rangeStartCellRef = $output[count($output) - 2]['value'] ?? '';
+                            }
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $rangeStartCellRef, $rangeStartMatches);
+                            if (array_key_exists(2, $rangeStartMatches)) {
+                                if ($rangeStartMatches[2] > '') {
+                                    $val = $rangeStartMatches[2] . '!' . $val;
+                                }
+                            } else {
+                                $val = ExcelError::REF();
+                            }
+                        } else {
+                            $rangeStartCellRef = $output[count($output) - 1]['value'] ?? '';
+                            if ($rangeStartCellRef === ':') {
+                                // Do we have chained range operators?
+                                $rangeStartCellRef = $output[count($output) - 2]['value'] ?? '';
+                            }
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $rangeStartCellRef, $rangeStartMatches);
+                            if ($rangeStartMatches[2] !== $matches[2]) {
+                                return $this->raiseFormulaError('3D Range references are not yet supported');
+                            }
+                        }
+                    } elseif (!str_contains($val, '!') && $pCellParent !== null) {
+                        $worksheet = $pCellParent->getTitle();
+                        $val = "'{$worksheet}'!{$val}";
+                    }
+                    // unescape any apostrophes or double quotes in worksheet name
+                    $val = str_replace(["''", '""'], ["'", '"'], $val);
+                    $outputItem = $stack->getStackItem('Cell Reference', $val, $val);
+
+                    $output[] = $outputItem;
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_STRUCTURED_REFERENCE . '$/miu', $val, $matches)) {
+                    try {
+                        $structuredReference = Operands\StructuredReference::fromParser($formula, $index, $matches);
+                    } catch (Exception $e) {
+                        return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
+                    }
+
+                    $val = $structuredReference->value();
+                    $length = strlen($val);
+                    $outputItem = $stack->getStackItem(Operands\StructuredReference::NAME, $structuredReference, null);
+
+                    $output[] = $outputItem;
+                    $expectingOperator = true;
+                } else {
+                    // it's a variable, constant, string, number or boolean
+                    $localeConstant = false;
+                    $stackItemType = 'Value';
+                    $stackItemReference = null;
+
+                    //    If the last entry on the stack was a : operator, then we may have a row or column range reference
+                    $testPrevOp = $stack->last(1);
+                    if ($testPrevOp !== null && $testPrevOp['value'] === ':') {
+                        $stackItemType = 'Cell Reference';
+
+                        if (
+                            !is_numeric($val)
+                            && ((ctype_alpha($val) === false || strlen($val) > 3))
+                            && (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $val) !== false)
+                            && ($this->spreadsheet === null || $this->spreadsheet->getNamedRange($val) !== null)
+                        ) {
+                            $namedRange = ($this->spreadsheet === null) ? null : $this->spreadsheet->getNamedRange($val);
+                            if ($namedRange !== null) {
+                                $stackItemType = 'Defined Name';
+                                $address = str_replace('$', '', $namedRange->getValue());
+                                $stackItemReference = $val;
+                                if (str_contains($address, ':')) {
+                                    // We'll need to manipulate the stack for an actual named range rather than a named cell
+                                    $fromTo = explode(':', $address);
+                                    $to = array_pop($fromTo);
+                                    foreach ($fromTo as $from) {
+                                        $output[] = $stack->getStackItem($stackItemType, $from, $stackItemReference);
+                                        $output[] = $stack->getStackItem('Binary Operator', ':');
+                                    }
+                                    $address = $to;
+                                }
+                                $val = $address;
+                            }
+                        } elseif ($val === ExcelError::REF()) {
+                            $stackItemReference = $val;
+                        } else {
+                            /** @var non-empty-string $startRowColRef */
+                            $startRowColRef = $output[count($output) - 1]['value'] ?? '';
+                            [$rangeWS1, $startRowColRef] = Worksheet::extractSheetTitle($startRowColRef, true);
+                            $rangeSheetRef = $rangeWS1;
+                            if ($rangeWS1 !== '') {
+                                $rangeWS1 .= '!';
+                            }
+                            $rangeSheetRef = trim($rangeSheetRef, "'");
+                            [$rangeWS2, $val] = Worksheet::extractSheetTitle($val, true);
+                            if ($rangeWS2 !== '') {
+                                $rangeWS2 .= '!';
+                            } else {
+                                $rangeWS2 = $rangeWS1;
+                            }
+
+                            $refSheet = $pCellParent;
+                            if ($pCellParent !== null && $rangeSheetRef !== '' && $rangeSheetRef !== $pCellParent->getTitle()) {
+                                $refSheet = $pCellParent->getParentOrThrow()->getSheetByName($rangeSheetRef);
+                            }
+
+                            if (ctype_digit($val) && $val <= 1048576) {
+                                //    Row range
+                                $stackItemType = 'Row Reference';
+                                /** @var int $valx */
+                                $valx = $val;
+                                $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataColumn($valx) : AddressRange::MAX_COLUMN; //    Max 16,384 columns for Excel2007
+                                $val = "{$rangeWS2}{$endRowColRef}{$val}";
+                            } elseif (ctype_alpha($val) && strlen($val ?? '') <= 3) {
+                                //    Column range
+                                $stackItemType = 'Column Reference';
+                                $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataRow($val) : AddressRange::MAX_ROW; //    Max 1,048,576 rows for Excel2007
+                                $val = "{$rangeWS2}{$val}{$endRowColRef}";
+                            }
+                            $stackItemReference = $val;
+                        }
+                    } elseif ($opCharacter === self::FORMULA_STRING_QUOTE) {
+                        //    UnEscape any quotes within the string
+                        $val = self::wrapResult(str_replace('""', self::FORMULA_STRING_QUOTE, self::unwrapResult($val)));
+                    } elseif (isset(self::$excelConstants[trim(strtoupper($val))])) {
+                        $stackItemType = 'Constant';
+                        $excelConstant = trim(strtoupper($val));
+                        $val = self::$excelConstants[$excelConstant];
+                        $stackItemReference = $excelConstant;
+                    } elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$localeBoolean)) !== false) {
+                        $stackItemType = 'Constant';
+                        $val = self::$excelConstants[$localeConstant];
+                        $stackItemReference = $localeConstant;
+                    } elseif (
+                        preg_match('/^' . self::CALCULATION_REGEXP_ROW_RANGE . '/miu', substr($formula, $index), $rowRangeReference)
+                    ) {
+                        $val = $rowRangeReference[1];
+                        $length = strlen($rowRangeReference[1]);
+                        $stackItemType = 'Row Reference';
+                        // unescape any apostrophes or double quotes in worksheet name
+                        $val = str_replace(["''", '""'], ["'", '"'], $val);
+                        $column = 'A';
+                        if (($testPrevOp !== null && $testPrevOp['value'] === ':') && $pCellParent !== null) {
+                            $column = $pCellParent->getHighestDataColumn($val);
+                        }
+                        $val = "{$rowRangeReference[2]}{$column}{$rowRangeReference[7]}";
+                        $stackItemReference = $val;
+                    } elseif (
+                        preg_match('/^' . self::CALCULATION_REGEXP_COLUMN_RANGE . '/miu', substr($formula, $index), $columnRangeReference)
+                    ) {
+                        $val = $columnRangeReference[1];
+                        $length = strlen($val);
+                        $stackItemType = 'Column Reference';
+                        // unescape any apostrophes or double quotes in worksheet name
+                        $val = str_replace(["''", '""'], ["'", '"'], $val);
+                        $row = '1';
+                        if (($testPrevOp !== null && $testPrevOp['value'] === ':') && $pCellParent !== null) {
+                            $row = $pCellParent->getHighestDataRow($val);
+                        }
+                        $val = "{$val}{$row}";
+                        $stackItemReference = $val;
+                    } elseif (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '.*/miu', $val, $match)) {
+                        $stackItemType = 'Defined Name';
+                        $stackItemReference = $val;
+                    } elseif (is_numeric($val)) {
+                        if ((str_contains((string) $val, '.')) || (stripos((string) $val, 'e') !== false) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
+                            $val = (float) $val;
+                        } else {
+                            $val = (int) $val;
+                        }
+                    }
+
+                    $details = $stack->getStackItem($stackItemType, $val, $stackItemReference);
+                    if ($localeConstant) {
+                        $details['localeValue'] = $localeConstant;
+                    }
+                    $output[] = $details;
+                }
+                $index += $length;
+            } elseif ($opCharacter === '$') { // absolute row or column range
+                ++$index;
+            } elseif ($opCharacter === ')') { // miscellaneous error checking
+                if ($expectingOperand) {
+                    $output[] = $stack->getStackItem('Empty Argument', null, 'NULL');
+                    $expectingOperand = false;
+                    $expectingOperator = true;
+                } else {
+                    return $this->raiseFormulaError("Formula Error: Unexpected ')'");
+                }
+            } elseif (isset(self::CALCULATION_OPERATORS[$opCharacter]) && !$expectingOperator) {
+                return $this->raiseFormulaError("Formula Error: Unexpected operator '$opCharacter'");
+            } else {    // I don't even want to know what you did to get here
+                return $this->raiseFormulaError('Formula Error: An unexpected error occurred');
+            }
+            //    Test for end of formula string
+            if ($index == strlen($formula)) {
+                //    Did we end with an operator?.
+                //    Only valid for the % unary operator
+                if ((isset(self::CALCULATION_OPERATORS[$opCharacter])) && ($opCharacter != '%')) {
+                    return $this->raiseFormulaError("Formula Error: Operator '$opCharacter' has no operands");
+                }
+
+                break;
+            }
+            //    Ignore white space
+            while (($formula[$index] === "\n") || ($formula[$index] === "\r")) {
+                ++$index;
+            }
+
+            if ($formula[$index] === ' ') {
+                while ($formula[$index] === ' ') {
+                    ++$index;
+                }
+
+                //    If we're expecting an operator, but only have a space between the previous and next operands (and both are
+                //        Cell References, Defined Names or Structured References) then we have an INTERSECTION operator
+                $countOutputMinus1 = count($output) - 1;
+                if (
+                    ($expectingOperator)
+                    && array_key_exists($countOutputMinus1, $output)
+                    && is_array($output[$countOutputMinus1])
+                    && array_key_exists('type', $output[$countOutputMinus1])
+                    && (
+                        (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/miu', substr($formula, $index), $match))
+                            && ($output[$countOutputMinus1]['type'] === 'Cell Reference')
+                        || (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '.*/miu', substr($formula, $index), $match))
+                            && ($output[$countOutputMinus1]['type'] === 'Defined Name' || $output[$countOutputMinus1]['type'] === 'Value')
+                        || (preg_match('/^' . self::CALCULATION_REGEXP_STRUCTURED_REFERENCE . '.*/miu', substr($formula, $index), $match))
+                            && ($output[$countOutputMinus1]['type'] === Operands\StructuredReference::NAME || $output[$countOutputMinus1]['type'] === 'Value')
+                    )
+                ) {
+                    while (
+                        $stack->count() > 0
+                        && ($o2 = $stack->last())
+                        && isset(self::CALCULATION_OPERATORS[$o2['value']])
+                        && @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])
+                    ) {
+                        $output[] = $stack->pop(); //    Swap operands and higher precedence operators from the stack to the output
+                    }
+                    $stack->push('Binary Operator', '∩'); //    Put an Intersect Operator on the stack
+                    $expectingOperator = false;
+                }
+            }
+        }
+
+        while (($op = $stack->pop()) !== null) {
+            // pop everything off the stack and push onto output
+            if ((is_array($op) && $op['value'] == '(')) {
+                return $this->raiseFormulaError("Formula Error: Expecting ')'"); // if there are any opening braces on the stack, then braces were unbalanced
+            }
+            $output[] = $op;
+        }
+
+        return $output;
+    }
+
+    private static function dataTestReference(array &$operandData): mixed
+    {
+        $operand = $operandData['value'];
+        if (($operandData['reference'] === null) && (is_array($operand))) {
+            $rKeys = array_keys($operand);
+            $rowKey = array_shift($rKeys);
+            if (is_array($operand[$rowKey]) === false) {
+                $operandData['value'] = $operand[$rowKey];
+
+                return $operand[$rowKey];
+            }
+
+            $cKeys = array_keys(array_keys($operand[$rowKey]));
+            $colKey = array_shift($cKeys);
+            if (ctype_upper("$colKey")) {
+                $operandData['reference'] = $colKey . $rowKey;
+            }
+        }
+
+        return $operand;
+    }
+
+    /**
+     * @return array<int, mixed>|false
+     */
+    private function processTokenStack(mixed $tokens, ?string $cellID = null, ?Cell $cell = null)
+    {
+        if ($tokens === false) {
+            return false;
+        }
+
+        //    If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent cell collection),
+        //        so we store the parent cell collection so that we can re-attach it when necessary
+        $pCellWorksheet = ($cell !== null) ? $cell->getWorksheet() : null;
+        $pCellParent = ($cell !== null) ? $cell->getParent() : null;
+        $stack = new Stack($this->branchPruner);
+
+        // Stores branches that have been pruned
+        $fakedForBranchPruning = [];
+        // help us to know when pruning ['branchTestId' => true/false]
+        $branchStore = [];
+        //    Loop through each token in turn
+        foreach ($tokens as $tokenData) {
+            $token = $tokenData['value'];
+            // Branch pruning: skip useless resolutions
+            $storeKey = $tokenData['storeKey'] ?? null;
+            if ($this->branchPruningEnabled && isset($tokenData['onlyIf'])) {
+                $onlyIfStoreKey = $tokenData['onlyIf'];
+                $storeValue = $branchStore[$onlyIfStoreKey] ?? null;
+                $storeValueAsBool = ($storeValue === null)
+                    ? true : (bool) Functions::flattenSingleValue($storeValue);
+                if (is_array($storeValue)) {
+                    $wrappedItem = end($storeValue);
+                    $storeValue = is_array($wrappedItem) ? end($wrappedItem) : $wrappedItem;
+                }
+
+                if (
+                    (isset($storeValue) || $tokenData['reference'] === 'NULL')
+                    && (!$storeValueAsBool || Information\ErrorValue::isError($storeValue) || ($storeValue === 'Pruned branch'))
+                ) {
+                    // If branching value is not true, we don't need to compute
+                    if (!isset($fakedForBranchPruning['onlyIf-' . $onlyIfStoreKey])) {
+                        $stack->push('Value', 'Pruned branch (only if ' . $onlyIfStoreKey . ') ' . $token);
+                        $fakedForBranchPruning['onlyIf-' . $onlyIfStoreKey] = true;
+                    }
+
+                    if (isset($storeKey)) {
+                        // We are processing an if condition
+                        // We cascade the pruning to the depending branches
+                        $branchStore[$storeKey] = 'Pruned branch';
+                        $fakedForBranchPruning['onlyIfNot-' . $storeKey] = true;
+                        $fakedForBranchPruning['onlyIf-' . $storeKey] = true;
+                    }
+
+                    continue;
+                }
+            }
+
+            if ($this->branchPruningEnabled && isset($tokenData['onlyIfNot'])) {
+                $onlyIfNotStoreKey = $tokenData['onlyIfNot'];
+                $storeValue = $branchStore[$onlyIfNotStoreKey] ?? null;
+                $storeValueAsBool = ($storeValue === null)
+                    ? true : (bool) Functions::flattenSingleValue($storeValue);
+                if (is_array($storeValue)) {
+                    $wrappedItem = end($storeValue);
+                    $storeValue = is_array($wrappedItem) ? end($wrappedItem) : $wrappedItem;
+                }
+
+                if (
+                    (isset($storeValue) || $tokenData['reference'] === 'NULL')
+                    && ($storeValueAsBool || Information\ErrorValue::isError($storeValue) || ($storeValue === 'Pruned branch'))
+                ) {
+                    // If branching value is true, we don't need to compute
+                    if (!isset($fakedForBranchPruning['onlyIfNot-' . $onlyIfNotStoreKey])) {
+                        $stack->push('Value', 'Pruned branch (only if not ' . $onlyIfNotStoreKey . ') ' . $token);
+                        $fakedForBranchPruning['onlyIfNot-' . $onlyIfNotStoreKey] = true;
+                    }
+
+                    if (isset($storeKey)) {
+                        // We are processing an if condition
+                        // We cascade the pruning to the depending branches
+                        $branchStore[$storeKey] = 'Pruned branch';
+                        $fakedForBranchPruning['onlyIfNot-' . $storeKey] = true;
+                        $fakedForBranchPruning['onlyIf-' . $storeKey] = true;
+                    }
+
+                    continue;
+                }
+            }
+
+            if ($token instanceof Operands\StructuredReference) {
+                if ($cell === null) {
+                    return $this->raiseFormulaError('Structured References must exist in a Cell context');
+                }
+
+                try {
+                    $cellRange = $token->parse($cell);
+                    if (str_contains($cellRange, ':')) {
+                        $this->debugLog->writeDebugLog('Evaluating Structured Reference %s as Cell Range %s', $token->value(), $cellRange);
+                        $rangeValue = self::getInstance($cell->getWorksheet()->getParent())->_calculateFormulaValue("={$cellRange}", $cellRange, $cell);
+                        $stack->push('Value', $rangeValue);
+                        $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as value %s', $token->value(), $this->showValue($rangeValue));
+                    } else {
+                        $this->debugLog->writeDebugLog('Evaluating Structured Reference %s as Cell %s', $token->value(), $cellRange);
+                        $cellValue = $cell->getWorksheet()->getCell($cellRange)->getCalculatedValue(false);
+                        $stack->push('Cell Reference', $cellValue, $cellRange);
+                        $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as value %s', $token->value(), $this->showValue($cellValue));
+                    }
+                } catch (Exception $e) {
+                    if ($e->getCode() === Exception::CALCULATION_ENGINE_PUSH_TO_STACK) {
+                        $stack->push('Error', ExcelError::REF(), null);
+                        $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as error value %s', $token->value(), ExcelError::REF());
+                    } else {
+                        return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
+                    }
+                }
+            } elseif (!is_numeric($token) && !is_object($token) && isset(self::BINARY_OPERATORS[$token])) {
+                // if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack
+                //    We must have two operands, error if we don't
+                $operand2Data = $stack->pop();
+                if ($operand2Data === null) {
+                    return $this->raiseFormulaError('Internal error - Operand value missing from stack');
+                }
+                $operand1Data = $stack->pop();
+                if ($operand1Data === null) {
+                    return $this->raiseFormulaError('Internal error - Operand value missing from stack');
+                }
+
+                $operand1 = self::dataTestReference($operand1Data);
+                $operand2 = self::dataTestReference($operand2Data);
+
+                //    Log what we're doing
+                if ($token == ':') {
+                    $this->debugLog->writeDebugLog('Evaluating Range %s %s %s', $this->showValue($operand1Data['reference']), $token, $this->showValue($operand2Data['reference']));
+                } else {
+                    $this->debugLog->writeDebugLog('Evaluating %s %s %s', $this->showValue($operand1), $token, $this->showValue($operand2));
+                }
+
+                //    Process the operation in the appropriate manner
+                switch ($token) {
+                    // Comparison (Boolean) Operators
+                    case '>': // Greater than
+                    case '<': // Less than
+                    case '>=': // Greater than or Equal to
+                    case '<=': // Less than or Equal to
+                    case '=': // Equality
+                    case '<>': // Inequality
+                        $result = $this->executeBinaryComparisonOperation($operand1, $operand2, (string) $token, $stack);
+                        if (isset($storeKey)) {
+                            $branchStore[$storeKey] = $result;
+                        }
+
+                        break;
+                    // Binary Operators
+                    case ':': // Range
+                        if ($operand1Data['type'] === 'Defined Name') {
+                            if (preg_match('/$' . self::CALCULATION_REGEXP_DEFINEDNAME . '^/mui', $operand1Data['reference']) !== false && $this->spreadsheet !== null) {
+                                $definedName = $this->spreadsheet->getNamedRange($operand1Data['reference']);
+                                if ($definedName !== null) {
+                                    $operand1Data['reference'] = $operand1Data['value'] = str_replace('$', '', $definedName->getValue());
+                                }
+                            }
+                        }
+                        if (str_contains($operand1Data['reference'] ?? '', '!')) {
+                            [$sheet1, $operand1Data['reference']] = Worksheet::extractSheetTitle($operand1Data['reference'], true);
+                        } else {
+                            $sheet1 = ($pCellWorksheet !== null) ? $pCellWorksheet->getTitle() : '';
+                        }
+                        $sheet1 ??= '';
+
+                        [$sheet2, $operand2Data['reference']] = Worksheet::extractSheetTitle($operand2Data['reference'], true);
+                        if (empty($sheet2)) {
+                            $sheet2 = $sheet1;
+                        }
+
+                        if (trim($sheet1, "'") === trim($sheet2, "'")) {
+                            if ($operand1Data['reference'] === null && $cell !== null) {
+                                if (is_array($operand1Data['value'])) {
+                                    $operand1Data['reference'] = $cell->getCoordinate();
+                                } elseif ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
+                                    $operand1Data['reference'] = $cell->getColumn() . $operand1Data['value'];
+                                } elseif (trim($operand1Data['value']) == '') {
+                                    $operand1Data['reference'] = $cell->getCoordinate();
+                                } else {
+                                    $operand1Data['reference'] = $operand1Data['value'] . $cell->getRow();
+                                }
+                            }
+                            if ($operand2Data['reference'] === null && $cell !== null) {
+                                if (is_array($operand2Data['value'])) {
+                                    $operand2Data['reference'] = $cell->getCoordinate();
+                                } elseif ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
+                                    $operand2Data['reference'] = $cell->getColumn() . $operand2Data['value'];
+                                } elseif (trim($operand2Data['value']) == '') {
+                                    $operand2Data['reference'] = $cell->getCoordinate();
+                                } else {
+                                    $operand2Data['reference'] = $operand2Data['value'] . $cell->getRow();
+                                }
+                            }
+
+                            $oData = array_merge(explode(':', $operand1Data['reference'] ?? ''), explode(':', $operand2Data['reference'] ?? ''));
+                            $oCol = $oRow = [];
+                            $breakNeeded = false;
+                            foreach ($oData as $oDatum) {
+                                try {
+                                    $oCR = Coordinate::coordinateFromString($oDatum);
+                                    $oCol[] = Coordinate::columnIndexFromString($oCR[0]) - 1;
+                                    $oRow[] = $oCR[1];
+                                } catch (\Exception) {
+                                    $stack->push('Error', ExcelError::REF(), null);
+                                    $breakNeeded = true;
+
+                                    break;
+                                }
+                            }
+                            if ($breakNeeded) {
+                                break;
+                            }
+                            $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':' . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
+                            if ($pCellParent !== null && $this->spreadsheet !== null) {
+                                $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($sheet1), false);
+                            } else {
+                                return $this->raiseFormulaError('Unable to access Cell Reference');
+                            }
+
+                            $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($cellValue));
+                            $stack->push('Cell Reference', $cellValue, $cellRef);
+                        } else {
+                            $this->debugLog->writeDebugLog('Evaluation Result is a #REF! Error');
+                            $stack->push('Error', ExcelError::REF(), null);
+                        }
+
+                        break;
+                    case '+':            //    Addition
+                    case '-':            //    Subtraction
+                    case '*':            //    Multiplication
+                    case '/':            //    Division
+                    case '^':            //    Exponential
+                        $result = $this->executeNumericBinaryOperation($operand1, $operand2, $token, $stack);
+                        if (isset($storeKey)) {
+                            $branchStore[$storeKey] = $result;
+                        }
+
+                        break;
+                    case '&':            //    Concatenation
+                        //    If either of the operands is a matrix, we need to treat them both as matrices
+                        //        (converting the other operand to a matrix if need be); then perform the required
+                        //        matrix operation
+                        $operand1 = self::boolToString($operand1);
+                        $operand2 = self::boolToString($operand2);
+                        if (is_array($operand1) || is_array($operand2)) {
+                            if (is_string($operand1)) {
+                                $operand1 = self::unwrapResult($operand1);
+                            }
+                            if (is_string($operand2)) {
+                                $operand2 = self::unwrapResult($operand2);
+                            }
+                            //    Ensure that both operands are arrays/matrices
+                            [$rows, $columns] = self::checkMatrixOperands($operand1, $operand2, 2);
+
+                            for ($row = 0; $row < $rows; ++$row) {
+                                for ($column = 0; $column < $columns; ++$column) {
+                                    $op1x = self::boolToString($operand1[$row][$column]);
+                                    $op2x = self::boolToString($operand2[$row][$column]);
+                                    if (Information\ErrorValue::isError($op1x)) {
+                                        // no need to do anything
+                                    } elseif (Information\ErrorValue::isError($op2x)) {
+                                        $operand1[$row][$column] = $op2x;
+                                    } else {
+                                        $operand1[$row][$column]
+                                            = Shared\StringHelper::substring(
+                                                $op1x . $op2x,
+                                                0,
+                                                DataType::MAX_STRING_LENGTH
+                                            );
+                                    }
+                                }
+                            }
+                            $result = $operand1;
+                        } else {
+                            // In theory, we should truncate here.
+                            // But I can't figure out a formula
+                            // using the concatenation operator
+                            // with literals that fits in 32K,
+                            // so I don't think we can overflow here.
+                            if (Information\ErrorValue::isError($operand1)) {
+                                $result = $operand1;
+                            } elseif (Information\ErrorValue::isError($operand2)) {
+                                $result = $operand2;
+                            } else {
+                                $result = self::FORMULA_STRING_QUOTE . str_replace('""', self::FORMULA_STRING_QUOTE, self::unwrapResult($operand1) . self::unwrapResult($operand2)) . self::FORMULA_STRING_QUOTE;
+                            }
+                        }
+                        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($result));
+                        $stack->push('Value', $result);
+
+                        if (isset($storeKey)) {
+                            $branchStore[$storeKey] = $result;
+                        }
+
+                        break;
+                    case '∩':            //    Intersect
+                        $rowIntersect = array_intersect_key($operand1, $operand2);
+                        $cellIntersect = $oCol = $oRow = [];
+                        foreach (array_keys($rowIntersect) as $row) {
+                            $oRow[] = $row;
+                            foreach ($rowIntersect[$row] as $col => $data) {
+                                $oCol[] = Coordinate::columnIndexFromString($col) - 1;
+                                $cellIntersect[$row] = array_intersect_key($operand1[$row], $operand2[$row]);
+                            }
+                        }
+                        if (count(Functions::flattenArray($cellIntersect)) === 0) {
+                            $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($cellIntersect));
+                            $stack->push('Error', ExcelError::null(), null);
+                        } else {
+                            $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':'
+                                . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
+                            $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($cellIntersect));
+                            $stack->push('Value', $cellIntersect, $cellRef);
+                        }
+
+                        break;
+                }
+            } elseif (($token === '~') || ($token === '%')) {
+                // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
+                if (($arg = $stack->pop()) === null) {
+                    return $this->raiseFormulaError('Internal error - Operand value missing from stack');
+                }
+                $arg = $arg['value'];
+                if ($token === '~') {
+                    $this->debugLog->writeDebugLog('Evaluating Negation of %s', $this->showValue($arg));
+                    $multiplier = -1;
+                } else {
+                    $this->debugLog->writeDebugLog('Evaluating Percentile of %s', $this->showValue($arg));
+                    $multiplier = 0.01;
+                }
+                if (is_array($arg)) {
+                    $operand2 = $multiplier;
+                    $result = $arg;
+                    [$rows, $columns] = self::checkMatrixOperands($result, $operand2, 0);
+                    for ($row = 0; $row < $rows; ++$row) {
+                        for ($column = 0; $column < $columns; ++$column) {
+                            if (self::isNumericOrBool($result[$row][$column])) {
+                                $result[$row][$column] *= $multiplier;
+                            } else {
+                                $result[$row][$column] = self::makeError($result[$row][$column]);
+                            }
+                        }
+                    }
+
+                    $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($result));
+                    $stack->push('Value', $result);
+                    if (isset($storeKey)) {
+                        $branchStore[$storeKey] = $result;
+                    }
+                } else {
+                    $this->executeNumericBinaryOperation($multiplier, $arg, '*', $stack);
+                }
+            } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $token ?? '', $matches)) {
+                $cellRef = null;
+
+                if (isset($matches[8])) {
+                    if ($cell === null) {
+                        // We can't access the range, so return a REF error
+                        $cellValue = ExcelError::REF();
+                    } else {
+                        $cellRef = $matches[6] . $matches[7] . ':' . $matches[9] . $matches[10];
+                        if ($matches[2] > '') {
+                            $matches[2] = trim($matches[2], "\"'");
+                            if ((str_contains($matches[2], '[')) || (str_contains($matches[2], ']'))) {
+                                //    It's a Reference to an external spreadsheet (not currently supported)
+                                return $this->raiseFormulaError('Unable to access External Workbook');
+                            }
+                            $matches[2] = trim($matches[2], "\"'");
+                            $this->debugLog->writeDebugLog('Evaluating Cell Range %s in worksheet %s', $cellRef, $matches[2]);
+                            if ($pCellParent !== null && $this->spreadsheet !== null) {
+                                $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($matches[2]), false);
+                            } else {
+                                return $this->raiseFormulaError('Unable to access Cell Reference');
+                            }
+                            $this->debugLog->writeDebugLog('Evaluation Result for cells %s in worksheet %s is %s', $cellRef, $matches[2], $this->showTypeDetails($cellValue));
+                        } else {
+                            $this->debugLog->writeDebugLog('Evaluating Cell Range %s in current worksheet', $cellRef);
+                            if ($pCellParent !== null) {
+                                $cellValue = $this->extractCellRange($cellRef, $pCellWorksheet, false);
+                            } else {
+                                return $this->raiseFormulaError('Unable to access Cell Reference');
+                            }
+                            $this->debugLog->writeDebugLog('Evaluation Result for cells %s is %s', $cellRef, $this->showTypeDetails($cellValue));
+                        }
+                    }
+                } else {
+                    if ($cell === null) {
+                        // We can't access the cell, so return a REF error
+                        $cellValue = ExcelError::REF();
+                    } else {
+                        $cellRef = $matches[6] . $matches[7];
+                        if ($matches[2] > '') {
+                            $matches[2] = trim($matches[2], "\"'");
+                            if ((str_contains($matches[2], '[')) || (str_contains($matches[2], ']'))) {
+                                //    It's a Reference to an external spreadsheet (not currently supported)
+                                return $this->raiseFormulaError('Unable to access External Workbook');
+                            }
+                            $this->debugLog->writeDebugLog('Evaluating Cell %s in worksheet %s', $cellRef, $matches[2]);
+                            if ($pCellParent !== null && $this->spreadsheet !== null) {
+                                $cellSheet = $this->spreadsheet->getSheetByName($matches[2]);
+                                if ($cellSheet && $cellSheet->cellExists($cellRef)) {
+                                    $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($matches[2]), false);
+                                    $cell->attach($pCellParent);
+                                } else {
+                                    $cellRef = ($cellSheet !== null) ? "'{$matches[2]}'!{$cellRef}" : $cellRef;
+                                    $cellValue = ($cellSheet !== null) ? null : ExcelError::REF();
+                                }
+                            } else {
+                                return $this->raiseFormulaError('Unable to access Cell Reference');
+                            }
+                            $this->debugLog->writeDebugLog('Evaluation Result for cell %s in worksheet %s is %s', $cellRef, $matches[2], $this->showTypeDetails($cellValue));
+                        } else {
+                            $this->debugLog->writeDebugLog('Evaluating Cell %s in current worksheet', $cellRef);
+                            if ($pCellParent !== null && $pCellParent->has($cellRef)) {
+                                $cellValue = $this->extractCellRange($cellRef, $pCellWorksheet, false);
+                                $cell->attach($pCellParent);
+                            } else {
+                                $cellValue = null;
+                            }
+                            $this->debugLog->writeDebugLog('Evaluation Result for cell %s is %s', $cellRef, $this->showTypeDetails($cellValue));
+                        }
+                    }
+                }
+
+                $stack->push('Cell Value', $cellValue, $cellRef);
+                if (isset($storeKey)) {
+                    $branchStore[$storeKey] = $cellValue;
+                }
+            } elseif (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $token ?? '', $matches)) {
+                // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
+                if ($cell !== null && $pCellParent !== null) {
+                    $cell->attach($pCellParent);
+                }
+
+                $functionName = $matches[1];
+                $argCount = $stack->pop();
+                $argCount = $argCount['value'];
+                if ($functionName !== 'MKMATRIX') {
+                    $this->debugLog->writeDebugLog('Evaluating Function %s() with %s argument%s', self::localeFunc($functionName), (($argCount == 0) ? 'no' : $argCount), (($argCount == 1) ? '' : 's'));
+                }
+                if ((isset(self::$phpSpreadsheetFunctions[$functionName])) || (isset(self::$controlFunctions[$functionName]))) {    // function
+                    $passByReference = false;
+                    $passCellReference = false;
+                    $functionCall = null;
+                    if (isset(self::$phpSpreadsheetFunctions[$functionName])) {
+                        $functionCall = self::$phpSpreadsheetFunctions[$functionName]['functionCall'];
+                        $passByReference = isset(self::$phpSpreadsheetFunctions[$functionName]['passByReference']);
+                        $passCellReference = isset(self::$phpSpreadsheetFunctions[$functionName]['passCellReference']);
+                    } elseif (isset(self::$controlFunctions[$functionName])) {
+                        $functionCall = self::$controlFunctions[$functionName]['functionCall'];
+                        $passByReference = isset(self::$controlFunctions[$functionName]['passByReference']);
+                        $passCellReference = isset(self::$controlFunctions[$functionName]['passCellReference']);
+                    }
+
+                    // get the arguments for this function
+                    $args = $argArrayVals = [];
+                    $emptyArguments = [];
+                    for ($i = 0; $i < $argCount; ++$i) {
+                        $arg = $stack->pop();
+                        $a = $argCount - $i - 1;
+                        if (
+                            ($passByReference)
+                            && (isset(self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a]))
+                            && (self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])
+                        ) {
+                            if ($arg['reference'] === null) {
+                                $args[] = $cellID;
+                                if ($functionName !== 'MKMATRIX') {
+                                    $argArrayVals[] = $this->showValue($cellID);
+                                }
+                            } else {
+                                $args[] = $arg['reference'];
+                                if ($functionName !== 'MKMATRIX') {
+                                    $argArrayVals[] = $this->showValue($arg['reference']);
+                                }
+                            }
+                        } else {
+                            if ($arg['type'] === 'Empty Argument' && in_array($functionName, ['MIN', 'MINA', 'MAX', 'MAXA', 'IF'], true)) {
+                                $emptyArguments[] = false;
+                                $args[] = $arg['value'] = 0;
+                                $this->debugLog->writeDebugLog('Empty Argument reevaluated as 0');
+                            } else {
+                                $emptyArguments[] = $arg['type'] === 'Empty Argument';
+                                $args[] = self::unwrapResult($arg['value']);
+                            }
+                            if ($functionName !== 'MKMATRIX') {
+                                $argArrayVals[] = $this->showValue($arg['value']);
+                            }
+                        }
+                    }
+
+                    //    Reverse the order of the arguments
+                    krsort($args);
+                    krsort($emptyArguments);
+
+                    if ($argCount > 0 && is_array($functionCall)) {
+                        $args = $this->addDefaultArgumentValues($functionCall, $args, $emptyArguments);
+                    }
+
+                    if (($passByReference) && ($argCount == 0)) {
+                        $args[] = $cellID;
+                        $argArrayVals[] = $this->showValue($cellID);
+                    }
+
+                    if ($functionName !== 'MKMATRIX') {
+                        if ($this->debugLog->getWriteDebugLog()) {
+                            krsort($argArrayVals);
+                            $this->debugLog->writeDebugLog('Evaluating %s ( %s )', self::localeFunc($functionName), implode(self::$localeArgumentSeparator . ' ', Functions::flattenArray($argArrayVals)));
+                        }
+                    }
+
+                    //    Process the argument with the appropriate function call
+                    $args = $this->addCellReference($args, $passCellReference, $functionCall, $cell);
+
+                    if (!is_array($functionCall)) {
+                        foreach ($args as &$arg) {
+                            $arg = Functions::flattenSingleValue($arg);
+                        }
+                        unset($arg);
+                    }
+
+                    $result = call_user_func_array($functionCall, $args);
+
+                    if ($functionName !== 'MKMATRIX') {
+                        $this->debugLog->writeDebugLog('Evaluation Result for %s() function call is %s', self::localeFunc($functionName), $this->showTypeDetails($result));
+                    }
+                    $stack->push('Value', self::wrapResult($result));
+                    if (isset($storeKey)) {
+                        $branchStore[$storeKey] = $result;
+                    }
+                }
+            } else {
+                // if the token is a number, boolean, string or an Excel error, push it onto the stack
+                if (isset(self::$excelConstants[strtoupper($token ?? '')])) {
+                    $excelConstant = strtoupper($token);
+                    $stack->push('Constant Value', self::$excelConstants[$excelConstant]);
+                    if (isset($storeKey)) {
+                        $branchStore[$storeKey] = self::$excelConstants[$excelConstant];
+                    }
+                    $this->debugLog->writeDebugLog('Evaluating Constant %s as %s', $excelConstant, $this->showTypeDetails(self::$excelConstants[$excelConstant]));
+                } elseif ((is_numeric($token)) || ($token === null) || (is_bool($token)) || ($token == '') || ($token[0] == self::FORMULA_STRING_QUOTE) || ($token[0] == '#')) {
+                    $stack->push($tokenData['type'], $token, $tokenData['reference']);
+                    if (isset($storeKey)) {
+                        $branchStore[$storeKey] = $token;
+                    }
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token, $matches)) {
+                    // if the token is a named range or formula, evaluate it and push the result onto the stack
+                    $definedName = $matches[6];
+                    if ($cell === null || $pCellWorksheet === null) {
+                        return $this->raiseFormulaError("undefined name '$token'");
+                    }
+                    $specifiedWorksheet = trim($matches[2], "'");
+
+                    $this->debugLog->writeDebugLog('Evaluating Defined Name %s', $definedName);
+                    $namedRange = DefinedName::resolveName($definedName, $pCellWorksheet, $specifiedWorksheet);
+                    // If not Defined Name, try as Table.
+                    if ($namedRange === null && $this->spreadsheet !== null) {
+                        $table = $this->spreadsheet->getTableByName($definedName);
+                        if ($table !== null) {
+                            $tableRange = Coordinate::getRangeBoundaries($table->getRange());
+                            if ($table->getShowHeaderRow()) {
+                                ++$tableRange[0][1];
+                            }
+                            if ($table->getShowTotalsRow()) {
+                                --$tableRange[1][1];
+                            }
+                            $tableRangeString
+                                = '$' . $tableRange[0][0]
+                                . '$' . $tableRange[0][1]
+                                . ':'
+                                . '$' . $tableRange[1][0]
+                                . '$' . $tableRange[1][1];
+                            $namedRange = new NamedRange($definedName, $table->getWorksheet(), $tableRangeString);
+                        }
+                    }
+                    if ($namedRange === null) {
+                        return $this->raiseFormulaError("undefined name '$definedName'");
+                    }
+
+                    $result = $this->evaluateDefinedName($cell, $namedRange, $pCellWorksheet, $stack, $specifiedWorksheet !== '');
+                    if (isset($storeKey)) {
+                        $branchStore[$storeKey] = $result;
+                    }
+                } else {
+                    return $this->raiseFormulaError("undefined name '$token'");
+                }
+            }
+        }
+        // when we're out of tokens, the stack should have a single element, the final result
+        if ($stack->count() != 1) {
+            return $this->raiseFormulaError('internal error');
+        }
+        $output = $stack->pop();
+        $output = $output['value'];
+
+        return $output;
+    }
+
+    private function validateBinaryOperand(mixed &$operand, mixed &$stack): bool
+    {
+        if (is_array($operand)) {
+            if ((count($operand, COUNT_RECURSIVE) - count($operand)) == 1) {
+                do {
+                    $operand = array_pop($operand);
+                } while (is_array($operand));
+            }
+        }
+        //    Numbers, matrices and booleans can pass straight through, as they're already valid
+        if (is_string($operand)) {
+            //    We only need special validations for the operand if it is a string
+            //    Start by stripping off the quotation marks we use to identify true excel string values internally
+            if ($operand > '' && $operand[0] == self::FORMULA_STRING_QUOTE) {
+                $operand = self::unwrapResult($operand);
+            }
+            //    If the string is a numeric value, we treat it as a numeric, so no further testing
+            if (!is_numeric($operand)) {
+                //    If not a numeric, test to see if the value is an Excel error, and so can't be used in normal binary operations
+                if ($operand > '' && $operand[0] == '#') {
+                    $stack->push('Value', $operand);
+                    $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($operand));
+
+                    return false;
+                } elseif (Engine\FormattedNumber::convertToNumberIfFormatted($operand) === false) {
+                    //    If not a numeric, a fraction or a percentage, then it's a text string, and so can't be used in mathematical binary operations
+                    $stack->push('Error', '#VALUE!');
+                    $this->debugLog->writeDebugLog('Evaluation Result is a %s', $this->showTypeDetails('#VALUE!'));
+
+                    return false;
+                }
+            }
+        }
+
+        //    return a true if the value of the operand is one that we can use in normal binary mathematical operations
+        return true;
+    }
+
+    private function executeArrayComparison(mixed $operand1, mixed $operand2, string $operation, Stack &$stack, bool $recursingArrays): array
+    {
+        $result = [];
+        if (!is_array($operand2)) {
+            // Operand 1 is an array, Operand 2 is a scalar
+            foreach ($operand1 as $x => $operandData) {
+                $this->debugLog->writeDebugLog('Evaluating Comparison %s %s %s', $this->showValue($operandData), $operation, $this->showValue($operand2));
+                $this->executeBinaryComparisonOperation($operandData, $operand2, $operation, $stack);
+                $r = $stack->pop();
+                $result[$x] = $r['value'];
+            }
+        } elseif (!is_array($operand1)) {
+            // Operand 1 is a scalar, Operand 2 is an array
+            foreach ($operand2 as $x => $operandData) {
+                $this->debugLog->writeDebugLog('Evaluating Comparison %s %s %s', $this->showValue($operand1), $operation, $this->showValue($operandData));
+                $this->executeBinaryComparisonOperation($operand1, $operandData, $operation, $stack);
+                $r = $stack->pop();
+                $result[$x] = $r['value'];
+            }
+        } else {
+            // Operand 1 and Operand 2 are both arrays
+            if (!$recursingArrays) {
+                self::checkMatrixOperands($operand1, $operand2, 2);
+            }
+            foreach ($operand1 as $x => $operandData) {
+                $this->debugLog->writeDebugLog('Evaluating Comparison %s %s %s', $this->showValue($operandData), $operation, $this->showValue($operand2[$x]));
+                $this->executeBinaryComparisonOperation($operandData, $operand2[$x], $operation, $stack, true);
+                $r = $stack->pop();
+                $result[$x] = $r['value'];
+            }
+        }
+        //    Log the result details
+        $this->debugLog->writeDebugLog('Comparison Evaluation Result is %s', $this->showTypeDetails($result));
+        //    And push the result onto the stack
+        $stack->push('Array', $result);
+
+        return $result;
+    }
+
+    private function executeBinaryComparisonOperation(mixed $operand1, mixed $operand2, string $operation, Stack &$stack, bool $recursingArrays = false): array|bool
+    {
+        //    If we're dealing with matrix operations, we want a matrix result
+        if ((is_array($operand1)) || (is_array($operand2))) {
+            return $this->executeArrayComparison($operand1, $operand2, $operation, $stack, $recursingArrays);
+        }
+
+        $result = BinaryComparison::compare($operand1, $operand2, $operation);
+
+        //    Log the result details
+        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($result));
+        //    And push the result onto the stack
+        $stack->push('Value', $result);
+
+        return $result;
+    }
+
+    private function executeNumericBinaryOperation(mixed $operand1, mixed $operand2, string $operation, Stack &$stack): mixed
+    {
+        //    Validate the two operands
+        if (
+            ($this->validateBinaryOperand($operand1, $stack) === false)
+            || ($this->validateBinaryOperand($operand2, $stack) === false)
+        ) {
+            return false;
+        }
+
+        if (
+            (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE)
+            && ((is_string($operand1) && !is_numeric($operand1) && $operand1 !== '')
+                || (is_string($operand2) && !is_numeric($operand2) && $operand2 !== ''))
+        ) {
+            $result = ExcelError::VALUE();
+        } elseif (is_array($operand1) || is_array($operand2)) {
+            //    Ensure that both operands are arrays/matrices
+            if (is_array($operand1)) {
+                foreach ($operand1 as $key => $value) {
+                    $operand1[$key] = Functions::flattenArray($value);
+                }
+            }
+            if (is_array($operand2)) {
+                foreach ($operand2 as $key => $value) {
+                    $operand2[$key] = Functions::flattenArray($value);
+                }
+            }
+            [$rows, $columns] = self::checkMatrixOperands($operand1, $operand2, 2);
+
+            for ($row = 0; $row < $rows; ++$row) {
+                for ($column = 0; $column < $columns; ++$column) {
+                    if ($operand1[$row][$column] === null) {
+                        $operand1[$row][$column] = 0;
+                    } elseif (!self::isNumericOrBool($operand1[$row][$column])) {
+                        $operand1[$row][$column] = self::makeError($operand1[$row][$column]);
+
+                        continue;
+                    }
+                    if ($operand2[$row][$column] === null) {
+                        $operand2[$row][$column] = 0;
+                    } elseif (!self::isNumericOrBool($operand2[$row][$column])) {
+                        $operand1[$row][$column] = self::makeError($operand2[$row][$column]);
+
+                        continue;
+                    }
+                    switch ($operation) {
+                        case '+':
+                            $operand1[$row][$column] += $operand2[$row][$column];
+
+                            break;
+                        case '-':
+                            $operand1[$row][$column] -= $operand2[$row][$column];
+
+                            break;
+                        case '*':
+                            $operand1[$row][$column] *= $operand2[$row][$column];
+
+                            break;
+                        case '/':
+                            if ($operand2[$row][$column] == 0) {
+                                $operand1[$row][$column] = ExcelError::DIV0();
+                            } else {
+                                $operand1[$row][$column] /= $operand2[$row][$column];
+                            }
+
+                            break;
+                        case '^':
+                            $operand1[$row][$column] = $operand1[$row][$column] ** $operand2[$row][$column];
+
+                            break;
+
+                        default:
+                            throw new Exception('Unsupported numeric binary operation');
+                    }
+                }
+            }
+            $result = $operand1;
+        } else {
+            //    If we're dealing with non-matrix operations, execute the necessary operation
+            switch ($operation) {
+                //    Addition
+                case '+':
+                    $result = $operand1 + $operand2;
+
+                    break;
+                //    Subtraction
+                case '-':
+                    $result = $operand1 - $operand2;
+
+                    break;
+                //    Multiplication
+                case '*':
+                    $result = $operand1 * $operand2;
+
+                    break;
+                //    Division
+                case '/':
+                    if ($operand2 == 0) {
+                        //    Trap for Divide by Zero error
+                        $stack->push('Error', ExcelError::DIV0());
+                        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails(ExcelError::DIV0()));
+
+                        return false;
+                    }
+                    $result = $operand1 / $operand2;
+
+                    break;
+                //    Power
+                case '^':
+                    $result = $operand1 ** $operand2;
+
+                    break;
+
+                default:
+                    throw new Exception('Unsupported numeric binary operation');
+            }
+        }
+
+        //    Log the result details
+        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($result));
+        //    And push the result onto the stack
+        $stack->push('Value', $result);
+
+        return $result;
+    }
+
+    /**
+     * Trigger an error, but nicely, if need be.
+     *
+     * @return false
+     */
+    protected function raiseFormulaError(string $errorMessage, int $code = 0, ?Throwable $exception = null): bool
+    {
+        $this->formulaError = $errorMessage;
+        $this->cyclicReferenceStack->clear();
+        $suppress = $this->suppressFormulaErrors;
+        if (!$suppress) {
+            throw new Exception($errorMessage, $code, $exception);
+        }
+
+        return false;
+    }
+
+    /**
+     * Extract range values.
+     *
+     * @param string $range String based range representation
+     * @param ?Worksheet $worksheet Worksheet
+     * @param bool $resetLog Flag indicating whether calculation log should be reset or not
+     *
+     * @return array Array of values in range if range contains more than one element. Otherwise, a single value is returned.
+     */
+    public function extractCellRange(string &$range = 'A1', ?Worksheet $worksheet = null, bool $resetLog = true): array
+    {
+        // Return value
+        $returnValue = [];
+
+        if ($worksheet !== null) {
+            $worksheetName = $worksheet->getTitle();
+
+            if (str_contains($range, '!')) {
+                [$worksheetName, $range] = Worksheet::extractSheetTitle($range, true);
+                $worksheet = ($this->spreadsheet === null) ? null : $this->spreadsheet->getSheetByName($worksheetName);
+            }
+
+            // Extract range
+            $aReferences = Coordinate::extractAllCellReferencesInRange($range);
+            $range = "'" . $worksheetName . "'" . '!' . $range;
+            $currentCol = '';
+            $currentRow = 0;
+            if (!isset($aReferences[1])) {
+                //    Single cell in range
+                sscanf($aReferences[0], '%[A-Z]%d', $currentCol, $currentRow);
+                if ($worksheet !== null && $worksheet->cellExists($aReferences[0])) {
+                    $returnValue[$currentRow][$currentCol] = $worksheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
+                } else {
+                    $returnValue[$currentRow][$currentCol] = null;
+                }
+            } else {
+                // Extract cell data for all cells in the range
+                foreach ($aReferences as $reference) {
+                    // Extract range
+                    sscanf($reference, '%[A-Z]%d', $currentCol, $currentRow);
+                    if ($worksheet !== null && $worksheet->cellExists($reference)) {
+                        $returnValue[$currentRow][$currentCol] = $worksheet->getCell($reference)->getCalculatedValue($resetLog);
+                    } else {
+                        $returnValue[$currentRow][$currentCol] = null;
+                    }
+                }
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Extract range values.
+     *
+     * @param string $range String based range representation
+     * @param null|Worksheet $worksheet Worksheet
+     * @param bool $resetLog Flag indicating whether calculation log should be reset or not
+     *
+     * @return array|string Array of values in range if range contains more than one element. Otherwise, a single value is returned.
+     */
+    public function extractNamedRange(string &$range = 'A1', ?Worksheet $worksheet = null, bool $resetLog = true): string|array
+    {
+        // Return value
+        $returnValue = [];
+
+        if ($worksheet !== null) {
+            if (str_contains($range, '!')) {
+                [$worksheetName, $range] = Worksheet::extractSheetTitle($range, true);
+                $worksheet = ($this->spreadsheet === null) ? null : $this->spreadsheet->getSheetByName($worksheetName);
+            }
+
+            // Named range?
+            $namedRange = ($worksheet === null) ? null : DefinedName::resolveName($range, $worksheet);
+            if ($namedRange === null) {
+                return ExcelError::REF();
+            }
+
+            $worksheet = $namedRange->getWorksheet();
+            $range = $namedRange->getValue();
+            $splitRange = Coordinate::splitRange($range);
+            //    Convert row and column references
+            if ($worksheet !== null && ctype_alpha($splitRange[0][0])) {
+                $range = $splitRange[0][0] . '1:' . $splitRange[0][1] . $worksheet->getHighestRow();
+            } elseif ($worksheet !== null && ctype_digit($splitRange[0][0])) {
+                $range = 'A' . $splitRange[0][0] . ':' . $worksheet->getHighestColumn() . $splitRange[0][1];
+            }
+
+            // Extract range
+            $aReferences = Coordinate::extractAllCellReferencesInRange($range);
+            if (!isset($aReferences[1])) {
+                //    Single cell (or single column or row) in range
+                [$currentCol, $currentRow] = Coordinate::coordinateFromString($aReferences[0]);
+                if ($worksheet !== null && $worksheet->cellExists($aReferences[0])) {
+                    $returnValue[$currentRow][$currentCol] = $worksheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
+                } else {
+                    $returnValue[$currentRow][$currentCol] = null;
+                }
+            } else {
+                // Extract cell data for all cells in the range
+                foreach ($aReferences as $reference) {
+                    // Extract range
+                    [$currentCol, $currentRow] = Coordinate::coordinateFromString($reference);
+                    if ($worksheet !== null && $worksheet->cellExists($reference)) {
+                        $returnValue[$currentRow][$currentCol] = $worksheet->getCell($reference)->getCalculatedValue($resetLog);
+                    } else {
+                        $returnValue[$currentRow][$currentCol] = null;
+                    }
+                }
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Is a specific function implemented?
+     *
+     * @param string $function Function Name
+     */
+    public function isImplemented(string $function): bool
+    {
+        $function = strtoupper($function);
+        $notImplemented = !isset(self::$phpSpreadsheetFunctions[$function]) || (is_array(self::$phpSpreadsheetFunctions[$function]['functionCall']) && self::$phpSpreadsheetFunctions[$function]['functionCall'][1] === 'DUMMY');
+
+        return !$notImplemented;
+    }
+
+    /**
+     * Get a list of all implemented functions as an array of function objects.
+     */
+    public static function getFunctions(): array
+    {
+        return self::$phpSpreadsheetFunctions;
+    }
+
+    /**
+     * Get a list of implemented Excel function names.
+     */
+    public function getImplementedFunctionNames(): array
+    {
+        $returnValue = [];
+        foreach (self::$phpSpreadsheetFunctions as $functionName => $function) {
+            if ($this->isImplemented($functionName)) {
+                $returnValue[] = $functionName;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    private function addDefaultArgumentValues(array $functionCall, array $args, array $emptyArguments): array
+    {
+        $reflector = new ReflectionMethod($functionCall[0], $functionCall[1]);
+        $methodArguments = $reflector->getParameters();
+
+        if (count($methodArguments) > 0) {
+            // Apply any defaults for empty argument values
+            foreach ($emptyArguments as $argumentId => $isArgumentEmpty) {
+                if ($isArgumentEmpty === true) {
+                    $reflectedArgumentId = count($args) - (int) $argumentId - 1;
+                    if (
+                        !array_key_exists($reflectedArgumentId, $methodArguments)
+                        || $methodArguments[$reflectedArgumentId]->isVariadic()
+                    ) {
+                        break;
+                    }
+
+                    $args[$argumentId] = $this->getArgumentDefaultValue($methodArguments[$reflectedArgumentId]);
+                }
+            }
+        }
+
+        return $args;
+    }
+
+    private function getArgumentDefaultValue(ReflectionParameter $methodArgument): mixed
+    {
+        $defaultValue = null;
+
+        if ($methodArgument->isDefaultValueAvailable()) {
+            $defaultValue = $methodArgument->getDefaultValue();
+            if ($methodArgument->isDefaultValueConstant()) {
+                $constantName = $methodArgument->getDefaultValueConstantName() ?? '';
+                // read constant value
+                if (str_contains($constantName, '::')) {
+                    [$className, $constantName] = explode('::', $constantName);
+                    $constantReflector = new ReflectionClassConstant($className, $constantName);
+
+                    return $constantReflector->getValue();
+                }
+
+                return constant($constantName);
+            }
+        }
+
+        return $defaultValue;
+    }
+
+    /**
+     * Add cell reference if needed while making sure that it is the last argument.
+     */
+    private function addCellReference(array $args, bool $passCellReference, array|string $functionCall, ?Cell $cell = null): array
+    {
+        if ($passCellReference) {
+            if (is_array($functionCall)) {
+                $className = $functionCall[0];
+                $methodName = $functionCall[1];
+
+                $reflectionMethod = new ReflectionMethod($className, $methodName);
+                $argumentCount = count($reflectionMethod->getParameters());
+                while (count($args) < $argumentCount - 1) {
+                    $args[] = null;
+                }
+            }
+
+            $args[] = $cell;
+        }
+
+        return $args;
+    }
+
+    private function evaluateDefinedName(Cell $cell, DefinedName $namedRange, Worksheet $cellWorksheet, Stack $stack, bool $ignoreScope = false): mixed
+    {
+        $definedNameScope = $namedRange->getScope();
+        if ($definedNameScope !== null && $definedNameScope !== $cellWorksheet && !$ignoreScope) {
+            // The defined name isn't in our current scope, so #REF
+            $result = ExcelError::REF();
+            $stack->push('Error', $result, $namedRange->getName());
+
+            return $result;
+        }
+
+        $definedNameValue = $namedRange->getValue();
+        $definedNameType = $namedRange->isFormula() ? 'Formula' : 'Range';
+        $definedNameWorksheet = $namedRange->getWorksheet();
+
+        if ($definedNameValue[0] !== '=') {
+            $definedNameValue = '=' . $definedNameValue;
+        }
+
+        $this->debugLog->writeDebugLog('Defined Name is a %s with a value of %s', $definedNameType, $definedNameValue);
+
+        $originalCoordinate = $cell->getCoordinate();
+        $recursiveCalculationCell = ($definedNameType !== 'Formula' && $definedNameWorksheet !== null && $definedNameWorksheet !== $cellWorksheet)
+            ? $definedNameWorksheet->getCell('A1')
+            : $cell;
+        $recursiveCalculationCellAddress = $recursiveCalculationCell->getCoordinate();
+
+        // Adjust relative references in ranges and formulae so that we execute the calculation for the correct rows and columns
+        $definedNameValue = self::$referenceHelper->updateFormulaReferencesAnyWorksheet(
+            $definedNameValue,
+            Coordinate::columnIndexFromString($cell->getColumn()) - 1,
+            $cell->getRow() - 1
+        );
+
+        $this->debugLog->writeDebugLog('Value adjusted for relative references is %s', $definedNameValue);
+
+        $recursiveCalculator = new self($this->spreadsheet);
+        $recursiveCalculator->getDebugLog()->setWriteDebugLog($this->getDebugLog()->getWriteDebugLog());
+        $recursiveCalculator->getDebugLog()->setEchoDebugLog($this->getDebugLog()->getEchoDebugLog());
+        $result = $recursiveCalculator->_calculateFormulaValue($definedNameValue, $recursiveCalculationCellAddress, $recursiveCalculationCell, true);
+        $cellWorksheet->getCell($originalCoordinate);
+
+        if ($this->getDebugLog()->getWriteDebugLog()) {
+            $this->debugLog->mergeDebugLog(array_slice($recursiveCalculator->getDebugLog()->getLog(), 3));
+            $this->debugLog->writeDebugLog('Evaluation Result for Named %s %s is %s', $definedNameType, $namedRange->getName(), $this->showTypeDetails($result));
+        }
+
+        $stack->push('Defined Name', $result, $namedRange->getName());
+
+        return $result;
+    }
+
+    public function setSuppressFormulaErrors(bool $suppressFormulaErrors): void
+    {
+        $this->suppressFormulaErrors = $suppressFormulaErrors;
+    }
+
+    public function getSuppressFormulaErrors(): bool
+    {
+        return $this->suppressFormulaErrors;
+    }
+
+    private static function boolToString(mixed $operand1): mixed
+    {
+        if (is_bool($operand1)) {
+            $operand1 = ($operand1) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
+        } elseif ($operand1 === null) {
+            $operand1 = '';
+        }
+
+        return $operand1;
+    }
+
+    private static function isNumericOrBool(mixed $operand): bool
+    {
+        return is_numeric($operand) || is_bool($operand);
+    }
+
+    private static function makeError(mixed $operand = ''): string
+    {
+        return Information\ErrorValue::isError($operand) ? $operand : ExcelError::VALUE();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php
new file mode 100644
index 00000000..b661fafe
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+abstract class Category
+{
+    // Function categories
+    const CATEGORY_CUBE = 'Cube';
+    const CATEGORY_DATABASE = 'Database';
+    const CATEGORY_DATE_AND_TIME = 'Date and Time';
+    const CATEGORY_ENGINEERING = 'Engineering';
+    const CATEGORY_FINANCIAL = 'Financial';
+    const CATEGORY_INFORMATION = 'Information';
+    const CATEGORY_LOGICAL = 'Logical';
+    const CATEGORY_LOOKUP_AND_REFERENCE = 'Lookup and Reference';
+    const CATEGORY_MATH_AND_TRIG = 'Math and Trig';
+    const CATEGORY_STATISTICAL = 'Statistical';
+    const CATEGORY_TEXT_AND_DATA = 'Text and Data';
+    const CATEGORY_WEB = 'Web';
+    const CATEGORY_UNCATEGORISED = 'Uncategorised';
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php
new file mode 100644
index 00000000..e54f1bb3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
+
+class DAverage extends DatabaseAbstract
+{
+    /**
+     * DAVERAGE.
+     *
+     * Averages the values in a column of a list or database that match conditions you specify.
+     *
+     * Excel Function:
+     *        DAVERAGE(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                          A database is a list of related data in which rows of related
+     *                              information are records, and columns of data are fields. The
+     *                              first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                              column label enclosed between double quotation marks, such as
+     *                              "Age" or "Yield," or a number (without quotation marks) that
+     *                              represents the position of the column within the list: 1 for
+     *                              the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                          You can use any range for the criteria argument, as long as it
+     *                              includes at least one column label and at least one cell below
+     *                              the column label in which you specify a condition for the
+     *                              column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|int|float
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Averages::average(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php
new file mode 100644
index 00000000..fff7ab0d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
+
+class DCount extends DatabaseAbstract
+{
+    /**
+     * DCOUNT.
+     *
+     * Counts the cells that contain numbers in a column of a list or database that match conditions
+     * that you specify.
+     *
+     * Excel Function:
+     *        DCOUNT(database,[field],criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria, bool $returnError = true): string|int
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($returnError && $field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Counts::COUNT(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php
new file mode 100644
index 00000000..f1a68c1b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
+
+class DCountA extends DatabaseAbstract
+{
+    /**
+     * DCOUNTA.
+     *
+     * Counts the nonblank cells in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DCOUNTA(database,[field],criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|int
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Counts::COUNTA(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php
new file mode 100644
index 00000000..dd0f0061
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class DGet extends DatabaseAbstract
+{
+    /**
+     * DGET.
+     *
+     * Extracts a single value from a column of a list or database that matches conditions that you
+     * specify.
+     *
+     * Excel Function:
+     *        DGET(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): null|float|int|string
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        $columnData = self::getFilteredColumn($database, $field, $criteria);
+        if (count($columnData) > 1) {
+            return ExcelError::NAN();
+        }
+
+        $row = array_pop($columnData);
+
+        return array_pop($row);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php
new file mode 100644
index 00000000..23b95a7d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Maximum;
+
+class DMax extends DatabaseAbstract
+{
+    /**
+     * DMAX.
+     *
+     * Returns the largest number in a column of a list or database that matches conditions you that
+     * specify.
+     *
+     * Excel Function:
+     *        DMAX(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria, bool $returnError = true): null|float|string
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return $returnError ? ExcelError::VALUE() : null;
+        }
+
+        return Maximum::max(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php
new file mode 100644
index 00000000..541803dc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Minimum;
+
+class DMin extends DatabaseAbstract
+{
+    /**
+     * DMIN.
+     *
+     * Returns the smallest number in a column of a list or database that matches conditions you that
+     * specify.
+     *
+     * Excel Function:
+     *        DMIN(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria, bool $returnError = true): float|string|null
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return $returnError ? ExcelError::VALUE() : null;
+        }
+
+        return Minimum::min(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php
new file mode 100644
index 00000000..b60aa0dc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+class DProduct extends DatabaseAbstract
+{
+    /**
+     * DPRODUCT.
+     *
+     * Multiplies the values in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DPRODUCT(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|float
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return MathTrig\Operations::product(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php
new file mode 100644
index 00000000..dc354056
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
+
+class DStDev extends DatabaseAbstract
+{
+    /**
+     * DSTDEV.
+     *
+     * Estimates the standard deviation of a population based on a sample by using the numbers in a
+     * column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DSTDEV(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): float|string
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return StandardDeviations::STDEV(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
new file mode 100644
index 00000000..a05d5968
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
+
+class DStDevP extends DatabaseAbstract
+{
+    /**
+     * DSTDEVP.
+     *
+     * Calculates the standard deviation of a population based on the entire population by using the
+     * numbers in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DSTDEVP(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): float|string
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return StandardDeviations::STDEVP(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php
new file mode 100644
index 00000000..f9f926b0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+class DSum extends DatabaseAbstract
+{
+    /**
+     * DSUM.
+     *
+     * Adds the numbers in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DSUM(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria, bool $returnNull = false): null|float|string
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return $returnNull ? null : ExcelError::VALUE();
+        }
+
+        return MathTrig\Sum::sumIgnoringStrings(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php
new file mode 100644
index 00000000..33b5b56e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Variances;
+
+class DVar extends DatabaseAbstract
+{
+    /**
+     * DVAR.
+     *
+     * Estimates the variance of a population based on a sample by using the numbers in a column
+     * of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DVAR(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|float
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Variances::VAR(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php
new file mode 100644
index 00000000..942a4a1f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Variances;
+
+class DVarP extends DatabaseAbstract
+{
+    /**
+     * DVARP.
+     *
+     * Calculates the variance of a population based on the entire population by using the numbers
+     * in a column of a list or database that match conditions that you specify.
+     *
+     * Excel Function:
+     *        DVARP(database,field,criteria)
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|float
+    {
+        $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
+
+        return Variances::VARP(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
new file mode 100644
index 00000000..7d9885ee
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Internal\WildcardMatch;
+
+abstract class DatabaseAbstract
+{
+    abstract public static function evaluate(array $database, array|null|int|string $field, array $criteria): null|float|int|string;
+
+    /**
+     * fieldExtract.
+     *
+     * Extracts the column ID to use for the data field.
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param mixed $field Indicates which column is used in the function. Enter the
+     *                                        column label enclosed between double quotation marks, such as
+     *                                        "Age" or "Yield," or a number (without quotation marks) that
+     *                                        represents the position of the column within the list: 1 for
+     *                                        the first column, 2 for the second column, and so on.
+     */
+    protected static function fieldExtract(array $database, mixed $field): ?int
+    {
+        $field = strtoupper(Functions::flattenSingleValue($field) ?? '');
+        if ($field === '') {
+            return null;
+        }
+
+        $fieldNames = array_map('strtoupper', array_shift($database));
+        if (is_numeric($field)) {
+            $field = (int) $field - 1;
+            if ($field < 0 || $field >= count($fieldNames)) {
+                return null;
+            }
+
+            return $field;
+        }
+        $key = array_search($field, array_values($fieldNames), true);
+
+        return ($key !== false) ? (int) $key : null;
+    }
+
+    /**
+     * filter.
+     *
+     * Parses the selection criteria, extracts the database rows that match those criteria, and
+     * returns that subset of rows.
+     *
+     * @param mixed[] $database The range of cells that makes up the list or database.
+     *                                        A database is a list of related data in which rows of related
+     *                                        information are records, and columns of data are fields. The
+     *                                        first row of the list contains labels for each column.
+     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
+     *                                        You can use any range for the criteria argument, as long as it
+     *                                        includes at least one column label and at least one cell below
+     *                                        the column label in which you specify a condition for the
+     *                                        column.
+     *
+     * @return mixed[]
+     */
+    protected static function filter(array $database, array $criteria): array
+    {
+        $fieldNames = array_shift($database);
+        $criteriaNames = array_shift($criteria);
+
+        //    Convert the criteria into a set of AND/OR conditions with [:placeholders]
+        $query = self::buildQuery($criteriaNames, $criteria);
+
+        //    Loop through each row of the database
+        return self::executeQuery($database, $query, $criteriaNames, $fieldNames);
+    }
+
+    protected static function getFilteredColumn(array $database, ?int $field, array $criteria): array
+    {
+        //    reduce the database to a set of rows that match all the criteria
+        $database = self::filter($database, $criteria);
+        $defaultReturnColumnValue = ($field === null) ? 1 : null;
+
+        //    extract an array of values for the requested column
+        $columnData = [];
+        foreach ($database as $rowKey => $row) {
+            $keys = array_keys($row);
+            $key = $keys[$field] ?? null;
+            $columnKey = $key ?? 'A';
+            $columnData[$rowKey][$columnKey] = $row[$key] ?? $defaultReturnColumnValue;
+        }
+
+        return $columnData;
+    }
+
+    private static function buildQuery(array $criteriaNames, array $criteria): string
+    {
+        $baseQuery = [];
+        foreach ($criteria as $key => $criterion) {
+            foreach ($criterion as $field => $value) {
+                $criterionName = $criteriaNames[$field];
+                if ($value !== null) {
+                    $condition = self::buildCondition($value, $criterionName);
+                    $baseQuery[$key][] = $condition;
+                }
+            }
+        }
+
+        $rowQuery = array_map(
+            fn ($rowValue): string => (count($rowValue) > 1) ? 'AND(' . implode(',', $rowValue) . ')' : ($rowValue[0] ?? ''),
+            $baseQuery
+        );
+
+        return (count($rowQuery) > 1) ? 'OR(' . implode(',', $rowQuery) . ')' : ($rowQuery[0] ?? '');
+    }
+
+    private static function buildCondition(mixed $criterion, string $criterionName): string
+    {
+        $ifCondition = Functions::ifCondition($criterion);
+
+        // Check for wildcard characters used in the condition
+        $result = preg_match('/(?<operator>[^"]*)(?<operand>".*[*?].*")/ui', $ifCondition, $matches);
+        if ($result !== 1) {
+            return "[:{$criterionName}]{$ifCondition}";
+        }
+
+        $trueFalse = ($matches['operator'] !== '<>');
+        $wildcard = WildcardMatch::wildcard($matches['operand']);
+        $condition = "WILDCARDMATCH([:{$criterionName}],{$wildcard})";
+        if ($trueFalse === false) {
+            $condition = "NOT({$condition})";
+        }
+
+        return $condition;
+    }
+
+    private static function executeQuery(array $database, string $query, array $criteria, array $fields): array
+    {
+        foreach ($database as $dataRow => $dataValues) {
+            //    Substitute actual values from the database row for our [:placeholders]
+            $conditions = $query;
+            foreach ($criteria as $criterion) {
+                $conditions = self::processCondition($criterion, $fields, $dataValues, $conditions);
+            }
+
+            //    evaluate the criteria against the row data
+            $result = Calculation::getInstance()->_calculateFormulaValue('=' . $conditions);
+
+            //    If the row failed to meet the criteria, remove it from the database
+            if ($result !== true) {
+                unset($database[$dataRow]);
+            }
+        }
+
+        return $database;
+    }
+
+    private static function processCondition(string $criterion, array $fields, array $dataValues, string $conditions): string
+    {
+        $key = array_search($criterion, $fields, true);
+
+        $dataValue = 'NULL';
+        if (is_bool($dataValues[$key])) {
+            $dataValue = ($dataValues[$key]) ? 'TRUE' : 'FALSE';
+        } elseif ($dataValues[$key] !== null) {
+            $dataValue = $dataValues[$key];
+            // escape quotes if we have a string containing quotes
+            if (is_string($dataValue) && str_contains($dataValue, '"')) {
+                $dataValue = str_replace('"', '""', $dataValue);
+            }
+            $dataValue = (is_string($dataValue)) ? Calculation::wrapResult(strtoupper($dataValue)) : $dataValue;
+        }
+
+        return str_replace('[:' . $criterion . ']', $dataValue, $conditions);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Constants.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Constants.php
new file mode 100644
index 00000000..1165eb1f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Constants.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+class Constants
+{
+    // Constants currently used by WeekNum; will eventually be used by WEEKDAY
+    const STARTWEEK_SUNDAY = 1;
+    const STARTWEEK_MONDAY = 2;
+    const STARTWEEK_MONDAY_ALT = 11;
+    const STARTWEEK_TUESDAY = 12;
+    const STARTWEEK_WEDNESDAY = 13;
+    const STARTWEEK_THURSDAY = 14;
+    const STARTWEEK_FRIDAY = 15;
+    const STARTWEEK_SATURDAY = 16;
+    const STARTWEEK_SUNDAY_ALT = 17;
+    const DOW_SUNDAY = 1;
+    const DOW_MONDAY = 2;
+    const DOW_TUESDAY = 3;
+    const DOW_WEDNESDAY = 4;
+    const DOW_THURSDAY = 5;
+    const DOW_FRIDAY = 6;
+    const DOW_SATURDAY = 7;
+    const STARTWEEK_MONDAY_ISO = 21;
+
+    const METHODARR = [
+        self::STARTWEEK_SUNDAY => self::DOW_SUNDAY,
+        self::DOW_MONDAY,
+        self::STARTWEEK_MONDAY_ALT => self::DOW_MONDAY,
+        self::DOW_TUESDAY,
+        self::DOW_WEDNESDAY,
+        self::DOW_THURSDAY,
+        self::DOW_FRIDAY,
+        self::DOW_SATURDAY,
+        self::DOW_SUNDAY,
+        self::STARTWEEK_MONDAY_ISO => self::STARTWEEK_MONDAY_ISO,
+    ];
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php
new file mode 100644
index 00000000..088e3794
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use DateTimeImmutable;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Current
+{
+    /**
+     * DATENOW.
+     *
+     * Returns the current date.
+     * The NOW function is useful when you need to display the current date and time on a worksheet or
+     * calculate a value based on the current date and time, and have that value updated each time you
+     * open the worksheet.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+     * and time format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        TODAY()
+     *
+     * @return DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function today(): DateTime|float|int|string
+    {
+        $dti = new DateTimeImmutable();
+        $dateArray = Helpers::dateParse($dti->format('c'));
+
+        return Helpers::dateParseSucceeded($dateArray) ? Helpers::returnIn3FormatsArray($dateArray, true) : ExcelError::VALUE();
+    }
+
+    /**
+     * DATETIMENOW.
+     *
+     * Returns the current date and time.
+     * The NOW function is useful when you need to display the current date and time on a worksheet or
+     * calculate a value based on the current date and time, and have that value updated each time you
+     * open the worksheet.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+     * and time format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        NOW()
+     *
+     * @return DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    public static function now(): DateTime|float|int|string
+    {
+        $dti = new DateTimeImmutable();
+        $dateArray = Helpers::dateParse($dti->format('c'));
+
+        return Helpers::dateParseSucceeded($dateArray) ? Helpers::returnIn3FormatsArray($dateArray) : ExcelError::VALUE();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php
new file mode 100644
index 00000000..e0e4b25f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Date
+{
+    use ArrayEnabled;
+
+    /**
+     * DATE.
+     *
+     * The DATE function returns a value that represents a particular date.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+     * format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        DATE(year,month,day)
+     *
+     * PhpSpreadsheet is a lot more forgiving than MS Excel when passing non numeric values to this function.
+     * A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted,
+     *     as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language.
+     *
+     * @param array|float|int|string $year The value of the year argument can include one to four digits.
+     *                                Excel interprets the year argument according to the configured
+     *                                date system: 1900 or 1904.
+     *                                If year is between 0 (zero) and 1899 (inclusive), Excel adds that
+     *                                value to 1900 to calculate the year. For example, DATE(108,1,2)
+     *                                returns January 2, 2008 (1900+108).
+     *                                If year is between 1900 and 9999 (inclusive), Excel uses that
+     *                                value as the year. For example, DATE(2008,1,2) returns January 2,
+     *                                2008.
+     *                                If year is less than 0 or is 10000 or greater, Excel returns the
+     *                                #NUM! error value.
+     * @param array|float|int|string $month A positive or negative integer representing the month of the year
+     *                                from 1 to 12 (January to December).
+     *                                If month is greater than 12, month adds that number of months to
+     *                                the first month in the year specified. For example, DATE(2008,14,2)
+     *                                returns the serial number representing February 2, 2009.
+     *                                If month is less than 1, month subtracts the magnitude of that
+     *                                number of months, plus 1, from the first month in the year
+     *                                specified. For example, DATE(2008,-3,2) returns the serial number
+     *                                representing September 2, 2007.
+     * @param array|float|int|string $day A positive or negative integer representing the day of the month
+     *                                from 1 to 31.
+     *                                If day is greater than the number of days in the month specified,
+     *                                day adds that number of days to the first day in the month. For
+     *                                example, DATE(2008,1,35) returns the serial number representing
+     *                                February 4, 2008.
+     *                                If day is less than 1, day subtracts the magnitude that number of
+     *                                days, plus one, from the first day of the month specified. For
+     *                                example, DATE(2008,1,-15) returns the serial number representing
+     *                                December 16, 2007.
+     *
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function fromYMD(array|float|int|string $year, array|float|int|string $month, array|float|int|string $day): float|int|DateTime|string|array
+    {
+        if (is_array($year) || is_array($month) || is_array($day)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $year, $month, $day);
+        }
+
+        $baseYear = SharedDateHelper::getExcelCalendar();
+
+        try {
+            $year = self::getYear($year, $baseYear);
+            $month = self::getMonth($month);
+            $day = self::getDay($day);
+            self::adjustYearMonth($year, $month, $baseYear);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $excelDateValue = SharedDateHelper::formattedPHPToExcel($year, $month, $day);
+
+        return Helpers::returnIn3FormatsFloat($excelDateValue);
+    }
+
+    /**
+     * Convert year from multiple formats to int.
+     */
+    private static function getYear(mixed $year, int $baseYear): int
+    {
+        $year = ($year !== null) ? StringHelper::testStringAsNumeric((string) $year) : 0;
+        if (!is_numeric($year)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+        $year = (int) $year;
+
+        if ($year < ($baseYear - 1900)) {
+            throw new Exception(ExcelError::NAN());
+        }
+        if ((($baseYear - 1900) !== 0) && ($year < $baseYear) && ($year >= 1900)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        if (($year < $baseYear) && ($year >= ($baseYear - 1900))) {
+            $year += 1900;
+        }
+
+        return (int) $year;
+    }
+
+    /**
+     * Convert month from multiple formats to int.
+     */
+    private static function getMonth(mixed $month): int
+    {
+        if (($month !== null) && (!is_numeric($month))) {
+            $month = SharedDateHelper::monthStringToNumber($month);
+        }
+
+        $month = ($month !== null) ? StringHelper::testStringAsNumeric((string) $month) : 0;
+        if (!is_numeric($month)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) $month;
+    }
+
+    /**
+     * Convert day from multiple formats to int.
+     */
+    private static function getDay(mixed $day): int
+    {
+        if (($day !== null) && (!is_numeric($day))) {
+            $day = SharedDateHelper::dayStringToNumber($day);
+        }
+
+        $day = ($day !== null) ? StringHelper::testStringAsNumeric((string) $day) : 0;
+        if (!is_numeric($day)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) $day;
+    }
+
+    private static function adjustYearMonth(int &$year, int &$month, int $baseYear): void
+    {
+        if ($month < 1) {
+            //    Handle year/month adjustment if month < 1
+            --$month;
+            $year += ceil($month / 12) - 1;
+            $month = 13 - abs($month % 12);
+        } elseif ($month > 12) {
+            //    Handle year/month adjustment if month > 12
+            $year += floor($month / 12);
+            $month = ($month % 12);
+        }
+
+        // Re-validate the year parameter after adjustments
+        if (($year < $baseYear) || ($year >= 10000)) {
+            throw new Exception(ExcelError::NAN());
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php
new file mode 100644
index 00000000..60e4de19
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class DateParts
+{
+    use ArrayEnabled;
+
+    /**
+     * DAYOFMONTH.
+     *
+     * Returns the day of the month, for a specified date. The day is given as an integer
+     * ranging from 1 to 31.
+     *
+     * Excel Function:
+     *        DAY(dateValue)
+     *
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     *
+     * @return array|int|string Day of the month
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function day(mixed $dateValue): array|int|string
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        $weirdResult = self::weirdCondition($dateValue);
+        if ($weirdResult >= 0) {
+            return $weirdResult;
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        SharedDateHelper::roundMicroseconds($PHPDateObject);
+
+        return (int) $PHPDateObject->format('j');
+    }
+
+    /**
+     * MONTHOFYEAR.
+     *
+     * Returns the month of a date represented by a serial number.
+     * The month is given as an integer, ranging from 1 (January) to 12 (December).
+     *
+     * Excel Function:
+     *        MONTH(dateValue)
+     *
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     *
+     * @return array|int|string Month of the year
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function month(mixed $dateValue): array|string|int
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+        if ($dateValue < 1 && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900) {
+            return 1;
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        SharedDateHelper::roundMicroseconds($PHPDateObject);
+
+        return (int) $PHPDateObject->format('n');
+    }
+
+    /**
+     * YEAR.
+     *
+     * Returns the year corresponding to a date.
+     * The year is returned as an integer in the range 1900-9999.
+     *
+     * Excel Function:
+     *        YEAR(dateValue)
+     *
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     *
+     * @return array|int|string Year
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function year(mixed $dateValue): array|string|int
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($dateValue < 1 && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900) {
+            return 1900;
+        }
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        SharedDateHelper::roundMicroseconds($PHPDateObject);
+
+        return (int) $PHPDateObject->format('Y');
+    }
+
+    /**
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     */
+    private static function weirdCondition(mixed $dateValue): int
+    {
+        // Excel does not treat 0 consistently for DAY vs. (MONTH or YEAR)
+        if (SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900 && Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
+            if (is_bool($dateValue)) {
+                return (int) $dateValue;
+            }
+            if ($dateValue === null) {
+                return 0;
+            }
+            if (is_numeric($dateValue) && $dateValue < 1 && $dateValue >= 0) {
+                return 0;
+            }
+        }
+
+        return -1;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php
new file mode 100644
index 00000000..8c5fa71c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use DateTimeImmutable;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class DateValue
+{
+    use ArrayEnabled;
+
+    /**
+     * DATEVALUE.
+     *
+     * Returns a value that represents a particular date.
+     * Use DATEVALUE to convert a date represented by a text string to an Excel or PHP date/time stamp
+     * value.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+     * format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        DATEVALUE(dateValue)
+     *
+     * @param null|array|bool|float|int|string $dateValue Text that represents a date in a Microsoft Excel date format.
+     *                                    For example, "1/30/2008" or "30-Jan-2008" are text strings within
+     *                                    quotation marks that represent dates. Using the default date
+     *                                    system in Excel for Windows, date_text must represent a date from
+     *                                    January 1, 1900, to December 31, 9999. Using the default date
+     *                                    system in Excel for the Macintosh, date_text must represent a date
+     *                                    from January 1, 1904, to December 31, 9999. DATEVALUE returns the
+     *                                    #VALUE! error value if date_text is out of this range.
+     *                         Or can be an array of date values
+     *
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function fromString(null|array|string|int|bool|float $dateValue): array|string|float|int|DateTime
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        // try to parse as date iff there is at least one digit
+        if (is_string($dateValue) && preg_match('/\\d/', $dateValue) !== 1) {
+            return ExcelError::VALUE();
+        }
+
+        $dti = new DateTimeImmutable();
+        $baseYear = SharedDateHelper::getExcelCalendar();
+        $dateValue = trim((string) $dateValue, '"');
+        //    Strip any ordinals because they're allowed in Excel (English only)
+        $dateValue = (string) preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue);
+        //    Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
+        $dateValue = str_replace(['/', '.', '-', '  '], ' ', $dateValue);
+
+        $yearFound = false;
+        $t1 = explode(' ', $dateValue);
+        $t = '';
+        foreach ($t1 as &$t) {
+            if ((is_numeric($t)) && ($t > 31)) {
+                if ($yearFound) {
+                    return ExcelError::VALUE();
+                }
+                if ($t < 100) {
+                    $t += 1900;
+                }
+                $yearFound = true;
+            }
+        }
+        if (count($t1) === 1) {
+            //    We've been fed a time value without any date
+            return ((!str_contains((string) $t, ':'))) ? ExcelError::Value() : 0.0;
+        }
+        unset($t);
+
+        $dateValue = self::t1ToString($t1, $dti, $yearFound);
+
+        $PHPDateArray = self::setUpArray($dateValue, $dti);
+
+        return self::finalResults($PHPDateArray, $dti, $baseYear);
+    }
+
+    private static function t1ToString(array $t1, DateTimeImmutable $dti, bool $yearFound): string
+    {
+        if (count($t1) == 2) {
+            //    We only have two parts of the date: either day/month or month/year
+            if ($yearFound) {
+                array_unshift($t1, 1);
+            } else {
+                if (is_numeric($t1[1]) && $t1[1] > 29) {
+                    $t1[1] += 1900;
+                    array_unshift($t1, 1);
+                } else {
+                    $t1[] = $dti->format('Y');
+                }
+            }
+        }
+        $dateValue = implode(' ', $t1);
+
+        return $dateValue;
+    }
+
+    /**
+     * Parse date.
+     */
+    private static function setUpArray(string $dateValue, DateTimeImmutable $dti): array
+    {
+        $PHPDateArray = Helpers::dateParse($dateValue);
+        if (!Helpers::dateParseSucceeded($PHPDateArray)) {
+            // If original count was 1, we've already returned.
+            // If it was 2, we added another.
+            // Therefore, neither of the first 2 stroks below can fail.
+            $testVal1 = strtok($dateValue, '- ');
+            $testVal2 = strtok('- ');
+            $testVal3 = strtok('- ') ?: $dti->format('Y');
+            Helpers::adjustYear((string) $testVal1, (string) $testVal2, $testVal3);
+            $PHPDateArray = Helpers::dateParse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
+            if (!Helpers::dateParseSucceeded($PHPDateArray)) {
+                $PHPDateArray = Helpers::dateParse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
+            }
+        }
+
+        return $PHPDateArray;
+    }
+
+    /**
+     * Final results.
+     *
+     * @return DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     */
+    private static function finalResults(array $PHPDateArray, DateTimeImmutable $dti, int $baseYear): string|float|int|DateTime
+    {
+        $retValue = ExcelError::Value();
+        if (Helpers::dateParseSucceeded($PHPDateArray)) {
+            // Execute function
+            Helpers::replaceIfEmpty($PHPDateArray['year'], $dti->format('Y'));
+            if ($PHPDateArray['year'] < $baseYear) {
+                return ExcelError::VALUE();
+            }
+            Helpers::replaceIfEmpty($PHPDateArray['month'], $dti->format('m'));
+            Helpers::replaceIfEmpty($PHPDateArray['day'], $dti->format('d'));
+            $PHPDateArray['hour'] = 0;
+            $PHPDateArray['minute'] = 0;
+            $PHPDateArray['second'] = 0;
+            $month = (int) $PHPDateArray['month'];
+            $day = (int) $PHPDateArray['day'];
+            $year = (int) $PHPDateArray['year'];
+            if (!checkdate($month, $day, $year)) {
+                return ($year === 1900 && $month === 2 && $day === 29) ? Helpers::returnIn3FormatsFloat(60.0) : ExcelError::VALUE();
+            }
+            $retValue = Helpers::returnIn3FormatsArray($PHPDateArray, true);
+        }
+
+        return $retValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php
new file mode 100644
index 00000000..6c6fd3d7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Days
+{
+    use ArrayEnabled;
+
+    /**
+     * DAYS.
+     *
+     * Returns the number of days between two dates
+     *
+     * Excel Function:
+     *        DAYS(endDate, startDate)
+     *
+     * @param array|DateTimeInterface|float|int|string $endDate Excel date serial value (float),
+     *           PHP date timestamp (integer), PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|DateTimeInterface|float|int|string $startDate Excel date serial value (float),
+     *           PHP date timestamp (integer), PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     *
+     * @return array|int|string Number of days between start date and end date or an error
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function between(array|DateTimeInterface|float|int|string $endDate, array|DateTimeInterface|float|int|string $startDate): array|int|string
+    {
+        if (is_array($endDate) || is_array($startDate)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $endDate, $startDate);
+        }
+
+        try {
+            $startDate = Helpers::getDateValue($startDate);
+            $endDate = Helpers::getDateValue($endDate);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
+        $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
+
+        $days = ExcelError::VALUE();
+        $diff = $PHPStartDateObject->diff($PHPEndDateObject);
+        if ($diff !== false && !is_bool($diff->days)) {
+            $days = $diff->days;
+            if ($diff->invert) {
+                $days = -$days;
+            }
+        }
+
+        return $days;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php
new file mode 100644
index 00000000..c7e03fc0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Days360
+{
+    use ArrayEnabled;
+
+    /**
+     * DAYS360.
+     *
+     * Returns the number of days between two dates based on a 360-day year (twelve 30-day months),
+     * which is used in some accounting calculations. Use this function to help compute payments if
+     * your accounting system is based on twelve 30-day months.
+     *
+     * Excel Function:
+     *        DAYS360(startDate,endDate[,method])
+     *
+     * @param array|mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|mixed $method US or European Method as a bool
+     *                                        FALSE or omitted: U.S. (NASD) method. If the starting date is
+     *                                        the last day of a month, it becomes equal to the 30th of the
+     *                                        same month. If the ending date is the last day of a month and
+     *                                        the starting date is earlier than the 30th of a month, the
+     *                                        ending date becomes equal to the 1st of the next month;
+     *                                        otherwise the ending date becomes equal to the 30th of the
+     *                                        same month.
+     *                                        TRUE: European method. Starting dates and ending dates that
+     *                                        occur on the 31st of a month become equal to the 30th of the
+     *                                        same month.
+     *                         Or can be an array of methods
+     *
+     * @return array|int|string Number of days between start date and end date
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function between(mixed $startDate = 0, mixed $endDate = 0, mixed $method = false): array|string|int
+    {
+        if (is_array($startDate) || is_array($endDate) || is_array($method)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $startDate, $endDate, $method);
+        }
+
+        try {
+            $startDate = Helpers::getDateValue($startDate);
+            $endDate = Helpers::getDateValue($endDate);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (!is_bool($method)) {
+            return ExcelError::VALUE();
+        }
+
+        // Execute function
+        $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
+        $startDay = $PHPStartDateObject->format('j');
+        $startMonth = $PHPStartDateObject->format('n');
+        $startYear = $PHPStartDateObject->format('Y');
+
+        $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
+        $endDay = $PHPEndDateObject->format('j');
+        $endMonth = $PHPEndDateObject->format('n');
+        $endYear = $PHPEndDateObject->format('Y');
+
+        return self::dateDiff360((int) $startDay, (int) $startMonth, (int) $startYear, (int) $endDay, (int) $endMonth, (int) $endYear, !$method);
+    }
+
+    /**
+     * Return the number of days between two dates based on a 360 day calendar.
+     */
+    private static function dateDiff360(int $startDay, int $startMonth, int $startYear, int $endDay, int $endMonth, int $endYear, bool $methodUS): int
+    {
+        $startDay = self::getStartDay($startDay, $startMonth, $startYear, $methodUS);
+        $endDay = self::getEndDay($endDay, $endMonth, $endYear, $startDay, $methodUS);
+
+        return $endDay + $endMonth * 30 + $endYear * 360 - $startDay - $startMonth * 30 - $startYear * 360;
+    }
+
+    private static function getStartDay(int $startDay, int $startMonth, int $startYear, bool $methodUS): int
+    {
+        if ($startDay == 31) {
+            --$startDay;
+        } elseif ($methodUS && ($startMonth == 2 && ($startDay == 29 || ($startDay == 28 && !Helpers::isLeapYear($startYear))))) {
+            $startDay = 30;
+        }
+
+        return $startDay;
+    }
+
+    private static function getEndDay(int $endDay, int &$endMonth, int &$endYear, int $startDay, bool $methodUS): int
+    {
+        if ($endDay == 31) {
+            if ($methodUS && $startDay != 30) {
+                $endDay = 1;
+                if ($endMonth == 12) {
+                    ++$endYear;
+                    $endMonth = 1;
+                } else {
+                    ++$endMonth;
+                }
+            } else {
+                $endDay = 30;
+            }
+        }
+
+        return $endDay;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php
new file mode 100644
index 00000000..199d5d85
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateInterval;
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Difference
+{
+    use ArrayEnabled;
+
+    /**
+     * DATEDIF.
+     *
+     * @param mixed $startDate Excel date serial value, PHP date/time stamp, PHP DateTime object
+     *                                    or a standard date string
+     *                         Or can be an array of date values
+     * @param mixed $endDate Excel date serial value, PHP date/time stamp, PHP DateTime object
+     *                                    or a standard date string
+     *                         Or can be an array of date values
+     * @param array|string $unit Or can be an array of unit values
+     *
+     * @return array|int|string Interval between the dates
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function interval(mixed $startDate, mixed $endDate, array|string $unit = 'D')
+    {
+        if (is_array($startDate) || is_array($endDate) || is_array($unit)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $startDate, $endDate, $unit);
+        }
+
+        try {
+            $startDate = Helpers::getDateValue($startDate);
+            $endDate = Helpers::getDateValue($endDate);
+            $difference = self::initialDiff($startDate, $endDate);
+            $unit = strtoupper($unit);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
+        $startDays = (int) $PHPStartDateObject->format('j');
+        //$startMonths = (int) $PHPStartDateObject->format('n');
+        $startYears = (int) $PHPStartDateObject->format('Y');
+
+        $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
+        $endDays = (int) $PHPEndDateObject->format('j');
+        //$endMonths = (int) $PHPEndDateObject->format('n');
+        $endYears = (int) $PHPEndDateObject->format('Y');
+
+        $PHPDiffDateObject = $PHPEndDateObject->diff($PHPStartDateObject);
+
+        $retVal = false;
+        $retVal = self::replaceRetValue($retVal, $unit, 'D') ?? self::datedifD($difference);
+        $retVal = self::replaceRetValue($retVal, $unit, 'M') ?? self::datedifM($PHPDiffDateObject);
+        $retVal = self::replaceRetValue($retVal, $unit, 'MD') ?? self::datedifMD($startDays, $endDays, $PHPEndDateObject, $PHPDiffDateObject);
+        $retVal = self::replaceRetValue($retVal, $unit, 'Y') ?? self::datedifY($PHPDiffDateObject);
+        $retVal = self::replaceRetValue($retVal, $unit, 'YD') ?? self::datedifYD($difference, $startYears, $endYears, $PHPStartDateObject, $PHPEndDateObject);
+        $retVal = self::replaceRetValue($retVal, $unit, 'YM') ?? self::datedifYM($PHPDiffDateObject);
+
+        return is_bool($retVal) ? ExcelError::VALUE() : $retVal;
+    }
+
+    private static function initialDiff(float $startDate, float $endDate): float
+    {
+        // Validate parameters
+        if ($startDate > $endDate) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $endDate - $startDate;
+    }
+
+    /**
+     * Decide whether it's time to set retVal.
+     */
+    private static function replaceRetValue(bool|int $retVal, string $unit, string $compare): null|bool|int
+    {
+        if ($retVal !== false || $unit !== $compare) {
+            return $retVal;
+        }
+
+        return null;
+    }
+
+    private static function datedifD(float $difference): int
+    {
+        return (int) $difference;
+    }
+
+    private static function datedifM(DateInterval $PHPDiffDateObject): int
+    {
+        return 12 * (int) $PHPDiffDateObject->format('%y') + (int) $PHPDiffDateObject->format('%m');
+    }
+
+    private static function datedifMD(int $startDays, int $endDays, DateTime $PHPEndDateObject, DateInterval $PHPDiffDateObject): int
+    {
+        if ($endDays < $startDays) {
+            $retVal = $endDays;
+            $PHPEndDateObject->modify('-' . $endDays . ' days');
+            $adjustDays = (int) $PHPEndDateObject->format('j');
+            $retVal += ($adjustDays - $startDays);
+        } else {
+            $retVal = (int) $PHPDiffDateObject->format('%d');
+        }
+
+        return $retVal;
+    }
+
+    private static function datedifY(DateInterval $PHPDiffDateObject): int
+    {
+        return (int) $PHPDiffDateObject->format('%y');
+    }
+
+    private static function datedifYD(float $difference, int $startYears, int $endYears, DateTime $PHPStartDateObject, DateTime $PHPEndDateObject): int
+    {
+        $retVal = (int) $difference;
+        if ($endYears > $startYears) {
+            $isLeapStartYear = $PHPStartDateObject->format('L');
+            $wasLeapEndYear = $PHPEndDateObject->format('L');
+
+            // Adjust end year to be as close as possible as start year
+            while ($PHPEndDateObject >= $PHPStartDateObject) {
+                $PHPEndDateObject->modify('-1 year');
+                //$endYears = $PHPEndDateObject->format('Y');
+            }
+            $PHPEndDateObject->modify('+1 year');
+
+            // Get the result
+            $retVal = (int) $PHPEndDateObject->diff($PHPStartDateObject)->days;
+
+            // Adjust for leap years cases
+            $isLeapEndYear = $PHPEndDateObject->format('L');
+            $limit = new DateTime($PHPEndDateObject->format('Y-02-29'));
+            if (!$isLeapStartYear && !$wasLeapEndYear && $isLeapEndYear && $PHPEndDateObject >= $limit) {
+                --$retVal;
+            }
+        }
+
+        return (int) $retVal;
+    }
+
+    private static function datedifYM(DateInterval $PHPDiffDateObject): int
+    {
+        return (int) $PHPDiffDateObject->format('%m');
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
new file mode 100644
index 00000000..94ffa4c4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
@@ -0,0 +1,285 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Helpers
+{
+    /**
+     * Identify if a year is a leap year or not.
+     *
+     * @param int|string $year The year to test
+     *
+     * @return bool TRUE if the year is a leap year, otherwise FALSE
+     */
+    public static function isLeapYear(int|string $year): bool
+    {
+        return (($year % 4) === 0) && (($year % 100) !== 0) || (($year % 400) === 0);
+    }
+
+    /**
+     * getDateValue.
+     *
+     * @return float Excel date/time serial value
+     */
+    public static function getDateValue(mixed $dateValue, bool $allowBool = true): float
+    {
+        if (is_object($dateValue)) {
+            $retval = SharedDateHelper::PHPToExcel($dateValue);
+            if (is_bool($retval)) {
+                throw new Exception(ExcelError::VALUE());
+            }
+
+            return $retval;
+        }
+
+        self::nullFalseTrueToNumber($dateValue, $allowBool);
+        if (!is_numeric($dateValue)) {
+            $saveReturnDateType = Functions::getReturnDateType();
+            Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+            $dateValue = DateValue::fromString($dateValue);
+            Functions::setReturnDateType($saveReturnDateType);
+            if (!is_numeric($dateValue)) {
+                throw new Exception(ExcelError::VALUE());
+            }
+        }
+        if ($dateValue < 0 && Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return (float) $dateValue;
+    }
+
+    /**
+     * getTimeValue.
+     *
+     * @return float|string Excel date/time serial value, or string if error
+     */
+    public static function getTimeValue(string $timeValue): string|float
+    {
+        $saveReturnDateType = Functions::getReturnDateType();
+        Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+        /** @var float|string $timeValue */
+        $timeValue = TimeValue::fromString($timeValue);
+        Functions::setReturnDateType($saveReturnDateType);
+
+        return $timeValue;
+    }
+
+    /**
+     * Adjust date by given months.
+     */
+    public static function adjustDateByMonths(mixed $dateValue = 0, float $adjustmentMonths = 0): DateTime
+    {
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        $oMonth = (int) $PHPDateObject->format('m');
+        $oYear = (int) $PHPDateObject->format('Y');
+
+        $adjustmentMonthsString = (string) $adjustmentMonths;
+        if ($adjustmentMonths > 0) {
+            $adjustmentMonthsString = '+' . $adjustmentMonths;
+        }
+        if ($adjustmentMonths != 0) {
+            $PHPDateObject->modify($adjustmentMonthsString . ' months');
+        }
+        $nMonth = (int) $PHPDateObject->format('m');
+        $nYear = (int) $PHPDateObject->format('Y');
+
+        $monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
+        if ($monthDiff != $adjustmentMonths) {
+            $adjustDays = (int) $PHPDateObject->format('d');
+            $adjustDaysString = '-' . $adjustDays . ' days';
+            $PHPDateObject->modify($adjustDaysString);
+        }
+
+        return $PHPDateObject;
+    }
+
+    /**
+     * Help reduce perceived complexity of some tests.
+     */
+    public static function replaceIfEmpty(mixed &$value, mixed $altValue): void
+    {
+        $value = $value ?: $altValue;
+    }
+
+    /**
+     * Adjust year in ambiguous situations.
+     */
+    public static function adjustYear(string $testVal1, string $testVal2, string &$testVal3): void
+    {
+        if (!is_numeric($testVal1) || $testVal1 < 31) {
+            if (!is_numeric($testVal2) || $testVal2 < 12) {
+                if (is_numeric($testVal3) && $testVal3 < 12) {
+                    $testVal3 += 2000;
+                }
+            }
+        }
+    }
+
+    /**
+     * Return result in one of three formats.
+     */
+    public static function returnIn3FormatsArray(array $dateArray, bool $noFrac = false): DateTime|float|int
+    {
+        $retType = Functions::getReturnDateType();
+        if ($retType === Functions::RETURNDATE_PHP_DATETIME_OBJECT) {
+            return new DateTime(
+                $dateArray['year']
+                . '-' . $dateArray['month']
+                . '-' . $dateArray['day']
+                . ' ' . $dateArray['hour']
+                . ':' . $dateArray['minute']
+                . ':' . $dateArray['second']
+            );
+        }
+        $excelDateValue
+            = SharedDateHelper::formattedPHPToExcel(
+                $dateArray['year'],
+                $dateArray['month'],
+                $dateArray['day'],
+                $dateArray['hour'],
+                $dateArray['minute'],
+                $dateArray['second']
+            );
+        if ($retType === Functions::RETURNDATE_EXCEL) {
+            return $noFrac ? floor($excelDateValue) : $excelDateValue;
+        }
+        // RETURNDATE_UNIX_TIMESTAMP)
+
+        return SharedDateHelper::excelToTimestamp($excelDateValue);
+    }
+
+    /**
+     * Return result in one of three formats.
+     */
+    public static function returnIn3FormatsFloat(float $excelDateValue): float|int|DateTime
+    {
+        $retType = Functions::getReturnDateType();
+        if ($retType === Functions::RETURNDATE_EXCEL) {
+            return $excelDateValue;
+        }
+        if ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
+            return SharedDateHelper::excelToTimestamp($excelDateValue);
+        }
+        // RETURNDATE_PHP_DATETIME_OBJECT
+
+        return SharedDateHelper::excelToDateTimeObject($excelDateValue);
+    }
+
+    /**
+     * Return result in one of three formats.
+     */
+    public static function returnIn3FormatsObject(DateTime $PHPDateObject): DateTime|float|int
+    {
+        $retType = Functions::getReturnDateType();
+        if ($retType === Functions::RETURNDATE_PHP_DATETIME_OBJECT) {
+            return $PHPDateObject;
+        }
+        if ($retType === Functions::RETURNDATE_EXCEL) {
+            return (float) SharedDateHelper::PHPToExcel($PHPDateObject);
+        }
+        // RETURNDATE_UNIX_TIMESTAMP
+        $stamp = SharedDateHelper::PHPToExcel($PHPDateObject);
+        $stamp = is_bool($stamp) ? ((int) $stamp) : $stamp;
+
+        return SharedDateHelper::excelToTimestamp($stamp);
+    }
+
+    private static function baseDate(): int
+    {
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+            return 0;
+        }
+        if (SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_MAC_1904) {
+            return 0;
+        }
+
+        return 1;
+    }
+
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     */
+    public static function nullFalseTrueToNumber(mixed &$number, bool $allowBool = true): void
+    {
+        $number = Functions::flattenSingleValue($number);
+        $nullVal = self::baseDate();
+        if ($number === null) {
+            $number = $nullVal;
+        } elseif ($allowBool && is_bool($number)) {
+            $number = $nullVal + (int) $number;
+        }
+    }
+
+    /**
+     * Many functions accept null argument treated as 0.
+     */
+    public static function validateNumericNull(mixed $number): int|float
+    {
+        $number = Functions::flattenSingleValue($number);
+        if ($number === null) {
+            return 0;
+        }
+        if (is_int($number)) {
+            return $number;
+        }
+        if (is_numeric($number)) {
+            return (float) $number;
+        }
+
+        throw new Exception(ExcelError::VALUE());
+    }
+
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     *
+     * @phpstan-assert float $number
+     */
+    public static function validateNotNegative(mixed $number): float
+    {
+        if (!is_numeric($number)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+        if ($number >= 0) {
+            return (float) $number;
+        }
+
+        throw new Exception(ExcelError::NAN());
+    }
+
+    public static function silly1900(DateTime $PHPDateObject, string $mod = '-1 day'): void
+    {
+        $isoDate = $PHPDateObject->format('c');
+        if ($isoDate < '1900-03-01') {
+            $PHPDateObject->modify($mod);
+        }
+    }
+
+    public static function dateParse(string $string): array
+    {
+        return self::forceArray(date_parse($string));
+    }
+
+    public static function dateParseSucceeded(array $dateArray): bool
+    {
+        return $dateArray['error_count'] === 0;
+    }
+
+    /**
+     * Despite documentation, date_parse probably never returns false.
+     * Just in case, this routine helps guarantee it.
+     *
+     * @param array|false $dateArray
+     */
+    private static function forceArray(array|bool $dateArray): array
+    {
+        return is_array($dateArray) ? $dateArray : ['error_count' => 1];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php
new file mode 100644
index 00000000..a90c0517
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Month
+{
+    use ArrayEnabled;
+
+    /**
+     * EDATE.
+     *
+     * Returns the serial number that represents the date that is the indicated number of months
+     * before or after a specified date (the start_date).
+     * Use EDATE to calculate maturity dates or due dates that fall on the same day of the month
+     * as the date of issue.
+     *
+     * Excel Function:
+     *        EDATE(dateValue,adjustmentMonths)
+     *
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|int $adjustmentMonths The number of months before or after start_date.
+     *                                        A positive value for months yields a future date;
+     *                                        a negative value yields a past date.
+     *                         Or can be an array of adjustment values
+     *
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function adjust(mixed $dateValue, array|string|bool|float|int $adjustmentMonths): DateTime|float|int|string|array
+    {
+        if (is_array($dateValue) || is_array($adjustmentMonths)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $adjustmentMonths);
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue, false);
+            $adjustmentMonths = Helpers::validateNumericNull($adjustmentMonths);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+        $dateValue = floor($dateValue);
+        $adjustmentMonths = floor($adjustmentMonths);
+
+        // Execute function
+        $PHPDateObject = Helpers::adjustDateByMonths($dateValue, $adjustmentMonths);
+
+        return Helpers::returnIn3FormatsObject($PHPDateObject);
+    }
+
+    /**
+     * EOMONTH.
+     *
+     * Returns the date value for the last day of the month that is the indicated number of months
+     * before or after start_date.
+     * Use EOMONTH to calculate maturity dates or due dates that fall on the last day of the month.
+     *
+     * Excel Function:
+     *        EOMONTH(dateValue,adjustmentMonths)
+     *
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|int $adjustmentMonths The number of months before or after start_date.
+     *                                        A positive value for months yields a future date;
+     *                                        a negative value yields a past date.
+     *                         Or can be an array of adjustment values
+     *
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function lastDay(mixed $dateValue, array|float|int|bool|string $adjustmentMonths): array|string|DateTime|float|int
+    {
+        if (is_array($dateValue) || is_array($adjustmentMonths)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $adjustmentMonths);
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue, false);
+            $adjustmentMonths = Helpers::validateNumericNull($adjustmentMonths);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+        $dateValue = floor($dateValue);
+        $adjustmentMonths = floor($adjustmentMonths);
+
+        // Execute function
+        $PHPDateObject = Helpers::adjustDateByMonths($dateValue, $adjustmentMonths + 1);
+        $adjustDays = (int) $PHPDateObject->format('d');
+        $adjustDaysString = '-' . $adjustDays . ' days';
+        $PHPDateObject->modify($adjustDaysString);
+
+        return Helpers::returnIn3FormatsObject($PHPDateObject);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php
new file mode 100644
index 00000000..503e30e8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class NetworkDays
+{
+    use ArrayEnabled;
+
+    /**
+     * NETWORKDAYS.
+     *
+     * Returns the number of whole working days between start_date and end_date. Working days
+     * exclude weekends and any dates identified in holidays.
+     * Use NETWORKDAYS to calculate employee benefits that accrue based on the number of days
+     * worked during a specific term.
+     *
+     * Excel Function:
+     *        NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]])
+     *
+     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
+     *                                            PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
+     *                                            PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param mixed $dateArgs An array of dates (such as holidays) to exclude from the calculation
+     *
+     * @return array|int|string Interval between the dates
+     *         If an array of values is passed for the $startDate or $endDate arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function count(mixed $startDate, mixed $endDate, mixed ...$dateArgs): array|string|int
+    {
+        if (is_array($startDate) || is_array($endDate)) {
+            return self::evaluateArrayArgumentsSubset(
+                [self::class, __FUNCTION__],
+                2,
+                $startDate,
+                $endDate,
+                ...$dateArgs
+            );
+        }
+
+        try {
+            //    Retrieve the mandatory start and end date that are referenced in the function definition
+            $sDate = Helpers::getDateValue($startDate);
+            $eDate = Helpers::getDateValue($endDate);
+            $startDate = min($sDate, $eDate);
+            $endDate = max($sDate, $eDate);
+            //    Get the optional days
+            $dateArgs = Functions::flattenArray($dateArgs);
+            //    Test any extra holiday parameters
+            $holidayArray = [];
+            foreach ($dateArgs as $holidayDate) {
+                $holidayArray[] = Helpers::getDateValue($holidayDate);
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $startDow = self::calcStartDow($startDate);
+        $endDow = self::calcEndDow($endDate);
+        $wholeWeekDays = (int) floor(($endDate - $startDate) / 7) * 5;
+        $partWeekDays = self::calcPartWeekDays($startDow, $endDow);
+
+        //    Test any extra holiday parameters
+        $holidayCountedArray = [];
+        foreach ($holidayArray as $holidayDate) {
+            if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
+                if ((Week::day($holidayDate, 2) < 6) && (!in_array($holidayDate, $holidayCountedArray))) {
+                    --$partWeekDays;
+                    $holidayCountedArray[] = $holidayDate;
+                }
+            }
+        }
+
+        return self::applySign($wholeWeekDays + $partWeekDays, $sDate, $eDate);
+    }
+
+    private static function calcStartDow(float $startDate): int
+    {
+        $startDow = 6 - (int) Week::day($startDate, 2);
+        if ($startDow < 0) {
+            $startDow = 5;
+        }
+
+        return $startDow;
+    }
+
+    private static function calcEndDow(float $endDate): int
+    {
+        $endDow = (int) Week::day($endDate, 2);
+        if ($endDow >= 6) {
+            $endDow = 0;
+        }
+
+        return $endDow;
+    }
+
+    private static function calcPartWeekDays(int $startDow, int $endDow): int
+    {
+        $partWeekDays = $endDow + $startDow;
+        if ($partWeekDays > 5) {
+            $partWeekDays -= 5;
+        }
+
+        return $partWeekDays;
+    }
+
+    private static function applySign(int $result, float $sDate, float $eDate): int
+    {
+        return ($sDate > $eDate) ? -$result : $result;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
new file mode 100644
index 00000000..3f8f324c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Time
+{
+    use ArrayEnabled;
+
+    /**
+     * TIME.
+     *
+     * The TIME function returns a value that represents a particular time.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
+     * format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        TIME(hour,minute,second)
+     *
+     * @param null|array|bool|float|int|string $hour A number from 0 (zero) to 32767 representing the hour.
+     *                                    Any value greater than 23 will be divided by 24 and the remainder
+     *                                    will be treated as the hour value. For example, TIME(27,0,0) =
+     *                                    TIME(3,0,0) = .125 or 3:00 AM.
+     * @param null|array|bool|float|int|string $minute A number from 0 to 32767 representing the minute.
+     *                                    Any value greater than 59 will be converted to hours and minutes.
+     *                                    For example, TIME(0,750,0) = TIME(12,30,0) = .520833 or 12:30 PM.
+     * @param null|array|bool|float|int|string $second A number from 0 to 32767 representing the second.
+     *                                    Any value greater than 59 will be converted to hours, minutes,
+     *                                    and seconds. For example, TIME(0,0,2000) = TIME(0,33,22) = .023148
+     *                                    or 12:33:20 AM
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     *
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function fromHMS(array|int|float|bool|null|string $hour, array|int|float|bool|null|string $minute, array|int|float|bool|null|string $second): array|string|float|int|DateTime
+    {
+        if (is_array($hour) || is_array($minute) || is_array($second)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $hour, $minute, $second);
+        }
+
+        try {
+            $hour = self::toIntWithNullBool($hour);
+            $minute = self::toIntWithNullBool($minute);
+            $second = self::toIntWithNullBool($second);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        self::adjustSecond($second, $minute);
+        self::adjustMinute($minute, $hour);
+
+        if ($hour > 23) {
+            $hour = $hour % 24;
+        } elseif ($hour < 0) {
+            return ExcelError::NAN();
+        }
+
+        // Execute function
+        $retType = Functions::getReturnDateType();
+        if ($retType === Functions::RETURNDATE_EXCEL) {
+            $calendar = SharedDateHelper::getExcelCalendar();
+            $date = (int) ($calendar !== SharedDateHelper::CALENDAR_WINDOWS_1900);
+
+            return (float) SharedDateHelper::formattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
+        }
+        if ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
+            return (int) SharedDateHelper::excelToTimestamp(SharedDateHelper::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second)); // -2147468400; //    -2147472000 + 3600
+        }
+        // RETURNDATE_PHP_DATETIME_OBJECT
+        // Hour has already been normalized (0-23) above
+        $phpDateObject = new DateTime('1900-01-01 ' . $hour . ':' . $minute . ':' . $second);
+
+        return $phpDateObject;
+    }
+
+    private static function adjustSecond(int &$second, int &$minute): void
+    {
+        if ($second < 0) {
+            $minute += floor($second / 60);
+            $second = 60 - abs($second % 60);
+            if ($second == 60) {
+                $second = 0;
+            }
+        } elseif ($second >= 60) {
+            $minute += floor($second / 60);
+            $second = $second % 60;
+        }
+    }
+
+    private static function adjustMinute(int &$minute, int &$hour): void
+    {
+        if ($minute < 0) {
+            $hour += floor($minute / 60);
+            $minute = 60 - abs($minute % 60);
+            if ($minute == 60) {
+                $minute = 0;
+            }
+        } elseif ($minute >= 60) {
+            $hour += floor($minute / 60);
+            $minute = $minute % 60;
+        }
+    }
+
+    /**
+     * @param mixed $value expect int
+     */
+    private static function toIntWithNullBool(mixed $value): int
+    {
+        $value = $value ?? 0;
+        if (is_bool($value)) {
+            $value = (int) $value;
+        }
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php
new file mode 100644
index 00000000..de522692
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class TimeParts
+{
+    use ArrayEnabled;
+
+    /**
+     * HOUROFDAY.
+     *
+     * Returns the hour of a time value.
+     * The hour is given as an integer, ranging from 0 (12:00 A.M.) to 23 (11:00 P.M.).
+     *
+     * Excel Function:
+     *        HOUR(timeValue)
+     *
+     * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard time string
+     *                         Or can be an array of date/time values
+     *
+     * @return array|int|string Hour
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function hour(mixed $timeValue): array|string|int
+    {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
+        try {
+            Helpers::nullFalseTrueToNumber($timeValue);
+            if (!is_numeric($timeValue)) {
+                $timeValue = Helpers::getTimeValue($timeValue);
+            }
+            Helpers::validateNotNegative($timeValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $timeValue = fmod($timeValue, 1);
+        $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+        SharedDateHelper::roundMicroseconds($timeValue);
+
+        return (int) $timeValue->format('H');
+    }
+
+    /**
+     * MINUTE.
+     *
+     * Returns the minutes of a time value.
+     * The minute is given as an integer, ranging from 0 to 59.
+     *
+     * Excel Function:
+     *        MINUTE(timeValue)
+     *
+     * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard time string
+     *                         Or can be an array of date/time values
+     *
+     * @return array|int|string Minute
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function minute(mixed $timeValue): array|string|int
+    {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
+        try {
+            Helpers::nullFalseTrueToNumber($timeValue);
+            if (!is_numeric($timeValue)) {
+                $timeValue = Helpers::getTimeValue($timeValue);
+            }
+            Helpers::validateNotNegative($timeValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $timeValue = fmod($timeValue, 1);
+        $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+        SharedDateHelper::roundMicroseconds($timeValue);
+
+        return (int) $timeValue->format('i');
+    }
+
+    /**
+     * SECOND.
+     *
+     * Returns the seconds of a time value.
+     * The minute is given as an integer, ranging from 0 to 59.
+     *
+     * Excel Function:
+     *        SECOND(timeValue)
+     *
+     * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard time string
+     *                         Or can be an array of date/time values
+     *
+     * @return array|int|string Second
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function second(mixed $timeValue): array|string|int
+    {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
+        try {
+            Helpers::nullFalseTrueToNumber($timeValue);
+            if (!is_numeric($timeValue)) {
+                $timeValue = Helpers::getTimeValue($timeValue);
+            }
+            Helpers::validateNotNegative($timeValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $timeValue = fmod($timeValue, 1);
+        $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+        SharedDateHelper::roundMicroseconds($timeValue);
+
+        return (int) $timeValue->format('s');
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
new file mode 100644
index 00000000..0af42114
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use Datetime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class TimeValue
+{
+    use ArrayEnabled;
+
+    /**
+     * TIMEVALUE.
+     *
+     * Returns a value that represents a particular time.
+     * Use TIMEVALUE to convert a time represented by a text string to an Excel or PHP date/time stamp
+     * value.
+     *
+     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
+     * format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
+     *
+     * Excel Function:
+     *        TIMEVALUE(timeValue)
+     *
+     * @param null|array|bool|float|int|string $timeValue A text string that represents a time in any one of the Microsoft
+     *                                    Excel time formats; for example, "6:45 PM" and "18:45" text strings
+     *                                    within quotation marks that represent time.
+     *                                    Date information in time_text is ignored.
+     *                         Or can be an array of date/time values
+     *
+     * @return array|Datetime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function fromString(null|array|string|int|bool|float $timeValue): array|string|Datetime|int|float
+    {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
+        // try to parse as time iff there is at least one digit
+        if (is_string($timeValue) && preg_match('/\\d/', $timeValue) !== 1) {
+            return ExcelError::VALUE();
+        }
+
+        $timeValue = trim((string) $timeValue, '"');
+        $timeValue = str_replace(['/', '.'], '-', $timeValue);
+
+        $arraySplit = preg_split('/[\/:\-\s]/', $timeValue) ?: [];
+        if ((count($arraySplit) == 2 || count($arraySplit) == 3) && $arraySplit[0] > 24) {
+            $arraySplit[0] = ($arraySplit[0] % 24);
+            $timeValue = implode(':', $arraySplit);
+        }
+
+        $PHPDateArray = Helpers::dateParse($timeValue);
+        $retValue = ExcelError::VALUE();
+        if (Helpers::dateParseSucceeded($PHPDateArray)) {
+            $hour = $PHPDateArray['hour'];
+            $minute = $PHPDateArray['minute'];
+            $second = $PHPDateArray['second'];
+            // OpenOffice-specific code removed - it works just like Excel
+            $excelDateValue = SharedDateHelper::formattedPHPToExcel(1900, 1, 1, $hour, $minute, $second) - 1;
+
+            $retType = Functions::getReturnDateType();
+            if ($retType === Functions::RETURNDATE_EXCEL) {
+                $retValue = (float) $excelDateValue;
+            } elseif ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
+                $retValue = (int) SharedDateHelper::excelToTimestamp($excelDateValue + 25569) - 3600;
+            } else {
+                $retValue = new Datetime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
+            }
+        }
+
+        return $retValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php
new file mode 100644
index 00000000..e620b4ca
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php
@@ -0,0 +1,274 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class Week
+{
+    use ArrayEnabled;
+
+    /**
+     * WEEKNUM.
+     *
+     * Returns the week of the year for a specified date.
+     * The WEEKNUM function considers the week containing January 1 to be the first week of the year.
+     * However, there is a European standard that defines the first week as the one with the majority
+     * of days (four or more) falling in the new year. This means that for years in which there are
+     * three days or less in the first week of January, the WEEKNUM function returns week numbers
+     * that are incorrect according to the European standard.
+     *
+     * Excel Function:
+     *        WEEKNUM(dateValue[,style])
+     *
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|int $method Week begins on Sunday or Monday
+     *                                        1 or omitted    Week begins on Sunday.
+     *                                        2                Week begins on Monday.
+     *                                        11               Week begins on Monday.
+     *                                        12               Week begins on Tuesday.
+     *                                        13               Week begins on Wednesday.
+     *                                        14               Week begins on Thursday.
+     *                                        15               Week begins on Friday.
+     *                                        16               Week begins on Saturday.
+     *                                        17               Week begins on Sunday.
+     *                                        21               ISO (Jan. 4 is week 1, begins on Monday).
+     *                         Or can be an array of methods
+     *
+     * @return array|int|string Week Number
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function number(mixed $dateValue, array|int|string|null $method = Constants::STARTWEEK_SUNDAY): array|int|string
+    {
+        if (is_array($dateValue) || is_array($method)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $method);
+        }
+
+        $origDateValueNull = empty($dateValue);
+
+        try {
+            $method = self::validateMethod($method);
+            if ($dateValue === null) { // boolean not allowed
+                $dateValue = (SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_MAC_1904 || $method === Constants::DOW_SUNDAY) ? 0 : 1;
+            }
+            $dateValue = self::validateDateValue($dateValue);
+            if (!$dateValue && self::buggyWeekNum1900($method)) {
+                // This seems to be an additional Excel bug.
+                return 0;
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        if ($method == Constants::STARTWEEK_MONDAY_ISO) {
+            Helpers::silly1900($PHPDateObject);
+
+            return (int) $PHPDateObject->format('W');
+        }
+        if (self::buggyWeekNum1904($method, $origDateValueNull, $PHPDateObject)) {
+            return 0;
+        }
+        Helpers::silly1900($PHPDateObject, '+ 5 years'); // 1905 calendar matches
+        $dayOfYear = (int) $PHPDateObject->format('z');
+        $PHPDateObject->modify('-' . $dayOfYear . ' days');
+        $firstDayOfFirstWeek = (int) $PHPDateObject->format('w');
+        $daysInFirstWeek = (6 - $firstDayOfFirstWeek + $method) % 7;
+        $daysInFirstWeek += 7 * !$daysInFirstWeek;
+        $endFirstWeek = $daysInFirstWeek - 1;
+        $weekOfYear = floor(($dayOfYear - $endFirstWeek + 13) / 7);
+
+        return (int) $weekOfYear;
+    }
+
+    /**
+     * ISOWEEKNUM.
+     *
+     * Returns the ISO 8601 week number of the year for a specified date.
+     *
+     * Excel Function:
+     *        ISOWEEKNUM(dateValue)
+     *
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     *
+     * @return array|int|string Week Number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isoWeekNumber(mixed $dateValue): array|int|string
+    {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        if (self::apparentBug($dateValue)) {
+            return 52;
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        Helpers::silly1900($PHPDateObject);
+
+        return (int) $PHPDateObject->format('W');
+    }
+
+    /**
+     * WEEKDAY.
+     *
+     * Returns the day of the week for a specified date. The day is given as an integer
+     * ranging from 0 to 7 (dependent on the requested style).
+     *
+     * Excel Function:
+     *        WEEKDAY(dateValue[,style])
+     *
+     * @param null|array|bool|float|int|string $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param mixed $style A number that determines the type of return value
+     *                                        1 or omitted    Numbers 1 (Sunday) through 7 (Saturday).
+     *                                        2                Numbers 1 (Monday) through 7 (Sunday).
+     *                                        3                Numbers 0 (Monday) through 6 (Sunday).
+     *                         Or can be an array of styles
+     *
+     * @return array|int|string Day of the week value
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function day(null|array|float|int|string|bool $dateValue, mixed $style = 1): array|string|int
+    {
+        if (is_array($dateValue) || is_array($style)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $style);
+        }
+
+        try {
+            $dateValue = Helpers::getDateValue($dateValue);
+            $style = self::validateStyle($style);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Execute function
+        $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        Helpers::silly1900($PHPDateObject);
+        $DoW = (int) $PHPDateObject->format('w');
+
+        switch ($style) {
+            case 1:
+                ++$DoW;
+
+                break;
+            case 2:
+                $DoW = self::dow0Becomes7($DoW);
+
+                break;
+            case 3:
+                $DoW = self::dow0Becomes7($DoW) - 1;
+
+                break;
+        }
+
+        return $DoW;
+    }
+
+    /**
+     * @param mixed $style expect int
+     */
+    private static function validateStyle(mixed $style): int
+    {
+        if (!is_numeric($style)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+        $style = (int) $style;
+        if (($style < 1) || ($style > 3)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $style;
+    }
+
+    private static function dow0Becomes7(int $DoW): int
+    {
+        return ($DoW === 0) ? 7 : $DoW;
+    }
+
+    /**
+     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     */
+    private static function apparentBug(mixed $dateValue): bool
+    {
+        if (SharedDateHelper::getExcelCalendar() !== SharedDateHelper::CALENDAR_MAC_1904) {
+            if (is_bool($dateValue)) {
+                return true;
+            }
+            if (is_numeric($dateValue) && !((int) $dateValue)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Validate dateValue parameter.
+     */
+    private static function validateDateValue(mixed $dateValue): float
+    {
+        if (is_bool($dateValue)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return Helpers::getDateValue($dateValue);
+    }
+
+    /**
+     * Validate method parameter.
+     */
+    private static function validateMethod(mixed $method): int
+    {
+        if ($method === null) {
+            $method = Constants::STARTWEEK_SUNDAY;
+        }
+
+        if (!is_numeric($method)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        $method = (int) $method;
+        if (!array_key_exists($method, Constants::METHODARR)) {
+            throw new Exception(ExcelError::NAN());
+        }
+        $method = Constants::METHODARR[$method];
+
+        return $method;
+    }
+
+    private static function buggyWeekNum1900(int $method): bool
+    {
+        return $method === Constants::DOW_SUNDAY && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900;
+    }
+
+    private static function buggyWeekNum1904(int $method, bool $origNull, DateTime $dateObject): bool
+    {
+        // This appears to be another Excel bug.
+
+        return $method === Constants::DOW_SUNDAY && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_MAC_1904
+            && !$origNull && $dateObject->format('Y-m-d') === '1904-01-01';
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php
new file mode 100644
index 00000000..4e4ed3c8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class WorkDay
+{
+    use ArrayEnabled;
+
+    /**
+     * WORKDAY.
+     *
+     * Returns the date that is the indicated number of working days before or after a date (the
+     * starting date). Working days exclude weekends and any dates identified as holidays.
+     * Use WORKDAY to exclude weekends or holidays when you calculate invoice due dates, expected
+     * delivery times, or the number of days of work performed.
+     *
+     * Excel Function:
+     *        WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
+     *
+     * @param array|mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
+     *                                        PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|int $endDays The number of nonweekend and nonholiday days before or after
+     *                                        startDate. A positive value for days yields a future date; a
+     *                                        negative value yields a past date.
+     *                         Or can be an array of int values
+     * @param null|mixed $dateArgs An array of dates (such as holidays) to exclude from the calculation
+     *
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     *                        depending on the value of the ReturnDateType flag
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function date(mixed $startDate, array|int|string $endDays, mixed ...$dateArgs): array|float|int|DateTime|string
+    {
+        if (is_array($startDate) || is_array($endDays)) {
+            return self::evaluateArrayArgumentsSubset(
+                [self::class, __FUNCTION__],
+                2,
+                $startDate,
+                $endDays,
+                ...$dateArgs
+            );
+        }
+
+        //    Retrieve the mandatory start date and days that are referenced in the function definition
+        try {
+            $startDate = Helpers::getDateValue($startDate);
+            $endDays = Helpers::validateNumericNull($endDays);
+            $holidayArray = array_map([Helpers::class, 'getDateValue'], Functions::flattenArray($dateArgs));
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $startDate = (float) floor($startDate);
+        $endDays = (int) floor($endDays);
+        //    If endDays is 0, we always return startDate
+        if ($endDays == 0) {
+            return $startDate;
+        }
+        if ($endDays < 0) {
+            return self::decrementing($startDate, $endDays, $holidayArray);
+        }
+
+        return self::incrementing($startDate, $endDays, $holidayArray);
+    }
+
+    /**
+     * Use incrementing logic to determine Workday.
+     */
+    private static function incrementing(float $startDate, int $endDays, array $holidayArray): float|int|DateTime
+    {
+        //    Adjust the start date if it falls over a weekend
+        $startDoW = self::getWeekDay($startDate, 3);
+        if ($startDoW >= 5) {
+            $startDate += 7 - $startDoW;
+            --$endDays;
+        }
+
+        //    Add endDays
+        $endDate = (float) $startDate + ((int) ($endDays / 5) * 7);
+        $endDays = $endDays % 5;
+        while ($endDays > 0) {
+            ++$endDate;
+            //    Adjust the calculated end date if it falls over a weekend
+            $endDow = self::getWeekDay($endDate, 3);
+            if ($endDow >= 5) {
+                $endDate += 7 - $endDow;
+            }
+            --$endDays;
+        }
+
+        //    Test any extra holiday parameters
+        if (!empty($holidayArray)) {
+            $endDate = self::incrementingArray($startDate, $endDate, $holidayArray);
+        }
+
+        return Helpers::returnIn3FormatsFloat($endDate);
+    }
+
+    private static function incrementingArray(float $startDate, float $endDate, array $holidayArray): float
+    {
+        $holidayCountedArray = $holidayDates = [];
+        foreach ($holidayArray as $holidayDate) {
+            if (self::getWeekDay($holidayDate, 3) < 5) {
+                $holidayDates[] = $holidayDate;
+            }
+        }
+        sort($holidayDates, SORT_NUMERIC);
+        foreach ($holidayDates as $holidayDate) {
+            if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
+                if (!in_array($holidayDate, $holidayCountedArray)) {
+                    ++$endDate;
+                    $holidayCountedArray[] = $holidayDate;
+                }
+            }
+            //    Adjust the calculated end date if it falls over a weekend
+            $endDoW = self::getWeekDay($endDate, 3);
+            if ($endDoW >= 5) {
+                $endDate += 7 - $endDoW;
+            }
+        }
+
+        return $endDate;
+    }
+
+    /**
+     * Use decrementing logic to determine Workday.
+     */
+    private static function decrementing(float $startDate, int $endDays, array $holidayArray): float|int|DateTime
+    {
+        //    Adjust the start date if it falls over a weekend
+        $startDoW = self::getWeekDay($startDate, 3);
+        if ($startDoW >= 5) {
+            $startDate += -$startDoW + 4;
+            ++$endDays;
+        }
+
+        //    Add endDays
+        $endDate = (float) $startDate + ((int) ($endDays / 5) * 7);
+        $endDays = $endDays % 5;
+        while ($endDays < 0) {
+            --$endDate;
+            //    Adjust the calculated end date if it falls over a weekend
+            $endDow = self::getWeekDay($endDate, 3);
+            if ($endDow >= 5) {
+                $endDate += 4 - $endDow;
+            }
+            ++$endDays;
+        }
+
+        //    Test any extra holiday parameters
+        if (!empty($holidayArray)) {
+            $endDate = self::decrementingArray($startDate, $endDate, $holidayArray);
+        }
+
+        return Helpers::returnIn3FormatsFloat($endDate);
+    }
+
+    private static function decrementingArray(float $startDate, float $endDate, array $holidayArray): float
+    {
+        $holidayCountedArray = $holidayDates = [];
+        foreach ($holidayArray as $holidayDate) {
+            if (self::getWeekDay($holidayDate, 3) < 5) {
+                $holidayDates[] = $holidayDate;
+            }
+        }
+        rsort($holidayDates, SORT_NUMERIC);
+        foreach ($holidayDates as $holidayDate) {
+            if (($holidayDate <= $startDate) && ($holidayDate >= $endDate)) {
+                if (!in_array($holidayDate, $holidayCountedArray)) {
+                    --$endDate;
+                    $holidayCountedArray[] = $holidayDate;
+                }
+            }
+            //    Adjust the calculated end date if it falls over a weekend
+            $endDoW = self::getWeekDay($endDate, 3);
+            /** int $endDoW */
+            if ($endDoW >= 5) {
+                $endDate += -$endDoW + 4;
+            }
+        }
+
+        return $endDate;
+    }
+
+    private static function getWeekDay(float $date, int $wd): int
+    {
+        $result = Functions::scalar(Week::day($date, $wd));
+
+        return is_int($result) ? $result : -1;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php
new file mode 100644
index 00000000..2713754a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
+
+class YearFrac
+{
+    use ArrayEnabled;
+
+    /**
+     * YEARFRAC.
+     *
+     * Calculates the fraction of the year represented by the number of whole days between two dates
+     * (the start_date and the end_date).
+     * Use the YEARFRAC worksheet function to identify the proportion of a whole year's benefits or
+     * obligations to assign to a specific term.
+     *
+     * Excel Function:
+     *        YEARFRAC(startDate,endDate[,method])
+     * See https://lists.oasis-open.org/archives/office-formula/200806/msg00039.html
+     *     for description of algorithm used in Excel
+     *
+     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of values
+     * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
+     *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of methods
+     * @param array|int $method Method used for the calculation
+     *                                        0 or omitted    US (NASD) 30/360
+     *                                        1                Actual/actual
+     *                                        2                Actual/360
+     *                                        3                Actual/365
+     *                                        4                European 30/360
+     *                         Or can be an array of methods
+     *
+     * @return array|float|int|string fraction of the year, or a string containing an error
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function fraction(mixed $startDate, mixed $endDate, array|int|string|null $method = 0): array|string|int|float
+    {
+        if (is_array($startDate) || is_array($endDate) || is_array($method)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $startDate, $endDate, $method);
+        }
+
+        try {
+            $method = (int) Helpers::validateNumericNull($method);
+            $sDate = Helpers::getDateValue($startDate);
+            $eDate = Helpers::getDateValue($endDate);
+            $sDate = self::excelBug($sDate, $startDate, $endDate, $method);
+            $eDate = self::excelBug($eDate, $endDate, $startDate, $method);
+            $startDate = min($sDate, $eDate);
+            $endDate = max($sDate, $eDate);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return match ($method) {
+            0 => Functions::scalar(Days360::between($startDate, $endDate)) / 360,
+            1 => self::method1($startDate, $endDate),
+            2 => Functions::scalar(Difference::interval($startDate, $endDate)) / 360,
+            3 => Functions::scalar(Difference::interval($startDate, $endDate)) / 365,
+            4 => Functions::scalar(Days360::between($startDate, $endDate, true)) / 360,
+            default => ExcelError::NAN(),
+        };
+    }
+
+    /**
+     * Excel 1900 calendar treats date argument of null as 1900-01-00. Really.
+     */
+    private static function excelBug(float $sDate, mixed $startDate, mixed $endDate, int $method): float
+    {
+        if (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE && SharedDateHelper::getExcelCalendar() !== SharedDateHelper::CALENDAR_MAC_1904) {
+            if ($endDate === null && $startDate !== null) {
+                if (DateParts::month($sDate) == 12 && DateParts::day($sDate) === 31 && $method === 0) {
+                    $sDate += 2;
+                } else {
+                    ++$sDate;
+                }
+            }
+        }
+
+        return $sDate;
+    }
+
+    private static function method1(float $startDate, float $endDate): float
+    {
+        $days = Functions::scalar(Difference::interval($startDate, $endDate));
+        $startYear = (int) DateParts::year($startDate);
+        $endYear = (int) DateParts::year($endDate);
+        $years = $endYear - $startYear + 1;
+        $startMonth = (int) DateParts::month($startDate);
+        $startDay = (int) DateParts::day($startDate);
+        $endMonth = (int) DateParts::month($endDate);
+        $endDay = (int) DateParts::day($endDate);
+        $startMonthDay = 100 * $startMonth + $startDay;
+        $endMonthDay = 100 * $endMonth + $endDay;
+        if ($years == 1) {
+            $tmpCalcAnnualBasis = 365 + (int) Helpers::isLeapYear($endYear);
+        } elseif ($years == 2 && $startMonthDay >= $endMonthDay) {
+            if (Helpers::isLeapYear($startYear)) {
+                $tmpCalcAnnualBasis = 365 + (int) ($startMonthDay <= 229);
+            } elseif (Helpers::isLeapYear($endYear)) {
+                $tmpCalcAnnualBasis = 365 + (int) ($endMonthDay >= 229);
+            } else {
+                $tmpCalcAnnualBasis = 365;
+            }
+        } else {
+            $tmpCalcAnnualBasis = 0;
+            for ($year = $startYear; $year <= $endYear; ++$year) {
+                $tmpCalcAnnualBasis += 365 + (int) Helpers::isLeapYear($year);
+            }
+            $tmpCalcAnnualBasis /= $years;
+        }
+
+        return $days / $tmpCalcAnnualBasis;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php
new file mode 100644
index 00000000..0107f404
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php
@@ -0,0 +1,190 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class ArrayArgumentHelper
+{
+    protected int $indexStart = 0;
+
+    protected array $arguments;
+
+    protected int $argumentCount;
+
+    protected array $rows;
+
+    protected array $columns;
+
+    public function initialise(array $arguments): void
+    {
+        $keys = array_keys($arguments);
+        $this->indexStart = (int) array_shift($keys);
+        $this->rows = $this->rows($arguments);
+        $this->columns = $this->columns($arguments);
+
+        $this->argumentCount = count($arguments);
+        $this->arguments = $this->flattenSingleCellArrays($arguments, $this->rows, $this->columns);
+
+        $this->rows = $this->rows($arguments);
+        $this->columns = $this->columns($arguments);
+
+        if ($this->arrayArguments() > 2) {
+            throw new Exception('Formulae with more than two array arguments are not supported');
+        }
+    }
+
+    public function arguments(): array
+    {
+        return $this->arguments;
+    }
+
+    public function hasArrayArgument(): bool
+    {
+        return $this->arrayArguments() > 0;
+    }
+
+    public function getFirstArrayArgumentNumber(): int
+    {
+        $rowArrays = $this->filterArray($this->rows);
+        $columnArrays = $this->filterArray($this->columns);
+
+        for ($index = $this->indexStart; $index < $this->argumentCount; ++$index) {
+            if (isset($rowArrays[$index]) || isset($columnArrays[$index])) {
+                return ++$index;
+            }
+        }
+
+        return 0;
+    }
+
+    public function getSingleRowVector(): ?int
+    {
+        $rowVectors = $this->getRowVectors();
+
+        return count($rowVectors) === 1 ? array_pop($rowVectors) : null;
+    }
+
+    private function getRowVectors(): array
+    {
+        $rowVectors = [];
+        for ($index = $this->indexStart; $index < ($this->indexStart + $this->argumentCount); ++$index) {
+            if ($this->rows[$index] === 1 && $this->columns[$index] > 1) {
+                $rowVectors[] = $index;
+            }
+        }
+
+        return $rowVectors;
+    }
+
+    public function getSingleColumnVector(): ?int
+    {
+        $columnVectors = $this->getColumnVectors();
+
+        return count($columnVectors) === 1 ? array_pop($columnVectors) : null;
+    }
+
+    private function getColumnVectors(): array
+    {
+        $columnVectors = [];
+        for ($index = $this->indexStart; $index < ($this->indexStart + $this->argumentCount); ++$index) {
+            if ($this->rows[$index] > 1 && $this->columns[$index] === 1) {
+                $columnVectors[] = $index;
+            }
+        }
+
+        return $columnVectors;
+    }
+
+    public function getMatrixPair(): array
+    {
+        for ($i = $this->indexStart; $i < ($this->indexStart + $this->argumentCount - 1); ++$i) {
+            for ($j = $i + 1; $j < $this->argumentCount; ++$j) {
+                if (isset($this->rows[$i], $this->rows[$j])) {
+                    return [$i, $j];
+                }
+            }
+        }
+
+        return [];
+    }
+
+    public function isVector(int $argument): bool
+    {
+        return $this->rows[$argument] === 1 || $this->columns[$argument] === 1;
+    }
+
+    public function isRowVector(int $argument): bool
+    {
+        return $this->rows[$argument] === 1;
+    }
+
+    public function isColumnVector(int $argument): bool
+    {
+        return $this->columns[$argument] === 1;
+    }
+
+    public function rowCount(int $argument): int
+    {
+        return $this->rows[$argument];
+    }
+
+    public function columnCount(int $argument): int
+    {
+        return $this->columns[$argument];
+    }
+
+    private function rows(array $arguments): array
+    {
+        return array_map(
+            fn ($argument): int => is_countable($argument) ? count($argument) : 1,
+            $arguments
+        );
+    }
+
+    private function columns(array $arguments): array
+    {
+        return array_map(
+            function (mixed $argument): int {
+                return is_array($argument) && is_array($argument[array_keys($argument)[0]])
+                    ? count($argument[array_keys($argument)[0]])
+                    : 1;
+            },
+            $arguments
+        );
+    }
+
+    public function arrayArguments(): int
+    {
+        $count = 0;
+        foreach (array_keys($this->arguments) as $argument) {
+            if ($this->rows[$argument] > 1 || $this->columns[$argument] > 1) {
+                ++$count;
+            }
+        }
+
+        return $count;
+    }
+
+    private function flattenSingleCellArrays(array $arguments, array $rows, array $columns): array
+    {
+        foreach ($arguments as $index => $argument) {
+            if ($rows[$index] === 1 && $columns[$index] === 1) {
+                while (is_array($argument)) {
+                    $argument = array_pop($argument);
+                }
+                $arguments[$index] = $argument;
+            }
+        }
+
+        return $arguments;
+    }
+
+    private function filterArray(array $array): array
+    {
+        return array_filter(
+            $array,
+            fn ($value): bool => $value > 1
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php
new file mode 100644
index 00000000..fb2c853b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class ArrayArgumentProcessor
+{
+    private static ArrayArgumentHelper $arrayArgumentHelper;
+
+    public static function processArguments(
+        ArrayArgumentHelper $arrayArgumentHelper,
+        callable $method,
+        mixed ...$arguments
+    ): array {
+        self::$arrayArgumentHelper = $arrayArgumentHelper;
+
+        if (self::$arrayArgumentHelper->hasArrayArgument() === false) {
+            return [$method(...$arguments)];
+        }
+
+        if (self::$arrayArgumentHelper->arrayArguments() === 1) {
+            $nthArgument = self::$arrayArgumentHelper->getFirstArrayArgumentNumber();
+
+            return self::evaluateNthArgumentAsArray($method, $nthArgument, ...$arguments);
+        }
+
+        $singleRowVectorIndex = self::$arrayArgumentHelper->getSingleRowVector();
+        $singleColumnVectorIndex = self::$arrayArgumentHelper->getSingleColumnVector();
+
+        if ($singleRowVectorIndex !== null && $singleColumnVectorIndex !== null) {
+            // Basic logic for a single row vector and a single column vector
+            return self::evaluateVectorPair($method, $singleRowVectorIndex, $singleColumnVectorIndex, ...$arguments);
+        }
+
+        $matrixPair = self::$arrayArgumentHelper->getMatrixPair();
+        if ($matrixPair !== []) {
+            if (
+                (self::$arrayArgumentHelper->isVector($matrixPair[0]) === true
+                    && self::$arrayArgumentHelper->isVector($matrixPair[1]) === false)
+                || (self::$arrayArgumentHelper->isVector($matrixPair[0]) === false
+                    && self::$arrayArgumentHelper->isVector($matrixPair[1]) === true)
+            ) {
+                // Logic for a matrix and a vector (row or column)
+                return self::evaluateVectorMatrixPair($method, $matrixPair, ...$arguments);
+            }
+
+            // Logic for matrix/matrix, column vector/column vector or row vector/row vector
+            return self::evaluateMatrixPair($method, $matrixPair, ...$arguments);
+        }
+
+        // Still need to work out the logic for more than two array arguments,
+        // For the moment, we're throwing an Exception when we initialise the ArrayArgumentHelper
+        return ['#VALUE!'];
+    }
+
+    private static function evaluateVectorMatrixPair(callable $method, array $matrixIndexes, mixed ...$arguments): array
+    {
+        $matrix2 = array_pop($matrixIndexes);
+        /** @var array $matrixValues2 */
+        $matrixValues2 = $arguments[$matrix2];
+        $matrix1 = array_pop($matrixIndexes);
+        /** @var array $matrixValues1 */
+        $matrixValues1 = $arguments[$matrix1];
+
+        $rows = min(array_map([self::$arrayArgumentHelper, 'rowCount'], [$matrix1, $matrix2]));
+        $columns = min(array_map([self::$arrayArgumentHelper, 'columnCount'], [$matrix1, $matrix2]));
+
+        if ($rows === 1) {
+            $rows = max(array_map([self::$arrayArgumentHelper, 'rowCount'], [$matrix1, $matrix2]));
+        }
+        if ($columns === 1) {
+            $columns = max(array_map([self::$arrayArgumentHelper, 'columnCount'], [$matrix1, $matrix2]));
+        }
+
+        $result = [];
+        for ($rowIndex = 0; $rowIndex < $rows; ++$rowIndex) {
+            for ($columnIndex = 0; $columnIndex < $columns; ++$columnIndex) {
+                $rowIndex1 = self::$arrayArgumentHelper->isRowVector($matrix1) ? 0 : $rowIndex;
+                $columnIndex1 = self::$arrayArgumentHelper->isColumnVector($matrix1) ? 0 : $columnIndex;
+                $value1 = $matrixValues1[$rowIndex1][$columnIndex1];
+                $rowIndex2 = self::$arrayArgumentHelper->isRowVector($matrix2) ? 0 : $rowIndex;
+                $columnIndex2 = self::$arrayArgumentHelper->isColumnVector($matrix2) ? 0 : $columnIndex;
+                $value2 = $matrixValues2[$rowIndex2][$columnIndex2];
+                $arguments[$matrix1] = $value1;
+                $arguments[$matrix2] = $value2;
+
+                $result[$rowIndex][$columnIndex] = $method(...$arguments);
+            }
+        }
+
+        return $result;
+    }
+
+    private static function evaluateMatrixPair(callable $method, array $matrixIndexes, mixed ...$arguments): array
+    {
+        $matrix2 = array_pop($matrixIndexes);
+        /** @var array $matrixValues2 */
+        $matrixValues2 = $arguments[$matrix2];
+        $matrix1 = array_pop($matrixIndexes);
+        /** @var array $matrixValues1 */
+        $matrixValues1 = $arguments[$matrix1];
+
+        $result = [];
+        foreach ($matrixValues1 as $rowIndex => $row) {
+            foreach ($row as $columnIndex => $value1) {
+                if (isset($matrixValues2[$rowIndex][$columnIndex]) === false) {
+                    continue;
+                }
+
+                $value2 = $matrixValues2[$rowIndex][$columnIndex];
+                $arguments[$matrix1] = $value1;
+                $arguments[$matrix2] = $value2;
+
+                $result[$rowIndex][$columnIndex] = $method(...$arguments);
+            }
+        }
+
+        return $result;
+    }
+
+    private static function evaluateVectorPair(callable $method, int $rowIndex, int $columnIndex, mixed ...$arguments): array
+    {
+        $rowVector = Functions::flattenArray($arguments[$rowIndex]);
+        $columnVector = Functions::flattenArray($arguments[$columnIndex]);
+
+        $result = [];
+        foreach ($columnVector as $column) {
+            $rowResults = [];
+            foreach ($rowVector as $row) {
+                $arguments[$rowIndex] = $row;
+                $arguments[$columnIndex] = $column;
+
+                $rowResults[] = $method(...$arguments);
+            }
+            $result[] = $rowResults;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Note, offset is from 1 (for the first argument) rather than from 0.
+     */
+    private static function evaluateNthArgumentAsArray(callable $method, int $nthArgument, mixed ...$arguments): array
+    {
+        $values = array_slice($arguments, $nthArgument - 1, 1);
+        /** @var array $values */
+        $values = array_pop($values);
+
+        $result = [];
+        foreach ($values as $value) {
+            $arguments[$nthArgument - 1] = $value;
+            $result[] = $method(...$arguments);
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php
new file mode 100644
index 00000000..e6dbbcbd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php
@@ -0,0 +1,201 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class BranchPruner
+{
+    protected bool $branchPruningEnabled;
+
+    /**
+     * Used to generate unique store keys.
+     */
+    private int $branchStoreKeyCounter = 0;
+
+    /**
+     * currently pending storeKey (last item of the storeKeysStack.
+     */
+    protected ?string $pendingStoreKey = null;
+
+    /**
+     * @var string[]
+     */
+    protected array $storeKeysStack = [];
+
+    /**
+     * @var bool[]
+     */
+    protected array $conditionMap = [];
+
+    /**
+     * @var bool[]
+     */
+    protected array $thenMap = [];
+
+    /**
+     * @var bool[]
+     */
+    protected array $elseMap = [];
+
+    /**
+     * @var int[]
+     */
+    protected array $braceDepthMap = [];
+
+    protected ?string $currentCondition = null;
+
+    protected ?string $currentOnlyIf = null;
+
+    protected ?string $currentOnlyIfNot = null;
+
+    protected ?string $previousStoreKey = null;
+
+    public function __construct(bool $branchPruningEnabled)
+    {
+        $this->branchPruningEnabled = $branchPruningEnabled;
+    }
+
+    public function clearBranchStore(): void
+    {
+        $this->branchStoreKeyCounter = 0;
+    }
+
+    public function initialiseForLoop(): void
+    {
+        $this->currentCondition = null;
+        $this->currentOnlyIf = null;
+        $this->currentOnlyIfNot = null;
+        $this->previousStoreKey = null;
+        $this->pendingStoreKey = empty($this->storeKeysStack) ? null : end($this->storeKeysStack);
+
+        if ($this->branchPruningEnabled) {
+            $this->initialiseCondition();
+            $this->initialiseThen();
+            $this->initialiseElse();
+        }
+    }
+
+    private function initialiseCondition(): void
+    {
+        if (isset($this->conditionMap[$this->pendingStoreKey]) && $this->conditionMap[$this->pendingStoreKey]) {
+            $this->currentCondition = $this->pendingStoreKey;
+            $stackDepth = count($this->storeKeysStack);
+            if ($stackDepth > 1) {
+                // nested if
+                $this->previousStoreKey = $this->storeKeysStack[$stackDepth - 2];
+            }
+        }
+    }
+
+    private function initialiseThen(): void
+    {
+        if (isset($this->thenMap[$this->pendingStoreKey]) && $this->thenMap[$this->pendingStoreKey]) {
+            $this->currentOnlyIf = $this->pendingStoreKey;
+        } elseif (
+            isset($this->previousStoreKey, $this->thenMap[$this->previousStoreKey])
+            && $this->thenMap[$this->previousStoreKey]
+        ) {
+            $this->currentOnlyIf = $this->previousStoreKey;
+        }
+    }
+
+    private function initialiseElse(): void
+    {
+        if (isset($this->elseMap[$this->pendingStoreKey]) && $this->elseMap[$this->pendingStoreKey]) {
+            $this->currentOnlyIfNot = $this->pendingStoreKey;
+        } elseif (
+            isset($this->previousStoreKey, $this->elseMap[$this->previousStoreKey])
+            && $this->elseMap[$this->previousStoreKey]
+        ) {
+            $this->currentOnlyIfNot = $this->previousStoreKey;
+        }
+    }
+
+    public function decrementDepth(): void
+    {
+        if (!empty($this->pendingStoreKey)) {
+            --$this->braceDepthMap[$this->pendingStoreKey];
+        }
+    }
+
+    public function incrementDepth(): void
+    {
+        if (!empty($this->pendingStoreKey)) {
+            ++$this->braceDepthMap[$this->pendingStoreKey];
+        }
+    }
+
+    public function functionCall(string $functionName): void
+    {
+        if ($this->branchPruningEnabled && ($functionName === 'IF(')) {
+            // we handle a new if
+            $this->pendingStoreKey = $this->getUnusedBranchStoreKey();
+            $this->storeKeysStack[] = $this->pendingStoreKey;
+            $this->conditionMap[$this->pendingStoreKey] = true;
+            $this->braceDepthMap[$this->pendingStoreKey] = 0;
+        } elseif (!empty($this->pendingStoreKey) && array_key_exists($this->pendingStoreKey, $this->braceDepthMap)) {
+            // this is not an if but we go deeper
+            ++$this->braceDepthMap[$this->pendingStoreKey];
+        }
+    }
+
+    public function argumentSeparator(): void
+    {
+        if (!empty($this->pendingStoreKey) && $this->braceDepthMap[$this->pendingStoreKey] === 0) {
+            // We must go to the IF next argument
+            if ($this->conditionMap[$this->pendingStoreKey]) {
+                $this->conditionMap[$this->pendingStoreKey] = false;
+                $this->thenMap[$this->pendingStoreKey] = true;
+            } elseif ($this->thenMap[$this->pendingStoreKey]) {
+                $this->thenMap[$this->pendingStoreKey] = false;
+                $this->elseMap[$this->pendingStoreKey] = true;
+            } elseif ($this->elseMap[$this->pendingStoreKey]) {
+                throw new Exception('Reaching fourth argument of an IF');
+            }
+        }
+    }
+
+    public function closingBrace(mixed $value): void
+    {
+        if (!empty($this->pendingStoreKey) && $this->braceDepthMap[$this->pendingStoreKey] === -1) {
+            // we are closing an IF(
+            if ($value !== 'IF(') {
+                throw new Exception('Parser bug we should be in an "IF("');
+            }
+
+            if ($this->conditionMap[$this->pendingStoreKey]) {
+                throw new Exception('We should not be expecting a condition');
+            }
+
+            $this->thenMap[$this->pendingStoreKey] = false;
+            $this->elseMap[$this->pendingStoreKey] = false;
+            --$this->braceDepthMap[$this->pendingStoreKey];
+            array_pop($this->storeKeysStack);
+            $this->pendingStoreKey = null;
+        }
+    }
+
+    public function currentCondition(): ?string
+    {
+        return $this->currentCondition;
+    }
+
+    public function currentOnlyIf(): ?string
+    {
+        return $this->currentOnlyIf;
+    }
+
+    public function currentOnlyIfNot(): ?string
+    {
+        return $this->currentOnlyIfNot;
+    }
+
+    private function getUnusedBranchStoreKey(): string
+    {
+        $storeKeyValue = 'storeKey-' . $this->branchStoreKeyCounter;
+        ++$this->branchStoreKeyCounter;
+
+        return $storeKeyValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
new file mode 100644
index 00000000..f4806b47
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+class CyclicReferenceStack
+{
+    /**
+     * The call stack for calculated cells.
+     *
+     * @var mixed[]
+     */
+    private array $stack = [];
+
+    /**
+     * Return the number of entries on the stack.
+     */
+    public function count(): int
+    {
+        return count($this->stack);
+    }
+
+    /**
+     * Push a new entry onto the stack.
+     */
+    public function push(mixed $value): void
+    {
+        $this->stack[$value] = $value;
+    }
+
+    /**
+     * Pop the last entry from the stack.
+     */
+    public function pop(): mixed
+    {
+        return array_pop($this->stack);
+    }
+
+    /**
+     * Test to see if a specified entry exists on the stack.
+     *
+     * @param mixed $value The value to test
+     */
+    public function onStack(mixed $value): bool
+    {
+        return isset($this->stack[$value]);
+    }
+
+    /**
+     * Clear the stack.
+     */
+    public function clear(): void
+    {
+        $this->stack = [];
+    }
+
+    /**
+     * Return an array of all entries on the stack.
+     *
+     * @return mixed[]
+     */
+    public function showStack(): array
+    {
+        return $this->stack;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php
new file mode 100644
index 00000000..331fa448
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class FormattedNumber
+{
+    /**    Constants                */
+    /**    Regular Expressions        */
+    private const STRING_REGEXP_FRACTION = '~^\s*(-?)((\d*)\s+)?(\d+\/\d+)\s*$~';
+
+    private const STRING_REGEXP_PERCENT = '~^(?:(?: *(?<PrefixedSign>[-+])? *\% *(?<PrefixedSign2>[-+])? *(?<PrefixedValue>[0-9]+\.?[0-9*]*(?:E[-+]?[0-9]*)?) *)|(?: *(?<PostfixedSign>[-+])? *(?<PostfixedValue>[0-9]+\.?[0-9]*(?:E[-+]?[0-9]*)?) *\% *))$~i';
+
+    // preg_quoted string for major currency symbols, with a %s for locale currency
+    private const CURRENCY_CONVERSION_LIST = '\$€£¥%s';
+
+    private const STRING_CONVERSION_LIST = [
+        [self::class, 'convertToNumberIfNumeric'],
+        [self::class, 'convertToNumberIfFraction'],
+        [self::class, 'convertToNumberIfPercent'],
+        [self::class, 'convertToNumberIfCurrency'],
+    ];
+
+    /**
+     * Identify whether a string contains a formatted numeric value,
+     * and convert it to a numeric if it is.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfFormatted(string &$operand): bool
+    {
+        foreach (self::STRING_CONVERSION_LIST as $conversionMethod) {
+            if ($conversionMethod($operand) === true) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Identify whether a string contains a numeric value,
+     * and convert it to a numeric if it is.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfNumeric(string &$operand): bool
+    {
+        $thousandsSeparator = preg_quote(StringHelper::getThousandsSeparator(), '/');
+        $value = preg_replace(['/(\d)' . $thousandsSeparator . '(\d)/u', '/([+-])\s+(\d)/u'], ['$1$2', '$1$2'], trim($operand));
+        $decimalSeparator = preg_quote(StringHelper::getDecimalSeparator(), '/');
+        $value = preg_replace(['/(\d)' . $decimalSeparator . '(\d)/u', '/([+-])\s+(\d)/u'], ['$1.$2', '$1$2'], $value ?? '');
+
+        if (is_numeric($value)) {
+            $operand = (float) $value;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Identify whether a string contains a fractional numeric value,
+     * and convert it to a numeric if it is.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfFraction(string &$operand): bool
+    {
+        if (preg_match(self::STRING_REGEXP_FRACTION, $operand, $match)) {
+            $sign = ($match[1] === '-') ? '-' : '+';
+            $wholePart = ($match[3] === '') ? '' : ($sign . $match[3]);
+            $fractionFormula = '=' . $wholePart . $sign . $match[4];
+            $operand = Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Identify whether a string contains a percentage, and if so,
+     * convert it to a numeric.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfPercent(string &$operand): bool
+    {
+        $thousandsSeparator = preg_quote(StringHelper::getThousandsSeparator(), '/');
+        $value = preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', trim($operand));
+        $decimalSeparator = preg_quote(StringHelper::getDecimalSeparator(), '/');
+        $value = preg_replace(['/(\d)' . $decimalSeparator . '(\d)/u', '/([+-])\s+(\d)/u'], ['$1.$2', '$1$2'], $value ?? '');
+
+        $match = [];
+        if ($value !== null && preg_match(self::STRING_REGEXP_PERCENT, $value, $match, PREG_UNMATCHED_AS_NULL)) {
+            //Calculate the percentage
+            $sign = ($match['PrefixedSign'] ?? $match['PrefixedSign2'] ?? $match['PostfixedSign']) ?? '';
+            $operand = (float) ($sign . ($match['PostfixedValue'] ?? $match['PrefixedValue'])) / 100;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Identify whether a string contains a currency value, and if so,
+     * convert it to a numeric.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfCurrency(string &$operand): bool
+    {
+        $currencyRegexp = self::currencyMatcherRegexp();
+        $thousandsSeparator = preg_quote(StringHelper::getThousandsSeparator(), '/');
+        $value = preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $operand);
+
+        $match = [];
+        if ($value !== null && preg_match($currencyRegexp, $value, $match, PREG_UNMATCHED_AS_NULL)) {
+            //Determine the sign
+            $sign = ($match['PrefixedSign'] ?? $match['PrefixedSign2'] ?? $match['PostfixedSign']) ?? '';
+            $decimalSeparator = StringHelper::getDecimalSeparator();
+            //Cast to a float
+            $intermediate = (string) ($match['PostfixedValue'] ?? $match['PrefixedValue']);
+            $intermediate = str_replace($decimalSeparator, '.', $intermediate);
+            if (is_numeric($intermediate)) {
+                $operand = (float) ($sign . str_replace($decimalSeparator, '.', $intermediate));
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static function currencyMatcherRegexp(): string
+    {
+        $currencyCodes = sprintf(self::CURRENCY_CONVERSION_LIST, preg_quote(StringHelper::getCurrencyCode(), '/'));
+        $decimalSeparator = preg_quote(StringHelper::getDecimalSeparator(), '/');
+
+        return '~^(?:(?: *(?<PrefixedSign>[-+])? *(?<PrefixedCurrency>[' . $currencyCodes . ']) *(?<PrefixedSign2>[-+])? *(?<PrefixedValue>[0-9]+[' . $decimalSeparator . ']?[0-9*]*(?:E[-+]?[0-9]*)?) *)|(?: *(?<PostfixedSign>[-+])? *(?<PostfixedValue>[0-9]+' . $decimalSeparator . '?[0-9]*(?:E[-+]?[0-9]*)?) *(?<PostfixedCurrency>[' . $currencyCodes . ']) *))$~ui';
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php
new file mode 100644
index 00000000..9adcd559
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+class Logger
+{
+    /**
+     * Flag to determine whether a debug log should be generated by the calculation engine
+     *        If true, then a debug log will be generated
+     *        If false, then a debug log will not be generated.
+     */
+    private bool $writeDebugLog = false;
+
+    /**
+     * Flag to determine whether a debug log should be echoed by the calculation engine
+     *        If true, then a debug log will be echoed
+     *        If false, then a debug log will not be echoed
+     * A debug log can only be echoed if it is generated.
+     */
+    private bool $echoDebugLog = false;
+
+    /**
+     * The debug log generated by the calculation engine.
+     *
+     * @var string[]
+     */
+    private array $debugLog = [];
+
+    /**
+     * The calculation engine cell reference stack.
+     */
+    private CyclicReferenceStack $cellStack;
+
+    /**
+     * Instantiate a Calculation engine logger.
+     */
+    public function __construct(CyclicReferenceStack $stack)
+    {
+        $this->cellStack = $stack;
+    }
+
+    /**
+     * Enable/Disable Calculation engine logging.
+     */
+    public function setWriteDebugLog(bool $writeDebugLog): void
+    {
+        $this->writeDebugLog = $writeDebugLog;
+    }
+
+    /**
+     * Return whether calculation engine logging is enabled or disabled.
+     */
+    public function getWriteDebugLog(): bool
+    {
+        return $this->writeDebugLog;
+    }
+
+    /**
+     * Enable/Disable echoing of debug log information.
+     */
+    public function setEchoDebugLog(bool $echoDebugLog): void
+    {
+        $this->echoDebugLog = $echoDebugLog;
+    }
+
+    /**
+     * Return whether echoing of debug log information is enabled or disabled.
+     */
+    public function getEchoDebugLog(): bool
+    {
+        return $this->echoDebugLog;
+    }
+
+    /**
+     * Write an entry to the calculation engine debug log.
+     */
+    public function writeDebugLog(string $message, mixed ...$args): void
+    {
+        //    Only write the debug log if logging is enabled
+        if ($this->writeDebugLog) {
+            $message = sprintf($message, ...$args);
+            $cellReference = implode(' -> ', $this->cellStack->showStack());
+            if ($this->echoDebugLog) {
+                echo $cellReference,
+                ($this->cellStack->count() > 0 ? ' => ' : ''),
+                $message,
+                PHP_EOL;
+            }
+            $this->debugLog[] = $cellReference
+                . ($this->cellStack->count() > 0 ? ' => ' : '')
+                . $message;
+        }
+    }
+
+    /**
+     * Write a series of entries to the calculation engine debug log.
+     *
+     * @param string[] $args
+     */
+    public function mergeDebugLog(array $args): void
+    {
+        if ($this->writeDebugLog) {
+            foreach ($args as $entry) {
+                $this->writeDebugLog($entry);
+            }
+        }
+    }
+
+    /**
+     * Clear the calculation engine debug log.
+     */
+    public function clearLog(): void
+    {
+        $this->debugLog = [];
+    }
+
+    /**
+     * Return the calculation engine debug log.
+     *
+     * @return string[]
+     */
+    public function getLog(): array
+    {
+        return $this->debugLog;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/Operand.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/Operand.php
new file mode 100644
index 00000000..05264c3f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/Operand.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine\Operands;
+
+interface Operand
+{
+    public static function fromParser(string $formula, int $index, array $matches): self;
+
+    public function value(): string;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php
new file mode 100644
index 00000000..fc2b5ea4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php
@@ -0,0 +1,355 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine\Operands;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use Stringable;
+
+final class StructuredReference implements Operand, Stringable
+{
+    public const NAME = 'Structured Reference';
+
+    private const OPEN_BRACE = '[';
+    private const CLOSE_BRACE = ']';
+
+    private const ITEM_SPECIFIER_ALL = '#All';
+    private const ITEM_SPECIFIER_HEADERS = '#Headers';
+    private const ITEM_SPECIFIER_DATA = '#Data';
+    private const ITEM_SPECIFIER_TOTALS = '#Totals';
+    private const ITEM_SPECIFIER_THIS_ROW = '#This Row';
+
+    private const ITEM_SPECIFIER_ROWS_SET = [
+        self::ITEM_SPECIFIER_ALL,
+        self::ITEM_SPECIFIER_HEADERS,
+        self::ITEM_SPECIFIER_DATA,
+        self::ITEM_SPECIFIER_TOTALS,
+    ];
+
+    private const TABLE_REFERENCE = '/([\p{L}_\\\\][\p{L}\p{N}\._]+)?(\[(?:[^\]\[]+|(?R))*+\])/miu';
+
+    private string $value;
+
+    private string $tableName;
+
+    private Table $table;
+
+    private string $reference;
+
+    private ?int $headersRow;
+
+    private int $firstDataRow;
+
+    private int $lastDataRow;
+
+    private ?int $totalsRow;
+
+    private array $columns;
+
+    public function __construct(string $structuredReference)
+    {
+        $this->value = $structuredReference;
+    }
+
+    public static function fromParser(string $formula, int $index, array $matches): self
+    {
+        $val = $matches[0];
+
+        $srCount = substr_count($val, self::OPEN_BRACE)
+            - substr_count($val, self::CLOSE_BRACE);
+        while ($srCount > 0) {
+            $srIndex = strlen($val);
+            $srStringRemainder = substr($formula, $index + $srIndex);
+            $closingPos = strpos($srStringRemainder, self::CLOSE_BRACE);
+            if ($closingPos === false) {
+                throw new Exception("Formula Error: No closing ']' to match opening '['");
+            }
+            $srStringRemainder = substr($srStringRemainder, 0, $closingPos + 1);
+            --$srCount;
+            if (str_contains($srStringRemainder, self::OPEN_BRACE)) {
+                ++$srCount;
+            }
+            $val .= $srStringRemainder;
+        }
+
+        return new self($val);
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    public function parse(Cell $cell): string
+    {
+        $this->getTableStructure($cell);
+        $cellRange = ($this->isRowReference()) ? $this->getRowReference($cell) : $this->getColumnReference();
+        $sheetName = '';
+        $worksheet = $this->table->getWorksheet();
+        if ($worksheet !== null && $worksheet !== $cell->getWorksheet()) {
+            $sheetName = "'" . $worksheet->getTitle() . "'!";
+        }
+
+        return $sheetName . $cellRange;
+    }
+
+    private function isRowReference(): bool
+    {
+        return str_contains($this->value, '[@')
+            || str_contains($this->value, '[' . self::ITEM_SPECIFIER_THIS_ROW . ']');
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function getTableStructure(Cell $cell): void
+    {
+        preg_match(self::TABLE_REFERENCE, $this->value, $matches);
+
+        $this->tableName = $matches[1];
+        $this->table = ($this->tableName === '')
+            ? $this->getTableForCell($cell)
+            : $this->getTableByName($cell);
+        $this->reference = $matches[2];
+        $tableRange = Coordinate::getRangeBoundaries($this->table->getRange());
+
+        $this->headersRow = ($this->table->getShowHeaderRow()) ? (int) $tableRange[0][1] : null;
+        $this->firstDataRow = ($this->table->getShowHeaderRow()) ? (int) $tableRange[0][1] + 1 : $tableRange[0][1];
+        $this->totalsRow = ($this->table->getShowTotalsRow()) ? (int) $tableRange[1][1] : null;
+        $this->lastDataRow = ($this->table->getShowTotalsRow()) ? (int) $tableRange[1][1] - 1 : $tableRange[1][1];
+
+        $cellParam = $cell;
+        $worksheet = $this->table->getWorksheet();
+        if ($worksheet !== null && $worksheet !== $cell->getWorksheet()) {
+            $cellParam = $worksheet->getCell('A1');
+        }
+        $this->columns = $this->getColumns($cellParam, $tableRange);
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function getTableForCell(Cell $cell): Table
+    {
+        $tables = $cell->getWorksheet()->getTableCollection();
+        foreach ($tables as $table) {
+            /** @var Table $table */
+            $range = $table->getRange();
+            if ($cell->isInRange($range) === true) {
+                $this->tableName = $table->getName();
+
+                return $table;
+            }
+        }
+
+        throw new Exception('Table for Structured Reference cannot be identified');
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function getTableByName(Cell $cell): Table
+    {
+        $table = $cell->getWorksheet()->getTableByName($this->tableName);
+
+        if ($table === null) {
+            $spreadsheet = $cell->getWorksheet()->getParent();
+            if ($spreadsheet !== null) {
+                $table = $spreadsheet->getTableByName($this->tableName);
+            }
+        }
+
+        if ($table === null) {
+            throw new Exception("Table {$this->tableName} for Structured Reference cannot be located");
+        }
+
+        return $table;
+    }
+
+    private function getColumns(Cell $cell, array $tableRange): array
+    {
+        $worksheet = $cell->getWorksheet();
+        $cellReference = $cell->getCoordinate();
+
+        $columns = [];
+        $lastColumn = ++$tableRange[1][0];
+        for ($column = $tableRange[0][0]; $column !== $lastColumn; ++$column) {
+            $columns[$column] = $worksheet
+                ->getCell($column . ($this->headersRow ?? ($this->firstDataRow - 1)))
+                ->getCalculatedValue();
+        }
+
+        $worksheet->getCell($cellReference);
+
+        return $columns;
+    }
+
+    private function getRowReference(Cell $cell): string
+    {
+        $reference = str_replace("\u{a0}", ' ', $this->reference);
+        /** @var string $reference */
+        $reference = str_replace('[' . self::ITEM_SPECIFIER_THIS_ROW . '],', '', $reference);
+
+        foreach ($this->columns as $columnId => $columnName) {
+            $columnName = str_replace("\u{a0}", ' ', $columnName);
+            $reference = $this->adjustRowReference($columnName, $reference, $cell, $columnId);
+        }
+
+        return $this->validateParsedReference(trim($reference, '[]@, '));
+    }
+
+    private function adjustRowReference(string $columnName, string $reference, Cell $cell, string $columnId): string
+    {
+        if ($columnName !== '') {
+            $cellReference = $columnId . $cell->getRow();
+            $pattern1 = '/\[' . preg_quote($columnName, '/') . '\]/miu';
+            $pattern2 = '/@' . preg_quote($columnName, '/') . '/miu';
+            if (preg_match($pattern1, $reference) === 1) {
+                $reference = preg_replace($pattern1, $cellReference, $reference);
+            } elseif (preg_match($pattern2, $reference) === 1) {
+                $reference = preg_replace($pattern2, $cellReference, $reference);
+            }
+            /** @var string $reference */
+        }
+
+        return $reference;
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function getColumnReference(): string
+    {
+        $reference = str_replace("\u{a0}", ' ', $this->reference);
+        $startRow = ($this->totalsRow === null) ? $this->lastDataRow : $this->totalsRow;
+        $endRow = ($this->headersRow === null) ? $this->firstDataRow : $this->headersRow;
+
+        [$startRow, $endRow] = $this->getRowsForColumnReference($reference, $startRow, $endRow);
+        $reference = $this->getColumnsForColumnReference($reference, $startRow, $endRow);
+
+        $reference = trim($reference, '[]@, ');
+        if (substr_count($reference, ':') > 1) {
+            $cells = explode(':', $reference);
+            $firstCell = array_shift($cells);
+            $lastCell = array_pop($cells);
+            $reference = "{$firstCell}:{$lastCell}";
+        }
+
+        return $this->validateParsedReference($reference);
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function validateParsedReference(string $reference): string
+    {
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . ':' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $reference) !== 1) {
+            if (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $reference) !== 1) {
+                throw new Exception(
+                    "Invalid Structured Reference {$this->reference} {$reference}",
+                    Exception::CALCULATION_ENGINE_PUSH_TO_STACK
+                );
+            }
+        }
+
+        return $reference;
+    }
+
+    private function fullData(int $startRow, int $endRow): string
+    {
+        $columns = array_keys($this->columns);
+        $firstColumn = array_shift($columns);
+        $lastColumn = (empty($columns)) ? $firstColumn : array_pop($columns);
+
+        return "{$firstColumn}{$startRow}:{$lastColumn}{$endRow}";
+    }
+
+    private function getMinimumRow(string $reference): int
+    {
+        return match ($reference) {
+            self::ITEM_SPECIFIER_ALL, self::ITEM_SPECIFIER_HEADERS => $this->headersRow ?? $this->firstDataRow,
+            self::ITEM_SPECIFIER_DATA => $this->firstDataRow,
+            self::ITEM_SPECIFIER_TOTALS => $this->totalsRow ?? $this->lastDataRow,
+            default => $this->headersRow ?? $this->firstDataRow,
+        };
+    }
+
+    private function getMaximumRow(string $reference): int
+    {
+        return match ($reference) {
+            self::ITEM_SPECIFIER_HEADERS => $this->headersRow ?? $this->firstDataRow,
+            self::ITEM_SPECIFIER_DATA => $this->lastDataRow,
+            self::ITEM_SPECIFIER_ALL, self::ITEM_SPECIFIER_TOTALS => $this->totalsRow ?? $this->lastDataRow,
+            default => $this->totalsRow ?? $this->lastDataRow,
+        };
+    }
+
+    public function value(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getRowsForColumnReference(string &$reference, int $startRow, int $endRow): array
+    {
+        $rowsSelected = false;
+        foreach (self::ITEM_SPECIFIER_ROWS_SET as $rowReference) {
+            $pattern = '/\[' . $rowReference . '\]/mui';
+            if (preg_match($pattern, $reference) === 1) {
+                if (($rowReference === self::ITEM_SPECIFIER_HEADERS) && ($this->table->getShowHeaderRow() === false)) {
+                    throw new Exception(
+                        'Table Headers are Hidden, and should not be Referenced',
+                        Exception::CALCULATION_ENGINE_PUSH_TO_STACK
+                    );
+                }
+                $rowsSelected = true;
+                $startRow = min($startRow, $this->getMinimumRow($rowReference));
+                $endRow = max($endRow, $this->getMaximumRow($rowReference));
+                $reference = preg_replace($pattern, '', $reference) ?? '';
+            }
+        }
+        if ($rowsSelected === false) {
+            // If there isn't any Special Item Identifier specified, then the selection defaults to data rows only.
+            $startRow = $this->firstDataRow;
+            $endRow = $this->lastDataRow;
+        }
+
+        return [$startRow, $endRow];
+    }
+
+    private function getColumnsForColumnReference(string $reference, int $startRow, int $endRow): string
+    {
+        $columnsSelected = false;
+        foreach ($this->columns as $columnId => $columnName) {
+            $columnName = str_replace("\u{a0}", ' ', $columnName ?? '');
+            $cellFrom = "{$columnId}{$startRow}";
+            $cellTo = "{$columnId}{$endRow}";
+            $cellReference = ($cellFrom === $cellTo) ? $cellFrom : "{$cellFrom}:{$cellTo}";
+            $pattern = '/\[' . preg_quote($columnName, '/') . '\]/mui';
+            if (preg_match($pattern, $reference) === 1) {
+                $columnsSelected = true;
+                $reference = preg_replace($pattern, $cellReference, $reference);
+            }
+            /** @var string $reference */
+        }
+        if ($columnsSelected === false) {
+            return $this->fullData($startRow, $endRow);
+        }
+
+        return $reference;
+    }
+
+    public function __toString(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php
new file mode 100644
index 00000000..5d564a05
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class BesselI
+{
+    use ArrayEnabled;
+
+    /**
+     * BESSELI.
+     *
+     *    Returns the modified Bessel function In(x), which is equivalent to the Bessel function evaluated
+     *        for purely imaginary arguments
+     *
+     *    Excel Function:
+     *        BESSELI(x,ord)
+     *
+     * NOTE: The MS Excel implementation of the BESSELI function is still not accurate.
+     *       This code provides a more accurate calculation
+     *
+     * @param mixed $x A float value at which to evaluate the function.
+     *                                If x is nonnumeric, BESSELI returns the #VALUE! error value.
+     *                      Or can be an array of values
+     * @param mixed $ord The integer order of the Bessel function.
+     *                                If ord is not an integer, it is truncated.
+     *                                If $ord is nonnumeric, BESSELI returns the #VALUE! error value.
+     *                                If $ord < 0, BESSELI returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BESSELI(mixed $x, mixed $ord): array|string|float
+    {
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
+
+        try {
+            $x = EngineeringValidations::validateFloat($x);
+            $ord = EngineeringValidations::validateInt($ord);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($ord < 0) {
+            return ExcelError::NAN();
+        }
+
+        $fResult = self::calculate($x, $ord);
+
+        return (is_nan($fResult)) ? ExcelError::NAN() : $fResult;
+    }
+
+    private static function calculate(float $x, int $ord): float
+    {
+        return match ($ord) {
+            0 => self::besselI0($x),
+            1 => self::besselI1($x),
+            default => self::besselI2($x, $ord),
+        };
+    }
+
+    private static function besselI0(float $x): float
+    {
+        $ax = abs($x);
+
+        if ($ax < 3.75) {
+            $y = $x / 3.75;
+            $y = $y * $y;
+
+            return 1.0 + $y * (3.5156229 + $y * (3.0899424 + $y * (1.2067492
+                                + $y * (0.2659732 + $y * (0.360768e-1 + $y * 0.45813e-2)))));
+        }
+
+        $y = 3.75 / $ax;
+
+        return (exp($ax) / sqrt($ax)) * (0.39894228 + $y * (0.1328592e-1 + $y * (0.225319e-2 + $y * (-0.157565e-2
+                            + $y * (0.916281e-2 + $y * (-0.2057706e-1 + $y * (0.2635537e-1
+                                        + $y * (-0.1647633e-1 + $y * 0.392377e-2))))))));
+    }
+
+    private static function besselI1(float $x): float
+    {
+        $ax = abs($x);
+
+        if ($ax < 3.75) {
+            $y = $x / 3.75;
+            $y = $y * $y;
+            $ans = $ax * (0.5 + $y * (0.87890594 + $y * (0.51498869 + $y * (0.15084934 + $y * (0.2658733e-1
+                                    + $y * (0.301532e-2 + $y * 0.32411e-3))))));
+
+            return ($x < 0.0) ? -$ans : $ans;
+        }
+
+        $y = 3.75 / $ax;
+        $ans = 0.2282967e-1 + $y * (-0.2895312e-1 + $y * (0.1787654e-1 - $y * 0.420059e-2));
+        $ans = 0.39894228 + $y * (-0.3988024e-1 + $y * (-0.362018e-2 + $y * (0.163801e-2
+                        + $y * (-0.1031555e-1 + $y * $ans))));
+        $ans *= exp($ax) / sqrt($ax);
+
+        return ($x < 0.0) ? -$ans : $ans;
+    }
+
+    private static function besselI2(float $x, int $ord): float
+    {
+        if ($x === 0.0) {
+            return 0.0;
+        }
+
+        $tox = 2.0 / abs($x);
+        $bip = 0;
+        $ans = 0.0;
+        $bi = 1.0;
+
+        for ($j = 2 * ($ord + (int) sqrt(40.0 * $ord)); $j > 0; --$j) {
+            $bim = $bip + $j * $tox * $bi;
+            $bip = $bi;
+            $bi = $bim;
+
+            if (abs($bi) > 1.0e+12) {
+                $ans *= 1.0e-12;
+                $bi *= 1.0e-12;
+                $bip *= 1.0e-12;
+            }
+
+            if ($j === $ord) {
+                $ans = $bip;
+            }
+        }
+
+        $ans *= self::besselI0($x) / $bi;
+
+        return ($x < 0.0 && (($ord % 2) === 1)) ? -$ans : $ans;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
new file mode 100644
index 00000000..4a9d9ffd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
@@ -0,0 +1,176 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class BesselJ
+{
+    use ArrayEnabled;
+
+    /**
+     * BESSELJ.
+     *
+     *    Returns the Bessel function
+     *
+     *    Excel Function:
+     *        BESSELJ(x,ord)
+     *
+     * NOTE: The MS Excel implementation of the BESSELJ function is still not accurate, particularly for higher order
+     *       values with x < -8 and x > 8. This code provides a more accurate calculation
+     *
+     * @param mixed $x A float value at which to evaluate the function.
+     *                                If x is nonnumeric, BESSELJ returns the #VALUE! error value.
+     *                      Or can be an array of values
+     * @param mixed $ord The integer order of the Bessel function.
+     *                       If ord is not an integer, it is truncated.
+     *                                If $ord is nonnumeric, BESSELJ returns the #VALUE! error value.
+     *                                If $ord < 0, BESSELJ returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BESSELJ(mixed $x, mixed $ord): array|string|float
+    {
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
+
+        try {
+            $x = EngineeringValidations::validateFloat($x);
+            $ord = EngineeringValidations::validateInt($ord);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($ord < 0) {
+            return ExcelError::NAN();
+        }
+
+        $fResult = self::calculate($x, $ord);
+
+        return (is_nan($fResult)) ? ExcelError::NAN() : $fResult;
+    }
+
+    private static function calculate(float $x, int $ord): float
+    {
+        return match ($ord) {
+            0 => self::besselJ0($x),
+            1 => self::besselJ1($x),
+            default => self::besselJ2($x, $ord),
+        };
+    }
+
+    private static function besselJ0(float $x): float
+    {
+        $ax = abs($x);
+
+        if ($ax < 8.0) {
+            $y = $x * $x;
+            $ans1 = 57568490574.0 + $y * (-13362590354.0 + $y * (651619640.7 + $y * (-11214424.18 + $y
+                            * (77392.33017 + $y * (-184.9052456)))));
+            $ans2 = 57568490411.0 + $y * (1029532985.0 + $y * (9494680.718 + $y * (59272.64853 + $y
+                            * (267.8532712 + $y * 1.0))));
+
+            return $ans1 / $ans2;
+        }
+
+        $z = 8.0 / $ax;
+        $y = $z * $z;
+        $xx = $ax - 0.785398164;
+        $ans1 = 1.0 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
+        $ans2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y
+                    * (0.7621095161e-6 - $y * 0.934935152e-7)));
+
+        return sqrt(0.636619772 / $ax) * (cos($xx) * $ans1 - $z * sin($xx) * $ans2);
+    }
+
+    private static function besselJ1(float $x): float
+    {
+        $ax = abs($x);
+
+        if ($ax < 8.0) {
+            $y = $x * $x;
+            $ans1 = $x * (72362614232.0 + $y * (-7895059235.0 + $y * (242396853.1 + $y
+                            * (-2972611.439 + $y * (15704.48260 + $y * (-30.16036606))))));
+            $ans2 = 144725228442.0 + $y * (2300535178.0 + $y * (18583304.74 + $y * (99447.43394 + $y
+                            * (376.9991397 + $y * 1.0))));
+
+            return $ans1 / $ans2;
+        }
+
+        $z = 8.0 / $ax;
+        $y = $z * $z;
+        $xx = $ax - 2.356194491;
+
+        $ans1 = 1.0 + $y * (0.183105e-2 + $y * (-0.3516396496e-4 + $y * (0.2457520174e-5 + $y * (-0.240337019e-6))));
+        $ans2 = 0.04687499995 + $y * (-0.2002690873e-3 + $y * (0.8449199096e-5 + $y
+                    * (-0.88228987e-6 + $y * 0.105787412e-6)));
+        $ans = sqrt(0.636619772 / $ax) * (cos($xx) * $ans1 - $z * sin($xx) * $ans2);
+
+        return ($x < 0.0) ? -$ans : $ans;
+    }
+
+    private static function besselJ2(float $x, int $ord): float
+    {
+        $ax = abs($x);
+        if ($ax === 0.0) {
+            return 0.0;
+        }
+
+        if ($ax > $ord) {
+            return self::besselj2a($ax, $ord, $x);
+        }
+
+        return self::besselj2b($ax, $ord, $x);
+    }
+
+    private static function besselj2a(float $ax, int $ord, float $x): float
+    {
+        $tox = 2.0 / $ax;
+        $bjm = self::besselJ0($ax);
+        $bj = self::besselJ1($ax);
+        for ($j = 1; $j < $ord; ++$j) {
+            $bjp = $j * $tox * $bj - $bjm;
+            $bjm = $bj;
+            $bj = $bjp;
+        }
+        $ans = $bj;
+
+        return ($x < 0.0 && ($ord % 2) == 1) ? -$ans : $ans;
+    }
+
+    private static function besselj2b(float $ax, int $ord, float $x): float
+    {
+        $tox = 2.0 / $ax;
+        $jsum = false;
+        $bjp = $ans = $sum = 0.0;
+        $bj = 1.0;
+        for ($j = 2 * ($ord + (int) sqrt(40.0 * $ord)); $j > 0; --$j) {
+            $bjm = $j * $tox * $bj - $bjp;
+            $bjp = $bj;
+            $bj = $bjm;
+            if (abs($bj) > 1.0e+10) {
+                $bj *= 1.0e-10;
+                $bjp *= 1.0e-10;
+                $ans *= 1.0e-10;
+                $sum *= 1.0e-10;
+            }
+            if ($jsum === true) {
+                $sum += $bj;
+            }
+            $jsum = $jsum === false;
+            if ($j === $ord) {
+                $ans = $bjp;
+            }
+        }
+        $sum = 2.0 * $sum - $bj;
+        $ans /= $sum;
+
+        return ($x < 0.0 && ($ord % 2) === 1) ? -$ans : $ans;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php
new file mode 100644
index 00000000..5a9bd54c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class BesselK
+{
+    use ArrayEnabled;
+
+    /**
+     * BESSELK.
+     *
+     *    Returns the modified Bessel function Kn(x), which is equivalent to the Bessel functions evaluated
+     *        for purely imaginary arguments.
+     *
+     *    Excel Function:
+     *        BESSELK(x,ord)
+     *
+     * @param mixed $x A float value at which to evaluate the function.
+     *                                If x is nonnumeric, BESSELK returns the #VALUE! error value.
+     *                      Or can be an array of values
+     * @param mixed $ord The integer order of the Bessel function.
+     *                       If ord is not an integer, it is truncated.
+     *                                If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
+     *                       If $ord < 0, BESSELKI returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BESSELK(mixed $x, mixed $ord): array|string|float
+    {
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
+
+        try {
+            $x = EngineeringValidations::validateFloat($x);
+            $ord = EngineeringValidations::validateInt($ord);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($ord < 0) || ($x <= 0.0)) {
+            return ExcelError::NAN();
+        }
+
+        $fBk = self::calculate($x, $ord);
+
+        return (is_nan($fBk)) ? ExcelError::NAN() : $fBk;
+    }
+
+    private static function calculate(float $x, int $ord): float
+    {
+        return match ($ord) {
+            0 => self::besselK0($x),
+            1 => self::besselK1($x),
+            default => self::besselK2($x, $ord),
+        };
+    }
+
+    /**
+     * Mollify Phpstan.
+     *
+     * @codeCoverageIgnore
+     */
+    private static function callBesselI(float $x, int $ord): float
+    {
+        $rslt = BesselI::BESSELI($x, $ord);
+        if (!is_float($rslt)) {
+            throw new Exception('Unexpected array or string');
+        }
+
+        return $rslt;
+    }
+
+    private static function besselK0(float $x): float
+    {
+        if ($x <= 2) {
+            $fNum2 = $x * 0.5;
+            $y = ($fNum2 * $fNum2);
+
+            return -log($fNum2) * self::callBesselI($x, 0)
+                + (-0.57721566 + $y * (0.42278420 + $y * (0.23069756 + $y * (0.3488590e-1 + $y * (0.262698e-2 + $y
+                                    * (0.10750e-3 + $y * 0.74e-5))))));
+        }
+
+        $y = 2 / $x;
+
+        return exp(-$x) / sqrt($x)
+            * (1.25331414 + $y * (-0.7832358e-1 + $y * (0.2189568e-1 + $y * (-0.1062446e-1 + $y
+                            * (0.587872e-2 + $y * (-0.251540e-2 + $y * 0.53208e-3))))));
+    }
+
+    private static function besselK1(float $x): float
+    {
+        if ($x <= 2) {
+            $fNum2 = $x * 0.5;
+            $y = ($fNum2 * $fNum2);
+
+            return log($fNum2) * self::callBesselI($x, 1)
+                + (1 + $y * (0.15443144 + $y * (-0.67278579 + $y * (-0.18156897 + $y * (-0.1919402e-1 + $y
+                                    * (-0.110404e-2 + $y * (-0.4686e-4))))))) / $x;
+        }
+
+        $y = 2 / $x;
+
+        return exp(-$x) / sqrt($x)
+            * (1.25331414 + $y * (0.23498619 + $y * (-0.3655620e-1 + $y * (0.1504268e-1 + $y * (-0.780353e-2 + $y
+                                * (0.325614e-2 + $y * (-0.68245e-3)))))));
+    }
+
+    private static function besselK2(float $x, int $ord): float
+    {
+        $fTox = 2 / $x;
+        $fBkm = self::besselK0($x);
+        $fBk = self::besselK1($x);
+        for ($n = 1; $n < $ord; ++$n) {
+            $fBkp = $fBkm + $n * $fTox * $fBk;
+            $fBkm = $fBk;
+            $fBk = $fBkp;
+        }
+
+        return $fBk;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php
new file mode 100644
index 00000000..5d99638a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class BesselY
+{
+    use ArrayEnabled;
+
+    /**
+     * BESSELY.
+     *
+     * Returns the Bessel function, which is also called the Weber function or the Neumann function.
+     *
+     *    Excel Function:
+     *        BESSELY(x,ord)
+     *
+     * @param mixed $x A float value at which to evaluate the function.
+     *                   If x is nonnumeric, BESSELY returns the #VALUE! error value.
+     *                      Or can be an array of values
+     * @param mixed $ord The integer order of the Bessel function.
+     *                       If ord is not an integer, it is truncated.
+     *                       If $ord is nonnumeric, BESSELY returns the #VALUE! error value.
+     *                       If $ord < 0, BESSELY returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BESSELY(mixed $x, mixed $ord): array|string|float
+    {
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
+
+        try {
+            $x = EngineeringValidations::validateFloat($x);
+            $ord = EngineeringValidations::validateInt($ord);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($ord < 0) || ($x <= 0.0)) {
+            return ExcelError::NAN();
+        }
+
+        $fBy = self::calculate($x, $ord);
+
+        return (is_nan($fBy)) ? ExcelError::NAN() : $fBy;
+    }
+
+    private static function calculate(float $x, int $ord): float
+    {
+        return match ($ord) {
+            0 => self::besselY0($x),
+            1 => self::besselY1($x),
+            default => self::besselY2($x, $ord),
+        };
+    }
+
+    /**
+     * Mollify Phpstan.
+     *
+     * @codeCoverageIgnore
+     */
+    private static function callBesselJ(float $x, int $ord): float
+    {
+        $rslt = BesselJ::BESSELJ($x, $ord);
+        if (!is_float($rslt)) {
+            throw new Exception('Unexpected array or string');
+        }
+
+        return $rslt;
+    }
+
+    private static function besselY0(float $x): float
+    {
+        if ($x < 8.0) {
+            $y = ($x * $x);
+            $ans1 = -2957821389.0 + $y * (7062834065.0 + $y * (-512359803.6 + $y * (10879881.29 + $y
+                            * (-86327.92757 + $y * 228.4622733))));
+            $ans2 = 40076544269.0 + $y * (745249964.8 + $y * (7189466.438 + $y
+                        * (47447.26470 + $y * (226.1030244 + $y))));
+
+            return $ans1 / $ans2 + 0.636619772 * self::callBesselJ($x, 0) * log($x);
+        }
+
+        $z = 8.0 / $x;
+        $y = ($z * $z);
+        $xx = $x - 0.785398164;
+        $ans1 = 1 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
+        $ans2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y * (0.7621095161e-6 + $y
+                        * (-0.934945152e-7))));
+
+        return sqrt(0.636619772 / $x) * (sin($xx) * $ans1 + $z * cos($xx) * $ans2);
+    }
+
+    private static function besselY1(float $x): float
+    {
+        if ($x < 8.0) {
+            $y = ($x * $x);
+            $ans1 = $x * (-0.4900604943e13 + $y * (0.1275274390e13 + $y * (-0.5153438139e11 + $y
+                            * (0.7349264551e9 + $y * (-0.4237922726e7 + $y * 0.8511937935e4)))));
+            $ans2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y
+                            * (0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
+
+            return ($ans1 / $ans2) + 0.636619772 * (self::callBesselJ($x, 1) * log($x) - 1 / $x);
+        }
+
+        $z = 8.0 / $x;
+        $y = $z * $z;
+        $xx = $x - 2.356194491;
+        $ans1 = 1.0 + $y * (0.183105e-2 + $y * (-0.3516396496e-4 + $y * (0.2457520174e-5 + $y * (-0.240337019e-6))));
+        $ans2 = 0.04687499995 + $y * (-0.2002690873e-3 + $y * (0.8449199096e-5 + $y
+                    * (-0.88228987e-6 + $y * 0.105787412e-6)));
+
+        return sqrt(0.636619772 / $x) * (sin($xx) * $ans1 + $z * cos($xx) * $ans2);
+    }
+
+    private static function besselY2(float $x, int $ord): float
+    {
+        $fTox = 2.0 / $x;
+        $fBym = self::besselY0($x);
+        $fBy = self::besselY1($x);
+        for ($n = 1; $n < $ord; ++$n) {
+            $fByp = $n * $fTox * $fBy - $fBym;
+            $fBym = $fBy;
+            $fBy = $fByp;
+        }
+
+        return $fBy;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
new file mode 100644
index 00000000..c861c21a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
@@ -0,0 +1,247 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class BitWise
+{
+    use ArrayEnabled;
+
+    const SPLIT_DIVISOR = 2 ** 24;
+
+    /**
+     * Split a number into upper and lower portions for full 32-bit support.
+     *
+     * @return int[]
+     */
+    private static function splitNumber(float|int $number): array
+    {
+        return [(int) floor($number / self::SPLIT_DIVISOR), (int) fmod($number, self::SPLIT_DIVISOR)];
+    }
+
+    /**
+     * BITAND.
+     *
+     * Returns the bitwise AND of two integer values.
+     *
+     * Excel Function:
+     *        BITAND(number1, number2)
+     *
+     * @param null|array|bool|float|int|string $number1 Or can be an array of values
+     * @param null|array|bool|float|int|string $number2 Or can be an array of values
+     *
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BITAND(null|array|bool|float|int|string $number1, null|array|bool|float|int|string $number2): array|string|int|float
+    {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
+        try {
+            $number1 = self::validateBitwiseArgument($number1);
+            $number2 = self::validateBitwiseArgument($number2);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+        $split1 = self::splitNumber($number1);
+        $split2 = self::splitNumber($number2);
+
+        return self::SPLIT_DIVISOR * ($split1[0] & $split2[0]) + ($split1[1] & $split2[1]);
+    }
+
+    /**
+     * BITOR.
+     *
+     * Returns the bitwise OR of two integer values.
+     *
+     * Excel Function:
+     *        BITOR(number1, number2)
+     *
+     * @param null|array|bool|float|int|string $number1 Or can be an array of values
+     * @param null|array|bool|float|int|string $number2 Or can be an array of values
+     *
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BITOR(null|array|bool|float|int|string $number1, null|array|bool|float|int|string $number2): array|string|int|float
+    {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
+        try {
+            $number1 = self::validateBitwiseArgument($number1);
+            $number2 = self::validateBitwiseArgument($number2);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $split1 = self::splitNumber($number1);
+        $split2 = self::splitNumber($number2);
+
+        return self::SPLIT_DIVISOR * ($split1[0] | $split2[0]) + ($split1[1] | $split2[1]);
+    }
+
+    /**
+     * BITXOR.
+     *
+     * Returns the bitwise XOR of two integer values.
+     *
+     * Excel Function:
+     *        BITXOR(number1, number2)
+     *
+     * @param null|array|bool|float|int|string $number1 Or can be an array of values
+     * @param null|array|bool|float|int|string $number2 Or can be an array of values
+     *
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BITXOR(null|array|bool|float|int|string $number1, null|array|bool|float|int|string $number2): array|string|int|float
+    {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
+        try {
+            $number1 = self::validateBitwiseArgument($number1);
+            $number2 = self::validateBitwiseArgument($number2);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $split1 = self::splitNumber($number1);
+        $split2 = self::splitNumber($number2);
+
+        return self::SPLIT_DIVISOR * ($split1[0] ^ $split2[0]) + ($split1[1] ^ $split2[1]);
+    }
+
+    /**
+     * BITLSHIFT.
+     *
+     * Returns the number value shifted left by shift_amount bits.
+     *
+     * Excel Function:
+     *        BITLSHIFT(number, shift_amount)
+     *
+     * @param null|array|bool|float|int|string $number Or can be an array of values
+     * @param null|array|bool|float|int|string $shiftAmount Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BITLSHIFT(null|array|bool|float|int|string $number, null|array|bool|float|int|string $shiftAmount): array|string|float
+    {
+        if (is_array($number) || is_array($shiftAmount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $shiftAmount);
+        }
+
+        try {
+            $number = self::validateBitwiseArgument($number);
+            $shiftAmount = self::validateShiftAmount($shiftAmount);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $result = floor($number * (2 ** $shiftAmount));
+        if ($result > 2 ** 48 - 1) {
+            return ExcelError::NAN();
+        }
+
+        return $result;
+    }
+
+    /**
+     * BITRSHIFT.
+     *
+     * Returns the number value shifted right by shift_amount bits.
+     *
+     * Excel Function:
+     *        BITRSHIFT(number, shift_amount)
+     *
+     * @param null|array|bool|float|int|string $number Or can be an array of values
+     * @param null|array|bool|float|int|string $shiftAmount Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function BITRSHIFT(null|array|bool|float|int|string $number, null|array|bool|float|int|string $shiftAmount): array|string|float
+    {
+        if (is_array($number) || is_array($shiftAmount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $shiftAmount);
+        }
+
+        try {
+            $number = self::validateBitwiseArgument($number);
+            $shiftAmount = self::validateShiftAmount($shiftAmount);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $result = floor($number / (2 ** $shiftAmount));
+        if ($result > 2 ** 48 - 1) { // possible because shiftAmount can be negative
+            return ExcelError::NAN();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Validate arguments passed to the bitwise functions.
+     */
+    private static function validateBitwiseArgument(mixed $value): float
+    {
+        $value = self::nullFalseTrueToNumber($value);
+
+        if (is_numeric($value)) {
+            $value = (float) $value;
+            if ($value == floor($value)) {
+                if (($value > 2 ** 48 - 1) || ($value < 0)) {
+                    throw new Exception(ExcelError::NAN());
+                }
+
+                return floor($value);
+            }
+
+            throw new Exception(ExcelError::NAN());
+        }
+
+        throw new Exception(ExcelError::VALUE());
+    }
+
+    /**
+     * Validate arguments passed to the bitwise functions.
+     */
+    private static function validateShiftAmount(mixed $value): int
+    {
+        $value = self::nullFalseTrueToNumber($value);
+
+        if (is_numeric($value)) {
+            if (abs($value) > 53) {
+                throw new Exception(ExcelError::NAN());
+            }
+
+            return (int) $value;
+        }
+
+        throw new Exception(ExcelError::VALUE());
+    }
+
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     */
+    private static function nullFalseTrueToNumber(mixed &$number): mixed
+    {
+        if ($number === null) {
+            $number = 0;
+        } elseif (is_bool($number)) {
+            $number = (int) $number;
+        }
+
+        return $number;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
new file mode 100644
index 00000000..9e3275fc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Compare
+{
+    use ArrayEnabled;
+
+    /**
+     * DELTA.
+     *
+     *    Excel Function:
+     *        DELTA(a[,b])
+     *
+     *    Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise.
+     *    Use this function to filter a set of values. For example, by summing several DELTA
+     *        functions you calculate the count of equal pairs. This function is also known as the
+     *        Kronecker Delta function.
+     *
+     * @param array|bool|float|int|string $a the first number
+     *                      Or can be an array of values
+     * @param array|bool|float|int|string $b The second number. If omitted, b is assumed to be zero.
+     *                      Or can be an array of values
+     *
+     * @return array|int|string (string in the event of an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function DELTA(array|float|bool|string|int $a, array|float|bool|string|int $b = 0.0): array|string|int
+    {
+        if (is_array($a) || is_array($b)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $a, $b);
+        }
+
+        try {
+            $a = EngineeringValidations::validateFloat($a);
+            $b = EngineeringValidations::validateFloat($b);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (int) (abs($a - $b) < 1.0e-15);
+    }
+
+    /**
+     * GESTEP.
+     *
+     *    Excel Function:
+     *        GESTEP(number[,step])
+     *
+     *    Returns 1 if number >= step; returns 0 (zero) otherwise
+     *    Use this function to filter a set of values. For example, by summing several GESTEP
+     *        functions you calculate the count of values that exceed a threshold.
+     *
+     * @param array|bool|float|int|string $number the value to test against step
+     *                      Or can be an array of values
+     * @param null|array|bool|float|int|string $step The threshold value. If you omit a value for step, GESTEP uses zero.
+     *                      Or can be an array of values
+     *
+     * @return array|int|string (string in the event of an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function GESTEP(array|float|bool|string|int $number, $step = 0.0): array|string|int
+    {
+        if (is_array($number) || is_array($step)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $step);
+        }
+
+        try {
+            $number = EngineeringValidations::validateFloat($number);
+            $step = EngineeringValidations::validateFloat($step ?? 0.0);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (int) ($number >= $step);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php
new file mode 100644
index 00000000..3e41371b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use Complex\Complex as ComplexObject;
+use Complex\Exception as ComplexException;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Complex
+{
+    use ArrayEnabled;
+
+    /**
+     * COMPLEX.
+     *
+     * Converts real and imaginary coefficients into a complex number of the form x +/- yi or x +/- yj.
+     *
+     * Excel Function:
+     *        COMPLEX(realNumber,imaginary[,suffix])
+     *
+     * @param mixed $realNumber the real float coefficient of the complex number
+     *                      Or can be an array of values
+     * @param mixed $imaginary the imaginary float coefficient of the complex number
+     *                      Or can be an array of values
+     * @param mixed $suffix The character suffix for the imaginary component of the complex number.
+     *                          If omitted, the suffix is assumed to be "i".
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function COMPLEX(mixed $realNumber = 0.0, mixed $imaginary = 0.0, mixed $suffix = 'i'): array|string
+    {
+        if (is_array($realNumber) || is_array($imaginary) || is_array($suffix)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $realNumber, $imaginary, $suffix);
+        }
+
+        $realNumber = $realNumber ?? 0.0;
+        $imaginary = $imaginary ?? 0.0;
+        $suffix = $suffix ?? 'i';
+
+        try {
+            $realNumber = EngineeringValidations::validateFloat($realNumber);
+            $imaginary = EngineeringValidations::validateFloat($imaginary);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($suffix === 'i') || ($suffix === 'j') || ($suffix === '')) {
+            $complex = new ComplexObject($realNumber, $imaginary, $suffix);
+
+            return (string) $complex;
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * IMAGINARY.
+     *
+     * Returns the imaginary coefficient of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMAGINARY(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the imaginary
+     *                                         coefficient
+     *                      Or can be an array of values
+     *
+     * @return array|float|string (string if an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMAGINARY($complexNumber): array|string|float
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return $complex->getImaginary();
+    }
+
+    /**
+     * IMREAL.
+     *
+     * Returns the real coefficient of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMREAL(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the real coefficient
+     *                      Or can be an array of values
+     *
+     * @return array|float|string (string if an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMREAL($complexNumber): array|string|float
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return $complex->getReal();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php
new file mode 100644
index 00000000..d1b7764a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php
@@ -0,0 +1,592 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use Complex\Complex as ComplexObject;
+use Complex\Exception as ComplexException;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ComplexFunctions
+{
+    use ArrayEnabled;
+
+    /**
+     * IMABS.
+     *
+     * Returns the absolute value (modulus) of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMABS(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the absolute value
+     *                      Or can be an array of values
+     *
+     * @return array|float|string         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMABS(array|string $complexNumber): array|float|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return $complex->abs();
+    }
+
+    /**
+     * IMARGUMENT.
+     *
+     * Returns the argument theta of a complex number, i.e. the angle in radians from the real
+     * axis to the representation of the number in polar coordinates.
+     *
+     * Excel Function:
+     *        IMARGUMENT(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the argument theta
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMARGUMENT(array|string $complexNumber): array|float|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return ExcelError::DIV0();
+        }
+
+        return $complex->argument();
+    }
+
+    /**
+     * IMCONJUGATE.
+     *
+     * Returns the complex conjugate of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCONJUGATE(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the conjugate
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMCONJUGATE(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->conjugate();
+    }
+
+    /**
+     * IMCOS.
+     *
+     * Returns the cosine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCOS(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the cosine
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMCOS(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->cos();
+    }
+
+    /**
+     * IMCOSH.
+     *
+     * Returns the hyperbolic cosine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCOSH(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic cosine
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMCOSH(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->cosh();
+    }
+
+    /**
+     * IMCOT.
+     *
+     * Returns the cotangent of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCOT(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the cotangent
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMCOT(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->cot();
+    }
+
+    /**
+     * IMCSC.
+     *
+     * Returns the cosecant of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCSC(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the cosecant
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMCSC(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->csc();
+    }
+
+    /**
+     * IMCSCH.
+     *
+     * Returns the hyperbolic cosecant of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMCSCH(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic cosecant
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMCSCH(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->csch();
+    }
+
+    /**
+     * IMSIN.
+     *
+     * Returns the sine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSIN(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the sine
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMSIN(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->sin();
+    }
+
+    /**
+     * IMSINH.
+     *
+     * Returns the hyperbolic sine of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSINH(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic sine
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMSINH(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->sinh();
+    }
+
+    /**
+     * IMSEC.
+     *
+     * Returns the secant of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSEC(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the secant
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMSEC(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->sec();
+    }
+
+    /**
+     * IMSECH.
+     *
+     * Returns the hyperbolic secant of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSECH(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic secant
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMSECH(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->sech();
+    }
+
+    /**
+     * IMTAN.
+     *
+     * Returns the tangent of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMTAN(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the tangent
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMTAN(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->tan();
+    }
+
+    /**
+     * IMSQRT.
+     *
+     * Returns the square root of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSQRT(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the square root
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMSQRT(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        $theta = self::IMARGUMENT($complexNumber);
+        if ($theta === ExcelError::DIV0()) {
+            return '0';
+        }
+
+        return (string) $complex->sqrt();
+    }
+
+    /**
+     * IMLN.
+     *
+     * Returns the natural logarithm of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLN(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the natural logarithm
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMLN(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->ln();
+    }
+
+    /**
+     * IMLOG10.
+     *
+     * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLOG10(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the common logarithm
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMLOG10(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->log10();
+    }
+
+    /**
+     * IMLOG2.
+     *
+     * Returns the base-2 logarithm of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMLOG2(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the base-2 logarithm
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMLOG2(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->log2();
+    }
+
+    /**
+     * IMEXP.
+     *
+     * Returns the exponential of a complex number in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMEXP(complexNumber)
+     *
+     * @param array|string $complexNumber the complex number for which you want the exponential
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMEXP(array|string $complexNumber): array|string
+    {
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $complex->exp();
+    }
+
+    /**
+     * IMPOWER.
+     *
+     * Returns a complex number in x + yi or x + yj text format raised to a power.
+     *
+     * Excel Function:
+     *        IMPOWER(complexNumber,realNumber)
+     *
+     * @param array|string $complexNumber the complex number you want to raise to a power
+     *                      Or can be an array of values
+     * @param array|float|int|string $realNumber the power to which you want to raise the complex number
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMPOWER(array|string $complexNumber, array|float|int|string $realNumber): array|string
+    {
+        if (is_array($complexNumber) || is_array($realNumber)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $complexNumber, $realNumber);
+        }
+
+        try {
+            $complex = new ComplexObject($complexNumber);
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        if (!is_numeric($realNumber)) {
+            return ExcelError::VALUE();
+        }
+
+        return (string) $complex->pow((float) $realNumber);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php
new file mode 100644
index 00000000..61efa847
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use Complex\Complex as ComplexObject;
+use Complex\Exception as ComplexException;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ComplexOperations
+{
+    use ArrayEnabled;
+
+    /**
+     * IMDIV.
+     *
+     * Returns the quotient of two complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMDIV(complexDividend,complexDivisor)
+     *
+     * @param array|string $complexDividend the complex numerator or dividend
+     *                      Or can be an array of values
+     * @param array|string $complexDivisor the complex denominator or divisor
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMDIV(array|string $complexDividend, array|string $complexDivisor): array|string
+    {
+        if (is_array($complexDividend) || is_array($complexDivisor)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $complexDividend, $complexDivisor);
+        }
+
+        try {
+            return (string) (new ComplexObject($complexDividend))->divideby(new ComplexObject($complexDivisor));
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+    }
+
+    /**
+     * IMSUB.
+     *
+     * Returns the difference of two complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSUB(complexNumber1,complexNumber2)
+     *
+     * @param array|string $complexNumber1 the complex number from which to subtract complexNumber2
+     *                      Or can be an array of values
+     * @param array|string $complexNumber2 the complex number to subtract from complexNumber1
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function IMSUB(array|string $complexNumber1, array|string $complexNumber2): array|string
+    {
+        if (is_array($complexNumber1) || is_array($complexNumber2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $complexNumber1, $complexNumber2);
+        }
+
+        try {
+            return (string) (new ComplexObject($complexNumber1))->subtract(new ComplexObject($complexNumber2));
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+    }
+
+    /**
+     * IMSUM.
+     *
+     * Returns the sum of two or more complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMSUM(complexNumber[,complexNumber[,...]])
+     *
+     * @param string ...$complexNumbers Series of complex numbers to add
+     */
+    public static function IMSUM(...$complexNumbers): string
+    {
+        // Return value
+        $returnValue = new ComplexObject(0.0);
+        $aArgs = Functions::flattenArray($complexNumbers);
+
+        try {
+            // Loop through the arguments
+            foreach ($aArgs as $complex) {
+                $returnValue = $returnValue->add(new ComplexObject($complex));
+            }
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $returnValue;
+    }
+
+    /**
+     * IMPRODUCT.
+     *
+     * Returns the product of two or more complex numbers in x + yi or x + yj text format.
+     *
+     * Excel Function:
+     *        IMPRODUCT(complexNumber[,complexNumber[,...]])
+     *
+     * @param string ...$complexNumbers Series of complex numbers to multiply
+     */
+    public static function IMPRODUCT(...$complexNumbers): string
+    {
+        // Return value
+        $returnValue = new ComplexObject(1.0);
+        $aArgs = Functions::flattenArray($complexNumbers);
+
+        try {
+            // Loop through the arguments
+            foreach ($aArgs as $complex) {
+                $returnValue = $returnValue->multiply(new ComplexObject($complex));
+            }
+        } catch (ComplexException) {
+            return ExcelError::NAN();
+        }
+
+        return (string) $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Constants.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Constants.php
new file mode 100644
index 00000000..a926db6e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Constants.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+class Constants
+{
+    /**
+     * EULER.
+     */
+    public const EULER = 2.71828182845904523536;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
new file mode 100644
index 00000000..1222831a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+abstract class ConvertBase
+{
+    use ArrayEnabled;
+
+    protected static function validateValue(mixed $value): string
+    {
+        if (is_bool($value)) {
+            if (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE) {
+                throw new Exception(ExcelError::VALUE());
+            }
+            $value = (int) $value;
+        }
+
+        if (is_numeric($value)) {
+            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+                $value = floor((float) $value);
+            }
+        }
+
+        return strtoupper((string) $value);
+    }
+
+    protected static function validatePlaces(mixed $places = null): ?int
+    {
+        if ($places === null) {
+            return $places;
+        }
+
+        if (is_numeric($places)) {
+            if ($places < 0 || $places > 10) {
+                throw new Exception(ExcelError::NAN());
+            }
+
+            return (int) $places;
+        }
+
+        throw new Exception(ExcelError::VALUE());
+    }
+
+    /**
+     * Formats a number base string value with leading zeroes.
+     *
+     * @param string $value The "number" to pad
+     * @param ?int $places The length that we want to pad this value
+     *
+     * @return string The padded "number"
+     */
+    protected static function nbrConversionFormat(string $value, ?int $places): string
+    {
+        if ($places !== null) {
+            if (strlen($value) <= $places) {
+                return substr(str_pad($value, $places, '0', STR_PAD_LEFT), -10);
+            }
+
+            return ExcelError::NAN();
+        }
+
+        return substr($value, -10);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php
new file mode 100644
index 00000000..9c00dcb5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertBinary extends ConvertBase
+{
+    /**
+     * toDecimal.
+     *
+     * Return a binary value as decimal.
+     *
+     * Excel Function:
+     *        BIN2DEC(x)
+     *
+     * @param array|bool|float|int|string $value The binary number (as a string) that you want to convert. The number
+     *                                cannot contain more than 10 characters (10 bits). The most significant
+     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+     *                                Negative numbers are represented using two's-complement notation.
+     *                                If number is not a valid binary number, or if number contains more than
+     *                                10 characters (10 bits), BIN2DEC returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toDecimal($value)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateBinary($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (strlen($value) == 10 && $value[0] === '1') {
+            //    Two's Complement
+            $value = substr($value, -9);
+
+            return '-' . (512 - bindec($value));
+        }
+
+        return (string) bindec($value);
+    }
+
+    /**
+     * toHex.
+     *
+     * Return a binary value as hex.
+     *
+     * Excel Function:
+     *        BIN2HEX(x[,places])
+     *
+     * @param array|bool|float|int|string $value The binary number (as a string) that you want to convert. The number
+     *                                cannot contain more than 10 characters (10 bits). The most significant
+     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+     *                                Negative numbers are represented using two's-complement notation.
+     *                                If number is not a valid binary number, or if number contains more than
+     *                                10 characters (10 bits), BIN2HEX returns the #NUM! error value.
+     *                      Or can be an array of values
+     * @param null|array|float|int|string $places The number of characters to use. If places is omitted, BIN2HEX uses the
+     *                                minimum number of characters necessary. Places is useful for padding the
+     *                                return value with leading 0s (zeros).
+     *                                If places is not an integer, it is truncated.
+     *                                If places is nonnumeric, BIN2HEX returns the #VALUE! error value.
+     *                                If places is negative, BIN2HEX returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toHex($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateBinary($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (strlen($value) == 10 && $value[0] === '1') {
+            $high2 = substr($value, 0, 2);
+            $low8 = substr($value, 2);
+            $xarr = ['00' => '00000000', '01' => '00000001', '10' => 'FFFFFFFE', '11' => 'FFFFFFFF'];
+
+            return $xarr[$high2] . strtoupper(substr('0' . dechex((int) bindec($low8)), -2));
+        }
+        $hexVal = (string) strtoupper(dechex((int) bindec($value)));
+
+        return self::nbrConversionFormat($hexVal, $places);
+    }
+
+    /**
+     * toOctal.
+     *
+     * Return a binary value as octal.
+     *
+     * Excel Function:
+     *        BIN2OCT(x[,places])
+     *
+     * @param array|bool|float|int|string $value The binary number (as a string) that you want to convert. The number
+     *                                cannot contain more than 10 characters (10 bits). The most significant
+     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+     *                                Negative numbers are represented using two's-complement notation.
+     *                                If number is not a valid binary number, or if number contains more than
+     *                                10 characters (10 bits), BIN2OCT returns the #NUM! error value.
+     *                      Or can be an array of values
+     * @param null|array|float|int|string $places The number of characters to use. If places is omitted, BIN2OCT uses the
+     *                                minimum number of characters necessary. Places is useful for padding the
+     *                                return value with leading 0s (zeros).
+     *                                If places is not an integer, it is truncated.
+     *                                If places is nonnumeric, BIN2OCT returns the #VALUE! error value.
+     *                                If places is negative, BIN2OCT returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toOctal($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateBinary($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (strlen($value) == 10 && $value[0] === '1') { //    Two's Complement
+            return str_repeat('7', 6) . strtoupper(decoct((int) bindec("11$value")));
+        }
+        $octVal = (string) decoct((int) bindec($value));
+
+        return self::nbrConversionFormat($octVal, $places);
+    }
+
+    protected static function validateBinary(string $value): string
+    {
+        if ((strlen($value) > preg_match_all('/[01]/', $value)) || (strlen($value) > 10)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php
new file mode 100644
index 00000000..923caa96
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertDecimal extends ConvertBase
+{
+    const LARGEST_OCTAL_IN_DECIMAL = 536870911;
+    const SMALLEST_OCTAL_IN_DECIMAL = -536870912;
+    const LARGEST_BINARY_IN_DECIMAL = 511;
+    const SMALLEST_BINARY_IN_DECIMAL = -512;
+    const LARGEST_HEX_IN_DECIMAL = 549755813887;
+    const SMALLEST_HEX_IN_DECIMAL = -549755813888;
+
+    /**
+     * toBinary.
+     *
+     * Return a decimal value as binary.
+     *
+     * Excel Function:
+     *        DEC2BIN(x[,places])
+     *
+     * @param array|bool|float|int|string $value The decimal integer you want to convert. If number is negative,
+     *                          valid place values are ignored and DEC2BIN returns a 10-character
+     *                          (10-bit) binary number in which the most significant bit is the sign
+     *                          bit. The remaining 9 bits are magnitude bits. Negative numbers are
+     *                          represented using two's-complement notation.
+     *                      If number < -512 or if number > 511, DEC2BIN returns the #NUM! error
+     *                          value.
+     *                      If number is nonnumeric, DEC2BIN returns the #VALUE! error value.
+     *                      If DEC2BIN requires more than places characters, it returns the #NUM!
+     *                          error value.
+     *                      Or can be an array of values
+     * @param null|array|float|int|string $places The number of characters to use. If places is omitted, DEC2BIN uses
+     *                          the minimum number of characters necessary. Places is useful for
+     *                          padding the return value with leading 0s (zeros).
+     *                      If places is not an integer, it is truncated.
+     *                      If places is nonnumeric, DEC2BIN returns the #VALUE! error value.
+     *                      If places is zero or negative, DEC2BIN returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toBinary($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateDecimal($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $value = (int) floor((float) $value);
+        if ($value > self::LARGEST_BINARY_IN_DECIMAL || $value < self::SMALLEST_BINARY_IN_DECIMAL) {
+            return ExcelError::NAN();
+        }
+
+        $r = decbin($value);
+        // Two's Complement
+        $r = substr($r, -10);
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+    /**
+     * toHex.
+     *
+     * Return a decimal value as hex.
+     *
+     * Excel Function:
+     *        DEC2HEX(x[,places])
+     *
+     * @param array|bool|float|int|string $value The decimal integer you want to convert. If number is negative,
+     *                          places is ignored and DEC2HEX returns a 10-character (40-bit)
+     *                          hexadecimal number in which the most significant bit is the sign
+     *                          bit. The remaining 39 bits are magnitude bits. Negative numbers
+     *                          are represented using two's-complement notation.
+     *                      If number < -549,755,813,888 or if number > 549,755,813,887,
+     *                          DEC2HEX returns the #NUM! error value.
+     *                      If number is nonnumeric, DEC2HEX returns the #VALUE! error value.
+     *                      If DEC2HEX requires more than places characters, it returns the
+     *                          #NUM! error value.
+     *                      Or can be an array of values
+     * @param null|array|float|int|string $places The number of characters to use. If places is omitted, DEC2HEX uses
+     *                          the minimum number of characters necessary. Places is useful for
+     *                          padding the return value with leading 0s (zeros).
+     *                      If places is not an integer, it is truncated.
+     *                      If places is nonnumeric, DEC2HEX returns the #VALUE! error value.
+     *                      If places is zero or negative, DEC2HEX returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toHex($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateDecimal($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $value = floor((float) $value);
+        if ($value > self::LARGEST_HEX_IN_DECIMAL || $value < self::SMALLEST_HEX_IN_DECIMAL) {
+            return ExcelError::NAN();
+        }
+        $r = strtoupper(dechex((int) $value));
+        $r = self::hex32bit($value, $r);
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+    public static function hex32bit(float $value, string $hexstr, bool $force = false): string
+    {
+        if (PHP_INT_SIZE === 4 || $force) {
+            if ($value >= 2 ** 32) {
+                $quotient = (int) ($value / (2 ** 32));
+
+                return strtoupper(substr('0' . dechex($quotient), -2) . $hexstr);
+            }
+            if ($value < -(2 ** 32)) {
+                $quotient = 256 - (int) ceil((-$value) / (2 ** 32));
+
+                return strtoupper(substr('0' . dechex($quotient), -2) . substr("00000000$hexstr", -8));
+            }
+            if ($value < 0) {
+                return "FF$hexstr";
+            }
+        }
+
+        return $hexstr;
+    }
+
+    /**
+     * toOctal.
+     *
+     * Return an decimal value as octal.
+     *
+     * Excel Function:
+     *        DEC2OCT(x[,places])
+     *
+     * @param array|bool|float|int|string $value The decimal integer you want to convert. If number is negative,
+     *                          places is ignored and DEC2OCT returns a 10-character (30-bit)
+     *                          octal number in which the most significant bit is the sign bit.
+     *                          The remaining 29 bits are magnitude bits. Negative numbers are
+     *                          represented using two's-complement notation.
+     *                      If number < -536,870,912 or if number > 536,870,911, DEC2OCT
+     *                          returns the #NUM! error value.
+     *                      If number is nonnumeric, DEC2OCT returns the #VALUE! error value.
+     *                      If DEC2OCT requires more than places characters, it returns the
+     *                          #NUM! error value.
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted, DEC2OCT uses
+     *                          the minimum number of characters necessary. Places is useful for
+     *                          padding the return value with leading 0s (zeros).
+     *                      If places is not an integer, it is truncated.
+     *                      If places is nonnumeric, DEC2OCT returns the #VALUE! error value.
+     *                      If places is zero or negative, DEC2OCT returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toOctal($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateDecimal($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $value = (int) floor((float) $value);
+        if ($value > self::LARGEST_OCTAL_IN_DECIMAL || $value < self::SMALLEST_OCTAL_IN_DECIMAL) {
+            return ExcelError::NAN();
+        }
+        $r = decoct($value);
+        $r = substr($r, -10);
+
+        return self::nbrConversionFormat($r, $places);
+    }
+
+    protected static function validateDecimal(string $value): string
+    {
+        if (strlen($value) > preg_match_all('/[-0123456789.]/', $value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php
new file mode 100644
index 00000000..0003a9fd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertHex extends ConvertBase
+{
+    /**
+     * toBinary.
+     *
+     * Return a hex value as binary.
+     *
+     * Excel Function:
+     *        HEX2BIN(x[,places])
+     *
+     * @param array|bool|float|string $value The hexadecimal number you want to convert.
+     *                      Number cannot contain more than 10 characters.
+     *                      The most significant bit of number is the sign bit (40th bit from the right).
+     *                      The remaining 9 bits are magnitude bits.
+     *                      Negative numbers are represented using two's-complement notation.
+     *                      If number is negative, HEX2BIN ignores places and returns a 10-character binary number.
+     *                      If number is negative, it cannot be less than FFFFFFFE00,
+     *                          and if number is positive, it cannot be greater than 1FF.
+     *                      If number is not a valid hexadecimal number, HEX2BIN returns the #NUM! error value.
+     *                      If HEX2BIN requires more than places characters, it returns the #NUM! error value.
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted,
+     *                          HEX2BIN uses the minimum number of characters necessary. Places
+     *                          is useful for padding the return value with leading 0s (zeros).
+     *                      If places is not an integer, it is truncated.
+     *                      If places is nonnumeric, HEX2BIN returns the #VALUE! error value.
+     *                      If places is negative, HEX2BIN returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toBinary($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateHex($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $dec = self::toDecimal($value);
+
+        return ConvertDecimal::toBinary($dec, $places);
+    }
+
+    /**
+     * toDecimal.
+     *
+     * Return a hex value as decimal.
+     *
+     * Excel Function:
+     *        HEX2DEC(x)
+     *
+     * @param array|bool|float|int|string $value The hexadecimal number you want to convert. This number cannot
+     *                          contain more than 10 characters (40 bits). The most significant
+     *                          bit of number is the sign bit. The remaining 39 bits are magnitude
+     *                          bits. Negative numbers are represented using two's-complement
+     *                          notation.
+     *                      If number is not a valid hexadecimal number, HEX2DEC returns the
+     *                          #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toDecimal($value)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateHex($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (strlen($value) > 10) {
+            return ExcelError::NAN();
+        }
+
+        $binX = '';
+        foreach (str_split($value) as $char) {
+            $binX .= str_pad(base_convert($char, 16, 2), 4, '0', STR_PAD_LEFT);
+        }
+        if (strlen($binX) == 40 && $binX[0] == '1') {
+            for ($i = 0; $i < 40; ++$i) {
+                $binX[$i] = ($binX[$i] == '1' ? '0' : '1');
+            }
+
+            return (string) ((bindec($binX) + 1) * -1);
+        }
+
+        return (string) bindec($binX);
+    }
+
+    /**
+     * toOctal.
+     *
+     * Return a hex value as octal.
+     *
+     * Excel Function:
+     *        HEX2OCT(x[,places])
+     *
+     * @param array|bool|float|int|string $value The hexadecimal number you want to convert. Number cannot
+     *                                    contain more than 10 characters. The most significant bit of
+     *                                    number is the sign bit. The remaining 39 bits are magnitude
+     *                                    bits. Negative numbers are represented using two's-complement
+     *                                    notation.
+     *                                    If number is negative, HEX2OCT ignores places and returns a
+     *                                    10-character octal number.
+     *                                    If number is negative, it cannot be less than FFE0000000, and
+     *                                    if number is positive, it cannot be greater than 1FFFFFFF.
+     *                                    If number is not a valid hexadecimal number, HEX2OCT returns
+     *                                    the #NUM! error value.
+     *                                    If HEX2OCT requires more than places characters, it returns
+     *                                    the #NUM! error value.
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted, HEX2OCT
+     *                                    uses the minimum number of characters necessary. Places is
+     *                                    useful for padding the return value with leading 0s (zeros).
+     *                                    If places is not an integer, it is truncated.
+     *                                    If places is nonnumeric, HEX2OCT returns the #VALUE! error
+     *                                    value.
+     *                                    If places is negative, HEX2OCT returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toOctal($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateHex($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $decimal = self::toDecimal($value);
+
+        return ConvertDecimal::toOctal($decimal, $places);
+    }
+
+    protected static function validateHex(string $value): string
+    {
+        if (strlen($value) > preg_match_all('/[0123456789ABCDEF]/', $value)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php
new file mode 100644
index 00000000..5e3c1248
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertOctal extends ConvertBase
+{
+    /**
+     * toBinary.
+     *
+     * Return an octal value as binary.
+     *
+     * Excel Function:
+     *        OCT2BIN(x[,places])
+     *
+     * @param array|bool|float|int|string $value The octal number you want to convert. Number may not
+     *                          contain more than 10 characters. The most significant
+     *                          bit of number is the sign bit. The remaining 29 bits
+     *                          are magnitude bits. Negative numbers are represented
+     *                          using two's-complement notation.
+     *                      If number is negative, OCT2BIN ignores places and returns
+     *                          a 10-character binary number.
+     *                      If number is negative, it cannot be less than 7777777000,
+     *                          and if number is positive, it cannot be greater than 777.
+     *                      If number is not a valid octal number, OCT2BIN returns
+     *                          the #NUM! error value.
+     *                      If OCT2BIN requires more than places characters, it
+     *                          returns the #NUM! error value.
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted,
+     *                          OCT2BIN uses the minimum number of characters necessary.
+     *                          Places is useful for padding the return value with
+     *                          leading 0s (zeros).
+     *                      If places is not an integer, it is truncated.
+     *                      If places is nonnumeric, OCT2BIN returns the #VALUE!
+     *                          error value.
+     *                      If places is negative, OCT2BIN returns the #NUM! error
+     *                          value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toBinary($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateOctal($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return ConvertDecimal::toBinary(self::toDecimal($value), $places);
+    }
+
+    /**
+     * toDecimal.
+     *
+     * Return an octal value as decimal.
+     *
+     * Excel Function:
+     *        OCT2DEC(x)
+     *
+     * @param array|bool|float|int|string $value The octal number you want to convert. Number may not contain
+     *                          more than 10 octal characters (30 bits). The most significant
+     *                          bit of number is the sign bit. The remaining 29 bits are
+     *                          magnitude bits. Negative numbers are represented using
+     *                          two's-complement notation.
+     *                      If number is not a valid octal number, OCT2DEC returns the
+     *                          #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toDecimal($value)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateOctal($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $binX = '';
+        foreach (str_split($value) as $char) {
+            $binX .= str_pad(decbin((int) $char), 3, '0', STR_PAD_LEFT);
+        }
+        if (strlen($binX) == 30 && $binX[0] == '1') {
+            for ($i = 0; $i < 30; ++$i) {
+                $binX[$i] = ($binX[$i] == '1' ? '0' : '1');
+            }
+
+            return (string) ((bindec($binX) + 1) * -1);
+        }
+
+        return (string) bindec($binX);
+    }
+
+    /**
+     * toHex.
+     *
+     * Return an octal value as hex.
+     *
+     * Excel Function:
+     *        OCT2HEX(x[,places])
+     *
+     * @param array|bool|float|int|string $value The octal number you want to convert. Number may not contain
+     *                          more than 10 octal characters (30 bits). The most significant
+     *                          bit of number is the sign bit. The remaining 29 bits are
+     *                          magnitude bits. Negative numbers are represented using
+     *                          two's-complement notation.
+     *                      If number is negative, OCT2HEX ignores places and returns a
+     *                          10-character hexadecimal number.
+     *                      If number is not a valid octal number, OCT2HEX returns the
+     *                          #NUM! error value.
+     *                      If OCT2HEX requires more than places characters, it returns
+     *                          the #NUM! error value.
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted, OCT2HEX
+     *                          uses the minimum number of characters necessary. Places is useful
+     *                          for padding the return value with leading 0s (zeros).
+     *                      If places is not an integer, it is truncated.
+     *                      If places is nonnumeric, OCT2HEX returns the #VALUE! error value.
+     *                      If places is negative, OCT2HEX returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toHex($value, $places = null): array|string
+    {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
+        try {
+            $value = self::validateValue($value);
+            $value = self::validateOctal($value);
+            $places = self::validatePlaces($places);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $hexVal = strtoupper(dechex((int) self::toDecimal($value)));
+        $hexVal = (PHP_INT_SIZE === 4 && strlen($value) === 10 && $value[0] >= '4') ? "FF{$hexVal}" : $hexVal;
+
+        return self::nbrConversionFormat($hexVal, $places);
+    }
+
+    protected static function validateOctal(string $value): string
+    {
+        $numDigits = (int) preg_match_all('/[01234567]/', $value);
+        if (strlen($value) > $numDigits || $numDigits > 10) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
new file mode 100644
index 00000000..969c270a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
@@ -0,0 +1,679 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ConvertUOM
+{
+    use ArrayEnabled;
+
+    public const CATEGORY_WEIGHT_AND_MASS = 'Weight and Mass';
+    public const CATEGORY_DISTANCE = 'Distance';
+    public const CATEGORY_TIME = 'Time';
+    public const CATEGORY_PRESSURE = 'Pressure';
+    public const CATEGORY_FORCE = 'Force';
+    public const CATEGORY_ENERGY = 'Energy';
+    public const CATEGORY_POWER = 'Power';
+    public const CATEGORY_MAGNETISM = 'Magnetism';
+    public const CATEGORY_TEMPERATURE = 'Temperature';
+    public const CATEGORY_VOLUME = 'Volume and Liquid Measure';
+    public const CATEGORY_AREA = 'Area';
+    public const CATEGORY_INFORMATION = 'Information';
+    public const CATEGORY_SPEED = 'Speed';
+
+    /**
+     * Details of the Units of measure that can be used in CONVERTUOM().
+     *
+     * @var array<string, array{Group: string, UnitName: string, AllowPrefix: bool}>
+     */
+    private static array $conversionUnits = [
+        // Weight and Mass
+        'g' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Gram', 'AllowPrefix' => true],
+        'sg' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Slug', 'AllowPrefix' => false],
+        'lbm' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Pound mass (avoirdupois)', 'AllowPrefix' => false],
+        'u' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'U (atomic mass unit)', 'AllowPrefix' => true],
+        'ozm' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Ounce mass (avoirdupois)', 'AllowPrefix' => false],
+        'grain' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Grain', 'AllowPrefix' => false],
+        'cwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'U.S. (short) hundredweight', 'AllowPrefix' => false],
+        'shweight' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'U.S. (short) hundredweight', 'AllowPrefix' => false],
+        'uk_cwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial hundredweight', 'AllowPrefix' => false],
+        'lcwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial hundredweight', 'AllowPrefix' => false],
+        'hweight' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial hundredweight', 'AllowPrefix' => false],
+        'stone' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Stone', 'AllowPrefix' => false],
+        'ton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Ton', 'AllowPrefix' => false],
+        'uk_ton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial ton', 'AllowPrefix' => false],
+        'LTON' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial ton', 'AllowPrefix' => false],
+        'brton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial ton', 'AllowPrefix' => false],
+        // Distance
+        'm' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Meter', 'AllowPrefix' => true],
+        'mi' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Statute mile', 'AllowPrefix' => false],
+        'Nmi' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Nautical mile', 'AllowPrefix' => false],
+        'in' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Inch', 'AllowPrefix' => false],
+        'ft' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Foot', 'AllowPrefix' => false],
+        'yd' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Yard', 'AllowPrefix' => false],
+        'ang' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Angstrom', 'AllowPrefix' => true],
+        'ell' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Ell', 'AllowPrefix' => false],
+        'ly' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Light Year', 'AllowPrefix' => false],
+        'parsec' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Parsec', 'AllowPrefix' => false],
+        'pc' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Parsec', 'AllowPrefix' => false],
+        'Pica' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Pica (1/72 in)', 'AllowPrefix' => false],
+        'Picapt' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Pica (1/72 in)', 'AllowPrefix' => false],
+        'pica' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Pica (1/6 in)', 'AllowPrefix' => false],
+        'survey_mi' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'U.S survey mile (statute mile)', 'AllowPrefix' => false],
+        // Time
+        'yr' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Year', 'AllowPrefix' => false],
+        'day' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Day', 'AllowPrefix' => false],
+        'd' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Day', 'AllowPrefix' => false],
+        'hr' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Hour', 'AllowPrefix' => false],
+        'mn' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Minute', 'AllowPrefix' => false],
+        'min' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Minute', 'AllowPrefix' => false],
+        'sec' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Second', 'AllowPrefix' => true],
+        's' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Second', 'AllowPrefix' => true],
+        // Pressure
+        'Pa' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Pascal', 'AllowPrefix' => true],
+        'p' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Pascal', 'AllowPrefix' => true],
+        'atm' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Atmosphere', 'AllowPrefix' => true],
+        'at' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Atmosphere', 'AllowPrefix' => true],
+        'mmHg' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'mm of Mercury', 'AllowPrefix' => true],
+        'psi' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'PSI', 'AllowPrefix' => true],
+        'Torr' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Torr', 'AllowPrefix' => true],
+        // Force
+        'N' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Newton', 'AllowPrefix' => true],
+        'dyn' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Dyne', 'AllowPrefix' => true],
+        'dy' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Dyne', 'AllowPrefix' => true],
+        'lbf' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Pound force', 'AllowPrefix' => false],
+        'pond' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Pond', 'AllowPrefix' => true],
+        // Energy
+        'J' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Joule', 'AllowPrefix' => true],
+        'e' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Erg', 'AllowPrefix' => true],
+        'c' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Thermodynamic calorie', 'AllowPrefix' => true],
+        'cal' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'IT calorie', 'AllowPrefix' => true],
+        'eV' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Electron volt', 'AllowPrefix' => true],
+        'ev' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Electron volt', 'AllowPrefix' => true],
+        'HPh' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Horsepower-hour', 'AllowPrefix' => false],
+        'hh' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Horsepower-hour', 'AllowPrefix' => false],
+        'Wh' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Watt-hour', 'AllowPrefix' => true],
+        'wh' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Watt-hour', 'AllowPrefix' => true],
+        'flb' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Foot-pound', 'AllowPrefix' => false],
+        'BTU' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'BTU', 'AllowPrefix' => false],
+        'btu' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'BTU', 'AllowPrefix' => false],
+        // Power
+        'HP' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Horsepower', 'AllowPrefix' => false],
+        'h' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Horsepower', 'AllowPrefix' => false],
+        'W' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Watt', 'AllowPrefix' => true],
+        'w' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Watt', 'AllowPrefix' => true],
+        'PS' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Pferdestärke', 'AllowPrefix' => false],
+        // Magnetism
+        'T' => ['Group' => self::CATEGORY_MAGNETISM, 'UnitName' => 'Tesla', 'AllowPrefix' => true],
+        'ga' => ['Group' => self::CATEGORY_MAGNETISM, 'UnitName' => 'Gauss', 'AllowPrefix' => true],
+        // Temperature
+        'C' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Celsius', 'AllowPrefix' => false],
+        'cel' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Celsius', 'AllowPrefix' => false],
+        'F' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Fahrenheit', 'AllowPrefix' => false],
+        'fah' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Fahrenheit', 'AllowPrefix' => false],
+        'K' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Kelvin', 'AllowPrefix' => false],
+        'kel' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Kelvin', 'AllowPrefix' => false],
+        'Rank' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Rankine', 'AllowPrefix' => false],
+        'Reau' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Réaumur', 'AllowPrefix' => false],
+        // Volume
+        'l' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Litre', 'AllowPrefix' => true],
+        'L' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Litre', 'AllowPrefix' => true],
+        'lt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Litre', 'AllowPrefix' => true],
+        'tsp' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Teaspoon', 'AllowPrefix' => false],
+        'tspm' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Modern Teaspoon', 'AllowPrefix' => false],
+        'tbs' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Tablespoon', 'AllowPrefix' => false],
+        'oz' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Fluid Ounce', 'AllowPrefix' => false],
+        'cup' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cup', 'AllowPrefix' => false],
+        'pt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'U.S. Pint', 'AllowPrefix' => false],
+        'us_pt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'U.S. Pint', 'AllowPrefix' => false],
+        'uk_pt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'U.K. Pint', 'AllowPrefix' => false],
+        'qt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Quart', 'AllowPrefix' => false],
+        'uk_qt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Imperial Quart (UK)', 'AllowPrefix' => false],
+        'gal' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Gallon', 'AllowPrefix' => false],
+        'uk_gal' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Imperial Gallon (UK)', 'AllowPrefix' => false],
+        'ang3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Angstrom', 'AllowPrefix' => true],
+        'ang^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Angstrom', 'AllowPrefix' => true],
+        'barrel' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'US Oil Barrel', 'AllowPrefix' => false],
+        'bushel' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'US Bushel', 'AllowPrefix' => false],
+        'in3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Inch', 'AllowPrefix' => false],
+        'in^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Inch', 'AllowPrefix' => false],
+        'ft3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Foot', 'AllowPrefix' => false],
+        'ft^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Foot', 'AllowPrefix' => false],
+        'ly3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Light Year', 'AllowPrefix' => false],
+        'ly^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Light Year', 'AllowPrefix' => false],
+        'm3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Meter', 'AllowPrefix' => true],
+        'm^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Meter', 'AllowPrefix' => true],
+        'mi3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Mile', 'AllowPrefix' => false],
+        'mi^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Mile', 'AllowPrefix' => false],
+        'yd3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Yard', 'AllowPrefix' => false],
+        'yd^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Yard', 'AllowPrefix' => false],
+        'Nmi3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Nautical Mile', 'AllowPrefix' => false],
+        'Nmi^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Nautical Mile', 'AllowPrefix' => false],
+        'Pica3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Pica', 'AllowPrefix' => false],
+        'Pica^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Pica', 'AllowPrefix' => false],
+        'Picapt3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Pica', 'AllowPrefix' => false],
+        'Picapt^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Pica', 'AllowPrefix' => false],
+        'GRT' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Gross Registered Ton', 'AllowPrefix' => false],
+        'regton' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Gross Registered Ton', 'AllowPrefix' => false],
+        'MTON' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Measurement Ton (Freight Ton)', 'AllowPrefix' => false],
+        // Area
+        'ha' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Hectare', 'AllowPrefix' => true],
+        'uk_acre' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'International Acre', 'AllowPrefix' => false],
+        'us_acre' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'US Survey/Statute Acre', 'AllowPrefix' => false],
+        'ang2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Angstrom', 'AllowPrefix' => true],
+        'ang^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Angstrom', 'AllowPrefix' => true],
+        'ar' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Are', 'AllowPrefix' => true],
+        'ft2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Feet', 'AllowPrefix' => false],
+        'ft^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Feet', 'AllowPrefix' => false],
+        'in2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Inches', 'AllowPrefix' => false],
+        'in^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Inches', 'AllowPrefix' => false],
+        'ly2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Light Years', 'AllowPrefix' => false],
+        'ly^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Light Years', 'AllowPrefix' => false],
+        'm2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Meters', 'AllowPrefix' => true],
+        'm^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Meters', 'AllowPrefix' => true],
+        'Morgen' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Morgen', 'AllowPrefix' => false],
+        'mi2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Miles', 'AllowPrefix' => false],
+        'mi^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Miles', 'AllowPrefix' => false],
+        'Nmi2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Nautical Miles', 'AllowPrefix' => false],
+        'Nmi^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Nautical Miles', 'AllowPrefix' => false],
+        'Pica2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Pica', 'AllowPrefix' => false],
+        'Pica^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Pica', 'AllowPrefix' => false],
+        'Picapt2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Pica', 'AllowPrefix' => false],
+        'Picapt^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Pica', 'AllowPrefix' => false],
+        'yd2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Yards', 'AllowPrefix' => false],
+        'yd^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Yards', 'AllowPrefix' => false],
+        // Information
+        'byte' => ['Group' => self::CATEGORY_INFORMATION, 'UnitName' => 'Byte', 'AllowPrefix' => true],
+        'bit' => ['Group' => self::CATEGORY_INFORMATION, 'UnitName' => 'Bit', 'AllowPrefix' => true],
+        // Speed
+        'm/s' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Meters per second', 'AllowPrefix' => true],
+        'm/sec' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Meters per second', 'AllowPrefix' => true],
+        'm/h' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Meters per hour', 'AllowPrefix' => true],
+        'm/hr' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Meters per hour', 'AllowPrefix' => true],
+        'mph' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Miles per hour', 'AllowPrefix' => false],
+        'admkn' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Admiralty Knot', 'AllowPrefix' => false],
+        'kn' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Knot', 'AllowPrefix' => false],
+    ];
+
+    /**
+     * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
+     *
+     * @var array<string, array{multiplier: float, name: string}>
+     */
+    private static array $conversionMultipliers = [
+        'Y' => ['multiplier' => 1E24, 'name' => 'yotta'],
+        'Z' => ['multiplier' => 1E21, 'name' => 'zetta'],
+        'E' => ['multiplier' => 1E18, 'name' => 'exa'],
+        'P' => ['multiplier' => 1E15, 'name' => 'peta'],
+        'T' => ['multiplier' => 1E12, 'name' => 'tera'],
+        'G' => ['multiplier' => 1E9, 'name' => 'giga'],
+        'M' => ['multiplier' => 1E6, 'name' => 'mega'],
+        'k' => ['multiplier' => 1E3, 'name' => 'kilo'],
+        'h' => ['multiplier' => 1E2, 'name' => 'hecto'],
+        'e' => ['multiplier' => 1E1, 'name' => 'dekao'],
+        'da' => ['multiplier' => 1E1, 'name' => 'dekao'],
+        'd' => ['multiplier' => 1E-1, 'name' => 'deci'],
+        'c' => ['multiplier' => 1E-2, 'name' => 'centi'],
+        'm' => ['multiplier' => 1E-3, 'name' => 'milli'],
+        'u' => ['multiplier' => 1E-6, 'name' => 'micro'],
+        'n' => ['multiplier' => 1E-9, 'name' => 'nano'],
+        'p' => ['multiplier' => 1E-12, 'name' => 'pico'],
+        'f' => ['multiplier' => 1E-15, 'name' => 'femto'],
+        'a' => ['multiplier' => 1E-18, 'name' => 'atto'],
+        'z' => ['multiplier' => 1E-21, 'name' => 'zepto'],
+        'y' => ['multiplier' => 1E-24, 'name' => 'yocto'],
+    ];
+
+    /**
+     * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
+     *
+     ** @var array<string, array{multiplier: float|int, name: string}>
+     */
+    private static array $binaryConversionMultipliers = [
+        'Yi' => ['multiplier' => 2 ** 80, 'name' => 'yobi'],
+        'Zi' => ['multiplier' => 2 ** 70, 'name' => 'zebi'],
+        'Ei' => ['multiplier' => 2 ** 60, 'name' => 'exbi'],
+        'Pi' => ['multiplier' => 2 ** 50, 'name' => 'pebi'],
+        'Ti' => ['multiplier' => 2 ** 40, 'name' => 'tebi'],
+        'Gi' => ['multiplier' => 2 ** 30, 'name' => 'gibi'],
+        'Mi' => ['multiplier' => 2 ** 20, 'name' => 'mebi'],
+        'ki' => ['multiplier' => 2 ** 10, 'name' => 'kibi'],
+    ];
+
+    /**
+     * Details of the Units of measure conversion factors, organised by group.
+     *
+     * @var array<string, array<string, float>>
+     */
+    private static array $unitConversions = [
+        // Conversion uses gram (g) as an intermediate unit
+        self::CATEGORY_WEIGHT_AND_MASS => [
+            'g' => 1.0,
+            'sg' => 6.85217658567918E-05,
+            'lbm' => 2.20462262184878E-03,
+            'u' => 6.02214179421676E+23,
+            'ozm' => 3.52739619495804E-02,
+            'grain' => 1.54323583529414E+01,
+            'cwt' => 2.20462262184878E-05,
+            'shweight' => 2.20462262184878E-05,
+            'uk_cwt' => 1.96841305522212E-05,
+            'lcwt' => 1.96841305522212E-05,
+            'hweight' => 1.96841305522212E-05,
+            'stone' => 1.57473044417770E-04,
+            'ton' => 1.10231131092439E-06,
+            'uk_ton' => 9.84206527611061E-07,
+            'LTON' => 9.84206527611061E-07,
+            'brton' => 9.84206527611061E-07,
+        ],
+        // Conversion uses meter (m) as an intermediate unit
+        self::CATEGORY_DISTANCE => [
+            'm' => 1.0,
+            'mi' => 6.21371192237334E-04,
+            'Nmi' => 5.39956803455724E-04,
+            'in' => 3.93700787401575E+01,
+            'ft' => 3.28083989501312E+00,
+            'yd' => 1.09361329833771E+00,
+            'ang' => 1.0E+10,
+            'ell' => 8.74890638670166E-01,
+            'ly' => 1.05700083402462E-16,
+            'parsec' => 3.24077928966473E-17,
+            'pc' => 3.24077928966473E-17,
+            'Pica' => 2.83464566929134E+03,
+            'Picapt' => 2.83464566929134E+03,
+            'pica' => 2.36220472440945E+02,
+            'survey_mi' => 6.21369949494950E-04,
+        ],
+        // Conversion uses second (s) as an intermediate unit
+        self::CATEGORY_TIME => [
+            'yr' => 3.16880878140289E-08,
+            'day' => 1.15740740740741E-05,
+            'd' => 1.15740740740741E-05,
+            'hr' => 2.77777777777778E-04,
+            'mn' => 1.66666666666667E-02,
+            'min' => 1.66666666666667E-02,
+            'sec' => 1.0,
+            's' => 1.0,
+        ],
+        // Conversion uses Pascal (Pa) as an intermediate unit
+        self::CATEGORY_PRESSURE => [
+            'Pa' => 1.0,
+            'p' => 1.0,
+            'atm' => 9.86923266716013E-06,
+            'at' => 9.86923266716013E-06,
+            'mmHg' => 7.50063755419211E-03,
+            'psi' => 1.45037737730209E-04,
+            'Torr' => 7.50061682704170E-03,
+        ],
+        // Conversion uses Newton (N) as an intermediate unit
+        self::CATEGORY_FORCE => [
+            'N' => 1.0,
+            'dyn' => 1.0E+5,
+            'dy' => 1.0E+5,
+            'lbf' => 2.24808923655339E-01,
+            'pond' => 1.01971621297793E+02,
+        ],
+        // Conversion uses Joule (J) as an intermediate unit
+        self::CATEGORY_ENERGY => [
+            'J' => 1.0,
+            'e' => 9.99999519343231E+06,
+            'c' => 2.39006249473467E-01,
+            'cal' => 2.38846190642017E-01,
+            'eV' => 6.24145700000000E+18,
+            'ev' => 6.24145700000000E+18,
+            'HPh' => 3.72506430801000E-07,
+            'hh' => 3.72506430801000E-07,
+            'Wh' => 2.77777916238711E-04,
+            'wh' => 2.77777916238711E-04,
+            'flb' => 2.37304222192651E+01,
+            'BTU' => 9.47815067349015E-04,
+            'btu' => 9.47815067349015E-04,
+        ],
+        // Conversion uses Horsepower (HP) as an intermediate unit
+        self::CATEGORY_POWER => [
+            'HP' => 1.0,
+            'h' => 1.0,
+            'W' => 7.45699871582270E+02,
+            'w' => 7.45699871582270E+02,
+            'PS' => 1.01386966542400E+00,
+        ],
+        // Conversion uses Tesla (T) as an intermediate unit
+        self::CATEGORY_MAGNETISM => [
+            'T' => 1.0,
+            'ga' => 10000.0,
+        ],
+        // Conversion uses litre (l) as an intermediate unit
+        self::CATEGORY_VOLUME => [
+            'l' => 1.0,
+            'L' => 1.0,
+            'lt' => 1.0,
+            'tsp' => 2.02884136211058E+02,
+            'tspm' => 2.0E+02,
+            'tbs' => 6.76280454036860E+01,
+            'oz' => 3.38140227018430E+01,
+            'cup' => 4.22675283773038E+00,
+            'pt' => 2.11337641886519E+00,
+            'us_pt' => 2.11337641886519E+00,
+            'uk_pt' => 1.75975398639270E+00,
+            'qt' => 1.05668820943259E+00,
+            'uk_qt' => 8.79876993196351E-01,
+            'gal' => 2.64172052358148E-01,
+            'uk_gal' => 2.19969248299088E-01,
+            'ang3' => 1.0E+27,
+            'ang^3' => 1.0E+27,
+            'barrel' => 6.28981077043211E-03,
+            'bushel' => 2.83775932584017E-02,
+            'in3' => 6.10237440947323E+01,
+            'in^3' => 6.10237440947323E+01,
+            'ft3' => 3.53146667214886E-02,
+            'ft^3' => 3.53146667214886E-02,
+            'ly3' => 1.18093498844171E-51,
+            'ly^3' => 1.18093498844171E-51,
+            'm3' => 1.0E-03,
+            'm^3' => 1.0E-03,
+            'mi3' => 2.39912758578928E-13,
+            'mi^3' => 2.39912758578928E-13,
+            'yd3' => 1.30795061931439E-03,
+            'yd^3' => 1.30795061931439E-03,
+            'Nmi3' => 1.57426214685811E-13,
+            'Nmi^3' => 1.57426214685811E-13,
+            'Pica3' => 2.27769904358706E+07,
+            'Pica^3' => 2.27769904358706E+07,
+            'Picapt3' => 2.27769904358706E+07,
+            'Picapt^3' => 2.27769904358706E+07,
+            'GRT' => 3.53146667214886E-04,
+            'regton' => 3.53146667214886E-04,
+            'MTON' => 8.82866668037215E-04,
+        ],
+        // Conversion uses hectare (ha) as an intermediate unit
+        self::CATEGORY_AREA => [
+            'ha' => 1.0,
+            'uk_acre' => 2.47105381467165E+00,
+            'us_acre' => 2.47104393046628E+00,
+            'ang2' => 1.0E+24,
+            'ang^2' => 1.0E+24,
+            'ar' => 1.0E+02,
+            'ft2' => 1.07639104167097E+05,
+            'ft^2' => 1.07639104167097E+05,
+            'in2' => 1.55000310000620E+07,
+            'in^2' => 1.55000310000620E+07,
+            'ly2' => 1.11725076312873E-28,
+            'ly^2' => 1.11725076312873E-28,
+            'm2' => 1.0E+04,
+            'm^2' => 1.0E+04,
+            'Morgen' => 4.0E+00,
+            'mi2' => 3.86102158542446E-03,
+            'mi^2' => 3.86102158542446E-03,
+            'Nmi2' => 2.91553349598123E-03,
+            'Nmi^2' => 2.91553349598123E-03,
+            'Pica2' => 8.03521607043214E+10,
+            'Pica^2' => 8.03521607043214E+10,
+            'Picapt2' => 8.03521607043214E+10,
+            'Picapt^2' => 8.03521607043214E+10,
+            'yd2' => 1.19599004630108E+04,
+            'yd^2' => 1.19599004630108E+04,
+        ],
+        // Conversion uses bit (bit) as an intermediate unit
+        self::CATEGORY_INFORMATION => [
+            'bit' => 1.0,
+            'byte' => 0.125,
+        ],
+        // Conversion uses Meters per Second (m/s) as an intermediate unit
+        self::CATEGORY_SPEED => [
+            'm/s' => 1.0,
+            'm/sec' => 1.0,
+            'm/h' => 3.60E+03,
+            'm/hr' => 3.60E+03,
+            'mph' => 2.23693629205440E+00,
+            'admkn' => 1.94260256941567E+00,
+            'kn' => 1.94384449244060E+00,
+        ],
+    ];
+
+    /**
+     *    getConversionGroups
+     * Returns a list of the different conversion groups for UOM conversions.
+     */
+    public static function getConversionCategories(): array
+    {
+        $conversionGroups = [];
+        foreach (self::$conversionUnits as $conversionUnit) {
+            $conversionGroups[] = $conversionUnit['Group'];
+        }
+
+        return array_merge(array_unique($conversionGroups));
+    }
+
+    /**
+     *    getConversionGroupUnits
+     * Returns an array of units of measure, for a specified conversion group, or for all groups.
+     *
+     * @param ?string $category The group whose units of measure you want to retrieve
+     */
+    public static function getConversionCategoryUnits(?string $category = null): array
+    {
+        $conversionGroups = [];
+        foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
+            if (($category === null) || ($conversionGroup['Group'] == $category)) {
+                $conversionGroups[$conversionGroup['Group']][] = $conversionUnit;
+            }
+        }
+
+        return $conversionGroups;
+    }
+
+    /**
+     * getConversionGroupUnitDetails.
+     *
+     * @param ?string $category The group whose units of measure you want to retrieve
+     */
+    public static function getConversionCategoryUnitDetails(?string $category = null): array
+    {
+        $conversionGroups = [];
+        foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
+            if (($category === null) || ($conversionGroup['Group'] == $category)) {
+                $conversionGroups[$conversionGroup['Group']][] = [
+                    'unit' => $conversionUnit,
+                    'description' => $conversionGroup['UnitName'],
+                ];
+            }
+        }
+
+        return $conversionGroups;
+    }
+
+    /**
+     *    getConversionMultipliers
+     * Returns an array of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
+     *
+     * @return mixed[]
+     */
+    public static function getConversionMultipliers(): array
+    {
+        return self::$conversionMultipliers;
+    }
+
+    /**
+     *    getBinaryConversionMultipliers
+     * Returns an array of the additional Multiplier prefixes that can be used with Information Units of Measure in CONVERTUOM().
+     *
+     * @return mixed[]
+     */
+    public static function getBinaryConversionMultipliers(): array
+    {
+        return self::$binaryConversionMultipliers;
+    }
+
+    /**
+     * CONVERT.
+     *
+     * Converts a number from one measurement system to another.
+     *    For example, CONVERT can translate a table of distances in miles to a table of distances
+     * in kilometers.
+     *
+     *    Excel Function:
+     *        CONVERT(value,fromUOM,toUOM)
+     *
+     * @param array|float|int|string $value the value in fromUOM to convert
+     *                      Or can be an array of values
+     * @param array|string $fromUOM the units for value
+     *                      Or can be an array of values
+     * @param array|string $toUOM the units for the result
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function CONVERT($value, $fromUOM, $toUOM)
+    {
+        if (is_array($value) || is_array($fromUOM) || is_array($toUOM)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $fromUOM, $toUOM);
+        }
+
+        if (!is_numeric($value)) {
+            return ExcelError::VALUE();
+        }
+
+        try {
+            [$fromUOM, $fromCategory, $fromMultiplier] = self::getUOMDetails($fromUOM);
+            [$toUOM, $toCategory, $toMultiplier] = self::getUOMDetails($toUOM);
+        } catch (Exception) {
+            return ExcelError::NA();
+        }
+
+        if ($fromCategory !== $toCategory) {
+            return ExcelError::NA();
+        }
+
+        // @var float $value
+        $value *= $fromMultiplier;
+
+        if (($fromUOM === $toUOM) && ($fromMultiplier === $toMultiplier)) {
+            //    We've already factored $fromMultiplier into the value, so we need
+            //        to reverse it again
+            return $value / $fromMultiplier;
+        } elseif ($fromUOM === $toUOM) {
+            return $value / $toMultiplier;
+        } elseif ($fromCategory === self::CATEGORY_TEMPERATURE) {
+            return self::convertTemperature($fromUOM, $toUOM, $value);
+        }
+
+        $baseValue = $value * (1.0 / self::$unitConversions[$fromCategory][$fromUOM]);
+
+        return ($baseValue * self::$unitConversions[$fromCategory][$toUOM]) / $toMultiplier;
+    }
+
+    private static function getUOMDetails(string $uom): array
+    {
+        if (isset(self::$conversionUnits[$uom])) {
+            $unitCategory = self::$conversionUnits[$uom]['Group'];
+
+            return [$uom, $unitCategory, 1.0];
+        }
+
+        // Check 1-character standard metric multiplier prefixes
+        $multiplierType = substr($uom, 0, 1);
+        $uom = substr($uom, 1);
+        if (isset(self::$conversionUnits[$uom], self::$conversionMultipliers[$multiplierType])) {
+            if (self::$conversionUnits[$uom]['AllowPrefix'] === false) {
+                throw new Exception('Prefix not allowed for UoM');
+            }
+            $unitCategory = self::$conversionUnits[$uom]['Group'];
+
+            return [$uom, $unitCategory, self::$conversionMultipliers[$multiplierType]['multiplier']];
+        }
+
+        $multiplierType .= substr($uom, 0, 1);
+        $uom = substr($uom, 1);
+
+        // Check 2-character standard metric multiplier prefixes
+        if (isset(self::$conversionUnits[$uom], self::$conversionMultipliers[$multiplierType])) {
+            if (self::$conversionUnits[$uom]['AllowPrefix'] === false) {
+                throw new Exception('Prefix not allowed for UoM');
+            }
+            $unitCategory = self::$conversionUnits[$uom]['Group'];
+
+            return [$uom, $unitCategory, self::$conversionMultipliers[$multiplierType]['multiplier']];
+        }
+
+        // Check 2-character binary multiplier prefixes
+        if (isset(self::$conversionUnits[$uom], self::$binaryConversionMultipliers[$multiplierType])) {
+            if (self::$conversionUnits[$uom]['AllowPrefix'] === false) {
+                throw new Exception('Prefix not allowed for UoM');
+            }
+            $unitCategory = self::$conversionUnits[$uom]['Group'];
+            if ($unitCategory !== 'Information') {
+                throw new Exception('Binary Prefix is only allowed for Information UoM');
+            }
+
+            return [$uom, $unitCategory, self::$binaryConversionMultipliers[$multiplierType]['multiplier']];
+        }
+
+        throw new Exception('UoM Not Found');
+    }
+
+    protected static function convertTemperature(string $fromUOM, string $toUOM, float|int $value): float|int
+    {
+        $fromUOM = self::resolveTemperatureSynonyms($fromUOM);
+        $toUOM = self::resolveTemperatureSynonyms($toUOM);
+
+        if ($fromUOM === $toUOM) {
+            return $value;
+        }
+
+        // Convert to Kelvin
+        switch ($fromUOM) {
+            case 'F':
+                $value = ($value - 32) / 1.8 + 273.15;
+
+                break;
+            case 'C':
+                $value += 273.15;
+
+                break;
+            case 'Rank':
+                $value /= 1.8;
+
+                break;
+            case 'Reau':
+                $value = $value * 1.25 + 273.15;
+
+                break;
+        }
+
+        // Convert from Kelvin
+        switch ($toUOM) {
+            case 'F':
+                $value = ($value - 273.15) * 1.8 + 32.00;
+
+                break;
+            case 'C':
+                $value -= 273.15;
+
+                break;
+            case 'Rank':
+                $value *= 1.8;
+
+                break;
+            case 'Reau':
+                $value = ($value - 273.15) * 0.80000;
+
+                break;
+        }
+
+        return $value;
+    }
+
+    private static function resolveTemperatureSynonyms(string $uom): string
+    {
+        return match ($uom) {
+            'fah' => 'F',
+            'cel' => 'C',
+            'kel' => 'K',
+            default => $uom,
+        };
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php
new file mode 100644
index 00000000..7e5118ff
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class EngineeringValidations
+{
+    public static function validateFloat(mixed $value): float
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    public static function validateInt(mixed $value): int
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) floor((float) $value);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php
new file mode 100644
index 00000000..aee7e317
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Erf
+{
+    use ArrayEnabled;
+
+    private const TWO_SQRT_PI = 1.128379167095512574;
+
+    /**
+     * ERF.
+     *
+     * Returns the error function integrated between the lower and upper bound arguments.
+     *
+     *    Note: In Excel 2007 or earlier, if you input a negative value for the upper or lower bound arguments,
+     *            the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
+     *            improved, so that it can now calculate the function for both positive and negative ranges.
+     *            PhpSpreadsheet follows Excel 2010 behaviour, and accepts negative arguments.
+     *
+     *    Excel Function:
+     *        ERF(lower[,upper])
+     *
+     * @param mixed $lower Lower bound float for integrating ERF
+     *                      Or can be an array of values
+     * @param mixed $upper Upper bound float for integrating ERF.
+     *                           If omitted, ERF integrates between zero and lower_limit
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function ERF(mixed $lower, mixed $upper = null): array|float|string
+    {
+        if (is_array($lower) || is_array($upper)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $lower, $upper);
+        }
+
+        if (is_numeric($lower)) {
+            if ($upper === null) {
+                return self::erfValue($lower);
+            }
+            if (is_numeric($upper)) {
+                return self::erfValue($upper) - self::erfValue($lower);
+            }
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * ERFPRECISE.
+     *
+     * Returns the error function integrated between the lower and upper bound arguments.
+     *
+     *    Excel Function:
+     *        ERF.PRECISE(limit)
+     *
+     * @param mixed $limit Float bound for integrating ERF, other bound is zero
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function ERFPRECISE(mixed $limit)
+    {
+        if (is_array($limit)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $limit);
+        }
+
+        return self::ERF($limit);
+    }
+
+    private static function makeFloat(mixed $value): float
+    {
+        return is_numeric($value) ? ((float) $value) : 0.0;
+    }
+
+    /**
+     * Method to calculate the erf value.
+     */
+    public static function erfValue(float|int|string $value): float
+    {
+        $value = (float) $value;
+        if (abs($value) > 2.2) {
+            return 1 - self::makeFloat(ErfC::ERFC($value));
+        }
+        $sum = $term = $value;
+        $xsqr = ($value * $value);
+        $j = 1;
+        do {
+            $term *= $xsqr / $j;
+            $sum -= $term / (2 * $j + 1);
+            ++$j;
+            $term *= $xsqr / $j;
+            $sum += $term / (2 * $j + 1);
+            ++$j;
+            if ($sum == 0.0) {
+                break;
+            }
+        } while (abs($term / $sum) > Functions::PRECISION);
+
+        return self::TWO_SQRT_PI * $sum;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
new file mode 100644
index 00000000..4365fecc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ErfC
+{
+    use ArrayEnabled;
+
+    /**
+     * ERFC.
+     *
+     *    Returns the complementary ERF function integrated between x and infinity
+     *
+     *    Note: In Excel 2007 or earlier, if you input a negative value for the lower bound argument,
+     *        the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
+     *        improved, so that it can now calculate the function for both positive and negative x values.
+     *            PhpSpreadsheet follows Excel 2010 behaviour, and accepts nagative arguments.
+     *
+     *    Excel Function:
+     *        ERFC(x)
+     *
+     * @param mixed $value The float lower bound for integrating ERFC
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function ERFC(mixed $value)
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (is_numeric($value)) {
+            return self::erfcValue($value);
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    private const ONE_SQRT_PI = 0.564189583547756287;
+
+    /**
+     * Method to calculate the erfc value.
+     */
+    private static function erfcValue(float|int|string $value): float|int
+    {
+        $value = (float) $value;
+        if (abs($value) < 2.2) {
+            return 1 - Erf::erfValue($value);
+        }
+        if ($value < 0) {
+            return 2 - self::erfcValue(-$value);
+        }
+        $a = $n = 1;
+        $b = $c = $value;
+        $d = ($value * $value) + 0.5;
+        $q2 = $b / $d;
+        do {
+            $t = $a * $n + $b * $value;
+            $a = $b;
+            $b = $t;
+            $t = $c * $n + $d * $value;
+            $c = $d;
+            $d = $t;
+            $n += 0.5;
+            $q1 = $q2;
+            $q2 = $b / $d;
+        } while ((abs($q1 - $q2) / $q2) > Functions::PRECISION);
+
+        return self::ONE_SQRT_PI * exp(-$value * $value) * $q2;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php
new file mode 100644
index 00000000..ea893d69
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class Exception extends PhpSpreadsheetException
+{
+    public const CALCULATION_ENGINE_PUSH_TO_STACK = 1;
+
+    /**
+     * Error handler callback.
+     */
+    public static function errorHandlerCallback(int $code, string $string, string $file, int $line): void
+    {
+        $e = new self($string, $code);
+        $e->line = $line;
+        $e->file = $file;
+
+        throw $e;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php
new file mode 100644
index 00000000..890da60b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+class ExceptionHandler
+{
+    /**
+     * Register errorhandler.
+     */
+    public function __construct()
+    {
+        /** @var callable $callable */
+        $callable = [Exception::class, 'errorHandlerCallback'];
+        set_error_handler($callable, E_ALL);
+    }
+
+    /**
+     * Unregister errorhandler.
+     */
+    public function __destruct()
+    {
+        restore_error_handler();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php
new file mode 100644
index 00000000..e56fabe9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php
@@ -0,0 +1,215 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class Amortization
+{
+    private const ROUNDING_ADJUSTMENT = (PHP_VERSION_ID < 80400) ? 0 : 1e-14;
+
+    /**
+     * AMORDEGRC.
+     *
+     * Returns the depreciation for each accounting period.
+     * This function is provided for the French accounting system. If an asset is purchased in
+     * the middle of the accounting period, the prorated depreciation is taken into account.
+     * The function is similar to AMORLINC, except that a depreciation coefficient is applied in
+     * the calculation depending on the life of the assets.
+     * This function will return the depreciation until the last period of the life of the assets
+     * or until the cumulated value of depreciation is greater than the cost of the assets minus
+     * the salvage value.
+     *
+     * Excel Function:
+     *        AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
+     *
+     * @param mixed $cost The float cost of the asset
+     * @param mixed $purchased Date of the purchase of the asset
+     * @param mixed $firstPeriod Date of the end of the first period
+     * @param mixed $salvage The salvage value at the end of the life of the asset
+     * @param mixed $period the period (float)
+     * @param mixed $rate rate of depreciation (float)
+     * @param mixed $basis The type of day count to use (int).
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     *
+     * @return float|string (string containing the error type if there is an error)
+     */
+    public static function AMORDEGRC(
+        mixed $cost,
+        mixed $purchased,
+        mixed $firstPeriod,
+        mixed $salvage,
+        mixed $period,
+        mixed $rate,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
+        $cost = Functions::flattenSingleValue($cost);
+        $purchased = Functions::flattenSingleValue($purchased);
+        $firstPeriod = Functions::flattenSingleValue($firstPeriod);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $period = Functions::flattenSingleValue($period);
+        $rate = Functions::flattenSingleValue($rate);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $cost = FinancialValidations::validateFloat($cost);
+            $purchased = FinancialValidations::validateDate($purchased);
+            $firstPeriod = FinancialValidations::validateDate($firstPeriod);
+            $salvage = FinancialValidations::validateFloat($salvage);
+            $period = FinancialValidations::validateInt($period);
+            $rate = FinancialValidations::validateFloat($rate);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $yearFracx = DateTimeExcel\YearFrac::fraction($purchased, $firstPeriod, $basis);
+        if (is_string($yearFracx)) {
+            return $yearFracx;
+        }
+        /** @var float $yearFrac */
+        $yearFrac = $yearFracx;
+
+        $amortiseCoeff = self::getAmortizationCoefficient($rate);
+
+        $rate *= $amortiseCoeff;
+        $rate += self::ROUNDING_ADJUSTMENT;
+        $fNRate = round($yearFrac * $rate * $cost, 0);
+        $cost -= $fNRate;
+        $fRest = $cost - $salvage;
+
+        for ($n = 0; $n < $period; ++$n) {
+            $fNRate = round($rate * $cost, 0);
+            $fRest -= $fNRate;
+
+            if ($fRest < 0.0) {
+                return match ($period - $n) {
+                    1 => round($cost * 0.5, 0),
+                    default => 0.0,
+                };
+            }
+            $cost -= $fNRate;
+        }
+
+        return $fNRate;
+    }
+
+    /**
+     * AMORLINC.
+     *
+     * Returns the depreciation for each accounting period.
+     * This function is provided for the French accounting system. If an asset is purchased in
+     * the middle of the accounting period, the prorated depreciation is taken into account.
+     *
+     * Excel Function:
+     *        AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
+     *
+     * @param mixed $cost The cost of the asset as a float
+     * @param mixed $purchased Date of the purchase of the asset
+     * @param mixed $firstPeriod Date of the end of the first period
+     * @param mixed $salvage The salvage value at the end of the life of the asset
+     * @param mixed $period The period as a float
+     * @param mixed $rate Rate of depreciation as  float
+     * @param mixed $basis Integer indicating the type of day count to use.
+     *                             0 or omitted    US (NASD) 30/360
+     *                             1               Actual/actual
+     *                             2               Actual/360
+     *                             3               Actual/365
+     *                             4               European 30/360
+     *
+     * @return float|string (string containing the error type if there is an error)
+     */
+    public static function AMORLINC(
+        mixed $cost,
+        mixed $purchased,
+        mixed $firstPeriod,
+        mixed $salvage,
+        mixed $period,
+        mixed $rate,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
+        $cost = Functions::flattenSingleValue($cost);
+        $purchased = Functions::flattenSingleValue($purchased);
+        $firstPeriod = Functions::flattenSingleValue($firstPeriod);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $period = Functions::flattenSingleValue($period);
+        $rate = Functions::flattenSingleValue($rate);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $cost = FinancialValidations::validateFloat($cost);
+            $purchased = FinancialValidations::validateDate($purchased);
+            $firstPeriod = FinancialValidations::validateDate($firstPeriod);
+            $salvage = FinancialValidations::validateFloat($salvage);
+            $period = FinancialValidations::validateFloat($period);
+            $rate = FinancialValidations::validateFloat($rate);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $fOneRate = $cost * $rate;
+        $fCostDelta = $cost - $salvage;
+        //    Note, quirky variation for leap years on the YEARFRAC for this function
+        $purchasedYear = DateTimeExcel\DateParts::year($purchased);
+        $yearFracx = DateTimeExcel\YearFrac::fraction($purchased, $firstPeriod, $basis);
+        if (is_string($yearFracx)) {
+            return $yearFracx;
+        }
+        /** @var float $yearFrac */
+        $yearFrac = $yearFracx;
+
+        if (
+            $basis == FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+            && $yearFrac < 1
+            && DateTimeExcel\Helpers::isLeapYear(Functions::scalar($purchasedYear))
+        ) {
+            $yearFrac *= 365 / 366;
+        }
+
+        $f0Rate = $yearFrac * $rate * $cost;
+        $nNumOfFullPeriods = (int) (($cost - $salvage - $f0Rate) / $fOneRate);
+
+        if ($period == 0) {
+            return $f0Rate;
+        } elseif ($period <= $nNumOfFullPeriods) {
+            return $fOneRate;
+        } elseif ($period == ($nNumOfFullPeriods + 1)) {
+            return $fCostDelta - $fOneRate * $nNumOfFullPeriods - $f0Rate;
+        }
+
+        return 0.0;
+    }
+
+    private static function getAmortizationCoefficient(float $rate): float
+    {
+        //    The depreciation coefficients are:
+        //    Life of assets (1/rate)        Depreciation coefficient
+        //    Less than 3 years            1
+        //    Between 3 and 4 years        1.5
+        //    Between 5 and 6 years        2
+        //    More than 6 years            2.5
+        $fUsePer = 1.0 / $rate;
+
+        if ($fUsePer < 3.0) {
+            return 1.0;
+        } elseif ($fUsePer < 4.0) {
+            return 1.5;
+        } elseif ($fUsePer <= 6.0) {
+            return 2.0;
+        }
+
+        return 2.5;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php
new file mode 100644
index 00000000..f5719b69
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\FinancialValidations;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class CashFlowValidations extends FinancialValidations
+{
+    public static function validateRate(mixed $rate): float
+    {
+        $rate = self::validateFloat($rate);
+
+        return $rate;
+    }
+
+    public static function validatePeriodType(mixed $type): int
+    {
+        $rate = self::validateInt($type);
+        if (
+            $type !== FinancialConstants::PAYMENT_END_OF_PERIOD
+            && $type !== FinancialConstants::PAYMENT_BEGINNING_OF_PERIOD
+        ) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $rate;
+    }
+
+    public static function validatePresentValue(mixed $presentValue): float
+    {
+        return self::validateFloat($presentValue);
+    }
+
+    public static function validateFutureValue(mixed $futureValue): float
+    {
+        return self::validateFloat($futureValue);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php
new file mode 100644
index 00000000..08cef3ee
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php
@@ -0,0 +1,195 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\CashFlowValidations;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Periodic
+{
+    /**
+     * FV.
+     *
+     * Returns the Future Value of a cash flow with constant payments and interest rate (annuities).
+     *
+     * Excel Function:
+     *        FV(rate,nper,pmt[,pv[,type]])
+     *
+     * @param mixed $rate The interest rate per period
+     * @param mixed $numberOfPeriods Total number of payment periods in an annuity as an integer
+     * @param mixed $payment The payment made each period: it cannot change over the
+     *                            life of the annuity. Typically, pmt contains principal
+     *                            and interest but no other fees or taxes.
+     * @param mixed $presentValue present Value, or the lump-sum amount that a series of
+     *                            future payments is worth right now
+     * @param mixed $type A number 0 or 1 and indicates when payments are due:
+     *                      0 or omitted    At the end of the period.
+     *                      1               At the beginning of the period.
+     */
+    public static function futureValue(
+        mixed $rate,
+        mixed $numberOfPeriods,
+        mixed $payment = 0.0,
+        mixed $presentValue = 0.0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
+        $rate = Functions::flattenSingleValue($rate);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $payment = ($payment === null) ? 0.0 : Functions::flattenSingleValue($payment);
+        $presentValue = ($presentValue === null) ? 0.0 : Functions::flattenSingleValue($presentValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $payment = CashFlowValidations::validateFloat($payment);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::calculateFutureValue($rate, $numberOfPeriods, $payment, $presentValue, $type);
+    }
+
+    /**
+     * PV.
+     *
+     * Returns the Present Value of a cash flow with constant payments and interest rate (annuities).
+     *
+     * @param mixed $rate Interest rate per period
+     * @param mixed $numberOfPeriods Number of periods as an integer
+     * @param mixed $payment Periodic payment (annuity)
+     * @param mixed $futureValue Future Value
+     * @param mixed $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function presentValue(
+        mixed $rate,
+        mixed $numberOfPeriods,
+        mixed $payment = 0.0,
+        mixed $futureValue = 0.0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
+        $rate = Functions::flattenSingleValue($rate);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $payment = ($payment === null) ? 0.0 : Functions::flattenSingleValue($payment);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $payment = CashFlowValidations::validateFloat($payment);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($numberOfPeriods < 0) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculatePresentValue($rate, $numberOfPeriods, $payment, $futureValue, $type);
+    }
+
+    /**
+     * NPER.
+     *
+     * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
+     *
+     * @param mixed $rate Interest rate per period
+     * @param mixed $payment Periodic payment (annuity)
+     * @param mixed $presentValue Present Value
+     * @param mixed $futureValue Future Value
+     * @param mixed $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function periods(
+        mixed $rate,
+        mixed $payment,
+        mixed $presentValue,
+        mixed $futureValue = 0.0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ) {
+        $rate = Functions::flattenSingleValue($rate);
+        $payment = Functions::flattenSingleValue($payment);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $payment = CashFlowValidations::validateFloat($payment);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($payment == 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculatePeriods($rate, $payment, $presentValue, $futureValue, $type);
+    }
+
+    private static function calculateFutureValue(
+        float $rate,
+        int $numberOfPeriods,
+        float $payment,
+        float $presentValue,
+        int $type
+    ): float {
+        if ($rate !== null && $rate != 0) {
+            return -$presentValue
+                * (1 + $rate) ** $numberOfPeriods - $payment * (1 + $rate * $type) * ((1 + $rate) ** $numberOfPeriods - 1)
+                    / $rate;
+        }
+
+        return -$presentValue - $payment * $numberOfPeriods;
+    }
+
+    private static function calculatePresentValue(
+        float $rate,
+        int $numberOfPeriods,
+        float $payment,
+        float $futureValue,
+        int $type
+    ): float {
+        if ($rate != 0.0) {
+            return (-$payment * (1 + $rate * $type)
+                    * (((1 + $rate) ** $numberOfPeriods - 1) / $rate) - $futureValue) / (1 + $rate) ** $numberOfPeriods;
+        }
+
+        return -$futureValue - $payment * $numberOfPeriods;
+    }
+
+    private static function calculatePeriods(
+        float $rate,
+        float $payment,
+        float $presentValue,
+        float $futureValue,
+        int $type
+    ): string|float {
+        if ($rate != 0.0) {
+            if ($presentValue == 0.0) {
+                return ExcelError::NAN();
+            }
+
+            return log(($payment * (1 + $rate * $type) / $rate - $futureValue)
+                    / ($presentValue + $payment * (1 + $rate * $type) / $rate)) / log(1 + $rate);
+        }
+
+        return (-$presentValue - $futureValue) / $payment;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php
new file mode 100644
index 00000000..94359090
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant\Periodic;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\CashFlowValidations;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Cumulative
+{
+    /**
+     * CUMIPMT.
+     *
+     * Returns the cumulative interest paid on a loan between the start and end periods.
+     *
+     * Excel Function:
+     *        CUMIPMT(rate,nper,pv,start,end[,type])
+     *
+     * @param mixed $rate The Interest rate
+     * @param mixed $periods The total number of payment periods
+     * @param mixed $presentValue Present Value
+     * @param mixed $start The first period in the calculation.
+     *                       Payment periods are numbered beginning with 1.
+     * @param mixed $end the last period in the calculation
+     * @param mixed $type A number 0 or 1 and indicates when payments are due:
+     *                    0 or omitted    At the end of the period.
+     *                    1               At the beginning of the period.
+     */
+    public static function interest(
+        mixed $rate,
+        mixed $periods,
+        mixed $presentValue,
+        mixed $start,
+        mixed $end,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float|int {
+        $rate = Functions::flattenSingleValue($rate);
+        $periods = Functions::flattenSingleValue($periods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $start = Functions::flattenSingleValue($start);
+        $end = Functions::flattenSingleValue($end);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $periods = CashFlowValidations::validateInt($periods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $start = CashFlowValidations::validateInt($start);
+            $end = CashFlowValidations::validateInt($end);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($start < 1 || $start > $end) {
+            return ExcelError::NAN();
+        }
+
+        // Calculate
+        $interest = 0;
+        for ($per = $start; $per <= $end; ++$per) {
+            $ipmt = Interest::payment($rate, $per, $periods, $presentValue, 0, $type);
+            if (is_string($ipmt)) {
+                return $ipmt;
+            }
+
+            $interest += $ipmt;
+        }
+
+        return $interest;
+    }
+
+    /**
+     * CUMPRINC.
+     *
+     * Returns the cumulative principal paid on a loan between the start and end periods.
+     *
+     * Excel Function:
+     *        CUMPRINC(rate,nper,pv,start,end[,type])
+     *
+     * @param mixed $rate The Interest rate
+     * @param mixed $periods The total number of payment periods as an integer
+     * @param mixed $presentValue Present Value
+     * @param mixed $start The first period in the calculation.
+     *                       Payment periods are numbered beginning with 1.
+     * @param mixed $end the last period in the calculation
+     * @param mixed $type A number 0 or 1 and indicates when payments are due:
+     *                    0 or omitted    At the end of the period.
+     *                    1               At the beginning of the period.
+     */
+    public static function principal(
+        mixed $rate,
+        mixed $periods,
+        mixed $presentValue,
+        mixed $start,
+        mixed $end,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float|int {
+        $rate = Functions::flattenSingleValue($rate);
+        $periods = Functions::flattenSingleValue($periods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $start = Functions::flattenSingleValue($start);
+        $end = Functions::flattenSingleValue($end);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $periods = CashFlowValidations::validateInt($periods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $start = CashFlowValidations::validateInt($start);
+            $end = CashFlowValidations::validateInt($end);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($start < 1 || $start > $end) {
+            return ExcelError::VALUE();
+        }
+
+        // Calculate
+        $principal = 0;
+        for ($per = $start; $per <= $end; ++$per) {
+            $ppmt = Payments::interestPayment($rate, $per, $periods, $presentValue, 0, $type);
+            if (is_string($ppmt)) {
+                return $ppmt;
+            }
+
+            $principal += $ppmt;
+        }
+
+        return $principal;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
new file mode 100644
index 00000000..833c5734
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant\Periodic;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\CashFlowValidations;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Interest
+{
+    private const FINANCIAL_MAX_ITERATIONS = 128;
+
+    private const FINANCIAL_PRECISION = 1.0e-08;
+
+    /**
+     * IPMT.
+     *
+     * Returns the interest payment for a given period for an investment based on periodic, constant payments
+     *         and a constant interest rate.
+     *
+     * Excel Function:
+     *        IPMT(rate,per,nper,pv[,fv][,type])
+     *
+     * @param mixed $interestRate Interest rate per period
+     * @param mixed $period Period for which we want to find the interest
+     * @param mixed $numberOfPeriods Number of periods
+     * @param mixed $presentValue Present Value
+     * @param mixed $futureValue Future Value
+     * @param mixed $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     */
+    public static function payment(
+        mixed $interestRate,
+        mixed $period,
+        mixed $numberOfPeriods,
+        mixed $presentValue,
+        mixed $futureValue = 0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
+        $interestRate = Functions::flattenSingleValue($interestRate);
+        $period = Functions::flattenSingleValue($period);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $interestRate = CashFlowValidations::validateRate($interestRate);
+            $period = CashFlowValidations::validateInt($period);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($period <= 0 || $period > $numberOfPeriods) {
+            return ExcelError::NAN();
+        }
+
+        // Calculate
+        $interestAndPrincipal = new InterestAndPrincipal(
+            $interestRate,
+            $period,
+            $numberOfPeriods,
+            $presentValue,
+            $futureValue,
+            $type
+        );
+
+        return $interestAndPrincipal->interest();
+    }
+
+    /**
+     * ISPMT.
+     *
+     * Returns the interest payment for an investment based on an interest rate and a constant payment schedule.
+     *
+     * Excel Function:
+     *     =ISPMT(interest_rate, period, number_payments, pv)
+     *
+     * @param mixed $interestRate is the interest rate for the investment
+     * @param mixed $period is the period to calculate the interest rate.  It must be betweeen 1 and number_payments.
+     * @param mixed $numberOfPeriods is the number of payments for the annuity
+     * @param mixed $principleRemaining is the loan amount or present value of the payments
+     */
+    public static function schedulePayment(mixed $interestRate, mixed $period, mixed $numberOfPeriods, mixed $principleRemaining): string|float
+    {
+        $interestRate = Functions::flattenSingleValue($interestRate);
+        $period = Functions::flattenSingleValue($period);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $principleRemaining = Functions::flattenSingleValue($principleRemaining);
+
+        try {
+            $interestRate = CashFlowValidations::validateRate($interestRate);
+            $period = CashFlowValidations::validateInt($period);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $principleRemaining = CashFlowValidations::validateFloat($principleRemaining);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($period <= 0 || $period > $numberOfPeriods) {
+            return ExcelError::NAN();
+        }
+
+        // Return value
+        $returnValue = 0;
+
+        // Calculate
+        $principlePayment = ($principleRemaining * 1.0) / ($numberOfPeriods * 1.0);
+        for ($i = 0; $i <= $period; ++$i) {
+            $returnValue = $interestRate * $principleRemaining * -1;
+            $principleRemaining -= $principlePayment;
+            // principle needs to be 0 after the last payment, don't let floating point screw it up
+            if ($i == $numberOfPeriods) {
+                $returnValue = 0.0;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * RATE.
+     *
+     * Returns the interest rate per period of an annuity.
+     * RATE is calculated by iteration and can have zero or more solutions.
+     * If the successive results of RATE do not converge to within 0.0000001 after 20 iterations,
+     * RATE returns the #NUM! error value.
+     *
+     * Excel Function:
+     *        RATE(nper,pmt,pv[,fv[,type[,guess]]])
+     *
+     * @param mixed $numberOfPeriods The total number of payment periods in an annuity
+     * @param mixed $payment The payment made each period and cannot change over the life of the annuity.
+     *                           Typically, pmt includes principal and interest but no other fees or taxes.
+     * @param mixed $presentValue The present value - the total amount that a series of future payments is worth now
+     * @param mixed $futureValue The future value, or a cash balance you want to attain after the last payment is made.
+     *                               If fv is omitted, it is assumed to be 0 (the future value of a loan,
+     *                               for example, is 0).
+     * @param mixed $type A number 0 or 1 and indicates when payments are due:
+     *                      0 or omitted    At the end of the period.
+     *                      1               At the beginning of the period.
+     * @param mixed $guess Your guess for what the rate will be.
+     *                          If you omit guess, it is assumed to be 10 percent.
+     */
+    public static function rate(
+        mixed $numberOfPeriods,
+        mixed $payment,
+        mixed $presentValue,
+        mixed $futureValue = 0.0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD,
+        mixed $guess = 0.1
+    ): string|float {
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $payment = Functions::flattenSingleValue($payment);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+        $guess = ($guess === null) ? 0.1 : Functions::flattenSingleValue($guess);
+
+        try {
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $payment = CashFlowValidations::validateFloat($payment);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+            $guess = CashFlowValidations::validateFloat($guess);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $rate = $guess;
+        // rest of code adapted from python/numpy
+        $close = false;
+        $iter = 0;
+        while (!$close && $iter < self::FINANCIAL_MAX_ITERATIONS) {
+            $nextdiff = self::rateNextGuess($rate, $numberOfPeriods, $payment, $presentValue, $futureValue, $type);
+            if (!is_numeric($nextdiff)) {
+                break;
+            }
+            $rate1 = $rate - $nextdiff;
+            $close = abs($rate1 - $rate) < self::FINANCIAL_PRECISION;
+            ++$iter;
+            $rate = $rate1;
+        }
+
+        return $close ? $rate : ExcelError::NAN();
+    }
+
+    private static function rateNextGuess(float $rate, int $numberOfPeriods, float $payment, float $presentValue, float $futureValue, int $type): string|float
+    {
+        if ($rate == 0.0) {
+            return ExcelError::NAN();
+        }
+        $tt1 = ($rate + 1) ** $numberOfPeriods;
+        $tt2 = ($rate + 1) ** ($numberOfPeriods - 1);
+        $numerator = $futureValue + $tt1 * $presentValue + $payment * ($tt1 - 1) * ($rate * $type + 1) / $rate;
+        $denominator = $numberOfPeriods * $tt2 * $presentValue - $payment * ($tt1 - 1)
+            * ($rate * $type + 1) / ($rate * $rate) + $numberOfPeriods
+            * $payment * $tt2 * ($rate * $type + 1) / $rate + $payment * ($tt1 - 1) * $type / $rate;
+        if ($denominator == 0) {
+            return ExcelError::NAN();
+        }
+
+        return $numerator / $denominator;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
new file mode 100644
index 00000000..ea9abb98
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant\Periodic;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+
+class InterestAndPrincipal
+{
+    protected float $interest;
+
+    protected float $principal;
+
+    public function __construct(
+        float $rate = 0.0,
+        int $period = 0,
+        int $numberOfPeriods = 0,
+        float $presentValue = 0,
+        float $futureValue = 0,
+        int $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ) {
+        $payment = Payments::annuity($rate, $numberOfPeriods, $presentValue, $futureValue, $type);
+        $capital = $presentValue;
+        $interest = 0.0;
+        $principal = 0.0;
+        for ($i = 1; $i <= $period; ++$i) {
+            $interest = ($type === FinancialConstants::PAYMENT_BEGINNING_OF_PERIOD && $i == 1) ? 0 : -$capital * $rate;
+            $principal = (float) $payment - $interest;
+            $capital += $principal;
+        }
+
+        $this->interest = $interest;
+        $this->principal = $principal;
+    }
+
+    public function interest(): float
+    {
+        return $this->interest;
+    }
+
+    public function principal(): float
+    {
+        return $this->principal;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php
new file mode 100644
index 00000000..41e88f9a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Constant\Periodic;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\CashFlowValidations;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Payments
+{
+    /**
+     * PMT.
+     *
+     * Returns the constant payment (annuity) for a cash flow with a constant interest rate.
+     *
+     * @param mixed $interestRate Interest rate per period
+     * @param mixed $numberOfPeriods Number of periods
+     * @param mixed $presentValue Present Value
+     * @param mixed $futureValue Future Value
+     * @param mixed $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function annuity(
+        mixed $interestRate,
+        mixed $numberOfPeriods,
+        mixed $presentValue,
+        mixed $futureValue = 0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
+        $interestRate = Functions::flattenSingleValue($interestRate);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $interestRate = CashFlowValidations::validateRate($interestRate);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Calculate
+        if ($interestRate != 0.0) {
+            return (-$futureValue - $presentValue * (1 + $interestRate) ** $numberOfPeriods)
+                / (1 + $interestRate * $type) / (((1 + $interestRate) ** $numberOfPeriods - 1) / $interestRate);
+        }
+
+        return (-$presentValue - $futureValue) / $numberOfPeriods;
+    }
+
+    /**
+     * PPMT.
+     *
+     * Returns the interest payment for a given period for an investment based on periodic, constant payments
+     *         and a constant interest rate.
+     *
+     * @param mixed $interestRate Interest rate per period
+     * @param mixed $period Period for which we want to find the interest
+     * @param mixed $numberOfPeriods Number of periods
+     * @param mixed $presentValue Present Value
+     * @param mixed $futureValue Future Value
+     * @param mixed $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function interestPayment(
+        mixed $interestRate,
+        mixed $period,
+        mixed $numberOfPeriods,
+        mixed $presentValue,
+        mixed $futureValue = 0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
+        $interestRate = Functions::flattenSingleValue($interestRate);
+        $period = Functions::flattenSingleValue($period);
+        $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = ($futureValue === null) ? 0.0 : Functions::flattenSingleValue($futureValue);
+        $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
+
+        try {
+            $interestRate = CashFlowValidations::validateRate($interestRate);
+            $period = CashFlowValidations::validateInt($period);
+            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+            $type = CashFlowValidations::validatePeriodType($type);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($period <= 0 || $period > $numberOfPeriods) {
+            return ExcelError::NAN();
+        }
+
+        // Calculate
+        $interestAndPrincipal = new InterestAndPrincipal(
+            $interestRate,
+            $period,
+            $numberOfPeriods,
+            $presentValue,
+            $futureValue,
+            $type
+        );
+
+        return $interestAndPrincipal->principal();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php
new file mode 100644
index 00000000..6f60a2af
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Single
+{
+    /**
+     * FVSCHEDULE.
+     *
+     * Returns the future value of an initial principal after applying a series of compound interest rates.
+     * Use FVSCHEDULE to calculate the future value of an investment with a variable or adjustable rate.
+     *
+     * Excel Function:
+     *        FVSCHEDULE(principal,schedule)
+     *
+     * @param mixed $principal the present value
+     * @param float[] $schedule an array of interest rates to apply
+     */
+    public static function futureValue(mixed $principal, array $schedule): string|float
+    {
+        $principal = Functions::flattenSingleValue($principal);
+        $schedule = Functions::flattenArray($schedule);
+
+        try {
+            $principal = CashFlowValidations::validateFloat($principal);
+
+            foreach ($schedule as $rate) {
+                $rate = CashFlowValidations::validateFloat($rate);
+                $principal *= 1 + $rate;
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $principal;
+    }
+
+    /**
+     * PDURATION.
+     *
+     * Calculates the number of periods required for an investment to reach a specified value.
+     *
+     * @param mixed $rate Interest rate per period
+     * @param mixed $presentValue Present Value
+     * @param mixed $futureValue Future Value
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function periods(mixed $rate, mixed $presentValue, mixed $futureValue): string|float
+    {
+        $rate = Functions::flattenSingleValue($rate);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = Functions::flattenSingleValue($futureValue);
+
+        try {
+            $rate = CashFlowValidations::validateRate($rate);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($rate <= 0.0 || $presentValue <= 0.0 || $futureValue <= 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return (log($futureValue) - log($presentValue)) / log(1 + $rate);
+    }
+
+    /**
+     * RRI.
+     *
+     * Calculates the interest rate required for an investment to grow to a specified future value .
+     *
+     * @param array|float $periods The number of periods over which the investment is made
+     * @param array|float $presentValue Present Value
+     * @param array|float $futureValue Future Value
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function interestRate(array|float $periods = 0.0, array|float $presentValue = 0.0, array|float $futureValue = 0.0): string|float
+    {
+        $periods = Functions::flattenSingleValue($periods);
+        $presentValue = Functions::flattenSingleValue($presentValue);
+        $futureValue = Functions::flattenSingleValue($futureValue);
+
+        try {
+            $periods = CashFlowValidations::validateFloat($periods);
+            $presentValue = CashFlowValidations::validatePresentValue($presentValue);
+            $futureValue = CashFlowValidations::validateFutureValue($futureValue);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if ($periods <= 0.0 || $presentValue <= 0.0 || $futureValue < 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return ($futureValue / $presentValue) ** (1 / $periods) - 1;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
new file mode 100644
index 00000000..8c6f615b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Variable;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class NonPeriodic
+{
+    const FINANCIAL_MAX_ITERATIONS = 128;
+
+    const FINANCIAL_PRECISION = 1.0e-08;
+
+    const DEFAULT_GUESS = 0.1;
+
+    /**
+     * XIRR.
+     *
+     * Returns the internal rate of return for a schedule of cash flows that is not necessarily periodic.
+     *
+     * Excel Function:
+     *        =XIRR(values,dates,guess)
+     *
+     * @param float[] $values     A series of cash flow payments
+     *                                The series of values must contain at least one positive value & one negative value
+     * @param mixed[] $dates      A series of payment dates
+     *                                The first payment date indicates the beginning of the schedule of payments
+     *                                All other dates must be later than this date, but they may occur in any order
+     * @param mixed $guess        An optional guess at the expected answer
+     */
+    public static function rate(array $values, array $dates, mixed $guess = self::DEFAULT_GUESS): float|string
+    {
+        $rslt = self::xirrPart1($values, $dates);
+        if ($rslt !== '') {
+            return $rslt;
+        }
+
+        // create an initial range, with a root somewhere between 0 and guess
+        $guess = Functions::flattenSingleValue($guess) ?? self::DEFAULT_GUESS;
+        if (!is_numeric($guess)) {
+            return ExcelError::VALUE();
+        }
+        $guess = ($guess + 0.0) ?: self::DEFAULT_GUESS;
+        $x1 = 0.0;
+        $x2 = $guess + 0.0;
+        $f1 = self::xnpvOrdered($x1, $values, $dates, false);
+        $f2 = self::xnpvOrdered($x2, $values, $dates, false);
+        $found = false;
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            if (!is_numeric($f1)) {
+                return $f1;
+            }
+            if (!is_numeric($f2)) {
+                return $f2;
+            }
+            $f1 = (float) $f1;
+            $f2 = (float) $f2;
+            if (($f1 * $f2) < 0.0) {
+                $found = true;
+
+                break;
+            } elseif (abs($f1) < abs($f2)) {
+                $x1 += 1.6 * ($x1 - $x2);
+                $f1 = self::xnpvOrdered($x1, $values, $dates, false);
+            } else {
+                $x2 += 1.6 * ($x2 - $x1);
+                $f2 = self::xnpvOrdered($x2, $values, $dates, false);
+            }
+        }
+        if ($found) {
+            return self::xirrPart3($values, $dates, $x1, $x2);
+        }
+
+        // Newton-Raphson didn't work - try bisection
+        $x1 = $guess - 0.5;
+        $x2 = $guess + 0.5;
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $f1 = self::xnpvOrdered($x1, $values, $dates, false, true);
+            $f2 = self::xnpvOrdered($x2, $values, $dates, false, true);
+            if (!is_numeric($f1) || !is_numeric($f2)) {
+                break;
+            }
+            if ($f1 * $f2 <= 0) {
+                $found = true;
+
+                break;
+            }
+            $x1 -= 0.5;
+            $x2 += 0.5;
+        }
+        if ($found) {
+            return self::xirrBisection($values, $dates, $x1, $x2);
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * XNPV.
+     *
+     * Returns the net present value for a schedule of cash flows that is not necessarily periodic.
+     * To calculate the net present value for a series of cash flows that is periodic, use the NPV function.
+     *
+     * Excel Function:
+     *        =XNPV(rate,values,dates)
+     *
+     * @param array|float $rate the discount rate to apply to the cash flows
+     * @param float[] $values A series of cash flows that corresponds to a schedule of payments in dates.
+     *                          The first payment is optional and corresponds to a cost or payment that occurs
+     *                              at the beginning of the investment.
+     *                          If the first value is a cost or payment, it must be a negative value.
+     *                             All succeeding payments are discounted based on a 365-day year.
+     *                          The series of values must contain at least one positive value and one negative value.
+     * @param mixed[] $dates A schedule of payment dates that corresponds to the cash flow payments.
+     *                         The first payment date indicates the beginning of the schedule of payments.
+     *                         All other dates must be later than this date, but they may occur in any order.
+     */
+    public static function presentValue(array|float $rate, array $values, array $dates): float|string
+    {
+        return self::xnpvOrdered($rate, $values, $dates, true);
+    }
+
+    private static function bothNegAndPos(bool $neg, bool $pos): bool
+    {
+        return $neg && $pos;
+    }
+
+    private static function xirrPart1(mixed &$values, mixed &$dates): string
+    {
+        $values = Functions::flattenArray($values);
+        $dates = Functions::flattenArray($dates);
+        $valuesIsArray = count($values) > 1;
+        $datesIsArray = count($dates) > 1;
+        if (!$valuesIsArray && !$datesIsArray) {
+            return ExcelError::NA();
+        }
+        if (count($values) != count($dates)) {
+            return ExcelError::NAN();
+        }
+
+        $datesCount = count($dates);
+        for ($i = 0; $i < $datesCount; ++$i) {
+            try {
+                $dates[$i] = DateTimeExcel\Helpers::getDateValue($dates[$i]);
+            } catch (Exception $e) {
+                return $e->getMessage();
+            }
+        }
+
+        return self::xirrPart2($values);
+    }
+
+    private static function xirrPart2(array &$values): string
+    {
+        $valCount = count($values);
+        $foundpos = false;
+        $foundneg = false;
+        for ($i = 0; $i < $valCount; ++$i) {
+            $fld = $values[$i];
+            if (!is_numeric($fld)) {
+                return ExcelError::VALUE();
+            } elseif ($fld > 0) {
+                $foundpos = true;
+            } elseif ($fld < 0) {
+                $foundneg = true;
+            }
+        }
+        if (!self::bothNegAndPos($foundneg, $foundpos)) {
+            return ExcelError::NAN();
+        }
+
+        return '';
+    }
+
+    private static function xirrPart3(array $values, array $dates, float $x1, float $x2): float|string
+    {
+        $f = self::xnpvOrdered($x1, $values, $dates, false);
+        if ($f < 0.0) {
+            $rtb = $x1;
+            $dx = $x2 - $x1;
+        } else {
+            $rtb = $x2;
+            $dx = $x1 - $x2;
+        }
+
+        $rslt = ExcelError::VALUE();
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $dx *= 0.5;
+            $x_mid = $rtb + $dx;
+            $f_mid = (float) self::xnpvOrdered($x_mid, $values, $dates, false);
+            if ($f_mid <= 0.0) {
+                $rtb = $x_mid;
+            }
+            if ((abs($f_mid) < self::FINANCIAL_PRECISION) || (abs($dx) < self::FINANCIAL_PRECISION)) {
+                $rslt = $x_mid;
+
+                break;
+            }
+        }
+
+        return $rslt;
+    }
+
+    private static function xirrBisection(array $values, array $dates, float $x1, float $x2): string|float
+    {
+        $rslt = ExcelError::NAN();
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $rslt = ExcelError::NAN();
+            $f1 = self::xnpvOrdered($x1, $values, $dates, false, true);
+            $f2 = self::xnpvOrdered($x2, $values, $dates, false, true);
+            if (!is_numeric($f1) || !is_numeric($f2)) {
+                break;
+            }
+            $f1 = (float) $f1;
+            $f2 = (float) $f2;
+            if (abs($f1) < self::FINANCIAL_PRECISION && abs($f2) < self::FINANCIAL_PRECISION) {
+                break;
+            }
+            if ($f1 * $f2 > 0) {
+                break;
+            }
+            $rslt = ($x1 + $x2) / 2;
+            $f3 = self::xnpvOrdered($rslt, $values, $dates, false, true);
+            if (!is_float($f3)) {
+                break;
+            }
+            if ($f3 * $f1 < 0) {
+                $x2 = $rslt;
+            } else {
+                $x1 = $rslt;
+            }
+            if (abs($f3) < self::FINANCIAL_PRECISION) {
+                break;
+            }
+        }
+
+        return $rslt;
+    }
+
+    private static function xnpvOrdered(mixed $rate, mixed $values, mixed $dates, bool $ordered = true, bool $capAtNegative1 = false): float|string
+    {
+        $rate = Functions::flattenSingleValue($rate);
+        $values = Functions::flattenArray($values);
+        $dates = Functions::flattenArray($dates);
+        $valCount = count($values);
+
+        try {
+            self::validateXnpv($rate, $values, $dates);
+            if ($capAtNegative1 && $rate <= -1) {
+                $rate = -1.0 + 1.0E-10;
+            }
+            $date0 = DateTimeExcel\Helpers::getDateValue($dates[0]);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $xnpv = 0.0;
+        for ($i = 0; $i < $valCount; ++$i) {
+            if (!is_numeric($values[$i])) {
+                return ExcelError::VALUE();
+            }
+
+            try {
+                $datei = DateTimeExcel\Helpers::getDateValue($dates[$i]);
+            } catch (Exception $e) {
+                return $e->getMessage();
+            }
+            if ($date0 > $datei) {
+                $dif = $ordered ? ExcelError::NAN() : -((int) DateTimeExcel\Difference::interval($datei, $date0, 'd'));
+            } else {
+                $dif = Functions::scalar(DateTimeExcel\Difference::interval($date0, $datei, 'd'));
+            }
+            if (!is_numeric($dif)) {
+                return $dif;
+            }
+            if ($rate <= -1.0) {
+                $xnpv += -abs($values[$i]) / (-1 - $rate) ** ($dif / 365);
+            } else {
+                $xnpv += $values[$i] / (1 + $rate) ** ($dif / 365);
+            }
+        }
+
+        return is_finite($xnpv) ? $xnpv : ExcelError::VALUE();
+    }
+
+    private static function validateXnpv(mixed $rate, array $values, array $dates): void
+    {
+        if (!is_numeric($rate)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+        $valCount = count($values);
+        if ($valCount != count($dates)) {
+            throw new Exception(ExcelError::NAN());
+        }
+        if ($valCount > 1 && ((min($values) > 0) || (max($values) < 0))) {
+            throw new Exception(ExcelError::NAN());
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php
new file mode 100644
index 00000000..21e537be
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Variable;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Periodic
+{
+    const FINANCIAL_MAX_ITERATIONS = 128;
+
+    const FINANCIAL_PRECISION = 1.0e-08;
+
+    /**
+     * IRR.
+     *
+     * Returns the internal rate of return for a series of cash flows represented by the numbers in values.
+     * These cash flows do not have to be even, as they would be for an annuity. However, the cash flows must occur
+     * at regular intervals, such as monthly or annually. The internal rate of return is the interest rate received
+     * for an investment consisting of payments (negative values) and income (positive values) that occur at regular
+     * periods.
+     *
+     * Excel Function:
+     *        IRR(values[,guess])
+     *
+     * @param mixed $values An array or a reference to cells that contain numbers for which you want
+     *                                    to calculate the internal rate of return.
+     *                                Values must contain at least one positive value and one negative value to
+     *                                    calculate the internal rate of return.
+     * @param mixed $guess A number that you guess is close to the result of IRR
+     */
+    public static function rate(mixed $values, mixed $guess = 0.1): string|float
+    {
+        if (!is_array($values)) {
+            return ExcelError::VALUE();
+        }
+        $values = Functions::flattenArray($values);
+        $guess = Functions::flattenSingleValue($guess);
+
+        // create an initial range, with a root somewhere between 0 and guess
+        $x1 = 0.0;
+        $x2 = $guess;
+        $f1 = self::presentValue($x1, $values);
+        $f2 = self::presentValue($x2, $values);
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            if (($f1 * $f2) < 0.0) {
+                break;
+            }
+            if (abs($f1) < abs($f2)) {
+                $f1 = self::presentValue($x1 += 1.6 * ($x1 - $x2), $values);
+            } else {
+                $f2 = self::presentValue($x2 += 1.6 * ($x2 - $x1), $values);
+            }
+        }
+        if (($f1 * $f2) > 0.0) {
+            return ExcelError::VALUE();
+        }
+
+        $f = self::presentValue($x1, $values);
+        if ($f < 0.0) {
+            $rtb = $x1;
+            $dx = $x2 - $x1;
+        } else {
+            $rtb = $x2;
+            $dx = $x1 - $x2;
+        }
+
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $dx *= 0.5;
+            $x_mid = $rtb + $dx;
+            $f_mid = self::presentValue($x_mid, $values);
+            if ($f_mid <= 0.0) {
+                $rtb = $x_mid;
+            }
+            if ((abs($f_mid) < self::FINANCIAL_PRECISION) || (abs($dx) < self::FINANCIAL_PRECISION)) {
+                return $x_mid;
+            }
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * MIRR.
+     *
+     * Returns the modified internal rate of return for a series of periodic cash flows. MIRR considers both
+     *        the cost of the investment and the interest received on reinvestment of cash.
+     *
+     * Excel Function:
+     *        MIRR(values,finance_rate, reinvestment_rate)
+     *
+     * @param mixed $values An array or a reference to cells that contain a series of payments and
+     *                         income occurring at regular intervals.
+     *                      Payments are negative value, income is positive values.
+     * @param mixed $financeRate The interest rate you pay on the money used in the cash flows
+     * @param mixed $reinvestmentRate The interest rate you receive on the cash flows as you reinvest them
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function modifiedRate(mixed $values, mixed $financeRate, mixed $reinvestmentRate): string|float
+    {
+        if (!is_array($values)) {
+            return ExcelError::DIV0();
+        }
+        $values = Functions::flattenArray($values);
+        $financeRate = Functions::flattenSingleValue($financeRate);
+        $reinvestmentRate = Functions::flattenSingleValue($reinvestmentRate);
+        $n = count($values);
+
+        $rr = 1.0 + $reinvestmentRate;
+        $fr = 1.0 + $financeRate;
+
+        $npvPos = $npvNeg = 0.0;
+        foreach ($values as $i => $v) {
+            if ($v >= 0) {
+                $npvPos += $v / $rr ** $i;
+            } else {
+                $npvNeg += $v / $fr ** $i;
+            }
+        }
+
+        if ($npvNeg === 0.0 || $npvPos === 0.0) {
+            return ExcelError::DIV0();
+        }
+
+        $mirr = ((-$npvPos * $rr ** $n)
+                / ($npvNeg * ($rr))) ** (1.0 / ($n - 1)) - 1.0;
+
+        return is_finite($mirr) ? $mirr : ExcelError::NAN();
+    }
+
+    /**
+     * NPV.
+     *
+     * Returns the Net Present Value of a cash flow series given a discount rate.
+     *
+     * @param array $args
+     */
+    public static function presentValue(mixed $rate, ...$args): int|float
+    {
+        $returnValue = 0;
+
+        $rate = Functions::flattenSingleValue($rate);
+        $aArgs = Functions::flattenArray($args);
+
+        // Calculate
+        $countArgs = count($aArgs);
+        for ($i = 1; $i <= $countArgs; ++$i) {
+            // Is it a numeric value?
+            if (is_numeric($aArgs[$i - 1])) {
+                $returnValue += $aArgs[$i - 1] / (1 + $rate) ** $i;
+            }
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Constants.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Constants.php
new file mode 100644
index 00000000..17740b0a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Constants.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+class Constants
+{
+    public const BASIS_DAYS_PER_YEAR_NASD = 0;
+    public const BASIS_DAYS_PER_YEAR_ACTUAL = 1;
+    public const BASIS_DAYS_PER_YEAR_360 = 2;
+    public const BASIS_DAYS_PER_YEAR_365 = 3;
+    public const BASIS_DAYS_PER_YEAR_360_EUROPEAN = 4;
+
+    public const FREQUENCY_ANNUAL = 1;
+    public const FREQUENCY_SEMI_ANNUAL = 2;
+    public const FREQUENCY_QUARTERLY = 4;
+
+    public const PAYMENT_END_OF_PERIOD = 0;
+    public const PAYMENT_BEGINNING_OF_PERIOD = 1;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php
new file mode 100644
index 00000000..c2fcab39
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php
@@ -0,0 +1,407 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+
+class Coupons
+{
+    private const PERIOD_DATE_PREVIOUS = false;
+    private const PERIOD_DATE_NEXT = true;
+
+    /**
+     * COUPDAYBS.
+     *
+     * Returns the number of days from the beginning of the coupon period to the settlement date.
+     *
+     * Excel Function:
+     *        COUPDAYBS(settlement,maturity,frequency[,basis])
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue
+     *                                  date when the security is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $frequency The number of coupon payments per year (int).
+     *                             Valid frequency values are:
+     *                               1    Annual
+     *                               2    Semi-Annual
+     *                               4    Quarterly
+     * @param mixed $basis The type of day count to use (int).
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     */
+    public static function COUPDAYBS(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|int|float {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        if (is_string($daysPerYear)) {
+            return ExcelError::VALUE();
+        }
+        $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_PREVIOUS);
+
+        if ($basis === FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL) {
+            return abs((float) DateTimeExcel\Days::between($prev, $settlement));
+        }
+
+        return (float) DateTimeExcel\YearFrac::fraction($prev, $settlement, $basis) * $daysPerYear;
+    }
+
+    /**
+     * COUPDAYS.
+     *
+     * Returns the number of days in the coupon period that contains the settlement date.
+     *
+     * Excel Function:
+     *        COUPDAYS(settlement,maturity,frequency[,basis])
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue
+     *                                  date when the security is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $frequency The number of coupon payments per year.
+     *                             Valid frequency values are:
+     *                               1    Annual
+     *                               2    Semi-Annual
+     *                               4    Quarterly
+     * @param mixed $basis The type of day count to use (int).
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     */
+    public static function COUPDAYS(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|int|float {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        switch ($basis) {
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_365:
+                // Actual/365
+                return 365 / $frequency;
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL:
+                // Actual/actual
+                if ($frequency == FinancialConstants::FREQUENCY_ANNUAL) {
+                    $daysPerYear = (int) Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+
+                    return $daysPerYear / $frequency;
+                }
+                $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_PREVIOUS);
+                $next = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_NEXT);
+
+                return $next - $prev;
+            default:
+                // US (NASD) 30/360, Actual/360 or European 30/360
+                return 360 / $frequency;
+        }
+    }
+
+    /**
+     * COUPDAYSNC.
+     *
+     * Returns the number of days from the settlement date to the next coupon date.
+     *
+     * Excel Function:
+     *        COUPDAYSNC(settlement,maturity,frequency[,basis])
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue
+     *                                  date when the security is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $frequency The number of coupon payments per year.
+     *                             Valid frequency values are:
+     *                               1    Annual
+     *                               2    Semi-Annual
+     *                               4    Quarterly
+     * @param mixed $basis The type of day count to use (int) .
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     */
+    public static function COUPDAYSNC(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            $basis = FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        /** @var int $daysPerYear */
+        $daysPerYear = Helpers::daysPerYear(Functions::Scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        $next = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_NEXT);
+
+        if ($basis === FinancialConstants::BASIS_DAYS_PER_YEAR_NASD) {
+            $settlementDate = Date::excelToDateTimeObject($settlement);
+            $settlementEoM = Helpers::isLastDayOfMonth($settlementDate);
+            if ($settlementEoM) {
+                ++$settlement;
+            }
+        }
+
+        return (float) DateTimeExcel\YearFrac::fraction($settlement, $next, $basis) * $daysPerYear;
+    }
+
+    /**
+     * COUPNCD.
+     *
+     * Returns the next coupon date after the settlement date.
+     *
+     * Excel Function:
+     *        COUPNCD(settlement,maturity,frequency[,basis])
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue
+     *                                  date when the security is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $frequency The number of coupon payments per year.
+     *                             Valid frequency values are:
+     *                               1    Annual
+     *                               2    Semi-Annual
+     *                               4    Quarterly
+     * @param mixed $basis The type of day count to use (int).
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     *
+     * @return float|string Excel date/time serial value or error message
+     */
+    public static function COUPNCD(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_NEXT);
+    }
+
+    /**
+     * COUPNUM.
+     *
+     * Returns the number of coupons payable between the settlement date and maturity date,
+     * rounded up to the nearest whole coupon.
+     *
+     * Excel Function:
+     *        COUPNUM(settlement,maturity,frequency[,basis])
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue
+     *                                  date when the security is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $frequency The number of coupon payments per year.
+     *                             Valid frequency values are:
+     *                               1    Annual
+     *                               2    Semi-Annual
+     *                               4    Quarterly
+     * @param mixed $basis The type of day count to use (int).
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     */
+    public static function COUPNUM(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|int {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $yearsBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction(
+            $settlement,
+            $maturity,
+            FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+        );
+
+        return (int) ceil((float) $yearsBetweenSettlementAndMaturity * $frequency);
+    }
+
+    /**
+     * COUPPCD.
+     *
+     * Returns the previous coupon date before the settlement date.
+     *
+     * Excel Function:
+     *        COUPPCD(settlement,maturity,frequency[,basis])
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue
+     *                              date when the security is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $frequency The number of coupon payments per year.
+     *                             Valid frequency values are:
+     *                               1    Annual
+     *                               2    Semi-Annual
+     *                               4    Quarterly
+     * @param mixed $basis The type of day count to use (int).
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     *
+     * @return float|string Excel date/time serial value or error message
+     */
+    public static function COUPPCD(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            self::validateCouponPeriod($settlement, $maturity);
+            $frequency = FinancialValidations::validateFrequency($frequency);
+            FinancialValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_PREVIOUS);
+    }
+
+    private static function monthsDiff(DateTime $result, int $months, string $plusOrMinus, int $day, bool $lastDayFlag): void
+    {
+        $result->setDate((int) $result->format('Y'), (int) $result->format('m'), 1);
+        $result->modify("$plusOrMinus $months months");
+        $daysInMonth = (int) $result->format('t');
+        $result->setDate((int) $result->format('Y'), (int) $result->format('m'), $lastDayFlag ? $daysInMonth : min($day, $daysInMonth));
+    }
+
+    private static function couponFirstPeriodDate(float $settlement, float $maturity, int $frequency, bool $next): float
+    {
+        $months = 12 / $frequency;
+
+        $result = Date::excelToDateTimeObject($maturity);
+        $day = (int) $result->format('d');
+        $lastDayFlag = Helpers::isLastDayOfMonth($result);
+
+        while ($settlement < Date::PHPToExcel($result)) {
+            self::monthsDiff($result, $months, '-', $day, $lastDayFlag);
+        }
+        if ($next === true) {
+            self::monthsDiff($result, $months, '+', $day, $lastDayFlag);
+        }
+
+        return (float) Date::PHPToExcel($result);
+    }
+
+    private static function validateCouponPeriod(float $settlement, float $maturity): void
+    {
+        if ($settlement >= $maturity) {
+            throw new Exception(ExcelError::NAN());
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
new file mode 100644
index 00000000..6ef18999
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
@@ -0,0 +1,265 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Depreciation
+{
+    private static float $zeroPointZero = 0.0;
+
+    /**
+     * DB.
+     *
+     * Returns the depreciation of an asset for a specified period using the
+     * fixed-declining balance method.
+     * This form of depreciation is used if you want to get a higher depreciation value
+     * at the beginning of the depreciation (as opposed to linear depreciation). The
+     * depreciation value is reduced with every depreciation period by the depreciation
+     * already deducted from the initial cost.
+     *
+     * Excel Function:
+     *        DB(cost,salvage,life,period[,month])
+     *
+     * @param mixed $cost Initial cost of the asset
+     * @param mixed $salvage Value at the end of the depreciation.
+     *                             (Sometimes called the salvage value of the asset)
+     * @param mixed $life Number of periods over which the asset is depreciated.
+     *                           (Sometimes called the useful life of the asset)
+     * @param mixed $period The period for which you want to calculate the
+     *                          depreciation. Period must use the same units as life.
+     * @param mixed $month Number of months in the first year. If month is omitted,
+     *                         it defaults to 12.
+     */
+    public static function DB(mixed $cost, mixed $salvage, mixed $life, mixed $period, mixed $month = 12): string|float|int
+    {
+        $cost = Functions::flattenSingleValue($cost);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $life = Functions::flattenSingleValue($life);
+        $period = Functions::flattenSingleValue($period);
+        $month = Functions::flattenSingleValue($month);
+
+        try {
+            $cost = self::validateCost($cost);
+            $salvage = self::validateSalvage($salvage);
+            $life = self::validateLife($life);
+            $period = self::validatePeriod($period);
+            $month = self::validateMonth($month);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($cost === self::$zeroPointZero) {
+            return 0.0;
+        }
+
+        //    Set Fixed Depreciation Rate
+        $fixedDepreciationRate = 1 - ($salvage / $cost) ** (1 / $life);
+        $fixedDepreciationRate = round($fixedDepreciationRate, 3);
+
+        //    Loop through each period calculating the depreciation
+        // TODO Handle period value between 0 and 1 (e.g. 0.5)
+        $previousDepreciation = 0;
+        $depreciation = 0;
+        for ($per = 1; $per <= $period; ++$per) {
+            if ($per == 1) {
+                $depreciation = $cost * $fixedDepreciationRate * $month / 12;
+            } elseif ($per == ($life + 1)) {
+                $depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate * (12 - $month) / 12;
+            } else {
+                $depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate;
+            }
+            $previousDepreciation += $depreciation;
+        }
+
+        return $depreciation;
+    }
+
+    /**
+     * DDB.
+     *
+     * Returns the depreciation of an asset for a specified period using the
+     * double-declining balance method or some other method you specify.
+     *
+     * Excel Function:
+     *        DDB(cost,salvage,life,period[,factor])
+     *
+     * @param mixed $cost Initial cost of the asset
+     * @param mixed $salvage Value at the end of the depreciation.
+     *                                (Sometimes called the salvage value of the asset)
+     * @param mixed $life Number of periods over which the asset is depreciated.
+     *                                (Sometimes called the useful life of the asset)
+     * @param mixed $period The period for which you want to calculate the
+     *                                depreciation. Period must use the same units as life.
+     * @param mixed $factor The rate at which the balance declines.
+     *                                If factor is omitted, it is assumed to be 2 (the
+     *                                double-declining balance method).
+     */
+    public static function DDB(mixed $cost, mixed $salvage, mixed $life, mixed $period, mixed $factor = 2.0): float|string
+    {
+        $cost = Functions::flattenSingleValue($cost);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $life = Functions::flattenSingleValue($life);
+        $period = Functions::flattenSingleValue($period);
+        $factor = Functions::flattenSingleValue($factor);
+
+        try {
+            $cost = self::validateCost($cost);
+            $salvage = self::validateSalvage($salvage);
+            $life = self::validateLife($life);
+            $period = self::validatePeriod($period);
+            $factor = self::validateFactor($factor);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($period > $life) {
+            return ExcelError::NAN();
+        }
+
+        // Loop through each period calculating the depreciation
+        // TODO Handling for fractional $period values
+        $previousDepreciation = 0;
+        $depreciation = 0;
+        for ($per = 1; $per <= $period; ++$per) {
+            $depreciation = min(
+                ($cost - $previousDepreciation) * ($factor / $life),
+                ($cost - $salvage - $previousDepreciation)
+            );
+            $previousDepreciation += $depreciation;
+        }
+
+        return $depreciation;
+    }
+
+    /**
+     * SLN.
+     *
+     * Returns the straight-line depreciation of an asset for one period
+     *
+     * @param mixed $cost Initial cost of the asset
+     * @param mixed $salvage Value at the end of the depreciation
+     * @param mixed $life Number of periods over which the asset is depreciated
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function SLN(mixed $cost, mixed $salvage, mixed $life): string|float
+    {
+        $cost = Functions::flattenSingleValue($cost);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $life = Functions::flattenSingleValue($life);
+
+        try {
+            $cost = self::validateCost($cost, true);
+            $salvage = self::validateSalvage($salvage, true);
+            $life = self::validateLife($life, true);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($life === self::$zeroPointZero) {
+            return ExcelError::DIV0();
+        }
+
+        return ($cost - $salvage) / $life;
+    }
+
+    /**
+     * SYD.
+     *
+     * Returns the sum-of-years' digits depreciation of an asset for a specified period.
+     *
+     * @param mixed $cost Initial cost of the asset
+     * @param mixed $salvage Value at the end of the depreciation
+     * @param mixed $life Number of periods over which the asset is depreciated
+     * @param mixed $period Period
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function SYD(mixed $cost, mixed $salvage, mixed $life, mixed $period): string|float
+    {
+        $cost = Functions::flattenSingleValue($cost);
+        $salvage = Functions::flattenSingleValue($salvage);
+        $life = Functions::flattenSingleValue($life);
+        $period = Functions::flattenSingleValue($period);
+
+        try {
+            $cost = self::validateCost($cost, true);
+            $salvage = self::validateSalvage($salvage);
+            $life = self::validateLife($life);
+            $period = self::validatePeriod($period);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($period > $life) {
+            return ExcelError::NAN();
+        }
+
+        $syd = (($cost - $salvage) * ($life - $period + 1) * 2) / ($life * ($life + 1));
+
+        return $syd;
+    }
+
+    private static function validateCost(mixed $cost, bool $negativeValueAllowed = false): float
+    {
+        $cost = FinancialValidations::validateFloat($cost);
+        if ($cost < 0.0 && $negativeValueAllowed === false) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $cost;
+    }
+
+    private static function validateSalvage(mixed $salvage, bool $negativeValueAllowed = false): float
+    {
+        $salvage = FinancialValidations::validateFloat($salvage);
+        if ($salvage < 0.0 && $negativeValueAllowed === false) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $salvage;
+    }
+
+    private static function validateLife(mixed $life, bool $negativeValueAllowed = false): float
+    {
+        $life = FinancialValidations::validateFloat($life);
+        if ($life < 0.0 && $negativeValueAllowed === false) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $life;
+    }
+
+    private static function validatePeriod(mixed $period, bool $negativeValueAllowed = false): float
+    {
+        $period = FinancialValidations::validateFloat($period);
+        if ($period <= 0.0 && $negativeValueAllowed === false) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $period;
+    }
+
+    private static function validateMonth(mixed $month): int
+    {
+        $month = FinancialValidations::validateInt($month);
+        if ($month < 1) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $month;
+    }
+
+    private static function validateFactor(mixed $factor): float
+    {
+        $factor = FinancialValidations::validateFloat($factor);
+        if ($factor <= 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $factor;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php
new file mode 100644
index 00000000..b0581f66
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\TextData\Format;
+
+class Dollar
+{
+    use ArrayEnabled;
+
+    /**
+     * DOLLAR.
+     *
+     * This function converts a number to text using currency format, with the decimals rounded to the specified place.
+     * The format used is $#,##0.00_);($#,##0.00)..
+     *
+     * @param mixed $number The value to format, or can be an array of numbers
+     *                         Or can be an array of values
+     * @param mixed $precision The number of digits to display to the right of the decimal point (as an integer).
+     *                            If precision is negative, number is rounded to the left of the decimal point.
+     *                            If you omit precision, it is assumed to be 2
+     *              Or can be an array of precision values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function format(mixed $number, mixed $precision = 2)
+    {
+        return Format::DOLLAR($number, $precision);
+    }
+
+    /**
+     * DOLLARDE.
+     *
+     * Converts a dollar price expressed as an integer part and a fraction
+     *        part into a dollar price expressed as a decimal number.
+     * Fractional dollar numbers are sometimes used for security prices.
+     *
+     * Excel Function:
+     *        DOLLARDE(fractional_dollar,fraction)
+     *
+     * @param mixed $fractionalDollar Fractional Dollar
+     *              Or can be an array of values
+     * @param mixed $fraction Fraction
+     *              Or can be an array of values
+     */
+    public static function decimal(mixed $fractionalDollar = null, mixed $fraction = 0): array|string|float
+    {
+        if (is_array($fractionalDollar) || is_array($fraction)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $fractionalDollar, $fraction);
+        }
+
+        try {
+            $fractionalDollar = FinancialValidations::validateFloat(
+                Functions::flattenSingleValue($fractionalDollar) ?? 0.0
+            );
+            $fraction = FinancialValidations::validateInt(Functions::flattenSingleValue($fraction));
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Additional parameter validations
+        if ($fraction < 0) {
+            return ExcelError::NAN();
+        }
+        if ($fraction == 0) {
+            return ExcelError::DIV0();
+        }
+
+        $dollars = ($fractionalDollar < 0) ? ceil($fractionalDollar) : floor($fractionalDollar);
+        $cents = fmod($fractionalDollar, 1.0);
+        $cents /= $fraction;
+        $cents *= 10 ** ceil(log10($fraction));
+
+        return $dollars + $cents;
+    }
+
+    /**
+     * DOLLARFR.
+     *
+     * Converts a dollar price expressed as a decimal number into a dollar price
+     *        expressed as a fraction.
+     * Fractional dollar numbers are sometimes used for security prices.
+     *
+     * Excel Function:
+     *        DOLLARFR(decimal_dollar,fraction)
+     *
+     * @param mixed $decimalDollar Decimal Dollar
+     *              Or can be an array of values
+     * @param mixed $fraction Fraction
+     *              Or can be an array of values
+     */
+    public static function fractional(mixed $decimalDollar = null, mixed $fraction = 0): array|string|float
+    {
+        if (is_array($decimalDollar) || is_array($fraction)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $decimalDollar, $fraction);
+        }
+
+        try {
+            $decimalDollar = FinancialValidations::validateFloat(
+                Functions::flattenSingleValue($decimalDollar) ?? 0.0
+            );
+            $fraction = FinancialValidations::validateInt(Functions::flattenSingleValue($fraction));
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Additional parameter validations
+        if ($fraction < 0) {
+            return ExcelError::NAN();
+        }
+        if ($fraction == 0) {
+            return ExcelError::DIV0();
+        }
+
+        $dollars = ($decimalDollar < 0.0) ? ceil($decimalDollar) : floor($decimalDollar);
+        $cents = fmod($decimalDollar, 1);
+        $cents *= $fraction;
+        $cents *= 10 ** (-ceil(log10($fraction)));
+
+        return $dollars + $cents;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php
new file mode 100644
index 00000000..e596fc30
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class FinancialValidations
+{
+    public static function validateDate(mixed $date): float
+    {
+        return DateTimeExcel\Helpers::getDateValue($date);
+    }
+
+    public static function validateSettlementDate(mixed $settlement): float
+    {
+        return self::validateDate($settlement);
+    }
+
+    public static function validateMaturityDate(mixed $maturity): float
+    {
+        return self::validateDate($maturity);
+    }
+
+    public static function validateFloat(mixed $value): float
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    public static function validateInt(mixed $value): int
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) floor((float) $value);
+    }
+
+    public static function validateRate(mixed $rate): float
+    {
+        $rate = self::validateFloat($rate);
+        if ($rate < 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $rate;
+    }
+
+    public static function validateFrequency(mixed $frequency): int
+    {
+        $frequency = self::validateInt($frequency);
+        if (
+            ($frequency !== FinancialConstants::FREQUENCY_ANNUAL)
+            && ($frequency !== FinancialConstants::FREQUENCY_SEMI_ANNUAL)
+            && ($frequency !== FinancialConstants::FREQUENCY_QUARTERLY)
+        ) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $frequency;
+    }
+
+    public static function validateBasis(mixed $basis): int
+    {
+        if (!is_numeric($basis)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        $basis = (int) $basis;
+        if (($basis < 0) || ($basis > 4)) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $basis;
+    }
+
+    public static function validatePrice(mixed $price): float
+    {
+        $price = self::validateFloat($price);
+        if ($price < 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $price;
+    }
+
+    public static function validateParValue(mixed $parValue): float
+    {
+        $parValue = self::validateFloat($parValue);
+        if ($parValue < 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $parValue;
+    }
+
+    public static function validateYield(mixed $yield): float
+    {
+        $yield = self::validateFloat($yield);
+        if ($yield < 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $yield;
+    }
+
+    public static function validateDiscount(mixed $discount): float
+    {
+        $discount = self::validateFloat($discount);
+        if ($discount <= 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $discount;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php
new file mode 100644
index 00000000..aa287129
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Helpers
+{
+    /**
+     * daysPerYear.
+     *
+     * Returns the number of days in a specified year, as defined by the "basis" value
+     *
+     * @param int|string $year The year against which we're testing
+     * @param int|string $basis The type of day count:
+     *                              0 or omitted US (NASD)   360
+     *                              1                        Actual (365 or 366 in a leap year)
+     *                              2                        360
+     *                              3                        365
+     *                              4                        European 360
+     *
+     * @return int|string Result, or a string containing an error
+     */
+    public static function daysPerYear($year, $basis = 0): string|int
+    {
+        if (!is_numeric($basis)) {
+            return ExcelError::NAN();
+        }
+
+        switch ($basis) {
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_NASD:
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_360:
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_360_EUROPEAN:
+                return 360;
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_365:
+                return 365;
+            case FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL:
+                return (DateTimeExcel\Helpers::isLeapYear($year)) ? 366 : 365;
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * isLastDayOfMonth.
+     *
+     * Returns a boolean TRUE/FALSE indicating if this date is the last date of the month
+     *
+     * @param DateTimeInterface $date The date for testing
+     */
+    public static function isLastDayOfMonth(DateTimeInterface $date): bool
+    {
+        return $date->format('d') === $date->format('t');
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php
new file mode 100644
index 00000000..2916df6b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class InterestRate
+{
+    /**
+     * EFFECT.
+     *
+     * Returns the effective interest rate given the nominal rate and the number of
+     *        compounding payments per year.
+     *
+     * Excel Function:
+     *        EFFECT(nominal_rate,npery)
+     *
+     * @param mixed $nominalRate Nominal interest rate as a float
+     * @param mixed $periodsPerYear Integer number of compounding payments per year
+     */
+    public static function effective(mixed $nominalRate = 0, mixed $periodsPerYear = 0): string|float
+    {
+        $nominalRate = Functions::flattenSingleValue($nominalRate);
+        $periodsPerYear = Functions::flattenSingleValue($periodsPerYear);
+
+        try {
+            $nominalRate = FinancialValidations::validateFloat($nominalRate);
+            $periodsPerYear = FinancialValidations::validateInt($periodsPerYear);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($nominalRate <= 0 || $periodsPerYear < 1) {
+            return ExcelError::NAN();
+        }
+
+        return ((1 + $nominalRate / $periodsPerYear) ** $periodsPerYear) - 1;
+    }
+
+    /**
+     * NOMINAL.
+     *
+     * Returns the nominal interest rate given the effective rate and the number of compounding payments per year.
+     *
+     * @param mixed $effectiveRate Effective interest rate as a float
+     * @param mixed $periodsPerYear Integer number of compounding payments per year
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function nominal(mixed $effectiveRate = 0, mixed $periodsPerYear = 0): string|float
+    {
+        $effectiveRate = Functions::flattenSingleValue($effectiveRate);
+        $periodsPerYear = Functions::flattenSingleValue($periodsPerYear);
+
+        try {
+            $effectiveRate = FinancialValidations::validateFloat($effectiveRate);
+            $periodsPerYear = FinancialValidations::validateInt($periodsPerYear);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($effectiveRate <= 0 || $periodsPerYear < 1) {
+            return ExcelError::NAN();
+        }
+
+        // Calculate
+        return $periodsPerYear * (($effectiveRate + 1) ** (1 / $periodsPerYear) - 1);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php
new file mode 100644
index 00000000..eb57abfc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel\YearFrac;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class AccruedInterest
+{
+    public const ACCRINT_CALCMODE_ISSUE_TO_SETTLEMENT = true;
+
+    public const ACCRINT_CALCMODE_FIRST_INTEREST_TO_SETTLEMENT = false;
+
+    /**
+     * ACCRINT.
+     *
+     * Returns the accrued interest for a security that pays periodic interest.
+     *
+     * Excel Function:
+     *        ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis][,calc_method])
+     *
+     * @param mixed $issue the security's issue date
+     * @param mixed $firstInterest the security's first interest date
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue date
+     *                                  when the security is traded to the buyer.
+     * @param mixed $rate The security's annual coupon rate
+     * @param mixed $parValue The security's par value.
+     *                            If you omit par, ACCRINT uses $1,000.
+     * @param mixed $frequency The number of coupon payments per year.
+     *                             Valid frequency values are:
+     *                               1    Annual
+     *                               2    Semi-Annual
+     *                               4    Quarterly
+     * @param mixed $basis The type of day count to use.
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     * @param mixed $calcMethod Unused by PhpSpreadsheet, and apparently by Excel (https://exceljet.net/functions/accrint-function)
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function periodic(
+        mixed $issue,
+        mixed $firstInterest,
+        mixed $settlement,
+        mixed $rate,
+        mixed $parValue = 1000,
+        mixed $frequency = FinancialConstants::FREQUENCY_ANNUAL,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD,
+        mixed $calcMethod = self::ACCRINT_CALCMODE_ISSUE_TO_SETTLEMENT
+    ) {
+        $issue = Functions::flattenSingleValue($issue);
+        $firstInterest = Functions::flattenSingleValue($firstInterest);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $rate = Functions::flattenSingleValue($rate);
+        $parValue = ($parValue === null) ? 1000 : Functions::flattenSingleValue($parValue);
+        $frequency = ($frequency === null)
+            ? FinancialConstants::FREQUENCY_ANNUAL
+            : Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $issue = SecurityValidations::validateIssueDate($issue);
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            SecurityValidations::validateSecurityPeriod($issue, $settlement);
+            $rate = SecurityValidations::validateRate($rate);
+            $parValue = SecurityValidations::validateParValue($parValue);
+            SecurityValidations::validateFrequency($frequency);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysBetweenIssueAndSettlement = Functions::scalar(YearFrac::fraction($issue, $settlement, $basis));
+        if (!is_numeric($daysBetweenIssueAndSettlement)) {
+            //    return date error
+            return $daysBetweenIssueAndSettlement;
+        }
+        $daysBetweenFirstInterestAndSettlement = Functions::scalar(YearFrac::fraction($firstInterest, $settlement, $basis));
+        if (!is_numeric($daysBetweenFirstInterestAndSettlement)) {
+            //    return date error
+            return $daysBetweenFirstInterestAndSettlement;
+        }
+
+        return $parValue * $rate * $daysBetweenIssueAndSettlement;
+    }
+
+    /**
+     * ACCRINTM.
+     *
+     * Returns the accrued interest for a security that pays interest at maturity.
+     *
+     * Excel Function:
+     *        ACCRINTM(issue,settlement,rate[,par[,basis]])
+     *
+     * @param mixed $issue The security's issue date
+     * @param mixed $settlement The security's settlement (or maturity) date
+     * @param mixed $rate The security's annual coupon rate
+     * @param mixed $parValue The security's par value.
+     *                            If you omit parValue, ACCRINT uses $1,000.
+     * @param mixed $basis The type of day count to use.
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function atMaturity(
+        mixed $issue,
+        mixed $settlement,
+        mixed $rate,
+        mixed $parValue = 1000,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $issue = Functions::flattenSingleValue($issue);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $rate = Functions::flattenSingleValue($rate);
+        $parValue = ($parValue === null) ? 1000 : Functions::flattenSingleValue($parValue);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $issue = SecurityValidations::validateIssueDate($issue);
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            SecurityValidations::validateSecurityPeriod($issue, $settlement);
+            $rate = SecurityValidations::validateRate($rate);
+            $parValue = SecurityValidations::validateParValue($parValue);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysBetweenIssueAndSettlement = Functions::scalar(YearFrac::fraction($issue, $settlement, $basis));
+        if (!is_numeric($daysBetweenIssueAndSettlement)) {
+            //    return date error
+            return $daysBetweenIssueAndSettlement;
+        }
+
+        return $parValue * $rate * $daysBetweenIssueAndSettlement;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php
new file mode 100644
index 00000000..b07b2c9f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php
@@ -0,0 +1,283 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Coupons;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Helpers;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Price
+{
+    /**
+     * PRICE.
+     *
+     * Returns the price per $100 face value of a security that pays periodic interest.
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue date when the security
+     *                              is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param mixed $rate the security's annual coupon rate
+     * @param mixed $yield the security's annual yield
+     * @param mixed $redemption The number of coupon payments per year.
+     *                              For annual payments, frequency = 1;
+     *                              for semiannual, frequency = 2;
+     *                              for quarterly, frequency = 4.
+     * @param mixed $basis The type of day count to use.
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function price(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $rate,
+        mixed $yield,
+        mixed $redemption,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $rate = Functions::flattenSingleValue($rate);
+        $yield = Functions::flattenSingleValue($yield);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $frequency = Functions::flattenSingleValue($frequency);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $rate = SecurityValidations::validateRate($rate);
+            $yield = SecurityValidations::validateYield($yield);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $frequency = SecurityValidations::validateFrequency($frequency);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $dsc = (float) Coupons::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
+        $e = (float) Coupons::COUPDAYS($settlement, $maturity, $frequency, $basis);
+        $n = (int) Coupons::COUPNUM($settlement, $maturity, $frequency, $basis);
+        $a = (float) Coupons::COUPDAYBS($settlement, $maturity, $frequency, $basis);
+
+        $baseYF = 1.0 + ($yield / $frequency);
+        $rfp = 100 * ($rate / $frequency);
+        $de = $dsc / $e;
+
+        $result = $redemption / $baseYF ** (--$n + $de);
+        for ($k = 0; $k <= $n; ++$k) {
+            $result += $rfp / ($baseYF ** ($k + $de));
+        }
+        $result -= $rfp * ($a / $e);
+
+        return $result;
+    }
+
+    /**
+     * PRICEDISC.
+     *
+     * Returns the price per $100 face value of a discounted security.
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue date when the security
+     *                              is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param mixed $discount The security's discount rate
+     * @param mixed $redemption The security's redemption value per $100 face value
+     * @param mixed $basis The type of day count to use.
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function priceDiscounted(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $discount,
+        mixed $redemption,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $discount = Functions::flattenSingleValue($discount);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $discount = SecurityValidations::validateDiscount($discount);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+
+        return $redemption * (1 - $discount * $daysBetweenSettlementAndMaturity);
+    }
+
+    /**
+     * PRICEMAT.
+     *
+     * Returns the price per $100 face value of a security that pays interest at maturity.
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security's settlement date is the date after the issue date when the
+     *                              security is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                                The maturity date is the date when the security expires.
+     * @param mixed $issue The security's issue date
+     * @param mixed $rate The security's interest rate at date of issue
+     * @param mixed $yield The security's annual yield
+     * @param mixed $basis The type of day count to use.
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function priceAtMaturity(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $issue,
+        mixed $rate,
+        mixed $yield,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $issue = Functions::flattenSingleValue($issue);
+        $rate = Functions::flattenSingleValue($rate);
+        $yield = Functions::flattenSingleValue($yield);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $issue = SecurityValidations::validateIssueDate($issue);
+            $rate = SecurityValidations::validateRate($rate);
+            $yield = SecurityValidations::validateYield($yield);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        if (!is_numeric($daysPerYear)) {
+            return $daysPerYear;
+        }
+        $daysBetweenIssueAndSettlement = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $settlement, $basis));
+        if (!is_numeric($daysBetweenIssueAndSettlement)) {
+            //    return date error
+            return $daysBetweenIssueAndSettlement;
+        }
+        $daysBetweenIssueAndSettlement *= $daysPerYear;
+        $daysBetweenIssueAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $maturity, $basis));
+        if (!is_numeric($daysBetweenIssueAndMaturity)) {
+            //    return date error
+            return $daysBetweenIssueAndMaturity;
+        }
+        $daysBetweenIssueAndMaturity *= $daysPerYear;
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+        $daysBetweenSettlementAndMaturity *= $daysPerYear;
+
+        return (100 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate * 100))
+            / (1 + (($daysBetweenSettlementAndMaturity / $daysPerYear) * $yield))
+            - (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate * 100);
+    }
+
+    /**
+     * RECEIVED.
+     *
+     * Returns the amount received at maturity for a fully invested Security.
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue date when the security
+     *                                  is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $investment The amount invested in the security
+     * @param mixed $discount The security's discount rate
+     * @param mixed $basis The type of day count to use.
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function received(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $investment,
+        mixed $discount,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $investment = Functions::flattenSingleValue($investment);
+        $discount = Functions::flattenSingleValue($discount);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $investment = SecurityValidations::validateFloat($investment);
+            $discount = SecurityValidations::validateDiscount($discount);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($investment <= 0) {
+            return ExcelError::NAN();
+        }
+        $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return Functions::scalar($daysBetweenSettlementAndMaturity);
+        }
+
+        return $investment / (1 - ($discount * $daysBetweenSettlementAndMaturity));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php
new file mode 100644
index 00000000..2989a29b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Rates
+{
+    /**
+     * DISC.
+     *
+     * Returns the discount rate for a security.
+     *
+     * Excel Function:
+     *        DISC(settlement,maturity,price,redemption[,basis])
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue
+     *                                  date when the security is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $price The security's price per $100 face value
+     * @param mixed $redemption The security's redemption value per $100 face value
+     * @param mixed $basis The type of day count to use.
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     */
+    public static function discount(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $price,
+        mixed $redemption,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): float|string {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $price = Functions::flattenSingleValue($price);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $price = SecurityValidations::validatePrice($price);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($price <= 0.0) {
+            return ExcelError::NAN();
+        }
+
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+
+        return (1 - $price / $redemption) / $daysBetweenSettlementAndMaturity;
+    }
+
+    /**
+     * INTRATE.
+     *
+     * Returns the interest rate for a fully invested security.
+     *
+     * Excel Function:
+     *        INTRATE(settlement,maturity,investment,redemption[,basis])
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security settlement date is the date after the issue date when the security
+     *                                  is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $investment the amount invested in the security
+     * @param mixed $redemption the amount to be received at maturity
+     * @param mixed $basis The type of day count to use.
+     *                         0 or omitted    US (NASD) 30/360
+     *                         1               Actual/actual
+     *                         2               Actual/360
+     *                         3               Actual/365
+     *                         4               European 30/360
+     */
+    public static function interest(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $investment,
+        mixed $redemption,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): float|string {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $investment = Functions::flattenSingleValue($investment);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $investment = SecurityValidations::validateFloat($investment);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($investment <= 0) {
+            return ExcelError::NAN();
+        }
+
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+
+        return (($redemption / $investment) - 1) / ($daysBetweenSettlementAndMaturity);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php
new file mode 100644
index 00000000..a0804cb8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\FinancialValidations;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class SecurityValidations extends FinancialValidations
+{
+    public static function validateIssueDate(mixed $issue): float
+    {
+        return self::validateDate($issue);
+    }
+
+    public static function validateSecurityPeriod(mixed $settlement, mixed $maturity): void
+    {
+        if ($settlement >= $maturity) {
+            throw new Exception(ExcelError::NAN());
+        }
+    }
+
+    public static function validateRedemption(mixed $redemption): float
+    {
+        $redemption = self::validateFloat($redemption);
+        if ($redemption <= 0.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $redemption;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php
new file mode 100644
index 00000000..a4c5a48f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Helpers;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class Yields
+{
+    /**
+     * YIELDDISC.
+     *
+     * Returns the annual yield of a security that pays interest at maturity.
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security's settlement date is the date after the issue date when the security
+     *                              is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $price The security's price per $100 face value
+     * @param mixed $redemption The security's redemption value per $100 face value
+     * @param mixed $basis The type of day count to use.
+     *                       0 or omitted    US (NASD) 30/360
+     *                       1               Actual/actual
+     *                       2               Actual/360
+     *                       3               Actual/365
+     *                       4               European 30/360
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function yieldDiscounted(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $price,
+        mixed $redemption,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $price = Functions::flattenSingleValue($price);
+        $redemption = Functions::flattenSingleValue($redemption);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $price = SecurityValidations::validatePrice($price);
+            $redemption = SecurityValidations::validateRedemption($redemption);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        if (!is_numeric($daysPerYear)) {
+            return $daysPerYear;
+        }
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+        $daysBetweenSettlementAndMaturity *= $daysPerYear;
+
+        return (($redemption - $price) / $price) * ($daysPerYear / $daysBetweenSettlementAndMaturity);
+    }
+
+    /**
+     * YIELDMAT.
+     *
+     * Returns the annual yield of a security that pays interest at maturity.
+     *
+     * @param mixed $settlement The security's settlement date.
+     *                              The security's settlement date is the date after the issue date when the security
+     *                              is traded to the buyer.
+     * @param mixed $maturity The security's maturity date.
+     *                            The maturity date is the date when the security expires.
+     * @param mixed $issue The security's issue date
+     * @param mixed $rate The security's interest rate at date of issue
+     * @param mixed $price The security's price per $100 face value
+     * @param mixed $basis The type of day count to use.
+     *                       0 or omitted    US (NASD) 30/360
+     *                       1               Actual/actual
+     *                       2               Actual/360
+     *                       3               Actual/365
+     *                       4               European 30/360
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function yieldAtMaturity(
+        mixed $settlement,
+        mixed $maturity,
+        mixed $issue,
+        mixed $rate,
+        mixed $price,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ) {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $issue = Functions::flattenSingleValue($issue);
+        $rate = Functions::flattenSingleValue($rate);
+        $price = Functions::flattenSingleValue($price);
+        $basis = ($basis === null)
+            ? FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+            : Functions::flattenSingleValue($basis);
+
+        try {
+            $settlement = SecurityValidations::validateSettlementDate($settlement);
+            $maturity = SecurityValidations::validateMaturityDate($maturity);
+            SecurityValidations::validateSecurityPeriod($settlement, $maturity);
+            $issue = SecurityValidations::validateIssueDate($issue);
+            $rate = SecurityValidations::validateRate($rate);
+            $price = SecurityValidations::validatePrice($price);
+            $basis = SecurityValidations::validateBasis($basis);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
+        if (!is_numeric($daysPerYear)) {
+            return $daysPerYear;
+        }
+        $daysBetweenIssueAndSettlement = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $settlement, $basis));
+        if (!is_numeric($daysBetweenIssueAndSettlement)) {
+            //    return date error
+            return $daysBetweenIssueAndSettlement;
+        }
+        $daysBetweenIssueAndSettlement *= $daysPerYear;
+        $daysBetweenIssueAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $maturity, $basis));
+        if (!is_numeric($daysBetweenIssueAndMaturity)) {
+            //    return date error
+            return $daysBetweenIssueAndMaturity;
+        }
+        $daysBetweenIssueAndMaturity *= $daysPerYear;
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
+        if (!is_numeric($daysBetweenSettlementAndMaturity)) {
+            //    return date error
+            return $daysBetweenSettlementAndMaturity;
+        }
+        $daysBetweenSettlementAndMaturity *= $daysPerYear;
+
+        return ((1 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate)
+                    - (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate)))
+                / (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate)))
+            * ($daysPerYear / $daysBetweenSettlementAndMaturity);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php
new file mode 100644
index 00000000..699efcc6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
+
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class TreasuryBill
+{
+    /**
+     * TBILLEQ.
+     *
+     * Returns the bond-equivalent yield for a Treasury bill.
+     *
+     * @param mixed $settlement The Treasury bill's settlement date.
+     *                                The Treasury bill's settlement date is the date after the issue date
+     *                                    when the Treasury bill is traded to the buyer.
+     * @param mixed $maturity The Treasury bill's maturity date.
+     *                                The maturity date is the date when the Treasury bill expires.
+     * @param mixed $discount The Treasury bill's discount rate
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function bondEquivalentYield(mixed $settlement, mixed $maturity, mixed $discount): string|float
+    {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $discount = Functions::flattenSingleValue($discount);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            $discount = FinancialValidations::validateFloat($discount);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($discount <= 0) {
+            return ExcelError::NAN();
+        }
+
+        $daysBetweenSettlementAndMaturity = $maturity - $settlement;
+        $daysPerYear = Helpers::daysPerYear(
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
+            FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+        );
+
+        if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
+            return ExcelError::NAN();
+        }
+
+        return (365 * $discount) / (360 - $discount * $daysBetweenSettlementAndMaturity);
+    }
+
+    /**
+     * TBILLPRICE.
+     *
+     * Returns the price per $100 face value for a Treasury bill.
+     *
+     * @param mixed $settlement The Treasury bill's settlement date.
+     *                                The Treasury bill's settlement date is the date after the issue date
+     *                                    when the Treasury bill is traded to the buyer.
+     * @param mixed $maturity The Treasury bill's maturity date.
+     *                                The maturity date is the date when the Treasury bill expires.
+     * @param mixed $discount The Treasury bill's discount rate
+     *
+     * @return float|string Result, or a string containing an error
+     */
+    public static function price(mixed $settlement, mixed $maturity, mixed $discount): string|float
+    {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $discount = Functions::flattenSingleValue($discount);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            $discount = FinancialValidations::validateFloat($discount);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($discount <= 0) {
+            return ExcelError::NAN();
+        }
+
+        $daysBetweenSettlementAndMaturity = $maturity - $settlement;
+        $daysPerYear = Helpers::daysPerYear(
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
+            FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+        );
+
+        if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
+            return ExcelError::NAN();
+        }
+
+        $price = 100 * (1 - (($discount * $daysBetweenSettlementAndMaturity) / 360));
+        if ($price < 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return $price;
+    }
+
+    /**
+     * TBILLYIELD.
+     *
+     * Returns the yield for a Treasury bill.
+     *
+     * @param mixed $settlement The Treasury bill's settlement date.
+     *                                The Treasury bill's settlement date is the date after the issue date when
+     *                                    the Treasury bill is traded to the buyer.
+     * @param mixed $maturity The Treasury bill's maturity date.
+     *                                The maturity date is the date when the Treasury bill expires.
+     * @param float|string $price The Treasury bill's price per $100 face value
+     */
+    public static function yield(mixed $settlement, mixed $maturity, $price): string|float
+    {
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $price = Functions::flattenSingleValue($price);
+
+        try {
+            $settlement = FinancialValidations::validateSettlementDate($settlement);
+            $maturity = FinancialValidations::validateMaturityDate($maturity);
+            $price = FinancialValidations::validatePrice($price);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $daysBetweenSettlementAndMaturity = $maturity - $settlement;
+        $daysPerYear = Helpers::daysPerYear(
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
+            FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+        );
+
+        if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
+            return ExcelError::NAN();
+        }
+
+        return ((100 - $price) / $price) * (360 / $daysBetweenSettlementAndMaturity);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php
new file mode 100644
index 00000000..9868b828
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php
@@ -0,0 +1,616 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+/**
+ * PARTLY BASED ON:
+ * Copyright (c) 2007 E. W. Bachtal, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * The software is provided "as is", without warranty of any kind, express or implied, including but not
+ * limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
+ * no event shall the authors or copyright holders be liable for any claim, damages or other liability,
+ * whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
+ * software or the use or other dealings in the software.
+ *
+ * https://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
+ * https://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
+ */
+class FormulaParser
+{
+    // Character constants
+    const QUOTE_DOUBLE = '"';
+    const QUOTE_SINGLE = '\'';
+    const BRACKET_CLOSE = ']';
+    const BRACKET_OPEN = '[';
+    const BRACE_OPEN = '{';
+    const BRACE_CLOSE = '}';
+    const PAREN_OPEN = '(';
+    const PAREN_CLOSE = ')';
+    const SEMICOLON = ';';
+    const WHITESPACE = ' ';
+    const COMMA = ',';
+    const ERROR_START = '#';
+
+    const OPERATORS_SN = '+-';
+    const OPERATORS_INFIX = '+-*/^&=><';
+    const OPERATORS_POSTFIX = '%';
+
+    /**
+     * Formula.
+     */
+    private string $formula;
+
+    /**
+     * Tokens.
+     *
+     * @var FormulaToken[]
+     */
+    private array $tokens = [];
+
+    /**
+     * Create a new FormulaParser.
+     *
+     * @param ?string $formula Formula to parse
+     */
+    public function __construct(?string $formula = '')
+    {
+        // Check parameters
+        if ($formula === null) {
+            throw new Exception('Invalid parameter passed: formula');
+        }
+
+        // Initialise values
+        $this->formula = trim($formula);
+        // Parse!
+        $this->parseToTokens();
+    }
+
+    /**
+     * Get Formula.
+     */
+    public function getFormula(): string
+    {
+        return $this->formula;
+    }
+
+    /**
+     * Get Token.
+     *
+     * @param int $id Token id
+     */
+    public function getToken(int $id = 0): FormulaToken
+    {
+        if (isset($this->tokens[$id])) {
+            return $this->tokens[$id];
+        }
+
+        throw new Exception("Token with id $id does not exist.");
+    }
+
+    /**
+     * Get Token count.
+     */
+    public function getTokenCount(): int
+    {
+        return count($this->tokens);
+    }
+
+    /**
+     * Get Tokens.
+     *
+     * @return FormulaToken[]
+     */
+    public function getTokens(): array
+    {
+        return $this->tokens;
+    }
+
+    /**
+     * Parse to tokens.
+     */
+    private function parseToTokens(): void
+    {
+        // No attempt is made to verify formulas; assumes formulas are derived from Excel, where
+        // they can only exist if valid; stack overflows/underflows sunk as nulls without exceptions.
+
+        // Check if the formula has a valid starting =
+        $formulaLength = strlen($this->formula);
+        if ($formulaLength < 2 || $this->formula[0] != '=') {
+            return;
+        }
+
+        // Helper variables
+        $tokens1 = $tokens2 = $stack = [];
+        $inString = $inPath = $inRange = $inError = false;
+        $nextToken = null;
+        //$token = $previousToken = null;
+
+        $index = 1;
+        $value = '';
+
+        $ERRORS = ['#NULL!', '#DIV/0!', '#VALUE!', '#REF!', '#NAME?', '#NUM!', '#N/A'];
+        $COMPARATORS_MULTI = ['>=', '<=', '<>'];
+
+        while ($index < $formulaLength) {
+            // state-dependent character evaluation (order is important)
+
+            // double-quoted strings
+            // embeds are doubled
+            // end marks token
+            if ($inString) {
+                if ($this->formula[$index] == self::QUOTE_DOUBLE) {
+                    if ((($index + 2) <= $formulaLength) && ($this->formula[$index + 1] == self::QUOTE_DOUBLE)) {
+                        $value .= self::QUOTE_DOUBLE;
+                        ++$index;
+                    } else {
+                        $inString = false;
+                        $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND, FormulaToken::TOKEN_SUBTYPE_TEXT);
+                        $value = '';
+                    }
+                } else {
+                    $value .= $this->formula[$index];
+                }
+                ++$index;
+
+                continue;
+            }
+
+            // single-quoted strings (links)
+            // embeds are double
+            // end does not mark a token
+            if ($inPath) {
+                if ($this->formula[$index] == self::QUOTE_SINGLE) {
+                    if ((($index + 2) <= $formulaLength) && ($this->formula[$index + 1] == self::QUOTE_SINGLE)) {
+                        $value .= self::QUOTE_SINGLE;
+                        ++$index;
+                    } else {
+                        $inPath = false;
+                    }
+                } else {
+                    $value .= $this->formula[$index];
+                }
+                ++$index;
+
+                continue;
+            }
+
+            // bracked strings (R1C1 range index or linked workbook name)
+            // no embeds (changed to "()" by Excel)
+            // end does not mark a token
+            if ($inRange) {
+                if ($this->formula[$index] == self::BRACKET_CLOSE) {
+                    $inRange = false;
+                }
+                $value .= $this->formula[$index];
+                ++$index;
+
+                continue;
+            }
+
+            // error values
+            // end marks a token, determined from absolute list of values
+            if ($inError) {
+                $value .= $this->formula[$index];
+                ++$index;
+                if (in_array($value, $ERRORS)) {
+                    $inError = false;
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND, FormulaToken::TOKEN_SUBTYPE_ERROR);
+                    $value = '';
+                }
+
+                continue;
+            }
+
+            // scientific notation check
+            if (str_contains(self::OPERATORS_SN, $this->formula[$index])) {
+                if (strlen($value) > 1) {
+                    if (preg_match('/^[1-9]{1}(\\.\\d+)?E{1}$/', $this->formula[$index]) != 0) {
+                        $value .= $this->formula[$index];
+                        ++$index;
+
+                        continue;
+                    }
+                }
+            }
+
+            // independent character evaluation (order not important)
+
+            // establish state-dependent character evaluations
+            if ($this->formula[$index] == self::QUOTE_DOUBLE) {
+                if ($value !== '') {
+                    // unexpected
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_UNKNOWN);
+                    $value = '';
+                }
+                $inString = true;
+                ++$index;
+
+                continue;
+            }
+
+            if ($this->formula[$index] == self::QUOTE_SINGLE) {
+                if ($value !== '') {
+                    // unexpected
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_UNKNOWN);
+                    $value = '';
+                }
+                $inPath = true;
+                ++$index;
+
+                continue;
+            }
+
+            if ($this->formula[$index] == self::BRACKET_OPEN) {
+                $inRange = true;
+                $value .= self::BRACKET_OPEN;
+                ++$index;
+
+                continue;
+            }
+
+            if ($this->formula[$index] == self::ERROR_START) {
+                if ($value !== '') {
+                    // unexpected
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_UNKNOWN);
+                    $value = '';
+                }
+                $inError = true;
+                $value .= self::ERROR_START;
+                ++$index;
+
+                continue;
+            }
+
+            // mark start and end of arrays and array rows
+            if ($this->formula[$index] == self::BRACE_OPEN) {
+                if ($value !== '') {
+                    // unexpected
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_UNKNOWN);
+                    $value = '';
+                }
+
+                $tmp = new FormulaToken('ARRAY', FormulaToken::TOKEN_TYPE_FUNCTION, FormulaToken::TOKEN_SUBTYPE_START);
+                $tokens1[] = $tmp;
+                $stack[] = clone $tmp;
+
+                $tmp = new FormulaToken('ARRAYROW', FormulaToken::TOKEN_TYPE_FUNCTION, FormulaToken::TOKEN_SUBTYPE_START);
+                $tokens1[] = $tmp;
+                $stack[] = clone $tmp;
+
+                ++$index;
+
+                continue;
+            }
+
+            if ($this->formula[$index] == self::SEMICOLON) {
+                if ($value !== '') {
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = '';
+                }
+
+                /** @var FormulaToken $tmp */
+                $tmp = array_pop($stack);
+                $tmp->setValue('');
+                $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
+                $tokens1[] = $tmp;
+
+                $tmp = new FormulaToken(',', FormulaToken::TOKEN_TYPE_ARGUMENT);
+                $tokens1[] = $tmp;
+
+                $tmp = new FormulaToken('ARRAYROW', FormulaToken::TOKEN_TYPE_FUNCTION, FormulaToken::TOKEN_SUBTYPE_START);
+                $tokens1[] = $tmp;
+                $stack[] = clone $tmp;
+
+                ++$index;
+
+                continue;
+            }
+
+            if ($this->formula[$index] == self::BRACE_CLOSE) {
+                if ($value !== '') {
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = '';
+                }
+
+                /** @var FormulaToken $tmp */
+                $tmp = array_pop($stack);
+                $tmp->setValue('');
+                $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
+                $tokens1[] = $tmp;
+
+                /** @var FormulaToken $tmp */
+                $tmp = array_pop($stack);
+                $tmp->setValue('');
+                $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
+                $tokens1[] = $tmp;
+
+                ++$index;
+
+                continue;
+            }
+
+            // trim white-space
+            if ($this->formula[$index] == self::WHITESPACE) {
+                if ($value !== '') {
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = '';
+                }
+                $tokens1[] = new FormulaToken('', FormulaToken::TOKEN_TYPE_WHITESPACE);
+                ++$index;
+                while (($this->formula[$index] == self::WHITESPACE) && ($index < $formulaLength)) {
+                    ++$index;
+                }
+
+                continue;
+            }
+
+            // multi-character comparators
+            if (($index + 2) <= $formulaLength) {
+                if (in_array(substr($this->formula, $index, 2), $COMPARATORS_MULTI)) {
+                    if ($value !== '') {
+                        $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                        $value = '';
+                    }
+                    $tokens1[] = new FormulaToken(substr($this->formula, $index, 2), FormulaToken::TOKEN_TYPE_OPERATORINFIX, FormulaToken::TOKEN_SUBTYPE_LOGICAL);
+                    $index += 2;
+
+                    continue;
+                }
+            }
+
+            // standard infix operators
+            if (str_contains(self::OPERATORS_INFIX, $this->formula[$index])) {
+                if ($value !== '') {
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = '';
+                }
+                $tokens1[] = new FormulaToken($this->formula[$index], FormulaToken::TOKEN_TYPE_OPERATORINFIX);
+                ++$index;
+
+                continue;
+            }
+
+            // standard postfix operators (only one)
+            if (str_contains(self::OPERATORS_POSTFIX, $this->formula[$index])) {
+                if ($value !== '') {
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = '';
+                }
+                $tokens1[] = new FormulaToken($this->formula[$index], FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX);
+                ++$index;
+
+                continue;
+            }
+
+            // start subexpression or function
+            if ($this->formula[$index] == self::PAREN_OPEN) {
+                if ($value !== '') {
+                    $tmp = new FormulaToken($value, FormulaToken::TOKEN_TYPE_FUNCTION, FormulaToken::TOKEN_SUBTYPE_START);
+                    $tokens1[] = $tmp;
+                    $stack[] = clone $tmp;
+                    $value = '';
+                } else {
+                    $tmp = new FormulaToken('', FormulaToken::TOKEN_TYPE_SUBEXPRESSION, FormulaToken::TOKEN_SUBTYPE_START);
+                    $tokens1[] = $tmp;
+                    $stack[] = clone $tmp;
+                }
+                ++$index;
+
+                continue;
+            }
+
+            // function, subexpression, or array parameters, or operand unions
+            if ($this->formula[$index] == self::COMMA) {
+                if ($value !== '') {
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = '';
+                }
+
+                /** @var FormulaToken $tmp */
+                $tmp = array_pop($stack);
+                $tmp->setValue('');
+                $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
+                $stack[] = $tmp;
+
+                if ($tmp->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) {
+                    $tokens1[] = new FormulaToken(',', FormulaToken::TOKEN_TYPE_OPERATORINFIX, FormulaToken::TOKEN_SUBTYPE_UNION);
+                } else {
+                    $tokens1[] = new FormulaToken(',', FormulaToken::TOKEN_TYPE_ARGUMENT);
+                }
+                ++$index;
+
+                continue;
+            }
+
+            // stop subexpression
+            if ($this->formula[$index] == self::PAREN_CLOSE) {
+                if ($value !== '') {
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                    $value = '';
+                }
+
+                /** @var FormulaToken $tmp */
+                $tmp = array_pop($stack);
+                $tmp->setValue('');
+                $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
+                $tokens1[] = $tmp;
+
+                ++$index;
+
+                continue;
+            }
+
+            // token accumulation
+            $value .= $this->formula[$index];
+            ++$index;
+        }
+
+        // dump remaining accumulation
+        if ($value !== '') {
+            $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+        }
+
+        // move tokenList to new set, excluding unnecessary white-space tokens and converting necessary ones to intersections
+        $tokenCount = count($tokens1);
+        for ($i = 0; $i < $tokenCount; ++$i) {
+            $token = $tokens1[$i];
+            if (isset($tokens1[$i - 1])) {
+                $previousToken = $tokens1[$i - 1];
+            } else {
+                $previousToken = null;
+            }
+            if (isset($tokens1[$i + 1])) {
+                $nextToken = $tokens1[$i + 1];
+            } else {
+                $nextToken = null;
+            }
+
+            if ($token->getTokenType() != FormulaToken::TOKEN_TYPE_WHITESPACE) {
+                $tokens2[] = $token;
+
+                continue;
+            }
+
+            if ($previousToken === null) {
+                continue;
+            }
+
+            if (
+                !(
+                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                || (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                || ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                )
+            ) {
+                continue;
+            }
+
+            if ($nextToken === null) {
+                continue;
+            }
+
+            if (
+                !(
+                    (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START))
+                || (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START))
+                || ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                )
+            ) {
+                continue;
+            }
+
+            $tokens2[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERATORINFIX, FormulaToken::TOKEN_SUBTYPE_INTERSECTION);
+        }
+
+        // move tokens to final list, switching infix "-" operators to prefix when appropriate, switching infix "+" operators
+        // to noop when appropriate, identifying operand and infix-operator subtypes, and pulling "@" from function names
+        $this->tokens = [];
+
+        $tokenCount = count($tokens2);
+        for ($i = 0; $i < $tokenCount; ++$i) {
+            $token = $tokens2[$i];
+            if (isset($tokens2[$i - 1])) {
+                $previousToken = $tokens2[$i - 1];
+            } else {
+                $previousToken = null;
+            }
+
+            if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == '-') {
+                if ($i == 0) {
+                    $token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
+                } elseif (
+                    (($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION)
+                        && ($previousToken?->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                    || (($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION)
+                        && ($previousToken?->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                    || ($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX)
+                    || ($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                ) {
+                    $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
+                } else {
+                    $token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
+                }
+
+                $this->tokens[] = $token;
+
+                continue;
+            }
+
+            if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == '+') {
+                if ($i == 0) {
+                    continue;
+                } elseif (
+                    (($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION)
+                        && ($previousToken?->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                    || (($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION)
+                        && ($previousToken?->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                    || ($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX)
+                    || ($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                ) {
+                    $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
+                } else {
+                    continue;
+                }
+
+                $this->tokens[] = $token;
+
+                continue;
+            }
+
+            if (
+                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX
+                && $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
+            ) {
+                if (str_contains('<>=', substr($token->getValue(), 0, 1))) {
+                    $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_LOGICAL);
+                } elseif ($token->getValue() == '&') {
+                    $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_CONCATENATION);
+                } else {
+                    $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
+                }
+
+                $this->tokens[] = $token;
+
+                continue;
+            }
+
+            if (
+                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND
+                && $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
+            ) {
+                if (!is_numeric($token->getValue())) {
+                    if (strtoupper($token->getValue()) == 'TRUE' || strtoupper($token->getValue()) == 'FALSE') {
+                        $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_LOGICAL);
+                    } else {
+                        $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_RANGE);
+                    }
+                } else {
+                    $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_NUMBER);
+                }
+
+                $this->tokens[] = $token;
+
+                continue;
+            }
+
+            if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) {
+                if ($token->getValue() !== '') {
+                    if (str_starts_with($token->getValue(), '@')) {
+                        $token->setValue(substr($token->getValue(), 1));
+                    }
+                }
+            }
+
+            $this->tokens[] = $token;
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php
new file mode 100644
index 00000000..cc7d48fc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+/**
+ * PARTLY BASED ON:
+ * Copyright (c) 2007 E. W. Bachtal, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * The software is provided "as is", without warranty of any kind, express or implied, including but not
+ * limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
+ * no event shall the authors or copyright holders be liable for any claim, damages or other liability,
+ * whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
+ * software or the use or other dealings in the software.
+ *
+ * https://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
+ * https://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
+ */
+class FormulaToken
+{
+    // Token types
+    const TOKEN_TYPE_NOOP = 'Noop';
+    const TOKEN_TYPE_OPERAND = 'Operand';
+    const TOKEN_TYPE_FUNCTION = 'Function';
+    const TOKEN_TYPE_SUBEXPRESSION = 'Subexpression';
+    const TOKEN_TYPE_ARGUMENT = 'Argument';
+    const TOKEN_TYPE_OPERATORPREFIX = 'OperatorPrefix';
+    const TOKEN_TYPE_OPERATORINFIX = 'OperatorInfix';
+    const TOKEN_TYPE_OPERATORPOSTFIX = 'OperatorPostfix';
+    const TOKEN_TYPE_WHITESPACE = 'Whitespace';
+    const TOKEN_TYPE_UNKNOWN = 'Unknown';
+
+    // Token subtypes
+    const TOKEN_SUBTYPE_NOTHING = 'Nothing';
+    const TOKEN_SUBTYPE_START = 'Start';
+    const TOKEN_SUBTYPE_STOP = 'Stop';
+    const TOKEN_SUBTYPE_TEXT = 'Text';
+    const TOKEN_SUBTYPE_NUMBER = 'Number';
+    const TOKEN_SUBTYPE_LOGICAL = 'Logical';
+    const TOKEN_SUBTYPE_ERROR = 'Error';
+    const TOKEN_SUBTYPE_RANGE = 'Range';
+    const TOKEN_SUBTYPE_MATH = 'Math';
+    const TOKEN_SUBTYPE_CONCATENATION = 'Concatenation';
+    const TOKEN_SUBTYPE_INTERSECTION = 'Intersection';
+    const TOKEN_SUBTYPE_UNION = 'Union';
+
+    /**
+     * Value.
+     */
+    private string $value;
+
+    /**
+     * Token Type (represented by TOKEN_TYPE_*).
+     */
+    private string $tokenType;
+
+    /**
+     * Token SubType (represented by TOKEN_SUBTYPE_*).
+     */
+    private string $tokenSubType;
+
+    /**
+     * Create a new FormulaToken.
+     *
+     * @param string $tokenType Token type (represented by TOKEN_TYPE_*)
+     * @param string $tokenSubType Token Subtype (represented by TOKEN_SUBTYPE_*)
+     */
+    public function __construct(string $value, string $tokenType = self::TOKEN_TYPE_UNKNOWN, string $tokenSubType = self::TOKEN_SUBTYPE_NOTHING)
+    {
+        // Initialise values
+        $this->value = $value;
+        $this->tokenType = $tokenType;
+        $this->tokenSubType = $tokenSubType;
+    }
+
+    /**
+     * Get Value.
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set Value.
+     */
+    public function setValue(string $value): void
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Get Token Type (represented by TOKEN_TYPE_*).
+     */
+    public function getTokenType(): string
+    {
+        return $this->tokenType;
+    }
+
+    /**
+     * Set Token Type (represented by TOKEN_TYPE_*).
+     */
+    public function setTokenType(string $value): void
+    {
+        $this->tokenType = $value;
+    }
+
+    /**
+     * Get Token SubType (represented by TOKEN_SUBTYPE_*).
+     */
+    public function getTokenSubType(): string
+    {
+        return $this->tokenSubType;
+    }
+
+    /**
+     * Set Token SubType (represented by TOKEN_SUBTYPE_*).
+     */
+    public function setTokenSubType(string $value): void
+    {
+        $this->tokenSubType = $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php
new file mode 100644
index 00000000..77f8317a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php
@@ -0,0 +1,324 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+
+class Functions
+{
+    const PRECISION = 8.88E-016;
+
+    /**
+     * 2 / PI.
+     */
+    const M_2DIVPI = 0.63661977236758134307553505349006;
+
+    const COMPATIBILITY_EXCEL = 'Excel';
+    const COMPATIBILITY_GNUMERIC = 'Gnumeric';
+    const COMPATIBILITY_OPENOFFICE = 'OpenOfficeCalc';
+
+    /** Use of RETURNDATE_PHP_NUMERIC is discouraged - not 32-bit Y2038-safe, no timezone. */
+    const RETURNDATE_PHP_NUMERIC = 'P';
+    /** Use of RETURNDATE_UNIX_TIMESTAMP is discouraged - not 32-bit Y2038-safe, no timezone. */
+    const RETURNDATE_UNIX_TIMESTAMP = 'P';
+    const RETURNDATE_PHP_OBJECT = 'O';
+    const RETURNDATE_PHP_DATETIME_OBJECT = 'O';
+    const RETURNDATE_EXCEL = 'E';
+
+    public const NOT_YET_IMPLEMENTED = '#Not Yet Implemented';
+
+    /**
+     * Compatibility mode to use for error checking and responses.
+     */
+    protected static string $compatibilityMode = self::COMPATIBILITY_EXCEL;
+
+    /**
+     * Data Type to use when returning date values.
+     */
+    protected static string $returnDateType = self::RETURNDATE_EXCEL;
+
+    /**
+     * Set the Compatibility Mode.
+     *
+     * @param string $compatibilityMode Compatibility Mode
+     *                                  Permitted values are:
+     *                                      Functions::COMPATIBILITY_EXCEL        'Excel'
+     *                                      Functions::COMPATIBILITY_GNUMERIC     'Gnumeric'
+     *                                      Functions::COMPATIBILITY_OPENOFFICE   'OpenOfficeCalc'
+     *
+     * @return bool (Success or Failure)
+     */
+    public static function setCompatibilityMode(string $compatibilityMode): bool
+    {
+        if (
+            ($compatibilityMode == self::COMPATIBILITY_EXCEL)
+            || ($compatibilityMode == self::COMPATIBILITY_GNUMERIC)
+            || ($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)
+        ) {
+            self::$compatibilityMode = $compatibilityMode;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the current Compatibility Mode.
+     *
+     * @return string Compatibility Mode
+     *                Possible Return values are:
+     *                    Functions::COMPATIBILITY_EXCEL        'Excel'
+     *                    Functions::COMPATIBILITY_GNUMERIC     'Gnumeric'
+     *                    Functions::COMPATIBILITY_OPENOFFICE   'OpenOfficeCalc'
+     */
+    public static function getCompatibilityMode(): string
+    {
+        return self::$compatibilityMode;
+    }
+
+    /**
+     * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP DateTime Object).
+     *
+     * @param string $returnDateType Return Date Format
+     *                               Permitted values are:
+     *                                   Functions::RETURNDATE_UNIX_TIMESTAMP       'P'
+     *                                   Functions::RETURNDATE_PHP_DATETIME_OBJECT  'O'
+     *                                   Functions::RETURNDATE_EXCEL                'E'
+     *
+     * @return bool Success or failure
+     */
+    public static function setReturnDateType(string $returnDateType): bool
+    {
+        if (
+            ($returnDateType == self::RETURNDATE_UNIX_TIMESTAMP)
+            || ($returnDateType == self::RETURNDATE_PHP_DATETIME_OBJECT)
+            || ($returnDateType == self::RETURNDATE_EXCEL)
+        ) {
+            self::$returnDateType = $returnDateType;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object).
+     *
+     * @return string Return Date Format
+     *                Possible Return values are:
+     *                    Functions::RETURNDATE_UNIX_TIMESTAMP         'P'
+     *                    Functions::RETURNDATE_PHP_DATETIME_OBJECT    'O'
+     *                    Functions::RETURNDATE_EXCEL            '     'E'
+     */
+    public static function getReturnDateType(): string
+    {
+        return self::$returnDateType;
+    }
+
+    /**
+     * DUMMY.
+     *
+     * @return string #Not Yet Implemented
+     */
+    public static function DUMMY(): string
+    {
+        return self::NOT_YET_IMPLEMENTED;
+    }
+
+    public static function isMatrixValue(mixed $idx): bool
+    {
+        return (substr_count($idx, '.') <= 1) || (preg_match('/\.[A-Z]/', $idx) > 0);
+    }
+
+    public static function isValue(mixed $idx): bool
+    {
+        return substr_count($idx, '.') === 0;
+    }
+
+    public static function isCellValue(mixed $idx): bool
+    {
+        return substr_count($idx, '.') > 1;
+    }
+
+    public static function ifCondition(mixed $condition): string
+    {
+        $condition = self::flattenSingleValue($condition);
+
+        if ($condition === '' || $condition === null) {
+            return '=""';
+        }
+        if (!is_string($condition) || !in_array($condition[0], ['>', '<', '='], true)) {
+            $condition = self::operandSpecialHandling($condition);
+            if (is_bool($condition)) {
+                return '=' . ($condition ? 'TRUE' : 'FALSE');
+            } elseif (!is_numeric($condition)) {
+                if ($condition !== '""') { // Not an empty string
+                    // Escape any quotes in the string value
+                    $condition = (string) preg_replace('/"/ui', '""', $condition);
+                }
+                $condition = Calculation::wrapResult(strtoupper($condition));
+            }
+
+            return str_replace('""""', '""', '=' . $condition);
+        }
+        preg_match('/(=|<[>=]?|>=?)(.*)/', $condition, $matches);
+        [, $operator, $operand] = $matches;
+
+        $operand = self::operandSpecialHandling($operand);
+        if (is_numeric(trim($operand, '"'))) {
+            $operand = trim($operand, '"');
+        } elseif (!is_numeric($operand) && $operand !== 'FALSE' && $operand !== 'TRUE') {
+            $operand = str_replace('"', '""', $operand);
+            $operand = Calculation::wrapResult(strtoupper($operand));
+        }
+
+        return str_replace('""""', '""', $operator . $operand);
+    }
+
+    private static function operandSpecialHandling(mixed $operand): mixed
+    {
+        if (is_numeric($operand) || is_bool($operand)) {
+            return $operand;
+        } elseif (strtoupper($operand) === Calculation::getTRUE() || strtoupper($operand) === Calculation::getFALSE()) {
+            return strtoupper($operand);
+        }
+
+        // Check for percentage
+        if (preg_match('/^\-?\d*\.?\d*\s?\%$/', $operand)) {
+            return ((float) rtrim($operand, '%')) / 100;
+        }
+
+        // Check for dates
+        if (($dateValueOperand = Date::stringToExcel($operand)) !== false) {
+            return $dateValueOperand;
+        }
+
+        return $operand;
+    }
+
+    /**
+     * Convert a multi-dimensional array to a simple 1-dimensional array.
+     *
+     * @param mixed $array Array to be flattened
+     *
+     * @return array Flattened array
+     */
+    public static function flattenArray(mixed $array): array
+    {
+        if (!is_array($array)) {
+            return (array) $array;
+        }
+
+        $flattened = [];
+        $stack = array_values($array);
+
+        while (!empty($stack)) {
+            $value = array_shift($stack);
+
+            if (is_array($value)) {
+                array_unshift($stack, ...array_values($value));
+            } else {
+                $flattened[] = $value;
+            }
+        }
+
+        return $flattened;
+    }
+
+    public static function scalar(mixed $value): mixed
+    {
+        if (!is_array($value)) {
+            return $value;
+        }
+
+        do {
+            $value = array_pop($value);
+        } while (is_array($value));
+
+        return $value;
+    }
+
+    /**
+     * Convert a multi-dimensional array to a simple 1-dimensional array, but retain an element of indexing.
+     *
+     * @param array|mixed $array Array to be flattened
+     *
+     * @return array Flattened array
+     */
+    public static function flattenArrayIndexed($array): array
+    {
+        if (!is_array($array)) {
+            return (array) $array;
+        }
+
+        $arrayValues = [];
+        foreach ($array as $k1 => $value) {
+            if (is_array($value)) {
+                foreach ($value as $k2 => $val) {
+                    if (is_array($val)) {
+                        foreach ($val as $k3 => $v) {
+                            $arrayValues[$k1 . '.' . $k2 . '.' . $k3] = $v;
+                        }
+                    } else {
+                        $arrayValues[$k1 . '.' . $k2] = $val;
+                    }
+                }
+            } else {
+                $arrayValues[$k1] = $value;
+            }
+        }
+
+        return $arrayValues;
+    }
+
+    /**
+     * Convert an array to a single scalar value by extracting the first element.
+     *
+     * @param mixed $value Array or scalar value
+     */
+    public static function flattenSingleValue(mixed $value): mixed
+    {
+        while (is_array($value)) {
+            $value = array_shift($value);
+        }
+
+        return $value;
+    }
+
+    public static function expandDefinedName(string $coordinate, Cell $cell): string
+    {
+        $worksheet = $cell->getWorksheet();
+        $spreadsheet = $worksheet->getParentOrThrow();
+        // Uppercase coordinate
+        $pCoordinatex = strtoupper($coordinate);
+        // Eliminate leading equal sign
+        $pCoordinatex = (string) preg_replace('/^=/', '', $pCoordinatex);
+        $defined = $spreadsheet->getDefinedName($pCoordinatex, $worksheet);
+        if ($defined !== null) {
+            $worksheet2 = $defined->getWorkSheet();
+            if (!$defined->isFormula() && $worksheet2 !== null) {
+                $coordinate = "'" . $worksheet2->getTitle() . "'!"
+                    . (string) preg_replace('/^=/', '', str_replace('$', '', $defined->getValue()));
+            }
+        }
+
+        return $coordinate;
+    }
+
+    public static function trimTrailingRange(string $coordinate): string
+    {
+        return (string) preg_replace('/:[\\w\$]+$/', '', $coordinate);
+    }
+
+    public static function trimSheetFromCellReference(string $coordinate): string
+    {
+        if (str_contains($coordinate, '!')) {
+            $coordinate = substr($coordinate, strrpos($coordinate, '!') + 1);
+        }
+
+        return $coordinate;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php
new file mode 100644
index 00000000..f3a74627
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Information;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class ErrorValue
+{
+    use ArrayEnabled;
+
+    /**
+     * IS_ERR.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isErr(mixed $value = ''): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return self::isError($value) && (!self::isNa(($value)));
+    }
+
+    /**
+     * IS_ERROR.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isError(mixed $value = '', bool $tryNotImplemented = false): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (!is_string($value)) {
+            return false;
+        }
+        if ($tryNotImplemented && $value === Functions::NOT_YET_IMPLEMENTED) {
+            return true;
+        }
+
+        return in_array($value, ExcelError::ERROR_CODES, true);
+    }
+
+    /**
+     * IS_NA.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isNa(mixed $value = ''): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return $value === ExcelError::NA();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php
new file mode 100644
index 00000000..d9aabfd0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Information;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+
+class ExcelError
+{
+    use ArrayEnabled;
+
+    /**
+     * List of error codes.
+     *
+     * @var array<string, string>
+     */
+    public const ERROR_CODES = [
+        'null' => '#NULL!', // 1
+        'divisionbyzero' => '#DIV/0!', // 2
+        'value' => '#VALUE!', // 3
+        'reference' => '#REF!', // 4
+        'name' => '#NAME?', // 5
+        'num' => '#NUM!', // 6
+        'na' => '#N/A', // 7
+        'gettingdata' => '#GETTING_DATA', // 8
+        'spill' => '#SPILL!', // 9
+        'connect' => '#CONNECT!', //10
+        'blocked' => '#BLOCKED!', //11
+        'unknown' => '#UNKNOWN!', //12
+        'field' => '#FIELD!', //13
+        'calculation' => '#CALC!', //14
+    ];
+
+    public static function throwError(mixed $value): string
+    {
+        return in_array($value, self::ERROR_CODES, true) ? $value : self::ERROR_CODES['value'];
+    }
+
+    /**
+     * ERROR_TYPE.
+     *
+     * @param mixed $value Value to check
+     */
+    public static function type(mixed $value = ''): array|int|string
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        $i = 1;
+        foreach (self::ERROR_CODES as $errorCode) {
+            if ($value === $errorCode) {
+                return $i;
+            }
+            ++$i;
+        }
+
+        return self::NA();
+    }
+
+    /**
+     * NULL.
+     *
+     * Returns the error value #NULL!
+     *
+     * @return string #NULL!
+     */
+    public static function null(): string
+    {
+        return self::ERROR_CODES['null'];
+    }
+
+    /**
+     * NaN.
+     *
+     * Returns the error value #NUM!
+     *
+     * @return string #NUM!
+     */
+    public static function NAN(): string
+    {
+        return self::ERROR_CODES['num'];
+    }
+
+    /**
+     * REF.
+     *
+     * Returns the error value #REF!
+     *
+     * @return string #REF!
+     */
+    public static function REF(): string
+    {
+        return self::ERROR_CODES['reference'];
+    }
+
+    /**
+     * NA.
+     *
+     * Excel Function:
+     *        =NA()
+     *
+     * Returns the error value #N/A
+     *        #N/A is the error value that means "no value is available."
+     *
+     * @return string #N/A!
+     */
+    public static function NA(): string
+    {
+        return self::ERROR_CODES['na'];
+    }
+
+    /**
+     * VALUE.
+     *
+     * Returns the error value #VALUE!
+     *
+     * @return string #VALUE!
+     */
+    public static function VALUE(): string
+    {
+        return self::ERROR_CODES['value'];
+    }
+
+    /**
+     * NAME.
+     *
+     * Returns the error value #NAME?
+     *
+     * @return string #NAME?
+     */
+    public static function NAME(): string
+    {
+        return self::ERROR_CODES['name'];
+    }
+
+    /**
+     * DIV0.
+     *
+     * @return string #DIV/0!
+     */
+    public static function DIV0(): string
+    {
+        return self::ERROR_CODES['divisionbyzero'];
+    }
+
+    /**
+     * CALC.
+     *
+     * @return string #CALC!
+     */
+    public static function CALC(): string
+    {
+        return self::ERROR_CODES['calculation'];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php
new file mode 100644
index 00000000..c9a7a0af
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php
@@ -0,0 +1,317 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Information;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Value
+{
+    use ArrayEnabled;
+
+    /**
+     * IS_BLANK.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isBlank(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return $value === null;
+    }
+
+    /**
+     * IS_REF.
+     *
+     * @param mixed $value Value to check
+     */
+    public static function isRef(mixed $value, ?Cell $cell = null): bool
+    {
+        if ($cell === null || $value === $cell->getCoordinate()) {
+            return false;
+        }
+
+        $cellValue = Functions::trimTrailingRange($value);
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/ui', $cellValue) === 1) {
+            [$worksheet, $cellValue] = Worksheet::extractSheetTitle($cellValue, true);
+            if (!empty($worksheet) && $cell->getWorksheet()->getParentOrThrow()->getSheetByName($worksheet) === null) {
+                return false;
+            }
+            [$column, $row] = Coordinate::indexesFromString($cellValue ?? '');
+            if ($column > 16384 || $row > 1048576) {
+                return false;
+            }
+
+            return true;
+        }
+
+        $namedRange = $cell->getWorksheet()->getParentOrThrow()->getNamedRange($value);
+
+        return $namedRange instanceof NamedRange;
+    }
+
+    /**
+     * IS_EVEN.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isEven(mixed $value = null): array|string|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if ($value === null) {
+            return ExcelError::NAME();
+        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
+            return ExcelError::VALUE();
+        }
+
+        return ((int) fmod($value, 2)) === 0;
+    }
+
+    /**
+     * IS_ODD.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isOdd(mixed $value = null): array|string|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if ($value === null) {
+            return ExcelError::NAME();
+        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
+            return ExcelError::VALUE();
+        }
+
+        return ((int) fmod($value, 2)) !== 0;
+    }
+
+    /**
+     * IS_NUMBER.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isNumber(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (is_string($value)) {
+            return false;
+        }
+
+        return is_numeric($value);
+    }
+
+    /**
+     * IS_LOGICAL.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isLogical(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return is_bool($value);
+    }
+
+    /**
+     * IS_TEXT.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isText(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return is_string($value) && !ErrorValue::isError($value);
+    }
+
+    /**
+     * IS_NONTEXT.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isNonText(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return !self::isText($value);
+    }
+
+    /**
+     * ISFORMULA.
+     *
+     * @param mixed $cellReference The cell to check
+     * @param ?Cell $cell The current cell (containing this formula)
+     */
+    public static function isFormula(mixed $cellReference = '', ?Cell $cell = null): array|bool|string
+    {
+        if ($cell === null) {
+            return ExcelError::REF();
+        }
+
+        $fullCellReference = Functions::expandDefinedName((string) $cellReference, $cell);
+
+        if (str_contains($cellReference, '!')) {
+            $cellReference = Functions::trimSheetFromCellReference($cellReference);
+            $cellReferences = Coordinate::extractAllCellReferencesInRange($cellReference);
+            if (count($cellReferences) > 1) {
+                return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $cellReferences, $cell);
+            }
+        }
+
+        $fullCellReference = Functions::trimTrailingRange($fullCellReference);
+
+        preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $fullCellReference, $matches);
+
+        $fullCellReference = $matches[6] . $matches[7];
+        $worksheetName = str_replace("''", "'", trim($matches[2], "'"));
+
+        $worksheet = (!empty($worksheetName))
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($worksheetName)
+            : $cell->getWorksheet();
+
+        return ($worksheet !== null) ? $worksheet->getCell($fullCellReference)->isFormula() : ExcelError::REF();
+    }
+
+    /**
+     * N.
+     *
+     * Returns a value converted to a number
+     *
+     * @param null|mixed $value The value you want converted
+     *
+     * @return number|string N converts values listed in the following table
+     *        If value is or refers to N returns
+     *        A number            That number value
+     *        A date              The Excel serialized number of that date
+     *        TRUE                1
+     *        FALSE               0
+     *        An error value      The error value
+     *        Anything else       0
+     */
+    public static function asNumber($value = null)
+    {
+        while (is_array($value)) {
+            $value = array_shift($value);
+        }
+
+        switch (gettype($value)) {
+            case 'double':
+            case 'float':
+            case 'integer':
+                return $value;
+            case 'boolean':
+                return (int) $value;
+            case 'string':
+                //    Errors
+                if (($value !== '') && ($value[0] == '#')) {
+                    return $value;
+                }
+
+                break;
+        }
+
+        return 0;
+    }
+
+    /**
+     * TYPE.
+     *
+     * Returns a number that identifies the type of a value
+     *
+     * @param null|mixed $value The value you want tested
+     *
+     * @return int N converts values listed in the following table
+     *        If value is or refers to N returns
+     *        A number            1
+     *        Text                2
+     *        Logical Value       4
+     *        An error value      16
+     *        Array or Matrix     64
+     */
+    public static function type($value = null): int
+    {
+        $value = Functions::flattenArrayIndexed($value);
+        if (is_array($value) && (count($value) > 1)) {
+            end($value);
+            $a = key($value);
+            //    Range of cells is an error
+            if (Functions::isCellValue($a)) {
+                return 16;
+            //    Test for Matrix
+            } elseif (Functions::isMatrixValue($a)) {
+                return 64;
+            }
+        } elseif (empty($value)) {
+            //    Empty Cell
+            return 1;
+        }
+
+        $value = Functions::flattenSingleValue($value);
+        if (($value === null) || (is_float($value)) || (is_int($value))) {
+            return 1;
+        } elseif (is_bool($value)) {
+            return 4;
+        } elseif (is_array($value)) {
+            return 64;
+        } elseif (is_string($value)) {
+            //    Errors
+            if (($value !== '') && ($value[0] == '#')) {
+                return 16;
+            }
+
+            return 2;
+        }
+
+        return 0;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php
new file mode 100644
index 00000000..22c95e86
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Internal;
+
+class MakeMatrix
+{
+    /** @param array $args */
+    public static function make(...$args): array
+    {
+        return $args;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
new file mode 100644
index 00000000..371ad8b3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Internal;
+
+class WildcardMatch
+{
+    private const SEARCH_SET = [
+        '~~', // convert double tilde to unprintable value
+        '~\\*', // convert tilde backslash asterisk to [*] (matches literal asterisk in regexp)
+        '\\*', // convert backslash asterisk to .* (matches string of any length in regexp)
+        '~\\?', // convert tilde backslash question to [?] (matches literal question mark in regexp)
+        '\\?', // convert backslash question to . (matches one character in regexp)
+        "\x1c", // convert original double tilde to single tilde
+    ];
+
+    private const REPLACEMENT_SET = [
+        "\x1c",
+        '[*]',
+        '.*',
+        '[?]',
+        '.',
+        '~',
+    ];
+
+    public static function wildcard(string $wildcard): string
+    {
+        // Preg Escape the wildcard, but protecting the Excel * and ? search characters
+        return str_replace(self::SEARCH_SET, self::REPLACEMENT_SET, preg_quote($wildcard, '/'));
+    }
+
+    public static function compare(?string $value, string $wildcard): bool
+    {
+        if ($value === '' || $value === null) {
+            return false;
+        }
+
+        return (bool) preg_match("/^{$wildcard}\$/mui", $value);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Boolean.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Boolean.php
new file mode 100644
index 00000000..8f1e9354
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Boolean.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Logical;
+
+class Boolean
+{
+    /**
+     * TRUE.
+     *
+     * Returns the boolean TRUE.
+     *
+     * Excel Function:
+     *        =TRUE()
+     *
+     * @return bool True
+     */
+    public static function true(): bool
+    {
+        return true;
+    }
+
+    /**
+     * FALSE.
+     *
+     * Returns the boolean FALSE.
+     *
+     * Excel Function:
+     *        =FALSE()
+     *
+     * @return bool False
+     */
+    public static function false(): bool
+    {
+        return false;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php
new file mode 100644
index 00000000..9ac36c5b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php
@@ -0,0 +1,211 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Logical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\Value;
+
+class Conditional
+{
+    use ArrayEnabled;
+
+    /**
+     * STATEMENT_IF.
+     *
+     * Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
+     *
+     * Excel Function:
+     *        =IF(condition[,returnIfTrue[,returnIfFalse]])
+     *
+     *        Condition is any value or expression that can be evaluated to TRUE or FALSE.
+     *            For example, A10=100 is a logical expression; if the value in cell A10 is equal to 100,
+     *            the expression evaluates to TRUE. Otherwise, the expression evaluates to FALSE.
+     *            This argument can use any comparison calculation operator.
+     *        ReturnIfTrue is the value that is returned if condition evaluates to TRUE.
+     *            For example, if this argument is the text string "Within budget" and
+     *                the condition argument evaluates to TRUE, then the IF function returns the text "Within budget"
+     *            If condition is TRUE and ReturnIfTrue is blank, this argument returns 0 (zero).
+     *            To display the word TRUE, use the logical value TRUE for this argument.
+     *            ReturnIfTrue can be another formula.
+     *        ReturnIfFalse is the value that is returned if condition evaluates to FALSE.
+     *            For example, if this argument is the text string "Over budget" and the condition argument evaluates
+     *                to FALSE, then the IF function returns the text "Over budget".
+     *            If condition is FALSE and ReturnIfFalse is omitted, then the logical value FALSE is returned.
+     *            If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
+     *            ReturnIfFalse can be another formula.
+     *
+     * @param mixed $condition Condition to evaluate
+     * @param mixed $returnIfTrue Value to return when condition is true
+     *              Note that this can be an array value
+     * @param mixed $returnIfFalse Optional value to return when condition is false
+     *              Note that this can be an array value
+     *
+     * @return mixed The value of returnIfTrue or returnIfFalse determined by condition
+     */
+    public static function statementIf(mixed $condition = true, mixed $returnIfTrue = 0, mixed $returnIfFalse = false): mixed
+    {
+        $condition = ($condition === null) ? true : Functions::flattenSingleValue($condition);
+
+        if (ErrorValue::isError($condition)) {
+            return $condition;
+        }
+
+        $returnIfTrue = $returnIfTrue ?? 0;
+        $returnIfFalse = $returnIfFalse ?? false;
+
+        return ((bool) $condition) ? $returnIfTrue : $returnIfFalse;
+    }
+
+    /**
+     * STATEMENT_SWITCH.
+     *
+     * Returns corresponding with first match (any data type such as a string, numeric, date, etc).
+     *
+     * Excel Function:
+     *        =SWITCH (expression, value1, result1, value2, result2, ... value_n, result_n [, default])
+     *
+     *        Expression
+     *              The expression to compare to a list of values.
+     *        value1, value2, ... value_n
+     *              A list of values that are compared to expression.
+     *              The SWITCH function is looking for the first value that matches the expression.
+     *        result1, result2, ... result_n
+     *              A list of results. The SWITCH function returns the corresponding result when a value
+     *              matches expression.
+     *              Note that these can be array values to be returned
+     *         default
+     *              Optional. It is the default to return if expression does not match any of the values
+     *              (value1, value2, ... value_n).
+     *              Note that this can be an array value to be returned
+     *
+     * @param mixed $arguments Statement arguments
+     *
+     * @return mixed The value of matched expression
+     */
+    public static function statementSwitch(mixed ...$arguments): mixed
+    {
+        $result = ExcelError::VALUE();
+
+        if (count($arguments) > 0) {
+            $targetValue = Functions::flattenSingleValue($arguments[0]);
+            $argc = count($arguments) - 1;
+            $switchCount = floor($argc / 2);
+            $hasDefaultClause = $argc % 2 !== 0;
+            $defaultClause = $argc % 2 === 0 ? null : $arguments[$argc];
+
+            $switchSatisfied = false;
+            if ($switchCount > 0) {
+                for ($index = 0; $index < $switchCount; ++$index) {
+                    if ($targetValue == Functions::flattenSingleValue($arguments[$index * 2 + 1])) {
+                        $result = $arguments[$index * 2 + 2];
+                        $switchSatisfied = true;
+
+                        break;
+                    }
+                }
+            }
+
+            if ($switchSatisfied !== true) {
+                $result = $hasDefaultClause ? $defaultClause : ExcelError::NA();
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * IFERROR.
+     *
+     * Excel Function:
+     *        =IFERROR(testValue,errorpart)
+     *
+     * @param mixed $testValue Value to check, is also the value returned when no error
+     *                      Or can be an array of values
+     * @param mixed $errorpart Value to return when testValue is an error condition
+     *              Note that this can be an array value to be returned
+     *
+     * @return mixed The value of errorpart or testValue determined by error condition
+     *         If an array of values is passed as the $testValue argument, then the returned result will also be
+     *            an array with the same dimensions
+     */
+    public static function IFERROR(mixed $testValue = '', mixed $errorpart = ''): mixed
+    {
+        if (is_array($testValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $testValue, $errorpart);
+        }
+
+        $errorpart = $errorpart ?? '';
+        $testValue = $testValue ?? 0; // this is how Excel handles empty cell
+
+        return self::statementIf(ErrorValue::isError($testValue), $errorpart, $testValue);
+    }
+
+    /**
+     * IFNA.
+     *
+     * Excel Function:
+     *        =IFNA(testValue,napart)
+     *
+     * @param mixed $testValue Value to check, is also the value returned when not an NA
+     *                      Or can be an array of values
+     * @param mixed $napart Value to return when testValue is an NA condition
+     *              Note that this can be an array value to be returned
+     *
+     * @return mixed The value of errorpart or testValue determined by error condition
+     *         If an array of values is passed as the $testValue argument, then the returned result will also be
+     *            an array with the same dimensions
+     */
+    public static function IFNA(mixed $testValue = '', mixed $napart = ''): mixed
+    {
+        if (is_array($testValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $testValue, $napart);
+        }
+
+        $napart = $napart ?? '';
+        $testValue = $testValue ?? 0; // this is how Excel handles empty cell
+
+        return self::statementIf(ErrorValue::isNa($testValue), $napart, $testValue);
+    }
+
+    /**
+     * IFS.
+     *
+     * Excel Function:
+     *         =IFS(testValue1;returnIfTrue1;testValue2;returnIfTrue2;...;testValue_n;returnIfTrue_n)
+     *
+     *         testValue1 ... testValue_n
+     *             Conditions to Evaluate
+     *         returnIfTrue1 ... returnIfTrue_n
+     *             Value returned if corresponding testValue (nth) was true
+     *
+     * @param mixed ...$arguments Statement arguments
+     *              Note that this can be an array value to be returned
+     *
+     * @return mixed|string The value of returnIfTrue_n, if testValue_n was true. #N/A if none of testValues was true
+     */
+    public static function IFS(mixed ...$arguments)
+    {
+        $argumentCount = count($arguments);
+
+        if ($argumentCount % 2 != 0) {
+            return ExcelError::NA();
+        }
+        // We use instance of Exception as a falseValue in order to prevent string collision with value in cell
+        $falseValueException = new Exception();
+        for ($i = 0; $i < $argumentCount; $i += 2) {
+            $testValue = ($arguments[$i] === null) ? '' : Functions::flattenSingleValue($arguments[$i]);
+            $returnIfTrue = ($arguments[$i + 1] === null) ? '' : $arguments[$i + 1];
+            $result = self::statementIf($testValue, $returnIfTrue, $falseValueException);
+
+            if ($result !== $falseValueException) {
+                return $result;
+            }
+        }
+
+        return ExcelError::NA();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php
new file mode 100644
index 00000000..16bb5dd4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Logical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Operations
+{
+    use ArrayEnabled;
+
+    /**
+     * LOGICAL_AND.
+     *
+     * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
+     *
+     * Excel Function:
+     *        =AND(logical1[,logical2[, ...]])
+     *
+     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
+     *            or references that contain logical values.
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string
+     *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return bool|string the logical AND of the arguments
+     */
+    public static function logicalAnd(mixed ...$args)
+    {
+        return self::countTrueValues($args, fn (int $trueValueCount, int $count): bool => $trueValueCount === $count);
+    }
+
+    /**
+     * LOGICAL_OR.
+     *
+     * Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
+     *
+     * Excel Function:
+     *        =OR(logical1[,logical2[, ...]])
+     *
+     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
+     *            or references that contain logical values.
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string
+     *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @param mixed $args Data values
+     *
+     * @return bool|string the logical OR of the arguments
+     */
+    public static function logicalOr(mixed ...$args)
+    {
+        return self::countTrueValues($args, fn (int $trueValueCount): bool => $trueValueCount > 0);
+    }
+
+    /**
+     * LOGICAL_XOR.
+     *
+     * Returns the Exclusive Or logical operation for one or more supplied conditions.
+     * i.e. the Xor function returns TRUE if an odd number of the supplied conditions evaluate to TRUE,
+     *      and FALSE otherwise.
+     *
+     * Excel Function:
+     *        =XOR(logical1[,logical2[, ...]])
+     *
+     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
+     *            or references that contain logical values.
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string
+     *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @param mixed $args Data values
+     *
+     * @return bool|string the logical XOR of the arguments
+     */
+    public static function logicalXor(mixed ...$args)
+    {
+        return self::countTrueValues($args, fn (int $trueValueCount): bool => $trueValueCount % 2 === 1);
+    }
+
+    /**
+     * NOT.
+     *
+     * Returns the boolean inverse of the argument.
+     *
+     * Excel Function:
+     *        =NOT(logical)
+     *
+     *        The argument must evaluate to a logical value such as TRUE or FALSE
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string
+     *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @param mixed $logical A value or expression that can be evaluated to TRUE or FALSE
+     *                      Or can be an array of values
+     *
+     * @return array|bool|string the boolean inverse of the argument
+     *         If an array of values is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function NOT(mixed $logical = false): array|bool|string
+    {
+        if (is_array($logical)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $logical);
+        }
+
+        if (is_string($logical)) {
+            $logical = mb_strtoupper($logical, 'UTF-8');
+            if (($logical == 'TRUE') || ($logical == Calculation::getTRUE())) {
+                return false;
+            } elseif (($logical == 'FALSE') || ($logical == Calculation::getFALSE())) {
+                return true;
+            }
+
+            return ExcelError::VALUE();
+        }
+
+        return !$logical;
+    }
+
+    private static function countTrueValues(array $args, callable $func): bool|string
+    {
+        $trueValueCount = 0;
+        $count = 0;
+
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            ++$count;
+            // Is it a boolean value?
+            if (is_bool($arg)) {
+                $trueValueCount += $arg;
+            } elseif (is_string($arg)) {
+                $isLiteral = !Functions::isCellValue($k);
+                $arg = mb_strtoupper($arg, 'UTF-8');
+                if ($isLiteral && ($arg == 'TRUE' || $arg == Calculation::getTRUE())) {
+                    ++$trueValueCount;
+                } elseif ($isLiteral && ($arg == 'FALSE' || $arg == Calculation::getFALSE())) {
+                    //$trueValueCount += 0;
+                } else {
+                    --$count;
+                }
+            } elseif (is_int($arg) || is_float($arg)) {
+                $trueValueCount += (int) ($arg != 0);
+            } else {
+                --$count;
+            }
+        }
+
+        return ($count === 0) ? ExcelError::VALUE() : $func($trueValueCount, $count);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
new file mode 100644
index 00000000..0a5347b8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class Address
+{
+    use ArrayEnabled;
+
+    public const ADDRESS_ABSOLUTE = 1;
+    public const ADDRESS_COLUMN_RELATIVE = 2;
+    public const ADDRESS_ROW_RELATIVE = 3;
+    public const ADDRESS_RELATIVE = 4;
+
+    public const REFERENCE_STYLE_A1 = true;
+    public const REFERENCE_STYLE_R1C1 = false;
+
+    /**
+     * ADDRESS.
+     *
+     * Creates a cell address as text, given specified row and column numbers.
+     *
+     * Excel Function:
+     *        =ADDRESS(row, column, [relativity], [referenceStyle], [sheetText])
+     *
+     * @param mixed $row Row number (integer) to use in the cell reference
+     *                      Or can be an array of values
+     * @param mixed $column Column number (integer) to use in the cell reference
+     *                      Or can be an array of values
+     * @param mixed $relativity Integer flag indicating the type of reference to return
+     *                             1 or omitted    Absolute
+     *                             2               Absolute row; relative column
+     *                             3               Relative row; absolute column
+     *                             4               Relative
+     *                      Or can be an array of values
+     * @param mixed $referenceStyle A logical (boolean) value that specifies the A1 or R1C1 reference style.
+     *                                TRUE or omitted    ADDRESS returns an A1-style reference
+     *                                FALSE              ADDRESS returns an R1C1-style reference
+     *                      Or can be an array of values
+     * @param mixed $sheetName Optional Name of worksheet to use
+     *                      Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the $testValue argument, then the returned result will also be
+     *            an array with the same dimensions
+     */
+    public static function cell(mixed $row, mixed $column, mixed $relativity = 1, mixed $referenceStyle = true, mixed $sheetName = ''): array|string
+    {
+        if (
+            is_array($row) || is_array($column)
+            || is_array($relativity) || is_array($referenceStyle) || is_array($sheetName)
+        ) {
+            return self::evaluateArrayArguments(
+                [self::class, __FUNCTION__],
+                $row,
+                $column,
+                $relativity,
+                $referenceStyle,
+                $sheetName
+            );
+        }
+
+        $relativity = $relativity ?? 1;
+        $referenceStyle = $referenceStyle ?? true;
+
+        if (($row < 1) || ($column < 1)) {
+            return ExcelError::VALUE();
+        }
+
+        $sheetName = self::sheetName($sheetName);
+
+        if (is_int($referenceStyle)) {
+            $referenceStyle = (bool) $referenceStyle;
+        }
+        if ((!is_bool($referenceStyle)) || $referenceStyle === self::REFERENCE_STYLE_A1) {
+            return self::formatAsA1($row, $column, $relativity, $sheetName);
+        }
+
+        return self::formatAsR1C1($row, $column, $relativity, $sheetName);
+    }
+
+    private static function sheetName(string $sheetName): string
+    {
+        if ($sheetName > '') {
+            if (str_contains($sheetName, ' ') || str_contains($sheetName, '[')) {
+                $sheetName = "'{$sheetName}'";
+            }
+            $sheetName .= '!';
+        }
+
+        return $sheetName;
+    }
+
+    private static function formatAsA1(int $row, int $column, int $relativity, string $sheetName): string
+    {
+        $rowRelative = $columnRelative = '$';
+        if (($relativity == self::ADDRESS_COLUMN_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
+            $columnRelative = '';
+        }
+        if (($relativity == self::ADDRESS_ROW_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
+            $rowRelative = '';
+        }
+        $column = Coordinate::stringFromColumnIndex($column);
+
+        return "{$sheetName}{$columnRelative}{$column}{$rowRelative}{$row}";
+    }
+
+    private static function formatAsR1C1(int $row, int $column, int $relativity, string $sheetName): string
+    {
+        if (($relativity == self::ADDRESS_COLUMN_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
+            $column = "[{$column}]";
+        }
+        if (($relativity == self::ADDRESS_ROW_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
+            $row = "[{$row}]";
+        }
+        [$rowChar, $colChar] = AddressHelper::getRowAndColumnChars();
+
+        return "{$sheetName}$rowChar{$row}$colChar{$column}";
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
new file mode 100644
index 00000000..43e89c9b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
@@ -0,0 +1,249 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Internal\WildcardMatch;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class ExcelMatch
+{
+    use ArrayEnabled;
+
+    public const MATCHTYPE_SMALLEST_VALUE = -1;
+    public const MATCHTYPE_FIRST_VALUE = 0;
+    public const MATCHTYPE_LARGEST_VALUE = 1;
+
+    /**
+     * MATCH.
+     *
+     * The MATCH function searches for a specified item in a range of cells
+     *
+     * Excel Function:
+     *        =MATCH(lookup_value, lookup_array, [match_type])
+     *
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param mixed $lookupArray The range of cells being searched
+     * @param mixed $matchType The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below.
+     *                         If match_type is 1 or -1, the list has to be ordered.
+     *
+     * @return array|float|int|string The relative position of the found item
+     */
+    public static function MATCH(mixed $lookupValue, mixed $lookupArray, mixed $matchType = self::MATCHTYPE_LARGEST_VALUE): array|string|int|float
+    {
+        if (is_array($lookupValue)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $lookupValue, $lookupArray, $matchType);
+        }
+
+        $lookupArray = Functions::flattenArray($lookupArray);
+
+        try {
+            // Input validation
+            self::validateLookupValue($lookupValue);
+            $matchType = self::validateMatchType($matchType);
+            self::validateLookupArray($lookupArray);
+
+            $keySet = array_keys($lookupArray);
+            if ($matchType == self::MATCHTYPE_LARGEST_VALUE) {
+                // If match_type is 1 the list has to be processed from last to first
+                $lookupArray = array_reverse($lookupArray);
+                $keySet = array_reverse($keySet);
+            }
+
+            $lookupArray = self::prepareLookupArray($lookupArray, $matchType);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // MATCH() is not case sensitive, so we convert lookup value to be lower cased if it's a string type.
+        if (is_string($lookupValue)) {
+            $lookupValue = StringHelper::strToLower($lookupValue);
+        }
+
+        $valueKey = match ($matchType) {
+            self::MATCHTYPE_LARGEST_VALUE => self::matchLargestValue($lookupArray, $lookupValue, $keySet),
+            self::MATCHTYPE_FIRST_VALUE => self::matchFirstValue($lookupArray, $lookupValue),
+            default => self::matchSmallestValue($lookupArray, $lookupValue),
+        };
+
+        if ($valueKey !== null) {
+            return ++$valueKey;
+        }
+
+        // Unsuccessful in finding a match, return #N/A error value
+        return ExcelError::NA();
+    }
+
+    private static function matchFirstValue(array $lookupArray, mixed $lookupValue): int|string|null
+    {
+        if (is_string($lookupValue)) {
+            $valueIsString = true;
+            $wildcard = WildcardMatch::wildcard($lookupValue);
+        } else {
+            $valueIsString = false;
+            $wildcard = '';
+        }
+
+        $valueIsNumeric = is_int($lookupValue) || is_float($lookupValue);
+        foreach ($lookupArray as $i => $lookupArrayValue) {
+            if (
+                $valueIsString
+                && is_string($lookupArrayValue)
+            ) {
+                if (WildcardMatch::compare($lookupArrayValue, $wildcard)) {
+                    return $i; // wildcard match
+                }
+            } else {
+                if ($lookupArrayValue === $lookupValue) {
+                    return $i; // exact match
+                }
+                if (
+                    $valueIsNumeric
+                    && (is_float($lookupArrayValue) || is_int($lookupArrayValue))
+                    && $lookupArrayValue == $lookupValue
+                ) {
+                    return $i; // exact match
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private static function matchLargestValue(array $lookupArray, mixed $lookupValue, array $keySet): mixed
+    {
+        if (is_string($lookupValue)) {
+            if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+                $wildcard = WildcardMatch::wildcard($lookupValue);
+                foreach (array_reverse($lookupArray) as $i => $lookupArrayValue) {
+                    if (is_string($lookupArrayValue) && WildcardMatch::compare($lookupArrayValue, $wildcard)) {
+                        return $i;
+                    }
+                }
+            } else {
+                foreach ($lookupArray as $i => $lookupArrayValue) {
+                    if ($lookupArrayValue === $lookupValue) {
+                        return $keySet[$i];
+                    }
+                }
+            }
+        }
+        $valueIsNumeric = is_int($lookupValue) || is_float($lookupValue);
+        foreach ($lookupArray as $i => $lookupArrayValue) {
+            if ($valueIsNumeric && (is_int($lookupArrayValue) || is_float($lookupArrayValue))) {
+                if ($lookupArrayValue <= $lookupValue) {
+                    return array_search($i, $keySet);
+                }
+            }
+            $typeMatch = gettype($lookupValue) === gettype($lookupArrayValue);
+            if ($typeMatch && ($lookupArrayValue <= $lookupValue)) {
+                return array_search($i, $keySet);
+            }
+        }
+
+        return null;
+    }
+
+    private static function matchSmallestValue(array $lookupArray, mixed $lookupValue): int|string|null
+    {
+        $valueKey = null;
+        if (is_string($lookupValue)) {
+            if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+                $wildcard = WildcardMatch::wildcard($lookupValue);
+                foreach ($lookupArray as $i => $lookupArrayValue) {
+                    if (is_string($lookupArrayValue) && WildcardMatch::compare($lookupArrayValue, $wildcard)) {
+                        return $i;
+                    }
+                }
+            }
+        }
+
+        $valueIsNumeric = is_int($lookupValue) || is_float($lookupValue);
+        // The basic algorithm is:
+        // Iterate and keep the highest match until the next element is smaller than the searched value.
+        // Return immediately if perfect match is found
+        foreach ($lookupArray as $i => $lookupArrayValue) {
+            $typeMatch = gettype($lookupValue) === gettype($lookupArrayValue);
+            $bothNumeric = $valueIsNumeric && (is_int($lookupArrayValue) || is_float($lookupArrayValue));
+
+            if ($lookupArrayValue === $lookupValue) {
+                // Another "special" case. If a perfect match is found,
+                // the algorithm gives up immediately
+                return $i;
+            }
+            if ($bothNumeric && $lookupValue == $lookupArrayValue) {
+                return $i; // exact match, as above
+            }
+            if (($typeMatch || $bothNumeric) && $lookupArrayValue >= $lookupValue) {
+                $valueKey = $i;
+            } elseif ($typeMatch && $lookupArrayValue < $lookupValue) {
+                //Excel algorithm gives up immediately if the first element is smaller than the searched value
+                break;
+            }
+        }
+
+        return $valueKey;
+    }
+
+    private static function validateLookupValue(mixed $lookupValue): void
+    {
+        // Lookup_value type has to be number, text, or logical values
+        if ((!is_numeric($lookupValue)) && (!is_string($lookupValue)) && (!is_bool($lookupValue))) {
+            throw new Exception(ExcelError::NA());
+        }
+    }
+
+    private static function validateMatchType(mixed $matchType): int
+    {
+        // Match_type is 0, 1 or -1
+        // However Excel accepts other numeric values,
+        //  including numeric strings and floats.
+        //  It seems to just be interested in the sign.
+        if (!is_numeric($matchType)) {
+            throw new Exception(ExcelError::Value());
+        }
+        if ($matchType > 0) {
+            return self::MATCHTYPE_LARGEST_VALUE;
+        }
+        if ($matchType < 0) {
+            return self::MATCHTYPE_SMALLEST_VALUE;
+        }
+
+        return self::MATCHTYPE_FIRST_VALUE;
+    }
+
+    private static function validateLookupArray(array $lookupArray): void
+    {
+        // Lookup_array should not be empty
+        $lookupArraySize = count($lookupArray);
+        if ($lookupArraySize <= 0) {
+            throw new Exception(ExcelError::NA());
+        }
+    }
+
+    private static function prepareLookupArray(array $lookupArray, mixed $matchType): array
+    {
+        // Lookup_array should contain only number, text, or logical values, or empty (null) cells
+        foreach ($lookupArray as $i => $value) {
+            //    check the type of the value
+            if ((!is_numeric($value)) && (!is_string($value)) && (!is_bool($value)) && ($value !== null)) {
+                throw new Exception(ExcelError::NA());
+            }
+            // Convert strings to lowercase for case-insensitive testing
+            if (is_string($value)) {
+                $lookupArray[$i] = StringHelper::strToLower($value);
+            }
+            if (
+                ($value === null)
+                && (($matchType == self::MATCHTYPE_LARGEST_VALUE) || ($matchType == self::MATCHTYPE_SMALLEST_VALUE))
+            ) {
+                unset($lookupArray[$i]);
+            }
+        }
+
+        return $lookupArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php
new file mode 100644
index 00000000..e3b6cbe5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Filter
+{
+    public static function filter(array $lookupArray, mixed $matchArray, mixed $ifEmpty = null): mixed
+    {
+        if (!is_array($matchArray)) {
+            return ExcelError::VALUE();
+        }
+
+        $matchArray = self::enumerateArrayKeys($matchArray);
+
+        $result = (Matrix::isColumnVector($matchArray))
+            ? self::filterByRow($lookupArray, $matchArray)
+            : self::filterByColumn($lookupArray, $matchArray);
+
+        if (empty($result)) {
+            return $ifEmpty ?? ExcelError::CALC();
+        }
+
+        return array_values(array_map('array_values', $result));
+    }
+
+    private static function enumerateArrayKeys(array $sortArray): array
+    {
+        array_walk(
+            $sortArray,
+            function (&$columns): void {
+                if (is_array($columns)) {
+                    $columns = array_values($columns);
+                }
+            }
+        );
+
+        return array_values($sortArray);
+    }
+
+    private static function filterByRow(array $lookupArray, array $matchArray): array
+    {
+        $matchArray = array_values(array_column($matchArray, 0));
+
+        return array_filter(
+            array_values($lookupArray),
+            fn ($index): bool => (bool) $matchArray[$index],
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    private static function filterByColumn(array $lookupArray, array $matchArray): array
+    {
+        $lookupArray = Matrix::transpose($lookupArray);
+
+        if (count($matchArray) === 1) {
+            $matchArray = array_pop($matchArray);
+        }
+
+        array_walk(
+            $matchArray,
+            function (&$value): void {
+                $value = [$value];
+            }
+        );
+
+        $result = self::filterByRow($lookupArray, $matchArray);
+
+        return Matrix::transpose($result);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
new file mode 100644
index 00000000..5c7f4051
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+
+class Formula
+{
+    /**
+     * FORMULATEXT.
+     *
+     * @param mixed $cellReference The cell to check
+     * @param ?Cell $cell The current cell (containing this formula)
+     */
+    public static function text(mixed $cellReference = '', ?Cell $cell = null): string
+    {
+        if ($cell === null) {
+            return ExcelError::REF();
+        }
+
+        preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellReference, $matches);
+
+        $cellReference = $matches[6] . $matches[7];
+        $worksheetName = trim($matches[3], "'");
+        $worksheet = (!empty($worksheetName))
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($worksheetName)
+            : $cell->getWorksheet();
+
+        if (
+            $worksheet === null
+            || !$worksheet->cellExists($cellReference)
+            || !$worksheet->getCell($cellReference)->isFormula()
+        ) {
+            return ExcelError::NA();
+        }
+
+        return $worksheet->getCell($cellReference)->getValue();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
new file mode 100644
index 00000000..fd83700b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class HLookup extends LookupBase
+{
+    use ArrayEnabled;
+
+    /**
+     * HLOOKUP
+     * The HLOOKUP function searches for value in the top-most row of lookup_array and returns the value
+     *     in the same column based on the index_number.
+     *
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param mixed $lookupArray The range of cells being searched
+     * @param mixed $indexNumber The row number in table_array from which the matching value must be returned.
+     *                                The first row is 1.
+     * @param mixed $notExactMatch determines if you are looking for an exact match based on lookup_value
+     *
+     * @return mixed The value of the found cell
+     */
+    public static function lookup(mixed $lookupValue, mixed $lookupArray, mixed $indexNumber, mixed $notExactMatch = true): mixed
+    {
+        if (is_array($lookupValue) || is_array($indexNumber)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $lookupValue, $lookupArray, $indexNumber, $notExactMatch);
+        }
+
+        $notExactMatch = (bool) ($notExactMatch ?? true);
+
+        try {
+            self::validateLookupArray($lookupArray);
+            $lookupArray = self::convertLiteralArray($lookupArray);
+            $indexNumber = self::validateIndexLookup($lookupArray, $indexNumber);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $f = array_keys($lookupArray);
+        $firstRow = reset($f);
+        if ((!is_array($lookupArray[$firstRow])) || ($indexNumber > count($lookupArray))) {
+            return ExcelError::REF();
+        }
+
+        $firstkey = $f[0] - 1;
+        $returnColumn = $firstkey + $indexNumber;
+        $firstColumn = array_shift($f) ?? 1;
+        $rowNumber = self::hLookupSearch($lookupValue, $lookupArray, $firstColumn, $notExactMatch);
+
+        if ($rowNumber !== null) {
+            //  otherwise return the appropriate value
+            return $lookupArray[$returnColumn][Coordinate::stringFromColumnIndex($rowNumber)];
+        }
+
+        return ExcelError::NA();
+    }
+
+    /**
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param  int|string $column
+     */
+    private static function hLookupSearch(mixed $lookupValue, array $lookupArray, $column, bool $notExactMatch): ?int
+    {
+        $lookupLower = StringHelper::strToLower((string) $lookupValue);
+
+        $rowNumber = null;
+        foreach ($lookupArray[$column] as $rowKey => $rowData) {
+            // break if we have passed possible keys
+            $bothNumeric = is_numeric($lookupValue) && is_numeric($rowData);
+            $bothNotNumeric = !is_numeric($lookupValue) && !is_numeric($rowData);
+            $cellDataLower = StringHelper::strToLower((string) $rowData);
+
+            if (
+                $notExactMatch
+                && (($bothNumeric && $rowData > $lookupValue) || ($bothNotNumeric && $cellDataLower > $lookupLower))
+            ) {
+                break;
+            }
+
+            $rowNumber = self::checkMatch(
+                $bothNumeric,
+                $bothNotNumeric,
+                $notExactMatch,
+                Coordinate::columnIndexFromString($rowKey),
+                $cellDataLower,
+                $lookupLower,
+                $rowNumber
+            );
+        }
+
+        return $rowNumber;
+    }
+
+    private static function convertLiteralArray(array $lookupArray): array
+    {
+        if (array_key_exists(0, $lookupArray)) {
+            $lookupArray2 = [];
+            $row = 0;
+            foreach ($lookupArray as $arrayVal) {
+                ++$row;
+                if (!is_array($arrayVal)) {
+                    $arrayVal = [$arrayVal];
+                }
+                $arrayVal2 = [];
+                foreach ($arrayVal as $key2 => $val2) {
+                    $index = Coordinate::stringFromColumnIndex($key2 + 1);
+                    $arrayVal2[$index] = $val2;
+                }
+                $lookupArray2[$row] = $arrayVal2;
+            }
+            $lookupArray = $lookupArray2;
+        }
+
+        return $lookupArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
new file mode 100644
index 00000000..191144bf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Helpers
+{
+    public const CELLADDRESS_USE_A1 = true;
+
+    public const CELLADDRESS_USE_R1C1 = false;
+
+    private static function convertR1C1(string &$cellAddress1, ?string &$cellAddress2, bool $a1, ?int $baseRow = null, ?int $baseCol = null): string
+    {
+        if ($a1 === self::CELLADDRESS_USE_R1C1) {
+            $cellAddress1 = AddressHelper::convertToA1($cellAddress1, $baseRow ?? 1, $baseCol ?? 1);
+            if ($cellAddress2) {
+                $cellAddress2 = AddressHelper::convertToA1($cellAddress2, $baseRow ?? 1, $baseCol ?? 1);
+            }
+        }
+
+        return $cellAddress1 . ($cellAddress2 ? ":$cellAddress2" : '');
+    }
+
+    private static function adjustSheetTitle(string &$sheetTitle, ?string $value): void
+    {
+        if ($sheetTitle) {
+            $sheetTitle .= '!';
+            if (stripos($value ?? '', $sheetTitle) === 0) {
+                $sheetTitle = '';
+            }
+        }
+    }
+
+    public static function extractCellAddresses(string $cellAddress, bool $a1, Worksheet $sheet, string $sheetName = '', ?int $baseRow = null, ?int $baseCol = null): array
+    {
+        $cellAddress1 = $cellAddress;
+        $cellAddress2 = null;
+        $namedRange = DefinedName::resolveName($cellAddress1, $sheet, $sheetName);
+        if ($namedRange !== null) {
+            $workSheet = $namedRange->getWorkSheet();
+            $sheetTitle = ($workSheet === null) ? '' : $workSheet->getTitle();
+            $value = (string) preg_replace('/^=/', '', $namedRange->getValue());
+            self::adjustSheetTitle($sheetTitle, $value);
+            $cellAddress1 = $sheetTitle . $value;
+            $cellAddress = $cellAddress1;
+            $a1 = self::CELLADDRESS_USE_A1;
+        }
+        if (str_contains($cellAddress, ':')) {
+            [$cellAddress1, $cellAddress2] = explode(':', $cellAddress);
+        }
+        $cellAddress = self::convertR1C1($cellAddress1, $cellAddress2, $a1, $baseRow, $baseCol);
+
+        return [$cellAddress1, $cellAddress2, $cellAddress];
+    }
+
+    public static function extractWorksheet(string $cellAddress, Cell $cell): array
+    {
+        $sheetName = '';
+        if (str_contains($cellAddress, '!')) {
+            [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+            $sheetName = trim($sheetName, "'");
+        }
+
+        $worksheet = ($sheetName !== '')
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($sheetName)
+            : $cell->getWorksheet();
+
+        return [$cellAddress, $worksheet, $sheetName];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php
new file mode 100644
index 00000000..455442a8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+
+class Hyperlink
+{
+    /**
+     * HYPERLINK.
+     *
+     * Excel Function:
+     *        =HYPERLINK(linkURL, [displayName])
+     *
+     * @param mixed $linkURL Expect string. Value to check, is also the value returned when no error
+     * @param mixed $displayName Expect string. Value to return when testValue is an error condition
+     * @param ?Cell $cell The cell to set the hyperlink in
+     *
+     * @return string The value of $displayName (or $linkURL if $displayName was blank)
+     */
+    public static function set(mixed $linkURL = '', mixed $displayName = null, ?Cell $cell = null): string
+    {
+        $linkURL = ($linkURL === null) ? '' : Functions::flattenSingleValue($linkURL);
+        $displayName = ($displayName === null) ? '' : Functions::flattenSingleValue($displayName);
+
+        if ((!is_object($cell)) || (trim($linkURL) == '')) {
+            return ExcelError::REF();
+        }
+
+        if ((is_object($displayName)) || trim($displayName) == '') {
+            $displayName = $linkURL;
+        }
+
+        $cell->getHyperlink()->setUrl($linkURL);
+        $cell->getHyperlink()->setTooltip($displayName);
+
+        return $displayName;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
new file mode 100644
index 00000000..d53900d4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Indirect
+{
+    /**
+     * Determine whether cell address is in A1 (true) or R1C1 (false) format.
+     *
+     * @param mixed $a1fmt Expect bool Helpers::CELLADDRESS_USE_A1 or CELLADDRESS_USE_R1C1,
+     *                      but can be provided as numeric which is cast to bool
+     */
+    private static function a1Format(mixed $a1fmt): bool
+    {
+        $a1fmt = Functions::flattenSingleValue($a1fmt);
+        if ($a1fmt === null) {
+            return Helpers::CELLADDRESS_USE_A1;
+        }
+        if (is_string($a1fmt)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (bool) $a1fmt;
+    }
+
+    /**
+     * Convert cellAddress to string, verify not null string.
+     */
+    private static function validateAddress(array|string|null $cellAddress): string
+    {
+        $cellAddress = Functions::flattenSingleValue($cellAddress);
+        if (!is_string($cellAddress) || !$cellAddress) {
+            throw new Exception(ExcelError::REF());
+        }
+
+        return $cellAddress;
+    }
+
+    /**
+     * INDIRECT.
+     *
+     * Returns the reference specified by a text string.
+     * References are immediately evaluated to display their contents.
+     *
+     * Excel Function:
+     *        =INDIRECT(cellAddress, bool) where the bool argument is optional
+     *
+     * @param array|string $cellAddress $cellAddress The cell address of the current cell (containing this formula)
+     * @param mixed $a1fmt Expect bool Helpers::CELLADDRESS_USE_A1 or CELLADDRESS_USE_R1C1,
+     *                      but can be provided as numeric which is cast to bool
+     * @param Cell $cell The current cell (containing this formula)
+     *
+     * @return array|string An array containing a cell or range of cells, or a string on error
+     */
+    public static function INDIRECT($cellAddress, mixed $a1fmt, Cell $cell): string|array
+    {
+        [$baseCol, $baseRow] = Coordinate::indexesFromString($cell->getCoordinate());
+
+        try {
+            $a1 = self::a1Format($a1fmt);
+            $cellAddress = self::validateAddress($cellAddress);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        [$cellAddress, $worksheet, $sheetName] = Helpers::extractWorksheet($cellAddress, $cell);
+
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_COLUMNRANGE_RELATIVE . '$/miu', $cellAddress, $matches)) {
+            $cellAddress = self::handleRowColumnRanges($worksheet, ...explode(':', $cellAddress));
+        } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_ROWRANGE_RELATIVE . '$/miu', $cellAddress, $matches)) {
+            $cellAddress = self::handleRowColumnRanges($worksheet, ...explode(':', $cellAddress));
+        }
+
+        try {
+            [$cellAddress1, $cellAddress2, $cellAddress] = Helpers::extractCellAddresses($cellAddress, $a1, $cell->getWorkSheet(), $sheetName, $baseRow, $baseCol);
+        } catch (Exception) {
+            return ExcelError::REF();
+        }
+
+        if (
+            (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $cellAddress1, $matches))
+            || (($cellAddress2 !== null) && (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $cellAddress2, $matches)))
+        ) {
+            return ExcelError::REF();
+        }
+
+        return self::extractRequiredCells($worksheet, $cellAddress);
+    }
+
+    /**
+     * Extract range values.
+     *
+     * @return array Array of values in range if range contains more than one element.
+     *                  Otherwise, a single value is returned.
+     */
+    private static function extractRequiredCells(?Worksheet $worksheet, string $cellAddress): array
+    {
+        return Calculation::getInstance($worksheet !== null ? $worksheet->getParent() : null)
+            ->extractCellRange($cellAddress, $worksheet, false);
+    }
+
+    private static function handleRowColumnRanges(?Worksheet $worksheet, string $start, string $end): string
+    {
+        // Being lazy, we're only checking a single row/column to get the max
+        if (ctype_digit($start) && $start <= 1048576) {
+            // Max 16,384 columns for Excel2007
+            $endColRef = ($worksheet !== null) ? $worksheet->getHighestDataColumn((int) $start) : AddressRange::MAX_COLUMN;
+
+            return "A{$start}:{$endColRef}{$end}";
+        } elseif (ctype_alpha($start) && strlen($start) <= 3) {
+            // Max 1,048,576 rows for Excel2007
+            $endRowRef = ($worksheet !== null) ? $worksheet->getHighestDataRow($start) : AddressRange::MAX_ROW;
+
+            return "{$start}1:{$end}{$endRowRef}";
+        }
+
+        return "{$start}:{$end}";
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
new file mode 100644
index 00000000..b1876207
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Lookup
+{
+    use ArrayEnabled;
+
+    /**
+     * LOOKUP
+     * The LOOKUP function searches for value either from a one-row or one-column range or from an array.
+     *
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param mixed $lookupVector The range of cells being searched
+     * @param null|mixed $resultVector The column from which the matching value must be returned
+     *
+     * @return mixed The value of the found cell
+     */
+    public static function lookup(mixed $lookupValue, mixed $lookupVector, $resultVector = null): mixed
+    {
+        if (is_array($lookupValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $lookupValue, $lookupVector, $resultVector);
+        }
+
+        if (!is_array($lookupVector)) {
+            return ExcelError::NA();
+        }
+        $hasResultVector = isset($resultVector);
+        $lookupRows = self::rowCount($lookupVector);
+        $lookupColumns = self::columnCount($lookupVector);
+        // we correctly orient our results
+        if (($lookupRows === 1 && $lookupColumns > 1) || (!$hasResultVector && $lookupRows === 2 && $lookupColumns !== 2)) {
+            $lookupVector = Matrix::transpose($lookupVector);
+            $lookupRows = self::rowCount($lookupVector);
+            $lookupColumns = self::columnCount($lookupVector);
+        }
+
+        $resultVector = self::verifyResultVector($resultVector ?? $lookupVector);
+
+        if ($lookupRows === 2 && !$hasResultVector) {
+            $resultVector = array_pop($lookupVector);
+            $lookupVector = array_shift($lookupVector);
+        }
+
+        if ($lookupColumns !== 2) {
+            $lookupVector = self::verifyLookupValues($lookupVector, $resultVector);
+        }
+
+        return VLookup::lookup($lookupValue, $lookupVector, 2);
+    }
+
+    private static function verifyLookupValues(array $lookupVector, array $resultVector): array
+    {
+        foreach ($lookupVector as &$value) {
+            if (is_array($value)) {
+                $k = array_keys($value);
+                $key1 = $key2 = array_shift($k);
+                ++$key2;
+                $dataValue1 = $value[$key1];
+            } else {
+                $key1 = 0;
+                $key2 = 1;
+                $dataValue1 = $value;
+            }
+
+            $dataValue2 = array_shift($resultVector);
+            if (is_array($dataValue2)) {
+                $dataValue2 = array_shift($dataValue2);
+            }
+            $value = [$key1 => $dataValue1, $key2 => $dataValue2];
+        }
+        unset($value);
+
+        return $lookupVector;
+    }
+
+    private static function verifyResultVector(array $resultVector): array
+    {
+        $resultRows = self::rowCount($resultVector);
+        $resultColumns = self::columnCount($resultVector);
+
+        // we correctly orient our results
+        if ($resultRows === 1 && $resultColumns > 1) {
+            $resultVector = Matrix::transpose($resultVector);
+        }
+
+        return $resultVector;
+    }
+
+    private static function rowCount(array $dataArray): int
+    {
+        return count($dataArray);
+    }
+
+    private static function columnCount(array $dataArray): int
+    {
+        $rowKeys = array_keys($dataArray);
+        $row = array_shift($rowKeys);
+
+        return count($dataArray[$row]);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
new file mode 100644
index 00000000..7d21cce0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+abstract class LookupBase
+{
+    protected static function validateLookupArray(mixed $lookup_array): void
+    {
+        if (!is_array($lookup_array)) {
+            throw new Exception(ExcelError::REF());
+        }
+    }
+
+    /** @param float|int|string $index_number */
+    protected static function validateIndexLookup(array $lookup_array, $index_number): int
+    {
+        // index_number must be a number greater than or equal to 1.
+        // Excel results are inconsistent when index is non-numeric.
+        // VLOOKUP(whatever, whatever, SQRT(-1)) yields NUM error, but
+        // VLOOKUP(whatever, whatever, cellref) yields REF error
+        //   when cellref is '=SQRT(-1)'. So just try our best here.
+        // Similar results if string (literal yields VALUE, cellRef REF).
+        if (!is_numeric($index_number)) {
+            throw new Exception(ExcelError::throwError($index_number));
+        }
+        if ($index_number < 1) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        // index_number must be less than or equal to the number of columns in lookup_array
+        if (empty($lookup_array)) {
+            throw new Exception(ExcelError::REF());
+        }
+
+        return (int) $index_number;
+    }
+
+    protected static function checkMatch(
+        bool $bothNumeric,
+        bool $bothNotNumeric,
+        bool $notExactMatch,
+        int $rowKey,
+        string $cellDataLower,
+        string $lookupLower,
+        ?int $rowNumber
+    ): ?int {
+        // remember the last key, but only if datatypes match
+        if ($bothNumeric || $bothNotNumeric) {
+            // Spreadsheets software returns first exact match,
+            // we have sorted and we might have broken key orders
+            // we want the first one (by its initial index)
+            if ($notExactMatch) {
+                $rowNumber = $rowKey;
+            } elseif (($cellDataLower == $lookupLower) && (($rowNumber === null) || ($rowKey < $rowNumber))) {
+                $rowNumber = $rowKey;
+            }
+        }
+
+        return $rowNumber;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php
new file mode 100644
index 00000000..74c313cc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class LookupRefValidations
+{
+    public static function validateInt(mixed $value): int
+    {
+        if (!is_numeric($value)) {
+            if (ErrorValue::isError($value)) {
+                throw new Exception($value);
+            }
+
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) floor((float) $value);
+    }
+
+    public static function validatePositiveInt(mixed $value, bool $allowZero = true): int
+    {
+        $value = self::validateInt($value);
+
+        if (($allowZero === false && $value <= 0) || $value < 0) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
new file mode 100644
index 00000000..228b4644
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Matrix
+{
+    use ArrayEnabled;
+
+    /**
+     * Helper function; NOT an implementation of any Excel Function.
+     */
+    public static function isColumnVector(array $values): bool
+    {
+        return count($values, COUNT_RECURSIVE) === (count($values, COUNT_NORMAL) * 2);
+    }
+
+    /**
+     * Helper function; NOT an implementation of any Excel Function.
+     */
+    public static function isRowVector(array $values): bool
+    {
+        return count($values, COUNT_RECURSIVE) > 1
+            && (count($values, COUNT_NORMAL) === 1 || count($values, COUNT_RECURSIVE) === count($values, COUNT_NORMAL));
+    }
+
+    /**
+     * TRANSPOSE.
+     *
+     * @param array|mixed $matrixData A matrix of values
+     */
+    public static function transpose($matrixData): array
+    {
+        $returnMatrix = [];
+        if (!is_array($matrixData)) {
+            $matrixData = [[$matrixData]];
+        }
+
+        $column = 0;
+        foreach ($matrixData as $matrixRow) {
+            $row = 0;
+            foreach ($matrixRow as $matrixCell) {
+                $returnMatrix[$row][$column] = $matrixCell;
+                ++$row;
+            }
+            ++$column;
+        }
+
+        return $returnMatrix;
+    }
+
+    /**
+     * INDEX.
+     *
+     * Uses an index to choose a value from a reference or array
+     *
+     * Excel Function:
+     *        =INDEX(range_array, row_num, [column_num], [area_num])
+     *
+     * @param mixed $matrix A range of cells or an array constant
+     * @param mixed $rowNum The row in the array or range from which to return a value.
+     *                          If row_num is omitted, column_num is required.
+     *                      Or can be an array of values
+     * @param mixed $columnNum The column in the array or range from which to return a value.
+     *                          If column_num is omitted, row_num is required.
+     *                      Or can be an array of values
+     *
+     * TODO Provide support for area_num, currently not supported
+     *
+     * @return mixed the value of a specified cell or array of cells
+     *         If an array of values is passed as the $rowNum and/or $columnNum arguments, then the returned result
+     *            will also be an array with the same dimensions
+     */
+    public static function index(mixed $matrix, mixed $rowNum = 0, mixed $columnNum = null): mixed
+    {
+        if (is_array($rowNum) || is_array($columnNum)) {
+            return self::evaluateArrayArgumentsSubsetFrom([self::class, __FUNCTION__], 1, $matrix, $rowNum, $columnNum);
+        }
+
+        $rowNum = $rowNum ?? 0;
+        $columnNum = $columnNum ?? 0;
+
+        try {
+            $rowNum = LookupRefValidations::validatePositiveInt($rowNum);
+            $columnNum = LookupRefValidations::validatePositiveInt($columnNum);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (is_array($matrix) && count($matrix) === 1 && $rowNum > 1) {
+            $matrixKey = array_keys($matrix)[0];
+            if (is_array($matrix[$matrixKey])) {
+                $tempMatrix = [];
+                foreach ($matrix[$matrixKey] as $key => $value) {
+                    $tempMatrix[$key] = [$value];
+                }
+                $matrix = $tempMatrix;
+            }
+        }
+
+        if (!is_array($matrix) || ($rowNum > count($matrix))) {
+            return ExcelError::REF();
+        }
+
+        $rowKeys = array_keys($matrix);
+        $columnKeys = @array_keys($matrix[$rowKeys[0]]);
+
+        if ($columnNum > count($columnKeys)) {
+            return ExcelError::REF();
+        }
+
+        if ($columnNum === 0) {
+            return self::extractRowValue($matrix, $rowKeys, $rowNum);
+        }
+
+        $columnNum = $columnKeys[--$columnNum];
+        if ($rowNum === 0) {
+            return array_map(
+                fn ($value): array => [$value],
+                array_column($matrix, $columnNum)
+            );
+        }
+        $rowNum = $rowKeys[--$rowNum];
+
+        return $matrix[$rowNum][$columnNum];
+    }
+
+    private static function extractRowValue(array $matrix, array $rowKeys, int $rowNum): mixed
+    {
+        if ($rowNum === 0) {
+            return $matrix;
+        }
+
+        $rowNum = $rowKeys[--$rowNum];
+        $row = $matrix[$rowNum];
+        if (is_array($row)) {
+            return [$rowNum => $row];
+        }
+
+        return $row;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
new file mode 100644
index 00000000..260ccc3a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Offset
+{
+    /**
+     * OFFSET.
+     *
+     * Returns a reference to a range that is a specified number of rows and columns from a cell or range of cells.
+     * The reference that is returned can be a single cell or a range of cells. You can specify the number of rows and
+     * the number of columns to be returned.
+     *
+     * Excel Function:
+     *        =OFFSET(cellAddress, rows, cols, [height], [width])
+     *
+     * @param null|string $cellAddress The reference from which you want to base the offset.
+     *                                     Reference must refer to a cell or range of adjacent cells;
+     *                                     otherwise, OFFSET returns the #VALUE! error value.
+     * @param mixed $rows The number of rows, up or down, that you want the upper-left cell to refer to.
+     *                        Using 5 as the rows argument specifies that the upper-left cell in the
+     *                        reference is five rows below reference. Rows can be positive (which means
+     *                        below the starting reference) or negative (which means above the starting
+     *                        reference).
+     * @param mixed $columns The number of columns, to the left or right, that you want the upper-left cell
+     *                           of the result to refer to. Using 5 as the cols argument specifies that the
+     *                           upper-left cell in the reference is five columns to the right of reference.
+     *                           Cols can be positive (which means to the right of the starting reference)
+     *                           or negative (which means to the left of the starting reference).
+     * @param mixed $height The height, in number of rows, that you want the returned reference to be.
+     *                          Height must be a positive number.
+     * @param mixed $width The width, in number of columns, that you want the returned reference to be.
+     *                         Width must be a positive number.
+     *
+     * @return array|string An array containing a cell or range of cells, or a string on error
+     */
+    public static function OFFSET(?string $cellAddress = null, mixed $rows = 0, mixed $columns = 0, mixed $height = null, mixed $width = null, ?Cell $cell = null): string|array
+    {
+        $rows = Functions::flattenSingleValue($rows);
+        $columns = Functions::flattenSingleValue($columns);
+        $height = Functions::flattenSingleValue($height);
+        $width = Functions::flattenSingleValue($width);
+
+        if ($cellAddress === null || $cellAddress === '') {
+            return ExcelError::VALUE();
+        }
+
+        if (!is_object($cell)) {
+            return ExcelError::REF();
+        }
+
+        [$cellAddress, $worksheet] = self::extractWorksheet($cellAddress, $cell);
+
+        $startCell = $endCell = $cellAddress;
+        if (strpos($cellAddress, ':')) {
+            [$startCell, $endCell] = explode(':', $cellAddress);
+        }
+        [$startCellColumn, $startCellRow] = Coordinate::coordinateFromString($startCell);
+        [$endCellColumn, $endCellRow] = Coordinate::coordinateFromString($endCell);
+
+        $startCellRow += $rows;
+        $startCellColumn = Coordinate::columnIndexFromString($startCellColumn) - 1;
+        $startCellColumn += $columns;
+
+        if (($startCellRow <= 0) || ($startCellColumn < 0)) {
+            return ExcelError::REF();
+        }
+
+        $endCellColumn = self::adjustEndCellColumnForWidth($endCellColumn, $width, $startCellColumn, $columns);
+        $startCellColumn = Coordinate::stringFromColumnIndex($startCellColumn + 1);
+
+        $endCellRow = self::adustEndCellRowForHeight($height, $startCellRow, $rows, $endCellRow);
+
+        if (($endCellRow <= 0) || ($endCellColumn < 0)) {
+            return ExcelError::REF();
+        }
+        $endCellColumn = Coordinate::stringFromColumnIndex($endCellColumn + 1);
+
+        $cellAddress = "{$startCellColumn}{$startCellRow}";
+        if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
+            $cellAddress .= ":{$endCellColumn}{$endCellRow}";
+        }
+
+        return self::extractRequiredCells($worksheet, $cellAddress);
+    }
+
+    private static function extractRequiredCells(?Worksheet $worksheet, string $cellAddress): array
+    {
+        return Calculation::getInstance($worksheet !== null ? $worksheet->getParent() : null)
+            ->extractCellRange($cellAddress, $worksheet, false);
+    }
+
+    private static function extractWorksheet(?string $cellAddress, Cell $cell): array
+    {
+        $cellAddress = self::assessCellAddress($cellAddress ?? '', $cell);
+
+        $sheetName = '';
+        if (str_contains($cellAddress, '!')) {
+            [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+            $sheetName = trim($sheetName, "'");
+        }
+
+        $worksheet = ($sheetName !== '')
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($sheetName)
+            : $cell->getWorksheet();
+
+        return [$cellAddress, $worksheet];
+    }
+
+    private static function assessCellAddress(string $cellAddress, Cell $cell): string
+    {
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $cellAddress) !== false) {
+            $cellAddress = Functions::expandDefinedName($cellAddress, $cell);
+        }
+
+        return $cellAddress;
+    }
+
+    private static function adjustEndCellColumnForWidth(string $endCellColumn, mixed $width, int $startCellColumn, mixed $columns): int
+    {
+        $endCellColumn = Coordinate::columnIndexFromString($endCellColumn) - 1;
+        if (($width !== null) && (!is_object($width))) {
+            $endCellColumn = $startCellColumn + (int) $width - 1;
+        } else {
+            $endCellColumn += (int) $columns;
+        }
+
+        return $endCellColumn;
+    }
+
+    private static function adustEndCellRowForHeight(mixed $height, int $startCellRow, mixed $rows, mixed $endCellRow): int
+    {
+        if (($height !== null) && (!is_object($height))) {
+            $endCellRow = $startCellRow + (int) $height - 1;
+        } else {
+            $endCellRow += (int) $rows;
+        }
+
+        return $endCellRow;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
new file mode 100644
index 00000000..ea3ce44c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class RowColumnInformation
+{
+    /**
+     * Test if cellAddress is null or whitespace string.
+     *
+     * @param null|array|string $cellAddress A reference to a range of cells
+     */
+    private static function cellAddressNullOrWhitespace($cellAddress): bool
+    {
+        return $cellAddress === null || (!is_array($cellAddress) && trim($cellAddress) === '');
+    }
+
+    private static function cellColumn(?Cell $cell): int
+    {
+        return ($cell !== null) ? Coordinate::columnIndexFromString($cell->getColumn()) : 1;
+    }
+
+    /**
+     * COLUMN.
+     *
+     * Returns the column number of the given cell reference
+     *     If the cell reference is a range of cells, COLUMN returns the column numbers of each column
+     *        in the reference as a horizontal array.
+     *     If cell reference is omitted, and the function is being called through the calculation engine,
+     *        then it is assumed to be the reference of the cell in which the COLUMN function appears;
+     *        otherwise this function returns 1.
+     *
+     * Excel Function:
+     *        =COLUMN([cellAddress])
+     *
+     * @param null|array|string $cellAddress A reference to a range of cells for which you want the column numbers
+     *
+     * @return int|int[]
+     */
+    public static function COLUMN($cellAddress = null, ?Cell $cell = null): int|array
+    {
+        if (self::cellAddressNullOrWhitespace($cellAddress)) {
+            return self::cellColumn($cell);
+        }
+
+        if (is_array($cellAddress)) {
+            foreach ($cellAddress as $columnKey => $value) {
+                $columnKey = (string) preg_replace('/[^a-z]/i', '', $columnKey);
+
+                return Coordinate::columnIndexFromString($columnKey);
+            }
+
+            return self::cellColumn($cell);
+        }
+
+        $cellAddress = $cellAddress ?? '';
+        if ($cell != null) {
+            [,, $sheetName] = Helpers::extractWorksheet($cellAddress, $cell);
+            [,, $cellAddress] = Helpers::extractCellAddresses($cellAddress, true, $cell->getWorksheet(), $sheetName);
+        }
+        [, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+        $cellAddress ??= '';
+
+        if (str_contains($cellAddress, ':')) {
+            [$startAddress, $endAddress] = explode(':', $cellAddress);
+            $startAddress = (string) preg_replace('/[^a-z]/i', '', $startAddress);
+            $endAddress = (string) preg_replace('/[^a-z]/i', '', $endAddress);
+
+            return range(
+                Coordinate::columnIndexFromString($startAddress),
+                Coordinate::columnIndexFromString($endAddress)
+            );
+        }
+
+        $cellAddress = (string) preg_replace('/[^a-z]/i', '', $cellAddress);
+
+        return Coordinate::columnIndexFromString($cellAddress);
+    }
+
+    /**
+     * COLUMNS.
+     *
+     * Returns the number of columns in an array or reference.
+     *
+     * Excel Function:
+     *        =COLUMNS(cellAddress)
+     *
+     * @param null|array|string $cellAddress An array or array formula, or a reference to a range of cells
+     *                                          for which you want the number of columns
+     *
+     * @return int|string The number of columns in cellAddress, or a string if arguments are invalid
+     */
+    public static function COLUMNS($cellAddress = null)
+    {
+        if (self::cellAddressNullOrWhitespace($cellAddress)) {
+            return 1;
+        }
+        if (!is_array($cellAddress)) {
+            return ExcelError::VALUE();
+        }
+
+        reset($cellAddress);
+        $isMatrix = (is_numeric(key($cellAddress)));
+        [$columns, $rows] = Calculation::getMatrixDimensions($cellAddress);
+
+        if ($isMatrix) {
+            return $rows;
+        }
+
+        return $columns;
+    }
+
+    private static function cellRow(?Cell $cell): int
+    {
+        return ($cell !== null) ? $cell->getRow() : 1;
+    }
+
+    /**
+     * ROW.
+     *
+     * Returns the row number of the given cell reference
+     *     If the cell reference is a range of cells, ROW returns the row numbers of each row in the reference
+     *        as a vertical array.
+     *     If cell reference is omitted, and the function is being called through the calculation engine,
+     *        then it is assumed to be the reference of the cell in which the ROW function appears;
+     *        otherwise this function returns 1.
+     *
+     * Excel Function:
+     *        =ROW([cellAddress])
+     *
+     * @param null|array|string $cellAddress A reference to a range of cells for which you want the row numbers
+     *
+     * @return int|mixed[]
+     */
+    public static function ROW($cellAddress = null, ?Cell $cell = null): int|array
+    {
+        if (self::cellAddressNullOrWhitespace($cellAddress)) {
+            return self::cellRow($cell);
+        }
+
+        if (is_array($cellAddress)) {
+            foreach ($cellAddress as $rowKey => $rowValue) {
+                foreach ($rowValue as $columnKey => $cellValue) {
+                    return (int) preg_replace('/\D/', '', $rowKey);
+                }
+            }
+
+            return self::cellRow($cell);
+        }
+
+        $cellAddress = $cellAddress ?? '';
+        if ($cell !== null) {
+            [,, $sheetName] = Helpers::extractWorksheet($cellAddress, $cell);
+            [,, $cellAddress] = Helpers::extractCellAddresses($cellAddress, true, $cell->getWorksheet(), $sheetName);
+        }
+        [, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+        $cellAddress ??= '';
+        if (str_contains($cellAddress, ':')) {
+            [$startAddress, $endAddress] = explode(':', $cellAddress);
+            $startAddress = (int) (string) preg_replace('/\D/', '', $startAddress);
+            $endAddress = (int) (string) preg_replace('/\D/', '', $endAddress);
+
+            return array_map(
+                fn ($value): array => [$value],
+                range($startAddress, $endAddress)
+            );
+        }
+        [$cellAddress] = explode(':', $cellAddress);
+
+        return (int) preg_replace('/\D/', '', $cellAddress);
+    }
+
+    /**
+     * ROWS.
+     *
+     * Returns the number of rows in an array or reference.
+     *
+     * Excel Function:
+     *        =ROWS(cellAddress)
+     *
+     * @param null|array|string $cellAddress An array or array formula, or a reference to a range of cells
+     *                                          for which you want the number of rows
+     *
+     * @return int|string The number of rows in cellAddress, or a string if arguments are invalid
+     */
+    public static function ROWS($cellAddress = null)
+    {
+        if (self::cellAddressNullOrWhitespace($cellAddress)) {
+            return 1;
+        }
+        if (!is_array($cellAddress)) {
+            return ExcelError::VALUE();
+        }
+
+        reset($cellAddress);
+        $isMatrix = (is_numeric(key($cellAddress)));
+        [$columns, $rows] = Calculation::getMatrixDimensions($cellAddress);
+
+        if ($isMatrix) {
+            return $columns;
+        }
+
+        return $rows;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php
new file mode 100644
index 00000000..53396c9c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Selection
+{
+    use ArrayEnabled;
+
+    /**
+     * CHOOSE.
+     *
+     * Uses lookup_value to return a value from the list of value arguments.
+     * Use CHOOSE to select one of up to 254 values based on the lookup_value.
+     *
+     * Excel Function:
+     *        =CHOOSE(index_num, value1, [value2], ...)
+     *
+     * @param mixed $chosenEntry The entry to select from the list (indexed from 1)
+     * @param mixed ...$chooseArgs Data values
+     *
+     * @return mixed The selected value
+     */
+    public static function choose(mixed $chosenEntry, mixed ...$chooseArgs): mixed
+    {
+        if (is_array($chosenEntry)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $chosenEntry, ...$chooseArgs);
+        }
+
+        $entryCount = count($chooseArgs) - 1;
+
+        if (is_numeric($chosenEntry)) {
+            --$chosenEntry;
+        } else {
+            return ExcelError::VALUE();
+        }
+        $chosenEntry = floor($chosenEntry);
+        if (($chosenEntry < 0) || ($chosenEntry > $entryCount)) {
+            return ExcelError::VALUE();
+        }
+
+        if (is_array($chooseArgs[$chosenEntry])) {
+            return Functions::flattenArray($chooseArgs[$chosenEntry]);
+        }
+
+        return $chooseArgs[$chosenEntry];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php
new file mode 100644
index 00000000..9ad47b4e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php
@@ -0,0 +1,309 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Sort extends LookupRefValidations
+{
+    public const ORDER_ASCENDING = 1;
+    public const ORDER_DESCENDING = -1;
+
+    /**
+     * SORT
+     * The SORT function returns a sorted array of the elements in an array.
+     * The returned array is the same shape as the provided array argument.
+     * Both $sortIndex and $sortOrder can be arrays, to provide multi-level sorting.
+     *
+     * @param mixed $sortArray The range of cells being sorted
+     * @param mixed $sortIndex The column or row number within the sortArray to sort on
+     * @param mixed $sortOrder Flag indicating whether to sort ascending or descending
+     *                          Ascending = 1 (self::ORDER_ASCENDING)
+     *                          Descending = -1 (self::ORDER_DESCENDING)
+     * @param mixed $byColumn Whether the sort should be determined by row (the default) or by column
+     *
+     * @return mixed The sorted values from the sort range
+     */
+    public static function sort(mixed $sortArray, mixed $sortIndex = 1, mixed $sortOrder = self::ORDER_ASCENDING, mixed $byColumn = false): mixed
+    {
+        if (!is_array($sortArray)) {
+            // Scalars are always returned "as is"
+            return $sortArray;
+        }
+
+        $sortArray = self::enumerateArrayKeys($sortArray);
+
+        $byColumn = (bool) $byColumn;
+        $lookupIndexSize = $byColumn ? count($sortArray) : count($sortArray[0]);
+
+        try {
+            // If $sortIndex and $sortOrder are scalars, then convert them into arrays
+            if (is_scalar($sortIndex)) {
+                $sortIndex = [$sortIndex];
+                $sortOrder = is_scalar($sortOrder) ? [$sortOrder] : $sortOrder;
+            }
+            // but the values of those array arguments still need validation
+            $sortOrder = (empty($sortOrder) ? [self::ORDER_ASCENDING] : $sortOrder);
+            self::validateArrayArgumentsForSort($sortIndex, $sortOrder, $lookupIndexSize);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // We want a simple, enumrated array of arrays where we can reference column by its index number.
+        $sortArray = array_values(array_map('array_values', $sortArray));
+
+        return ($byColumn === true)
+            ? self::sortByColumn($sortArray, $sortIndex, $sortOrder)
+            : self::sortByRow($sortArray, $sortIndex, $sortOrder);
+    }
+
+    /**
+     * SORTBY
+     * The SORTBY function sorts the contents of a range or array based on the values in a corresponding range or array.
+     * The returned array is the same shape as the provided array argument.
+     * Both $sortIndex and $sortOrder can be arrays, to provide multi-level sorting.
+     *
+     * @param mixed $sortArray The range of cells being sorted
+     * @param mixed $args
+     *              At least one additional argument must be provided, The vector or range to sort on
+     *              After that, arguments are passed as pairs:
+     *                    sort order: ascending or descending
+     *                         Ascending = 1 (self::ORDER_ASCENDING)
+     *                         Descending = -1 (self::ORDER_DESCENDING)
+     *                    additional arrays or ranges for multi-level sorting
+     *
+     * @return mixed The sorted values from the sort range
+     */
+    public static function sortBy(mixed $sortArray, mixed ...$args): mixed
+    {
+        if (!is_array($sortArray)) {
+            // Scalars are always returned "as is"
+            return $sortArray;
+        }
+
+        $sortArray = self::enumerateArrayKeys($sortArray);
+
+        $lookupArraySize = count($sortArray);
+        $argumentCount = count($args);
+
+        try {
+            $sortBy = $sortOrder = [];
+            for ($i = 0; $i < $argumentCount; $i += 2) {
+                $sortBy[] = self::validateSortVector($args[$i], $lookupArraySize);
+                $sortOrder[] = self::validateSortOrder($args[$i + 1] ?? self::ORDER_ASCENDING);
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::processSortBy($sortArray, $sortBy, $sortOrder);
+    }
+
+    private static function enumerateArrayKeys(array $sortArray): array
+    {
+        array_walk(
+            $sortArray,
+            function (&$columns): void {
+                if (is_array($columns)) {
+                    $columns = array_values($columns);
+                }
+            }
+        );
+
+        return array_values($sortArray);
+    }
+
+    private static function validateScalarArgumentsForSort(mixed &$sortIndex, mixed &$sortOrder, int $sortArraySize): void
+    {
+        if (is_array($sortIndex) || is_array($sortOrder)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        $sortIndex = self::validatePositiveInt($sortIndex, false);
+
+        if ($sortIndex > $sortArraySize) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        $sortOrder = self::validateSortOrder($sortOrder);
+    }
+
+    private static function validateSortVector(mixed $sortVector, int $sortArraySize): array
+    {
+        if (!is_array($sortVector)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        // It doesn't matter if it's a row or a column vectors, it works either way
+        $sortVector = Functions::flattenArray($sortVector);
+        if (count($sortVector) !== $sortArraySize) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $sortVector;
+    }
+
+    private static function validateSortOrder(mixed $sortOrder): int
+    {
+        $sortOrder = self::validateInt($sortOrder);
+        if (($sortOrder == self::ORDER_ASCENDING || $sortOrder === self::ORDER_DESCENDING) === false) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $sortOrder;
+    }
+
+    private static function validateArrayArgumentsForSort(array &$sortIndex, mixed &$sortOrder, int $sortArraySize): void
+    {
+        // It doesn't matter if they're row or column vectors, it works either way
+        $sortIndex = Functions::flattenArray($sortIndex);
+        $sortOrder = Functions::flattenArray($sortOrder);
+
+        if (
+            count($sortOrder) === 0 || count($sortOrder) > $sortArraySize
+            || (count($sortOrder) > count($sortIndex))
+        ) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        if (count($sortIndex) > count($sortOrder)) {
+            // If $sortOrder has fewer elements than $sortIndex, then the last order element is repeated.
+            $sortOrder = array_merge(
+                $sortOrder,
+                array_fill(0, count($sortIndex) - count($sortOrder), array_pop($sortOrder))
+            );
+        }
+
+        foreach ($sortIndex as $key => &$value) {
+            self::validateScalarArgumentsForSort($value, $sortOrder[$key], $sortArraySize);
+        }
+    }
+
+    private static function prepareSortVectorValues(array $sortVector): array
+    {
+        // Strings should be sorted case-insensitive; with booleans converted to locale-strings
+        return array_map(
+            function ($value) {
+                if (is_bool($value)) {
+                    return ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+                } elseif (is_string($value)) {
+                    return StringHelper::strToLower($value);
+                }
+
+                return $value;
+            },
+            $sortVector
+        );
+    }
+
+    /**
+     * @param array[] $sortIndex
+     * @param int[] $sortOrder
+     */
+    private static function processSortBy(array $sortArray, array $sortIndex, array $sortOrder): array
+    {
+        $sortArguments = [];
+        $sortData = [];
+        foreach ($sortIndex as $index => $sortValues) {
+            $sortData[] = $sortValues;
+            $sortArguments[] = self::prepareSortVectorValues($sortValues);
+            $sortArguments[] = $sortOrder[$index] === self::ORDER_ASCENDING ? SORT_ASC : SORT_DESC;
+        }
+
+        $sortVector = self::executeVectorSortQuery($sortData, $sortArguments);
+
+        return self::sortLookupArrayFromVector($sortArray, $sortVector);
+    }
+
+    /**
+     * @param int[] $sortIndex
+     * @param int[] $sortOrder
+     */
+    private static function sortByRow(array $sortArray, array $sortIndex, array $sortOrder): array
+    {
+        $sortVector = self::buildVectorForSort($sortArray, $sortIndex, $sortOrder);
+
+        return self::sortLookupArrayFromVector($sortArray, $sortVector);
+    }
+
+    /**
+     * @param int[] $sortIndex
+     * @param int[] $sortOrder
+     */
+    private static function sortByColumn(array $sortArray, array $sortIndex, array $sortOrder): array
+    {
+        $sortArray = Matrix::transpose($sortArray);
+        $result = self::sortByRow($sortArray, $sortIndex, $sortOrder);
+
+        return Matrix::transpose($result);
+    }
+
+    /**
+     * @param int[] $sortIndex
+     * @param int[] $sortOrder
+     */
+    private static function buildVectorForSort(array $sortArray, array $sortIndex, array $sortOrder): array
+    {
+        $sortArguments = [];
+        $sortData = [];
+        foreach ($sortIndex as $index => $sortIndexValue) {
+            $sortValues = array_column($sortArray, $sortIndexValue - 1);
+            $sortData[] = $sortValues;
+            $sortArguments[] = self::prepareSortVectorValues($sortValues);
+            $sortArguments[] = $sortOrder[$index] === self::ORDER_ASCENDING ? SORT_ASC : SORT_DESC;
+        }
+
+        $sortData = self::executeVectorSortQuery($sortData, $sortArguments);
+
+        return $sortData;
+    }
+
+    private static function executeVectorSortQuery(array $sortData, array $sortArguments): array
+    {
+        $sortData = Matrix::transpose($sortData);
+
+        // We need to set an index that can be retained, as array_multisort doesn't maintain numeric keys.
+        $sortDataIndexed = [];
+        foreach ($sortData as $key => $value) {
+            $sortDataIndexed[Coordinate::stringFromColumnIndex($key + 1)] = $value;
+        }
+        unset($sortData);
+
+        $sortArguments[] = &$sortDataIndexed;
+
+        array_multisort(...$sortArguments);
+
+        // After the sort, we restore the numeric keys that will now be in the correct, sorted order
+        $sortedData = [];
+        foreach (array_keys($sortDataIndexed) as $key) {
+            $sortedData[] = Coordinate::columnIndexFromString($key) - 1;
+        }
+
+        return $sortedData;
+    }
+
+    private static function sortLookupArrayFromVector(array $sortArray, array $sortVector): array
+    {
+        // Building a new array in the correct (sorted) order works; but may be memory heavy for larger arrays
+        $sortedArray = [];
+        foreach ($sortVector as $index) {
+            $sortedArray[] = $sortArray[$index];
+        }
+
+        return $sortedArray;
+
+//        uksort(
+//            $lookupArray,
+//            function (int $a, int $b) use (array $sortVector) {
+//                return $sortVector[$a] <=> $sortVector[$b];
+//            }
+//        );
+//
+//        return $lookupArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php
new file mode 100644
index 00000000..220be2d1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Unique
+{
+    /**
+     * UNIQUE
+     * The UNIQUE function searches for value either from a one-row or one-column range or from an array.
+     *
+     * @param mixed $lookupVector The range of cells being searched
+     * @param mixed $byColumn Whether the uniqueness should be determined by row (the default) or by column
+     * @param mixed $exactlyOnce Whether the function should return only entries that occur just once in the list
+     *
+     * @return mixed The unique values from the search range
+     */
+    public static function unique(mixed $lookupVector, mixed $byColumn = false, mixed $exactlyOnce = false): mixed
+    {
+        if (!is_array($lookupVector)) {
+            // Scalars are always returned "as is"
+            return $lookupVector;
+        }
+
+        $byColumn = (bool) $byColumn;
+        $exactlyOnce = (bool) $exactlyOnce;
+
+        return ($byColumn === true)
+            ? self::uniqueByColumn($lookupVector, $exactlyOnce)
+            : self::uniqueByRow($lookupVector, $exactlyOnce);
+    }
+
+    private static function uniqueByRow(array $lookupVector, bool $exactlyOnce): mixed
+    {
+        // When not $byColumn, we count whole rows or values, not individual values
+        //      so implode each row into a single string value
+        array_walk(
+            $lookupVector,
+            function (array &$value): void {
+                $value = implode(chr(0x00), $value);
+            }
+        );
+
+        $result = self::countValuesCaseInsensitive($lookupVector);
+
+        if ($exactlyOnce === true) {
+            $result = self::exactlyOnceFilter($result);
+        }
+
+        if (count($result) === 0) {
+            return ExcelError::CALC();
+        }
+
+        $result = array_keys($result);
+
+        // restore rows from their strings
+        array_walk(
+            $result,
+            function (string &$value): void {
+                $value = explode(chr(0x00), $value);
+            }
+        );
+
+        return (count($result) === 1) ? array_pop($result) : $result;
+    }
+
+    private static function uniqueByColumn(array $lookupVector, bool $exactlyOnce): mixed
+    {
+        $flattenedLookupVector = Functions::flattenArray($lookupVector);
+
+        if (count($lookupVector, COUNT_RECURSIVE) > count($flattenedLookupVector, COUNT_RECURSIVE) + 1) {
+            // We're looking at a full column check (multiple rows)
+            $transpose = Matrix::transpose($lookupVector);
+            $result = self::uniqueByRow($transpose, $exactlyOnce);
+
+            return (is_array($result)) ? Matrix::transpose($result) : $result;
+        }
+
+        $result = self::countValuesCaseInsensitive($flattenedLookupVector);
+
+        if ($exactlyOnce === true) {
+            $result = self::exactlyOnceFilter($result);
+        }
+
+        if (count($result) === 0) {
+            return ExcelError::CALC();
+        }
+
+        $result = array_keys($result);
+
+        return $result;
+    }
+
+    private static function countValuesCaseInsensitive(array $caseSensitiveLookupValues): array
+    {
+        $caseInsensitiveCounts = array_count_values(
+            array_map(
+                fn (string $value): string => StringHelper::strToUpper($value),
+                $caseSensitiveLookupValues
+            )
+        );
+
+        $caseSensitiveCounts = [];
+        foreach ($caseInsensitiveCounts as $caseInsensitiveKey => $count) {
+            if (is_numeric($caseInsensitiveKey)) {
+                $caseSensitiveCounts[$caseInsensitiveKey] = $count;
+            } else {
+                foreach ($caseSensitiveLookupValues as $caseSensitiveValue) {
+                    if ($caseInsensitiveKey === StringHelper::strToUpper($caseSensitiveValue)) {
+                        $caseSensitiveCounts[$caseSensitiveValue] = $count;
+
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $caseSensitiveCounts;
+    }
+
+    private static function exactlyOnceFilter(array $values): array
+    {
+        return array_filter(
+            $values,
+            fn ($value): bool => $value === 1
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
new file mode 100644
index 00000000..247074cf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class VLookup extends LookupBase
+{
+    use ArrayEnabled;
+
+    /**
+     * VLOOKUP
+     * The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value
+     *     in the same row based on the index_number.
+     *
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param mixed $lookupArray The range of cells being searched
+     * @param mixed $indexNumber The column number in table_array from which the matching value must be returned.
+     *                                The first column is 1.
+     * @param mixed $notExactMatch determines if you are looking for an exact match based on lookup_value
+     *
+     * @return mixed The value of the found cell
+     */
+    public static function lookup(mixed $lookupValue, mixed $lookupArray, mixed $indexNumber, mixed $notExactMatch = true): mixed
+    {
+        if (is_array($lookupValue) || is_array($indexNumber)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $lookupValue, $lookupArray, $indexNumber, $notExactMatch);
+        }
+
+        $notExactMatch = (bool) ($notExactMatch ?? true);
+
+        try {
+            self::validateLookupArray($lookupArray);
+            $indexNumber = self::validateIndexLookup($lookupArray, $indexNumber);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $f = array_keys($lookupArray);
+        $firstRow = array_pop($f);
+        if ((!is_array($lookupArray[$firstRow])) || ($indexNumber > count($lookupArray[$firstRow]))) {
+            return ExcelError::REF();
+        }
+        $columnKeys = array_keys($lookupArray[$firstRow]);
+        $returnColumn = $columnKeys[--$indexNumber];
+        $firstColumn = array_shift($columnKeys) ?? 1;
+
+        if (!$notExactMatch) {
+            /** @var callable $callable */
+            $callable = [self::class, 'vlookupSort'];
+            uasort($lookupArray, $callable);
+        }
+
+        $rowNumber = self::vLookupSearch($lookupValue, $lookupArray, $firstColumn, $notExactMatch);
+
+        if ($rowNumber !== null) {
+            // return the appropriate value
+            return $lookupArray[$rowNumber][$returnColumn];
+        }
+
+        return ExcelError::NA();
+    }
+
+    private static function vlookupSort(array $a, array $b): int
+    {
+        reset($a);
+        $firstColumn = key($a);
+        $aLower = StringHelper::strToLower((string) $a[$firstColumn]);
+        $bLower = StringHelper::strToLower((string) $b[$firstColumn]);
+
+        if ($aLower == $bLower) {
+            return 0;
+        }
+
+        return ($aLower < $bLower) ? -1 : 1;
+    }
+
+    /**
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param  int|string $column
+     */
+    private static function vLookupSearch(mixed $lookupValue, array $lookupArray, $column, bool $notExactMatch): ?int
+    {
+        $lookupLower = StringHelper::strToLower((string) $lookupValue);
+
+        $rowNumber = null;
+        foreach ($lookupArray as $rowKey => $rowData) {
+            $bothNumeric = is_numeric($lookupValue) && is_numeric($rowData[$column]);
+            $bothNotNumeric = !is_numeric($lookupValue) && !is_numeric($rowData[$column]);
+            $cellDataLower = StringHelper::strToLower((string) $rowData[$column]);
+
+            // break if we have passed possible keys
+            if (
+                $notExactMatch
+                && (($bothNumeric && ($rowData[$column] > $lookupValue))
+                || ($bothNotNumeric && ($cellDataLower > $lookupLower)))
+            ) {
+                break;
+            }
+
+            $rowNumber = self::checkMatch(
+                $bothNumeric,
+                $bothNotNumeric,
+                $notExactMatch,
+                $rowKey,
+                $cellDataLower,
+                $lookupLower,
+                $rowNumber
+            );
+        }
+
+        return $rowNumber;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php
new file mode 100644
index 00000000..03e61399
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Absolute
+{
+    use ArrayEnabled;
+
+    /**
+     * ABS.
+     *
+     * Returns the result of builtin function abs after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|int|string rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function evaluate(mixed $number): array|string|int|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return abs($number);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php
new file mode 100644
index 00000000..e7de7aac
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Angle
+{
+    use ArrayEnabled;
+
+    /**
+     * DEGREES.
+     *
+     * Returns the result of builtin function rad2deg after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toDegrees(mixed $number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return rad2deg($number);
+    }
+
+    /**
+     * RADIANS.
+     *
+     * Returns the result of builtin function deg2rad after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function toRadians(mixed $number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return deg2rad($number);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php
new file mode 100644
index 00000000..98c3e3dc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Arabic
+{
+    use ArrayEnabled;
+
+    private const ROMAN_LOOKUP = [
+        'M' => 1000,
+        'D' => 500,
+        'C' => 100,
+        'L' => 50,
+        'X' => 10,
+        'V' => 5,
+        'I' => 1,
+    ];
+
+    /**
+     * Recursively calculate the arabic value of a roman numeral.
+     */
+    private static function calculateArabic(array $roman, int &$sum = 0, int $subtract = 0): int
+    {
+        $numeral = array_shift($roman);
+        if (!isset(self::ROMAN_LOOKUP[$numeral])) {
+            throw new Exception('Invalid character detected');
+        }
+
+        $arabic = self::ROMAN_LOOKUP[$numeral];
+        if (count($roman) > 0 && isset(self::ROMAN_LOOKUP[$roman[0]]) && $arabic < self::ROMAN_LOOKUP[$roman[0]]) {
+            $subtract += $arabic;
+        } else {
+            $sum += ($arabic - $subtract);
+            $subtract = 0;
+        }
+
+        if (count($roman) > 0) {
+            self::calculateArabic($roman, $sum, $subtract);
+        }
+
+        return $sum;
+    }
+
+    /**
+     * ARABIC.
+     *
+     * Converts a Roman numeral to an Arabic numeral.
+     *
+     * Excel Function:
+     *        ARABIC(text)
+     *
+     * @param string|string[] $roman Should be a string, or can be an array of strings
+     *
+     * @return array|int|string the arabic numberal contrived from the roman numeral
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function evaluate(mixed $roman): array|int|string
+    {
+        if (is_array($roman)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $roman);
+        }
+
+        // An empty string should return 0
+        $roman = substr(trim(strtoupper((string) $roman)), 0, 255);
+        if ($roman === '') {
+            return 0;
+        }
+
+        // Convert the roman numeral to an arabic number
+        $negativeNumber = $roman[0] === '-';
+        if ($negativeNumber) {
+            $roman = substr($roman, 1);
+        }
+
+        try {
+            $arabic = self::calculateArabic(str_split($roman));
+        } catch (Exception) {
+            return ExcelError::VALUE(); // Invalid character detected
+        }
+
+        if ($negativeNumber) {
+            $arabic *= -1; // The number should be negative
+        }
+
+        return $arabic;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php
new file mode 100644
index 00000000..7eda72c3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Base
+{
+    use ArrayEnabled;
+
+    /**
+     * BASE.
+     *
+     * Converts a number into a text representation with the given radix (base).
+     *
+     * Excel Function:
+     *        BASE(Number, Radix [Min_length])
+     *
+     * @param mixed $number expect float
+     *                      Or can be an array of values
+     * @param mixed $radix expect float
+     *                      Or can be an array of values
+     * @param mixed $minLength expect int or null
+     *                      Or can be an array of values
+     *
+     * @return array|string the text representation with the given radix (base)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function evaluate(mixed $number, mixed $radix, mixed $minLength = null): array|string
+    {
+        if (is_array($number) || is_array($radix) || is_array($minLength)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $radix, $minLength);
+        }
+
+        try {
+            $number = (float) floor(Helpers::validateNumericNullBool($number));
+            $radix = (int) Helpers::validateNumericNullBool($radix);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::calculate($number, $radix, $minLength);
+    }
+
+    private static function calculate(float $number, int $radix, mixed $minLength): string
+    {
+        if ($minLength === null || is_numeric($minLength)) {
+            if ($number < 0 || $number >= 2 ** 53 || $radix < 2 || $radix > 36) {
+                return ExcelError::NAN(); // Numeric range constraints
+            }
+
+            $outcome = strtoupper((string) base_convert("$number", 10, $radix));
+            if ($minLength !== null) {
+                $outcome = str_pad($outcome, (int) $minLength, '0', STR_PAD_LEFT); // String padding
+            }
+
+            return $outcome;
+        }
+
+        return ExcelError::VALUE();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php
new file mode 100644
index 00000000..365ec2e9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Ceiling
+{
+    use ArrayEnabled;
+
+    /**
+     * CEILING.
+     *
+     * Returns number rounded up, away from zero, to the nearest multiple of significance.
+     *        For example, if you want to avoid using pennies in your prices and your product is
+     *        priced at $4.42, use the formula =CEILING(4.42,0.05) to round prices up to the
+     *        nearest nickel.
+     *
+     * Excel Function:
+     *        CEILING(number[,significance])
+     *
+     * @param array|float $number the number you want the ceiling
+     *                      Or can be an array of values
+     * @param array|float $significance the multiple to which you want to round
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function ceiling($number, $significance = null)
+    {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
+        if ($significance === null) {
+            self::floorCheck1Arg();
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $significance = Helpers::validateNumericNullSubstitution($significance, ($number < 0) ? -1 : 1);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::argumentsOk((float) $number, (float) $significance);
+    }
+
+    /**
+     * CEILING.MATH.
+     *
+     * Round a number down to the nearest integer or to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        CEILING.MATH(number[,significance[,mode]])
+     *
+     * @param mixed $number Number to round
+     *                      Or can be an array of values
+     * @param mixed $significance Significance
+     *                      Or can be an array of values
+     * @param array|int $mode direction to round negative numbers
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function math(mixed $number, mixed $significance = null, $mode = 0): array|string|float
+    {
+        if (is_array($number) || is_array($significance) || is_array($mode)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance, $mode);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $significance = Helpers::validateNumericNullSubstitution($significance, ($number < 0) ? -1 : 1);
+            $mode = Helpers::validateNumericNullSubstitution($mode, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (empty($significance * $number)) {
+            return 0.0;
+        }
+        if (self::ceilingMathTest((float) $significance, (float) $number, (int) $mode)) {
+            return floor($number / $significance) * $significance;
+        }
+
+        return ceil($number / $significance) * $significance;
+    }
+
+    /**
+     * CEILING.PRECISE.
+     *
+     * Rounds number up, away from zero, to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        CEILING.PRECISE(number[,significance])
+     *
+     * @param mixed $number the number you want to round
+     *                      Or can be an array of values
+     * @param array|float $significance the multiple to which you want to round
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function precise(mixed $number, $significance = 1): array|string|float
+    {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $significance = Helpers::validateNumericNullSubstitution($significance, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (!$significance) {
+            return 0.0;
+        }
+        $result = $number / abs($significance);
+
+        return ceil($result) * $significance * (($significance < 0) ? -1 : 1);
+    }
+
+    /**
+     * Let CEILINGMATH complexity pass Scrutinizer.
+     */
+    private static function ceilingMathTest(float $significance, float $number, int $mode): bool
+    {
+        return ($significance < 0) || ($number < 0 && !empty($mode));
+    }
+
+    /**
+     * Avoid Scrutinizer problems concerning complexity.
+     */
+    private static function argumentsOk(float $number, float $significance): float|string
+    {
+        if (empty($number * $significance)) {
+            return 0.0;
+        }
+        if (Helpers::returnSign($number) == Helpers::returnSign($significance)) {
+            return ceil($number / $significance) * $significance;
+        }
+
+        return ExcelError::NAN();
+    }
+
+    private static function floorCheck1Arg(): void
+    {
+        $compatibility = Functions::getCompatibilityMode();
+        if ($compatibility === Functions::COMPATIBILITY_EXCEL) {
+            throw new Exception('Excel requires 2 arguments for CEILING');
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php
new file mode 100644
index 00000000..99eb05a5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Combinations
+{
+    use ArrayEnabled;
+
+    /**
+     * COMBIN.
+     *
+     * Returns the number of combinations for a given number of items. Use COMBIN to
+     *        determine the total possible number of groups for a given number of items.
+     *
+     * Excel Function:
+     *        COMBIN(numObjs,numInSet)
+     *
+     * @param mixed $numObjs Number of different objects, or can be an array of numbers
+     * @param mixed $numInSet Number of objects in each combination, or can be an array of numbers
+     *
+     * @return array|float|string Number of combinations, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function withoutRepetition(mixed $numObjs, mixed $numInSet): array|string|float
+    {
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
+
+        try {
+            $numObjs = Helpers::validateNumericNullSubstitution($numObjs, null);
+            $numInSet = Helpers::validateNumericNullSubstitution($numInSet, null);
+            Helpers::validateNotNegative($numInSet);
+            Helpers::validateNotNegative($numObjs - $numInSet);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        /** @var float */
+        $quotient = Factorial::fact($numObjs);
+        /** @var float */
+        $divisor1 = Factorial::fact($numObjs - $numInSet);
+        /** @var float */
+        $divisor2 = Factorial::fact($numInSet);
+
+        return round($quotient / ($divisor1 * $divisor2));
+    }
+
+    /**
+     * COMBINA.
+     *
+     * Returns the number of combinations for a given number of items. Use COMBIN to
+     *        determine the total possible number of groups for a given number of items.
+     *
+     * Excel Function:
+     *        COMBINA(numObjs,numInSet)
+     *
+     * @param mixed $numObjs Number of different objects, or can be an array of numbers
+     * @param mixed $numInSet Number of objects in each combination, or can be an array of numbers
+     *
+     * @return array|float|int|string Number of combinations, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function withRepetition(mixed $numObjs, mixed $numInSet): array|int|string|float
+    {
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
+
+        try {
+            $numObjs = Helpers::validateNumericNullSubstitution($numObjs, null);
+            $numInSet = Helpers::validateNumericNullSubstitution($numInSet, null);
+            Helpers::validateNotNegative($numInSet);
+            Helpers::validateNotNegative($numObjs);
+            $numObjs = (int) $numObjs;
+            $numInSet = (int) $numInSet;
+            // Microsoft documentation says following is true, but Excel
+            //  does not enforce this restriction.
+            //Helpers::validateNotNegative($numObjs - $numInSet);
+            if ($numObjs === 0) {
+                Helpers::validateNotNegative(-$numInSet);
+
+                return 1;
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        /** @var float */
+        $quotient = Factorial::fact($numObjs + $numInSet - 1);
+        /** @var float */
+        $divisor1 = Factorial::fact($numObjs - 1);
+        /** @var float */
+        $divisor2 = Factorial::fact($numInSet);
+
+        return round($quotient / ($divisor1 * $divisor2));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php
new file mode 100644
index 00000000..ea67d5fd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Exp
+{
+    use ArrayEnabled;
+
+    /**
+     * EXP.
+     *
+     * Returns the result of builtin function exp after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function evaluate(mixed $number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return exp($number);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php
new file mode 100644
index 00000000..7bbd4d8b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+class Factorial
+{
+    use ArrayEnabled;
+
+    /**
+     * FACT.
+     *
+     * Returns the factorial of a number.
+     * The factorial of a number is equal to 1*2*3*...* number.
+     *
+     * Excel Function:
+     *        FACT(factVal)
+     *
+     * @param array|float $factVal Factorial Value, or can be an array of numbers
+     *
+     * @return array|float|int|string Factorial, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function fact($factVal): array|string|float|int
+    {
+        if (is_array($factVal)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $factVal);
+        }
+
+        try {
+            $factVal = Helpers::validateNumericNullBool($factVal);
+            Helpers::validateNotNegative($factVal);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $factLoop = floor($factVal);
+        if ($factVal > $factLoop) {
+            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+                return Statistical\Distributions\Gamma::gammaValue($factVal + 1);
+            }
+        }
+
+        $factorial = 1;
+        while ($factLoop > 1) {
+            $factorial *= $factLoop--;
+        }
+
+        return $factorial;
+    }
+
+    /**
+     * FACTDOUBLE.
+     *
+     * Returns the double factorial of a number.
+     *
+     * Excel Function:
+     *        FACTDOUBLE(factVal)
+     *
+     * @param array|float $factVal Factorial Value, or can be an array of numbers
+     *
+     * @return array|float|int|string Double Factorial, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function factDouble($factVal): array|string|float|int
+    {
+        if (is_array($factVal)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $factVal);
+        }
+
+        try {
+            $factVal = Helpers::validateNumericNullSubstitution($factVal, 0);
+            Helpers::validateNotNegative($factVal);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $factLoop = floor($factVal);
+        $factorial = 1;
+        while ($factLoop > 1) {
+            $factorial *= $factLoop;
+            $factLoop -= 2;
+        }
+
+        return $factorial;
+    }
+
+    /**
+     * MULTINOMIAL.
+     *
+     * Returns the ratio of the factorial of a sum of values to the product of factorials.
+     *
+     * @param mixed[] $args An array of mixed values for the Data Series
+     *
+     * @return float|int|string The result, or a string containing an error
+     */
+    public static function multinomial(...$args): string|int|float
+    {
+        $summer = 0;
+        $divisor = 1;
+
+        try {
+            // Loop through arguments
+            foreach (Functions::flattenArray($args) as $argx) {
+                $arg = Helpers::validateNumericNullSubstitution($argx, null);
+                Helpers::validateNotNegative($arg);
+                $arg = (int) $arg;
+                $summer += $arg;
+                $divisor *= self::fact($arg);
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $summer = self::fact($summer);
+
+        return is_numeric($summer) ? ($summer / $divisor) : ExcelError::VALUE();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php
new file mode 100644
index 00000000..83cf0515
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php
@@ -0,0 +1,191 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Floor
+{
+    use ArrayEnabled;
+
+    private static function floorCheck1Arg(): void
+    {
+        $compatibility = Functions::getCompatibilityMode();
+        if ($compatibility === Functions::COMPATIBILITY_EXCEL) {
+            throw new Exception('Excel requires 2 arguments for FLOOR');
+        }
+    }
+
+    /**
+     * FLOOR.
+     *
+     * Rounds number down, toward zero, to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        FLOOR(number[,significance])
+     *
+     * @param mixed $number Expect float. Number to round
+     *                      Or can be an array of values
+     * @param mixed $significance Expect float. Significance
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function floor(mixed $number, mixed $significance = null)
+    {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
+        if ($significance === null) {
+            self::floorCheck1Arg();
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $significance = Helpers::validateNumericNullSubstitution($significance, ($number < 0) ? -1 : 1);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::argumentsOk((float) $number, (float) $significance);
+    }
+
+    /**
+     * FLOOR.MATH.
+     *
+     * Round a number down to the nearest integer or to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        FLOOR.MATH(number[,significance[,mode]])
+     *
+     * @param mixed $number Number to round
+     *                      Or can be an array of values
+     * @param mixed $significance Significance
+     *                      Or can be an array of values
+     * @param mixed $mode direction to round negative numbers
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function math(mixed $number, mixed $significance = null, mixed $mode = 0)
+    {
+        if (is_array($number) || is_array($significance) || is_array($mode)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance, $mode);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $significance = Helpers::validateNumericNullSubstitution($significance, ($number < 0) ? -1 : 1);
+            $mode = Helpers::validateNumericNullSubstitution($mode, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::argsOk((float) $number, (float) $significance, (int) $mode);
+    }
+
+    /**
+     * FLOOR.PRECISE.
+     *
+     * Rounds number down, toward zero, to the nearest multiple of significance.
+     *
+     * Excel Function:
+     *        FLOOR.PRECISE(number[,significance])
+     *
+     * @param array|float $number Number to round
+     *                      Or can be an array of values
+     * @param array|float $significance Significance
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function precise($number, $significance = 1)
+    {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $significance = Helpers::validateNumericNullSubstitution($significance, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::argumentsOkPrecise((float) $number, (float) $significance);
+    }
+
+    /**
+     * Avoid Scrutinizer problems concerning complexity.
+     */
+    private static function argumentsOkPrecise(float $number, float $significance): string|float
+    {
+        if ($significance == 0.0) {
+            return ExcelError::DIV0();
+        }
+        if ($number == 0.0) {
+            return 0.0;
+        }
+
+        return floor($number / abs($significance)) * abs($significance);
+    }
+
+    /**
+     * Avoid Scrutinizer complexity problems.
+     *
+     * @return float|string Rounded Number, or a string containing an error
+     */
+    private static function argsOk(float $number, float $significance, int $mode): string|float
+    {
+        if (!$significance) {
+            return ExcelError::DIV0();
+        }
+        if (!$number) {
+            return 0.0;
+        }
+        if (self::floorMathTest($number, $significance, $mode)) {
+            return ceil($number / $significance) * $significance;
+        }
+
+        return floor($number / $significance) * $significance;
+    }
+
+    /**
+     * Let FLOORMATH complexity pass Scrutinizer.
+     */
+    private static function floorMathTest(float $number, float $significance, int $mode): bool
+    {
+        return Helpers::returnSign($significance) == -1 || (Helpers::returnSign($number) == -1 && !empty($mode));
+    }
+
+    /**
+     * Avoid Scrutinizer problems concerning complexity.
+     */
+    private static function argumentsOk(float $number, float $significance): string|float
+    {
+        if ($significance == 0.0) {
+            return ExcelError::DIV0();
+        }
+        if ($number == 0.0) {
+            return 0.0;
+        }
+        if (Helpers::returnSign($significance) == 1) {
+            return floor($number / $significance) * $significance;
+        }
+        if (Helpers::returnSign($number) == -1 && Helpers::returnSign($significance) == -1) {
+            return floor($number / $significance) * $significance;
+        }
+
+        return ExcelError::NAN();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php
new file mode 100644
index 00000000..f2aedb60
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Gcd
+{
+    /**
+     * Recursively determine GCD.
+     *
+     * Returns the greatest common divisor of a series of numbers.
+     * The greatest common divisor is the largest integer that divides both
+     *        number1 and number2 without a remainder.
+     *
+     * Excel Function:
+     *        GCD(number1[,number2[, ...]])
+     */
+    private static function evaluateGCD(float|int $a, float|int $b): float|int
+    {
+        return $b ? self::evaluateGCD($b, $a % $b) : $a;
+    }
+
+    /**
+     * GCD.
+     *
+     * Returns the greatest common divisor of a series of numbers.
+     * The greatest common divisor is the largest integer that divides both
+     *        number1 and number2 without a remainder.
+     *
+     * Excel Function:
+     *        GCD(number1[,number2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|int|string Greatest Common Divisor, or a string containing an error
+     */
+    public static function evaluate(mixed ...$args)
+    {
+        try {
+            $arrayArgs = [];
+            foreach (Functions::flattenArray($args) as $value1) {
+                if ($value1 !== null) {
+                    $value = Helpers::validateNumericNullSubstitution($value1, 1);
+                    Helpers::validateNotNegative($value);
+                    $arrayArgs[] = (int) $value;
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (count($arrayArgs) <= 0) {
+            return ExcelError::VALUE();
+        }
+        $gcd = (int) array_pop($arrayArgs);
+        do {
+            $gcd = self::evaluateGCD($gcd, (int) array_pop($arrayArgs));
+        } while (!empty($arrayArgs));
+
+        return $gcd;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php
new file mode 100644
index 00000000..57e05b19
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Helpers
+{
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     *
+     * @return float|string quotient or DIV0 if denominator is too small
+     */
+    public static function verySmallDenominator(float $numerator, float $denominator): string|float
+    {
+        return (abs($denominator) < 1.0E-12) ? ExcelError::DIV0() : ($numerator / $denominator);
+    }
+
+    /**
+     * Many functions accept null/false/true argument treated as 0/0/1.
+     */
+    public static function validateNumericNullBool(mixed $number): int|float
+    {
+        $number = Functions::flattenSingleValue($number);
+        if ($number === null) {
+            return 0;
+        }
+        if (is_bool($number)) {
+            return (int) $number;
+        }
+        if (is_numeric($number)) {
+            return 0 + $number;
+        }
+
+        throw new Exception(ExcelError::throwError($number));
+    }
+
+    /**
+     * Validate numeric, but allow substitute for null.
+     */
+    public static function validateNumericNullSubstitution(mixed $number, null|float|int $substitute): float|int
+    {
+        $number = Functions::flattenSingleValue($number);
+        if ($number === null && $substitute !== null) {
+            return $substitute;
+        }
+        if (is_numeric($number)) {
+            return 0 + $number;
+        }
+
+        throw new Exception(ExcelError::throwError($number));
+    }
+
+    /**
+     * Confirm number >= 0.
+     */
+    public static function validateNotNegative(float|int $number, ?string $except = null): void
+    {
+        if ($number >= 0) {
+            return;
+        }
+
+        throw new Exception($except ?? ExcelError::NAN());
+    }
+
+    /**
+     * Confirm number > 0.
+     */
+    public static function validatePositive(float|int $number, ?string $except = null): void
+    {
+        if ($number > 0) {
+            return;
+        }
+
+        throw new Exception($except ?? ExcelError::NAN());
+    }
+
+    /**
+     * Confirm number != 0.
+     */
+    public static function validateNotZero(float|int $number): void
+    {
+        if ($number) {
+            return;
+        }
+
+        throw new Exception(ExcelError::DIV0());
+    }
+
+    public static function returnSign(float $number): int
+    {
+        return $number ? (($number > 0) ? 1 : -1) : 0;
+    }
+
+    public static function getEven(float $number): float
+    {
+        $significance = 2 * self::returnSign($number);
+
+        return $significance ? (ceil($number / $significance) * $significance) : 0;
+    }
+
+    /**
+     * Return NAN or value depending on argument.
+     */
+    public static function numberOrNan(float $result): float|string
+    {
+        return is_nan($result) ? ExcelError::NAN() : $result;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php
new file mode 100644
index 00000000..76bbced8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class IntClass
+{
+    use ArrayEnabled;
+
+    /**
+     * INT.
+     *
+     * Casts a floating point value to an integer
+     *
+     * Excel Function:
+     *        INT(number)
+     *
+     * @param array|float $number Number to cast to an integer, or can be an array of numbers
+     *
+     * @return array|int|string Integer value, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function evaluate($number): array|string|int
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (int) floor($number);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php
new file mode 100644
index 00000000..979b6df2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Lcm
+{
+    //
+    //    Private method to return an array of the factors of the input value
+    //
+    private static function factors(float $value): array
+    {
+        $startVal = floor(sqrt($value));
+
+        $factorArray = [];
+        for ($i = $startVal; $i > 1; --$i) {
+            if (($value % $i) == 0) {
+                $factorArray = array_merge($factorArray, self::factors($value / $i));
+                $factorArray = array_merge($factorArray, self::factors($i));
+                if ($i <= sqrt($value)) {
+                    break;
+                }
+            }
+        }
+        if (!empty($factorArray)) {
+            rsort($factorArray);
+
+            return $factorArray;
+        }
+
+        return [(int) $value];
+    }
+
+    /**
+     * LCM.
+     *
+     * Returns the lowest common multiplier of a series of numbers
+     * The least common multiple is the smallest positive integer that is a multiple
+     * of all integer arguments number1, number2, and so on. Use LCM to add fractions
+     * with different denominators.
+     *
+     * Excel Function:
+     *        LCM(number1[,number2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return int|string Lowest Common Multiplier, or a string containing an error
+     */
+    public static function evaluate(mixed ...$args): int|string
+    {
+        try {
+            $arrayArgs = [];
+            $anyZeros = 0;
+            $anyNonNulls = 0;
+            foreach (Functions::flattenArray($args) as $value1) {
+                $anyNonNulls += (int) ($value1 !== null);
+                $value = Helpers::validateNumericNullSubstitution($value1, 1);
+                Helpers::validateNotNegative($value);
+                $arrayArgs[] = (int) $value;
+                $anyZeros += (int) !((bool) $value);
+            }
+            self::testNonNulls($anyNonNulls);
+            if ($anyZeros) {
+                return 0;
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $returnValue = 1;
+        $allPoweredFactors = [];
+        // Loop through arguments
+        foreach ($arrayArgs as $value) {
+            $myFactors = self::factors(floor($value));
+            $myCountedFactors = array_count_values($myFactors);
+            $myPoweredFactors = [];
+            foreach ($myCountedFactors as $myCountedFactor => $myCountedPower) {
+                $myPoweredFactors[$myCountedFactor] = $myCountedFactor ** $myCountedPower;
+            }
+            self::processPoweredFactors($allPoweredFactors, $myPoweredFactors);
+        }
+        foreach ($allPoweredFactors as $allPoweredFactor) {
+            $returnValue *= (int) $allPoweredFactor;
+        }
+
+        return $returnValue;
+    }
+
+    private static function processPoweredFactors(array &$allPoweredFactors, array &$myPoweredFactors): void
+    {
+        foreach ($myPoweredFactors as $myPoweredValue => $myPoweredFactor) {
+            if (isset($allPoweredFactors[$myPoweredValue])) {
+                if ($allPoweredFactors[$myPoweredValue] < $myPoweredFactor) {
+                    $allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
+                }
+            } else {
+                $allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
+            }
+        }
+    }
+
+    private static function testNonNulls(int $anyNonNulls): void
+    {
+        if (!$anyNonNulls) {
+            throw new Exception(ExcelError::VALUE());
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php
new file mode 100644
index 00000000..3de0a2bb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Logarithms
+{
+    use ArrayEnabled;
+
+    /**
+     * LOG_BASE.
+     *
+     * Returns the logarithm of a number to a specified base. The default base is 10.
+     *
+     * Excel Function:
+     *        LOG(number[,base])
+     *
+     * @param mixed $number The positive real number for which you want the logarithm
+     *                      Or can be an array of values
+     * @param mixed $base The base of the logarithm. If base is omitted, it is assumed to be 10.
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function withBase(mixed $number, mixed $base = 10): array|string|float
+    {
+        if (is_array($number) || is_array($base)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $base);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            Helpers::validatePositive($number);
+            $base = Helpers::validateNumericNullBool($base);
+            Helpers::validatePositive($base);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return log($number, $base);
+    }
+
+    /**
+     * LOG10.
+     *
+     * Returns the result of builtin function log after validating args.
+     *
+     * @param mixed $number Should be numeric
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function base10(mixed $number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            Helpers::validatePositive($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return log10($number);
+    }
+
+    /**
+     * LN.
+     *
+     * Returns the result of builtin function log after validating args.
+     *
+     * @param mixed $number Should be numeric
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function natural(mixed $number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            Helpers::validatePositive($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return log($number);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php
new file mode 100644
index 00000000..fad01086
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use Matrix\Builder;
+use Matrix\Div0Exception as MatrixDiv0Exception;
+use Matrix\Exception as MatrixException;
+use Matrix\Matrix;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class MatrixFunctions
+{
+    /**
+     * Convert parameter to Matrix.
+     *
+     * @param mixed $matrixValues A matrix of values
+     */
+    private static function getMatrix(mixed $matrixValues): Matrix
+    {
+        $matrixData = [];
+        if (!is_array($matrixValues)) {
+            $matrixValues = [[$matrixValues]];
+        }
+
+        $row = 0;
+        foreach ($matrixValues as $matrixRow) {
+            if (!is_array($matrixRow)) {
+                $matrixRow = [$matrixRow];
+            }
+            $column = 0;
+            foreach ($matrixRow as $matrixCell) {
+                if ((is_string($matrixCell)) || ($matrixCell === null)) {
+                    throw new Exception(ExcelError::VALUE());
+                }
+                $matrixData[$row][$column] = $matrixCell;
+                ++$column;
+            }
+            ++$row;
+        }
+
+        return new Matrix($matrixData);
+    }
+
+    /**
+     * SEQUENCE.
+     *
+     * Generates a list of sequential numbers in an array.
+     *
+     * Excel Function:
+     *      SEQUENCE(rows,[columns],[start],[step])
+     *
+     * @param mixed $rows the number of rows to return, defaults to 1
+     * @param mixed $columns the number of columns to return, defaults to 1
+     * @param mixed $start the first number in the sequence, defaults to 1
+     * @param mixed $step the amount to increment each subsequent value in the array, defaults to 1
+     *
+     * @return array|string The resulting array, or a string containing an error
+     */
+    public static function sequence(mixed $rows = 1, mixed $columns = 1, mixed $start = 1, mixed $step = 1): string|array
+    {
+        try {
+            $rows = (int) Helpers::validateNumericNullSubstitution($rows, 1);
+            Helpers::validatePositive($rows);
+            $columns = (int) Helpers::validateNumericNullSubstitution($columns, 1);
+            Helpers::validatePositive($columns);
+            $start = Helpers::validateNumericNullSubstitution($start, 1);
+            $step = Helpers::validateNumericNullSubstitution($step, 1);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($step === 0) {
+            return array_chunk(
+                array_fill(0, $rows * $columns, $start),
+                max($columns, 1)
+            );
+        }
+
+        return array_chunk(
+            range($start, $start + (($rows * $columns - 1) * $step), $step),
+            max($columns, 1)
+        );
+    }
+
+    /**
+     * MDETERM.
+     *
+     * Returns the matrix determinant of an array.
+     *
+     * Excel Function:
+     *        MDETERM(array)
+     *
+     * @param mixed $matrixValues A matrix of values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function determinant(mixed $matrixValues)
+    {
+        try {
+            $matrix = self::getMatrix($matrixValues);
+
+            return $matrix->determinant();
+        } catch (MatrixException) {
+            return ExcelError::VALUE();
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * MINVERSE.
+     *
+     * Returns the inverse matrix for the matrix stored in an array.
+     *
+     * Excel Function:
+     *        MINVERSE(array)
+     *
+     * @param mixed $matrixValues A matrix of values
+     *
+     * @return array|string The result, or a string containing an error
+     */
+    public static function inverse(mixed $matrixValues): array|string
+    {
+        try {
+            $matrix = self::getMatrix($matrixValues);
+
+            return $matrix->inverse()->toArray();
+        } catch (MatrixDiv0Exception) {
+            return ExcelError::NAN();
+        } catch (MatrixException) {
+            return ExcelError::VALUE();
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * MMULT.
+     *
+     * @param mixed $matrixData1 A matrix of values
+     * @param mixed $matrixData2 A matrix of values
+     *
+     * @return array|string The result, or a string containing an error
+     */
+    public static function multiply(mixed $matrixData1, mixed $matrixData2): array|string
+    {
+        try {
+            $matrixA = self::getMatrix($matrixData1);
+            $matrixB = self::getMatrix($matrixData2);
+
+            return $matrixA->multiply($matrixB)->toArray();
+        } catch (MatrixException) {
+            return ExcelError::VALUE();
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * MUnit.
+     *
+     * @param mixed $dimension Number of rows and columns
+     *
+     * @return array|string The result, or a string containing an error
+     */
+    public static function identity(mixed $dimension)
+    {
+        try {
+            $dimension = (int) Helpers::validateNumericNullBool($dimension);
+            Helpers::validatePositive($dimension, ExcelError::VALUE());
+            $matrix = Builder::createIdentityMatrix($dimension, 0)->toArray();
+
+            return $matrix;
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php
new file mode 100644
index 00000000..0eca549b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Operations
+{
+    use ArrayEnabled;
+
+    /**
+     * MOD.
+     *
+     * @param mixed $dividend Dividend
+     *                      Or can be an array of values
+     * @param mixed $divisor Divisor
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Remainder, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function mod(mixed $dividend, mixed $divisor): array|string|float
+    {
+        if (is_array($dividend) || is_array($divisor)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dividend, $divisor);
+        }
+
+        try {
+            $dividend = Helpers::validateNumericNullBool($dividend);
+            $divisor = Helpers::validateNumericNullBool($divisor);
+            Helpers::validateNotZero($divisor);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($dividend < 0.0) && ($divisor > 0.0)) {
+            return $divisor - fmod(abs($dividend), $divisor);
+        }
+        if (($dividend > 0.0) && ($divisor < 0.0)) {
+            return $divisor + fmod($dividend, abs($divisor));
+        }
+
+        return fmod($dividend, $divisor);
+    }
+
+    /**
+     * POWER.
+     *
+     * Computes x raised to the power y.
+     *
+     * @param null|array|bool|float|int|string $x Or can be an array of values
+     * @param null|array|bool|float|int|string $y Or can be an array of values
+     *
+     * @return array|float|int|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function power(null|array|bool|float|int|string $x, null|array|bool|float|int|string $y): array|float|int|string
+    {
+        if (is_array($x) || is_array($y)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $y);
+        }
+
+        try {
+            $x = Helpers::validateNumericNullBool($x);
+            $y = Helpers::validateNumericNullBool($y);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Validate parameters
+        if (!$x && !$y) {
+            return ExcelError::NAN();
+        }
+        if (!$x && $y < 0.0) {
+            return ExcelError::DIV0();
+        }
+
+        // Return
+        $result = $x ** $y;
+
+        return Helpers::numberOrNan($result);
+    }
+
+    /**
+     * PRODUCT.
+     *
+     * PRODUCT returns the product of all the values and cells referenced in the argument list.
+     *
+     * Excel Function:
+     *        PRODUCT(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function product(mixed ...$args): string|float
+    {
+        $args = array_filter(
+            Functions::flattenArray($args),
+            fn ($value): bool => $value !== null
+        );
+
+        // Return value
+        $returnValue = (count($args) === 0) ? 0.0 : 1.0;
+
+        // Loop through arguments
+        foreach ($args as $arg) {
+            // Is it a numeric value?
+            if (is_numeric($arg)) {
+                $returnValue *= $arg;
+            } else {
+                return ExcelError::throwError($arg);
+            }
+        }
+
+        return (float) $returnValue;
+    }
+
+    /**
+     * QUOTIENT.
+     *
+     * QUOTIENT function returns the integer portion of a division. Numerator is the divided number
+     *        and denominator is the divisor.
+     *
+     * Excel Function:
+     *        QUOTIENT(value1,value2)
+     *
+     * @param mixed $numerator Expect float|int
+     *                      Or can be an array of values
+     * @param mixed $denominator Expect float|int
+     *                      Or can be an array of values
+     *
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function quotient(mixed $numerator, mixed $denominator): array|string|int
+    {
+        if (is_array($numerator) || is_array($denominator)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numerator, $denominator);
+        }
+
+        try {
+            $numerator = Helpers::validateNumericNullSubstitution($numerator, 0);
+            $denominator = Helpers::validateNumericNullSubstitution($denominator, 0);
+            Helpers::validateNotZero($denominator);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (int) ($numerator / $denominator);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
new file mode 100644
index 00000000..5d351677
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Random
+{
+    use ArrayEnabled;
+
+    /**
+     * RAND.
+     *
+     * @return float|int Random number
+     */
+    public static function rand(): int|float
+    {
+        return mt_rand(0, 10000000) / 10000000;
+    }
+
+    /**
+     * RANDBETWEEN.
+     *
+     * @param mixed $min Minimal value
+     *                      Or can be an array of values
+     * @param mixed $max Maximal value
+     *                      Or can be an array of values
+     *
+     * @return array|int|string Random number
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function randBetween(mixed $min, mixed $max): array|string|int
+    {
+        if (is_array($min) || is_array($max)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $min, $max);
+        }
+
+        try {
+            $min = (int) Helpers::validateNumericNullBool($min);
+            $max = (int) Helpers::validateNumericNullBool($max);
+            Helpers::validateNotNegative($max - $min);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return mt_rand($min, $max);
+    }
+
+    /**
+     * RANDARRAY.
+     *
+     * Generates a list of sequential numbers in an array.
+     *
+     * Excel Function:
+     *      RANDARRAY([rows],[columns],[start],[step])
+     *
+     * @param mixed $rows the number of rows to return, defaults to 1
+     * @param mixed $columns the number of columns to return, defaults to 1
+     * @param mixed $min the minimum number to be returned, defaults to 0
+     * @param mixed $max the maximum number to be returned, defaults to 1
+     * @param bool $wholeNumber the type of numbers to return:
+     *                             False - Decimal numbers to 15 decimal places. (default)
+     *                             True - Whole (integer) numbers
+     *
+     * @return array|string The resulting array, or a string containing an error
+     */
+    public static function randArray(mixed $rows = 1, mixed $columns = 1, mixed $min = 0, mixed $max = 1, bool $wholeNumber = false): string|array
+    {
+        try {
+            $rows = (int) Helpers::validateNumericNullSubstitution($rows, 1);
+            Helpers::validatePositive($rows);
+            $columns = (int) Helpers::validateNumericNullSubstitution($columns, 1);
+            Helpers::validatePositive($columns);
+            $min = Helpers::validateNumericNullSubstitution($min, 1);
+            $max = Helpers::validateNumericNullSubstitution($max, 1);
+
+            if ($max <= $min) {
+                return ExcelError::VALUE();
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return array_chunk(
+            array_map(
+                function () use ($min, $max, $wholeNumber): int|float {
+                    return $wholeNumber
+                        ? mt_rand((int) $min, (int) $max)
+                        : (mt_rand() / mt_getrandmax()) * ($max - $min) + $min;
+                },
+                array_fill(0, $rows * $columns, $min)
+            ),
+            max($columns, 1)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php
new file mode 100644
index 00000000..7c6f8e78
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php
@@ -0,0 +1,846 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Roman
+{
+    use ArrayEnabled;
+
+    private const VALUES = [
+        45 => ['VL'],
+        46 => ['VLI'],
+        47 => ['VLII'],
+        48 => ['VLIII'],
+        49 => ['VLIV', 'IL'],
+        95 => ['VC'],
+        96 => ['VCI'],
+        97 => ['VCII'],
+        98 => ['VCIII'],
+        99 => ['VCIV', 'IC'],
+        145 => ['CVL'],
+        146 => ['CVLI'],
+        147 => ['CVLII'],
+        148 => ['CVLIII'],
+        149 => ['CVLIV', 'CIL'],
+        195 => ['CVC'],
+        196 => ['CVCI'],
+        197 => ['CVCII'],
+        198 => ['CVCIII'],
+        199 => ['CVCIV', 'CIC'],
+        245 => ['CCVL'],
+        246 => ['CCVLI'],
+        247 => ['CCVLII'],
+        248 => ['CCVLIII'],
+        249 => ['CCVLIV', 'CCIL'],
+        295 => ['CCVC'],
+        296 => ['CCVCI'],
+        297 => ['CCVCII'],
+        298 => ['CCVCIII'],
+        299 => ['CCVCIV', 'CCIC'],
+        345 => ['CCCVL'],
+        346 => ['CCCVLI'],
+        347 => ['CCCVLII'],
+        348 => ['CCCVLIII'],
+        349 => ['CCCVLIV', 'CCCIL'],
+        395 => ['CCCVC'],
+        396 => ['CCCVCI'],
+        397 => ['CCCVCII'],
+        398 => ['CCCVCIII'],
+        399 => ['CCCVCIV', 'CCCIC'],
+        445 => ['CDVL'],
+        446 => ['CDVLI'],
+        447 => ['CDVLII'],
+        448 => ['CDVLIII'],
+        449 => ['CDVLIV', 'CDIL'],
+        450 => ['LD'],
+        451 => ['LDI'],
+        452 => ['LDII'],
+        453 => ['LDIII'],
+        454 => ['LDIV'],
+        455 => ['LDV'],
+        456 => ['LDVI'],
+        457 => ['LDVII'],
+        458 => ['LDVIII'],
+        459 => ['LDIX'],
+        460 => ['LDX'],
+        461 => ['LDXI'],
+        462 => ['LDXII'],
+        463 => ['LDXIII'],
+        464 => ['LDXIV'],
+        465 => ['LDXV'],
+        466 => ['LDXVI'],
+        467 => ['LDXVII'],
+        468 => ['LDXVIII'],
+        469 => ['LDXIX'],
+        470 => ['LDXX'],
+        471 => ['LDXXI'],
+        472 => ['LDXXII'],
+        473 => ['LDXXIII'],
+        474 => ['LDXXIV'],
+        475 => ['LDXXV'],
+        476 => ['LDXXVI'],
+        477 => ['LDXXVII'],
+        478 => ['LDXXVIII'],
+        479 => ['LDXXIX'],
+        480 => ['LDXXX'],
+        481 => ['LDXXXI'],
+        482 => ['LDXXXII'],
+        483 => ['LDXXXIII'],
+        484 => ['LDXXXIV'],
+        485 => ['LDXXXV'],
+        486 => ['LDXXXVI'],
+        487 => ['LDXXXVII'],
+        488 => ['LDXXXVIII'],
+        489 => ['LDXXXIX'],
+        490 => ['LDXL', 'XD'],
+        491 => ['LDXLI', 'XDI'],
+        492 => ['LDXLII', 'XDII'],
+        493 => ['LDXLIII', 'XDIII'],
+        494 => ['LDXLIV', 'XDIV'],
+        495 => ['LDVL', 'XDV', 'VD'],
+        496 => ['LDVLI', 'XDVI', 'VDI'],
+        497 => ['LDVLII', 'XDVII', 'VDII'],
+        498 => ['LDVLIII', 'XDVIII', 'VDIII'],
+        499 => ['LDVLIV', 'XDIX', 'VDIV', 'ID'],
+        545 => ['DVL'],
+        546 => ['DVLI'],
+        547 => ['DVLII'],
+        548 => ['DVLIII'],
+        549 => ['DVLIV', 'DIL'],
+        595 => ['DVC'],
+        596 => ['DVCI'],
+        597 => ['DVCII'],
+        598 => ['DVCIII'],
+        599 => ['DVCIV', 'DIC'],
+        645 => ['DCVL'],
+        646 => ['DCVLI'],
+        647 => ['DCVLII'],
+        648 => ['DCVLIII'],
+        649 => ['DCVLIV', 'DCIL'],
+        695 => ['DCVC'],
+        696 => ['DCVCI'],
+        697 => ['DCVCII'],
+        698 => ['DCVCIII'],
+        699 => ['DCVCIV', 'DCIC'],
+        745 => ['DCCVL'],
+        746 => ['DCCVLI'],
+        747 => ['DCCVLII'],
+        748 => ['DCCVLIII'],
+        749 => ['DCCVLIV', 'DCCIL'],
+        795 => ['DCCVC'],
+        796 => ['DCCVCI'],
+        797 => ['DCCVCII'],
+        798 => ['DCCVCIII'],
+        799 => ['DCCVCIV', 'DCCIC'],
+        845 => ['DCCCVL'],
+        846 => ['DCCCVLI'],
+        847 => ['DCCCVLII'],
+        848 => ['DCCCVLIII'],
+        849 => ['DCCCVLIV', 'DCCCIL'],
+        895 => ['DCCCVC'],
+        896 => ['DCCCVCI'],
+        897 => ['DCCCVCII'],
+        898 => ['DCCCVCIII'],
+        899 => ['DCCCVCIV', 'DCCCIC'],
+        945 => ['CMVL'],
+        946 => ['CMVLI'],
+        947 => ['CMVLII'],
+        948 => ['CMVLIII'],
+        949 => ['CMVLIV', 'CMIL'],
+        950 => ['LM'],
+        951 => ['LMI'],
+        952 => ['LMII'],
+        953 => ['LMIII'],
+        954 => ['LMIV'],
+        955 => ['LMV'],
+        956 => ['LMVI'],
+        957 => ['LMVII'],
+        958 => ['LMVIII'],
+        959 => ['LMIX'],
+        960 => ['LMX'],
+        961 => ['LMXI'],
+        962 => ['LMXII'],
+        963 => ['LMXIII'],
+        964 => ['LMXIV'],
+        965 => ['LMXV'],
+        966 => ['LMXVI'],
+        967 => ['LMXVII'],
+        968 => ['LMXVIII'],
+        969 => ['LMXIX'],
+        970 => ['LMXX'],
+        971 => ['LMXXI'],
+        972 => ['LMXXII'],
+        973 => ['LMXXIII'],
+        974 => ['LMXXIV'],
+        975 => ['LMXXV'],
+        976 => ['LMXXVI'],
+        977 => ['LMXXVII'],
+        978 => ['LMXXVIII'],
+        979 => ['LMXXIX'],
+        980 => ['LMXXX'],
+        981 => ['LMXXXI'],
+        982 => ['LMXXXII'],
+        983 => ['LMXXXIII'],
+        984 => ['LMXXXIV'],
+        985 => ['LMXXXV'],
+        986 => ['LMXXXVI'],
+        987 => ['LMXXXVII'],
+        988 => ['LMXXXVIII'],
+        989 => ['LMXXXIX'],
+        990 => ['LMXL', 'XM'],
+        991 => ['LMXLI', 'XMI'],
+        992 => ['LMXLII', 'XMII'],
+        993 => ['LMXLIII', 'XMIII'],
+        994 => ['LMXLIV', 'XMIV'],
+        995 => ['LMVL', 'XMV', 'VM'],
+        996 => ['LMVLI', 'XMVI', 'VMI'],
+        997 => ['LMVLII', 'XMVII', 'VMII'],
+        998 => ['LMVLIII', 'XMVIII', 'VMIII'],
+        999 => ['LMVLIV', 'XMIX', 'VMIV', 'IM'],
+        1045 => ['MVL'],
+        1046 => ['MVLI'],
+        1047 => ['MVLII'],
+        1048 => ['MVLIII'],
+        1049 => ['MVLIV', 'MIL'],
+        1095 => ['MVC'],
+        1096 => ['MVCI'],
+        1097 => ['MVCII'],
+        1098 => ['MVCIII'],
+        1099 => ['MVCIV', 'MIC'],
+        1145 => ['MCVL'],
+        1146 => ['MCVLI'],
+        1147 => ['MCVLII'],
+        1148 => ['MCVLIII'],
+        1149 => ['MCVLIV', 'MCIL'],
+        1195 => ['MCVC'],
+        1196 => ['MCVCI'],
+        1197 => ['MCVCII'],
+        1198 => ['MCVCIII'],
+        1199 => ['MCVCIV', 'MCIC'],
+        1245 => ['MCCVL'],
+        1246 => ['MCCVLI'],
+        1247 => ['MCCVLII'],
+        1248 => ['MCCVLIII'],
+        1249 => ['MCCVLIV', 'MCCIL'],
+        1295 => ['MCCVC'],
+        1296 => ['MCCVCI'],
+        1297 => ['MCCVCII'],
+        1298 => ['MCCVCIII'],
+        1299 => ['MCCVCIV', 'MCCIC'],
+        1345 => ['MCCCVL'],
+        1346 => ['MCCCVLI'],
+        1347 => ['MCCCVLII'],
+        1348 => ['MCCCVLIII'],
+        1349 => ['MCCCVLIV', 'MCCCIL'],
+        1395 => ['MCCCVC'],
+        1396 => ['MCCCVCI'],
+        1397 => ['MCCCVCII'],
+        1398 => ['MCCCVCIII'],
+        1399 => ['MCCCVCIV', 'MCCCIC'],
+        1445 => ['MCDVL'],
+        1446 => ['MCDVLI'],
+        1447 => ['MCDVLII'],
+        1448 => ['MCDVLIII'],
+        1449 => ['MCDVLIV', 'MCDIL'],
+        1450 => ['MLD'],
+        1451 => ['MLDI'],
+        1452 => ['MLDII'],
+        1453 => ['MLDIII'],
+        1454 => ['MLDIV'],
+        1455 => ['MLDV'],
+        1456 => ['MLDVI'],
+        1457 => ['MLDVII'],
+        1458 => ['MLDVIII'],
+        1459 => ['MLDIX'],
+        1460 => ['MLDX'],
+        1461 => ['MLDXI'],
+        1462 => ['MLDXII'],
+        1463 => ['MLDXIII'],
+        1464 => ['MLDXIV'],
+        1465 => ['MLDXV'],
+        1466 => ['MLDXVI'],
+        1467 => ['MLDXVII'],
+        1468 => ['MLDXVIII'],
+        1469 => ['MLDXIX'],
+        1470 => ['MLDXX'],
+        1471 => ['MLDXXI'],
+        1472 => ['MLDXXII'],
+        1473 => ['MLDXXIII'],
+        1474 => ['MLDXXIV'],
+        1475 => ['MLDXXV'],
+        1476 => ['MLDXXVI'],
+        1477 => ['MLDXXVII'],
+        1478 => ['MLDXXVIII'],
+        1479 => ['MLDXXIX'],
+        1480 => ['MLDXXX'],
+        1481 => ['MLDXXXI'],
+        1482 => ['MLDXXXII'],
+        1483 => ['MLDXXXIII'],
+        1484 => ['MLDXXXIV'],
+        1485 => ['MLDXXXV'],
+        1486 => ['MLDXXXVI'],
+        1487 => ['MLDXXXVII'],
+        1488 => ['MLDXXXVIII'],
+        1489 => ['MLDXXXIX'],
+        1490 => ['MLDXL', 'MXD'],
+        1491 => ['MLDXLI', 'MXDI'],
+        1492 => ['MLDXLII', 'MXDII'],
+        1493 => ['MLDXLIII', 'MXDIII'],
+        1494 => ['MLDXLIV', 'MXDIV'],
+        1495 => ['MLDVL', 'MXDV', 'MVD'],
+        1496 => ['MLDVLI', 'MXDVI', 'MVDI'],
+        1497 => ['MLDVLII', 'MXDVII', 'MVDII'],
+        1498 => ['MLDVLIII', 'MXDVIII', 'MVDIII'],
+        1499 => ['MLDVLIV', 'MXDIX', 'MVDIV', 'MID'],
+        1545 => ['MDVL'],
+        1546 => ['MDVLI'],
+        1547 => ['MDVLII'],
+        1548 => ['MDVLIII'],
+        1549 => ['MDVLIV', 'MDIL'],
+        1595 => ['MDVC'],
+        1596 => ['MDVCI'],
+        1597 => ['MDVCII'],
+        1598 => ['MDVCIII'],
+        1599 => ['MDVCIV', 'MDIC'],
+        1645 => ['MDCVL'],
+        1646 => ['MDCVLI'],
+        1647 => ['MDCVLII'],
+        1648 => ['MDCVLIII'],
+        1649 => ['MDCVLIV', 'MDCIL'],
+        1695 => ['MDCVC'],
+        1696 => ['MDCVCI'],
+        1697 => ['MDCVCII'],
+        1698 => ['MDCVCIII'],
+        1699 => ['MDCVCIV', 'MDCIC'],
+        1745 => ['MDCCVL'],
+        1746 => ['MDCCVLI'],
+        1747 => ['MDCCVLII'],
+        1748 => ['MDCCVLIII'],
+        1749 => ['MDCCVLIV', 'MDCCIL'],
+        1795 => ['MDCCVC'],
+        1796 => ['MDCCVCI'],
+        1797 => ['MDCCVCII'],
+        1798 => ['MDCCVCIII'],
+        1799 => ['MDCCVCIV', 'MDCCIC'],
+        1845 => ['MDCCCVL'],
+        1846 => ['MDCCCVLI'],
+        1847 => ['MDCCCVLII'],
+        1848 => ['MDCCCVLIII'],
+        1849 => ['MDCCCVLIV', 'MDCCCIL'],
+        1895 => ['MDCCCVC'],
+        1896 => ['MDCCCVCI'],
+        1897 => ['MDCCCVCII'],
+        1898 => ['MDCCCVCIII'],
+        1899 => ['MDCCCVCIV', 'MDCCCIC'],
+        1945 => ['MCMVL'],
+        1946 => ['MCMVLI'],
+        1947 => ['MCMVLII'],
+        1948 => ['MCMVLIII'],
+        1949 => ['MCMVLIV', 'MCMIL'],
+        1950 => ['MLM'],
+        1951 => ['MLMI'],
+        1952 => ['MLMII'],
+        1953 => ['MLMIII'],
+        1954 => ['MLMIV'],
+        1955 => ['MLMV'],
+        1956 => ['MLMVI'],
+        1957 => ['MLMVII'],
+        1958 => ['MLMVIII'],
+        1959 => ['MLMIX'],
+        1960 => ['MLMX'],
+        1961 => ['MLMXI'],
+        1962 => ['MLMXII'],
+        1963 => ['MLMXIII'],
+        1964 => ['MLMXIV'],
+        1965 => ['MLMXV'],
+        1966 => ['MLMXVI'],
+        1967 => ['MLMXVII'],
+        1968 => ['MLMXVIII'],
+        1969 => ['MLMXIX'],
+        1970 => ['MLMXX'],
+        1971 => ['MLMXXI'],
+        1972 => ['MLMXXII'],
+        1973 => ['MLMXXIII'],
+        1974 => ['MLMXXIV'],
+        1975 => ['MLMXXV'],
+        1976 => ['MLMXXVI'],
+        1977 => ['MLMXXVII'],
+        1978 => ['MLMXXVIII'],
+        1979 => ['MLMXXIX'],
+        1980 => ['MLMXXX'],
+        1981 => ['MLMXXXI'],
+        1982 => ['MLMXXXII'],
+        1983 => ['MLMXXXIII'],
+        1984 => ['MLMXXXIV'],
+        1985 => ['MLMXXXV'],
+        1986 => ['MLMXXXVI'],
+        1987 => ['MLMXXXVII'],
+        1988 => ['MLMXXXVIII'],
+        1989 => ['MLMXXXIX'],
+        1990 => ['MLMXL', 'MXM'],
+        1991 => ['MLMXLI', 'MXMI'],
+        1992 => ['MLMXLII', 'MXMII'],
+        1993 => ['MLMXLIII', 'MXMIII'],
+        1994 => ['MLMXLIV', 'MXMIV'],
+        1995 => ['MLMVL', 'MXMV', 'MVM'],
+        1996 => ['MLMVLI', 'MXMVI', 'MVMI'],
+        1997 => ['MLMVLII', 'MXMVII', 'MVMII'],
+        1998 => ['MLMVLIII', 'MXMVIII', 'MVMIII'],
+        1999 => ['MLMVLIV', 'MXMIX', 'MVMIV', 'MIM'],
+        2045 => ['MMVL'],
+        2046 => ['MMVLI'],
+        2047 => ['MMVLII'],
+        2048 => ['MMVLIII'],
+        2049 => ['MMVLIV', 'MMIL'],
+        2095 => ['MMVC'],
+        2096 => ['MMVCI'],
+        2097 => ['MMVCII'],
+        2098 => ['MMVCIII'],
+        2099 => ['MMVCIV', 'MMIC'],
+        2145 => ['MMCVL'],
+        2146 => ['MMCVLI'],
+        2147 => ['MMCVLII'],
+        2148 => ['MMCVLIII'],
+        2149 => ['MMCVLIV', 'MMCIL'],
+        2195 => ['MMCVC'],
+        2196 => ['MMCVCI'],
+        2197 => ['MMCVCII'],
+        2198 => ['MMCVCIII'],
+        2199 => ['MMCVCIV', 'MMCIC'],
+        2245 => ['MMCCVL'],
+        2246 => ['MMCCVLI'],
+        2247 => ['MMCCVLII'],
+        2248 => ['MMCCVLIII'],
+        2249 => ['MMCCVLIV', 'MMCCIL'],
+        2295 => ['MMCCVC'],
+        2296 => ['MMCCVCI'],
+        2297 => ['MMCCVCII'],
+        2298 => ['MMCCVCIII'],
+        2299 => ['MMCCVCIV', 'MMCCIC'],
+        2345 => ['MMCCCVL'],
+        2346 => ['MMCCCVLI'],
+        2347 => ['MMCCCVLII'],
+        2348 => ['MMCCCVLIII'],
+        2349 => ['MMCCCVLIV', 'MMCCCIL'],
+        2395 => ['MMCCCVC'],
+        2396 => ['MMCCCVCI'],
+        2397 => ['MMCCCVCII'],
+        2398 => ['MMCCCVCIII'],
+        2399 => ['MMCCCVCIV', 'MMCCCIC'],
+        2445 => ['MMCDVL'],
+        2446 => ['MMCDVLI'],
+        2447 => ['MMCDVLII'],
+        2448 => ['MMCDVLIII'],
+        2449 => ['MMCDVLIV', 'MMCDIL'],
+        2450 => ['MMLD'],
+        2451 => ['MMLDI'],
+        2452 => ['MMLDII'],
+        2453 => ['MMLDIII'],
+        2454 => ['MMLDIV'],
+        2455 => ['MMLDV'],
+        2456 => ['MMLDVI'],
+        2457 => ['MMLDVII'],
+        2458 => ['MMLDVIII'],
+        2459 => ['MMLDIX'],
+        2460 => ['MMLDX'],
+        2461 => ['MMLDXI'],
+        2462 => ['MMLDXII'],
+        2463 => ['MMLDXIII'],
+        2464 => ['MMLDXIV'],
+        2465 => ['MMLDXV'],
+        2466 => ['MMLDXVI'],
+        2467 => ['MMLDXVII'],
+        2468 => ['MMLDXVIII'],
+        2469 => ['MMLDXIX'],
+        2470 => ['MMLDXX'],
+        2471 => ['MMLDXXI'],
+        2472 => ['MMLDXXII'],
+        2473 => ['MMLDXXIII'],
+        2474 => ['MMLDXXIV'],
+        2475 => ['MMLDXXV'],
+        2476 => ['MMLDXXVI'],
+        2477 => ['MMLDXXVII'],
+        2478 => ['MMLDXXVIII'],
+        2479 => ['MMLDXXIX'],
+        2480 => ['MMLDXXX'],
+        2481 => ['MMLDXXXI'],
+        2482 => ['MMLDXXXII'],
+        2483 => ['MMLDXXXIII'],
+        2484 => ['MMLDXXXIV'],
+        2485 => ['MMLDXXXV'],
+        2486 => ['MMLDXXXVI'],
+        2487 => ['MMLDXXXVII'],
+        2488 => ['MMLDXXXVIII'],
+        2489 => ['MMLDXXXIX'],
+        2490 => ['MMLDXL', 'MMXD'],
+        2491 => ['MMLDXLI', 'MMXDI'],
+        2492 => ['MMLDXLII', 'MMXDII'],
+        2493 => ['MMLDXLIII', 'MMXDIII'],
+        2494 => ['MMLDXLIV', 'MMXDIV'],
+        2495 => ['MMLDVL', 'MMXDV', 'MMVD'],
+        2496 => ['MMLDVLI', 'MMXDVI', 'MMVDI'],
+        2497 => ['MMLDVLII', 'MMXDVII', 'MMVDII'],
+        2498 => ['MMLDVLIII', 'MMXDVIII', 'MMVDIII'],
+        2499 => ['MMLDVLIV', 'MMXDIX', 'MMVDIV', 'MMID'],
+        2545 => ['MMDVL'],
+        2546 => ['MMDVLI'],
+        2547 => ['MMDVLII'],
+        2548 => ['MMDVLIII'],
+        2549 => ['MMDVLIV', 'MMDIL'],
+        2595 => ['MMDVC'],
+        2596 => ['MMDVCI'],
+        2597 => ['MMDVCII'],
+        2598 => ['MMDVCIII'],
+        2599 => ['MMDVCIV', 'MMDIC'],
+        2645 => ['MMDCVL'],
+        2646 => ['MMDCVLI'],
+        2647 => ['MMDCVLII'],
+        2648 => ['MMDCVLIII'],
+        2649 => ['MMDCVLIV', 'MMDCIL'],
+        2695 => ['MMDCVC'],
+        2696 => ['MMDCVCI'],
+        2697 => ['MMDCVCII'],
+        2698 => ['MMDCVCIII'],
+        2699 => ['MMDCVCIV', 'MMDCIC'],
+        2745 => ['MMDCCVL'],
+        2746 => ['MMDCCVLI'],
+        2747 => ['MMDCCVLII'],
+        2748 => ['MMDCCVLIII'],
+        2749 => ['MMDCCVLIV', 'MMDCCIL'],
+        2795 => ['MMDCCVC'],
+        2796 => ['MMDCCVCI'],
+        2797 => ['MMDCCVCII'],
+        2798 => ['MMDCCVCIII'],
+        2799 => ['MMDCCVCIV', 'MMDCCIC'],
+        2845 => ['MMDCCCVL'],
+        2846 => ['MMDCCCVLI'],
+        2847 => ['MMDCCCVLII'],
+        2848 => ['MMDCCCVLIII'],
+        2849 => ['MMDCCCVLIV', 'MMDCCCIL'],
+        2895 => ['MMDCCCVC'],
+        2896 => ['MMDCCCVCI'],
+        2897 => ['MMDCCCVCII'],
+        2898 => ['MMDCCCVCIII'],
+        2899 => ['MMDCCCVCIV', 'MMDCCCIC'],
+        2945 => ['MMCMVL'],
+        2946 => ['MMCMVLI'],
+        2947 => ['MMCMVLII'],
+        2948 => ['MMCMVLIII'],
+        2949 => ['MMCMVLIV', 'MMCMIL'],
+        2950 => ['MMLM'],
+        2951 => ['MMLMI'],
+        2952 => ['MMLMII'],
+        2953 => ['MMLMIII'],
+        2954 => ['MMLMIV'],
+        2955 => ['MMLMV'],
+        2956 => ['MMLMVI'],
+        2957 => ['MMLMVII'],
+        2958 => ['MMLMVIII'],
+        2959 => ['MMLMIX'],
+        2960 => ['MMLMX'],
+        2961 => ['MMLMXI'],
+        2962 => ['MMLMXII'],
+        2963 => ['MMLMXIII'],
+        2964 => ['MMLMXIV'],
+        2965 => ['MMLMXV'],
+        2966 => ['MMLMXVI'],
+        2967 => ['MMLMXVII'],
+        2968 => ['MMLMXVIII'],
+        2969 => ['MMLMXIX'],
+        2970 => ['MMLMXX'],
+        2971 => ['MMLMXXI'],
+        2972 => ['MMLMXXII'],
+        2973 => ['MMLMXXIII'],
+        2974 => ['MMLMXXIV'],
+        2975 => ['MMLMXXV'],
+        2976 => ['MMLMXXVI'],
+        2977 => ['MMLMXXVII'],
+        2978 => ['MMLMXXVIII'],
+        2979 => ['MMLMXXIX'],
+        2980 => ['MMLMXXX'],
+        2981 => ['MMLMXXXI'],
+        2982 => ['MMLMXXXII'],
+        2983 => ['MMLMXXXIII'],
+        2984 => ['MMLMXXXIV'],
+        2985 => ['MMLMXXXV'],
+        2986 => ['MMLMXXXVI'],
+        2987 => ['MMLMXXXVII'],
+        2988 => ['MMLMXXXVIII'],
+        2989 => ['MMLMXXXIX'],
+        2990 => ['MMLMXL', 'MMXM'],
+        2991 => ['MMLMXLI', 'MMXMI'],
+        2992 => ['MMLMXLII', 'MMXMII'],
+        2993 => ['MMLMXLIII', 'MMXMIII'],
+        2994 => ['MMLMXLIV', 'MMXMIV'],
+        2995 => ['MMLMVL', 'MMXMV', 'MMVM'],
+        2996 => ['MMLMVLI', 'MMXMVI', 'MMVMI'],
+        2997 => ['MMLMVLII', 'MMXMVII', 'MMVMII'],
+        2998 => ['MMLMVLIII', 'MMXMVIII', 'MMVMIII'],
+        2999 => ['MMLMVLIV', 'MMXMIX', 'MMVMIV', 'MMIM'],
+        3045 => ['MMMVL'],
+        3046 => ['MMMVLI'],
+        3047 => ['MMMVLII'],
+        3048 => ['MMMVLIII'],
+        3049 => ['MMMVLIV', 'MMMIL'],
+        3095 => ['MMMVC'],
+        3096 => ['MMMVCI'],
+        3097 => ['MMMVCII'],
+        3098 => ['MMMVCIII'],
+        3099 => ['MMMVCIV', 'MMMIC'],
+        3145 => ['MMMCVL'],
+        3146 => ['MMMCVLI'],
+        3147 => ['MMMCVLII'],
+        3148 => ['MMMCVLIII'],
+        3149 => ['MMMCVLIV', 'MMMCIL'],
+        3195 => ['MMMCVC'],
+        3196 => ['MMMCVCI'],
+        3197 => ['MMMCVCII'],
+        3198 => ['MMMCVCIII'],
+        3199 => ['MMMCVCIV', 'MMMCIC'],
+        3245 => ['MMMCCVL'],
+        3246 => ['MMMCCVLI'],
+        3247 => ['MMMCCVLII'],
+        3248 => ['MMMCCVLIII'],
+        3249 => ['MMMCCVLIV', 'MMMCCIL'],
+        3295 => ['MMMCCVC'],
+        3296 => ['MMMCCVCI'],
+        3297 => ['MMMCCVCII'],
+        3298 => ['MMMCCVCIII'],
+        3299 => ['MMMCCVCIV', 'MMMCCIC'],
+        3345 => ['MMMCCCVL'],
+        3346 => ['MMMCCCVLI'],
+        3347 => ['MMMCCCVLII'],
+        3348 => ['MMMCCCVLIII'],
+        3349 => ['MMMCCCVLIV', 'MMMCCCIL'],
+        3395 => ['MMMCCCVC'],
+        3396 => ['MMMCCCVCI'],
+        3397 => ['MMMCCCVCII'],
+        3398 => ['MMMCCCVCIII'],
+        3399 => ['MMMCCCVCIV', 'MMMCCCIC'],
+        3445 => ['MMMCDVL'],
+        3446 => ['MMMCDVLI'],
+        3447 => ['MMMCDVLII'],
+        3448 => ['MMMCDVLIII'],
+        3449 => ['MMMCDVLIV', 'MMMCDIL'],
+        3450 => ['MMMLD'],
+        3451 => ['MMMLDI'],
+        3452 => ['MMMLDII'],
+        3453 => ['MMMLDIII'],
+        3454 => ['MMMLDIV'],
+        3455 => ['MMMLDV'],
+        3456 => ['MMMLDVI'],
+        3457 => ['MMMLDVII'],
+        3458 => ['MMMLDVIII'],
+        3459 => ['MMMLDIX'],
+        3460 => ['MMMLDX'],
+        3461 => ['MMMLDXI'],
+        3462 => ['MMMLDXII'],
+        3463 => ['MMMLDXIII'],
+        3464 => ['MMMLDXIV'],
+        3465 => ['MMMLDXV'],
+        3466 => ['MMMLDXVI'],
+        3467 => ['MMMLDXVII'],
+        3468 => ['MMMLDXVIII'],
+        3469 => ['MMMLDXIX'],
+        3470 => ['MMMLDXX'],
+        3471 => ['MMMLDXXI'],
+        3472 => ['MMMLDXXII'],
+        3473 => ['MMMLDXXIII'],
+        3474 => ['MMMLDXXIV'],
+        3475 => ['MMMLDXXV'],
+        3476 => ['MMMLDXXVI'],
+        3477 => ['MMMLDXXVII'],
+        3478 => ['MMMLDXXVIII'],
+        3479 => ['MMMLDXXIX'],
+        3480 => ['MMMLDXXX'],
+        3481 => ['MMMLDXXXI'],
+        3482 => ['MMMLDXXXII'],
+        3483 => ['MMMLDXXXIII'],
+        3484 => ['MMMLDXXXIV'],
+        3485 => ['MMMLDXXXV'],
+        3486 => ['MMMLDXXXVI'],
+        3487 => ['MMMLDXXXVII'],
+        3488 => ['MMMLDXXXVIII'],
+        3489 => ['MMMLDXXXIX'],
+        3490 => ['MMMLDXL', 'MMMXD'],
+        3491 => ['MMMLDXLI', 'MMMXDI'],
+        3492 => ['MMMLDXLII', 'MMMXDII'],
+        3493 => ['MMMLDXLIII', 'MMMXDIII'],
+        3494 => ['MMMLDXLIV', 'MMMXDIV'],
+        3495 => ['MMMLDVL', 'MMMXDV', 'MMMVD'],
+        3496 => ['MMMLDVLI', 'MMMXDVI', 'MMMVDI'],
+        3497 => ['MMMLDVLII', 'MMMXDVII', 'MMMVDII'],
+        3498 => ['MMMLDVLIII', 'MMMXDVIII', 'MMMVDIII'],
+        3499 => ['MMMLDVLIV', 'MMMXDIX', 'MMMVDIV', 'MMMID'],
+        3545 => ['MMMDVL'],
+        3546 => ['MMMDVLI'],
+        3547 => ['MMMDVLII'],
+        3548 => ['MMMDVLIII'],
+        3549 => ['MMMDVLIV', 'MMMDIL'],
+        3595 => ['MMMDVC'],
+        3596 => ['MMMDVCI'],
+        3597 => ['MMMDVCII'],
+        3598 => ['MMMDVCIII'],
+        3599 => ['MMMDVCIV', 'MMMDIC'],
+        3645 => ['MMMDCVL'],
+        3646 => ['MMMDCVLI'],
+        3647 => ['MMMDCVLII'],
+        3648 => ['MMMDCVLIII'],
+        3649 => ['MMMDCVLIV', 'MMMDCIL'],
+        3695 => ['MMMDCVC'],
+        3696 => ['MMMDCVCI'],
+        3697 => ['MMMDCVCII'],
+        3698 => ['MMMDCVCIII'],
+        3699 => ['MMMDCVCIV', 'MMMDCIC'],
+        3745 => ['MMMDCCVL'],
+        3746 => ['MMMDCCVLI'],
+        3747 => ['MMMDCCVLII'],
+        3748 => ['MMMDCCVLIII'],
+        3749 => ['MMMDCCVLIV', 'MMMDCCIL'],
+        3795 => ['MMMDCCVC'],
+        3796 => ['MMMDCCVCI'],
+        3797 => ['MMMDCCVCII'],
+        3798 => ['MMMDCCVCIII'],
+        3799 => ['MMMDCCVCIV', 'MMMDCCIC'],
+        3845 => ['MMMDCCCVL'],
+        3846 => ['MMMDCCCVLI'],
+        3847 => ['MMMDCCCVLII'],
+        3848 => ['MMMDCCCVLIII'],
+        3849 => ['MMMDCCCVLIV', 'MMMDCCCIL'],
+        3895 => ['MMMDCCCVC'],
+        3896 => ['MMMDCCCVCI'],
+        3897 => ['MMMDCCCVCII'],
+        3898 => ['MMMDCCCVCIII'],
+        3899 => ['MMMDCCCVCIV', 'MMMDCCCIC'],
+        3945 => ['MMMCMVL'],
+        3946 => ['MMMCMVLI'],
+        3947 => ['MMMCMVLII'],
+        3948 => ['MMMCMVLIII'],
+        3949 => ['MMMCMVLIV', 'MMMCMIL'],
+        3950 => ['MMMLM'],
+        3951 => ['MMMLMI'],
+        3952 => ['MMMLMII'],
+        3953 => ['MMMLMIII'],
+        3954 => ['MMMLMIV'],
+        3955 => ['MMMLMV'],
+        3956 => ['MMMLMVI'],
+        3957 => ['MMMLMVII'],
+        3958 => ['MMMLMVIII'],
+        3959 => ['MMMLMIX'],
+        3960 => ['MMMLMX'],
+        3961 => ['MMMLMXI'],
+        3962 => ['MMMLMXII'],
+        3963 => ['MMMLMXIII'],
+        3964 => ['MMMLMXIV'],
+        3965 => ['MMMLMXV'],
+        3966 => ['MMMLMXVI'],
+        3967 => ['MMMLMXVII'],
+        3968 => ['MMMLMXVIII'],
+        3969 => ['MMMLMXIX'],
+        3970 => ['MMMLMXX'],
+        3971 => ['MMMLMXXI'],
+        3972 => ['MMMLMXXII'],
+        3973 => ['MMMLMXXIII'],
+        3974 => ['MMMLMXXIV'],
+        3975 => ['MMMLMXXV'],
+        3976 => ['MMMLMXXVI'],
+        3977 => ['MMMLMXXVII'],
+        3978 => ['MMMLMXXVIII'],
+        3979 => ['MMMLMXXIX'],
+        3980 => ['MMMLMXXX'],
+        3981 => ['MMMLMXXXI'],
+        3982 => ['MMMLMXXXII'],
+        3983 => ['MMMLMXXXIII'],
+        3984 => ['MMMLMXXXIV'],
+        3985 => ['MMMLMXXXV'],
+        3986 => ['MMMLMXXXVI'],
+        3987 => ['MMMLMXXXVII'],
+        3988 => ['MMMLMXXXVIII'],
+        3989 => ['MMMLMXXXIX'],
+        3990 => ['MMMLMXL', 'MMMXM'],
+        3991 => ['MMMLMXLI', 'MMMXMI'],
+        3992 => ['MMMLMXLII', 'MMMXMII'],
+        3993 => ['MMMLMXLIII', 'MMMXMIII'],
+        3994 => ['MMMLMXLIV', 'MMMXMIV'],
+        3995 => ['MMMLMVL', 'MMMXMV', 'MMMVM'],
+        3996 => ['MMMLMVLI', 'MMMXMVI', 'MMMVMI'],
+        3997 => ['MMMLMVLII', 'MMMXMVII', 'MMMVMII'],
+        3998 => ['MMMLMVLIII', 'MMMXMVIII', 'MMMVMIII'],
+        3999 => ['MMMLMVLIV', 'MMMXMIX', 'MMMVMIV', 'MMMIM'],
+    ];
+
+    private const THOUSANDS = ['', 'M', 'MM', 'MMM'];
+    private const HUNDREDS = ['', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM'];
+    private const TENS = ['', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC'];
+    private const ONES = ['', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX'];
+    const MAX_ROMAN_VALUE = 3999;
+    const MAX_ROMAN_STYLE = 4;
+
+    private static function valueOk(int $aValue, int $style): string
+    {
+        $origValue = $aValue;
+        $m = \intdiv($aValue, 1000);
+        $aValue %= 1000;
+        $c = \intdiv($aValue, 100);
+        $aValue %= 100;
+        $t = \intdiv($aValue, 10);
+        $aValue %= 10;
+        $result = self::THOUSANDS[$m] . self::HUNDREDS[$c] . self::TENS[$t] . self::ONES[$aValue];
+        if ($style > 0) {
+            if (array_key_exists($origValue, self::VALUES)) {
+                $arr = self::VALUES[$origValue];
+                $idx = min($style, count($arr)) - 1;
+                $result = $arr[$idx];
+            }
+        }
+
+        return $result;
+    }
+
+    private static function styleOk(int $aValue, int $style): string
+    {
+        return ($aValue < 0 || $aValue > self::MAX_ROMAN_VALUE) ? ExcelError::VALUE() : self::valueOk($aValue, $style);
+    }
+
+    public static function calculateRoman(int $aValue, int $style): string
+    {
+        return ($style < 0 || $style > self::MAX_ROMAN_STYLE) ? ExcelError::VALUE() : self::styleOk($aValue, $style);
+    }
+
+    /**
+     * ROMAN.
+     *
+     * Converts a number to Roman numeral
+     *
+     * @param mixed $aValue Number to convert
+     *                      Or can be an array of numbers
+     * @param mixed $style Number indicating one of five possible forms
+     *                      Or can be an array of styles
+     *
+     * @return array|string Roman numeral, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function evaluate(mixed $aValue, mixed $style = 0): array|string
+    {
+        if (is_array($aValue) || is_array($style)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $aValue, $style);
+        }
+
+        try {
+            $aValue = Helpers::validateNumericNullBool($aValue);
+            if (is_bool($style)) {
+                $style = $style ? 0 : 4;
+            }
+            $style = Helpers::validateNumericNullSubstitution($style, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::calculateRoman((int) $aValue, (int) $style);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php
new file mode 100644
index 00000000..a573f2af
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Round
+{
+    use ArrayEnabled;
+
+    private const ROUNDING_ADJUSTMENT = (PHP_VERSION_ID < 80400) ? 0 : 1e-14;
+
+    /**
+     * ROUND.
+     *
+     * Returns the result of builtin function round after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     * @param mixed $precision Should be int, or can be an array of numbers
+     *
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function round(mixed $number, mixed $precision): array|string|float
+    {
+        if (is_array($number) || is_array($precision)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $precision);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $precision = Helpers::validateNumericNullBool($precision);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return round($number, (int) $precision);
+    }
+
+    /**
+     * ROUNDUP.
+     *
+     * Rounds a number up to a specified number of decimal places
+     *
+     * @param array|float $number Number to round, or can be an array of numbers
+     * @param array|int $digits Number of digits to which you want to round $number, or can be an array of numbers
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function up($number, $digits): array|string|float
+    {
+        if (is_array($number) || is_array($digits)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $digits);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $digits = (int) Helpers::validateNumericNullSubstitution($digits, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($number == 0.0) {
+            return 0.0;
+        }
+
+        if ($number < 0.0) {
+            return round($number - 0.5 * 0.1 ** $digits + self::ROUNDING_ADJUSTMENT, $digits, PHP_ROUND_HALF_DOWN);
+        }
+
+        return round($number + 0.5 * 0.1 ** $digits - self::ROUNDING_ADJUSTMENT, $digits, PHP_ROUND_HALF_DOWN);
+    }
+
+    /**
+     * ROUNDDOWN.
+     *
+     * Rounds a number down to a specified number of decimal places
+     *
+     * @param array|float $number Number to round, or can be an array of numbers
+     * @param array|int $digits Number of digits to which you want to round $number, or can be an array of numbers
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function down($number, $digits): array|string|float
+    {
+        if (is_array($number) || is_array($digits)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $digits);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+            $digits = (int) Helpers::validateNumericNullSubstitution($digits, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($number == 0.0) {
+            return 0.0;
+        }
+
+        if ($number < 0.0) {
+            return round($number + 0.5 * 0.1 ** $digits - self::ROUNDING_ADJUSTMENT, $digits, PHP_ROUND_HALF_UP);
+        }
+
+        return round($number - 0.5 * 0.1 ** $digits + self::ROUNDING_ADJUSTMENT, $digits, PHP_ROUND_HALF_UP);
+    }
+
+    /**
+     * MROUND.
+     *
+     * Rounds a number to the nearest multiple of a specified value
+     *
+     * @param mixed $number Expect float. Number to round, or can be an array of numbers
+     * @param mixed $multiple Expect int. Multiple to which you want to round, or can be an array of numbers.
+     *
+     * @return array|float|int|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function multiple(mixed $number, mixed $multiple): array|string|int|float
+    {
+        if (is_array($number) || is_array($multiple)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $multiple);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullSubstitution($number, 0);
+            $multiple = Helpers::validateNumericNullSubstitution($multiple, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($number == 0 || $multiple == 0) {
+            return 0;
+        }
+        if ((Helpers::returnSign($number)) == (Helpers::returnSign($multiple))) {
+            $multiplier = 1 / $multiple;
+
+            return round($number * $multiplier) / $multiplier;
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * EVEN.
+     *
+     * Returns number rounded up to the nearest even integer.
+     * You can use this function for processing items that come in twos. For example,
+     *        a packing crate accepts rows of one or two items. The crate is full when
+     *        the number of items, rounded up to the nearest two, matches the crate's
+     *        capacity.
+     *
+     * Excel Function:
+     *        EVEN(number)
+     *
+     * @param array|float $number Number to round, or can be an array of numbers
+     *
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function even($number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::getEven($number);
+    }
+
+    /**
+     * ODD.
+     *
+     * Returns number rounded up to the nearest odd integer.
+     *
+     * @param array|float $number Number to round, or can be an array of numbers
+     *
+     * @return array|float|int|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function odd($number): array|string|int|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $significance = Helpers::returnSign($number);
+        if ($significance == 0) {
+            return 1;
+        }
+
+        $result = ceil($number / $significance) * $significance;
+        if ($result == Helpers::getEven($result)) {
+            $result += $significance;
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php
new file mode 100644
index 00000000..bb100901
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class SeriesSum
+{
+    use ArrayEnabled;
+
+    /**
+     * SERIESSUM.
+     *
+     * Returns the sum of a power series
+     *
+     * @param mixed $x Input value
+     * @param mixed $n Initial power
+     * @param mixed $m Step
+     * @param mixed[] $args An array of coefficients for the Data Series
+     *
+     * @return array|float|int|string The result, or a string containing an error
+     */
+    public static function evaluate(mixed $x, mixed $n, mixed $m, ...$args): array|string|float|int
+    {
+        if (is_array($x) || is_array($n) || is_array($m)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 3, $x, $n, $m, ...$args);
+        }
+
+        try {
+            $x = Helpers::validateNumericNullSubstitution($x, 0);
+            $n = Helpers::validateNumericNullSubstitution($n, 0);
+            $m = Helpers::validateNumericNullSubstitution($m, 0);
+
+            // Loop through arguments
+            $aArgs = Functions::flattenArray($args);
+            $returnValue = 0;
+            $i = 0;
+            foreach ($aArgs as $argx) {
+                if ($argx !== null) {
+                    $arg = Helpers::validateNumericNullSubstitution($argx, 0);
+                    $returnValue += $arg * $x ** ($n + ($m * $i));
+                    ++$i;
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php
new file mode 100644
index 00000000..86a55092
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Sign
+{
+    use ArrayEnabled;
+
+    /**
+     * SIGN.
+     *
+     * Determines the sign of a number. Returns 1 if the number is positive, zero (0)
+     *        if the number is 0, and -1 if the number is negative.
+     *
+     * @param array|float $number Number to round, or can be an array of numbers
+     *
+     * @return array|int|string sign value, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function evaluate($number): array|string|int
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::returnSign($number);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php
new file mode 100644
index 00000000..18289f7b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Sqrt
+{
+    use ArrayEnabled;
+
+    /**
+     * SQRT.
+     *
+     * Returns the result of builtin function sqrt after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string square root
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function sqrt(mixed $number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(sqrt($number));
+    }
+
+    /**
+     * SQRTPI.
+     *
+     * Returns the square root of (number * pi).
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string Square Root of Number * Pi, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function pi($number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullSubstitution($number, 0);
+            Helpers::validateNotNegative($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return sqrt($number * M_PI);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php
new file mode 100644
index 00000000..cfced9e4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+class Subtotal
+{
+    protected static function filterHiddenArgs(mixed $cellReference, mixed $args): array
+    {
+        return array_filter(
+            $args,
+            function ($index) use ($cellReference) {
+                $explodeArray = explode('.', $index);
+                $row = $explodeArray[1] ?? '';
+                if (!is_numeric($row)) {
+                    return true;
+                }
+
+                return $cellReference->getWorksheet()->getRowDimension($row)->getVisible();
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    protected static function filterFormulaArgs(mixed $cellReference, mixed $args): array
+    {
+        return array_filter(
+            $args,
+            function ($index) use ($cellReference): bool {
+                $explodeArray = explode('.', $index);
+                $row = $explodeArray[1] ?? '';
+                $column = $explodeArray[2] ?? '';
+                $retVal = true;
+                if ($cellReference->getWorksheet()->cellExists($column . $row)) {
+                    //take this cell out if it contains the SUBTOTAL or AGGREGATE functions in a formula
+                    $isFormula = $cellReference->getWorksheet()->getCell($column . $row)->isFormula();
+                    $cellFormula = !preg_match(
+                        '/^=.*\b(SUBTOTAL|AGGREGATE)\s*\(/i',
+                        $cellReference->getWorksheet()->getCell($column . $row)->getValue() ?? ''
+                    );
+
+                    $retVal = !$isFormula || $cellFormula;
+                }
+
+                return $retVal;
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    /**
+     * @var array<int, callable>
+     */
+    private const CALL_FUNCTIONS = [
+        1 => [Statistical\Averages::class, 'average'], // 1 and 101
+        [Statistical\Counts::class, 'COUNT'], // 2 and 102
+        [Statistical\Counts::class, 'COUNTA'], // 3 and 103
+        [Statistical\Maximum::class, 'max'], // 4 and 104
+        [Statistical\Minimum::class, 'min'], // 5 and 105
+        [Operations::class, 'product'], // 6 and 106
+        [Statistical\StandardDeviations::class, 'STDEV'], // 7 and 107
+        [Statistical\StandardDeviations::class, 'STDEVP'], // 8 and 108
+        [Sum::class, 'sumIgnoringStrings'], // 9 and 109
+        [Statistical\Variances::class, 'VAR'], // 10 and 110
+        [Statistical\Variances::class, 'VARP'], // 111 and 111
+    ];
+
+    /**
+     * SUBTOTAL.
+     *
+     * Returns a subtotal in a list or database.
+     *
+     * @param mixed $functionType
+     *            A number 1 to 11 that specifies which function to
+     *                    use in calculating subtotals within a range
+     *                    list
+     *            Numbers 101 to 111 shadow the functions of 1 to 11
+     *                    but ignore any values in the range that are
+     *                    in hidden rows
+     * @param mixed[] $args A mixed data series of values
+     */
+    public static function evaluate(mixed $functionType, ...$args): float|int|string
+    {
+        $cellReference = array_pop($args);
+        $bArgs = Functions::flattenArrayIndexed($args);
+        $aArgs = [];
+        // int keys must come before string keys for PHP 8.0+
+        // Otherwise, PHP thinks positional args follow keyword
+        //    in the subsequent call to call_user_func_array.
+        // Fortunately, order of args is unimportant to Subtotal.
+        foreach ($bArgs as $key => $value) {
+            if (is_int($key)) {
+                $aArgs[$key] = $value;
+            }
+        }
+        foreach ($bArgs as $key => $value) {
+            if (!is_int($key)) {
+                $aArgs[$key] = $value;
+            }
+        }
+
+        try {
+            $subtotal = (int) Helpers::validateNumericNullBool($functionType);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // Calculate
+        if ($subtotal > 100) {
+            $aArgs = self::filterHiddenArgs($cellReference, $aArgs);
+            $subtotal -= 100;
+        }
+
+        $aArgs = self::filterFormulaArgs($cellReference, $aArgs);
+        if (array_key_exists($subtotal, self::CALL_FUNCTIONS)) {
+            $call = self::CALL_FUNCTIONS[$subtotal];
+
+            return call_user_func_array($call, $aArgs);
+        }
+
+        return ExcelError::VALUE();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
new file mode 100644
index 00000000..f939d9e7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Sum
+{
+    /**
+     * SUM, ignoring non-numeric non-error strings. This is eventually used by SUMIF.
+     *
+     * SUM computes the sum of all the values and cells referenced in the argument list.
+     *
+     * Excel Function:
+     *        SUM(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function sumIgnoringStrings(mixed ...$args): float|int|string
+    {
+        $returnValue = 0;
+
+        // Loop through the arguments
+        foreach (Functions::flattenArray($args) as $arg) {
+            // Is it a numeric value?
+            if (is_numeric($arg)) {
+                $returnValue += $arg;
+            } elseif (ErrorValue::isError($arg)) {
+                return $arg;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * SUM, returning error for non-numeric strings. This is used by Excel SUM function.
+     *
+     * SUM computes the sum of all the values and cells referenced in the argument list.
+     *
+     * Excel Function:
+     *        SUM(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function sumErroringStrings(mixed ...$args): float|int|string|array
+    {
+        $returnValue = 0;
+        // Loop through the arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            // Is it a numeric value?
+            if (is_numeric($arg)) {
+                $returnValue += $arg;
+            } elseif (is_bool($arg)) {
+                $returnValue += (int) $arg;
+            } elseif (ErrorValue::isError($arg)) {
+                return $arg;
+            } elseif ($arg !== null && !Functions::isCellValue($k)) {
+                // ignore non-numerics from cell, but fail as literals (except null)
+                return ExcelError::VALUE();
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * SUMPRODUCT.
+     *
+     * Excel Function:
+     *        SUMPRODUCT(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|int|string The result, or a string containing an error
+     */
+    public static function product(mixed ...$args): string|int|float
+    {
+        $arrayList = $args;
+
+        $wrkArray = Functions::flattenArray(array_shift($arrayList));
+        $wrkCellCount = count($wrkArray);
+
+        for ($i = 0; $i < $wrkCellCount; ++$i) {
+            if ((!is_numeric($wrkArray[$i])) || (is_string($wrkArray[$i]))) {
+                $wrkArray[$i] = 0;
+            }
+        }
+
+        foreach ($arrayList as $matrixData) {
+            $array2 = Functions::flattenArray($matrixData);
+            $count = count($array2);
+            if ($wrkCellCount != $count) {
+                return ExcelError::VALUE();
+            }
+
+            foreach ($array2 as $i => $val) {
+                if ((!is_numeric($val)) || (is_string($val))) {
+                    $val = 0;
+                }
+                $wrkArray[$i] *= $val;
+            }
+        }
+
+        return array_sum($wrkArray);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
new file mode 100644
index 00000000..b2e9cea2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class SumSquares
+{
+    /**
+     * SUMSQ.
+     *
+     * SUMSQ returns the sum of the squares of the arguments
+     *
+     * Excel Function:
+     *        SUMSQ(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function sumSquare(mixed ...$args): string|int|float
+    {
+        try {
+            $returnValue = 0;
+
+            // Loop through arguments
+            foreach (Functions::flattenArray($args) as $arg) {
+                $arg1 = Helpers::validateNumericNullSubstitution($arg, 0);
+                $returnValue += ($arg1 * $arg1);
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $returnValue;
+    }
+
+    private static function getCount(array $array1, array $array2): int
+    {
+        $count = count($array1);
+        if ($count !== count($array2)) {
+            throw new Exception(ExcelError::NA());
+        }
+
+        return $count;
+    }
+
+    /**
+     * These functions accept only numeric arguments, not even strings which are numeric.
+     */
+    private static function numericNotString(mixed $item): bool
+    {
+        return is_numeric($item) && !is_string($item);
+    }
+
+    /**
+     * SUMX2MY2.
+     *
+     * @param mixed[] $matrixData1 Matrix #1
+     * @param mixed[] $matrixData2 Matrix #2
+     */
+    public static function sumXSquaredMinusYSquared(array $matrixData1, array $matrixData2): string|int|float
+    {
+        try {
+            $array1 = Functions::flattenArray($matrixData1);
+            $array2 = Functions::flattenArray($matrixData2);
+            $count = self::getCount($array1, $array2);
+
+            $result = 0;
+            for ($i = 0; $i < $count; ++$i) {
+                if (self::numericNotString($array1[$i]) && self::numericNotString($array2[$i])) {
+                    $result += ($array1[$i] * $array1[$i]) - ($array2[$i] * $array2[$i]);
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $result;
+    }
+
+    /**
+     * SUMX2PY2.
+     *
+     * @param mixed[] $matrixData1 Matrix #1
+     * @param mixed[] $matrixData2 Matrix #2
+     */
+    public static function sumXSquaredPlusYSquared(array $matrixData1, array $matrixData2): string|int|float
+    {
+        try {
+            $array1 = Functions::flattenArray($matrixData1);
+            $array2 = Functions::flattenArray($matrixData2);
+            $count = self::getCount($array1, $array2);
+
+            $result = 0;
+            for ($i = 0; $i < $count; ++$i) {
+                if (self::numericNotString($array1[$i]) && self::numericNotString($array2[$i])) {
+                    $result += ($array1[$i] * $array1[$i]) + ($array2[$i] * $array2[$i]);
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $result;
+    }
+
+    /**
+     * SUMXMY2.
+     *
+     * @param mixed[] $matrixData1 Matrix #1
+     * @param mixed[] $matrixData2 Matrix #2
+     */
+    public static function sumXMinusYSquared(array $matrixData1, array $matrixData2): string|int|float
+    {
+        try {
+            $array1 = Functions::flattenArray($matrixData1);
+            $array2 = Functions::flattenArray($matrixData2);
+            $count = self::getCount($array1, $array2);
+
+            $result = 0;
+            for ($i = 0; $i < $count; ++$i) {
+                if (self::numericNotString($array1[$i]) && self::numericNotString($array2[$i])) {
+                    $result += ($array1[$i] - $array2[$i]) * ($array1[$i] - $array2[$i]);
+                }
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php
new file mode 100644
index 00000000..845b6c14
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
+
+class Cosecant
+{
+    use ArrayEnabled;
+
+    /**
+     * CSC.
+     *
+     * Returns the cosecant of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @return array|float|string The cosecant of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function csc($angle)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, sin($angle));
+    }
+
+    /**
+     * CSCH.
+     *
+     * Returns the hyperbolic cosecant of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @return array|float|string The hyperbolic cosecant of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function csch($angle)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, sinh($angle));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php
new file mode 100644
index 00000000..733e3d61
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
+
+class Cosine
+{
+    use ArrayEnabled;
+
+    /**
+     * COS.
+     *
+     * Returns the result of builtin function cos after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string cosine
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function cos(mixed $number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return cos($number);
+    }
+
+    /**
+     * COSH.
+     *
+     * Returns the result of builtin function cosh after validating args.
+     *
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string hyperbolic cosine
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function cosh(mixed $number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return cosh($number);
+    }
+
+    /**
+     * ACOS.
+     *
+     * Returns the arccosine of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string The arccosine of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function acos($number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(acos($number));
+    }
+
+    /**
+     * ACOSH.
+     *
+     * Returns the arc inverse hyperbolic cosine of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string The inverse hyperbolic cosine of the number, or an error string
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function acosh($number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(acosh($number));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php
new file mode 100644
index 00000000..861159a3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
+
+class Cotangent
+{
+    use ArrayEnabled;
+
+    /**
+     * COT.
+     *
+     * Returns the cotangent of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @return array|float|string The cotangent of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function cot($angle)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(cos($angle), sin($angle));
+    }
+
+    /**
+     * COTH.
+     *
+     * Returns the hyperbolic cotangent of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @return array|float|string The hyperbolic cotangent of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function coth($angle)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, tanh($angle));
+    }
+
+    /**
+     * ACOT.
+     *
+     * Returns the arccotangent of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string The arccotangent of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function acot($number): array|string|float
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (M_PI / 2) - atan($number);
+    }
+
+    /**
+     * ACOTH.
+     *
+     * Returns the hyperbolic arccotangent of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string The hyperbolic arccotangent of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function acoth($number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $result = ($number === 1) ? NAN : (log(($number + 1) / ($number - 1)) / 2);
+
+        return Helpers::numberOrNan($result);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php
new file mode 100644
index 00000000..2d26e5dd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
+
+class Secant
+{
+    use ArrayEnabled;
+
+    /**
+     * SEC.
+     *
+     * Returns the secant of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @return array|float|string The secant of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function sec($angle)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, cos($angle));
+    }
+
+    /**
+     * SECH.
+     *
+     * Returns the hyperbolic secant of an angle.
+     *
+     * @param array|float $angle Number, or can be an array of numbers
+     *
+     * @return array|float|string The hyperbolic secant of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function sech($angle)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(1.0, cosh($angle));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php
new file mode 100644
index 00000000..924466e9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
+
+class Sine
+{
+    use ArrayEnabled;
+
+    /**
+     * SIN.
+     *
+     * Returns the result of builtin function sin after validating args.
+     *
+     * @param mixed $angle Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string sine
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function sin(mixed $angle): array|string|float
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return sin($angle);
+    }
+
+    /**
+     * SINH.
+     *
+     * Returns the result of builtin function sinh after validating args.
+     *
+     * @param mixed $angle Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string hyperbolic sine
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function sinh(mixed $angle): array|string|float
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return sinh($angle);
+    }
+
+    /**
+     * ASIN.
+     *
+     * Returns the arcsine of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string The arcsine of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function asin($number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(asin($number));
+    }
+
+    /**
+     * ASINH.
+     *
+     * Returns the inverse hyperbolic sine of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string The inverse hyperbolic sine of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function asinh($number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(asinh($number));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php
new file mode 100644
index 00000000..9d6775f4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
+
+class Tangent
+{
+    use ArrayEnabled;
+
+    /**
+     * TAN.
+     *
+     * Returns the result of builtin function tan after validating args.
+     *
+     * @param mixed $angle Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string tangent
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function tan(mixed $angle)
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::verySmallDenominator(sin($angle), cos($angle));
+    }
+
+    /**
+     * TANH.
+     *
+     * Returns the result of builtin function sinh after validating args.
+     *
+     * @param mixed $angle Should be numeric, or can be an array of numbers
+     *
+     * @return array|float|string hyperbolic tangent
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function tanh(mixed $angle): array|string|float
+    {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
+        try {
+            $angle = Helpers::validateNumericNullBool($angle);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return tanh($angle);
+    }
+
+    /**
+     * ATAN.
+     *
+     * Returns the arctangent of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string The arctangent of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function atan($number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(atan($number));
+    }
+
+    /**
+     * ATANH.
+     *
+     * Returns the inverse hyperbolic tangent of a number.
+     *
+     * @param array|float $number Number, or can be an array of numbers
+     *
+     * @return array|float|string The inverse hyperbolic tangent of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function atanh($number)
+    {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
+        try {
+            $number = Helpers::validateNumericNullBool($number);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return Helpers::numberOrNan(atanh($number));
+    }
+
+    /**
+     * ATAN2.
+     *
+     * This function calculates the arc tangent of the two variables x and y. It is similar to
+     *        calculating the arc tangent of y ÷ x, except that the signs of both arguments are used
+     *        to determine the quadrant of the result.
+     * The arctangent is the angle from the x-axis to a line containing the origin (0, 0) and a
+     *        point with coordinates (xCoordinate, yCoordinate). The angle is given in radians between
+     *        -pi and pi, excluding -pi.
+     *
+     * Note that the Excel ATAN2() function accepts its arguments in the reverse order to the standard
+     *        PHP atan2() function, so we need to reverse them here before calling the PHP atan() function.
+     *
+     * Excel Function:
+     *        ATAN2(xCoordinate,yCoordinate)
+     *
+     * @param mixed $xCoordinate should be float, the x-coordinate of the point, or can be an array of numbers
+     * @param mixed $yCoordinate should be float, the y-coordinate of the point, or can be an array of numbers
+     *
+     * @return array|float|string The inverse tangent of the specified x- and y-coordinates, or a string containing an error
+     *         If an array of numbers is passed as one of the arguments, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function atan2(mixed $xCoordinate, mixed $yCoordinate): array|string|float
+    {
+        if (is_array($xCoordinate) || is_array($yCoordinate)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $xCoordinate, $yCoordinate);
+        }
+
+        try {
+            $xCoordinate = Helpers::validateNumericNullBool($xCoordinate);
+            $yCoordinate = Helpers::validateNumericNullBool($yCoordinate);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($xCoordinate == 0) && ($yCoordinate == 0)) {
+            return ExcelError::DIV0();
+        }
+
+        return atan2($yCoordinate, $xCoordinate);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php
new file mode 100644
index 00000000..44aedd2c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class Trunc
+{
+    use ArrayEnabled;
+
+    /**
+     * TRUNC.
+     *
+     * Truncates value to the number of fractional digits by number_digits.
+     *
+     * @param array|float $value Or can be an array of values
+     * @param array|int $digits Or can be an array of values
+     *
+     * @return array|float|string Truncated value, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function evaluate(array|float|string|null $value = 0, array|int|string $digits = 0): array|float|string
+    {
+        if (is_array($value) || is_array($digits)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $digits);
+        }
+
+        try {
+            $value = Helpers::validateNumericNullBool($value);
+            $digits = Helpers::validateNumericNullSubstitution($digits, null);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $digits = floor($digits);
+
+        // Truncate
+        $adjust = 10 ** $digits;
+
+        if (($digits > 0) && (rtrim((string) (int) ((abs($value) - abs((int) $value)) * $adjust), '0') < $adjust / 10)) {
+            return $value;
+        }
+
+        return ((int) ($value * $adjust)) / $adjust;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php
new file mode 100644
index 00000000..a10b2780
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+abstract class AggregateBase
+{
+    /**
+     * MS Excel does not count Booleans if passed as cell values, but they are counted if passed as literals.
+     * OpenOffice Calc always counts Booleans.
+     * Gnumeric never counts Booleans.
+     */
+    protected static function testAcceptedBoolean(mixed $arg, mixed $k): mixed
+    {
+        if (!is_bool($arg)) {
+            return $arg;
+        }
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_GNUMERIC) {
+            return $arg;
+        }
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+            return (int) $arg;
+        }
+        if (!Functions::isCellValue($k)) {
+            return (int) $arg;
+        }
+        /*if (
+            (is_bool($arg)) &&
+            ((!Functions::isCellValue($k) && (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_EXCEL)) ||
+                (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE))
+        ) {
+            $arg = (int) $arg;
+        }*/
+
+        return $arg;
+    }
+
+    protected static function isAcceptedCountable(mixed $arg, mixed $k, bool $countNull = false): bool
+    {
+        if ($countNull && $arg === null && !Functions::isCellValue($k) && Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC) {
+            return true;
+        }
+        if (!is_numeric($arg)) {
+            return false;
+        }
+        if (!is_string($arg)) {
+            return true;
+        }
+        if (!Functions::isCellValue($k) && Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+            return true;
+        }
+        if (!Functions::isCellValue($k) && Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
new file mode 100644
index 00000000..998e14df
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
@@ -0,0 +1,259 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Averages extends AggregateBase
+{
+    /**
+     * AVEDEV.
+     *
+     * Returns the average of the absolute deviations of data points from their mean.
+     * AVEDEV is a measure of the variability in a data set.
+     *
+     * Excel Function:
+     *        AVEDEV(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function averageDeviations(mixed ...$args): string|float
+    {
+        $aArgs = Functions::flattenArrayIndexed($args);
+
+        // Return value
+        $returnValue = 0.0;
+
+        $aMean = self::average(...$args);
+        if ($aMean === ExcelError::DIV0()) {
+            return ExcelError::NAN();
+        } elseif ($aMean === ExcelError::VALUE()) {
+            return ExcelError::VALUE();
+        }
+
+        $aCount = 0;
+        foreach ($aArgs as $k => $arg) {
+            $arg = self::testAcceptedBoolean($arg, $k);
+            // Is it a numeric value?
+            // Strings containing numeric values are only counted if they are string literals (not cell values)
+            //    and then only in MS Excel and in Open Office, not in Gnumeric
+            if ((is_string($arg)) && (!is_numeric($arg)) && (!Functions::isCellValue($k))) {
+                return ExcelError::VALUE();
+            }
+            if (self::isAcceptedCountable($arg, $k)) {
+                $returnValue += abs($arg - $aMean);
+                ++$aCount;
+            }
+        }
+
+        // Return
+        if ($aCount === 0) {
+            return ExcelError::DIV0();
+        }
+
+        return $returnValue / $aCount;
+    }
+
+    /**
+     * AVERAGE.
+     *
+     * Returns the average (arithmetic mean) of the arguments
+     *
+     * Excel Function:
+     *        AVERAGE(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|int|string (string if result is an error)
+     */
+    public static function average(mixed ...$args): string|int|float
+    {
+        $returnValue = $aCount = 0;
+
+        // Loop through arguments
+        foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
+            $arg = self::testAcceptedBoolean($arg, $k);
+            // Is it a numeric value?
+            // Strings containing numeric values are only counted if they are string literals (not cell values)
+            //    and then only in MS Excel and in Open Office, not in Gnumeric
+            if ((is_string($arg)) && (!is_numeric($arg)) && (!Functions::isCellValue($k))) {
+                return ExcelError::VALUE();
+            }
+            if (self::isAcceptedCountable($arg, $k)) {
+                $returnValue += $arg;
+                ++$aCount;
+            }
+        }
+
+        // Return
+        if ($aCount > 0) {
+            return $returnValue / $aCount;
+        }
+
+        return ExcelError::DIV0();
+    }
+
+    /**
+     * AVERAGEA.
+     *
+     * Returns the average of its arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        AVERAGEA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|int|string (string if result is an error)
+     */
+    public static function averageA(mixed ...$args): string|int|float
+    {
+        $returnValue = null;
+
+        $aCount = 0;
+        // Loop through arguments
+        foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
+            if (is_numeric($arg)) {
+                // do nothing
+            } elseif (is_bool($arg)) {
+                $arg = (int) $arg;
+            } elseif (!Functions::isMatrixValue($k)) {
+                $arg = 0;
+            } else {
+                return ExcelError::VALUE();
+            }
+            $returnValue += $arg;
+            ++$aCount;
+        }
+
+        if ($aCount > 0) {
+            return $returnValue / $aCount;
+        }
+
+        return ExcelError::DIV0();
+    }
+
+    /**
+     * MEDIAN.
+     *
+     * Returns the median of the given numbers. The median is the number in the middle of a set of numbers.
+     *
+     * Excel Function:
+     *        MEDIAN(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function median(mixed ...$args): float|string
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        $returnValue = ExcelError::NAN();
+
+        $aArgs = self::filterArguments($aArgs);
+        $valueCount = count($aArgs);
+        if ($valueCount > 0) {
+            sort($aArgs, SORT_NUMERIC);
+            $valueCount = $valueCount / 2;
+            if ($valueCount == floor($valueCount)) {
+                $returnValue = ($aArgs[$valueCount--] + $aArgs[$valueCount]) / 2;
+            } else {
+                $valueCount = floor($valueCount);
+                $returnValue = $aArgs[$valueCount];
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * MODE.
+     *
+     * Returns the most frequently occurring, or repetitive, value in an array or range of data
+     *
+     * Excel Function:
+     *        MODE(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function mode(mixed ...$args): float|string
+    {
+        $returnValue = ExcelError::NA();
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        $aArgs = self::filterArguments($aArgs);
+
+        if (!empty($aArgs)) {
+            return self::modeCalc($aArgs);
+        }
+
+        return $returnValue;
+    }
+
+    protected static function filterArguments(array $args): array
+    {
+        return array_filter(
+            $args,
+            function ($value): bool {
+                // Is it a numeric value?
+                return is_numeric($value) && (!is_string($value));
+            }
+        );
+    }
+
+    /**
+     * Special variant of array_count_values that isn't limited to strings and integers,
+     * but can work with floating point numbers as values.
+     */
+    private static function modeCalc(array $data): float|string
+    {
+        $frequencyArray = [];
+        $index = 0;
+        $maxfreq = 0;
+        $maxfreqkey = '';
+        $maxfreqdatum = '';
+        foreach ($data as $datum) {
+            $found = false;
+            ++$index;
+            foreach ($frequencyArray as $key => $value) {
+                if ((string) $value['value'] == (string) $datum) {
+                    ++$frequencyArray[$key]['frequency'];
+                    $freq = $frequencyArray[$key]['frequency'];
+                    if ($freq > $maxfreq) {
+                        $maxfreq = $freq;
+                        $maxfreqkey = $key;
+                        $maxfreqdatum = $datum;
+                    } elseif ($freq == $maxfreq) {
+                        if ($frequencyArray[$key]['index'] < $frequencyArray[$maxfreqkey]['index']) {
+                            $maxfreqkey = $key;
+                            $maxfreqdatum = $datum;
+                        }
+                    }
+                    $found = true;
+
+                    break;
+                }
+            }
+
+            if ($found === false) {
+                $frequencyArray[] = [
+                    'value' => $datum,
+                    'frequency' => 1,
+                    'index' => $index,
+                ];
+            }
+        }
+
+        if ($maxfreq <= 1) {
+            return ExcelError::NA();
+        }
+
+        return $maxfreqdatum;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php
new file mode 100644
index 00000000..2051675c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Minimum;
+
+class Mean
+{
+    /**
+     * GEOMEAN.
+     *
+     * Returns the geometric mean of an array or range of positive data. For example, you
+     *        can use GEOMEAN to calculate average growth rate given compound interest with
+     *        variable rates.
+     *
+     * Excel Function:
+     *        GEOMEAN(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function geometric(mixed ...$args): float|int|string
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        $aMean = MathTrig\Operations::product($aArgs);
+        if (is_numeric($aMean) && ($aMean > 0)) {
+            $aCount = Counts::COUNT($aArgs);
+            if (Minimum::min($aArgs) > 0) {
+                return $aMean ** (1 / $aCount);
+            }
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * HARMEAN.
+     *
+     * Returns the harmonic mean of a data set. The harmonic mean is the reciprocal of the
+     *        arithmetic mean of reciprocals.
+     *
+     * Excel Function:
+     *        HARMEAN(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function harmonic(mixed ...$args): string|float|int
+    {
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        if (Minimum::min($aArgs) < 0) {
+            return ExcelError::NAN();
+        }
+
+        $returnValue = 0;
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if ($arg <= 0) {
+                    return ExcelError::NAN();
+                }
+                $returnValue += (1 / $arg);
+                ++$aCount;
+            }
+        }
+
+        // Return
+        if ($aCount > 0) {
+            return 1 / ($returnValue / $aCount);
+        }
+
+        return ExcelError::NA();
+    }
+
+    /**
+     * TRIMMEAN.
+     *
+     * Returns the mean of the interior of a data set. TRIMMEAN calculates the mean
+     *        taken by excluding a percentage of data points from the top and bottom tails
+     *        of a data set.
+     *
+     * Excel Function:
+     *        TRIMEAN(value1[,value2[, ...]], $discard)
+     *
+     * @param mixed $args Data values
+     */
+    public static function trim(mixed ...$args): float|string
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        // Calculate
+        $percent = array_pop($aArgs);
+
+        if ((is_numeric($percent)) && (!is_string($percent))) {
+            if (($percent < 0) || ($percent > 1)) {
+                return ExcelError::NAN();
+            }
+
+            $mArgs = [];
+            foreach ($aArgs as $arg) {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $mArgs[] = $arg;
+                }
+            }
+
+            $discard = floor(Counts::COUNT($mArgs) * $percent / 2);
+            sort($mArgs);
+
+            for ($i = 0; $i < $discard; ++$i) {
+                array_pop($mArgs);
+                array_shift($mArgs);
+            }
+
+            return Averages::average($mArgs);
+        }
+
+        return ExcelError::VALUE();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
new file mode 100644
index 00000000..ae98c608
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
@@ -0,0 +1,293 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Database\DAverage;
+use PhpOffice\PhpSpreadsheet\Calculation\Database\DCount;
+use PhpOffice\PhpSpreadsheet\Calculation\Database\DMax;
+use PhpOffice\PhpSpreadsheet\Calculation\Database\DMin;
+use PhpOffice\PhpSpreadsheet\Calculation\Database\DSum;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcException;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class Conditional
+{
+    private const CONDITION_COLUMN_NAME = 'CONDITION';
+    private const VALUE_COLUMN_NAME = 'VALUE';
+    private const CONDITIONAL_COLUMN_NAME = 'CONDITIONAL %d';
+
+    /**
+     * AVERAGEIF.
+     *
+     * Returns the average value from a range of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        AVERAGEIF(range,condition[, average_range])
+     *
+     * @param mixed $range Data values
+     * @param null|array|string $condition the criteria that defines which cells will be checked
+     * @param mixed $averageRange Data values
+     */
+    public static function AVERAGEIF(mixed $range, null|array|string $condition, mixed $averageRange = []): null|int|float|string
+    {
+        if (!is_array($range) || !is_array($averageRange) || array_key_exists(0, $range) || array_key_exists(0, $averageRange)) {
+            throw new CalcException('Must specify range of cells, not any kind of literal');
+        }
+        $database = self::databaseFromRangeAndValue($range, $averageRange);
+        $condition = [[self::CONDITION_COLUMN_NAME, self::VALUE_COLUMN_NAME], [$condition, null]];
+
+        return DAverage::evaluate($database, self::VALUE_COLUMN_NAME, $condition);
+    }
+
+    /**
+     * AVERAGEIFS.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        AVERAGEIFS(average_range, criteria_range1, criteria1, [criteria_range2, criteria2]…)
+     *
+     * @param mixed $args Pairs of Ranges and Criteria
+     */
+    public static function AVERAGEIFS(mixed ...$args): null|int|float|string
+    {
+        if (empty($args)) {
+            return 0.0;
+        } elseif (count($args) === 3) {
+            return self::AVERAGEIF($args[1], $args[2], $args[0]);
+        }
+        foreach ($args as $arg) {
+            if (is_array($arg) && array_key_exists(0, $arg)) {
+                throw new CalcException('Must specify range of cells, not any kind of literal');
+            }
+        }
+
+        $conditions = self::buildConditionSetForValueRange(...$args);
+        $database = self::buildDatabaseWithValueRange(...$args);
+
+        return DAverage::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
+    }
+
+    /**
+     * COUNTIF.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTIF(range,condition)
+     *
+     * @param mixed[] $range Data values
+     * @param null|array|string $condition the criteria that defines which cells will be counted
+     */
+    public static function COUNTIF(array $range, null|array|string $condition): string|int
+    {
+        // Filter out any empty values that shouldn't be included in a COUNT
+        $range = array_filter(
+            Functions::flattenArray($range),
+            fn ($value): bool => $value !== null && $value !== ''
+        );
+
+        $range = array_merge([[self::CONDITION_COLUMN_NAME]], array_chunk($range, 1));
+        $condition = array_merge([[self::CONDITION_COLUMN_NAME]], [[$condition]]);
+
+        return DCount::evaluate($range, null, $condition, false);
+    }
+
+    /**
+     * COUNTIFS.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2]…)
+     *
+     * @param mixed $args Pairs of Ranges and Criteria
+     */
+    public static function COUNTIFS(mixed ...$args): int|string
+    {
+        if (empty($args)) {
+            return 0;
+        } elseif (count($args) === 2) {
+            return self::COUNTIF(...$args);
+        }
+
+        $database = self::buildDatabase(...$args);
+        $conditions = self::buildConditionSet(...$args);
+
+        return DCount::evaluate($database, null, $conditions, false);
+    }
+
+    /**
+     * MAXIFS.
+     *
+     * Returns the maximum value within a range of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        MAXIFS(max_range, criteria_range1, criteria1, [criteria_range2, criteria2]…)
+     *
+     * @param mixed $args Pairs of Ranges and Criteria
+     */
+    public static function MAXIFS(mixed ...$args): null|float|string
+    {
+        if (empty($args)) {
+            return 0.0;
+        }
+
+        $conditions = self::buildConditionSetForValueRange(...$args);
+        $database = self::buildDatabaseWithValueRange(...$args);
+
+        return DMax::evaluate($database, self::VALUE_COLUMN_NAME, $conditions, false);
+    }
+
+    /**
+     * MINIFS.
+     *
+     * Returns the minimum value within a range of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        MINIFS(min_range, criteria_range1, criteria1, [criteria_range2, criteria2]…)
+     *
+     * @param mixed $args Pairs of Ranges and Criteria
+     */
+    public static function MINIFS(mixed ...$args): null|float|string
+    {
+        if (empty($args)) {
+            return 0.0;
+        }
+
+        $conditions = self::buildConditionSetForValueRange(...$args);
+        $database = self::buildDatabaseWithValueRange(...$args);
+
+        return DMin::evaluate($database, self::VALUE_COLUMN_NAME, $conditions, false);
+    }
+
+    /**
+     * SUMIF.
+     *
+     * Totals the values of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        SUMIF(range, criteria, [sum_range])
+     *
+     * @param array $range Data values
+     */
+    public static function SUMIF(array $range, mixed $condition, array $sumRange = []): null|float|string
+    {
+        $database = self::databaseFromRangeAndValue($range, $sumRange);
+        $condition = [[self::CONDITION_COLUMN_NAME, self::VALUE_COLUMN_NAME], [$condition, null]];
+
+        return DSum::evaluate($database, self::VALUE_COLUMN_NAME, $condition);
+    }
+
+    /**
+     * SUMIFS.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        SUMIFS(average_range, criteria_range1, criteria1, [criteria_range2, criteria2]…)
+     *
+     * @param mixed $args Pairs of Ranges and Criteria
+     */
+    public static function SUMIFS(mixed ...$args): null|float|string
+    {
+        if (empty($args)) {
+            return 0.0;
+        } elseif (count($args) === 3) {
+            return self::SUMIF($args[1], $args[2], $args[0]);
+        }
+
+        $conditions = self::buildConditionSetForValueRange(...$args);
+        $database = self::buildDatabaseWithValueRange(...$args);
+
+        return DSum::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
+    }
+
+    /** @param array $args */
+    private static function buildConditionSet(...$args): array
+    {
+        $conditions = self::buildConditions(1, ...$args);
+
+        return array_map(null, ...$conditions);
+    }
+
+    /** @param array $args */
+    private static function buildConditionSetForValueRange(...$args): array
+    {
+        $conditions = self::buildConditions(2, ...$args);
+
+        if (count($conditions) === 1) {
+            return array_map(
+                fn ($value): array => [$value],
+                $conditions[0]
+            );
+        }
+
+        return array_map(null, ...$conditions);
+    }
+
+    /** @param array $args */
+    private static function buildConditions(int $startOffset, ...$args): array
+    {
+        $conditions = [];
+
+        $pairCount = 1;
+        $argumentCount = count($args);
+        for ($argument = $startOffset; $argument < $argumentCount; $argument += 2) {
+            $conditions[] = array_merge([sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)], [$args[$argument]]);
+            ++$pairCount;
+        }
+
+        return $conditions;
+    }
+
+    /** @param array $args */
+    private static function buildDatabase(...$args): array
+    {
+        $database = [];
+
+        return self::buildDataSet(0, $database, ...$args);
+    }
+
+    /** @param array $args */
+    private static function buildDatabaseWithValueRange(...$args): array
+    {
+        $database = [];
+        $database[] = array_merge(
+            [self::VALUE_COLUMN_NAME],
+            Functions::flattenArray($args[0])
+        );
+
+        return self::buildDataSet(1, $database, ...$args);
+    }
+
+    /** @param array $args */
+    private static function buildDataSet(int $startOffset, array $database, ...$args): array
+    {
+        $pairCount = 1;
+        $argumentCount = count($args);
+        for ($argument = $startOffset; $argument < $argumentCount; $argument += 2) {
+            $database[] = array_merge(
+                [sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)],
+                Functions::flattenArray($args[$argument])
+            );
+            ++$pairCount;
+        }
+
+        return array_map(null, ...$database);
+    }
+
+    private static function databaseFromRangeAndValue(array $range, array $valueRange = []): array
+    {
+        $range = Functions::flattenArray($range);
+
+        $valueRange = Functions::flattenArray($valueRange);
+        if (empty($valueRange)) {
+            $valueRange = $range;
+        }
+
+        $database = array_map(null, array_merge([self::CONDITION_COLUMN_NAME], $range), array_merge([self::VALUE_COLUMN_NAME], $valueRange));
+
+        return $database;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php
new file mode 100644
index 00000000..492438ad
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Confidence
+{
+    use ArrayEnabled;
+
+    /**
+     * CONFIDENCE.
+     *
+     * Returns the confidence interval for a population mean
+     *
+     * @param mixed $alpha As a float
+     *                      Or can be an array of values
+     * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
+     * @param mixed $size As an integer
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function CONFIDENCE(mixed $alpha, mixed $stdDev, mixed $size)
+    {
+        if (is_array($alpha) || is_array($stdDev) || is_array($size)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $alpha, $stdDev, $size);
+        }
+
+        try {
+            $alpha = StatisticalValidations::validateFloat($alpha);
+            $stdDev = StatisticalValidations::validateFloat($stdDev);
+            $size = StatisticalValidations::validateInt($size);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($alpha <= 0) || ($alpha >= 1) || ($stdDev <= 0) || ($size < 1)) {
+            return ExcelError::NAN();
+        }
+        /** @var float $temp */
+        $temp = Distributions\StandardNormal::inverse(1 - $alpha / 2);
+
+        return Functions::scalar($temp * $stdDev / sqrt($size));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php
new file mode 100644
index 00000000..20ed6349
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcException;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class Counts extends AggregateBase
+{
+    /**
+     * COUNT.
+     *
+     * Counts the number of cells that contain numbers within the list of arguments
+     *
+     * Excel Function:
+     *        COUNT(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function COUNT(mixed ...$args): int
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            $arg = self::testAcceptedBoolean($arg, $k);
+            // Is it a numeric value?
+            // Strings containing numeric values are only counted if they are string literals (not cell values)
+            //    and then only in MS Excel and in Open Office, not in Gnumeric
+            if (self::isAcceptedCountable($arg, $k, true)) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * COUNTA.
+     *
+     * Counts the number of cells that are not empty within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function COUNTA(mixed ...$args): int
+    {
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            // Nulls are counted if literals, but not if cell values
+            if ($arg !== null || (!Functions::isCellValue($k))) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * COUNTBLANK.
+     *
+     * Counts the number of empty cells within the list of arguments
+     *
+     * Excel Function:
+     *        COUNTBLANK(value1[,value2[, ...]])
+     *
+     * @param mixed $range Data values
+     */
+    public static function COUNTBLANK(mixed $range): int
+    {
+        if ($range === null) {
+            return 1;
+        }
+        if (!is_array($range) || array_key_exists(0, $range)) {
+            throw new CalcException('Must specify range of cells, not any kind of literal');
+        }
+        $returnValue = 0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($range);
+        foreach ($aArgs as $arg) {
+            // Is it a blank cell?
+            if (($arg === null) || ((is_string($arg)) && ($arg == ''))) {
+                ++$returnValue;
+            }
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
new file mode 100644
index 00000000..77c0d38f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Deviations
+{
+    /**
+     * DEVSQ.
+     *
+     * Returns the sum of squares of deviations of data points from their sample mean.
+     *
+     * Excel Function:
+     *        DEVSQ(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function sumSquares(mixed ...$args): string|float
+    {
+        $aArgs = Functions::flattenArrayIndexed($args);
+
+        $aMean = Averages::average($aArgs);
+        if (!is_numeric($aMean)) {
+            return ExcelError::NAN();
+        }
+
+        // Return value
+        $returnValue = 0.0;
+        $aCount = -1;
+        foreach ($aArgs as $k => $arg) {
+            // Is it a numeric value?
+            if (
+                (is_bool($arg))
+                && ((!Functions::isCellValue($k))
+                    || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))
+            ) {
+                $arg = (int) $arg;
+            }
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $returnValue += ($arg - $aMean) ** 2;
+                ++$aCount;
+            }
+        }
+
+        return $aCount === 0 ? ExcelError::VALUE() : $returnValue;
+    }
+
+    /**
+     * KURT.
+     *
+     * Returns the kurtosis of a data set. Kurtosis characterizes the relative peakedness
+     * or flatness of a distribution compared with the normal distribution. Positive
+     * kurtosis indicates a relatively peaked distribution. Negative kurtosis indicates a
+     * relatively flat distribution.
+     *
+     * @param array ...$args Data Series
+     */
+    public static function kurtosis(...$args): string|int|float
+    {
+        $aArgs = Functions::flattenArrayIndexed($args);
+        $mean = Averages::average($aArgs);
+        if (!is_numeric($mean)) {
+            return ExcelError::DIV0();
+        }
+        $stdDev = (float) StandardDeviations::STDEV($aArgs);
+
+        if ($stdDev > 0) {
+            $count = $summer = 0;
+
+            foreach ($aArgs as $k => $arg) {
+                if ((is_bool($arg)) && (!Functions::isMatrixValue($k))) {
+                } else {
+                    // Is it a numeric value?
+                    if ((is_numeric($arg)) && (!is_string($arg))) {
+                        $summer += (($arg - $mean) / $stdDev) ** 4;
+                        ++$count;
+                    }
+                }
+            }
+
+            if ($count > 3) {
+                return $summer * ($count * ($count + 1)
+                        / (($count - 1) * ($count - 2) * ($count - 3))) - (3 * ($count - 1) ** 2
+                        / (($count - 2) * ($count - 3)));
+            }
+        }
+
+        return ExcelError::DIV0();
+    }
+
+    /**
+     * SKEW.
+     *
+     * Returns the skewness of a distribution. Skewness characterizes the degree of asymmetry
+     * of a distribution around its mean. Positive skewness indicates a distribution with an
+     * asymmetric tail extending toward more positive values. Negative skewness indicates a
+     * distribution with an asymmetric tail extending toward more negative values.
+     *
+     * @param array ...$args Data Series
+     *
+     * @return float|int|string The result, or a string containing an error
+     */
+    public static function skew(...$args): string|int|float
+    {
+        $aArgs = Functions::flattenArrayIndexed($args);
+        $mean = Averages::average($aArgs);
+        if (!is_numeric($mean)) {
+            return ExcelError::DIV0();
+        }
+        $stdDev = StandardDeviations::STDEV($aArgs);
+        if ($stdDev === 0.0 || is_string($stdDev)) {
+            return ExcelError::DIV0();
+        }
+
+        $count = $summer = 0;
+        // Loop through arguments
+        foreach ($aArgs as $k => $arg) {
+            if ((is_bool($arg)) && (!Functions::isMatrixValue($k))) {
+            } elseif (!is_numeric($arg)) {
+                return ExcelError::VALUE();
+            } else {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) && (!is_string($arg))) {
+                    $summer += (($arg - $mean) / $stdDev) ** 3;
+                    ++$count;
+                }
+            }
+        }
+
+        if ($count > 2) {
+            return $summer * ($count / (($count - 1) * ($count - 2)));
+        }
+
+        return ExcelError::DIV0();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
new file mode 100644
index 00000000..16817ce6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
@@ -0,0 +1,279 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Beta
+{
+    use ArrayEnabled;
+
+    private const MAX_ITERATIONS = 256;
+
+    private const LOG_GAMMA_X_MAX_VALUE = 2.55e305;
+
+    private const XMININ = 2.23e-308;
+
+    /**
+     * BETADIST.
+     *
+     * Returns the beta distribution.
+     *
+     * @param mixed $value Float value at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     * @param mixed $alpha Parameter to the distribution as a float
+     *                      Or can be an array of values
+     * @param mixed $beta Parameter to the distribution as a float
+     *                      Or can be an array of values
+     * @param mixed $rMin as an float
+     *                      Or can be an array of values
+     * @param mixed $rMax as an float
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $alpha, mixed $beta, mixed $rMin = 0.0, mixed $rMax = 1.0): array|string|float
+    {
+        if (is_array($value) || is_array($alpha) || is_array($beta) || is_array($rMin) || is_array($rMax)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $alpha, $beta, $rMin, $rMax);
+        }
+
+        $rMin = $rMin ?? 0.0;
+        $rMax = $rMax ?? 1.0;
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $alpha = DistributionValidations::validateFloat($alpha);
+            $beta = DistributionValidations::validateFloat($beta);
+            $rMax = DistributionValidations::validateFloat($rMax);
+            $rMin = DistributionValidations::validateFloat($rMin);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($rMin > $rMax) {
+            $tmp = $rMin;
+            $rMin = $rMax;
+            $rMax = $tmp;
+        }
+        if (($value < $rMin) || ($value > $rMax) || ($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax)) {
+            return ExcelError::NAN();
+        }
+
+        $value -= $rMin;
+        $value /= ($rMax - $rMin);
+
+        return self::incompleteBeta($value, $alpha, $beta);
+    }
+
+    /**
+     * BETAINV.
+     *
+     * Returns the inverse of the Beta distribution.
+     *
+     * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     * @param mixed $alpha Parameter to the distribution as a float
+     *                      Or can be an array of values
+     * @param mixed $beta Parameter to the distribution as a float
+     *                      Or can be an array of values
+     * @param mixed $rMin Minimum value as a float
+     *                      Or can be an array of values
+     * @param mixed $rMax Maximum value as a float
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverse(mixed $probability, mixed $alpha, mixed $beta, mixed $rMin = 0.0, mixed $rMax = 1.0): array|string|float
+    {
+        if (is_array($probability) || is_array($alpha) || is_array($beta) || is_array($rMin) || is_array($rMax)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $alpha, $beta, $rMin, $rMax);
+        }
+
+        $rMin = $rMin ?? 0.0;
+        $rMax = $rMax ?? 1.0;
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $alpha = DistributionValidations::validateFloat($alpha);
+            $beta = DistributionValidations::validateFloat($beta);
+            $rMax = DistributionValidations::validateFloat($rMax);
+            $rMin = DistributionValidations::validateFloat($rMin);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($rMin > $rMax) {
+            $tmp = $rMin;
+            $rMin = $rMax;
+            $rMax = $tmp;
+        }
+        if (($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax) || ($probability <= 0.0)) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculateInverse($probability, $alpha, $beta, $rMin, $rMax);
+    }
+
+    private static function calculateInverse(float $probability, float $alpha, float $beta, float $rMin, float $rMax): string|float
+    {
+        $a = 0;
+        $b = 2;
+        $guess = ($a + $b) / 2;
+
+        $i = 0;
+        while ((($b - $a) > Functions::PRECISION) && (++$i <= self::MAX_ITERATIONS)) {
+            $guess = ($a + $b) / 2;
+            $result = self::distribution($guess, $alpha, $beta);
+            if (($result === $probability) || ($result === 0.0)) {
+                $b = $a;
+            } elseif ($result > $probability) {
+                $b = $guess;
+            } else {
+                $a = $guess;
+            }
+        }
+
+        if ($i === self::MAX_ITERATIONS) {
+            return ExcelError::NA();
+        }
+
+        return round($rMin + $guess * ($rMax - $rMin), 12);
+    }
+
+    /**
+     * Incomplete beta function.
+     *
+     * @author Jaco van Kooten
+     * @author Paul Meagher
+     *
+     * The computation is based on formulas from Numerical Recipes, Chapter 6.4 (W.H. Press et al, 1992).
+     *
+     * @param float $x require 0<=x<=1
+     * @param float $p require p>0
+     * @param float $q require q>0
+     *
+     * @return float 0 if x<0, p<=0, q<=0 or p+q>2.55E305 and 1 if x>1 to avoid errors and over/underflow
+     */
+    public static function incompleteBeta(float $x, float $p, float $q): float
+    {
+        if ($x <= 0.0) {
+            return 0.0;
+        } elseif ($x >= 1.0) {
+            return 1.0;
+        } elseif (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > self::LOG_GAMMA_X_MAX_VALUE)) {
+            return 0.0;
+        }
+
+        $beta_gam = exp((0 - self::logBeta($p, $q)) + $p * log($x) + $q * log(1.0 - $x));
+        if ($x < ($p + 1.0) / ($p + $q + 2.0)) {
+            return $beta_gam * self::betaFraction($x, $p, $q) / $p;
+        }
+
+        return 1.0 - ($beta_gam * self::betaFraction(1 - $x, $q, $p) / $q);
+    }
+
+    // Function cache for logBeta function
+
+    private static float $logBetaCacheP = 0.0;
+
+    private static float $logBetaCacheQ = 0.0;
+
+    private static float $logBetaCacheResult = 0.0;
+
+    /**
+     * The natural logarithm of the beta function.
+     *
+     * @param float $p require p>0
+     * @param float $q require q>0
+     *
+     * @return float 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
+     *
+     * @author Jaco van Kooten
+     */
+    private static function logBeta(float $p, float $q): float
+    {
+        if ($p != self::$logBetaCacheP || $q != self::$logBetaCacheQ) {
+            self::$logBetaCacheP = $p;
+            self::$logBetaCacheQ = $q;
+            if (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > self::LOG_GAMMA_X_MAX_VALUE)) {
+                self::$logBetaCacheResult = 0.0;
+            } else {
+                self::$logBetaCacheResult = Gamma::logGamma($p) + Gamma::logGamma($q) - Gamma::logGamma($p + $q);
+            }
+        }
+
+        return self::$logBetaCacheResult;
+    }
+
+    /**
+     * Evaluates of continued fraction part of incomplete beta function.
+     * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
+     *
+     * @author Jaco van Kooten
+     */
+    private static function betaFraction(float $x, float $p, float $q): float
+    {
+        $c = 1.0;
+        $sum_pq = $p + $q;
+        $p_plus = $p + 1.0;
+        $p_minus = $p - 1.0;
+        $h = 1.0 - $sum_pq * $x / $p_plus;
+        if (abs($h) < self::XMININ) {
+            $h = self::XMININ;
+        }
+        $h = 1.0 / $h;
+        $frac = $h;
+        $m = 1;
+        $delta = 0.0;
+        while ($m <= self::MAX_ITERATIONS && abs($delta - 1.0) > Functions::PRECISION) {
+            $m2 = 2 * $m;
+            // even index for d
+            $d = $m * ($q - $m) * $x / (($p_minus + $m2) * ($p + $m2));
+            $h = 1.0 + $d * $h;
+            if (abs($h) < self::XMININ) {
+                $h = self::XMININ;
+            }
+            $h = 1.0 / $h;
+            $c = 1.0 + $d / $c;
+            if (abs($c) < self::XMININ) {
+                $c = self::XMININ;
+            }
+            $frac *= $h * $c;
+            // odd index for d
+            $d = -($p + $m) * ($sum_pq + $m) * $x / (($p + $m2) * ($p_plus + $m2));
+            $h = 1.0 + $d * $h;
+            if (abs($h) < self::XMININ) {
+                $h = self::XMININ;
+            }
+            $h = 1.0 / $h;
+            $c = 1.0 + $d / $c;
+            if (abs($c) < self::XMININ) {
+                $c = self::XMININ;
+            }
+            $delta = $h * $c;
+            $frac *= $delta;
+            ++$m;
+        }
+
+        return $frac;
+    }
+
+    /*
+    private static function betaValue(float $a, float $b): float
+    {
+        return (Gamma::gammaValue($a) * Gamma::gammaValue($b)) /
+            Gamma::gammaValue($a + $b);
+    }
+
+    private static function regularizedIncompleteBeta(float $value, float $a, float $b): float
+    {
+        return self::incompleteBeta($value, $a, $b) / self::betaValue($a, $b);
+    }
+    */
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php
new file mode 100644
index 00000000..2ce3fd5a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php
@@ -0,0 +1,231 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Combinations;
+
+class Binomial
+{
+    use ArrayEnabled;
+
+    /**
+     * BINOMDIST.
+     *
+     * Returns the individual term binomial distribution probability. Use BINOMDIST in problems with
+     *        a fixed number of tests or trials, when the outcomes of any trial are only success or failure,
+     *        when trials are independent, and when the probability of success is constant throughout the
+     *        experiment. For example, BINOMDIST can calculate the probability that two of the next three
+     *        babies born are male.
+     *
+     * @param mixed $value Integer number of successes in trials
+     *                      Or can be an array of values
+     * @param mixed $trials Integer umber of trials
+     *                      Or can be an array of values
+     * @param mixed $probability Probability of success on each trial as a float
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $trials, mixed $probability, mixed $cumulative)
+    {
+        if (is_array($value) || is_array($trials) || is_array($probability) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $trials, $probability, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateInt($value);
+            $trials = DistributionValidations::validateInt($trials);
+            $probability = DistributionValidations::validateProbability($probability);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($value > $trials)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            return self::calculateCumulativeBinomial($value, $trials, $probability);
+        }
+        /** @var float $comb */
+        $comb = Combinations::withoutRepetition($trials, $value);
+
+        return $comb * $probability ** $value
+            * (1 - $probability) ** ($trials - $value);
+    }
+
+    /**
+     * BINOM.DIST.RANGE.
+     *
+     * Returns returns the Binomial Distribution probability for the number of successes from a specified number
+     *     of trials falling into a specified range.
+     *
+     * @param mixed $trials Integer number of trials
+     *                      Or can be an array of values
+     * @param mixed $probability Probability of success on each trial as a float
+     *                      Or can be an array of values
+     * @param mixed $successes The integer number of successes in trials
+     *                      Or can be an array of values
+     * @param mixed $limit Upper limit for successes in trials as null, or an integer
+     *                           If null, then this will indicate the same as the number of Successes
+     *                      Or can be an array of values
+     *
+     * @return array|float|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function range(mixed $trials, mixed $probability, mixed $successes, mixed $limit = null): array|string|float|int
+    {
+        if (is_array($trials) || is_array($probability) || is_array($successes) || is_array($limit)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $trials, $probability, $successes, $limit);
+        }
+
+        $limit = $limit ?? $successes;
+
+        try {
+            $trials = DistributionValidations::validateInt($trials);
+            $probability = DistributionValidations::validateProbability($probability);
+            $successes = DistributionValidations::validateInt($successes);
+            $limit = DistributionValidations::validateInt($limit);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($successes < 0) || ($successes > $trials)) {
+            return ExcelError::NAN();
+        }
+        if (($limit < 0) || ($limit > $trials) || $limit < $successes) {
+            return ExcelError::NAN();
+        }
+
+        $summer = 0;
+        for ($i = $successes; $i <= $limit; ++$i) {
+            /** @var float $comb */
+            $comb = Combinations::withoutRepetition($trials, $i);
+            $summer += $comb * $probability ** $i
+                * (1 - $probability) ** ($trials - $i);
+        }
+
+        return $summer;
+    }
+
+    /**
+     * NEGBINOMDIST.
+     *
+     * Returns the negative binomial distribution. NEGBINOMDIST returns the probability that
+     *        there will be number_f failures before the number_s-th success, when the constant
+     *        probability of a success is probability_s. This function is similar to the binomial
+     *        distribution, except that the number of successes is fixed, and the number of trials is
+     *        variable. Like the binomial, trials are assumed to be independent.
+     *
+     * @param mixed $failures Number of Failures as an integer
+     *                      Or can be an array of values
+     * @param mixed $successes Threshold number of Successes as an integer
+     *                      Or can be an array of values
+     * @param mixed $probability Probability of success on each trial as a float
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     *
+     * TODO Add support for the cumulative flag not present for NEGBINOMDIST, but introduced for NEGBINOM.DIST
+     *      The cumulative default should be false to reflect the behaviour of NEGBINOMDIST
+     */
+    public static function negative(mixed $failures, mixed $successes, mixed $probability): array|string|float
+    {
+        if (is_array($failures) || is_array($successes) || is_array($probability)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $failures, $successes, $probability);
+        }
+
+        try {
+            $failures = DistributionValidations::validateInt($failures);
+            $successes = DistributionValidations::validateInt($successes);
+            $probability = DistributionValidations::validateProbability($probability);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($failures < 0) || ($successes < 1)) {
+            return ExcelError::NAN();
+        }
+        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+            if (($failures + $successes - 1) <= 0) {
+                return ExcelError::NAN();
+            }
+        }
+        /** @var float $comb */
+        $comb = Combinations::withoutRepetition($failures + $successes - 1, $successes - 1);
+
+        return $comb
+            * ($probability ** $successes) * ((1 - $probability) ** $failures);
+    }
+
+    /**
+     * BINOM.INV.
+     *
+     * Returns the smallest value for which the cumulative binomial distribution is greater
+     *        than or equal to a criterion value
+     *
+     * @param mixed $trials number of Bernoulli trials as an integer
+     *                      Or can be an array of values
+     * @param mixed $probability probability of a success on each trial as a float
+     *                      Or can be an array of values
+     * @param mixed $alpha criterion value as a float
+     *                      Or can be an array of values
+     *
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverse(mixed $trials, mixed $probability, mixed $alpha): array|string|int
+    {
+        if (is_array($trials) || is_array($probability) || is_array($alpha)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $trials, $probability, $alpha);
+        }
+
+        try {
+            $trials = DistributionValidations::validateInt($trials);
+            $probability = DistributionValidations::validateProbability($probability);
+            $alpha = DistributionValidations::validateFloat($alpha);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($trials < 0) {
+            return ExcelError::NAN();
+        } elseif (($alpha < 0.0) || ($alpha > 1.0)) {
+            return ExcelError::NAN();
+        }
+
+        $successes = 0;
+        while ($successes <= $trials) {
+            $result = self::calculateCumulativeBinomial($successes, $trials, $probability);
+            if ($result >= $alpha) {
+                break;
+            }
+            ++$successes;
+        }
+
+        return $successes;
+    }
+
+    private static function calculateCumulativeBinomial(int $value, int $trials, float $probability): float|int
+    {
+        $summer = 0;
+        for ($i = 0; $i <= $value; ++$i) {
+            /** @var float $comb */
+            $comb = Combinations::withoutRepetition($trials, $i);
+            $summer += $comb * $probability ** $i
+                * (1 - $probability) ** ($trials - $i);
+        }
+
+        return $summer;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
new file mode 100644
index 00000000..49b0dfc9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
@@ -0,0 +1,331 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class ChiSquared
+{
+    use ArrayEnabled;
+
+    private const EPS = 2.22e-16;
+
+    /**
+     * CHIDIST.
+     *
+     * Returns the one-tailed probability of the chi-squared distribution.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $degrees Integer degrees of freedom
+     *                      Or can be an array of values
+     *
+     * @return array|float|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distributionRightTail(mixed $value, mixed $degrees): array|string|int|float
+    {
+        if (is_array($value) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $degrees);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $degrees = DistributionValidations::validateInt($degrees);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees < 1) {
+            return ExcelError::NAN();
+        }
+        if ($value < 0) {
+            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+                return 1;
+            }
+
+            return ExcelError::NAN();
+        }
+
+        return 1 - (Gamma::incompleteGamma($degrees / 2, $value / 2) / Gamma::gammaValue($degrees / 2));
+    }
+
+    /**
+     * CHIDIST.
+     *
+     * Returns the one-tailed probability of the chi-squared distribution.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $degrees Integer degrees of freedom
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distributionLeftTail(mixed $value, mixed $degrees, mixed $cumulative): array|string|int|float
+    {
+        if (is_array($value) || is_array($degrees) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $degrees, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $degrees = DistributionValidations::validateInt($degrees);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees < 1) {
+            return ExcelError::NAN();
+        }
+        if ($value < 0) {
+            if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
+                return 1;
+            }
+
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative === true) {
+            $temp = self::distributionRightTail($value, $degrees);
+
+            return 1 - (is_numeric($temp) ? $temp : 0);
+        }
+
+        return ($value ** (($degrees / 2) - 1) * exp(-$value / 2))
+            / ((2 ** ($degrees / 2)) * Gamma::gammaValue($degrees / 2));
+    }
+
+    /**
+     * CHIINV.
+     *
+     * Returns the inverse of the right-tailed probability of the chi-squared distribution.
+     *
+     * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     * @param mixed $degrees Integer degrees of freedom
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverseRightTail(mixed $probability, mixed $degrees)
+    {
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $degrees = DistributionValidations::validateInt($degrees);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees < 1) {
+            return ExcelError::NAN();
+        }
+
+        $callback = function ($value) use ($degrees): float {
+            return 1 - (Gamma::incompleteGamma($degrees / 2, $value / 2)
+                    / Gamma::gammaValue($degrees / 2));
+        };
+
+        $newtonRaphson = new NewtonRaphson($callback);
+
+        return $newtonRaphson->execute($probability);
+    }
+
+    /**
+     * CHIINV.
+     *
+     * Returns the inverse of the left-tailed probability of the chi-squared distribution.
+     *
+     * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     * @param mixed $degrees Integer degrees of freedom
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverseLeftTail(mixed $probability, mixed $degrees): array|string|float
+    {
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $degrees = DistributionValidations::validateInt($degrees);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees < 1) {
+            return ExcelError::NAN();
+        }
+
+        return self::inverseLeftTailCalculation($probability, $degrees);
+    }
+
+    /**
+     * CHITEST.
+     *
+     * Uses the chi-square test to calculate the probability that the differences between two supplied data sets
+     *      (of observed and expected frequencies), are likely to be simply due to sampling error,
+     *      or if they are likely to be real.
+     *
+     * @param mixed $actual an array of observed frequencies
+     * @param mixed $expected an array of expected frequencies
+     */
+    public static function test(mixed $actual, mixed $expected): float|string
+    {
+        $rows = count($actual);
+        $actual = Functions::flattenArray($actual);
+        $expected = Functions::flattenArray($expected);
+        $columns = intdiv(count($actual), $rows);
+
+        $countActuals = count($actual);
+        $countExpected = count($expected);
+        if ($countActuals !== $countExpected || $countActuals === 1) {
+            return ExcelError::NAN();
+        }
+
+        $result = 0.0;
+        for ($i = 0; $i < $countActuals; ++$i) {
+            if ($expected[$i] == 0.0) {
+                return ExcelError::DIV0();
+            } elseif ($expected[$i] < 0.0) {
+                return ExcelError::NAN();
+            }
+            $result += (($actual[$i] - $expected[$i]) ** 2) / $expected[$i];
+        }
+
+        $degrees = self::degrees($rows, $columns);
+
+        $result = Functions::scalar(self::distributionRightTail($result, $degrees));
+
+        return $result;
+    }
+
+    protected static function degrees(int $rows, int $columns): int
+    {
+        if ($rows === 1) {
+            return $columns - 1;
+        } elseif ($columns === 1) {
+            return $rows - 1;
+        }
+
+        return ($columns - 1) * ($rows - 1);
+    }
+
+    private static function inverseLeftTailCalculation(float $probability, int $degrees): float
+    {
+        // bracket the root
+        $min = 0;
+        $sd = sqrt(2.0 * $degrees);
+        $max = 2 * $sd;
+        $s = -1;
+
+        while ($s * self::pchisq($max, $degrees) > $probability * $s) {
+            $min = $max;
+            $max += 2 * $sd;
+        }
+
+        // Find root using bisection
+        $chi2 = 0.5 * ($min + $max);
+
+        while (($max - $min) > self::EPS * $chi2) {
+            if ($s * self::pchisq($chi2, $degrees) > $probability * $s) {
+                $min = $chi2;
+            } else {
+                $max = $chi2;
+            }
+            $chi2 = 0.5 * ($min + $max);
+        }
+
+        return $chi2;
+    }
+
+    private static function pchisq(float $chi2, int $degrees): float
+    {
+        return self::gammp($degrees, 0.5 * $chi2);
+    }
+
+    private static function gammp(int $n, float $x): float
+    {
+        if ($x < 0.5 * $n + 1) {
+            return self::gser($n, $x);
+        }
+
+        return 1 - self::gcf($n, $x);
+    }
+
+    // Return the incomplete gamma function P(n/2,x) evaluated by
+    // series representation. Algorithm from numerical recipe.
+    // Assume that n is a positive integer and x>0, won't check arguments.
+    // Relative error controlled by the eps parameter
+    private static function gser(int $n, float $x): float
+    {
+        /** @var float $gln */
+        $gln = Gamma::ln($n / 2);
+        $a = 0.5 * $n;
+        $ap = $a;
+        $sum = 1.0 / $a;
+        $del = $sum;
+        for ($i = 1; $i < 101; ++$i) {
+            ++$ap;
+            $del = $del * $x / $ap;
+            $sum += $del;
+            if ($del < $sum * self::EPS) {
+                break;
+            }
+        }
+
+        return $sum * exp(-$x + $a * log($x) - $gln);
+    }
+
+    // Return the incomplete gamma function Q(n/2,x) evaluated by
+    // its continued fraction representation. Algorithm from numerical recipe.
+    // Assume that n is a postive integer and x>0, won't check arguments.
+    // Relative error controlled by the eps parameter
+    private static function gcf(int $n, float $x): float
+    {
+        /** @var float $gln */
+        $gln = Gamma::ln($n / 2);
+        $a = 0.5 * $n;
+        $b = $x + 1 - $a;
+        $fpmin = 1.e-300;
+        $c = 1 / $fpmin;
+        $d = 1 / $b;
+        $h = $d;
+        for ($i = 1; $i < 101; ++$i) {
+            $an = -$i * ($i - $a);
+            $b += 2;
+            $d = $an * $d + $b;
+            if (abs($d) < $fpmin) {
+                $d = $fpmin;
+            }
+            $c = $b + $an / $c;
+            if (abs($c) < $fpmin) {
+                $c = $fpmin;
+            }
+            $d = 1 / $d;
+            $del = $d * $c;
+            $h = $h * $del;
+            if (abs($del - 1) < self::EPS) {
+                break;
+            }
+        }
+
+        return $h * exp(-$x + $a * log($x) - $gln);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php
new file mode 100644
index 00000000..61c62f6a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StatisticalValidations;
+
+class DistributionValidations extends StatisticalValidations
+{
+    public static function validateProbability(mixed $probability): float
+    {
+        $probability = self::validateFloat($probability);
+
+        if ($probability < 0.0 || $probability > 1.0) {
+            throw new Exception(ExcelError::NAN());
+        }
+
+        return $probability;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php
new file mode 100644
index 00000000..55264737
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Exponential
+{
+    use ArrayEnabled;
+
+    /**
+     * EXPONDIST.
+     *
+     *    Returns the exponential distribution. Use EXPONDIST to model the time between events,
+     *        such as how long an automated bank teller takes to deliver cash. For example, you can
+     *        use EXPONDIST to determine the probability that the process takes at most 1 minute.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $lambda The parameter value as a float
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $lambda, mixed $cumulative): array|string|float
+    {
+        if (is_array($value) || is_array($lambda) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $lambda, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $lambda = DistributionValidations::validateFloat($lambda);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($lambda < 0)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative === true) {
+            return 1 - exp(0 - $value * $lambda);
+        }
+
+        return $lambda * exp(0 - $value * $lambda);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php
new file mode 100644
index 00000000..aa7a19dc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class F
+{
+    use ArrayEnabled;
+
+    /**
+     * F.DIST.
+     *
+     *    Returns the F probability distribution.
+     *    You can use this function to determine whether two data sets have different degrees of diversity.
+     *    For example, you can examine the test scores of men and women entering high school, and determine
+     *        if the variability in the females is different from that found in the males.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $u The numerator degrees of freedom as an integer
+     *                      Or can be an array of values
+     * @param mixed $v The denominator degrees of freedom as an integer
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $u, mixed $v, mixed $cumulative): array|string|float
+    {
+        if (is_array($value) || is_array($u) || is_array($v) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $u, $v, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $u = DistributionValidations::validateInt($u);
+            $v = DistributionValidations::validateInt($v);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($value < 0 || $u < 1 || $v < 1) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            $adjustedValue = ($u * $value) / ($u * $value + $v);
+
+            return Beta::incompleteBeta($adjustedValue, $u / 2, $v / 2);
+        }
+
+        return (Gamma::gammaValue(($v + $u) / 2)
+                / (Gamma::gammaValue($u / 2) * Gamma::gammaValue($v / 2)))
+            * (($u / $v) ** ($u / 2))
+            * (($value ** (($u - 2) / 2)) / ((1 + ($u / $v) * $value) ** (($u + $v) / 2)));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php
new file mode 100644
index 00000000..9ad10dbc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Fisher
+{
+    use ArrayEnabled;
+
+    /**
+     * FISHER.
+     *
+     * Returns the Fisher transformation at x. This transformation produces a function that
+     *        is normally distributed rather than skewed. Use this function to perform hypothesis
+     *        testing on the correlation coefficient.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value): array|string|float
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            DistributionValidations::validateFloat($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value <= -1) || ($value >= 1)) {
+            return ExcelError::NAN();
+        }
+
+        return 0.5 * log((1 + $value) / (1 - $value));
+    }
+
+    /**
+     * FISHERINV.
+     *
+     * Returns the inverse of the Fisher transformation. Use this transformation when
+     *        analyzing correlations between ranges or arrays of data. If y = FISHER(x), then
+     *        FISHERINV(y) = x.
+     *
+     * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverse(mixed $probability): array|string|float
+    {
+        if (is_array($probability)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $probability);
+        }
+
+        try {
+            DistributionValidations::validateFloat($probability);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return (exp(2 * $probability) - 1) / (exp(2 * $probability) + 1);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php
new file mode 100644
index 00000000..babe937d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Gamma extends GammaBase
+{
+    use ArrayEnabled;
+
+    /**
+     * GAMMA.
+     *
+     * Return the gamma function value.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function gamma(mixed $value): array|string|float
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ((((int) $value) == ((float) $value)) && $value <= 0.0) {
+            return ExcelError::NAN();
+        }
+
+        return self::gammaValue($value);
+    }
+
+    /**
+     * GAMMADIST.
+     *
+     * Returns the gamma distribution.
+     *
+     * @param mixed $value Float Value at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     * @param mixed $a Parameter to the distribution as a float
+     *                      Or can be an array of values
+     * @param mixed $b Parameter to the distribution as a float
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $a, mixed $b, mixed $cumulative)
+    {
+        if (is_array($value) || is_array($a) || is_array($b) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $a, $b, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $a = DistributionValidations::validateFloat($a);
+            $b = DistributionValidations::validateFloat($b);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($a <= 0) || ($b <= 0)) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculateDistribution($value, $a, $b, $cumulative);
+    }
+
+    /**
+     * GAMMAINV.
+     *
+     * Returns the inverse of the Gamma distribution.
+     *
+     * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     * @param mixed $alpha Parameter to the distribution as a float
+     *                      Or can be an array of values
+     * @param mixed $beta Parameter to the distribution as a float
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverse(mixed $probability, mixed $alpha, mixed $beta)
+    {
+        if (is_array($probability) || is_array($alpha) || is_array($beta)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $alpha, $beta);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $alpha = DistributionValidations::validateFloat($alpha);
+            $beta = DistributionValidations::validateFloat($beta);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($alpha <= 0.0) || ($beta <= 0.0)) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculateInverse($probability, $alpha, $beta);
+    }
+
+    /**
+     * GAMMALN.
+     *
+     * Returns the natural logarithm of the gamma function.
+     *
+     * @param mixed $value Float Value at which you want to evaluate the distribution
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function ln(mixed $value): array|string|float
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($value <= 0) {
+            return ExcelError::NAN();
+        }
+
+        return log(self::gammaValue($value));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
new file mode 100644
index 00000000..6ce99d8b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
@@ -0,0 +1,388 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+abstract class GammaBase
+{
+    private const LOG_GAMMA_X_MAX_VALUE = 2.55e305;
+
+    private const EPS = 2.22e-16;
+
+    private const MAX_VALUE = 1.2e308;
+
+    private const SQRT2PI = 2.5066282746310005024157652848110452530069867406099;
+
+    private const MAX_ITERATIONS = 256;
+
+    protected static function calculateDistribution(float $value, float $a, float $b, bool $cumulative): float
+    {
+        if ($cumulative) {
+            return self::incompleteGamma($a, $value / $b) / self::gammaValue($a);
+        }
+
+        return (1 / ($b ** $a * self::gammaValue($a))) * $value ** ($a - 1) * exp(0 - ($value / $b));
+    }
+
+    /** @return float|string */
+    protected static function calculateInverse(float $probability, float $alpha, float $beta)
+    {
+        $xLo = 0;
+        $xHi = $alpha * $beta * 5;
+
+        $dx = 1024;
+        $x = $xNew = 1;
+        $i = 0;
+
+        while ((abs($dx) > Functions::PRECISION) && (++$i <= self::MAX_ITERATIONS)) {
+            // Apply Newton-Raphson step
+            $result = self::calculateDistribution($x, $alpha, $beta, true);
+            if (!is_float($result)) {
+                return ExcelError::NA();
+            }
+            $error = $result - $probability;
+
+            if ($error == 0.0) {
+                $dx = 0;
+            } elseif ($error < 0.0) {
+                $xLo = $x;
+            } else {
+                $xHi = $x;
+            }
+
+            $pdf = self::calculateDistribution($x, $alpha, $beta, false);
+            // Avoid division by zero
+            if (!is_float($pdf)) {
+                return ExcelError::NA();
+            }
+            if ($pdf !== 0.0) {
+                $dx = $error / $pdf;
+                $xNew = $x - $dx;
+            }
+
+            // If the NR fails to converge (which for example may be the
+            // case if the initial guess is too rough) we apply a bisection
+            // step to determine a more narrow interval around the root.
+            if (($xNew < $xLo) || ($xNew > $xHi) || ($pdf == 0.0)) {
+                $xNew = ($xLo + $xHi) / 2;
+                $dx = $xNew - $x;
+            }
+            $x = $xNew;
+        }
+
+        if ($i === self::MAX_ITERATIONS) {
+            return ExcelError::NA();
+        }
+
+        return $x;
+    }
+
+    //
+    //    Implementation of the incomplete Gamma function
+    //
+    public static function incompleteGamma(float $a, float $x): float
+    {
+        static $max = 32;
+        $summer = 0;
+        for ($n = 0; $n <= $max; ++$n) {
+            $divisor = $a;
+            for ($i = 1; $i <= $n; ++$i) {
+                $divisor *= ($a + $i);
+            }
+            $summer += ($x ** $n / $divisor);
+        }
+
+        return $x ** $a * exp(0 - $x) * $summer;
+    }
+
+    //
+    //    Implementation of the Gamma function
+    //
+    public static function gammaValue(float $value): float
+    {
+        if ($value == 0.0) {
+            return 0;
+        }
+
+        static $p0 = 1.000000000190015;
+        static $p = [
+            1 => 76.18009172947146,
+            2 => -86.50532032941677,
+            3 => 24.01409824083091,
+            4 => -1.231739572450155,
+            5 => 1.208650973866179e-3,
+            6 => -5.395239384953e-6,
+        ];
+
+        $y = $x = $value;
+        $tmp = $x + 5.5;
+        $tmp -= ($x + 0.5) * log($tmp);
+
+        $summer = $p0;
+        for ($j = 1; $j <= 6; ++$j) {
+            $summer += ($p[$j] / ++$y);
+        }
+
+        return exp(0 - $tmp + log(self::SQRT2PI * $summer / $x));
+    }
+
+    private const LG_D1 = -0.5772156649015328605195174;
+
+    private const LG_D2 = 0.4227843350984671393993777;
+
+    private const LG_D4 = 1.791759469228055000094023;
+
+    private const LG_P1 = [
+        4.945235359296727046734888,
+        201.8112620856775083915565,
+        2290.838373831346393026739,
+        11319.67205903380828685045,
+        28557.24635671635335736389,
+        38484.96228443793359990269,
+        26377.48787624195437963534,
+        7225.813979700288197698961,
+    ];
+
+    private const LG_P2 = [
+        4.974607845568932035012064,
+        542.4138599891070494101986,
+        15506.93864978364947665077,
+        184793.2904445632425417223,
+        1088204.76946882876749847,
+        3338152.967987029735917223,
+        5106661.678927352456275255,
+        3074109.054850539556250927,
+    ];
+
+    private const LG_P4 = [
+        14745.02166059939948905062,
+        2426813.369486704502836312,
+        121475557.4045093227939592,
+        2663432449.630976949898078,
+        29403789566.34553899906876,
+        170266573776.5398868392998,
+        492612579337.743088758812,
+        560625185622.3951465078242,
+    ];
+
+    private const LG_Q1 = [
+        67.48212550303777196073036,
+        1113.332393857199323513008,
+        7738.757056935398733233834,
+        27639.87074403340708898585,
+        54993.10206226157329794414,
+        61611.22180066002127833352,
+        36351.27591501940507276287,
+        8785.536302431013170870835,
+    ];
+
+    private const LG_Q2 = [
+        183.0328399370592604055942,
+        7765.049321445005871323047,
+        133190.3827966074194402448,
+        1136705.821321969608938755,
+        5267964.117437946917577538,
+        13467014.54311101692290052,
+        17827365.30353274213975932,
+        9533095.591844353613395747,
+    ];
+
+    private const LG_Q4 = [
+        2690.530175870899333379843,
+        639388.5654300092398984238,
+        41355999.30241388052042842,
+        1120872109.61614794137657,
+        14886137286.78813811542398,
+        101680358627.2438228077304,
+        341747634550.7377132798597,
+        446315818741.9713286462081,
+    ];
+
+    private const LG_C = [
+        -0.001910444077728,
+        8.4171387781295e-4,
+        -5.952379913043012e-4,
+        7.93650793500350248e-4,
+        -0.002777777777777681622553,
+        0.08333333333333333331554247,
+        0.0057083835261,
+    ];
+
+    // Rough estimate of the fourth root of logGamma_xBig
+    private const LG_FRTBIG = 2.25e76;
+
+    private const PNT68 = 0.6796875;
+
+    // Function cache for logGamma
+
+    private static float $logGammaCacheResult = 0.0;
+
+    private static float $logGammaCacheX = 0.0;
+
+    /**
+     * logGamma function.
+     *
+     * Original author was Jaco van Kooten. Ported to PHP by Paul Meagher.
+     *
+     * The natural logarithm of the gamma function. <br />
+     * Based on public domain NETLIB (Fortran) code by W. J. Cody and L. Stoltz <br />
+     * Applied Mathematics Division <br />
+     * Argonne National Laboratory <br />
+     * Argonne, IL 60439 <br />
+     * <p>
+     * References:
+     * <ol>
+     * <li>W. J. Cody and K. E. Hillstrom, 'Chebyshev Approximations for the Natural
+     *     Logarithm of the Gamma Function,' Math. Comp. 21, 1967, pp. 198-203.</li>
+     * <li>K. E. Hillstrom, ANL/AMD Program ANLC366S, DGAMMA/DLGAMA, May, 1969.</li>
+     * <li>Hart, Et. Al., Computer Approximations, Wiley and sons, New York, 1968.</li>
+     * </ol>
+     * </p>
+     * <p>
+     * From the original documentation:
+     * </p>
+     * <p>
+     * This routine calculates the LOG(GAMMA) function for a positive real argument X.
+     * Computation is based on an algorithm outlined in references 1 and 2.
+     * The program uses rational functions that theoretically approximate LOG(GAMMA)
+     * to at least 18 significant decimal digits. The approximation for X > 12 is from
+     * reference 3, while approximations for X < 12.0 are similar to those in reference
+     * 1, but are unpublished. The accuracy achieved depends on the arithmetic system,
+     * the compiler, the intrinsic functions, and proper selection of the
+     * machine-dependent constants.
+     * </p>
+     * <p>
+     * Error returns: <br />
+     * The program returns the value XINF for X .LE. 0.0 or when overflow would occur.
+     * The computation is believed to be free of underflow and overflow.
+     * </p>
+     *
+     * @version 1.1
+     *
+     * @author Jaco van Kooten
+     *
+     * @return float MAX_VALUE for x < 0.0 or when overflow would occur, i.e. x > 2.55E305
+     */
+    public static function logGamma(float $x): float
+    {
+        if ($x == self::$logGammaCacheX) {
+            return self::$logGammaCacheResult;
+        }
+
+        $y = $x;
+        if ($y > 0.0 && $y <= self::LOG_GAMMA_X_MAX_VALUE) {
+            if ($y <= self::EPS) {
+                $res = -log($y);
+            } elseif ($y <= 1.5) {
+                $res = self::logGamma1($y);
+            } elseif ($y <= 4.0) {
+                $res = self::logGamma2($y);
+            } elseif ($y <= 12.0) {
+                $res = self::logGamma3($y);
+            } else {
+                $res = self::logGamma4($y);
+            }
+        } else {
+            // --------------------------
+            //    Return for bad arguments
+            // --------------------------
+            $res = self::MAX_VALUE;
+        }
+
+        // ------------------------------
+        //    Final adjustments and return
+        // ------------------------------
+        self::$logGammaCacheX = $x;
+        self::$logGammaCacheResult = $res;
+
+        return $res;
+    }
+
+    private static function logGamma1(float $y): float
+    {
+        // ---------------------
+        //    EPS .LT. X .LE. 1.5
+        // ---------------------
+        if ($y < self::PNT68) {
+            $corr = -log($y);
+            $xm1 = $y;
+        } else {
+            $corr = 0.0;
+            $xm1 = $y - 1.0;
+        }
+
+        $xden = 1.0;
+        $xnum = 0.0;
+        if ($y <= 0.5 || $y >= self::PNT68) {
+            for ($i = 0; $i < 8; ++$i) {
+                $xnum = $xnum * $xm1 + self::LG_P1[$i];
+                $xden = $xden * $xm1 + self::LG_Q1[$i];
+            }
+
+            return $corr + $xm1 * (self::LG_D1 + $xm1 * ($xnum / $xden));
+        }
+
+        $xm2 = $y - 1.0;
+        for ($i = 0; $i < 8; ++$i) {
+            $xnum = $xnum * $xm2 + self::LG_P2[$i];
+            $xden = $xden * $xm2 + self::LG_Q2[$i];
+        }
+
+        return $corr + $xm2 * (self::LG_D2 + $xm2 * ($xnum / $xden));
+    }
+
+    private static function logGamma2(float $y): float
+    {
+        // ---------------------
+        //    1.5 .LT. X .LE. 4.0
+        // ---------------------
+        $xm2 = $y - 2.0;
+        $xden = 1.0;
+        $xnum = 0.0;
+        for ($i = 0; $i < 8; ++$i) {
+            $xnum = $xnum * $xm2 + self::LG_P2[$i];
+            $xden = $xden * $xm2 + self::LG_Q2[$i];
+        }
+
+        return $xm2 * (self::LG_D2 + $xm2 * ($xnum / $xden));
+    }
+
+    protected static function logGamma3(float $y): float
+    {
+        // ----------------------
+        //    4.0 .LT. X .LE. 12.0
+        // ----------------------
+        $xm4 = $y - 4.0;
+        $xden = -1.0;
+        $xnum = 0.0;
+        for ($i = 0; $i < 8; ++$i) {
+            $xnum = $xnum * $xm4 + self::LG_P4[$i];
+            $xden = $xden * $xm4 + self::LG_Q4[$i];
+        }
+
+        return self::LG_D4 + $xm4 * ($xnum / $xden);
+    }
+
+    protected static function logGamma4(float $y): float
+    {
+        // ---------------------------------
+        //    Evaluate for argument .GE. 12.0
+        // ---------------------------------
+        $res = 0.0;
+        if ($y <= self::LG_FRTBIG) {
+            $res = self::LG_C[6];
+            $ysq = $y * $y;
+            for ($i = 0; $i < 6; ++$i) {
+                $res = $res / $ysq + self::LG_C[$i];
+            }
+            $res /= $y;
+            $corr = log($y);
+            $res = $res + log(self::SQRT2PI) - 0.5 * $corr;
+            $res += $y * ($corr - 1.0);
+        }
+
+        return $res;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php
new file mode 100644
index 00000000..345ea81b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Combinations;
+
+class HyperGeometric
+{
+    use ArrayEnabled;
+
+    /**
+     * HYPGEOMDIST.
+     *
+     * Returns the hypergeometric distribution. HYPGEOMDIST returns the probability of a given number of
+     * sample successes, given the sample size, population successes, and population size.
+     *
+     * @param mixed $sampleSuccesses Integer number of successes in the sample
+     *                      Or can be an array of values
+     * @param mixed $sampleNumber Integer size of the sample
+     *                      Or can be an array of values
+     * @param mixed $populationSuccesses Integer number of successes in the population
+     *                      Or can be an array of values
+     * @param mixed $populationNumber Integer population size
+     *                      Or can be an array of values
+     *
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $sampleSuccesses, mixed $sampleNumber, mixed $populationSuccesses, mixed $populationNumber): array|string|float
+    {
+        if (
+            is_array($sampleSuccesses) || is_array($sampleNumber)
+            || is_array($populationSuccesses) || is_array($populationNumber)
+        ) {
+            return self::evaluateArrayArguments(
+                [self::class, __FUNCTION__],
+                $sampleSuccesses,
+                $sampleNumber,
+                $populationSuccesses,
+                $populationNumber
+            );
+        }
+
+        try {
+            $sampleSuccesses = DistributionValidations::validateInt($sampleSuccesses);
+            $sampleNumber = DistributionValidations::validateInt($sampleNumber);
+            $populationSuccesses = DistributionValidations::validateInt($populationSuccesses);
+            $populationNumber = DistributionValidations::validateInt($populationNumber);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
+            return ExcelError::NAN();
+        }
+        if (($sampleNumber <= 0) || ($sampleNumber > $populationNumber)) {
+            return ExcelError::NAN();
+        }
+        if (($populationSuccesses <= 0) || ($populationSuccesses > $populationNumber)) {
+            return ExcelError::NAN();
+        }
+
+        $successesPopulationAndSample = (float) Combinations::withoutRepetition($populationSuccesses, $sampleSuccesses);
+        $numbersPopulationAndSample = (float) Combinations::withoutRepetition($populationNumber, $sampleNumber);
+        $adjustedPopulationAndSample = (float) Combinations::withoutRepetition(
+            $populationNumber - $populationSuccesses,
+            $sampleNumber - $sampleSuccesses
+        );
+
+        return $successesPopulationAndSample * $adjustedPopulationAndSample / $numbersPopulationAndSample;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php
new file mode 100644
index 00000000..50f02e41
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class LogNormal
+{
+    use ArrayEnabled;
+
+    /**
+     * LOGNORMDIST.
+     *
+     * Returns the cumulative lognormal distribution of x, where ln(x) is normally distributed
+     * with parameters mean and standard_dev.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $mean Mean value as a float
+     *                      Or can be an array of values
+     * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function cumulative(mixed $value, mixed $mean, mixed $stdDev)
+    {
+        if (is_array($value) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value <= 0) || ($stdDev <= 0)) {
+            return ExcelError::NAN();
+        }
+
+        return StandardNormal::cumulative((log($value) - $mean) / $stdDev);
+    }
+
+    /**
+     * LOGNORM.DIST.
+     *
+     * Returns the lognormal distribution of x, where ln(x) is normally distributed
+     * with parameters mean and standard_dev.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $mean Mean value as a float
+     *                      Or can be an array of values
+     * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $mean, mixed $stdDev, mixed $cumulative = false)
+    {
+        if (is_array($value) || is_array($mean) || is_array($stdDev) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value <= 0) || ($stdDev <= 0)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative === true) {
+            return StandardNormal::distribution((log($value) - $mean) / $stdDev, true);
+        }
+
+        return (1 / (sqrt(2 * M_PI) * $stdDev * $value))
+            * exp(0 - ((log($value) - $mean) ** 2 / (2 * $stdDev ** 2)));
+    }
+
+    /**
+     * LOGINV.
+     *
+     * Returns the inverse of the lognormal cumulative distribution
+     *
+     * @param mixed $probability Float probability for which we want the value
+     *                      Or can be an array of values
+     * @param mixed $mean Mean Value as a float
+     *                      Or can be an array of values
+     * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     *
+     * @TODO    Try implementing P J Acklam's refinement algorithm for greater
+     *            accuracy if I can get my head round the mathematics
+     *            (as described at) http://home.online.no/~pjacklam/notes/invnorm/
+     */
+    public static function inverse(mixed $probability, mixed $mean, mixed $stdDev): array|string|float
+    {
+        if (is_array($probability) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $mean, $stdDev);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($stdDev <= 0) {
+            return ExcelError::NAN();
+        }
+        /** @var float $inverse */
+        $inverse = StandardNormal::inverse($probability);
+
+        return exp($mean + $stdDev * $inverse);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
new file mode 100644
index 00000000..647c0c46
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class NewtonRaphson
+{
+    private const MAX_ITERATIONS = 256;
+
+    /** @var callable */
+    protected $callback;
+
+    public function __construct(callable $callback)
+    {
+        $this->callback = $callback;
+    }
+
+    public function execute(float $probability): string|int|float
+    {
+        $xLo = 100;
+        $xHi = 0;
+
+        $dx = 1;
+        $x = $xNew = 1;
+        $i = 0;
+
+        while ((abs($dx) > Functions::PRECISION) && ($i++ < self::MAX_ITERATIONS)) {
+            // Apply Newton-Raphson step
+            $result = call_user_func($this->callback, $x);
+            $error = $result - $probability;
+
+            if ($error == 0.0) {
+                $dx = 0;
+            } elseif ($error < 0.0) {
+                $xLo = $x;
+            } else {
+                $xHi = $x;
+            }
+
+            // Avoid division by zero
+            if ($result != 0.0) {
+                $dx = $error / $result;
+                $xNew = $x - $dx;
+            }
+
+            // If the NR fails to converge (which for example may be the
+            // case if the initial guess is too rough) we apply a bisection
+            // step to determine a more narrow interval around the root.
+            if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
+                $xNew = ($xLo + $xHi) / 2;
+                $dx = $xNew - $x;
+            }
+            $x = $xNew;
+        }
+
+        if ($i == self::MAX_ITERATIONS) {
+            return ExcelError::NA();
+        }
+
+        return $x;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
new file mode 100644
index 00000000..8d08d57a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
@@ -0,0 +1,180 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Normal
+{
+    use ArrayEnabled;
+
+    public const SQRT2PI = 2.5066282746310005024157652848110452530069867406099;
+
+    /**
+     * NORMDIST.
+     *
+     * Returns the normal distribution for the specified mean and standard deviation. This
+     * function has a very wide range of applications in statistics, including hypothesis
+     * testing.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $mean Mean value as a float
+     *                      Or can be an array of values
+     * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $mean, mixed $stdDev, mixed $cumulative): array|string|float
+    {
+        if (is_array($value) || is_array($mean) || is_array($stdDev) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($stdDev < 0) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            return 0.5 * (1 + Engineering\Erf::erfValue(($value - $mean) / ($stdDev * sqrt(2))));
+        }
+
+        return (1 / (self::SQRT2PI * $stdDev)) * exp(0 - (($value - $mean) ** 2 / (2 * ($stdDev * $stdDev))));
+    }
+
+    /**
+     * NORMINV.
+     *
+     * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
+     *
+     * @param mixed $probability Float probability for which we want the value
+     *                      Or can be an array of values
+     * @param mixed $mean Mean Value as a float
+     *                      Or can be an array of values
+     * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverse(mixed $probability, mixed $mean, mixed $stdDev): array|string|float
+    {
+        if (is_array($probability) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $mean, $stdDev);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $mean = DistributionValidations::validateFloat($mean);
+            $stdDev = DistributionValidations::validateFloat($stdDev);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($stdDev < 0) {
+            return ExcelError::NAN();
+        }
+
+        return (self::inverseNcdf($probability) * $stdDev) + $mean;
+    }
+
+    /*
+     *                                inverse_ncdf.php
+     *                            -------------------
+     *    begin                : Friday, January 16, 2004
+     *    copyright            : (C) 2004 Michael Nickerson
+     *    email                : nickersonm@yahoo.com
+     *
+     */
+    private static function inverseNcdf(float $p): float
+    {
+        //    Inverse ncdf approximation by Peter J. Acklam, implementation adapted to
+        //    PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
+        //    a guide. http://home.online.no/~pjacklam/notes/invnorm/index.html
+        //    I have not checked the accuracy of this implementation. Be aware that PHP
+        //    will truncate the coeficcients to 14 digits.
+
+        //    You have permission to use and distribute this function freely for
+        //    whatever purpose you want, but please show common courtesy and give credit
+        //    where credit is due.
+
+        //    Input paramater is $p - probability - where 0 < p < 1.
+
+        //    Coefficients in rational approximations
+        static $a = [
+            1 => -3.969683028665376e+01,
+            2 => 2.209460984245205e+02,
+            3 => -2.759285104469687e+02,
+            4 => 1.383577518672690e+02,
+            5 => -3.066479806614716e+01,
+            6 => 2.506628277459239e+00,
+        ];
+
+        static $b = [
+            1 => -5.447609879822406e+01,
+            2 => 1.615858368580409e+02,
+            3 => -1.556989798598866e+02,
+            4 => 6.680131188771972e+01,
+            5 => -1.328068155288572e+01,
+        ];
+
+        static $c = [
+            1 => -7.784894002430293e-03,
+            2 => -3.223964580411365e-01,
+            3 => -2.400758277161838e+00,
+            4 => -2.549732539343734e+00,
+            5 => 4.374664141464968e+00,
+            6 => 2.938163982698783e+00,
+        ];
+
+        static $d = [
+            1 => 7.784695709041462e-03,
+            2 => 3.224671290700398e-01,
+            3 => 2.445134137142996e+00,
+            4 => 3.754408661907416e+00,
+        ];
+
+        //    Define lower and upper region break-points.
+        $p_low = 0.02425; //Use lower region approx. below this
+        $p_high = 1 - $p_low; //Use upper region approx. above this
+
+        if (0 < $p && $p < $p_low) {
+            //    Rational approximation for lower region.
+            $q = sqrt(-2 * log($p));
+
+            return ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6])
+                / (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
+        } elseif ($p_high < $p && $p < 1) {
+            //    Rational approximation for upper region.
+            $q = sqrt(-2 * log(1 - $p));
+
+            return -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6])
+                / (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
+        }
+
+        //    Rational approximation for central region.
+        $q = $p - 0.5;
+        $r = $q * $q;
+
+        return ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) * $r + $a[6]) * $q
+                / ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r + $b[4]) * $r + $b[5]) * $r + 1);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php
new file mode 100644
index 00000000..931568ee
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+class Poisson
+{
+    use ArrayEnabled;
+
+    /**
+     * POISSON.
+     *
+     * Returns the Poisson distribution. A common application of the Poisson distribution
+     * is predicting the number of events over a specific time, such as the number of
+     * cars arriving at a toll plaza in 1 minute.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $mean Mean value as a float
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $mean, mixed $cumulative): array|string|float
+    {
+        if (is_array($value) || is_array($mean) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $mean = DistributionValidations::validateFloat($mean);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($mean < 0)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            $summer = 0;
+            $floor = floor($value);
+            for ($i = 0; $i <= $floor; ++$i) {
+                /** @var float $fact */
+                $fact = MathTrig\Factorial::fact($i);
+                $summer += $mean ** $i / $fact;
+            }
+
+            return exp(0 - $mean) * $summer;
+        }
+        /** @var float $fact */
+        $fact = MathTrig\Factorial::fact($value);
+
+        return (exp(0 - $mean) * $mean ** $value) / $fact;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
new file mode 100644
index 00000000..cb2c646f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
+
+class StandardNormal
+{
+    use ArrayEnabled;
+
+    /**
+     * NORMSDIST.
+     *
+     * Returns the standard normal cumulative distribution function. The distribution has
+     * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
+     * table of standard normal curve areas.
+     *
+     * NOTE: We don't need to check for arrays to array-enable this function, because that is already
+     *       handled by the logic in Normal::distribution()
+     *       All we need to do is pass the value through as scalar or as array.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function cumulative(mixed $value)
+    {
+        return Normal::distribution($value, 0, 1, true);
+    }
+
+    /**
+     * NORM.S.DIST.
+     *
+     * Returns the standard normal cumulative distribution function. The distribution has
+     * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
+     * table of standard normal curve areas.
+     *
+     * NOTE: We don't need to check for arrays to array-enable this function, because that is already
+     *       handled by the logic in Normal::distribution()
+     *       All we need to do is pass the value and cumulative through as scalar or as array.
+     *
+     * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $cumulative)
+    {
+        return Normal::distribution($value, 0, 1, $cumulative);
+    }
+
+    /**
+     * NORMSINV.
+     *
+     * Returns the inverse of the standard normal cumulative distribution
+     *
+     * @param mixed $value float probability for which we want the value
+     *                      Or can be an array of values
+     *
+     * NOTE: We don't need to check for arrays to array-enable this function, because that is already
+     *       handled by the logic in Normal::inverse()
+     *       All we need to do is pass the value through as scalar or as array
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverse(mixed $value)
+    {
+        return Normal::inverse($value, 0, 1);
+    }
+
+    /**
+     * GAUSS.
+     *
+     * Calculates the probability that a member of a standard normal population will fall between
+     *     the mean and z standard deviations from the mean.
+     *
+     * @param mixed $value Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function gauss(mixed $value): array|string|float
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (!is_numeric($value)) {
+            return ExcelError::VALUE();
+        }
+        /** @var float $dist */
+        $dist = self::distribution($value, true);
+
+        return $dist - 0.5;
+    }
+
+    /**
+     * ZTEST.
+     *
+     * Returns the one-tailed P-value of a z-test.
+     *
+     * For a given hypothesized population mean, x, Z.TEST returns the probability that the sample mean would be
+     *     greater than the average of observations in the data set (array) — that is, the observed sample mean.
+     *
+     * @param mixed $dataSet The dataset should be an array of float values for the observations
+     * @param mixed $m0 Alpha Parameter
+     *                      Or can be an array of values
+     * @param mixed $sigma A null or float value for the Beta (Standard Deviation) Parameter;
+     *                       if null, we use the standard deviation of the dataset
+     *                      Or can be an array of values
+     *
+     * @return array|float|string (string if result is an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function zTest(mixed $dataSet, mixed $m0, mixed $sigma = null)
+    {
+        if (is_array($m0) || is_array($sigma)) {
+            return self::evaluateArrayArgumentsSubsetFrom([self::class, __FUNCTION__], 1, $dataSet, $m0, $sigma);
+        }
+
+        $dataSet = Functions::flattenArrayIndexed($dataSet);
+
+        if (!is_numeric($m0) || ($sigma !== null && !is_numeric($sigma))) {
+            return ExcelError::VALUE();
+        }
+
+        if ($sigma === null) {
+            /** @var float $sigma */
+            $sigma = StandardDeviations::STDEV($dataSet);
+        }
+        $n = count($dataSet);
+
+        $sub1 = Averages::average($dataSet);
+
+        if (!is_numeric($sub1)) {
+            return $sub1;
+        }
+
+        $temp = self::cumulative(($sub1 - $m0) / ($sigma / sqrt($n)));
+
+        return 1 - (is_numeric($temp) ? $temp : 0);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php
new file mode 100644
index 00000000..5ec64895
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class StudentT
+{
+    use ArrayEnabled;
+
+    /**
+     * TDIST.
+     *
+     * Returns the probability of Student's T distribution.
+     *
+     * @param mixed $value Float value for the distribution
+     *                      Or can be an array of values
+     * @param mixed $degrees Integer value for degrees of freedom
+     *                      Or can be an array of values
+     * @param mixed $tails Integer value for the number of tails (1 or 2)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $degrees, mixed $tails)
+    {
+        if (is_array($value) || is_array($degrees) || is_array($tails)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $degrees, $tails);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $degrees = DistributionValidations::validateInt($degrees);
+            $tails = DistributionValidations::validateInt($tails);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($degrees < 1) || ($tails < 1) || ($tails > 2)) {
+            return ExcelError::NAN();
+        }
+
+        return self::calculateDistribution($value, $degrees, $tails);
+    }
+
+    /**
+     * TINV.
+     *
+     * Returns the one-tailed probability of the chi-squared distribution.
+     *
+     * @param mixed $probability Float probability for the function
+     *                      Or can be an array of values
+     * @param mixed $degrees Integer value for degrees of freedom
+     *                      Or can be an array of values
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function inverse(mixed $probability, mixed $degrees)
+    {
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
+
+        try {
+            $probability = DistributionValidations::validateProbability($probability);
+            $degrees = DistributionValidations::validateInt($degrees);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($degrees <= 0) {
+            return ExcelError::NAN();
+        }
+
+        $callback = fn ($value) => self::distribution($value, $degrees, 2);
+
+        $newtonRaphson = new NewtonRaphson($callback);
+
+        return $newtonRaphson->execute($probability);
+    }
+
+    private static function calculateDistribution(float $value, int $degrees, int $tails): float
+    {
+        //    tdist, which finds the probability that corresponds to a given value
+        //    of t with k degrees of freedom. This algorithm is translated from a
+        //    pascal function on p81 of "Statistical Computing in Pascal" by D
+        //    Cooke, A H Craven & G M Clark (1985: Edward Arnold (Pubs.) Ltd:
+        //    London). The above Pascal algorithm is itself a translation of the
+        //    fortran algoritm "AS 3" by B E Cooper of the Atlas Computer
+        //    Laboratory as reported in (among other places) "Applied Statistics
+        //    Algorithms", editied by P Griffiths and I D Hill (1985; Ellis
+        //    Horwood Ltd.; W. Sussex, England).
+        $tterm = $degrees;
+        $ttheta = atan2($value, sqrt($tterm));
+        $tc = cos($ttheta);
+        $ts = sin($ttheta);
+
+        if (($degrees % 2) === 1) {
+            $ti = 3;
+            $tterm = $tc;
+        } else {
+            $ti = 2;
+            $tterm = 1;
+        }
+
+        $tsum = $tterm;
+        while ($ti < $degrees) {
+            $tterm *= $tc * $tc * ($ti - 1) / $ti;
+            $tsum += $tterm;
+            $ti += 2;
+        }
+
+        $tsum *= $ts;
+        if (($degrees % 2) == 1) {
+            $tsum = Functions::M_2DIVPI * ($tsum + $ttheta);
+        }
+
+        $tValue = 0.5 * (1 + $tsum);
+        if ($tails == 1) {
+            return 1 - abs($tValue);
+        }
+
+        return 1 - abs((1 - $tValue) - $tValue);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php
new file mode 100644
index 00000000..2f20b624
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Weibull
+{
+    use ArrayEnabled;
+
+    /**
+     * WEIBULL.
+     *
+     * Returns the Weibull distribution. Use this distribution in reliability
+     * analysis, such as calculating a device's mean time to failure.
+     *
+     * @param mixed $value Float value for the distribution
+     *                      Or can be an array of values
+     * @param mixed $alpha Float alpha Parameter
+     *                      Or can be an array of values
+     * @param mixed $beta Float beta Parameter
+     *                      Or can be an array of values
+     * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
+     *
+     * @return array|float|string (string if result is an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function distribution(mixed $value, mixed $alpha, mixed $beta, mixed $cumulative): array|string|float
+    {
+        if (is_array($value) || is_array($alpha) || is_array($beta) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $alpha, $beta, $cumulative);
+        }
+
+        try {
+            $value = DistributionValidations::validateFloat($value);
+            $alpha = DistributionValidations::validateFloat($alpha);
+            $beta = DistributionValidations::validateFloat($beta);
+            $cumulative = DistributionValidations::validateBool($cumulative);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($value < 0) || ($alpha <= 0) || ($beta <= 0)) {
+            return ExcelError::NAN();
+        }
+
+        if ($cumulative) {
+            return 1 - exp(0 - ($value / $beta) ** $alpha);
+        }
+
+        return ($alpha / $beta ** $alpha) * $value ** ($alpha - 1) * exp(0 - ($value / $beta) ** $alpha);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
new file mode 100644
index 00000000..a722fbd9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+abstract class MaxMinBase
+{
+    protected static function datatypeAdjustmentAllowStrings(int|float|string|bool $value): int|float
+    {
+        if (is_bool($value)) {
+            return (int) $value;
+        } elseif (is_string($value)) {
+            return 0;
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
new file mode 100644
index 00000000..47a98e6c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+
+class Maximum extends MaxMinBase
+{
+    /**
+     * MAX.
+     *
+     * MAX returns the value of the element of the values passed that has the highest value,
+     *        with negative numbers considered smaller than positive numbers.
+     *
+     * Excel Function:
+     *        MAX(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function max(mixed ...$args): float|int|string
+    {
+        $returnValue = null;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        foreach ($aArgs as $arg) {
+            if (ErrorValue::isError($arg)) {
+                $returnValue = $arg;
+
+                break;
+            }
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if (($returnValue === null) || ($arg > $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if ($returnValue === null) {
+            return 0;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * MAXA.
+     *
+     * Returns the greatest value in a list of arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        MAXA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function maxA(mixed ...$args): float|int|string
+    {
+        $returnValue = null;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        foreach ($aArgs as $arg) {
+            if (ErrorValue::isError($arg)) {
+                $returnValue = $arg;
+
+                break;
+            }
+            // Is it a numeric value?
+            if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+                $arg = self::datatypeAdjustmentAllowStrings($arg);
+                if (($returnValue === null) || ($arg > $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if ($returnValue === null) {
+            return 0;
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
new file mode 100644
index 00000000..fcb77c63
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+
+class Minimum extends MaxMinBase
+{
+    /**
+     * MIN.
+     *
+     * MIN returns the value of the element of the values passed that has the smallest value,
+     *        with negative numbers considered smaller than positive numbers.
+     *
+     * Excel Function:
+     *        MIN(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function min(mixed ...$args): float|int|string
+    {
+        $returnValue = null;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        foreach ($aArgs as $arg) {
+            if (ErrorValue::isError($arg)) {
+                $returnValue = $arg;
+
+                break;
+            }
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                if (($returnValue === null) || ($arg < $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if ($returnValue === null) {
+            return 0;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * MINA.
+     *
+     * Returns the smallest value in a list of arguments, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        MINA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function minA(mixed ...$args): float|int|string
+    {
+        $returnValue = null;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        foreach ($aArgs as $arg) {
+            if (ErrorValue::isError($arg)) {
+                $returnValue = $arg;
+
+                break;
+            }
+            // Is it a numeric value?
+            if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+                $arg = self::datatypeAdjustmentAllowStrings($arg);
+                if (($returnValue === null) || ($arg < $returnValue)) {
+                    $returnValue = $arg;
+                }
+            }
+        }
+
+        if ($returnValue === null) {
+            return 0;
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
new file mode 100644
index 00000000..e274f9c8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
@@ -0,0 +1,202 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Percentiles
+{
+    public const RANK_SORT_DESCENDING = 0;
+
+    public const RANK_SORT_ASCENDING = 1;
+
+    /**
+     * PERCENTILE.
+     *
+     * Returns the nth percentile of values in a range..
+     *
+     * Excel Function:
+     *        PERCENTILE(value1[,value2[, ...]],entry)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function PERCENTILE(mixed ...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        // Calculate
+        $entry = array_pop($aArgs);
+
+        try {
+            $entry = StatisticalValidations::validateFloat($entry);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if (($entry < 0) || ($entry > 1)) {
+            return ExcelError::NAN();
+        }
+
+        $mArgs = self::percentileFilterValues($aArgs);
+        $mValueCount = count($mArgs);
+        if ($mValueCount > 0) {
+            sort($mArgs);
+            $count = Counts::COUNT($mArgs);
+            $index = $entry * ($count - 1);
+            $iBase = floor($index);
+            if ($index == $iBase) {
+                return $mArgs[$index];
+            }
+            $iNext = $iBase + 1;
+            $iProportion = $index - $iBase;
+
+            return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion);
+        }
+
+        return ExcelError::NAN();
+    }
+
+    /**
+     * PERCENTRANK.
+     *
+     * Returns the rank of a value in a data set as a percentage of the data set.
+     * Note that the returned rank is simply rounded to the appropriate significant digits,
+     *      rather than floored (as MS Excel), so value 3 for a value set of  1, 2, 3, 4 will return
+     *      0.667 rather than 0.666
+     *
+     * @param mixed $valueSet An array of (float) values, or a reference to, a list of numbers
+     * @param mixed $value The number whose rank you want to find
+     * @param mixed $significance The (integer) number of significant digits for the returned percentage value
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function PERCENTRANK(mixed $valueSet, mixed $value, mixed $significance = 3): string|float
+    {
+        $valueSet = Functions::flattenArray($valueSet);
+        $value = Functions::flattenSingleValue($value);
+        $significance = ($significance === null) ? 3 : Functions::flattenSingleValue($significance);
+
+        try {
+            $value = StatisticalValidations::validateFloat($value);
+            $significance = StatisticalValidations::validateInt($significance);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $valueSet = self::rankFilterValues($valueSet);
+        $valueCount = count($valueSet);
+        if ($valueCount == 0) {
+            return ExcelError::NA();
+        }
+        sort($valueSet, SORT_NUMERIC);
+
+        $valueAdjustor = $valueCount - 1;
+        if (($value < $valueSet[0]) || ($value > $valueSet[$valueAdjustor])) {
+            return ExcelError::NA();
+        }
+
+        $pos = array_search($value, $valueSet);
+        if ($pos === false) {
+            $pos = 0;
+            $testValue = $valueSet[0];
+            while ($testValue < $value) {
+                $testValue = $valueSet[++$pos];
+            }
+            --$pos;
+            $pos += (($value - $valueSet[$pos]) / ($testValue - $valueSet[$pos]));
+        }
+
+        return round(((float) $pos) / $valueAdjustor, $significance);
+    }
+
+    /**
+     * QUARTILE.
+     *
+     * Returns the quartile of a data set.
+     *
+     * Excel Function:
+     *        QUARTILE(value1[,value2[, ...]],entry)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function QUARTILE(mixed ...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+        $entry = array_pop($aArgs);
+
+        try {
+            $entry = StatisticalValidations::validateFloat($entry);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $entry = floor($entry);
+        $entry /= 4;
+        if (($entry < 0) || ($entry > 1)) {
+            return ExcelError::NAN();
+        }
+
+        return self::PERCENTILE($aArgs, $entry);
+    }
+
+    /**
+     * RANK.
+     *
+     * Returns the rank of a number in a list of numbers.
+     *
+     * @param mixed $value The number whose rank you want to find
+     * @param mixed $valueSet An array of float values, or a reference to, a list of numbers
+     * @param mixed $order Order to sort the values in the value set
+     *
+     * @return float|string The result, or a string containing an error (0 = Descending, 1 = Ascending)
+     */
+    public static function RANK(mixed $value, mixed $valueSet, mixed $order = self::RANK_SORT_DESCENDING)
+    {
+        $value = Functions::flattenSingleValue($value);
+        $valueSet = Functions::flattenArray($valueSet);
+        $order = ($order === null) ? self::RANK_SORT_DESCENDING : Functions::flattenSingleValue($order);
+
+        try {
+            $value = StatisticalValidations::validateFloat($value);
+            $order = StatisticalValidations::validateInt($order);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $valueSet = self::rankFilterValues($valueSet);
+        if ($order === self::RANK_SORT_DESCENDING) {
+            rsort($valueSet, SORT_NUMERIC);
+        } else {
+            sort($valueSet, SORT_NUMERIC);
+        }
+
+        $pos = array_search($value, $valueSet);
+        if ($pos === false) {
+            return ExcelError::NA();
+        }
+
+        return ++$pos;
+    }
+
+    protected static function percentileFilterValues(array $dataSet): array
+    {
+        return array_filter(
+            $dataSet,
+            fn ($value): bool => is_numeric($value) && !is_string($value)
+        );
+    }
+
+    protected static function rankFilterValues(array $dataSet): array
+    {
+        return array_filter(
+            $dataSet,
+            fn ($value): bool => is_numeric($value)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php
new file mode 100644
index 00000000..06e3b798
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+use PhpOffice\PhpSpreadsheet\Shared\IntOrFloat;
+
+class Permutations
+{
+    use ArrayEnabled;
+
+    /**
+     * PERMUT.
+     *
+     * Returns the number of permutations for a given number of objects that can be
+     *        selected from number objects. A permutation is any set or subset of objects or
+     *        events where internal order is significant. Permutations are different from
+     *        combinations, for which the internal order is not significant. Use this function
+     *        for lottery-style probability calculations.
+     *
+     * @param mixed $numObjs Integer number of different objects
+     *                      Or can be an array of values
+     * @param mixed $numInSet Integer number of objects in each permutation
+     *                      Or can be an array of values
+     *
+     * @return array|float|int|string Number of permutations, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function PERMUT(mixed $numObjs, mixed $numInSet)
+    {
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
+
+        try {
+            $numObjs = StatisticalValidations::validateInt($numObjs);
+            $numInSet = StatisticalValidations::validateInt($numInSet);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($numObjs < $numInSet) {
+            return ExcelError::NAN();
+        }
+        /** @var float|int|string */
+        $result1 = MathTrig\Factorial::fact($numObjs);
+        if (is_string($result1)) {
+            return $result1;
+        }
+        /** @var float|int|string */
+        $result2 = MathTrig\Factorial::fact($numObjs - $numInSet);
+        if (is_string($result2)) {
+            return $result2;
+        }
+        $result = round($result1 / $result2);
+
+        return IntOrFloat::evaluate($result);
+    }
+
+    /**
+     * PERMUTATIONA.
+     *
+     * Returns the number of permutations for a given number of objects (with repetitions)
+     *     that can be selected from the total objects.
+     *
+     * @param mixed $numObjs Integer number of different objects
+     *                      Or can be an array of values
+     * @param mixed $numInSet Integer number of objects in each permutation
+     *                      Or can be an array of values
+     *
+     * @return array|float|int|string Number of permutations, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function PERMUTATIONA(mixed $numObjs, mixed $numInSet)
+    {
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
+
+        try {
+            $numObjs = StatisticalValidations::validateInt($numObjs);
+            $numInSet = StatisticalValidations::validateInt($numInSet);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($numObjs < 0 || $numInSet < 0) {
+            return ExcelError::NAN();
+        }
+
+        $result = $numObjs ** $numInSet;
+
+        return IntOrFloat::evaluate($result);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php
new file mode 100644
index 00000000..71594bdf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Size
+{
+    /**
+     * LARGE.
+     *
+     * Returns the nth largest value in a data set. You can use this function to
+     *        select a value based on its relative standing.
+     *
+     * Excel Function:
+     *        LARGE(value1[,value2[, ...]],entry)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function large(mixed ...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+        $entry = array_pop($aArgs);
+
+        if ((is_numeric($entry)) && (!is_string($entry))) {
+            $entry = (int) floor($entry);
+
+            $mArgs = self::filter($aArgs);
+            $count = Counts::COUNT($mArgs);
+            --$entry;
+            if ($count === 0 || $entry < 0 || $entry >= $count) {
+                return ExcelError::NAN();
+            }
+            rsort($mArgs);
+
+            return $mArgs[$entry];
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * SMALL.
+     *
+     * Returns the nth smallest value in a data set. You can use this function to
+     *        select a value based on its relative standing.
+     *
+     * Excel Function:
+     *        SMALL(value1[,value2[, ...]],entry)
+     *
+     * @param mixed $args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function small(mixed ...$args)
+    {
+        $aArgs = Functions::flattenArray($args);
+
+        $entry = array_pop($aArgs);
+
+        if ((is_numeric($entry)) && (!is_string($entry))) {
+            $entry = (int) floor($entry);
+
+            $mArgs = self::filter($aArgs);
+            $count = Counts::COUNT($mArgs);
+            --$entry;
+            if ($count === 0 || $entry < 0 || $entry >= $count) {
+                return ExcelError::NAN();
+            }
+            sort($mArgs);
+
+            return $mArgs[$entry];
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * @param mixed[] $args Data values
+     */
+    protected static function filter(array $args): array
+    {
+        $mArgs = [];
+
+        foreach ($args as $arg) {
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $mArgs[] = $arg;
+            }
+        }
+
+        return $mArgs;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php
new file mode 100644
index 00000000..3d4ea305
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+class StandardDeviations
+{
+    /**
+     * STDEV.
+     *
+     * Estimates standard deviation based on a sample. The standard deviation is a measure of how
+     *        widely values are dispersed from the average value (the mean).
+     *
+     * Excel Function:
+     *        STDEV(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function STDEV(mixed ...$args)
+    {
+        $result = Variances::VAR(...$args);
+        if (!is_numeric($result)) {
+            return $result;
+        }
+
+        return sqrt((float) $result);
+    }
+
+    /**
+     * STDEVA.
+     *
+     * Estimates standard deviation based on a sample, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        STDEVA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function STDEVA(mixed ...$args): float|string
+    {
+        $result = Variances::VARA(...$args);
+        if (!is_numeric($result)) {
+            return $result;
+        }
+
+        return sqrt((float) $result);
+    }
+
+    /**
+     * STDEVP.
+     *
+     * Calculates standard deviation based on the entire population
+     *
+     * Excel Function:
+     *        STDEVP(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function STDEVP(mixed ...$args): float|string
+    {
+        $result = Variances::VARP(...$args);
+        if (!is_numeric($result)) {
+            return $result;
+        }
+
+        return sqrt((float) $result);
+    }
+
+    /**
+     * STDEVPA.
+     *
+     * Calculates standard deviation based on the entire population, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        STDEVPA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     */
+    public static function STDEVPA(mixed ...$args): float|string
+    {
+        $result = Variances::VARPA(...$args);
+        if (!is_numeric($result)) {
+            return $result;
+        }
+
+        return sqrt((float) $result);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php
new file mode 100644
index 00000000..b8e73505
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Standardize extends StatisticalValidations
+{
+    use ArrayEnabled;
+
+    /**
+     * STANDARDIZE.
+     *
+     * Returns a normalized value from a distribution characterized by mean and standard_dev.
+     *
+     * @param array|float $value Value to normalize
+     *                      Or can be an array of values
+     * @param array|float $mean Mean Value
+     *                      Or can be an array of values
+     * @param array|float $stdDev Standard Deviation
+     *                      Or can be an array of values
+     *
+     * @return array|float|string Standardized value, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function execute($value, $mean, $stdDev): array|string|float
+    {
+        if (is_array($value) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev);
+        }
+
+        try {
+            $value = self::validateFloat($value);
+            $mean = self::validateFloat($mean);
+            $stdDev = self::validateFloat($stdDev);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($stdDev <= 0) {
+            return ExcelError::NAN();
+        }
+
+        return ($value - $mean) / $stdDev;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php
new file mode 100644
index 00000000..59ad7eef
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class StatisticalValidations
+{
+    public static function validateFloat(mixed $value): float
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    public static function validateInt(mixed $value): int
+    {
+        if (!is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (int) floor((float) $value);
+    }
+
+    public static function validateBool(mixed $value): bool
+    {
+        if (!is_bool($value) && !is_numeric($value)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return (bool) $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php
new file mode 100644
index 00000000..365001fd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php
@@ -0,0 +1,425 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\Trend\Trend;
+
+class Trends
+{
+    use ArrayEnabled;
+
+    private static function filterTrendValues(array &$array1, array &$array2): void
+    {
+        foreach ($array1 as $key => $value) {
+            if ((is_bool($value)) || (is_string($value)) || ($value === null)) {
+                unset($array1[$key], $array2[$key]);
+            }
+        }
+    }
+
+    /**
+     * @param mixed $array1 should be array, but scalar is made into one
+     * @param mixed $array2 should be array, but scalar is made into one
+     */
+    private static function checkTrendArrays(mixed &$array1, mixed &$array2): void
+    {
+        if (!is_array($array1)) {
+            $array1 = [$array1];
+        }
+        if (!is_array($array2)) {
+            $array2 = [$array2];
+        }
+
+        $array1 = Functions::flattenArray($array1);
+        $array2 = Functions::flattenArray($array2);
+
+        self::filterTrendValues($array1, $array2);
+        self::filterTrendValues($array2, $array1);
+
+        // Reset the array indexes
+        $array1 = array_merge($array1);
+        $array2 = array_merge($array2);
+    }
+
+    protected static function validateTrendArrays(array $yValues, array $xValues): void
+    {
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        if (($yValueCount === 0) || ($yValueCount !== $xValueCount)) {
+            throw new Exception(ExcelError::NA());
+        } elseif ($yValueCount === 1) {
+            throw new Exception(ExcelError::DIV0());
+        }
+    }
+
+    /**
+     * CORREL.
+     *
+     * Returns covariance, the average of the products of deviations for each data point pair.
+     *
+     * @param mixed $yValues array of mixed Data Series Y
+     * @param null|mixed $xValues array of mixed Data Series X
+     */
+    public static function CORREL(mixed $yValues, $xValues = null): float|string
+    {
+        if (($xValues === null) || (!is_array($yValues)) || (!is_array($xValues))) {
+            return ExcelError::VALUE();
+        }
+
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getCorrelation();
+    }
+
+    /**
+     * COVAR.
+     *
+     * Returns covariance, the average of the products of deviations for each data point pair.
+     *
+     * @param mixed[] $yValues array of mixed Data Series Y
+     * @param mixed[] $xValues array of mixed Data Series X
+     */
+    public static function COVAR(array $yValues, array $xValues): float|string
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getCovariance();
+    }
+
+    /**
+     * FORECAST.
+     *
+     * Calculates, or predicts, a future value by using existing values.
+     * The predicted value is a y-value for a given x-value.
+     *
+     * @param mixed $xValue Float value of X for which we want to find Y
+     *                      Or can be an array of values
+     * @param mixed[] $yValues array of mixed Data Series Y
+     * @param mixed[] $xValues array of mixed Data Series X
+     *
+     * @return array|bool|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function FORECAST(mixed $xValue, array $yValues, array $xValues)
+    {
+        if (is_array($xValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $xValue, $yValues, $xValues);
+        }
+
+        try {
+            $xValue = StatisticalValidations::validateFloat($xValue);
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getValueOfYForX($xValue);
+    }
+
+    /**
+     * GROWTH.
+     *
+     * Returns values along a predicted exponential Trend
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param mixed[] $xValues Data Series X
+     * @param mixed[] $newValues Values of X for which we want to find Y
+     * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
+     *
+     * @return array<int, array<int, array<int, float>>>
+     */
+    public static function GROWTH(array $yValues, array $xValues = [], array $newValues = [], mixed $const = true): array
+    {
+        $yValues = Functions::flattenArray($yValues);
+        $xValues = Functions::flattenArray($xValues);
+        $newValues = Functions::flattenArray($newValues);
+        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
+
+        $bestFitExponential = Trend::calculate(Trend::TREND_EXPONENTIAL, $yValues, $xValues, $const);
+        if (empty($newValues)) {
+            $newValues = $bestFitExponential->getXValues();
+        }
+
+        $returnArray = [];
+        foreach ($newValues as $xValue) {
+            $returnArray[0][] = [$bestFitExponential->getValueOfYForX($xValue)];
+        }
+
+        return $returnArray;
+    }
+
+    /**
+     * INTERCEPT.
+     *
+     * Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param mixed[] $xValues Data Series X
+     */
+    public static function INTERCEPT(array $yValues, array $xValues): float|string
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getIntersect();
+    }
+
+    /**
+     * LINEST.
+     *
+     * Calculates the statistics for a line by using the "least squares" method to calculate a straight line
+     *     that best fits your data, and then returns an array that describes the line.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param null|mixed[] $xValues Data Series X
+     * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
+     * @param mixed $stats A logical (boolean) value specifying whether to return additional regression statistics
+     *
+     * @return array|string The result, or a string containing an error
+     */
+    public static function LINEST(array $yValues, ?array $xValues = null, mixed $const = true, mixed $stats = false): string|array
+    {
+        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
+        $stats = ($stats === null) ? false : (bool) Functions::flattenSingleValue($stats);
+        if ($xValues === null) {
+            $xValues = $yValues;
+        }
+
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues, $const);
+
+        if ($stats === true) {
+            return [
+                [
+                    $bestFitLinear->getSlope(),
+                    $bestFitLinear->getIntersect(),
+                ],
+                [
+                    $bestFitLinear->getSlopeSE(),
+                    ($const === false) ? ExcelError::NA() : $bestFitLinear->getIntersectSE(),
+                ],
+                [
+                    $bestFitLinear->getGoodnessOfFit(),
+                    $bestFitLinear->getStdevOfResiduals(),
+                ],
+                [
+                    $bestFitLinear->getF(),
+                    $bestFitLinear->getDFResiduals(),
+                ],
+                [
+                    $bestFitLinear->getSSRegression(),
+                    $bestFitLinear->getSSResiduals(),
+                ],
+            ];
+        }
+
+        return [
+            $bestFitLinear->getSlope(),
+            $bestFitLinear->getIntersect(),
+        ];
+    }
+
+    /**
+     * LOGEST.
+     *
+     * Calculates an exponential curve that best fits the X and Y data series,
+     *        and then returns an array that describes the line.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param null|mixed[] $xValues Data Series X
+     * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
+     * @param mixed $stats A logical (boolean) value specifying whether to return additional regression statistics
+     *
+     * @return array|string The result, or a string containing an error
+     */
+    public static function LOGEST(array $yValues, ?array $xValues = null, mixed $const = true, mixed $stats = false): string|array
+    {
+        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
+        $stats = ($stats === null) ? false : (bool) Functions::flattenSingleValue($stats);
+        if ($xValues === null) {
+            $xValues = $yValues;
+        }
+
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        foreach ($yValues as $value) {
+            if ($value < 0.0) {
+                return ExcelError::NAN();
+            }
+        }
+
+        $bestFitExponential = Trend::calculate(Trend::TREND_EXPONENTIAL, $yValues, $xValues, $const);
+
+        if ($stats === true) {
+            return [
+                [
+                    $bestFitExponential->getSlope(),
+                    $bestFitExponential->getIntersect(),
+                ],
+                [
+                    $bestFitExponential->getSlopeSE(),
+                    ($const === false) ? ExcelError::NA() : $bestFitExponential->getIntersectSE(),
+                ],
+                [
+                    $bestFitExponential->getGoodnessOfFit(),
+                    $bestFitExponential->getStdevOfResiduals(),
+                ],
+                [
+                    $bestFitExponential->getF(),
+                    $bestFitExponential->getDFResiduals(),
+                ],
+                [
+                    $bestFitExponential->getSSRegression(),
+                    $bestFitExponential->getSSResiduals(),
+                ],
+            ];
+        }
+
+        return [
+            $bestFitExponential->getSlope(),
+            $bestFitExponential->getIntersect(),
+        ];
+    }
+
+    /**
+     * RSQ.
+     *
+     * Returns the square of the Pearson product moment correlation coefficient through data points
+     *     in known_y's and known_x's.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param mixed[] $xValues Data Series X
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function RSQ(array $yValues, array $xValues)
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getGoodnessOfFit();
+    }
+
+    /**
+     * SLOPE.
+     *
+     * Returns the slope of the linear regression line through data points in known_y's and known_x's.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param mixed[] $xValues Data Series X
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function SLOPE(array $yValues, array $xValues)
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getSlope();
+    }
+
+    /**
+     * STEYX.
+     *
+     * Returns the standard error of the predicted y-value for each x in the regression.
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param mixed[] $xValues Data Series X
+     */
+    public static function STEYX(array $yValues, array $xValues): float|string
+    {
+        try {
+            self::checkTrendArrays($yValues, $xValues);
+            self::validateTrendArrays($yValues, $xValues);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues);
+
+        return $bestFitLinear->getStdevOfResiduals();
+    }
+
+    /**
+     * TREND.
+     *
+     * Returns values along a linear Trend
+     *
+     * @param mixed[] $yValues Data Series Y
+     * @param mixed[] $xValues Data Series X
+     * @param mixed[] $newValues Values of X for which we want to find Y
+     * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
+     *
+     * @return array<int, array<int, array<int, float>>>
+     */
+    public static function TREND(array $yValues, array $xValues = [], array $newValues = [], mixed $const = true): array
+    {
+        $yValues = Functions::flattenArray($yValues);
+        $xValues = Functions::flattenArray($xValues);
+        $newValues = Functions::flattenArray($newValues);
+        $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
+
+        $bestFitLinear = Trend::calculate(Trend::TREND_LINEAR, $yValues, $xValues, $const);
+        if (empty($newValues)) {
+            $newValues = $bestFitLinear->getXValues();
+        }
+
+        $returnArray = [];
+        foreach ($newValues as $xValue) {
+            $returnArray[0][] = [$bestFitLinear->getValueOfYForX($xValue)];
+        }
+
+        return $returnArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
new file mode 100644
index 00000000..d5646cf9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+abstract class VarianceBase
+{
+    protected static function datatypeAdjustmentAllowStrings(int|float|string|bool $value): int|float
+    {
+        if (is_bool($value)) {
+            return (int) $value;
+        } elseif (is_string($value)) {
+            return 0;
+        }
+
+        return $value;
+    }
+
+    protected static function datatypeAdjustmentBooleans(mixed $value): mixed
+    {
+        if (is_bool($value) && (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE)) {
+            return (int) $value;
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php
new file mode 100644
index 00000000..3256e85a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Variances extends VarianceBase
+{
+    /**
+     * VAR.
+     *
+     * Estimates variance based on a sample.
+     *
+     * Excel Function:
+     *        VAR(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function VAR(mixed ...$args): float|string
+    {
+        $returnValue = ExcelError::DIV0();
+
+        $summerA = $summerB = 0.0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            $arg = self::datatypeAdjustmentBooleans($arg);
+
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $summerA += ($arg * $arg);
+                $summerB += $arg;
+                ++$aCount;
+            }
+        }
+
+        if ($aCount > 1) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+
+            return ($summerA - $summerB) / ($aCount * ($aCount - 1));
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * VARA.
+     *
+     * Estimates variance based on a sample, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        VARA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function VARA(mixed ...$args): string|float
+    {
+        $returnValue = ExcelError::DIV0();
+
+        $summerA = $summerB = 0.0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        $aCount = 0;
+        foreach ($aArgs as $k => $arg) {
+            if ((is_string($arg)) && (Functions::isValue($k))) {
+                return ExcelError::VALUE();
+            } elseif ((is_string($arg)) && (!Functions::isMatrixValue($k))) {
+            } else {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+                    $arg = self::datatypeAdjustmentAllowStrings($arg);
+                    $summerA += ($arg * $arg);
+                    $summerB += $arg;
+                    ++$aCount;
+                }
+            }
+        }
+
+        if ($aCount > 1) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+
+            return ($summerA - $summerB) / ($aCount * ($aCount - 1));
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * VARP.
+     *
+     * Calculates variance based on the entire population
+     *
+     * Excel Function:
+     *        VARP(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function VARP(mixed ...$args): float|string
+    {
+        // Return value
+        $returnValue = ExcelError::DIV0();
+
+        $summerA = $summerB = 0.0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+        $aCount = 0;
+        foreach ($aArgs as $arg) {
+            $arg = self::datatypeAdjustmentBooleans($arg);
+
+            // Is it a numeric value?
+            if ((is_numeric($arg)) && (!is_string($arg))) {
+                $summerA += ($arg * $arg);
+                $summerB += $arg;
+                ++$aCount;
+            }
+        }
+
+        if ($aCount > 0) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+
+            return ($summerA - $summerB) / ($aCount * $aCount);
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * VARPA.
+     *
+     * Calculates variance based on the entire population, including numbers, text, and logical values
+     *
+     * Excel Function:
+     *        VARPA(value1[,value2[, ...]])
+     *
+     * @param mixed ...$args Data values
+     *
+     * @return float|string (string if result is an error)
+     */
+    public static function VARPA(mixed ...$args): string|float
+    {
+        $returnValue = ExcelError::DIV0();
+
+        $summerA = $summerB = 0.0;
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArrayIndexed($args);
+        $aCount = 0;
+        foreach ($aArgs as $k => $arg) {
+            if ((is_string($arg)) && (Functions::isValue($k))) {
+                return ExcelError::VALUE();
+            } elseif ((is_string($arg)) && (!Functions::isMatrixValue($k))) {
+            } else {
+                // Is it a numeric value?
+                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+                    $arg = self::datatypeAdjustmentAllowStrings($arg);
+                    $summerA += ($arg * $arg);
+                    $summerB += $arg;
+                    ++$aCount;
+                }
+            }
+        }
+
+        if ($aCount > 0) {
+            $summerA *= $aCount;
+            $summerB *= $summerB;
+
+            return ($summerA - $summerB) / ($aCount * $aCount);
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php
new file mode 100644
index 00000000..6667bac5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class CaseConvert
+{
+    use ArrayEnabled;
+
+    /**
+     * LOWERCASE.
+     *
+     * Converts a string value to upper case.
+     *
+     * @param mixed $mixedCaseValue The string value to convert to lower case
+     *                              Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function lower(mixed $mixedCaseValue): array|string
+    {
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
+
+        try {
+            $mixedCaseValue = Helpers::extractString($mixedCaseValue, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return StringHelper::strToLower($mixedCaseValue);
+    }
+
+    /**
+     * UPPERCASE.
+     *
+     * Converts a string value to upper case.
+     *
+     * @param mixed $mixedCaseValue The string value to convert to upper case
+     *                              Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function upper(mixed $mixedCaseValue): array|string
+    {
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
+
+        try {
+            $mixedCaseValue = Helpers::extractString($mixedCaseValue, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return StringHelper::strToUpper($mixedCaseValue);
+    }
+
+    /**
+     * PROPERCASE.
+     *
+     * Converts a string value to proper or title case.
+     *
+     * @param mixed $mixedCaseValue The string value to convert to title case
+     *                              Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function proper(mixed $mixedCaseValue): array|string
+    {
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
+
+        try {
+            $mixedCaseValue = Helpers::extractString($mixedCaseValue, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return StringHelper::strToTitle($mixedCaseValue);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
new file mode 100644
index 00000000..06d0f900
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class CharacterConvert
+{
+    use ArrayEnabled;
+
+    /**
+     * CHAR.
+     *
+     * @param mixed $character Integer Value to convert to its character representation
+     *                              Or can be an array of values
+     *
+     * @return array|string The character string
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function character(mixed $character): array|string
+    {
+        if (is_array($character)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $character);
+        }
+
+        try {
+            $character = Helpers::validateInt($character, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $min = Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE ? 0 : 1;
+        if ($character < $min || $character > 255) {
+            return ExcelError::VALUE();
+        }
+        $result = iconv('UCS-4LE', 'UTF-8', pack('V', $character));
+
+        return ($result === false) ? '' : $result;
+    }
+
+    /**
+     * CODE.
+     *
+     * @param mixed $characters String character to convert to its ASCII value
+     *                              Or can be an array of values
+     *
+     * @return array|int|string A string if arguments are invalid
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function code(mixed $characters): array|string|int
+    {
+        if (is_array($characters)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $characters);
+        }
+
+        try {
+            $characters = Helpers::extractString($characters, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        if ($characters === '') {
+            return ExcelError::VALUE();
+        }
+
+        $character = $characters;
+        if (mb_strlen($characters, 'UTF-8') > 1) {
+            $character = mb_substr($characters, 0, 1, 'UTF-8');
+        }
+
+        return self::unicodeToOrd($character);
+    }
+
+    private static function unicodeToOrd(string $character): int
+    {
+        $retVal = 0;
+        $iconv = iconv('UTF-8', 'UCS-4LE', $character);
+        if ($iconv !== false) {
+            $result = unpack('V', $iconv);
+            if (is_array($result) && isset($result[1])) {
+                $retVal = $result[1];
+            }
+        }
+
+        return $retVal;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
new file mode 100644
index 00000000..78940ed1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Concatenate
+{
+    use ArrayEnabled;
+
+    /**
+     * CONCATENATE.
+     *
+     * @param array $args
+     */
+    public static function CONCATENATE(...$args): string
+    {
+        $returnValue = '';
+
+        // Loop through arguments
+        $aArgs = Functions::flattenArray($args);
+
+        foreach ($aArgs as $arg) {
+            $value = Helpers::extractString($arg);
+            if (ErrorValue::isError($value, true)) {
+                $returnValue = $value;
+
+                break;
+            }
+            $returnValue .= Helpers::extractString($arg);
+            if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+                $returnValue = ExcelError::CALC();
+
+                break;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * TEXTJOIN.
+     *
+     * @param mixed $delimiter The delimter to use between the joined arguments
+     *                         Or can be an array of values
+     * @param mixed $ignoreEmpty true/false Flag indicating whether empty arguments should be skipped
+     *                         Or can be an array of values
+     * @param mixed $args The values to join
+     *
+     * @return array|string The joined string
+     *         If an array of values is passed for the $delimiter or $ignoreEmpty arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function TEXTJOIN(mixed $delimiter = '', mixed $ignoreEmpty = true, mixed ...$args): array|string
+    {
+        if (is_array($delimiter) || is_array($ignoreEmpty)) {
+            return self::evaluateArrayArgumentsSubset(
+                [self::class, __FUNCTION__],
+                2,
+                $delimiter,
+                $ignoreEmpty,
+                ...$args
+            );
+        }
+
+        $delimiter ??= '';
+        $ignoreEmpty ??= true;
+        $aArgs = Functions::flattenArray($args);
+        $returnValue = self::evaluateTextJoinArray($ignoreEmpty, $aArgs);
+
+        $returnValue ??= implode($delimiter, $aArgs);
+        if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+            $returnValue = ExcelError::CALC();
+        }
+
+        return $returnValue;
+    }
+
+    private static function evaluateTextJoinArray(bool $ignoreEmpty, array &$aArgs): ?string
+    {
+        foreach ($aArgs as $key => &$arg) {
+            $value = Helpers::extractString($arg);
+            if (ErrorValue::isError($value, true)) {
+                return $value;
+            }
+
+            if ($ignoreEmpty === true && ((is_string($arg) && trim($arg) === '') || $arg === null)) {
+                unset($aArgs[$key]);
+            } elseif (is_bool($arg)) {
+                $arg = Helpers::convertBooleanValue($arg);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * REPT.
+     *
+     * Returns the result of builtin function round after validating args.
+     *
+     * @param mixed $stringValue The value to repeat
+     *                         Or can be an array of values
+     * @param mixed $repeatCount The number of times the string value should be repeated
+     *                         Or can be an array of values
+     *
+     * @return array|string The repeated string
+     *         If an array of values is passed for the $stringValue or $repeatCount arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function builtinREPT(mixed $stringValue, mixed $repeatCount): array|string
+    {
+        if (is_array($stringValue) || is_array($repeatCount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $stringValue, $repeatCount);
+        }
+
+        $stringValue = Helpers::extractString($stringValue);
+
+        if (!is_numeric($repeatCount) || $repeatCount < 0) {
+            $returnValue = ExcelError::VALUE();
+        } elseif (ErrorValue::isError($stringValue, true)) {
+            $returnValue = $stringValue;
+        } else {
+            $returnValue = str_repeat($stringValue, (int) $repeatCount);
+            if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+                $returnValue = ExcelError::VALUE(); // note VALUE not CALC
+            }
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php
new file mode 100644
index 00000000..1dfb724c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php
@@ -0,0 +1,282 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Extract
+{
+    use ArrayEnabled;
+
+    /**
+     * LEFT.
+     *
+     * @param mixed $value String value from which to extract characters
+     *                         Or can be an array of values
+     * @param mixed $chars The number of characters to extract (as an integer)
+     *                         Or can be an array of values
+     *
+     * @return array|string The joined string
+     *         If an array of values is passed for the $value or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function left(mixed $value, mixed $chars = 1): array|string
+    {
+        if (is_array($value) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $chars);
+        }
+
+        try {
+            $value = Helpers::extractString($value, true);
+            $chars = Helpers::extractInt($chars, 0, 1);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return mb_substr($value, 0, $chars, 'UTF-8');
+    }
+
+    /**
+     * MID.
+     *
+     * @param mixed $value String value from which to extract characters
+     *                         Or can be an array of values
+     * @param mixed $start Integer offset of the first character that we want to extract
+     *                         Or can be an array of values
+     * @param mixed $chars The number of characters to extract (as an integer)
+     *                         Or can be an array of values
+     *
+     * @return array|string The joined string
+     *         If an array of values is passed for the $value, $start or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function mid(mixed $value, mixed $start, mixed $chars): array|string
+    {
+        if (is_array($value) || is_array($start) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $start, $chars);
+        }
+
+        try {
+            $value = Helpers::extractString($value, true);
+            $start = Helpers::extractInt($start, 1);
+            $chars = Helpers::extractInt($chars, 0);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return mb_substr($value, --$start, $chars, 'UTF-8');
+    }
+
+    /**
+     * RIGHT.
+     *
+     * @param mixed $value String value from which to extract characters
+     *                         Or can be an array of values
+     * @param mixed $chars The number of characters to extract (as an integer)
+     *                         Or can be an array of values
+     *
+     * @return array|string The joined string
+     *         If an array of values is passed for the $value or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function right(mixed $value, mixed $chars = 1): array|string
+    {
+        if (is_array($value) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $chars);
+        }
+
+        try {
+            $value = Helpers::extractString($value, true);
+            $chars = Helpers::extractInt($chars, 0, 1);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return mb_substr($value, mb_strlen($value, 'UTF-8') - $chars, $chars, 'UTF-8');
+    }
+
+    /**
+     * TEXTBEFORE.
+     *
+     * @param mixed $text the text that you're searching
+     *                    Or can be an array of values
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
+     * @param mixed $instance The instance of the delimiter after which you want to extract the text.
+     *                            By default, this is the first instance (1).
+     *                            A negative value means start searching from the end of the text string.
+     *                        Or can be an array of values
+     * @param mixed $matchMode Determines whether the match is case-sensitive or not.
+     *                           0 - Case-sensitive
+     *                           1 - Case-insensitive
+     *                        Or can be an array of values
+     * @param mixed $matchEnd Treats the end of text as a delimiter.
+     *                          0 - Don't match the delimiter against the end of the text.
+     *                          1 - Match the delimiter against the end of the text.
+     *                        Or can be an array of values
+     * @param mixed $ifNotFound value to return if no match is found
+     *                             The default is a #N/A Error
+     *                          Or can be an array of values
+     *
+     * @return array|string the string extracted from text before the delimiter; or the $ifNotFound value
+     *         If an array of values is passed for any of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function before(mixed $text, $delimiter, mixed $instance = 1, mixed $matchMode = 0, mixed $matchEnd = 0, mixed $ifNotFound = '#N/A'): array|string
+    {
+        if (is_array($text) || is_array($instance) || is_array($matchMode) || is_array($matchEnd) || is_array($ifNotFound)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        }
+
+        try {
+            $text = Helpers::extractString($text ?? '', true);
+            Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''), true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $instance = (int) $instance;
+        $matchMode = (int) $matchMode;
+        $matchEnd = (int) $matchEnd;
+
+        $split = self::validateTextBeforeAfter($text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        if (is_string($split)) {
+            return $split;
+        }
+        if (Helpers::extractString(Functions::flattenSingleValue($delimiter ?? '')) === '') {
+            return ($instance > 0) ? '' : $text;
+        }
+
+        // Adjustment for a match as the first element of the split
+        $flags = self::matchFlags($matchMode);
+        $delimiter = self::buildDelimiter($delimiter);
+        $adjust = preg_match('/^' . $delimiter . "\$/{$flags}", $split[0]);
+        $oddReverseAdjustment = count($split) % 2;
+
+        $split = ($instance < 0)
+            ? array_slice($split, 0, max(count($split) - (abs($instance) * 2 - 1) - $adjust - $oddReverseAdjustment, 0))
+            : array_slice($split, 0, $instance * 2 - 1 - $adjust);
+
+        return implode('', $split);
+    }
+
+    /**
+     * TEXTAFTER.
+     *
+     * @param mixed $text the text that you're searching
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
+     * @param mixed $instance The instance of the delimiter after which you want to extract the text.
+     *                          By default, this is the first instance (1).
+     *                          A negative value means start searching from the end of the text string.
+     *                        Or can be an array of values
+     * @param mixed $matchMode Determines whether the match is case-sensitive or not.
+     *                            0 - Case-sensitive
+     *                            1 - Case-insensitive
+     *                         Or can be an array of values
+     * @param mixed $matchEnd Treats the end of text as a delimiter.
+     *                          0 - Don't match the delimiter against the end of the text.
+     *                          1 - Match the delimiter against the end of the text.
+     *                        Or can be an array of values
+     * @param mixed $ifNotFound value to return if no match is found
+     *                             The default is a #N/A Error
+     *                          Or can be an array of values
+     *
+     * @return array|string the string extracted from text before the delimiter; or the $ifNotFound value
+     *         If an array of values is passed for any of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function after(mixed $text, $delimiter, mixed $instance = 1, mixed $matchMode = 0, mixed $matchEnd = 0, mixed $ifNotFound = '#N/A'): array|string
+    {
+        if (is_array($text) || is_array($instance) || is_array($matchMode) || is_array($matchEnd) || is_array($ifNotFound)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        }
+
+        try {
+            $text = Helpers::extractString($text ?? '', true);
+            Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''), true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $instance = (int) $instance;
+        $matchMode = (int) $matchMode;
+        $matchEnd = (int) $matchEnd;
+
+        $split = self::validateTextBeforeAfter($text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        if (is_string($split)) {
+            return $split;
+        }
+        if (Helpers::extractString(Functions::flattenSingleValue($delimiter ?? '')) === '') {
+            return ($instance < 0) ? '' : $text;
+        }
+
+        // Adjustment for a match as the first element of the split
+        $flags = self::matchFlags($matchMode);
+        $delimiter = self::buildDelimiter($delimiter);
+        $adjust = preg_match('/^' . $delimiter . "\$/{$flags}", $split[0]);
+        $oddReverseAdjustment = count($split) % 2;
+
+        $split = ($instance < 0)
+            ? array_slice($split, count($split) - ((int) abs($instance + 1) * 2) - $adjust - $oddReverseAdjustment)
+            : array_slice($split, $instance * 2 - $adjust);
+
+        return implode('', $split);
+    }
+
+    private static function validateTextBeforeAfter(string $text, null|array|string $delimiter, int $instance, int $matchMode, int $matchEnd, mixed $ifNotFound): array|string
+    {
+        $flags = self::matchFlags($matchMode);
+        $delimiter = self::buildDelimiter($delimiter);
+
+        if (preg_match('/' . $delimiter . "/{$flags}", $text) === 0 && $matchEnd === 0) {
+            return $ifNotFound;
+        }
+
+        $split = preg_split('/' . $delimiter . "/{$flags}", $text, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        if ($split === false) {
+            return ExcelError::NA();
+        }
+
+        if ($instance === 0 || abs($instance) > StringHelper::countCharacters($text)) {
+            return ExcelError::VALUE();
+        }
+
+        if ($matchEnd === 0 && (abs($instance) > floor(count($split) / 2))) {
+            return ExcelError::NA();
+        } elseif ($matchEnd !== 0 && (abs($instance) - 1 > ceil(count($split) / 2))) {
+            return ExcelError::NA();
+        }
+
+        return $split;
+    }
+
+    /**
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
+     */
+    private static function buildDelimiter($delimiter): string
+    {
+        if (is_array($delimiter)) {
+            $delimiter = Functions::flattenArray($delimiter);
+            $quotedDelimiters = array_map(
+                fn ($delimiter): string => preg_quote($delimiter ?? '', '/'),
+                $delimiter
+            );
+            $delimiters = implode('|', $quotedDelimiters);
+
+            return '(' . $delimiters . ')';
+        }
+
+        return '(' . preg_quote($delimiter ?? '', '/') . ')';
+    }
+
+    private static function matchFlags(int $matchMode): string
+    {
+        return ($matchMode === 0) ? 'mu' : 'miu';
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php
new file mode 100644
index 00000000..0560b376
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php
@@ -0,0 +1,322 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class Format
+{
+    use ArrayEnabled;
+
+    /**
+     * DOLLAR.
+     *
+     * This function converts a number to text using currency format, with the decimals rounded to the specified place.
+     * The format used is $#,##0.00_);($#,##0.00)..
+     *
+     * @param mixed $value The value to format
+     *                         Or can be an array of values
+     * @param mixed $decimals The number of digits to display to the right of the decimal point (as an integer).
+     *                            If decimals is negative, number is rounded to the left of the decimal point.
+     *                            If you omit decimals, it is assumed to be 2
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function DOLLAR(mixed $value = 0, mixed $decimals = 2)
+    {
+        if (is_array($value) || is_array($decimals)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimals);
+        }
+
+        try {
+            $value = Helpers::extractFloat($value);
+            $decimals = Helpers::extractInt($decimals, -100, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $mask = '$#,##0';
+        if ($decimals > 0) {
+            $mask .= '.' . str_repeat('0', $decimals);
+        } else {
+            $round = 10 ** abs($decimals);
+            if ($value < 0) {
+                $round = 0 - $round;
+            }
+            /** @var float|int|string */
+            $value = MathTrig\Round::multiple($value, $round);
+        }
+        $mask = "{$mask};-{$mask}";
+
+        return NumberFormat::toFormattedString($value, $mask);
+    }
+
+    /**
+     * FIXED.
+     *
+     * @param mixed $value The value to format
+     *                         Or can be an array of values
+     * @param mixed $decimals Integer value for the number of decimal places that should be formatted
+     *                         Or can be an array of values
+     * @param mixed $noCommas Boolean value indicating whether the value should have thousands separators or not
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function FIXEDFORMAT(mixed $value, mixed $decimals = 2, mixed $noCommas = false): array|string
+    {
+        if (is_array($value) || is_array($decimals) || is_array($noCommas)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimals, $noCommas);
+        }
+
+        try {
+            $value = Helpers::extractFloat($value);
+            $decimals = Helpers::extractInt($decimals, -100, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $valueResult = round($value, $decimals);
+        if ($decimals < 0) {
+            $decimals = 0;
+        }
+        if ($noCommas === false) {
+            $valueResult = number_format(
+                $valueResult,
+                $decimals,
+                StringHelper::getDecimalSeparator(),
+                StringHelper::getThousandsSeparator()
+            );
+        }
+
+        return (string) $valueResult;
+    }
+
+    /**
+     * TEXT.
+     *
+     * @param mixed $value The value to format
+     *                         Or can be an array of values
+     * @param mixed $format A string with the Format mask that should be used
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function TEXTFORMAT(mixed $value, mixed $format): array|string
+    {
+        if (is_array($value) || is_array($format)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $format);
+        }
+
+        try {
+            $value = Helpers::extractString($value, true);
+            $format = Helpers::extractString($format, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $format = (string) NumberFormat::convertSystemFormats($format);
+
+        if (!is_numeric($value) && Date::isDateTimeFormatCode($format)) {
+            $value1 = DateTimeExcel\DateValue::fromString($value);
+            $value2 = DateTimeExcel\TimeValue::fromString($value);
+            /** @var float|int|string */
+            $value = (is_numeric($value1) && is_numeric($value2)) ? ($value1 + $value2) : (is_numeric($value1) ? $value2 : $value1);
+        }
+
+        return (string) NumberFormat::toFormattedString($value, $format);
+    }
+
+    /**
+     * @param mixed $value Value to check
+     */
+    private static function convertValue(mixed $value, bool $spacesMeanZero = false): mixed
+    {
+        $value = $value ?? 0;
+        if (is_bool($value)) {
+            if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+                $value = (int) $value;
+            } else {
+                throw new CalcExp(ExcelError::VALUE());
+            }
+        }
+        if (is_string($value)) {
+            $value = trim($value);
+            if (ErrorValue::isError($value, true)) {
+                throw new CalcExp($value);
+            }
+            if ($spacesMeanZero && $value === '') {
+                $value = 0;
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * VALUE.
+     *
+     * @param mixed $value Value to check
+     *                         Or can be an array of values
+     *
+     * @return array|DateTimeInterface|float|int|string A string if arguments are invalid
+     *         If an array of values is passed for the argument, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function VALUE(mixed $value = '')
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = self::convertValue($value);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+        if (!is_numeric($value)) {
+            $numberValue = str_replace(
+                StringHelper::getThousandsSeparator(),
+                '',
+                trim($value, " \t\n\r\0\x0B" . StringHelper::getCurrencyCode())
+            );
+            if ($numberValue === '') {
+                return ExcelError::VALUE();
+            }
+            if (is_numeric($numberValue)) {
+                return (float) $numberValue;
+            }
+
+            $dateSetting = Functions::getReturnDateType();
+            Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+
+            if (str_contains($value, ':')) {
+                $timeValue = Functions::scalar(DateTimeExcel\TimeValue::fromString($value));
+                if ($timeValue !== ExcelError::VALUE()) {
+                    Functions::setReturnDateType($dateSetting);
+
+                    return $timeValue;
+                }
+            }
+            $dateValue = Functions::scalar(DateTimeExcel\DateValue::fromString($value));
+            if ($dateValue !== ExcelError::VALUE()) {
+                Functions::setReturnDateType($dateSetting);
+
+                return $dateValue;
+            }
+            Functions::setReturnDateType($dateSetting);
+
+            return ExcelError::VALUE();
+        }
+
+        return (float) $value;
+    }
+
+    /**
+     * VALUETOTEXT.
+     *
+     * @param mixed $value The value to format
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function valueToText(mixed $value, mixed $format = false): array|string
+    {
+        if (is_array($value) || is_array($format)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $format);
+        }
+
+        $format = (bool) $format;
+
+        if (is_object($value) && $value instanceof RichText) {
+            $value = $value->getPlainText();
+        }
+        if (is_string($value)) {
+            $value = ($format === true) ? Calculation::wrapResult($value) : $value;
+            $value = str_replace("\n", '', $value);
+        } elseif (is_bool($value)) {
+            $value = Calculation::getLocaleBoolean($value ? 'TRUE' : 'FALSE');
+        }
+
+        return (string) $value;
+    }
+
+    private static function getDecimalSeparator(mixed $decimalSeparator): string
+    {
+        return empty($decimalSeparator) ? StringHelper::getDecimalSeparator() : (string) $decimalSeparator;
+    }
+
+    private static function getGroupSeparator(mixed $groupSeparator): string
+    {
+        return empty($groupSeparator) ? StringHelper::getThousandsSeparator() : (string) $groupSeparator;
+    }
+
+    /**
+     * NUMBERVALUE.
+     *
+     * @param mixed $value The value to format
+     *                         Or can be an array of values
+     * @param mixed $decimalSeparator A string with the decimal separator to use, defaults to locale defined value
+     *                         Or can be an array of values
+     * @param mixed $groupSeparator A string with the group/thousands separator to use, defaults to locale defined value
+     *                         Or can be an array of values
+     */
+    public static function NUMBERVALUE(mixed $value = '', mixed $decimalSeparator = null, mixed $groupSeparator = null): array|string|float
+    {
+        if (is_array($value) || is_array($decimalSeparator) || is_array($groupSeparator)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimalSeparator, $groupSeparator);
+        }
+
+        try {
+            $value = self::convertValue($value, true);
+            $decimalSeparator = self::getDecimalSeparator($decimalSeparator);
+            $groupSeparator = self::getGroupSeparator($groupSeparator);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        if (!is_numeric($value)) {
+            $decimalPositions = preg_match_all('/' . preg_quote($decimalSeparator, '/') . '/', $value, $matches, PREG_OFFSET_CAPTURE);
+            if ($decimalPositions > 1) {
+                return ExcelError::VALUE();
+            }
+            $decimalOffset = array_pop($matches[0])[1] ?? null;
+            if ($decimalOffset === null || strpos($value, $groupSeparator, $decimalOffset) !== false) {
+                return ExcelError::VALUE();
+            }
+
+            $value = str_replace([$groupSeparator, $decimalSeparator], ['', '.'], $value);
+
+            // Handle the special case of trailing % signs
+            $percentageString = rtrim($value, '%');
+            if (!is_numeric($percentageString)) {
+                return ExcelError::VALUE();
+            }
+
+            $percentageAdjustment = strlen($value) - strlen($percentageString);
+            if ($percentageAdjustment) {
+                $value = (float) $percentageString;
+                $value /= 10 ** ($percentageAdjustment * 2);
+            }
+        }
+
+        return is_array($value) ? ExcelError::VALUE() : (float) $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php
new file mode 100644
index 00000000..719de04a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Helpers
+{
+    public static function convertBooleanValue(bool $value): string
+    {
+        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
+            return $value ? '1' : '0';
+        }
+
+        return ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+    }
+
+    /**
+     * @param mixed $value String value from which to extract characters
+     */
+    public static function extractString(mixed $value, bool $throwIfError = false): string
+    {
+        if (is_bool($value)) {
+            return self::convertBooleanValue($value);
+        }
+        if ($throwIfError && is_string($value) && ErrorValue::isError($value, true)) {
+            throw new CalcExp($value);
+        }
+
+        return (string) $value;
+    }
+
+    public static function extractInt(mixed $value, int $minValue, int $gnumericNull = 0, bool $ooBoolOk = false): int
+    {
+        if ($value === null) {
+            // usually 0, but sometimes 1 for Gnumeric
+            $value = (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_GNUMERIC) ? $gnumericNull : 0;
+        }
+        if (is_bool($value) && ($ooBoolOk || Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE)) {
+            $value = (int) $value;
+        }
+        if (!is_numeric($value)) {
+            throw new CalcExp(ExcelError::VALUE());
+        }
+        $value = (int) $value;
+        if ($value < $minValue) {
+            throw new CalcExp(ExcelError::VALUE());
+        }
+
+        return (int) $value;
+    }
+
+    public static function extractFloat(mixed $value): float
+    {
+        if ($value === null) {
+            $value = 0.0;
+        }
+        if (is_bool($value)) {
+            $value = (float) $value;
+        }
+        if (!is_numeric($value)) {
+            if (is_string($value) && ErrorValue::isError($value, true)) {
+                throw new CalcExp($value);
+            }
+
+            throw new CalcExp(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    public static function validateInt(mixed $value, bool $throwIfError = false): int
+    {
+        if ($value === null) {
+            $value = 0;
+        } elseif (is_bool($value)) {
+            $value = (int) $value;
+        } elseif ($throwIfError && is_string($value) && !is_numeric($value)) {
+            if (!ErrorValue::isError($value, true)) {
+                $value = ExcelError::VALUE();
+            }
+
+            throw new CalcExp($value);
+        }
+
+        return (int) $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php
new file mode 100644
index 00000000..8f6f196f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Replace
+{
+    use ArrayEnabled;
+
+    /**
+     * REPLACE.
+     *
+     * @param mixed $oldText The text string value to modify
+     *                         Or can be an array of values
+     * @param mixed $start Integer offset for start character of the replacement
+     *                         Or can be an array of values
+     * @param mixed $chars Integer number of characters to replace from the start offset
+     *                         Or can be an array of values
+     * @param mixed $newText String to replace in the defined position
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function replace(mixed $oldText, mixed $start, mixed $chars, mixed $newText): array|string
+    {
+        if (is_array($oldText) || is_array($start) || is_array($chars) || is_array($newText)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $oldText, $start, $chars, $newText);
+        }
+
+        try {
+            $start = Helpers::extractInt($start, 1, 0, true);
+            $chars = Helpers::extractInt($chars, 0, 0, true);
+            $oldText = Helpers::extractString($oldText, true);
+            $newText = Helpers::extractString($newText, true);
+            $left = StringHelper::substring($oldText, 0, $start - 1);
+
+            $right = StringHelper::substring($oldText, $start + $chars - 1, null);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+        $returnValue = $left . $newText . $right;
+        if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+            $returnValue = ExcelError::VALUE();
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * SUBSTITUTE.
+     *
+     * @param mixed $text The text string value to modify
+     *                         Or can be an array of values
+     * @param mixed $fromText The string value that we want to replace in $text
+     *                         Or can be an array of values
+     * @param mixed $toText The string value that we want to replace with in $text
+     *                         Or can be an array of values
+     * @param mixed $instance Integer instance Number for the occurrence of frmText to change
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function substitute(mixed $text = '', mixed $fromText = '', mixed $toText = '', mixed $instance = null): array|string
+    {
+        if (is_array($text) || is_array($fromText) || is_array($toText) || is_array($instance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $text, $fromText, $toText, $instance);
+        }
+
+        try {
+            $text = Helpers::extractString($text, true);
+            $fromText = Helpers::extractString($fromText, true);
+            $toText = Helpers::extractString($toText, true);
+            if ($instance === null) {
+                $returnValue = str_replace($fromText, $toText, $text);
+            } else {
+                if (is_bool($instance)) {
+                    if ($instance === false || Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE) {
+                        return ExcelError::Value();
+                    }
+                    $instance = 1;
+                }
+                $instance = Helpers::extractInt($instance, 1, 0, true);
+                $returnValue = self::executeSubstitution($text, $fromText, $toText, $instance);
+            }
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+        if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+            $returnValue = ExcelError::VALUE();
+        }
+
+        return $returnValue;
+    }
+
+    private static function executeSubstitution(string $text, string $fromText, string $toText, int $instance): string
+    {
+        $pos = -1;
+        while ($instance > 0) {
+            $pos = mb_strpos($text, $fromText, $pos + 1, 'UTF-8');
+            if ($pos === false) {
+                return $text;
+            }
+            --$instance;
+        }
+
+        return Functions::scalar(self::REPLACE($text, ++$pos, StringHelper::countCharacters($fromText), $toText));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php
new file mode 100644
index 00000000..663d49fc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Search
+{
+    use ArrayEnabled;
+
+    /**
+     * FIND (case sensitive search).
+     *
+     * @param mixed $needle The string to look for
+     *                         Or can be an array of values
+     * @param mixed $haystack The string in which to look
+     *                         Or can be an array of values
+     * @param mixed $offset Integer offset within $haystack to start searching from
+     *                         Or can be an array of values
+     *
+     * @return array|int|string The offset where the first occurrence of needle was found in the haystack
+     *         If an array of values is passed for the $value or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function sensitive(mixed $needle, mixed $haystack, mixed $offset = 1): array|string|int
+    {
+        if (is_array($needle) || is_array($haystack) || is_array($offset)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $needle, $haystack, $offset);
+        }
+
+        try {
+            $needle = Helpers::extractString($needle, true);
+            $haystack = Helpers::extractString($haystack, true);
+            $offset = Helpers::extractInt($offset, 1, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        if (StringHelper::countCharacters($haystack) >= $offset) {
+            if (StringHelper::countCharacters($needle) === 0) {
+                return $offset;
+            }
+
+            $pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
+            if ($pos !== false) {
+                return ++$pos;
+            }
+        }
+
+        return ExcelError::VALUE();
+    }
+
+    /**
+     * SEARCH (case insensitive search).
+     *
+     * @param mixed $needle The string to look for
+     *                         Or can be an array of values
+     * @param mixed $haystack The string in which to look
+     *                         Or can be an array of values
+     * @param mixed $offset Integer offset within $haystack to start searching from
+     *                         Or can be an array of values
+     *
+     * @return array|int|string The offset where the first occurrence of needle was found in the haystack
+     *         If an array of values is passed for the $value or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function insensitive(mixed $needle, mixed $haystack, mixed $offset = 1): array|string|int
+    {
+        if (is_array($needle) || is_array($haystack) || is_array($offset)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $needle, $haystack, $offset);
+        }
+
+        try {
+            $needle = Helpers::extractString($needle, true);
+            $haystack = Helpers::extractString($haystack, true);
+            $offset = Helpers::extractInt($offset, 1, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        if (StringHelper::countCharacters($haystack) >= $offset) {
+            if (StringHelper::countCharacters($needle) === 0) {
+                return $offset;
+            }
+
+            $pos = mb_stripos($haystack, $needle, --$offset, 'UTF-8');
+            if ($pos !== false) {
+                return ++$pos;
+            }
+        }
+
+        return ExcelError::VALUE();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php
new file mode 100644
index 00000000..f988a6c1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php
@@ -0,0 +1,245 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+
+class Text
+{
+    use ArrayEnabled;
+
+    /**
+     * LEN.
+     *
+     * @param mixed $value String Value
+     *                         Or can be an array of values
+     *
+     * @return array|int|string If an array of values is passed for the argument, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function length(mixed $value = ''): array|int|string
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        try {
+            $value = Helpers::extractString($value, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return mb_strlen($value, 'UTF-8');
+    }
+
+    /**
+     * Compares two text strings and returns TRUE if they are exactly the same, FALSE otherwise.
+     * EXACT is case-sensitive but ignores formatting differences.
+     * Use EXACT to test text being entered into a document.
+     *
+     * @param mixed $value1 String Value
+     *                         Or can be an array of values
+     * @param mixed $value2 String Value
+     *                         Or can be an array of values
+     *
+     * @return array|bool|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function exact(mixed $value1, mixed $value2): array|bool|string
+    {
+        if (is_array($value1) || is_array($value2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value1, $value2);
+        }
+
+        try {
+            $value1 = Helpers::extractString($value1, true);
+            $value2 = Helpers::extractString($value2, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        return $value2 === $value1;
+    }
+
+    /**
+     * T.
+     *
+     * @param mixed $testValue Value to check
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for the argument, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function test(mixed $testValue = ''): array|string
+    {
+        if (is_array($testValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $testValue);
+        }
+
+        if (is_string($testValue)) {
+            return $testValue;
+        }
+
+        return '';
+    }
+
+    /**
+     * TEXTSPLIT.
+     *
+     * @param mixed $text the text that you're searching
+     * @param null|array|string $columnDelimiter The text that marks the point where to spill the text across columns.
+     *                          Multiple delimiters can be passed as an array of string values
+     * @param null|array|string $rowDelimiter The text that marks the point where to spill the text down rows.
+     *                          Multiple delimiters can be passed as an array of string values
+     * @param bool $ignoreEmpty Specify FALSE to create an empty cell when two delimiters are consecutive.
+     *                              true = create empty cells
+     *                              false = skip empty cells
+     *                              Defaults to TRUE, which creates an empty cell
+     * @param bool $matchMode Determines whether the match is case-sensitive or not.
+     *                              true = case-sensitive
+     *                              false = case-insensitive
+     *                         By default, a case-sensitive match is done.
+     * @param mixed $padding The value with which to pad the result.
+     *                              The default is #N/A.
+     *
+     * @return array|string the array built from the text, split by the row and column delimiters, or an error string
+     */
+    public static function split(mixed $text, $columnDelimiter = null, $rowDelimiter = null, bool $ignoreEmpty = false, bool $matchMode = true, mixed $padding = '#N/A'): array|string
+    {
+        $text = Functions::flattenSingleValue($text);
+        if (ErrorValue::isError($text, true)) {
+            return $text;
+        }
+
+        $flags = self::matchFlags($matchMode);
+
+        if ($rowDelimiter !== null) {
+            $delimiter = self::buildDelimiter($rowDelimiter);
+            $rows = ($delimiter === '()')
+                ? [$text]
+                : preg_split("/{$delimiter}/{$flags}", $text);
+        } else {
+            $rows = [$text];
+        }
+
+        /** @var array $rows */
+        if ($ignoreEmpty === true) {
+            $rows = array_values(array_filter(
+                $rows,
+                fn ($row): bool => $row !== ''
+            ));
+        }
+
+        if ($columnDelimiter !== null) {
+            $delimiter = self::buildDelimiter($columnDelimiter);
+            array_walk(
+                $rows,
+                function (&$row) use ($delimiter, $flags, $ignoreEmpty): void {
+                    $row = ($delimiter === '()')
+                        ? [$row]
+                        : preg_split("/{$delimiter}/{$flags}", $row);
+                    /** @var array $row */
+                    if ($ignoreEmpty === true) {
+                        $row = array_values(array_filter(
+                            $row,
+                            fn ($value): bool => $value !== ''
+                        ));
+                    }
+                }
+            );
+            if ($ignoreEmpty === true) {
+                $rows = array_values(array_filter(
+                    $rows,
+                    fn ($row): bool => $row !== [] && $row !== ['']
+                ));
+            }
+        }
+
+        return self::applyPadding($rows, $padding);
+    }
+
+    private static function applyPadding(array $rows, mixed $padding): array
+    {
+        $columnCount = array_reduce(
+            $rows,
+            fn (int $counter, array $row): int => max($counter, count($row)),
+            0
+        );
+
+        return array_map(
+            function (array $row) use ($columnCount, $padding): array {
+                return (count($row) < $columnCount)
+                    ? array_merge($row, array_fill(0, $columnCount - count($row), $padding))
+                    : $row;
+            },
+            $rows
+        );
+    }
+
+    /**
+     * @param null|array|string $delimiter the text that marks the point before which you want to split
+     *                                 Multiple delimiters can be passed as an array of string values
+     */
+    private static function buildDelimiter($delimiter): string
+    {
+        $valueSet = Functions::flattenArray($delimiter);
+
+        if (is_array($delimiter) && count($valueSet) > 1) {
+            $quotedDelimiters = array_map(
+                fn ($delimiter): string => preg_quote($delimiter ?? '', '/'),
+                $valueSet
+            );
+            $delimiters = implode('|', $quotedDelimiters);
+
+            return '(' . $delimiters . ')';
+        }
+
+        return '(' . preg_quote(Functions::flattenSingleValue($delimiter), '/') . ')';
+    }
+
+    private static function matchFlags(bool $matchMode): string
+    {
+        return ($matchMode === true) ? 'miu' : 'mu';
+    }
+
+    public static function fromArray(array $array, int $format = 0): string
+    {
+        $result = [];
+        foreach ($array as $row) {
+            $cells = [];
+            foreach ($row as $cellValue) {
+                $value = ($format === 1) ? self::formatValueMode1($cellValue) : self::formatValueMode0($cellValue);
+                $cells[] = $value;
+            }
+            $result[] = implode(($format === 1) ? ',' : ', ', $cells);
+        }
+
+        $result = implode(($format === 1) ? ';' : ', ', $result);
+
+        return ($format === 1) ? '{' . $result . '}' : $result;
+    }
+
+    private static function formatValueMode0(mixed $cellValue): string
+    {
+        if (is_bool($cellValue)) {
+            return Calculation::getLocaleBoolean($cellValue ? 'TRUE' : 'FALSE');
+        }
+
+        return (string) $cellValue;
+    }
+
+    private static function formatValueMode1(mixed $cellValue): string
+    {
+        if (is_string($cellValue) && ErrorValue::isError($cellValue) === false) {
+            return Calculation::FORMULA_STRING_QUOTE . $cellValue . Calculation::FORMULA_STRING_QUOTE;
+        } elseif (is_bool($cellValue)) {
+            return Calculation::getLocaleBoolean($cellValue ? 'TRUE' : 'FALSE');
+        }
+
+        return (string) $cellValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php
new file mode 100644
index 00000000..d8f17062
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+
+class Trim
+{
+    use ArrayEnabled;
+
+    /**
+     * CLEAN.
+     *
+     * @param mixed $stringValue String Value to check
+     *                              Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function nonPrintable(mixed $stringValue = '')
+    {
+        if (is_array($stringValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $stringValue);
+        }
+
+        $stringValue = Helpers::extractString($stringValue);
+
+        return (string) preg_replace('/[\\x00-\\x1f]/', '', "$stringValue");
+    }
+
+    /**
+     * TRIM.
+     *
+     * @param mixed $stringValue String Value to check
+     *                              Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function spaces(mixed $stringValue = ''): array|string
+    {
+        if (is_array($stringValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $stringValue);
+        }
+
+        $stringValue = Helpers::extractString($stringValue);
+
+        return trim(preg_replace('/ +/', ' ', trim("$stringValue", ' ')) ?? '', ' ');
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php
new file mode 100644
index 00000000..13c6e5b1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Token;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\BranchPruner;
+
+class Stack
+{
+    private BranchPruner $branchPruner;
+
+    /**
+     * The parser stack for formulae.
+     *
+     * @var mixed[]
+     */
+    private array $stack = [];
+
+    /**
+     * Count of entries in the parser stack.
+     */
+    private int $count = 0;
+
+    public function __construct(BranchPruner $branchPruner)
+    {
+        $this->branchPruner = $branchPruner;
+    }
+
+    /**
+     * Return the number of entries on the stack.
+     */
+    public function count(): int
+    {
+        return $this->count;
+    }
+
+    /**
+     * Push a new entry onto the stack.
+     */
+    public function push(string $type, mixed $value, ?string $reference = null): void
+    {
+        $stackItem = $this->getStackItem($type, $value, $reference);
+        $this->stack[$this->count++] = $stackItem;
+
+        if ($type === 'Function') {
+            $localeFunction = Calculation::localeFunc($value);
+            if ($localeFunction != $value) {
+                $this->stack[($this->count - 1)]['localeValue'] = $localeFunction;
+            }
+        }
+    }
+
+    public function pushStackItem(array $stackItem): void
+    {
+        $this->stack[$this->count++] = $stackItem;
+    }
+
+    public function getStackItem(string $type, mixed $value, ?string $reference = null): array
+    {
+        $stackItem = [
+            'type' => $type,
+            'value' => $value,
+            'reference' => $reference,
+        ];
+
+        // will store the result under this alias
+        $storeKey = $this->branchPruner->currentCondition();
+        if (isset($storeKey) || $reference === 'NULL') {
+            $stackItem['storeKey'] = $storeKey;
+        }
+
+        // will only run computation if the matching store key is true
+        $onlyIf = $this->branchPruner->currentOnlyIf();
+        if (isset($onlyIf) || $reference === 'NULL') {
+            $stackItem['onlyIf'] = $onlyIf;
+        }
+
+        // will only run computation if the matching store key is false
+        $onlyIfNot = $this->branchPruner->currentOnlyIfNot();
+        if (isset($onlyIfNot) || $reference === 'NULL') {
+            $stackItem['onlyIfNot'] = $onlyIfNot;
+        }
+
+        return $stackItem;
+    }
+
+    /**
+     * Pop the last entry from the stack.
+     */
+    public function pop(): ?array
+    {
+        if ($this->count > 0) {
+            return $this->stack[--$this->count];
+        }
+
+        return null;
+    }
+
+    /**
+     * Return an entry from the stack without removing it.
+     */
+    public function last(int $n = 1): ?array
+    {
+        if ($this->count - $n < 0) {
+            return null;
+        }
+
+        return $this->stack[$this->count - $n];
+    }
+
+    /**
+     * Clear the stack.
+     */
+    public function clear(): void
+    {
+        $this->stack = [];
+        $this->count = 0;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php
new file mode 100644
index 00000000..55813414
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Web;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Settings;
+use Psr\Http\Client\ClientExceptionInterface;
+
+class Service
+{
+    /**
+     * WEBSERVICE.
+     *
+     * Returns data from a web service on the Internet or Intranet.
+     *
+     * Excel Function:
+     *        Webservice(url)
+     *
+     * @return string the output resulting from a call to the webservice
+     */
+    public static function webService(string $url): string
+    {
+        $url = trim($url);
+        if (strlen($url) > 2048) {
+            return ExcelError::VALUE(); // Invalid URL length
+        }
+
+        if (!preg_match('/^http[s]?:\/\//', $url)) {
+            return ExcelError::VALUE(); // Invalid protocol
+        }
+
+        // Get results from the the webservice
+        $client = Settings::getHttpClient();
+        $requestFactory = Settings::getRequestFactory();
+        $request = $requestFactory->createRequest('GET', $url);
+
+        try {
+            $response = $client->sendRequest($request);
+        } catch (ClientExceptionInterface) {
+            return ExcelError::VALUE(); // cURL error
+        }
+
+        if ($response->getStatusCode() != 200) {
+            return ExcelError::VALUE(); // cURL error
+        }
+
+        $output = $response->getBody()->getContents();
+        if (strlen($output) > 32767) {
+            return ExcelError::VALUE(); // Output not a string or too long
+        }
+
+        return $output;
+    }
+
+    /**
+     * URLENCODE.
+     *
+     * Returns data from a web service on the Internet or Intranet.
+     *
+     * Excel Function:
+     *        urlEncode(text)
+     *
+     * @return string the url encoded output
+     */
+    public static function urlEncode(mixed $text): string
+    {
+        if (!is_string($text)) {
+            return ExcelError::VALUE();
+        }
+
+        return str_replace('+', '%20', urlencode($text));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx
new file mode 100644
index 00000000..080d5e7a
Binary files /dev/null and b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx differ
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/config
new file mode 100644
index 00000000..689203c5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/config
@@ -0,0 +1,24 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## български (Bulgarian)
+##
+############################################################
+
+ArgumentSeparator = ;
+##
+##  (For future use)
+##
+currencySymbol = лв
+
+##
+## Error Codes
+##
+NULL = #ПРАЗНО!
+DIV0 = #ДЕЛ/0!
+VALUE = #СТОЙНОСТ!
+REF = #РЕФ!
+NAME = #ИМЕ?
+NUM = #ЧИСЛО!
+NA = #Н/Д
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/functions
new file mode 100644
index 00000000..ec56433c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/functions
@@ -0,0 +1,409 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## български (Bulgarian)
+##
+############################################################
+
+
+##
+## Функции Куб (Cube Functions)
+##
+CUBEKPIMEMBER = КУБЭЛЕМЕНТКИП
+CUBEMEMBER = КУБЭЛЕМЕНТ
+CUBEMEMBERPROPERTY = КУБСВОЙСТВОЭЛЕМЕНТА
+CUBERANKEDMEMBER = КУБПОРЭЛЕМЕНТ
+CUBESET = КУБМНОЖ
+CUBESETCOUNT = КУБЧИСЛОЭЛМНОЖ
+CUBEVALUE = КУБЗНАЧЕНИЕ
+
+##
+## Функции для работы с базами данных (Database Functions)
+##
+DAVERAGE = ДСРЗНАЧ
+DCOUNT = БСЧЁТ
+DCOUNTA = БСЧЁТА
+DGET = БИЗВЛЕЧЬ
+DMAX = ДМАКС
+DMIN = ДМИН
+DPRODUCT = БДПРОИЗВЕД
+DSTDEV = ДСТАНДОТКЛ
+DSTDEVP = ДСТАНДОТКЛП
+DSUM = БДСУММ
+DVAR = БДДИСП
+DVARP = БДДИСПП
+
+##
+## Функции даты и времени (Date & Time Functions)
+##
+DATE = ДАТА
+DATEVALUE = ДАТАЗНАЧ
+DAY = ДЕНЬ
+DAYS360 = ДНЕЙ360
+EDATE = ДАТАМЕС
+EOMONTH = КОНМЕСЯЦА
+HOUR = ЧАС
+MINUTE = МИНУТЫ
+MONTH = МЕСЯЦ
+NETWORKDAYS = ЧИСТРАБДНИ
+NOW = ТДАТА
+SECOND = СЕКУНДЫ
+TIME = ВРЕМЯ
+TIMEVALUE = ВРЕМЗНАЧ
+TODAY = СЕГОДНЯ
+WEEKDAY = ДЕНЬНЕД
+WEEKNUM = НОМНЕДЕЛИ
+WORKDAY = РАБДЕНЬ
+YEAR = ГОД
+YEARFRAC = ДОЛЯГОДА
+
+##
+## Инженерные функции (Engineering Functions)
+##
+BESSELI = БЕССЕЛЬ.I
+BESSELJ = БЕССЕЛЬ.J
+BESSELK = БЕССЕЛЬ.K
+BESSELY = БЕССЕЛЬ.Y
+BIN2DEC = ДВ.В.ДЕС
+BIN2HEX = ДВ.В.ШЕСТН
+BIN2OCT = ДВ.В.ВОСЬМ
+COMPLEX = КОМПЛЕКСН
+CONVERT = ПРЕОБР
+DEC2BIN = ДЕС.В.ДВ
+DEC2HEX = ДЕС.В.ШЕСТН
+DEC2OCT = ДЕС.В.ВОСЬМ
+DELTA = ДЕЛЬТА
+ERF = ФОШ
+ERFC = ДФОШ
+GESTEP = ПОРОГ
+HEX2BIN = ШЕСТН.В.ДВ
+HEX2DEC = ШЕСТН.В.ДЕС
+HEX2OCT = ШЕСТН.В.ВОСЬМ
+IMABS = МНИМ.ABS
+IMAGINARY = МНИМ.ЧАСТЬ
+IMARGUMENT = МНИМ.АРГУМЕНТ
+IMCONJUGATE = МНИМ.СОПРЯЖ
+IMCOS = МНИМ.COS
+IMDIV = МНИМ.ДЕЛ
+IMEXP = МНИМ.EXP
+IMLN = МНИМ.LN
+IMLOG10 = МНИМ.LOG10
+IMLOG2 = МНИМ.LOG2
+IMPOWER = МНИМ.СТЕПЕНЬ
+IMPRODUCT = МНИМ.ПРОИЗВЕД
+IMREAL = МНИМ.ВЕЩ
+IMSIN = МНИМ.SIN
+IMSQRT = МНИМ.КОРЕНЬ
+IMSUB = МНИМ.РАЗН
+IMSUM = МНИМ.СУММ
+OCT2BIN = ВОСЬМ.В.ДВ
+OCT2DEC = ВОСЬМ.В.ДЕС
+OCT2HEX = ВОСЬМ.В.ШЕСТН
+
+##
+## Финансовые функции (Financial Functions)
+##
+ACCRINT = НАКОПДОХОД
+ACCRINTM = НАКОПДОХОДПОГАШ
+AMORDEGRC = АМОРУМ
+AMORLINC = АМОРУВ
+COUPDAYBS = ДНЕЙКУПОНДО
+COUPDAYS = ДНЕЙКУПОН
+COUPDAYSNC = ДНЕЙКУПОНПОСЛЕ
+COUPNCD = ДАТАКУПОНПОСЛЕ
+COUPNUM = ЧИСЛКУПОН
+COUPPCD = ДАТАКУПОНДО
+CUMIPMT = ОБЩПЛАТ
+CUMPRINC = ОБЩДОХОД
+DB = ФУО
+DDB = ДДОБ
+DISC = СКИДКА
+DOLLARDE = РУБЛЬ.ДЕС
+DOLLARFR = РУБЛЬ.ДРОБЬ
+DURATION = ДЛИТ
+EFFECT = ЭФФЕКТ
+FV = БС
+FVSCHEDULE = БЗРАСПИС
+INTRATE = ИНОРМА
+IPMT = ПРПЛТ
+IRR = ВСД
+ISPMT = ПРОЦПЛАТ
+MDURATION = МДЛИТ
+MIRR = МВСД
+NOMINAL = НОМИНАЛ
+NPER = КПЕР
+NPV = ЧПС
+ODDFPRICE = ЦЕНАПЕРВНЕРЕГ
+ODDFYIELD = ДОХОДПЕРВНЕРЕГ
+ODDLPRICE = ЦЕНАПОСЛНЕРЕГ
+ODDLYIELD = ДОХОДПОСЛНЕРЕГ
+PMT = ПЛТ
+PPMT = ОСПЛТ
+PRICE = ЦЕНА
+PRICEDISC = ЦЕНАСКИДКА
+PRICEMAT = ЦЕНАПОГАШ
+PV = ПС
+RATE = СТАВКА
+RECEIVED = ПОЛУЧЕНО
+SLN = АПЛ
+SYD = АСЧ
+TBILLEQ = РАВНОКЧЕК
+TBILLPRICE = ЦЕНАКЧЕК
+TBILLYIELD = ДОХОДКЧЕК
+VDB = ПУО
+XIRR = ЧИСТВНДОХ
+XNPV = ЧИСТНЗ
+YIELD = ДОХОД
+YIELDDISC = ДОХОДСКИДКА
+YIELDMAT = ДОХОДПОГАШ
+
+##
+## Информационные функции (Information Functions)
+##
+CELL = ЯЧЕЙКА
+ERROR.TYPE = ТИП.ОШИБКИ
+INFO = ИНФОРМ
+ISBLANK = ЕПУСТО
+ISERR = ЕОШ
+ISERROR = ЕОШИБКА
+ISEVEN = ЕЧЁТН
+ISLOGICAL = ЕЛОГИЧ
+ISNA = ЕНД
+ISNONTEXT = ЕНЕТЕКСТ
+ISNUMBER = ЕЧИСЛО
+ISODD = ЕНЕЧЁТ
+ISREF = ЕССЫЛКА
+ISTEXT = ЕТЕКСТ
+N = Ч
+NA = НД
+TYPE = ТИП
+
+##
+## Логические функции (Logical Functions)
+##
+AND = И
+FALSE = ЛОЖЬ
+IF = ЕСЛИ
+IFERROR = ЕСЛИОШИБКА
+NOT = НЕ
+OR = ИЛИ
+TRUE = ИСТИНА
+
+##
+## Функции ссылки и поиска (Lookup & Reference Functions)
+##
+ADDRESS = АДРЕС
+AREAS = ОБЛАСТИ
+CHOOSE = ВЫБОР
+COLUMN = СТОЛБЕЦ
+COLUMNS = ЧИСЛСТОЛБ
+GETPIVOTDATA = ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ
+HLOOKUP = ГПР
+HYPERLINK = ГИПЕРССЫЛКА
+INDEX = ИНДЕКС
+INDIRECT = ДВССЫЛ
+LOOKUP = ПРОСМОТР
+MATCH = ПОИСКПОЗ
+OFFSET = СМЕЩ
+ROW = СТРОКА
+ROWS = ЧСТРОК
+RTD = ДРВ
+TRANSPOSE = ТРАНСП
+VLOOKUP = ВПР
+
+##
+## Математические и тригонометрические функции (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+COMBIN = ЧИСЛКОМБ
+COS = COS
+COSH = COSH
+DEGREES = ГРАДУСЫ
+EVEN = ЧЁТН
+EXP = EXP
+FACT = ФАКТР
+FACTDOUBLE = ДВФАКТР
+GCD = НОД
+INT = ЦЕЛОЕ
+LCM = НОК
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = МОПРЕД
+MINVERSE = МОБР
+MMULT = МУМНОЖ
+MOD = ОСТАТ
+MROUND = ОКРУГЛТ
+MULTINOMIAL = МУЛЬТИНОМ
+ODD = НЕЧЁТ
+PI = ПИ
+POWER = СТЕПЕНЬ
+PRODUCT = ПРОИЗВЕД
+QUOTIENT = ЧАСТНОЕ
+RADIANS = РАДИАНЫ
+RAND = СЛЧИС
+RANDBETWEEN = СЛУЧМЕЖДУ
+ROMAN = РИМСКОЕ
+ROUND = ОКРУГЛ
+ROUNDDOWN = ОКРУГЛВНИЗ
+ROUNDUP = ОКРУГЛВВЕРХ
+SERIESSUM = РЯД.СУММ
+SIGN = ЗНАК
+SIN = SIN
+SINH = SINH
+SQRT = КОРЕНЬ
+SQRTPI = КОРЕНЬПИ
+SUBTOTAL = ПРОМЕЖУТОЧНЫЕ.ИТОГИ
+SUM = СУММ
+SUMIF = СУММЕСЛИ
+SUMIFS = СУММЕСЛИМН
+SUMPRODUCT = СУММПРОИЗВ
+SUMSQ = СУММКВ
+SUMX2MY2 = СУММРАЗНКВ
+SUMX2PY2 = СУММСУММКВ
+SUMXMY2 = СУММКВРАЗН
+TAN = TAN
+TANH = TANH
+TRUNC = ОТБР
+
+##
+## Статистические функции (Statistical Functions)
+##
+AVEDEV = СРОТКЛ
+AVERAGE = СРЗНАЧ
+AVERAGEA = СРЗНАЧА
+AVERAGEIF = СРЗНАЧЕСЛИ
+AVERAGEIFS = СРЗНАЧЕСЛИМН
+CORREL = КОРРЕЛ
+COUNT = СЧЁТ
+COUNTA = СЧЁТЗ
+COUNTBLANK = СЧИТАТЬПУСТОТЫ
+COUNTIF = СЧЁТЕСЛИ
+COUNTIFS = СЧЁТЕСЛИМН
+DEVSQ = КВАДРОТКЛ
+FISHER = ФИШЕР
+FISHERINV = ФИШЕРОБР
+FREQUENCY = ЧАСТОТА
+GAMMALN = ГАММАНЛОГ
+GEOMEAN = СРГЕОМ
+GROWTH = РОСТ
+HARMEAN = СРГАРМ
+INTERCEPT = ОТРЕЗОК
+KURT = ЭКСЦЕСС
+LARGE = НАИБОЛЬШИЙ
+LINEST = ЛИНЕЙН
+LOGEST = ЛГРФПРИБЛ
+MAX = МАКС
+MAXA = МАКСА
+MEDIAN = МЕДИАНА
+MIN = МИН
+MINA = МИНА
+PEARSON = ПИРСОН
+PERMUT = ПЕРЕСТ
+PROB = ВЕРОЯТНОСТЬ
+RSQ = КВПИРСОН
+SKEW = СКОС
+SLOPE = НАКЛОН
+SMALL = НАИМЕНЬШИЙ
+STANDARDIZE = НОРМАЛИЗАЦИЯ
+STDEVA = СТАНДОТКЛОНА
+STDEVPA = СТАНДОТКЛОНПА
+STEYX = СТОШYX
+TREND = ТЕНДЕНЦИЯ
+TRIMMEAN = УРЕЗСРЕДНЕЕ
+VARA = ДИСПА
+VARPA = ДИСПРА
+
+##
+## Текстовые функции (Text Functions)
+##
+ASC = ASC
+BAHTTEXT = БАТТЕКСТ
+CHAR = СИМВОЛ
+CLEAN = ПЕЧСИМВ
+CODE = КОДСИМВ
+DOLLAR = РУБЛЬ
+EXACT = СОВПАД
+FIND = НАЙТИ
+FINDB = НАЙТИБ
+FIXED = ФИКСИРОВАННЫЙ
+LEFT = ЛЕВСИМВ
+LEFTB = ЛЕВБ
+LEN = ДЛСТР
+LENB = ДЛИНБ
+LOWER = СТРОЧН
+MID = ПСТР
+MIDB = ПСТРБ
+PHONETIC = PHONETIC
+PROPER = ПРОПНАЧ
+REPLACE = ЗАМЕНИТЬ
+REPLACEB = ЗАМЕНИТЬБ
+REPT = ПОВТОР
+RIGHT = ПРАВСИМВ
+RIGHTB = ПРАВБ
+SEARCH = ПОИСК
+SEARCHB = ПОИСКБ
+SUBSTITUTE = ПОДСТАВИТЬ
+T = Т
+TEXT = ТЕКСТ
+TRIM = СЖПРОБЕЛЫ
+UPPER = ПРОПИСН
+VALUE = ЗНАЧЕН
+
+##
+##  (Web Functions)
+##
+
+##
+##  (Compatibility Functions)
+##
+BETADIST = БЕТАРАСП
+BETAINV = БЕТАОБР
+BINOMDIST = БИНОМРАСП
+CEILING = ОКРВВЕРХ
+CHIDIST = ХИ2РАСП
+CHIINV = ХИ2ОБР
+CHITEST = ХИ2ТЕСТ
+CONCATENATE = СЦЕПИТЬ
+CONFIDENCE = ДОВЕРИТ
+COVAR = КОВАР
+CRITBINOM = КРИТБИНОМ
+EXPONDIST = ЭКСПРАСП
+FDIST = FРАСП
+FINV = FРАСПОБР
+FLOOR = ОКРВНИЗ
+FORECAST = ПРЕДСКАЗ
+FTEST = ФТЕСТ
+GAMMADIST = ГАММАРАСП
+GAMMAINV = ГАММАОБР
+HYPGEOMDIST = ГИПЕРГЕОМЕТ
+LOGINV = ЛОГНОРМОБР
+LOGNORMDIST = ЛОГНОРМРАСП
+MODE = МОДА
+NEGBINOMDIST = ОТРБИНОМРАСП
+NORMDIST = НОРМРАСП
+NORMINV = НОРМОБР
+NORMSDIST = НОРМСТРАСП
+NORMSINV = НОРМСТОБР
+PERCENTILE = ПЕРСЕНТИЛЬ
+PERCENTRANK = ПРОЦЕНТРАНГ
+POISSON = ПУАССОН
+QUARTILE = КВАРТИЛЬ
+RANK = РАНГ
+STDEV = СТАНДОТКЛОН
+STDEVP = СТАНДОТКЛОНП
+TDIST = СТЬЮДРАСП
+TINV = СТЬЮДРАСПОБР
+TTEST = ТТЕСТ
+VAR = ДИСП
+VARP = ДИСПР
+WEIBULL = ВЕЙБУЛЛ
+ZTEST = ZТЕСТ
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/config
new file mode 100644
index 00000000..49f40fcb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Ceština (Czech)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL
+DIV0 = #DĚLENÍ_NULOU!
+VALUE = #HODNOTA!
+REF = #ODKAZ!
+NAME = #NÁZEV?
+NUM = #ČÍSLO!
+NA = #NENÍ_K_DISPOZICI
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/functions
new file mode 100644
index 00000000..49c4945c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/cs/functions
@@ -0,0 +1,520 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Ceština (Czech)
+##
+############################################################
+
+
+##
+## Funkce pro práci s datovými krychlemi (Cube Functions)
+##
+CUBEKPIMEMBER = CUBEKPIMEMBER
+CUBEMEMBER = CUBEMEMBER
+CUBEMEMBERPROPERTY = CUBEMEMBERPROPERTY
+CUBERANKEDMEMBER = CUBERANKEDMEMBER
+CUBESET = CUBESET
+CUBESETCOUNT = CUBESETCOUNT
+CUBEVALUE = CUBEVALUE
+
+##
+## Funkce databáze (Database Functions)
+##
+DAVERAGE = DPRŮMĚR
+DCOUNT = DPOČET
+DCOUNTA = DPOČET2
+DGET = DZÍSKAT
+DMAX = DMAX
+DMIN = DMIN
+DPRODUCT = DSOUČIN
+DSTDEV = DSMODCH.VÝBĚR
+DSTDEVP = DSMODCH
+DSUM = DSUMA
+DVAR = DVAR.VÝBĚR
+DVARP = DVAR
+
+##
+## Funkce data a času (Date & Time Functions)
+##
+DATE = DATUM
+DATEVALUE = DATUMHODN
+DAY = DEN
+DAYS = DAYS
+DAYS360 = ROK360
+EDATE = EDATE
+EOMONTH = EOMONTH
+HOUR = HODINA
+ISOWEEKNUM = ISOWEEKNUM
+MINUTE = MINUTA
+MONTH = MĚSÍC
+NETWORKDAYS = NETWORKDAYS
+NETWORKDAYS.INTL = NETWORKDAYS.INTL
+NOW = NYNÍ
+SECOND = SEKUNDA
+TIME = ČAS
+TIMEVALUE = ČASHODN
+TODAY = DNES
+WEEKDAY = DENTÝDNE
+WEEKNUM = WEEKNUM
+WORKDAY = WORKDAY
+WORKDAY.INTL = WORKDAY.INTL
+YEAR = ROK
+YEARFRAC = YEARFRAC
+
+##
+## Inženýrské funkce (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN2DEC
+BIN2HEX = BIN2HEX
+BIN2OCT = BIN2OCT
+BITAND = BITAND
+BITLSHIFT = BITLSHIFT
+BITOR = BITOR
+BITRSHIFT = BITRSHIFT
+BITXOR = BITXOR
+COMPLEX = COMPLEX
+CONVERT = CONVERT
+DEC2BIN = DEC2BIN
+DEC2HEX = DEC2HEX
+DEC2OCT = DEC2OCT
+DELTA = DELTA
+ERF = ERF
+ERF.PRECISE = ERF.PRECISE
+ERFC = ERFC
+ERFC.PRECISE = ERFC.PRECISE
+GESTEP = GESTEP
+HEX2BIN = HEX2BIN
+HEX2DEC = HEX2DEC
+HEX2OCT = HEX2OCT
+IMABS = IMABS
+IMAGINARY = IMAGINARY
+IMARGUMENT = IMARGUMENT
+IMCONJUGATE = IMCONJUGATE
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCSC
+IMCSCH = IMCSCH
+IMDIV = IMDIV
+IMEXP = IMEXP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMPOWER
+IMPRODUCT = IMPRODUCT
+IMREAL = IMREAL
+IMSEC = IMSEC
+IMSECH = IMSECH
+IMSIN = IMSIN
+IMSINH = IMSINH
+IMSQRT = IMSQRT
+IMSUB = IMSUB
+IMSUM = IMSUM
+IMTAN = IMTAN
+OCT2BIN = OCT2BIN
+OCT2DEC = OCT2DEC
+OCT2HEX = OCT2HEX
+
+##
+## Finanční funkce (Financial Functions)
+##
+ACCRINT = ACCRINT
+ACCRINTM = ACCRINTM
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = COUPDAYBS
+COUPDAYS = COUPDAYS
+COUPDAYSNC = COUPDAYSNC
+COUPNCD = COUPNCD
+COUPNUM = COUPNUM
+COUPPCD = COUPPCD
+CUMIPMT = CUMIPMT
+CUMPRINC = CUMPRINC
+DB = ODPIS.ZRYCH
+DDB = ODPIS.ZRYCH2
+DISC = DISC
+DOLLARDE = DOLLARDE
+DOLLARFR = DOLLARFR
+DURATION = DURATION
+EFFECT = EFFECT
+FV = BUDHODNOTA
+FVSCHEDULE = FVSCHEDULE
+INTRATE = INTRATE
+IPMT = PLATBA.ÚROK
+IRR = MÍRA.VÝNOSNOSTI
+ISPMT = ISPMT
+MDURATION = MDURATION
+MIRR = MOD.MÍRA.VÝNOSNOSTI
+NOMINAL = NOMINAL
+NPER = POČET.OBDOBÍ
+NPV = ČISTÁ.SOUČHODNOTA
+ODDFPRICE = ODDFPRICE
+ODDFYIELD = ODDFYIELD
+ODDLPRICE = ODDLPRICE
+ODDLYIELD = ODDLYIELD
+PDURATION = PDURATION
+PMT = PLATBA
+PPMT = PLATBA.ZÁKLAD
+PRICE = PRICE
+PRICEDISC = PRICEDISC
+PRICEMAT = PRICEMAT
+PV = SOUČHODNOTA
+RATE = ÚROKOVÁ.MÍRA
+RECEIVED = RECEIVED
+RRI = RRI
+SLN = ODPIS.LIN
+SYD = ODPIS.NELIN
+TBILLEQ = TBILLEQ
+TBILLPRICE = TBILLPRICE
+TBILLYIELD = TBILLYIELD
+VDB = ODPIS.ZA.INT
+XIRR = XIRR
+XNPV = XNPV
+YIELD = YIELD
+YIELDDISC = YIELDDISC
+YIELDMAT = YIELDMAT
+
+##
+## Informační funkce (Information Functions)
+##
+CELL = POLÍČKO
+ERROR.TYPE = CHYBA.TYP
+INFO = O.PROSTŘEDÍ
+ISBLANK = JE.PRÁZDNÉ
+ISERR = JE.CHYBA
+ISERROR = JE.CHYBHODN
+ISEVEN = ISEVEN
+ISFORMULA = ISFORMULA
+ISLOGICAL = JE.LOGHODN
+ISNA = JE.NEDEF
+ISNONTEXT = JE.NETEXT
+ISNUMBER = JE.ČISLO
+ISODD = ISODD
+ISREF = JE.ODKAZ
+ISTEXT = JE.TEXT
+N = N
+NA = NEDEF
+SHEET = SHEET
+SHEETS = SHEETS
+TYPE = TYP
+
+##
+## Logické funkce (Logical Functions)
+##
+AND = A
+FALSE = NEPRAVDA
+IF = KDYŽ
+IFERROR = IFERROR
+IFNA = IFNA
+IFS = IFS
+NOT = NE
+OR = NEBO
+SWITCH = SWITCH
+TRUE = PRAVDA
+XOR = XOR
+
+##
+## Vyhledávací funkce a funkce pro odkazy (Lookup & Reference Functions)
+##
+ADDRESS = ODKAZ
+AREAS = POČET.BLOKŮ
+CHOOSE = ZVOLIT
+COLUMN = SLOUPEC
+COLUMNS = SLOUPCE
+FORMULATEXT = FORMULATEXT
+GETPIVOTDATA = ZÍSKATKONTDATA
+HLOOKUP = VVYHLEDAT
+HYPERLINK = HYPERTEXTOVÝ.ODKAZ
+INDEX = INDEX
+INDIRECT = NEPŘÍMÝ.ODKAZ
+LOOKUP = VYHLEDAT
+MATCH = POZVYHLEDAT
+OFFSET = POSUN
+ROW = ŘÁDEK
+ROWS = ŘÁDKY
+RTD = RTD
+TRANSPOSE = TRANSPOZICE
+VLOOKUP = SVYHLEDAT
+
+##
+## Matematické a trigonometrické funkce (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGGREGATE
+ARABIC = ARABIC
+ASIN = ARCSIN
+ASINH = ARCSINH
+ATAN = ARCTG
+ATAN2 = ARCTG2
+ATANH = ARCTGH
+BASE = BASE
+CEILING.MATH = CEILING.MATH
+COMBIN = KOMBINACE
+COMBINA = COMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = DEGREES
+EVEN = ZAOKROUHLIT.NA.SUDÉ
+EXP = EXP
+FACT = FAKTORIÁL
+FACTDOUBLE = FACTDOUBLE
+FLOOR.MATH = FLOOR.MATH
+GCD = GCD
+INT = CELÁ.ČÁST
+LCM = LCM
+LN = LN
+LOG = LOGZ
+LOG10 = LOG
+MDETERM = DETERMINANT
+MINVERSE = INVERZE
+MMULT = SOUČIN.MATIC
+MOD = MOD
+MROUND = MROUND
+MULTINOMIAL = MULTINOMIAL
+MUNIT = MUNIT
+ODD = ZAOKROUHLIT.NA.LICHÉ
+PI = PI
+POWER = POWER
+PRODUCT = SOUČIN
+QUOTIENT = QUOTIENT
+RADIANS = RADIANS
+RAND = NÁHČÍSLO
+RANDBETWEEN = RANDBETWEEN
+ROMAN = ROMAN
+ROUND = ZAOKROUHLIT
+ROUNDDOWN = ROUNDDOWN
+ROUNDUP = ROUNDUP
+SEC = SEC
+SECH = SECH
+SERIESSUM = SERIESSUM
+SIGN = SIGN
+SIN = SIN
+SINH = SINH
+SQRT = ODMOCNINA
+SQRTPI = SQRTPI
+SUBTOTAL = SUBTOTAL
+SUM = SUMA
+SUMIF = SUMIF
+SUMIFS = SUMIFS
+SUMPRODUCT = SOUČIN.SKALÁRNÍ
+SUMSQ = SUMA.ČTVERCŮ
+SUMX2MY2 = SUMX2MY2
+SUMX2PY2 = SUMX2PY2
+SUMXMY2 = SUMXMY2
+TAN = TG
+TANH = TGH
+TRUNC = USEKNOUT
+
+##
+## Statistické funkce (Statistical Functions)
+##
+AVEDEV = PRŮMODCHYLKA
+AVERAGE = PRŮMĚR
+AVERAGEA = AVERAGEA
+AVERAGEIF = AVERAGEIF
+AVERAGEIFS = AVERAGEIFS
+BETA.DIST = BETA.DIST
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.DIST
+BINOM.DIST.RANGE = BINOM.DIST.RANGE
+BINOM.INV = BINOM.INV
+CHISQ.DIST = CHISQ.DIST
+CHISQ.DIST.RT = CHISQ.DIST.RT
+CHISQ.INV = CHISQ.INV
+CHISQ.INV.RT = CHISQ.INV.RT
+CHISQ.TEST = CHISQ.TEST
+CONFIDENCE.NORM = CONFIDENCE.NORM
+CONFIDENCE.T = CONFIDENCE.T
+CORREL = CORREL
+COUNT = POČET
+COUNTA = POČET2
+COUNTBLANK = COUNTBLANK
+COUNTIF = COUNTIF
+COUNTIFS = COUNTIFS
+COVARIANCE.P = COVARIANCE.P
+COVARIANCE.S = COVARIANCE.S
+DEVSQ = DEVSQ
+EXPON.DIST = EXPON.DIST
+F.DIST = F.DIST
+F.DIST.RT = F.DIST.RT
+F.INV = F.INV
+F.INV.RT = F.INV.RT
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = FORECAST.ETS
+FORECAST.ETS.CONFINT = FORECAST.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = FORECAST.ETS.SEASONALITY
+FORECAST.ETS.STAT = FORECAST.ETS.STAT
+FORECAST.LINEAR = FORECAST.LINEAR
+FREQUENCY = ČETNOSTI
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.DIST
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.PRECISE
+GAUSS = GAUSS
+GEOMEAN = GEOMEAN
+GROWTH = LOGLINTREND
+HARMEAN = HARMEAN
+HYPGEOM.DIST = HYPGEOM.DIST
+INTERCEPT = INTERCEPT
+KURT = KURT
+LARGE = LARGE
+LINEST = LINREGRESE
+LOGEST = LOGLINREGRESE
+LOGNORM.DIST = LOGNORM.DIST
+LOGNORM.INV = LOGNORM.INV
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAXIFS
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINA
+MINIFS = MINIFS
+MODE.MULT = MODE.MULT
+MODE.SNGL = MODE.SNGL
+NEGBINOM.DIST = NEGBINOM.DIST
+NORM.DIST = NORM.DIST
+NORM.INV = NORM.INV
+NORM.S.DIST = NORM.S.DIST
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXC
+PERCENTILE.INC = PERCENTIL.INC
+PERCENTRANK.EXC = PERCENTRANK.EXC
+PERCENTRANK.INC = PERCENTRANK.INC
+PERMUT = PERMUTACE
+PERMUTATIONA = PERMUTATIONA
+PHI = PHI
+POISSON.DIST = POISSON.DIST
+PROB = PROB
+QUARTILE.EXC = QUARTIL.EXC
+QUARTILE.INC = QUARTIL.INC
+RANK.AVG = RANK.AVG
+RANK.EQ = RANK.EQ
+RSQ = RKQ
+SKEW = SKEW
+SKEW.P = SKEW.P
+SLOPE = SLOPE
+SMALL = SMALL
+STANDARDIZE = STANDARDIZE
+STDEV.P = SMODCH.P
+STDEV.S = SMODCH.VÝBĚR.S
+STDEVA = STDEVA
+STDEVPA = STDEVPA
+STEYX = STEYX
+T.DIST = T.DIST
+T.DIST.2T = T.DIST.2T
+T.DIST.RT = T.DIST.RT
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = LINTREND
+TRIMMEAN = TRIMMEAN
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.DIST
+Z.TEST = Z.TEST
+
+##
+## Textové funkce (Text Functions)
+##
+BAHTTEXT = BAHTTEXT
+CHAR = ZNAK
+CLEAN = VYČISTIT
+CODE = KÓD
+CONCAT = CONCAT
+DOLLAR = KČ
+EXACT = STEJNÉ
+FIND = NAJÍT
+FIXED = ZAOKROUHLIT.NA.TEXT
+LEFT = ZLEVA
+LEN = DÉLKA
+LOWER = MALÁ
+MID = ČÁST
+NUMBERVALUE = NUMBERVALUE
+PHONETIC = ZVUKOVÉ
+PROPER = VELKÁ2
+REPLACE = NAHRADIT
+REPT = OPAKOVAT
+RIGHT = ZPRAVA
+SEARCH = HLEDAT
+SUBSTITUTE = DOSADIT
+T = T
+TEXT = HODNOTA.NA.TEXT
+TEXTJOIN = TEXTJOIN
+TRIM = PROČISTIT
+UNICHAR = UNICHAR
+UNICODE = UNICODE
+UPPER = VELKÁ
+VALUE = HODNOTA
+
+##
+## Webové funkce (Web Functions)
+##
+ENCODEURL = ENCODEURL
+FILTERXML = FILTERXML
+WEBSERVICE = WEBSERVICE
+
+##
+## Funkce pro kompatibilitu (Compatibility Functions)
+##
+BETADIST = BETADIST
+BETAINV = BETAINV
+BINOMDIST = BINOMDIST
+CEILING = ZAOKR.NAHORU
+CHIDIST = CHIDIST
+CHIINV = CHIINV
+CHITEST = CHITEST
+CONCATENATE = CONCATENATE
+CONFIDENCE = CONFIDENCE
+COVAR = COVAR
+CRITBINOM = CRITBINOM
+EXPONDIST = EXPONDIST
+FDIST = FDIST
+FINV = FINV
+FLOOR = ZAOKR.DOLŮ
+FORECAST = FORECAST
+FTEST = FTEST
+GAMMADIST = GAMMADIST
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOMDIST
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMDIST
+MODE = MODE
+NEGBINOMDIST = NEGBINOMDIST
+NORMDIST = NORMDIST
+NORMINV = NORMINV
+NORMSDIST = NORMSDIST
+NORMSINV = NORMSINV
+PERCENTILE = PERCENTIL
+PERCENTRANK = PERCENTRANK
+POISSON = POISSON
+QUARTILE = QUARTIL
+RANK = RANK
+STDEV = SMODCH.VÝBĚR
+STDEVP = SMODCH
+TDIST = TDIST
+TINV = TINV
+TTEST = TTEST
+VAR = VAR.VÝBĚR
+VARP = VAR
+WEIBULL = WEIBULL
+ZTEST = ZTEST
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/config
new file mode 100644
index 00000000..284b2490
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Dansk (Danish)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #NUL!
+DIV0
+VALUE = #VÆRDI!
+REF = #REFERENCE!
+NAME = #NAVN?
+NUM
+NA = #I/T
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions
new file mode 100644
index 00000000..03b68c9b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions
@@ -0,0 +1,538 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Dansk (Danish)
+##
+############################################################
+
+
+##
+## Kubefunktioner (Cube Functions)
+##
+CUBEKPIMEMBER = KUBE.KPI.MEDLEM
+CUBEMEMBER = KUBEMEDLEM
+CUBEMEMBERPROPERTY = KUBEMEDLEM.EGENSKAB
+CUBERANKEDMEMBER = KUBERANGERET.MEDLEM
+CUBESET = KUBESÆT
+CUBESETCOUNT = KUBESÆT.ANTAL
+CUBEVALUE = KUBEVÆRDI
+
+##
+## Databasefunktioner (Database Functions)
+##
+DAVERAGE = DMIDDEL
+DCOUNT = DTÆL
+DCOUNTA = DTÆLV
+DGET = DHENT
+DMAX = DMAKS
+DMIN = DMIN
+DPRODUCT = DPRODUKT
+DSTDEV = DSTDAFV
+DSTDEVP = DSTDAFVP
+DSUM = DSUM
+DVAR = DVARIANS
+DVARP = DVARIANSP
+
+##
+## Dato- og klokkeslætfunktioner (Date & Time Functions)
+##
+DATE = DATO
+DATEDIF = DATO.FORSKEL
+DATESTRING = DATOSTRENG
+DATEVALUE = DATOVÆRDI
+DAY = DAG
+DAYS = DAGE
+DAYS360 = DAGE360
+EDATE = EDATO
+EOMONTH = SLUT.PÅ.MÅNED
+HOUR = TIME
+ISOWEEKNUM = ISOUGE.NR
+MINUTE = MINUT
+MONTH = MÅNED
+NETWORKDAYS = ANTAL.ARBEJDSDAGE
+NETWORKDAYS.INTL = ANTAL.ARBEJDSDAGE.INTL
+NOW = NU
+SECOND = SEKUND
+THAIDAYOFWEEK = THAILANDSKUGEDAG
+THAIMONTHOFYEAR = THAILANDSKMÅNED
+THAIYEAR = THAILANDSKÅR
+TIME = TID
+TIMEVALUE = TIDSVÆRDI
+TODAY = IDAG
+WEEKDAY = UGEDAG
+WEEKNUM = UGE.NR
+WORKDAY = ARBEJDSDAG
+WORKDAY.INTL = ARBEJDSDAG.INTL
+YEAR = ÅR
+YEARFRAC = ÅR.BRØK
+
+##
+## Tekniske funktioner (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN.TIL.DEC
+BIN2HEX = BIN.TIL.HEX
+BIN2OCT = BIN.TIL.OKT
+BITAND = BITOG
+BITLSHIFT = BITLSKIFT
+BITOR = BITELLER
+BITRSHIFT = BITRSKIFT
+BITXOR = BITXELLER
+COMPLEX = KOMPLEKS
+CONVERT = KONVERTER
+DEC2BIN = DEC.TIL.BIN
+DEC2HEX = DEC.TIL.HEX
+DEC2OCT = DEC.TIL.OKT
+DELTA = DELTA
+ERF = FEJLFUNK
+ERF.PRECISE = ERF.PRECISE
+ERFC = FEJLFUNK.KOMP
+ERFC.PRECISE = ERFC.PRECISE
+GESTEP = GETRIN
+HEX2BIN = HEX.TIL.BIN
+HEX2DEC = HEX.TIL.DEC
+HEX2OCT = HEX.TIL.OKT
+IMABS = IMAGABS
+IMAGINARY = IMAGINÆR
+IMARGUMENT = IMAGARGUMENT
+IMCONJUGATE = IMAGKONJUGERE
+IMCOS = IMAGCOS
+IMCOSH = IMAGCOSH
+IMCOT = IMAGCOT
+IMCSC = IMAGCSC
+IMCSCH = IMAGCSCH
+IMDIV = IMAGDIV
+IMEXP = IMAGEKSP
+IMLN = IMAGLN
+IMLOG10 = IMAGLOG10
+IMLOG2 = IMAGLOG2
+IMPOWER = IMAGPOTENS
+IMPRODUCT = IMAGPRODUKT
+IMREAL = IMAGREELT
+IMSEC = IMAGSEC
+IMSECH = IMAGSECH
+IMSIN = IMAGSIN
+IMSINH = IMAGSINH
+IMSQRT = IMAGKVROD
+IMSUB = IMAGSUB
+IMSUM = IMAGSUM
+IMTAN = IMAGTAN
+OCT2BIN = OKT.TIL.BIN
+OCT2DEC = OKT.TIL.DEC
+OCT2HEX = OKT.TIL.HEX
+
+##
+## Finansielle funktioner (Financial Functions)
+##
+ACCRINT = PÅLØBRENTE
+ACCRINTM = PÅLØBRENTE.UDLØB
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = KUPONDAGE.SA
+COUPDAYS = KUPONDAGE.A
+COUPDAYSNC = KUPONDAGE.ANK
+COUPNCD = KUPONDAG.NÆSTE
+COUPNUM = KUPONBETALINGER
+COUPPCD = KUPONDAG.FORRIGE
+CUMIPMT = AKKUM.RENTE
+CUMPRINC = AKKUM.HOVEDSTOL
+DB = DB
+DDB = DSA
+DISC = DISKONTO
+DOLLARDE = KR.DECIMAL
+DOLLARFR = KR.BRØK
+DURATION = VARIGHED
+EFFECT = EFFEKTIV.RENTE
+FV = FV
+FVSCHEDULE = FVTABEL
+INTRATE = RENTEFOD
+IPMT = R.YDELSE
+IRR = IA
+ISPMT = ISPMT
+MDURATION = MVARIGHED
+MIRR = MIA
+NOMINAL = NOMINEL
+NPER = NPER
+NPV = NUTIDSVÆRDI
+ODDFPRICE = ULIGE.KURS.PÅLYDENDE
+ODDFYIELD = ULIGE.FØRSTE.AFKAST
+ODDLPRICE = ULIGE.SIDSTE.KURS
+ODDLYIELD = ULIGE.SIDSTE.AFKAST
+PDURATION = PVARIGHED
+PMT = YDELSE
+PPMT = H.YDELSE
+PRICE = KURS
+PRICEDISC = KURS.DISKONTO
+PRICEMAT = KURS.UDLØB
+PV = NV
+RATE = RENTE
+RECEIVED = MODTAGET.VED.UDLØB
+RRI = RRI
+SLN = LA
+SYD = ÅRSAFSKRIVNING
+TBILLEQ = STATSOBLIGATION
+TBILLPRICE = STATSOBLIGATION.KURS
+TBILLYIELD = STATSOBLIGATION.AFKAST
+VDB = VSA
+XIRR = INTERN.RENTE
+XNPV = NETTO.NUTIDSVÆRDI
+YIELD = AFKAST
+YIELDDISC = AFKAST.DISKONTO
+YIELDMAT = AFKAST.UDLØBSDATO
+
+##
+## Informationsfunktioner (Information Functions)
+##
+CELL = CELLE
+ERROR.TYPE = FEJLTYPE
+INFO = INFO
+ISBLANK = ER.TOM
+ISERR = ER.FJL
+ISERROR = ER.FEJL
+ISEVEN = ER.LIGE
+ISFORMULA = ER.FORMEL
+ISLOGICAL = ER.LOGISK
+ISNA = ER.IKKE.TILGÆNGELIG
+ISNONTEXT = ER.IKKE.TEKST
+ISNUMBER = ER.TAL
+ISODD = ER.ULIGE
+ISREF = ER.REFERENCE
+ISTEXT = ER.TEKST
+N = TAL
+NA = IKKE.TILGÆNGELIG
+SHEET = ARK
+SHEETS = ARK.FLERE
+TYPE = VÆRDITYPE
+
+##
+## Logiske funktioner (Logical Functions)
+##
+AND = OG
+FALSE = FALSK
+IF = HVIS
+IFERROR = HVIS.FEJL
+IFNA = HVISIT
+IFS = HVISER
+NOT = IKKE
+OR = ELLER
+SWITCH = SKIFT
+TRUE = SAND
+XOR = XELLER
+
+##
+## Opslags- og referencefunktioner (Lookup & Reference Functions)
+##
+ADDRESS = ADRESSE
+AREAS = OMRÅDER
+CHOOSE = VÆLG
+COLUMN = KOLONNE
+COLUMNS = KOLONNER
+FORMULATEXT = FORMELTEKST
+GETPIVOTDATA = GETPIVOTDATA
+HLOOKUP = VOPSLAG
+HYPERLINK = HYPERLINK
+INDEX = INDEKS
+INDIRECT = INDIREKTE
+LOOKUP = SLÅ.OP
+MATCH = SAMMENLIGN
+OFFSET = FORSKYDNING
+ROW = RÆKKE
+ROWS = RÆKKER
+RTD = RTD
+TRANSPOSE = TRANSPONER
+VLOOKUP = LOPSLAG
+*RC = RK
+
+##
+## Matematiske og trigonometriske funktioner (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ARCCOT
+ACOTH = ARCCOTH
+AGGREGATE = SAMLING
+ARABIC = ARABISK
+ASIN = ARCSIN
+ASINH = ARCSINH
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ARCTANH
+BASE = BASIS
+CEILING.MATH = LOFT.MAT
+CEILING.PRECISE = LOFT.PRECISE
+COMBIN = KOMBIN
+COMBINA = KOMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = GRADER
+ECMA.CEILING = ECMA.LOFT
+EVEN = LIGE
+EXP = EKSP
+FACT = FAKULTET
+FACTDOUBLE = DOBBELT.FAKULTET
+FLOOR.MATH = AFRUND.BUND.MAT
+FLOOR.PRECISE = AFRUND.GULV.PRECISE
+GCD = STØRSTE.FÆLLES.DIVISOR
+INT = HELTAL
+ISO.CEILING = ISO.LOFT
+LCM = MINDSTE.FÆLLES.MULTIPLUM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MINVERT
+MMULT = MPRODUKT
+MOD = REST
+MROUND = MAFRUND
+MULTINOMIAL = MULTINOMIAL
+MUNIT = MENHED
+ODD = ULIGE
+PI = PI
+POWER = POTENS
+PRODUCT = PRODUKT
+QUOTIENT = KVOTIENT
+RADIANS = RADIANER
+RAND = SLUMP
+RANDBETWEEN = SLUMPMELLEM
+ROMAN = ROMERTAL
+ROUND = AFRUND
+ROUNDBAHTDOWN = RUNDBAHTNED
+ROUNDBAHTUP = RUNDBAHTOP
+ROUNDDOWN = RUND.NED
+ROUNDUP = RUND.OP
+SEC = SEC
+SECH = SECH
+SERIESSUM = SERIESUM
+SIGN = FORTEGN
+SIN = SIN
+SINH = SINH
+SQRT = KVROD
+SQRTPI = KVRODPI
+SUBTOTAL = SUBTOTAL
+SUM = SUM
+SUMIF = SUM.HVIS
+SUMIFS = SUM.HVISER
+SUMPRODUCT = SUMPRODUKT
+SUMSQ = SUMKV
+SUMX2MY2 = SUMX2MY2
+SUMX2PY2 = SUMX2PY2
+SUMXMY2 = SUMXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = AFKORT
+
+##
+## Statistiske funktioner (Statistical Functions)
+##
+AVEDEV = MAD
+AVERAGE = MIDDEL
+AVERAGEA = MIDDELV
+AVERAGEIF = MIDDEL.HVIS
+AVERAGEIFS = MIDDEL.HVISER
+BETA.DIST = BETA.FORDELING
+BETA.INV = BETA.INV
+BINOM.DIST = BINOMIAL.FORDELING
+BINOM.DIST.RANGE = BINOMIAL.DIST.INTERVAL
+BINOM.INV = BINOMIAL.INV
+CHISQ.DIST = CHI2.FORDELING
+CHISQ.DIST.RT = CHI2.FORD.RT
+CHISQ.INV = CHI2.INV
+CHISQ.INV.RT = CHI2.INV.RT
+CHISQ.TEST = CHI2.TEST
+CONFIDENCE.NORM = KONFIDENS.NORM
+CONFIDENCE.T = KONFIDENST
+CORREL = KORRELATION
+COUNT = TÆL
+COUNTA = TÆLV
+COUNTBLANK = ANTAL.BLANKE
+COUNTIF = TÆL.HVIS
+COUNTIFS = TÆL.HVISER
+COVARIANCE.P = KOVARIANS.P
+COVARIANCE.S = KOVARIANS.S
+DEVSQ = SAK
+EXPON.DIST = EKSP.FORDELING
+F.DIST = F.FORDELING
+F.DIST.RT = F.FORDELING.RT
+F.INV = F.INV
+F.INV.RT = F.INV.RT
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PROGNOSE.ETS
+FORECAST.ETS.CONFINT = PROGNOSE.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PROGNOSE.ETS.SÆSONUDSVING
+FORECAST.ETS.STAT = PROGNOSE.ETS.STAT
+FORECAST.LINEAR = PROGNOSE.LINEÆR
+FREQUENCY = FREKVENS
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.FORDELING
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.PRECISE
+GAUSS = GAUSS
+GEOMEAN = GEOMIDDELVÆRDI
+GROWTH = FORØGELSE
+HARMEAN = HARMIDDELVÆRDI
+HYPGEOM.DIST = HYPGEO.FORDELING
+INTERCEPT = SKÆRING
+KURT = TOPSTEJL
+LARGE = STØRSTE
+LINEST = LINREGR
+LOGEST = LOGREGR
+LOGNORM.DIST = LOGNORM.FORDELING
+LOGNORM.INV = LOGNORM.INV
+MAX = MAKS
+MAXA = MAKSV
+MAXIFS = MAKSHVISER
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINV
+MINIFS = MINHVISER
+MODE.MULT = HYPPIGST.FLERE
+MODE.SNGL = HYPPIGST.ENKELT
+NEGBINOM.DIST = NEGBINOM.FORDELING
+NORM.DIST = NORMAL.FORDELING
+NORM.INV = NORM.INV
+NORM.S.DIST = STANDARD.NORM.FORDELING
+NORM.S.INV = STANDARD.NORM.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = FRAKTIL.UDELAD
+PERCENTILE.INC = FRAKTIL.MEDTAG
+PERCENTRANK.EXC = PROCENTPLADS.UDELAD
+PERCENTRANK.INC = PROCENTPLADS.MEDTAG
+PERMUT = PERMUT
+PERMUTATIONA = PERMUTATIONA
+PHI = PHI
+POISSON.DIST = POISSON.FORDELING
+PROB = SANDSYNLIGHED
+QUARTILE.EXC = KVARTIL.UDELAD
+QUARTILE.INC = KVARTIL.MEDTAG
+RANK.AVG = PLADS.GNSN
+RANK.EQ = PLADS.LIGE
+RSQ = FORKLARINGSGRAD
+SKEW = SKÆVHED
+SKEW.P = SKÆVHED.P
+SLOPE = STIGNING
+SMALL = MINDSTE
+STANDARDIZE = STANDARDISER
+STDEV.P = STDAFV.P
+STDEV.S = STDAFV.S
+STDEVA = STDAFVV
+STDEVPA = STDAFVPV
+STEYX = STFYX
+T.DIST = T.FORDELING
+T.DIST.2T = T.FORDELING.2T
+T.DIST.RT = T.FORDELING.RT
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = TENDENS
+TRIMMEAN = TRIMMIDDELVÆRDI
+VAR.P = VARIANS.P
+VAR.S = VARIANS.S
+VARA = VARIANSV
+VARPA = VARIANSPV
+WEIBULL.DIST = WEIBULL.FORDELING
+Z.TEST = Z.TEST
+
+##
+## Tekstfunktioner (Text Functions)
+##
+BAHTTEXT = BAHTTEKST
+CHAR = TEGN
+CLEAN = RENS
+CODE = KODE
+CONCAT = CONCAT
+DOLLAR = KR
+EXACT = EKSAKT
+FIND = FIND
+FIXED = FAST
+ISTHAIDIGIT = ERTHAILANDSKCIFFER
+LEFT = VENSTRE
+LEN = LÆNGDE
+LOWER = SMÅ.BOGSTAVER
+MID = MIDT
+NUMBERSTRING = TALSTRENG
+NUMBERVALUE = TALVÆRDI
+PHONETIC = FONETISK
+PROPER = STORT.FORBOGSTAV
+REPLACE = ERSTAT
+REPT = GENTAG
+RIGHT = HØJRE
+SEARCH = SØG
+SUBSTITUTE = UDSKIFT
+T = T
+TEXT = TEKST
+TEXTJOIN = TEKST.KOMBINER
+THAIDIGIT = THAILANDSKCIFFER
+THAINUMSOUND = THAILANDSKNUMLYD
+THAINUMSTRING = THAILANDSKNUMSTRENG
+THAISTRINGLENGTH = THAILANDSKSTRENGLÆNGDE
+TRIM = FJERN.OVERFLØDIGE.BLANKE
+UNICHAR = UNICHAR
+UNICODE = UNICODE
+UPPER = STORE.BOGSTAVER
+VALUE = VÆRDI
+
+##
+## Webfunktioner (Web Functions)
+##
+ENCODEURL = KODNINGSURL
+FILTERXML = FILTRERXML
+WEBSERVICE = WEBTJENESTE
+
+##
+## Kompatibilitetsfunktioner (Compatibility Functions)
+##
+BETADIST = BETAFORDELING
+BETAINV = BETAINV
+BINOMDIST = BINOMIALFORDELING
+CEILING = AFRUND.LOFT
+CHIDIST = CHIFORDELING
+CHIINV = CHIINV
+CHITEST = CHITEST
+CONCATENATE = SAMMENKÆDNING
+CONFIDENCE = KONFIDENSINTERVAL
+COVAR = KOVARIANS
+CRITBINOM = KRITBINOM
+EXPONDIST = EKSPFORDELING
+FDIST = FFORDELING
+FINV = FINV
+FLOOR = AFRUND.GULV
+FORECAST = PROGNOSE
+FTEST = FTEST
+GAMMADIST = GAMMAFORDELING
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOFORDELING
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMFORDELING
+MODE = HYPPIGST
+NEGBINOMDIST = NEGBINOMFORDELING
+NORMDIST = NORMFORDELING
+NORMINV = NORMINV
+NORMSDIST = STANDARDNORMFORDELING
+NORMSINV = STANDARDNORMINV
+PERCENTILE = FRAKTIL
+PERCENTRANK = PROCENTPLADS
+POISSON = POISSON
+QUARTILE = KVARTIL
+RANK = PLADS
+STDEV = STDAFV
+STDEVP = STDAFVP
+TDIST = TFORDELING
+TINV = TINV
+TTEST = TTEST
+VAR = VARIANS
+VARP = VARIANSP
+WEIBULL = WEIBULL
+ZTEST = ZTEST
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/config
new file mode 100644
index 00000000..4ca2b82b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Deutsch (German)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL
+DIV0
+VALUE = #WERT!
+REF = #BEZUG!
+NAME
+NUM = #ZAHL!
+NA = #NV
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions
new file mode 100644
index 00000000..d49fc5f1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions
@@ -0,0 +1,534 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Deutsch (German)
+##
+############################################################
+
+
+##
+## Cubefunktionen (Cube Functions)
+##
+CUBEKPIMEMBER = CUBEKPIELEMENT
+CUBEMEMBER = CUBEELEMENT
+CUBEMEMBERPROPERTY = CUBEELEMENTEIGENSCHAFT
+CUBERANKEDMEMBER = CUBERANGELEMENT
+CUBESET = CUBEMENGE
+CUBESETCOUNT = CUBEMENGENANZAHL
+CUBEVALUE = CUBEWERT
+
+##
+## Datenbankfunktionen (Database Functions)
+##
+DAVERAGE = DBMITTELWERT
+DCOUNT = DBANZAHL
+DCOUNTA = DBANZAHL2
+DGET = DBAUSZUG
+DMAX = DBMAX
+DMIN = DBMIN
+DPRODUCT = DBPRODUKT
+DSTDEV = DBSTDABW
+DSTDEVP = DBSTDABWN
+DSUM = DBSUMME
+DVAR = DBVARIANZ
+DVARP = DBVARIANZEN
+
+##
+## Datums- und Uhrzeitfunktionen (Date & Time Functions)
+##
+DATE = DATUM
+DATEVALUE = DATWERT
+DAY = TAG
+DAYS = TAGE
+DAYS360 = TAGE360
+EDATE = EDATUM
+EOMONTH = MONATSENDE
+HOUR = STUNDE
+ISOWEEKNUM = ISOKALENDERWOCHE
+MINUTE = MINUTE
+MONTH = MONAT
+NETWORKDAYS = NETTOARBEITSTAGE
+NETWORKDAYS.INTL = NETTOARBEITSTAGE.INTL
+NOW = JETZT
+SECOND = SEKUNDE
+THAIDAYOFWEEK = THAIWOCHENTAG
+THAIMONTHOFYEAR = THAIMONATDESJAHRES
+THAIYEAR = THAIJAHR
+TIME = ZEIT
+TIMEVALUE = ZEITWERT
+TODAY = HEUTE
+WEEKDAY = WOCHENTAG
+WEEKNUM = KALENDERWOCHE
+WORKDAY = ARBEITSTAG
+WORKDAY.INTL = ARBEITSTAG.INTL
+YEAR = JAHR
+YEARFRAC = BRTEILJAHRE
+
+##
+## Technische Funktionen (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BININDEZ
+BIN2HEX = BININHEX
+BIN2OCT = BININOKT
+BITAND = BITUND
+BITLSHIFT = BITLVERSCHIEB
+BITOR = BITODER
+BITRSHIFT = BITRVERSCHIEB
+BITXOR = BITXODER
+COMPLEX = KOMPLEXE
+CONVERT = UMWANDELN
+DEC2BIN = DEZINBIN
+DEC2HEX = DEZINHEX
+DEC2OCT = DEZINOKT
+DELTA = DELTA
+ERF = GAUSSFEHLER
+ERF.PRECISE = GAUSSF.GENAU
+ERFC = GAUSSFKOMPL
+ERFC.PRECISE = GAUSSFKOMPL.GENAU
+GESTEP = GGANZZAHL
+HEX2BIN = HEXINBIN
+HEX2DEC = HEXINDEZ
+HEX2OCT = HEXINOKT
+IMABS = IMABS
+IMAGINARY = IMAGINÄRTEIL
+IMARGUMENT = IMARGUMENT
+IMCONJUGATE = IMKONJUGIERTE
+IMCOS = IMCOS
+IMCOSH = IMCOSHYP
+IMCOT = IMCOT
+IMCSC = IMCOSEC
+IMCSCH = IMCOSECHYP
+IMDIV = IMDIV
+IMEXP = IMEXP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMAPOTENZ
+IMPRODUCT = IMPRODUKT
+IMREAL = IMREALTEIL
+IMSEC = IMSEC
+IMSECH = IMSECHYP
+IMSIN = IMSIN
+IMSINH = IMSINHYP
+IMSQRT = IMWURZEL
+IMSUB = IMSUB
+IMSUM = IMSUMME
+IMTAN = IMTAN
+OCT2BIN = OKTINBIN
+OCT2DEC = OKTINDEZ
+OCT2HEX = OKTINHEX
+
+##
+## Finanzmathematische Funktionen (Financial Functions)
+##
+ACCRINT = AUFGELZINS
+ACCRINTM = AUFGELZINSF
+AMORDEGRC = AMORDEGRK
+AMORLINC = AMORLINEARK
+COUPDAYBS = ZINSTERMTAGVA
+COUPDAYS = ZINSTERMTAGE
+COUPDAYSNC = ZINSTERMTAGNZ
+COUPNCD = ZINSTERMNZ
+COUPNUM = ZINSTERMZAHL
+COUPPCD = ZINSTERMVZ
+CUMIPMT = KUMZINSZ
+CUMPRINC = KUMKAPITAL
+DB = GDA2
+DDB = GDA
+DISC = DISAGIO
+DOLLARDE = NOTIERUNGDEZ
+DOLLARFR = NOTIERUNGBRU
+DURATION = DURATION
+EFFECT = EFFEKTIV
+FV = ZW
+FVSCHEDULE = ZW2
+INTRATE = ZINSSATZ
+IPMT = ZINSZ
+IRR = IKV
+ISPMT = ISPMT
+MDURATION = MDURATION
+MIRR = QIKV
+NOMINAL = NOMINAL
+NPER = ZZR
+NPV = NBW
+ODDFPRICE = UNREGER.KURS
+ODDFYIELD = UNREGER.REND
+ODDLPRICE = UNREGLE.KURS
+ODDLYIELD = UNREGLE.REND
+PDURATION = PDURATION
+PMT = RMZ
+PPMT = KAPZ
+PRICE = KURS
+PRICEDISC = KURSDISAGIO
+PRICEMAT = KURSFÄLLIG
+PV = BW
+RATE = ZINS
+RECEIVED = AUSZAHLUNG
+RRI = ZSATZINVEST
+SLN = LIA
+SYD = DIA
+TBILLEQ = TBILLÄQUIV
+TBILLPRICE = TBILLKURS
+TBILLYIELD = TBILLRENDITE
+VDB = VDB
+XIRR = XINTZINSFUSS
+XNPV = XKAPITALWERT
+YIELD = RENDITE
+YIELDDISC = RENDITEDIS
+YIELDMAT = RENDITEFÄLL
+
+##
+## Informationsfunktionen (Information Functions)
+##
+CELL = ZELLE
+ERROR.TYPE = FEHLER.TYP
+INFO = INFO
+ISBLANK = ISTLEER
+ISERR = ISTFEHL
+ISERROR = ISTFEHLER
+ISEVEN = ISTGERADE
+ISFORMULA = ISTFORMEL
+ISLOGICAL = ISTLOG
+ISNA = ISTNV
+ISNONTEXT = ISTKTEXT
+ISNUMBER = ISTZAHL
+ISODD = ISTUNGERADE
+ISREF = ISTBEZUG
+ISTEXT = ISTTEXT
+N = N
+NA = NV
+SHEET = BLATT
+SHEETS = BLÄTTER
+TYPE = TYP
+
+##
+## Logische Funktionen (Logical Functions)
+##
+AND = UND
+FALSE = FALSCH
+IF = WENN
+IFERROR = WENNFEHLER
+IFNA = WENNNV
+IFS = WENNS
+NOT = NICHT
+OR = ODER
+SWITCH = ERSTERWERT
+TRUE = WAHR
+XOR = XODER
+
+##
+## Nachschlage- und Verweisfunktionen (Lookup & Reference Functions)
+##
+ADDRESS = ADRESSE
+AREAS = BEREICHE
+CHOOSE = WAHL
+COLUMN = SPALTE
+COLUMNS = SPALTEN
+FORMULATEXT = FORMELTEXT
+GETPIVOTDATA = PIVOTDATENZUORDNEN
+HLOOKUP = WVERWEIS
+HYPERLINK = HYPERLINK
+INDEX = INDEX
+INDIRECT = INDIREKT
+LOOKUP = VERWEIS
+MATCH = VERGLEICH
+OFFSET = BEREICH.VERSCHIEBEN
+ROW = ZEILE
+ROWS = ZEILEN
+RTD = RTD
+TRANSPOSE = MTRANS
+VLOOKUP = SVERWEIS
+*RC = ZS
+
+##
+## Mathematische und trigonometrische Funktionen (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSHYP
+ACOT = ARCCOT
+ACOTH = ARCCOTHYP
+AGGREGATE = AGGREGAT
+ARABIC = ARABISCH
+ASIN = ARCSIN
+ASINH = ARCSINHYP
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ARCTANHYP
+BASE = BASIS
+CEILING.MATH = OBERGRENZE.MATHEMATIK
+CEILING.PRECISE = OBERGRENZE.GENAU
+COMBIN = KOMBINATIONEN
+COMBINA = KOMBINATIONEN2
+COS = COS
+COSH = COSHYP
+COT = COT
+COTH = COTHYP
+CSC = COSEC
+CSCH = COSECHYP
+DECIMAL = DEZIMAL
+DEGREES = GRAD
+ECMA.CEILING = ECMA.OBERGRENZE
+EVEN = GERADE
+EXP = EXP
+FACT = FAKULTÄT
+FACTDOUBLE = ZWEIFAKULTÄT
+FLOOR.MATH = UNTERGRENZE.MATHEMATIK
+FLOOR.PRECISE = UNTERGRENZE.GENAU
+GCD = GGT
+INT = GANZZAHL
+ISO.CEILING = ISO.OBERGRENZE
+LCM = KGV
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDET
+MINVERSE = MINV
+MMULT = MMULT
+MOD = REST
+MROUND = VRUNDEN
+MULTINOMIAL = POLYNOMIAL
+MUNIT = MEINHEIT
+ODD = UNGERADE
+PI = PI
+POWER = POTENZ
+PRODUCT = PRODUKT
+QUOTIENT = QUOTIENT
+RADIANS = BOGENMASS
+RAND = ZUFALLSZAHL
+RANDBETWEEN = ZUFALLSBEREICH
+ROMAN = RÖMISCH
+ROUND = RUNDEN
+ROUNDBAHTDOWN = RUNDBAHTNED
+ROUNDBAHTUP = BAHTAUFRUNDEN
+ROUNDDOWN = ABRUNDEN
+ROUNDUP = AUFRUNDEN
+SEC = SEC
+SECH = SECHYP
+SERIESSUM = POTENZREIHE
+SIGN = VORZEICHEN
+SIN = SIN
+SINH = SINHYP
+SQRT = WURZEL
+SQRTPI = WURZELPI
+SUBTOTAL = TEILERGEBNIS
+SUM = SUMME
+SUMIF = SUMMEWENN
+SUMIFS = SUMMEWENNS
+SUMPRODUCT = SUMMENPRODUKT
+SUMSQ = QUADRATESUMME
+SUMX2MY2 = SUMMEX2MY2
+SUMX2PY2 = SUMMEX2PY2
+SUMXMY2 = SUMMEXMY2
+TAN = TAN
+TANH = TANHYP
+TRUNC = KÜRZEN
+
+##
+## Statistische Funktionen (Statistical Functions)
+##
+AVEDEV = MITTELABW
+AVERAGE = MITTELWERT
+AVERAGEA = MITTELWERTA
+AVERAGEIF = MITTELWERTWENN
+AVERAGEIFS = MITTELWERTWENNS
+BETA.DIST = BETA.VERT
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.VERT
+BINOM.DIST.RANGE = BINOM.VERT.BEREICH
+BINOM.INV = BINOM.INV
+CHISQ.DIST = CHIQU.VERT
+CHISQ.DIST.RT = CHIQU.VERT.RE
+CHISQ.INV = CHIQU.INV
+CHISQ.INV.RT = CHIQU.INV.RE
+CHISQ.TEST = CHIQU.TEST
+CONFIDENCE.NORM = KONFIDENZ.NORM
+CONFIDENCE.T = KONFIDENZ.T
+CORREL = KORREL
+COUNT = ANZAHL
+COUNTA = ANZAHL2
+COUNTBLANK = ANZAHLLEEREZELLEN
+COUNTIF = ZÄHLENWENN
+COUNTIFS = ZÄHLENWENNS
+COVARIANCE.P = KOVARIANZ.P
+COVARIANCE.S = KOVARIANZ.S
+DEVSQ = SUMQUADABW
+EXPON.DIST = EXPON.VERT
+F.DIST = F.VERT
+F.DIST.RT = F.VERT.RE
+F.INV = F.INV
+F.INV.RT = F.INV.RE
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PROGNOSE.ETS
+FORECAST.ETS.CONFINT = PROGNOSE.ETS.KONFINT
+FORECAST.ETS.SEASONALITY = PROGNOSE.ETS.SAISONALITÄT
+FORECAST.ETS.STAT = PROGNOSE.ETS.STAT
+FORECAST.LINEAR = PROGNOSE.LINEAR
+FREQUENCY = HÄUFIGKEIT
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.VERT
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.GENAU
+GAUSS = GAUSS
+GEOMEAN = GEOMITTEL
+GROWTH = VARIATION
+HARMEAN = HARMITTEL
+HYPGEOM.DIST = HYPGEOM.VERT
+INTERCEPT = ACHSENABSCHNITT
+KURT = KURT
+LARGE = KGRÖSSTE
+LINEST = RGP
+LOGEST = RKP
+LOGNORM.DIST = LOGNORM.VERT
+LOGNORM.INV = LOGNORM.INV
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAXWENNS
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINA
+MINIFS = MINWENNS
+MODE.MULT = MODUS.VIELF
+MODE.SNGL = MODUS.EINF
+NEGBINOM.DIST = NEGBINOM.VERT
+NORM.DIST = NORM.VERT
+NORM.INV = NORM.INV
+NORM.S.DIST = NORM.S.VERT
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = QUANTIL.EXKL
+PERCENTILE.INC = QUANTIL.INKL
+PERCENTRANK.EXC = QUANTILSRANG.EXKL
+PERCENTRANK.INC = QUANTILSRANG.INKL
+PERMUT = VARIATIONEN
+PERMUTATIONA = VARIATIONEN2
+PHI = PHI
+POISSON.DIST = POISSON.VERT
+PROB = WAHRSCHBEREICH
+QUARTILE.EXC = QUARTILE.EXKL
+QUARTILE.INC = QUARTILE.INKL
+RANK.AVG = RANG.MITTELW
+RANK.EQ = RANG.GLEICH
+RSQ = BESTIMMTHEITSMASS
+SKEW = SCHIEFE
+SKEW.P = SCHIEFE.P
+SLOPE = STEIGUNG
+SMALL = KKLEINSTE
+STANDARDIZE = STANDARDISIERUNG
+STDEV.P = STABW.N
+STDEV.S = STABW.S
+STDEVA = STABWA
+STDEVPA = STABWNA
+STEYX = STFEHLERYX
+T.DIST = T.VERT
+T.DIST.2T = T.VERT.2S
+T.DIST.RT = T.VERT.RE
+T.INV = T.INV
+T.INV.2T = T.INV.2S
+T.TEST = T.TEST
+TREND = TREND
+TRIMMEAN = GESTUTZTMITTEL
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARIANZA
+VARPA = VARIANZENA
+WEIBULL.DIST = WEIBULL.VERT
+Z.TEST = G.TEST
+
+##
+## Textfunktionen (Text Functions)
+##
+BAHTTEXT = BAHTTEXT
+CHAR = ZEICHEN
+CLEAN = SÄUBERN
+CODE = CODE
+CONCAT = TEXTKETTE
+DOLLAR = DM
+EXACT = IDENTISCH
+FIND = FINDEN
+FIXED = FEST
+ISTHAIDIGIT = ISTTHAIZAHLENWORT
+LEFT = LINKS
+LEN = LÄNGE
+LOWER = KLEIN
+MID = TEIL
+NUMBERVALUE = ZAHLENWERT
+PROPER = GROSS2
+REPLACE = ERSETZEN
+REPT = WIEDERHOLEN
+RIGHT = RECHTS
+SEARCH = SUCHEN
+SUBSTITUTE = WECHSELN
+T = T
+TEXT = TEXT
+TEXTJOIN = TEXTVERKETTEN
+THAIDIGIT = THAIZAHLENWORT
+THAINUMSOUND = THAIZAHLSOUND
+THAINUMSTRING = THAILANDSKNUMSTRENG
+THAISTRINGLENGTH = THAIZEICHENFOLGENLÄNGE
+TRIM = GLÄTTEN
+UNICHAR = UNIZEICHEN
+UNICODE = UNICODE
+UPPER = GROSS
+VALUE = WERT
+
+##
+## Webfunktionen (Web Functions)
+##
+ENCODEURL = URLCODIEREN
+FILTERXML = XMLFILTERN
+WEBSERVICE = WEBDIENST
+
+##
+## Kompatibilitätsfunktionen (Compatibility Functions)
+##
+BETADIST = BETAVERT
+BETAINV = BETAINV
+BINOMDIST = BINOMVERT
+CEILING = OBERGRENZE
+CHIDIST = CHIVERT
+CHIINV = CHIINV
+CHITEST = CHITEST
+CONCATENATE = VERKETTEN
+CONFIDENCE = KONFIDENZ
+COVAR = KOVAR
+CRITBINOM = KRITBINOM
+EXPONDIST = EXPONVERT
+FDIST = FVERT
+FINV = FINV
+FLOOR = UNTERGRENZE
+FORECAST = SCHÄTZER
+FTEST = FTEST
+GAMMADIST = GAMMAVERT
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOMVERT
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMVERT
+MODE = MODALWERT
+NEGBINOMDIST = NEGBINOMVERT
+NORMDIST = NORMVERT
+NORMINV = NORMINV
+NORMSDIST = STANDNORMVERT
+NORMSINV = STANDNORMINV
+PERCENTILE = QUANTIL
+PERCENTRANK = QUANTILSRANG
+POISSON = POISSON
+QUARTILE = QUARTILE
+RANK = RANG
+STDEV = STABW
+STDEVP = STABWN
+TDIST = TVERT
+TINV = TINV
+TTEST = TTEST
+VAR = VARIANZ
+VARP = VARIANZEN
+WEIBULL = WEIBULL
+ZTEST = GTEST
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/en/uk/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/en/uk/config
new file mode 100644
index 00000000..4e068ab0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/en/uk/config
@@ -0,0 +1,24 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## English-UK (English-UK)
+##
+############################################################
+
+ArgumentSeparator = ,
+##
+##  (For future use)
+##
+currencySymbol = £
+
+##
+## Error Codes
+##
+NULL
+DIV0
+VALUE
+REF
+NAME
+NUM
+NA
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/config
new file mode 100644
index 00000000..fe044efa
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Español (Spanish)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #¡NULO!
+DIV0 = #¡DIV/0!
+VALUE = #¡VALOR!
+REF = #¡REF!
+NAME = #¿NOMBRE?
+NUM = #¡NUM!
+NA
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions
new file mode 100644
index 00000000..88012aa1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions
@@ -0,0 +1,538 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Español (Spanish)
+##
+############################################################
+
+
+##
+## Funciones de cubo (Cube Functions)
+##
+CUBEKPIMEMBER = MIEMBROKPICUBO
+CUBEMEMBER = MIEMBROCUBO
+CUBEMEMBERPROPERTY = PROPIEDADMIEMBROCUBO
+CUBERANKEDMEMBER = MIEMBRORANGOCUBO
+CUBESET = CONJUNTOCUBO
+CUBESETCOUNT = RECUENTOCONJUNTOCUBO
+CUBEVALUE = VALORCUBO
+
+##
+## Funciones de base de datos (Database Functions)
+##
+DAVERAGE = BDPROMEDIO
+DCOUNT = BDCONTAR
+DCOUNTA = BDCONTARA
+DGET = BDEXTRAER
+DMAX = BDMAX
+DMIN = BDMIN
+DPRODUCT = BDPRODUCTO
+DSTDEV = BDDESVEST
+DSTDEVP = BDDESVESTP
+DSUM = BDSUMA
+DVAR = BDVAR
+DVARP = BDVARP
+
+##
+## Funciones de fecha y hora (Date & Time Functions)
+##
+DATE = FECHA
+DATEDIF = SIFECHA
+DATESTRING = CADENA.FECHA
+DATEVALUE = FECHANUMERO
+DAY = DIA
+DAYS = DIAS
+DAYS360 = DIAS360
+EDATE = FECHA.MES
+EOMONTH = FIN.MES
+HOUR = HORA
+ISOWEEKNUM = ISO.NUM.DE.SEMANA
+MINUTE = MINUTO
+MONTH = MES
+NETWORKDAYS = DIAS.LAB
+NETWORKDAYS.INTL = DIAS.LAB.INTL
+NOW = AHORA
+SECOND = SEGUNDO
+THAIDAYOFWEEK = DIASEMTAI
+THAIMONTHOFYEAR = MESAÑOTAI
+THAIYEAR = AÑOTAI
+TIME = NSHORA
+TIMEVALUE = HORANUMERO
+TODAY = HOY
+WEEKDAY = DIASEM
+WEEKNUM = NUM.DE.SEMANA
+WORKDAY = DIA.LAB
+WORKDAY.INTL = DIA.LAB.INTL
+YEAR = AÑO
+YEARFRAC = FRAC.AÑO
+
+##
+## Funciones de ingeniería (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN.A.DEC
+BIN2HEX = BIN.A.HEX
+BIN2OCT = BIN.A.OCT
+BITAND = BIT.Y
+BITLSHIFT = BIT.DESPLIZQDA
+BITOR = BIT.O
+BITRSHIFT = BIT.DESPLDCHA
+BITXOR = BIT.XO
+COMPLEX = COMPLEJO
+CONVERT = CONVERTIR
+DEC2BIN = DEC.A.BIN
+DEC2HEX = DEC.A.HEX
+DEC2OCT = DEC.A.OCT
+DELTA = DELTA
+ERF = FUN.ERROR
+ERF.PRECISE = FUN.ERROR.EXACTO
+ERFC = FUN.ERROR.COMPL
+ERFC.PRECISE = FUN.ERROR.COMPL.EXACTO
+GESTEP = MAYOR.O.IGUAL
+HEX2BIN = HEX.A.BIN
+HEX2DEC = HEX.A.DEC
+HEX2OCT = HEX.A.OCT
+IMABS = IM.ABS
+IMAGINARY = IMAGINARIO
+IMARGUMENT = IM.ANGULO
+IMCONJUGATE = IM.CONJUGADA
+IMCOS = IM.COS
+IMCOSH = IM.COSH
+IMCOT = IM.COT
+IMCSC = IM.CSC
+IMCSCH = IM.CSCH
+IMDIV = IM.DIV
+IMEXP = IM.EXP
+IMLN = IM.LN
+IMLOG10 = IM.LOG10
+IMLOG2 = IM.LOG2
+IMPOWER = IM.POT
+IMPRODUCT = IM.PRODUCT
+IMREAL = IM.REAL
+IMSEC = IM.SEC
+IMSECH = IM.SECH
+IMSIN = IM.SENO
+IMSINH = IM.SENOH
+IMSQRT = IM.RAIZ2
+IMSUB = IM.SUSTR
+IMSUM = IM.SUM
+IMTAN = IM.TAN
+OCT2BIN = OCT.A.BIN
+OCT2DEC = OCT.A.DEC
+OCT2HEX = OCT.A.HEX
+
+##
+## Funciones financieras (Financial Functions)
+##
+ACCRINT = INT.ACUM
+ACCRINTM = INT.ACUM.V
+AMORDEGRC = AMORTIZ.PROGRE
+AMORLINC = AMORTIZ.LIN
+COUPDAYBS = CUPON.DIAS.L1
+COUPDAYS = CUPON.DIAS
+COUPDAYSNC = CUPON.DIAS.L2
+COUPNCD = CUPON.FECHA.L2
+COUPNUM = CUPON.NUM
+COUPPCD = CUPON.FECHA.L1
+CUMIPMT = PAGO.INT.ENTRE
+CUMPRINC = PAGO.PRINC.ENTRE
+DB = DB
+DDB = DDB
+DISC = TASA.DESC
+DOLLARDE = MONEDA.DEC
+DOLLARFR = MONEDA.FRAC
+DURATION = DURACION
+EFFECT = INT.EFECTIVO
+FV = VF
+FVSCHEDULE = VF.PLAN
+INTRATE = TASA.INT
+IPMT = PAGOINT
+IRR = TIR
+ISPMT = INT.PAGO.DIR
+MDURATION = DURACION.MODIF
+MIRR = TIRM
+NOMINAL = TASA.NOMINAL
+NPER = NPER
+NPV = VNA
+ODDFPRICE = PRECIO.PER.IRREGULAR.1
+ODDFYIELD = RENDTO.PER.IRREGULAR.1
+ODDLPRICE = PRECIO.PER.IRREGULAR.2
+ODDLYIELD = RENDTO.PER.IRREGULAR.2
+PDURATION = P.DURACION
+PMT = PAGO
+PPMT = PAGOPRIN
+PRICE = PRECIO
+PRICEDISC = PRECIO.DESCUENTO
+PRICEMAT = PRECIO.VENCIMIENTO
+PV = VA
+RATE = TASA
+RECEIVED = CANTIDAD.RECIBIDA
+RRI = RRI
+SLN = SLN
+SYD = SYD
+TBILLEQ = LETRA.DE.TEST.EQV.A.BONO
+TBILLPRICE = LETRA.DE.TES.PRECIO
+TBILLYIELD = LETRA.DE.TES.RENDTO
+VDB = DVS
+XIRR = TIR.NO.PER
+XNPV = VNA.NO.PER
+YIELD = RENDTO
+YIELDDISC = RENDTO.DESC
+YIELDMAT = RENDTO.VENCTO
+
+##
+## Funciones de información (Information Functions)
+##
+CELL = CELDA
+ERROR.TYPE = TIPO.DE.ERROR
+INFO = INFO
+ISBLANK = ESBLANCO
+ISERR = ESERR
+ISERROR = ESERROR
+ISEVEN = ES.PAR
+ISFORMULA = ESFORMULA
+ISLOGICAL = ESLOGICO
+ISNA = ESNOD
+ISNONTEXT = ESNOTEXTO
+ISNUMBER = ESNUMERO
+ISODD = ES.IMPAR
+ISREF = ESREF
+ISTEXT = ESTEXTO
+N = N
+NA = NOD
+SHEET = HOJA
+SHEETS = HOJAS
+TYPE = TIPO
+
+##
+## Funciones lógicas (Logical Functions)
+##
+AND = Y
+FALSE = FALSO
+IF = SI
+IFERROR = SI.ERROR
+IFNA = SI.ND
+IFS = SI.CONJUNTO
+NOT = NO
+OR = O
+SWITCH = CAMBIAR
+TRUE = VERDADERO
+XOR = XO
+
+##
+## Funciones de búsqueda y referencia (Lookup & Reference Functions)
+##
+ADDRESS = DIRECCION
+AREAS = AREAS
+CHOOSE = ELEGIR
+COLUMN = COLUMNA
+COLUMNS = COLUMNAS
+FORMULATEXT = FORMULATEXTO
+GETPIVOTDATA = IMPORTARDATOSDINAMICOS
+HLOOKUP = BUSCARH
+HYPERLINK = HIPERVINCULO
+INDEX = INDICE
+INDIRECT = INDIRECTO
+LOOKUP = BUSCAR
+MATCH = COINCIDIR
+OFFSET = DESREF
+ROW = FILA
+ROWS = FILAS
+RTD = RDTR
+TRANSPOSE = TRANSPONER
+VLOOKUP = BUSCARV
+*RC = FC
+
+##
+## Funciones matemáticas y trigonométricas (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGAR
+ARABIC = NUMERO.ARABE
+ASIN = ASENO
+ASINH = ASENOH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = BASE
+CEILING.MATH = MULTIPLO.SUPERIOR.MAT
+CEILING.PRECISE = MULTIPLO.SUPERIOR.EXACTO
+COMBIN = COMBINAT
+COMBINA = COMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = CONV.DECIMAL
+DEGREES = GRADOS
+ECMA.CEILING = MULTIPLO.SUPERIOR.ECMA
+EVEN = REDONDEA.PAR
+EXP = EXP
+FACT = FACT
+FACTDOUBLE = FACT.DOBLE
+FLOOR.MATH = MULTIPLO.INFERIOR.MAT
+FLOOR.PRECISE = MULTIPLO.INFERIOR.EXACTO
+GCD = M.C.D
+INT = ENTERO
+ISO.CEILING = MULTIPLO.SUPERIOR.ISO
+LCM = M.C.M
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MINVERSA
+MMULT = MMULT
+MOD = RESIDUO
+MROUND = REDOND.MULT
+MULTINOMIAL = MULTINOMIAL
+MUNIT = M.UNIDAD
+ODD = REDONDEA.IMPAR
+PI = PI
+POWER = POTENCIA
+PRODUCT = PRODUCTO
+QUOTIENT = COCIENTE
+RADIANS = RADIANES
+RAND = ALEATORIO
+RANDBETWEEN = ALEATORIO.ENTRE
+ROMAN = NUMERO.ROMANO
+ROUND = REDONDEAR
+ROUNDBAHTDOWN = REDONDEAR.BAHT.MAS
+ROUNDBAHTUP = REDONDEAR.BAHT.MENOS
+ROUNDDOWN = REDONDEAR.MENOS
+ROUNDUP = REDONDEAR.MAS
+SEC = SEC
+SECH = SECH
+SERIESSUM = SUMA.SERIES
+SIGN = SIGNO
+SIN = SENO
+SINH = SENOH
+SQRT = RAIZ
+SQRTPI = RAIZ2PI
+SUBTOTAL = SUBTOTALES
+SUM = SUMA
+SUMIF = SUMAR.SI
+SUMIFS = SUMAR.SI.CONJUNTO
+SUMPRODUCT = SUMAPRODUCTO
+SUMSQ = SUMA.CUADRADOS
+SUMX2MY2 = SUMAX2MENOSY2
+SUMX2PY2 = SUMAX2MASY2
+SUMXMY2 = SUMAXMENOSY2
+TAN = TAN
+TANH = TANH
+TRUNC = TRUNCAR
+
+##
+## Funciones estadísticas (Statistical Functions)
+##
+AVEDEV = DESVPROM
+AVERAGE = PROMEDIO
+AVERAGEA = PROMEDIOA
+AVERAGEIF = PROMEDIO.SI
+AVERAGEIFS = PROMEDIO.SI.CONJUNTO
+BETA.DIST = DISTR.BETA.N
+BETA.INV = INV.BETA.N
+BINOM.DIST = DISTR.BINOM.N
+BINOM.DIST.RANGE = DISTR.BINOM.SERIE
+BINOM.INV = INV.BINOM
+CHISQ.DIST = DISTR.CHICUAD
+CHISQ.DIST.RT = DISTR.CHICUAD.CD
+CHISQ.INV = INV.CHICUAD
+CHISQ.INV.RT = INV.CHICUAD.CD
+CHISQ.TEST = PRUEBA.CHICUAD
+CONFIDENCE.NORM = INTERVALO.CONFIANZA.NORM
+CONFIDENCE.T = INTERVALO.CONFIANZA.T
+CORREL = COEF.DE.CORREL
+COUNT = CONTAR
+COUNTA = CONTARA
+COUNTBLANK = CONTAR.BLANCO
+COUNTIF = CONTAR.SI
+COUNTIFS = CONTAR.SI.CONJUNTO
+COVARIANCE.P = COVARIANCE.P
+COVARIANCE.S = COVARIANZA.M
+DEVSQ = DESVIA2
+EXPON.DIST = DISTR.EXP.N
+F.DIST = DISTR.F.N
+F.DIST.RT = DISTR.F.CD
+F.INV = INV.F
+F.INV.RT = INV.F.CD
+F.TEST = PRUEBA.F.N
+FISHER = FISHER
+FISHERINV = PRUEBA.FISHER.INV
+FORECAST.ETS = PRONOSTICO.ETS
+FORECAST.ETS.CONFINT = PRONOSTICO.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PRONOSTICO.ETS.ESTACIONALIDAD
+FORECAST.ETS.STAT = PRONOSTICO.ETS.STAT
+FORECAST.LINEAR = PRONOSTICO.LINEAL
+FREQUENCY = FRECUENCIA
+GAMMA = GAMMA
+GAMMA.DIST = DISTR.GAMMA.N
+GAMMA.INV = INV.GAMMA
+GAMMALN = GAMMA.LN
+GAMMALN.PRECISE = GAMMA.LN.EXACTO
+GAUSS = GAUSS
+GEOMEAN = MEDIA.GEOM
+GROWTH = CRECIMIENTO
+HARMEAN = MEDIA.ARMO
+HYPGEOM.DIST = DISTR.HIPERGEOM.N
+INTERCEPT = INTERSECCION.EJE
+KURT = CURTOSIS
+LARGE = K.ESIMO.MAYOR
+LINEST = ESTIMACION.LINEAL
+LOGEST = ESTIMACION.LOGARITMICA
+LOGNORM.DIST = DISTR.LOGNORM
+LOGNORM.INV = INV.LOGNORM
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAX.SI.CONJUNTO
+MEDIAN = MEDIANA
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.SI.CONJUNTO
+MODE.MULT = MODA.VARIOS
+MODE.SNGL = MODA.UNO
+NEGBINOM.DIST = NEGBINOM.DIST
+NORM.DIST = DISTR.NORM.N
+NORM.INV = INV.NORM
+NORM.S.DIST = DISTR.NORM.ESTAND.N
+NORM.S.INV = INV.NORM.ESTAND
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXC
+PERCENTILE.INC = PERCENTIL.INC
+PERCENTRANK.EXC = RANGO.PERCENTIL.EXC
+PERCENTRANK.INC = RANGO.PERCENTIL.INC
+PERMUT = PERMUTACIONES
+PERMUTATIONA = PERMUTACIONES.A
+PHI = FI
+POISSON.DIST = POISSON.DIST
+PROB = PROBABILIDAD
+QUARTILE.EXC = CUARTIL.EXC
+QUARTILE.INC = CUARTIL.INC
+RANK.AVG = JERARQUIA.MEDIA
+RANK.EQ = JERARQUIA.EQV
+RSQ = COEFICIENTE.R2
+SKEW = COEFICIENTE.ASIMETRIA
+SKEW.P = COEFICIENTE.ASIMETRIA.P
+SLOPE = PENDIENTE
+SMALL = K.ESIMO.MENOR
+STANDARDIZE = NORMALIZACION
+STDEV.P = DESVEST.P
+STDEV.S = DESVEST.M
+STDEVA = DESVESTA
+STDEVPA = DESVESTPA
+STEYX = ERROR.TIPICO.XY
+T.DIST = DISTR.T.N
+T.DIST.2T = DISTR.T.2C
+T.DIST.RT = DISTR.T.CD
+T.INV = INV.T
+T.INV.2T = INV.T.2C
+T.TEST = PRUEBA.T.N
+TREND = TENDENCIA
+TRIMMEAN = MEDIA.ACOTADA
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = DISTR.WEIBULL
+Z.TEST = PRUEBA.Z.N
+
+##
+## Funciones de texto (Text Functions)
+##
+BAHTTEXT = TEXTOBAHT
+CHAR = CARACTER
+CLEAN = LIMPIAR
+CODE = CODIGO
+CONCAT = CONCAT
+DOLLAR = MONEDA
+EXACT = IGUAL
+FIND = ENCONTRAR
+FIXED = DECIMAL
+ISTHAIDIGIT = ESDIGITOTAI
+LEFT = IZQUIERDA
+LEN = LARGO
+LOWER = MINUSC
+MID = EXTRAE
+NUMBERSTRING = CADENA.NUMERO
+NUMBERVALUE = VALOR.NUMERO
+PHONETIC = FONETICO
+PROPER = NOMPROPIO
+REPLACE = REEMPLAZAR
+REPT = REPETIR
+RIGHT = DERECHA
+SEARCH = HALLAR
+SUBSTITUTE = SUSTITUIR
+T = T
+TEXT = TEXTO
+TEXTJOIN = UNIRCADENAS
+THAIDIGIT = DIGITOTAI
+THAINUMSOUND = SONNUMTAI
+THAINUMSTRING = CADENANUMTAI
+THAISTRINGLENGTH = LONGCADENATAI
+TRIM = ESPACIOS
+UNICHAR = UNICAR
+UNICODE = UNICODE
+UPPER = MAYUSC
+VALUE = VALOR
+
+##
+## Funciones web (Web Functions)
+##
+ENCODEURL = URLCODIF
+FILTERXML = XMLFILTRO
+WEBSERVICE = SERVICIOWEB
+
+##
+## Funciones de compatibilidad (Compatibility Functions)
+##
+BETADIST = DISTR.BETA
+BETAINV = DISTR.BETA.INV
+BINOMDIST = DISTR.BINOM
+CEILING = MULTIPLO.SUPERIOR
+CHIDIST = DISTR.CHI
+CHIINV = PRUEBA.CHI.INV
+CHITEST = PRUEBA.CHI
+CONCATENATE = CONCATENAR
+CONFIDENCE = INTERVALO.CONFIANZA
+COVAR = COVAR
+CRITBINOM = BINOM.CRIT
+EXPONDIST = DISTR.EXP
+FDIST = DISTR.F
+FINV = DISTR.F.INV
+FLOOR = MULTIPLO.INFERIOR
+FORECAST = PRONOSTICO
+FTEST = PRUEBA.F
+GAMMADIST = DISTR.GAMMA
+GAMMAINV = DISTR.GAMMA.INV
+HYPGEOMDIST = DISTR.HIPERGEOM
+LOGINV = DISTR.LOG.INV
+LOGNORMDIST = DISTR.LOG.NORM
+MODE = MODA
+NEGBINOMDIST = NEGBINOMDIST
+NORMDIST = DISTR.NORM
+NORMINV = DISTR.NORM.INV
+NORMSDIST = DISTR.NORM.ESTAND
+NORMSINV = DISTR.NORM.ESTAND.INV
+PERCENTILE = PERCENTIL
+PERCENTRANK = RANGO.PERCENTIL
+POISSON = POISSON
+QUARTILE = CUARTIL
+RANK = JERARQUIA
+STDEV = DESVEST
+STDEVP = DESVESTP
+TDIST = DISTR.T
+TINV = DISTR.T.INV
+TTEST = PRUEBA.T
+VAR = VAR
+VARP = VARP
+WEIBULL = DIST.WEIBULL
+ZTEST = PRUEBA.Z
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/config
new file mode 100644
index 00000000..5388f939
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Suomi (Finnish)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #TYHJÄ!
+DIV0 = #JAKO/0!
+VALUE = #ARVO!
+REF = #VIITTAUS!
+NAME = #NIMI?
+NUM = #LUKU!
+NA = #PUUTTUU!
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions
new file mode 100644
index 00000000..18f7c8c8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions
@@ -0,0 +1,538 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Suomi (Finnish)
+##
+############################################################
+
+
+##
+## Kuutiofunktiot (Cube Functions)
+##
+CUBEKPIMEMBER = KUUTIOKPIJÄSEN
+CUBEMEMBER = KUUTIONJÄSEN
+CUBEMEMBERPROPERTY = KUUTIONJÄSENENOMINAISUUS
+CUBERANKEDMEMBER = KUUTIONLUOKITELTUJÄSEN
+CUBESET = KUUTIOJOUKKO
+CUBESETCOUNT = KUUTIOJOUKKOJENMÄÄRÄ
+CUBEVALUE = KUUTIONARVO
+
+##
+## Tietokantafunktiot (Database Functions)
+##
+DAVERAGE = TKESKIARVO
+DCOUNT = TLASKE
+DCOUNTA = TLASKEA
+DGET = TNOUDA
+DMAX = TMAKS
+DMIN = TMIN
+DPRODUCT = TTULO
+DSTDEV = TKESKIHAJONTA
+DSTDEVP = TKESKIHAJONTAP
+DSUM = TSUMMA
+DVAR = TVARIANSSI
+DVARP = TVARIANSSIP
+
+##
+## Päivämäärä- ja aikafunktiot (Date & Time Functions)
+##
+DATE = PÄIVÄYS
+DATEDIF = PVMERO
+DATESTRING = PVMMERKKIJONO
+DATEVALUE = PÄIVÄYSARVO
+DAY = PÄIVÄ
+DAYS = PÄIVÄT
+DAYS360 = PÄIVÄT360
+EDATE = PÄIVÄ.KUUKAUSI
+EOMONTH = KUUKAUSI.LOPPU
+HOUR = TUNNIT
+ISOWEEKNUM = VIIKKO.ISO.NRO
+MINUTE = MINUUTIT
+MONTH = KUUKAUSI
+NETWORKDAYS = TYÖPÄIVÄT
+NETWORKDAYS.INTL = TYÖPÄIVÄT.KANSVÄL
+NOW = NYT
+SECOND = SEKUNNIT
+THAIDAYOFWEEK = THAI.VIIKONPÄIVÄ
+THAIMONTHOFYEAR = THAI.KUUKAUSI
+THAIYEAR = THAI.VUOSI
+TIME = AIKA
+TIMEVALUE = AIKA_ARVO
+TODAY = TÄMÄ.PÄIVÄ
+WEEKDAY = VIIKONPÄIVÄ
+WEEKNUM = VIIKKO.NRO
+WORKDAY = TYÖPÄIVÄ
+WORKDAY.INTL = TYÖPÄIVÄ.KANSVÄL
+YEAR = VUOSI
+YEARFRAC = VUOSI.OSA
+
+##
+## Tekniset funktiot (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINDES
+BIN2HEX = BINHEKSA
+BIN2OCT = BINOKT
+BITAND = BITTI.JA
+BITLSHIFT = BITTI.SIIRTO.V
+BITOR = BITTI.TAI
+BITRSHIFT = BITTI.SIIRTO.O
+BITXOR = BITTI.EHDOTON.TAI
+COMPLEX = KOMPLEKSI
+CONVERT = MUUNNA
+DEC2BIN = DESBIN
+DEC2HEX = DESHEKSA
+DEC2OCT = DESOKT
+DELTA = SAMA.ARVO
+ERF = VIRHEFUNKTIO
+ERF.PRECISE = VIRHEFUNKTIO.TARKKA
+ERFC = VIRHEFUNKTIO.KOMPLEMENTTI
+ERFC.PRECISE = VIRHEFUNKTIO.KOMPLEMENTTI.TARKKA
+GESTEP = RAJA
+HEX2BIN = HEKSABIN
+HEX2DEC = HEKSADES
+HEX2OCT = HEKSAOKT
+IMABS = KOMPLEKSI.ABS
+IMAGINARY = KOMPLEKSI.IMAG
+IMARGUMENT = KOMPLEKSI.ARG
+IMCONJUGATE = KOMPLEKSI.KONJ
+IMCOS = KOMPLEKSI.COS
+IMCOSH = IMCOSH
+IMCOT = KOMPLEKSI.COT
+IMCSC = KOMPLEKSI.KOSEK
+IMCSCH = KOMPLEKSI.KOSEKH
+IMDIV = KOMPLEKSI.OSAM
+IMEXP = KOMPLEKSI.EKSP
+IMLN = KOMPLEKSI.LN
+IMLOG10 = KOMPLEKSI.LOG10
+IMLOG2 = KOMPLEKSI.LOG2
+IMPOWER = KOMPLEKSI.POT
+IMPRODUCT = KOMPLEKSI.TULO
+IMREAL = KOMPLEKSI.REAALI
+IMSEC = KOMPLEKSI.SEK
+IMSECH = KOMPLEKSI.SEKH
+IMSIN = KOMPLEKSI.SIN
+IMSINH = KOMPLEKSI.SINH
+IMSQRT = KOMPLEKSI.NELIÖJ
+IMSUB = KOMPLEKSI.EROTUS
+IMSUM = KOMPLEKSI.SUM
+IMTAN = KOMPLEKSI.TAN
+OCT2BIN = OKTBIN
+OCT2DEC = OKTDES
+OCT2HEX = OKTHEKSA
+
+##
+## Rahoitusfunktiot (Financial Functions)
+##
+ACCRINT = KERTYNYT.KORKO
+ACCRINTM = KERTYNYT.KORKO.LOPUSSA
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = KORKOPÄIVÄT.ALUSTA
+COUPDAYS = KORKOPÄIVÄT
+COUPDAYSNC = KORKOPÄIVÄT.SEURAAVA
+COUPNCD = KORKOPÄIVÄ.SEURAAVA
+COUPNUM = KORKOPÄIVÄ.JAKSOT
+COUPPCD = KORKOPÄIVÄ.EDELLINEN
+CUMIPMT = MAKSETTU.KORKO
+CUMPRINC = MAKSETTU.LYHENNYS
+DB = DB
+DDB = DDB
+DISC = DISKONTTOKORKO
+DOLLARDE = VALUUTTA.DES
+DOLLARFR = VALUUTTA.MURTO
+DURATION = KESTO
+EFFECT = KORKO.EFEKT
+FV = TULEVA.ARVO
+FVSCHEDULE = TULEVA.ARVO.ERIKORKO
+INTRATE = KORKO.ARVOPAPERI
+IPMT = IPMT
+IRR = SISÄINEN.KORKO
+ISPMT = ISPMT
+MDURATION = KESTO.MUUNN
+MIRR = MSISÄINEN
+NOMINAL = KORKO.VUOSI
+NPER = NJAKSO
+NPV = NNA
+ODDFPRICE = PARITON.ENS.NIMELLISARVO
+ODDFYIELD = PARITON.ENS.TUOTTO
+ODDLPRICE = PARITON.VIIM.NIMELLISARVO
+ODDLYIELD = PARITON.VIIM.TUOTTO
+PDURATION = KESTO.JAKSO
+PMT = MAKSU
+PPMT = PPMT
+PRICE = HINTA
+PRICEDISC = HINTA.DISK
+PRICEMAT = HINTA.LUNASTUS
+PV = NA
+RATE = KORKO
+RECEIVED = SAATU.HINTA
+RRI = TOT.ROI
+SLN = STP
+SYD = VUOSIPOISTO
+TBILLEQ = OBLIG.TUOTTOPROS
+TBILLPRICE = OBLIG.HINTA
+TBILLYIELD = OBLIG.TUOTTO
+VDB = VDB
+XIRR = SISÄINEN.KORKO.JAKSOTON
+XNPV = NNA.JAKSOTON
+YIELD = TUOTTO
+YIELDDISC = TUOTTO.DISK
+YIELDMAT = TUOTTO.ERÄP
+
+##
+## Tietofunktiot (Information Functions)
+##
+CELL = SOLU
+ERROR.TYPE = VIRHEEN.LAJI
+INFO = KUVAUS
+ISBLANK = ONTYHJÄ
+ISERR = ONVIRH
+ISERROR = ONVIRHE
+ISEVEN = ONPARILLINEN
+ISFORMULA = ONKAAVA
+ISLOGICAL = ONTOTUUS
+ISNA = ONPUUTTUU
+ISNONTEXT = ONEI_TEKSTI
+ISNUMBER = ONLUKU
+ISODD = ONPARITON
+ISREF = ONVIITT
+ISTEXT = ONTEKSTI
+N = N
+NA = PUUTTUU
+SHEET = TAULUKKO
+SHEETS = TAULUKOT
+TYPE = TYYPPI
+
+##
+## Loogiset funktiot (Logical Functions)
+##
+AND = JA
+FALSE = EPÄTOSI
+IF = JOS
+IFERROR = JOSVIRHE
+IFNA = JOSPUUTTUU
+IFS = JOSS
+NOT = EI
+OR = TAI
+SWITCH = MUUTA
+TRUE = TOSI
+XOR = EHDOTON.TAI
+
+##
+## Haku- ja viitefunktiot (Lookup & Reference Functions)
+##
+ADDRESS = OSOITE
+AREAS = ALUEET
+CHOOSE = VALITSE.INDEKSI
+COLUMN = SARAKE
+COLUMNS = SARAKKEET
+FORMULATEXT = KAAVA.TEKSTI
+GETPIVOTDATA = NOUDA.PIVOT.TIEDOT
+HLOOKUP = VHAKU
+HYPERLINK = HYPERLINKKI
+INDEX = INDEKSI
+INDIRECT = EPÄSUORA
+LOOKUP = HAKU
+MATCH = VASTINE
+OFFSET = SIIRTYMÄ
+ROW = RIVI
+ROWS = RIVIT
+RTD = RTD
+TRANSPOSE = TRANSPONOI
+VLOOKUP = PHAKU
+*RC = RS
+
+##
+## Matemaattiset ja trigonometriset funktiot (Math & Trig Functions)
+##
+ABS = ITSEISARVO
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = KOOSTE
+ARABIC = ARABIA
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = PERUS
+CEILING.MATH = PYÖRISTÄ.KERR.YLÖS.MATEMAATTINEN
+CEILING.PRECISE = PYÖRISTÄ.KERR.YLÖS.TARKKA
+COMBIN = KOMBINAATIO
+COMBINA = KOMBINAATIOA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = KOSEK
+CSCH = KOSEKH
+DECIMAL = DESIMAALI
+DEGREES = ASTEET
+ECMA.CEILING = ECMA.PYÖRISTÄ.KERR.YLÖS
+EVEN = PARILLINEN
+EXP = EKSPONENTTI
+FACT = KERTOMA
+FACTDOUBLE = KERTOMA.OSA
+FLOOR.MATH = PYÖRISTÄ.KERR.ALAS.MATEMAATTINEN
+FLOOR.PRECISE = PYÖRISTÄ.KERR.ALAS.TARKKA
+GCD = SUURIN.YHT.TEKIJÄ
+INT = KOKONAISLUKU
+ISO.CEILING = ISO.PYÖRISTÄ.KERR.YLÖS
+LCM = PIENIN.YHT.JAETTAVA
+LN = LUONNLOG
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MKÄÄNTEINEN
+MMULT = MKERRO
+MOD = JAKOJ
+MROUND = PYÖRISTÄ.KERR
+MULTINOMIAL = MULTINOMI
+MUNIT = YKSIKKÖM
+ODD = PARITON
+PI = PII
+POWER = POTENSSI
+PRODUCT = TULO
+QUOTIENT = OSAMÄÄRÄ
+RADIANS = RADIAANIT
+RAND = SATUNNAISLUKU
+RANDBETWEEN = SATUNNAISLUKU.VÄLILTÄ
+ROMAN = ROMAN
+ROUND = PYÖRISTÄ
+ROUNDBAHTDOWN = PYÖRISTÄ.BAHT.ALAS
+ROUNDBAHTUP = PYÖRISTÄ.BAHT.YLÖS
+ROUNDDOWN = PYÖRISTÄ.DES.ALAS
+ROUNDUP = PYÖRISTÄ.DES.YLÖS
+SEC = SEK
+SECH = SEKH
+SERIESSUM = SARJA.SUMMA
+SIGN = ETUMERKKI
+SIN = SIN
+SINH = SINH
+SQRT = NELIÖJUURI
+SQRTPI = NELIÖJUURI.PII
+SUBTOTAL = VÄLISUMMA
+SUM = SUMMA
+SUMIF = SUMMA.JOS
+SUMIFS = SUMMA.JOS.JOUKKO
+SUMPRODUCT = TULOJEN.SUMMA
+SUMSQ = NELIÖSUMMA
+SUMX2MY2 = NELIÖSUMMIEN.EROTUS
+SUMX2PY2 = NELIÖSUMMIEN.SUMMA
+SUMXMY2 = EROTUSTEN.NELIÖSUMMA
+TAN = TAN
+TANH = TANH
+TRUNC = KATKAISE
+
+##
+## Tilastolliset funktiot (Statistical Functions)
+##
+AVEDEV = KESKIPOIKKEAMA
+AVERAGE = KESKIARVO
+AVERAGEA = KESKIARVOA
+AVERAGEIF = KESKIARVO.JOS
+AVERAGEIFS = KESKIARVO.JOS.JOUKKO
+BETA.DIST = BEETA.JAKAUMA
+BETA.INV = BEETA.KÄÄNT
+BINOM.DIST = BINOMI.JAKAUMA
+BINOM.DIST.RANGE = BINOMI.JAKAUMA.ALUE
+BINOM.INV = BINOMIJAKAUMA.KÄÄNT
+CHISQ.DIST = CHINELIÖ.JAKAUMA
+CHISQ.DIST.RT = CHINELIÖ.JAKAUMA.OH
+CHISQ.INV = CHINELIÖ.KÄÄNT
+CHISQ.INV.RT = CHINELIÖ.KÄÄNT.OH
+CHISQ.TEST = CHINELIÖ.TESTI
+CONFIDENCE.NORM = LUOTTAMUSVÄLI.NORM
+CONFIDENCE.T = LUOTTAMUSVÄLI.T
+CORREL = KORRELAATIO
+COUNT = LASKE
+COUNTA = LASKE.A
+COUNTBLANK = LASKE.TYHJÄT
+COUNTIF = LASKE.JOS
+COUNTIFS = LASKE.JOS.JOUKKO
+COVARIANCE.P = KOVARIANSSI.P
+COVARIANCE.S = KOVARIANSSI.S
+DEVSQ = OIKAISTU.NELIÖSUMMA
+EXPON.DIST = EKSPONENTIAALI.JAKAUMA
+F.DIST = F.JAKAUMA
+F.DIST.RT = F.JAKAUMA.OH
+F.INV = F.KÄÄNT
+F.INV.RT = F.KÄÄNT.OH
+F.TEST = F.TESTI
+FISHER = FISHER
+FISHERINV = FISHER.KÄÄNT
+FORECAST.ETS = ENNUSTE.ETS
+FORECAST.ETS.CONFINT = ENNUSTE.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = ENNUSTE.ETS.KAUSIVAIHTELU
+FORECAST.ETS.STAT = ENNUSTE.ETS.STAT
+FORECAST.LINEAR = ENNUSTE.LINEAARINEN
+FREQUENCY = TAAJUUS
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.JAKAUMA
+GAMMA.INV = GAMMA.JAKAUMA.KÄÄNT
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.TARKKA
+GAUSS = GAUSS
+GEOMEAN = KESKIARVO.GEOM
+GROWTH = KASVU
+HARMEAN = KESKIARVO.HARM
+HYPGEOM.DIST = HYPERGEOM_JAKAUMA
+INTERCEPT = LEIKKAUSPISTE
+KURT = KURT
+LARGE = SUURI
+LINEST = LINREGR
+LOGEST = LOGREGR
+LOGNORM.DIST = LOGNORM_JAKAUMA
+LOGNORM.INV = LOGNORM.KÄÄNT
+MAX = MAKS
+MAXA = MAKSA
+MAXIFS = MAKS.JOS
+MEDIAN = MEDIAANI
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.JOS
+MODE.MULT = MOODI.USEA
+MODE.SNGL = MOODI.YKSI
+NEGBINOM.DIST = BINOMI.JAKAUMA.NEG
+NORM.DIST = NORMAALI.JAKAUMA
+NORM.INV = NORMAALI.JAKAUMA.KÄÄNT
+NORM.S.DIST = NORM_JAKAUMA.NORMIT
+NORM.S.INV = NORM_JAKAUMA.KÄÄNT
+PEARSON = PEARSON
+PERCENTILE.EXC = PROSENTTIPISTE.ULK
+PERCENTILE.INC = PROSENTTIPISTE.SIS
+PERCENTRANK.EXC = PROSENTTIJÄRJESTYS.ULK
+PERCENTRANK.INC = PROSENTTIJÄRJESTYS.SIS
+PERMUT = PERMUTAATIO
+PERMUTATIONA = PERMUTAATIOA
+PHI = FII
+POISSON.DIST = POISSON.JAKAUMA
+PROB = TODENNÄKÖISYYS
+QUARTILE.EXC = NELJÄNNES.ULK
+QUARTILE.INC = NELJÄNNES.SIS
+RANK.AVG = ARVON.MUKAAN.KESKIARVO
+RANK.EQ = ARVON.MUKAAN.TASAN
+RSQ = PEARSON.NELIÖ
+SKEW = JAKAUMAN.VINOUS
+SKEW.P = JAKAUMAN.VINOUS.POP
+SLOPE = KULMAKERROIN
+SMALL = PIENI
+STANDARDIZE = NORMITA
+STDEV.P = KESKIHAJONTA.P
+STDEV.S = KESKIHAJONTA.S
+STDEVA = KESKIHAJONTAA
+STDEVPA = KESKIHAJONTAPA
+STEYX = KESKIVIRHE
+T.DIST = T.JAKAUMA
+T.DIST.2T = T.JAKAUMA.2S
+T.DIST.RT = T.JAKAUMA.OH
+T.INV = T.KÄÄNT
+T.INV.2T = T.KÄÄNT.2S
+T.TEST = T.TESTI
+TREND = SUUNTAUS
+TRIMMEAN = KESKIARVO.TASATTU
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.JAKAUMA
+Z.TEST = Z.TESTI
+
+##
+## Tekstifunktiot (Text Functions)
+##
+BAHTTEXT = BAHTTEKSTI
+CHAR = MERKKI
+CLEAN = SIIVOA
+CODE = KOODI
+CONCAT = YHDISTÄ
+DOLLAR = VALUUTTA
+EXACT = VERTAA
+FIND = ETSI
+FIXED = KIINTEÄ
+ISTHAIDIGIT = ON.THAI.NUMERO
+LEFT = VASEN
+LEN = PITUUS
+LOWER = PIENET
+MID = POIMI.TEKSTI
+NUMBERSTRING = NROMERKKIJONO
+NUMBERVALUE = NROARVO
+PHONETIC = FONEETTINEN
+PROPER = ERISNIMI
+REPLACE = KORVAA
+REPT = TOISTA
+RIGHT = OIKEA
+SEARCH = KÄY.LÄPI
+SUBSTITUTE = VAIHDA
+T = T
+TEXT = TEKSTI
+TEXTJOIN = TEKSTI.YHDISTÄ
+THAIDIGIT = THAI.NUMERO
+THAINUMSOUND = THAI.LUKU.ÄÄNI
+THAINUMSTRING = THAI.LUKU.MERKKIJONO
+THAISTRINGLENGTH = THAI.MERKKIJONON.PITUUS
+TRIM = POISTA.VÄLIT
+UNICHAR = UNICODEMERKKI
+UNICODE = UNICODE
+UPPER = ISOT
+VALUE = ARVO
+
+##
+## Verkkofunktiot (Web Functions)
+##
+ENCODEURL = URLKOODAUS
+FILTERXML = SUODATA.XML
+WEBSERVICE = VERKKOPALVELU
+
+##
+## Yhteensopivuusfunktiot (Compatibility Functions)
+##
+BETADIST = BEETAJAKAUMA
+BETAINV = BEETAJAKAUMA.KÄÄNT
+BINOMDIST = BINOMIJAKAUMA
+CEILING = PYÖRISTÄ.KERR.YLÖS
+CHIDIST = CHIJAKAUMA
+CHIINV = CHIJAKAUMA.KÄÄNT
+CHITEST = CHITESTI
+CONCATENATE = KETJUTA
+CONFIDENCE = LUOTTAMUSVÄLI
+COVAR = KOVARIANSSI
+CRITBINOM = BINOMIJAKAUMA.KRIT
+EXPONDIST = EKSPONENTIAALIJAKAUMA
+FDIST = FJAKAUMA
+FINV = FJAKAUMA.KÄÄNT
+FLOOR = PYÖRISTÄ.KERR.ALAS
+FORECAST = ENNUSTE
+FTEST = FTESTI
+GAMMADIST = GAMMAJAKAUMA
+GAMMAINV = GAMMAJAKAUMA.KÄÄNT
+HYPGEOMDIST = HYPERGEOM.JAKAUMA
+LOGINV = LOGNORM.JAKAUMA.KÄÄNT
+LOGNORMDIST = LOGNORM.JAKAUMA
+MODE = MOODI
+NEGBINOMDIST = BINOMIJAKAUMA.NEG
+NORMDIST = NORM.JAKAUMA
+NORMINV = NORM.JAKAUMA.KÄÄNT
+NORMSDIST = NORM.JAKAUMA.NORMIT
+NORMSINV = NORM.JAKAUMA.NORMIT.KÄÄNT
+PERCENTILE = PROSENTTIPISTE
+PERCENTRANK = PROSENTTIJÄRJESTYS
+POISSON = POISSON
+QUARTILE = NELJÄNNES
+RANK = ARVON.MUKAAN
+STDEV = KESKIHAJONTA
+STDEVP = KESKIHAJONTAP
+TDIST = TJAKAUMA
+TINV = TJAKAUMA.KÄÄNT
+TTEST = TTESTI
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = ZTESTI
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/config
new file mode 100644
index 00000000..bdac4121
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Français (French)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #NUL!
+DIV0
+VALUE = #VALEUR!
+REF
+NAME = #NOM?
+NUM = #NOMBRE!
+NA
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions
new file mode 100644
index 00000000..621cb0db
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions
@@ -0,0 +1,525 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Français (French)
+##
+############################################################
+
+
+##
+## Fonctions Cube (Cube Functions)
+##
+CUBEKPIMEMBER = MEMBREKPICUBE
+CUBEMEMBER = MEMBRECUBE
+CUBEMEMBERPROPERTY = PROPRIETEMEMBRECUBE
+CUBERANKEDMEMBER = RANGMEMBRECUBE
+CUBESET = JEUCUBE
+CUBESETCOUNT = NBJEUCUBE
+CUBEVALUE = VALEURCUBE
+
+##
+## Fonctions de base de données (Database Functions)
+##
+DAVERAGE = BDMOYENNE
+DCOUNT = BDNB
+DCOUNTA = BDNBVAL
+DGET = BDLIRE
+DMAX = BDMAX
+DMIN = BDMIN
+DPRODUCT = BDPRODUIT
+DSTDEV = BDECARTYPE
+DSTDEVP = BDECARTYPEP
+DSUM = BDSOMME
+DVAR = BDVAR
+DVARP = BDVARP
+
+##
+## Fonctions de date et d’heure (Date & Time Functions)
+##
+DATE = DATE
+DATEVALUE = DATEVAL
+DAY = JOUR
+DAYS = JOURS
+DAYS360 = JOURS360
+EDATE = MOIS.DECALER
+EOMONTH = FIN.MOIS
+HOUR = HEURE
+ISOWEEKNUM = NO.SEMAINE.ISO
+MINUTE = MINUTE
+MONTH = MOIS
+NETWORKDAYS = NB.JOURS.OUVRES
+NETWORKDAYS.INTL = NB.JOURS.OUVRES.INTL
+NOW = MAINTENANT
+SECOND = SECONDE
+TIME = TEMPS
+TIMEVALUE = TEMPSVAL
+TODAY = AUJOURDHUI
+WEEKDAY = JOURSEM
+WEEKNUM = NO.SEMAINE
+WORKDAY = SERIE.JOUR.OUVRE
+WORKDAY.INTL = SERIE.JOUR.OUVRE.INTL
+YEAR = ANNEE
+YEARFRAC = FRACTION.ANNEE
+
+##
+## Fonctions d’ingénierie (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINDEC
+BIN2HEX = BINHEX
+BIN2OCT = BINOCT
+BITAND = BITET
+BITLSHIFT = BITDECALG
+BITOR = BITOU
+BITRSHIFT = BITDECALD
+BITXOR = BITOUEXCLUSIF
+COMPLEX = COMPLEXE
+CONVERT = CONVERT
+DEC2BIN = DECBIN
+DEC2HEX = DECHEX
+DEC2OCT = DECOCT
+DELTA = DELTA
+ERF = ERF
+ERF.PRECISE = ERF.PRECIS
+ERFC = ERFC
+ERFC.PRECISE = ERFC.PRECIS
+GESTEP = SUP.SEUIL
+HEX2BIN = HEXBIN
+HEX2DEC = HEXDEC
+HEX2OCT = HEXOCT
+IMABS = COMPLEXE.MODULE
+IMAGINARY = COMPLEXE.IMAGINAIRE
+IMARGUMENT = COMPLEXE.ARGUMENT
+IMCONJUGATE = COMPLEXE.CONJUGUE
+IMCOS = COMPLEXE.COS
+IMCOSH = COMPLEXE.COSH
+IMCOT = COMPLEXE.COT
+IMCSC = COMPLEXE.CSC
+IMCSCH = COMPLEXE.CSCH
+IMDIV = COMPLEXE.DIV
+IMEXP = COMPLEXE.EXP
+IMLN = COMPLEXE.LN
+IMLOG10 = COMPLEXE.LOG10
+IMLOG2 = COMPLEXE.LOG2
+IMPOWER = COMPLEXE.PUISSANCE
+IMPRODUCT = COMPLEXE.PRODUIT
+IMREAL = COMPLEXE.REEL
+IMSEC = COMPLEXE.SEC
+IMSECH = COMPLEXE.SECH
+IMSIN = COMPLEXE.SIN
+IMSINH = COMPLEXE.SINH
+IMSQRT = COMPLEXE.RACINE
+IMSUB = COMPLEXE.DIFFERENCE
+IMSUM = COMPLEXE.SOMME
+IMTAN = COMPLEXE.TAN
+OCT2BIN = OCTBIN
+OCT2DEC = OCTDEC
+OCT2HEX = OCTHEX
+
+##
+## Fonctions financières (Financial Functions)
+##
+ACCRINT = INTERET.ACC
+ACCRINTM = INTERET.ACC.MAT
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = NB.JOURS.COUPON.PREC
+COUPDAYS = NB.JOURS.COUPONS
+COUPDAYSNC = NB.JOURS.COUPON.SUIV
+COUPNCD = DATE.COUPON.SUIV
+COUPNUM = NB.COUPONS
+COUPPCD = DATE.COUPON.PREC
+CUMIPMT = CUMUL.INTER
+CUMPRINC = CUMUL.PRINCPER
+DB = DB
+DDB = DDB
+DISC = TAUX.ESCOMPTE
+DOLLARDE = PRIX.DEC
+DOLLARFR = PRIX.FRAC
+DURATION = DUREE
+EFFECT = TAUX.EFFECTIF
+FV = VC
+FVSCHEDULE = VC.PAIEMENTS
+INTRATE = TAUX.INTERET
+IPMT = INTPER
+IRR = TRI
+ISPMT = ISPMT
+MDURATION = DUREE.MODIFIEE
+MIRR = TRIM
+NOMINAL = TAUX.NOMINAL
+NPER = NPM
+NPV = VAN
+ODDFPRICE = PRIX.PCOUPON.IRREG
+ODDFYIELD = REND.PCOUPON.IRREG
+ODDLPRICE = PRIX.DCOUPON.IRREG
+ODDLYIELD = REND.DCOUPON.IRREG
+PDURATION = PDUREE
+PMT = VPM
+PPMT = PRINCPER
+PRICE = PRIX.TITRE
+PRICEDISC = VALEUR.ENCAISSEMENT
+PRICEMAT = PRIX.TITRE.ECHEANCE
+PV = VA
+RATE = TAUX
+RECEIVED = VALEUR.NOMINALE
+RRI = TAUX.INT.EQUIV
+SLN = AMORLIN
+SYD = SYD
+TBILLEQ = TAUX.ESCOMPTE.R
+TBILLPRICE = PRIX.BON.TRESOR
+TBILLYIELD = RENDEMENT.BON.TRESOR
+VDB = VDB
+XIRR = TRI.PAIEMENTS
+XNPV = VAN.PAIEMENTS
+YIELD = RENDEMENT.TITRE
+YIELDDISC = RENDEMENT.SIMPLE
+YIELDMAT = RENDEMENT.TITRE.ECHEANCE
+
+##
+## Fonctions d’information (Information Functions)
+##
+CELL = CELLULE
+ERROR.TYPE = TYPE.ERREUR
+INFO = INFORMATIONS
+ISBLANK = ESTVIDE
+ISERR = ESTERR
+ISERROR = ESTERREUR
+ISEVEN = EST.PAIR
+ISFORMULA = ESTFORMULE
+ISLOGICAL = ESTLOGIQUE
+ISNA = ESTNA
+ISNONTEXT = ESTNONTEXTE
+ISNUMBER = ESTNUM
+ISODD = EST.IMPAIR
+ISREF = ESTREF
+ISTEXT = ESTTEXTE
+N = N
+NA = NA
+SHEET = FEUILLE
+SHEETS = FEUILLES
+TYPE = TYPE
+
+##
+## Fonctions logiques (Logical Functions)
+##
+AND = ET
+FALSE = FAUX
+IF = SI
+IFERROR = SIERREUR
+IFNA = SI.NON.DISP
+IFS = SI.CONDITIONS
+NOT = NON
+OR = OU
+SWITCH = SI.MULTIPLE
+TRUE = VRAI
+XOR = OUX
+
+##
+## Fonctions de recherche et de référence (Lookup & Reference Functions)
+##
+ADDRESS = ADRESSE
+AREAS = ZONES
+CHOOSE = CHOISIR
+COLUMN = COLONNE
+COLUMNS = COLONNES
+FORMULATEXT = FORMULETEXTE
+GETPIVOTDATA = LIREDONNEESTABCROISDYNAMIQUE
+HLOOKUP = RECHERCHEH
+HYPERLINK = LIEN_HYPERTEXTE
+INDEX = INDEX
+INDIRECT = INDIRECT
+LOOKUP = RECHERCHE
+MATCH = EQUIV
+OFFSET = DECALER
+ROW = LIGNE
+ROWS = LIGNES
+RTD = RTD
+TRANSPOSE = TRANSPOSE
+VLOOKUP = RECHERCHEV
+*RC = LC
+
+##
+## Fonctions mathématiques et trigonométriques (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGAT
+ARABIC = CHIFFRE.ARABE
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = BASE
+CEILING.MATH = PLAFOND.MATH
+CEILING.PRECISE = PLAFOND.PRECIS
+COMBIN = COMBIN
+COMBINA = COMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = DEGRES
+ECMA.CEILING = ECMA.PLAFOND
+EVEN = PAIR
+EXP = EXP
+FACT = FACT
+FACTDOUBLE = FACTDOUBLE
+FLOOR.MATH = PLANCHER.MATH
+FLOOR.PRECISE = PLANCHER.PRECIS
+GCD = PGCD
+INT = ENT
+ISO.CEILING = ISO.PLAFOND
+LCM = PPCM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = DETERMAT
+MINVERSE = INVERSEMAT
+MMULT = PRODUITMAT
+MOD = MOD
+MROUND = ARRONDI.AU.MULTIPLE
+MULTINOMIAL = MULTINOMIALE
+MUNIT = MATRICE.UNITAIRE
+ODD = IMPAIR
+PI = PI
+POWER = PUISSANCE
+PRODUCT = PRODUIT
+QUOTIENT = QUOTIENT
+RADIANS = RADIANS
+RAND = ALEA
+RANDBETWEEN = ALEA.ENTRE.BORNES
+ROMAN = ROMAIN
+ROUND = ARRONDI
+ROUNDDOWN = ARRONDI.INF
+ROUNDUP = ARRONDI.SUP
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOMME.SERIES
+SIGN = SIGNE
+SIN = SIN
+SINH = SINH
+SQRT = RACINE
+SQRTPI = RACINE.PI
+SUBTOTAL = SOUS.TOTAL
+SUM = SOMME
+SUMIF = SOMME.SI
+SUMIFS = SOMME.SI.ENS
+SUMPRODUCT = SOMMEPROD
+SUMSQ = SOMME.CARRES
+SUMX2MY2 = SOMME.X2MY2
+SUMX2PY2 = SOMME.X2PY2
+SUMXMY2 = SOMME.XMY2
+TAN = TAN
+TANH = TANH
+TRUNC = TRONQUE
+
+##
+## Fonctions statistiques (Statistical Functions)
+##
+AVEDEV = ECART.MOYEN
+AVERAGE = MOYENNE
+AVERAGEA = AVERAGEA
+AVERAGEIF = MOYENNE.SI
+AVERAGEIFS = MOYENNE.SI.ENS
+BETA.DIST = LOI.BETA.N
+BETA.INV = BETA.INVERSE.N
+BINOM.DIST = LOI.BINOMIALE.N
+BINOM.DIST.RANGE = LOI.BINOMIALE.SERIE
+BINOM.INV = LOI.BINOMIALE.INVERSE
+CHISQ.DIST = LOI.KHIDEUX.N
+CHISQ.DIST.RT = LOI.KHIDEUX.DROITE
+CHISQ.INV = LOI.KHIDEUX.INVERSE
+CHISQ.INV.RT = LOI.KHIDEUX.INVERSE.DROITE
+CHISQ.TEST = CHISQ.TEST
+CONFIDENCE.NORM = INTERVALLE.CONFIANCE.NORMAL
+CONFIDENCE.T = INTERVALLE.CONFIANCE.STUDENT
+CORREL = COEFFICIENT.CORRELATION
+COUNT = NB
+COUNTA = NBVAL
+COUNTBLANK = NB.VIDE
+COUNTIF = NB.SI
+COUNTIFS = NB.SI.ENS
+COVARIANCE.P = COVARIANCE.PEARSON
+COVARIANCE.S = COVARIANCE.STANDARD
+DEVSQ = SOMME.CARRES.ECARTS
+EXPON.DIST = LOI.EXPONENTIELLE.N
+F.DIST = LOI.F.N
+F.DIST.RT = LOI.F.DROITE
+F.INV = INVERSE.LOI.F.N
+F.INV.RT = INVERSE.LOI.F.DROITE
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHER.INVERSE
+FORECAST.ETS = PREVISION.ETS
+FORECAST.ETS.CONFINT = PREVISION.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PREVISION.ETS.CARACTERESAISONNIER
+FORECAST.ETS.STAT = PREVISION.ETS.STAT
+FORECAST.LINEAR = PREVISION.LINEAIRE
+FREQUENCY = FREQUENCE
+GAMMA = GAMMA
+GAMMA.DIST = LOI.GAMMA.N
+GAMMA.INV = LOI.GAMMA.INVERSE.N
+GAMMALN = LNGAMMA
+GAMMALN.PRECISE = LNGAMMA.PRECIS
+GAUSS = GAUSS
+GEOMEAN = MOYENNE.GEOMETRIQUE
+GROWTH = CROISSANCE
+HARMEAN = MOYENNE.HARMONIQUE
+HYPGEOM.DIST = LOI.HYPERGEOMETRIQUE.N
+INTERCEPT = ORDONNEE.ORIGINE
+KURT = KURTOSIS
+LARGE = GRANDE.VALEUR
+LINEST = DROITEREG
+LOGEST = LOGREG
+LOGNORM.DIST = LOI.LOGNORMALE.N
+LOGNORM.INV = LOI.LOGNORMALE.INVERSE.N
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAX.SI
+MEDIAN = MEDIANE
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.SI
+MODE.MULT = MODE.MULTIPLE
+MODE.SNGL = MODE.SIMPLE
+NEGBINOM.DIST = LOI.BINOMIALE.NEG.N
+NORM.DIST = LOI.NORMALE.N
+NORM.INV = LOI.NORMALE.INVERSE.N
+NORM.S.DIST = LOI.NORMALE.STANDARD.N
+NORM.S.INV = LOI.NORMALE.STANDARD.INVERSE.N
+PEARSON = PEARSON
+PERCENTILE.EXC = CENTILE.EXCLURE
+PERCENTILE.INC = CENTILE.INCLURE
+PERCENTRANK.EXC = RANG.POURCENTAGE.EXCLURE
+PERCENTRANK.INC = RANG.POURCENTAGE.INCLURE
+PERMUT = PERMUTATION
+PERMUTATIONA = PERMUTATIONA
+PHI = PHI
+POISSON.DIST = LOI.POISSON.N
+PROB = PROBABILITE
+QUARTILE.EXC = QUARTILE.EXCLURE
+QUARTILE.INC = QUARTILE.INCLURE
+RANK.AVG = MOYENNE.RANG
+RANK.EQ = EQUATION.RANG
+RSQ = COEFFICIENT.DETERMINATION
+SKEW = COEFFICIENT.ASYMETRIE
+SKEW.P = COEFFICIENT.ASYMETRIE.P
+SLOPE = PENTE
+SMALL = PETITE.VALEUR
+STANDARDIZE = CENTREE.REDUITE
+STDEV.P = ECARTYPE.PEARSON
+STDEV.S = ECARTYPE.STANDARD
+STDEVA = STDEVA
+STDEVPA = STDEVPA
+STEYX = ERREUR.TYPE.XY
+T.DIST = LOI.STUDENT.N
+T.DIST.2T = LOI.STUDENT.BILATERALE
+T.DIST.RT = LOI.STUDENT.DROITE
+T.INV = LOI.STUDENT.INVERSE.N
+T.INV.2T = LOI.STUDENT.INVERSE.BILATERALE
+T.TEST = T.TEST
+TREND = TENDANCE
+TRIMMEAN = MOYENNE.REDUITE
+VAR.P = VAR.P.N
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = LOI.WEIBULL.N
+Z.TEST = Z.TEST
+
+##
+## Fonctions de texte (Text Functions)
+##
+BAHTTEXT = BAHTTEXT
+CHAR = CAR
+CLEAN = EPURAGE
+CODE = CODE
+CONCAT = CONCAT
+DOLLAR = DEVISE
+EXACT = EXACT
+FIND = TROUVE
+FIXED = CTXT
+LEFT = GAUCHE
+LEN = NBCAR
+LOWER = MINUSCULE
+MID = STXT
+NUMBERVALUE = VALEURNOMBRE
+PHONETIC = PHONETIQUE
+PROPER = NOMPROPRE
+REPLACE = REMPLACER
+REPT = REPT
+RIGHT = DROITE
+SEARCH = CHERCHE
+SUBSTITUTE = SUBSTITUE
+T = T
+TEXT = TEXTE
+TEXTJOIN = JOINDRE.TEXTE
+TRIM = SUPPRESPACE
+UNICHAR = UNICAR
+UNICODE = UNICODE
+UPPER = MAJUSCULE
+VALUE = CNUM
+
+##
+## Fonctions web (Web Functions)
+##
+ENCODEURL = URLENCODAGE
+FILTERXML = FILTRE.XML
+WEBSERVICE = SERVICEWEB
+
+##
+## Fonctions de compatibilité (Compatibility Functions)
+##
+BETADIST = LOI.BETA
+BETAINV = BETA.INVERSE
+BINOMDIST = LOI.BINOMIALE
+CEILING = PLAFOND
+CHIDIST = LOI.KHIDEUX
+CHIINV = KHIDEUX.INVERSE
+CHITEST = TEST.KHIDEUX
+CONCATENATE = CONCATENER
+CONFIDENCE = INTERVALLE.CONFIANCE
+COVAR = COVARIANCE
+CRITBINOM = CRITERE.LOI.BINOMIALE
+EXPONDIST = LOI.EXPONENTIELLE
+FDIST = LOI.F
+FINV = INVERSE.LOI.F
+FLOOR = PLANCHER
+FORECAST = PREVISION
+FTEST = TEST.F
+GAMMADIST = LOI.GAMMA
+GAMMAINV = LOI.GAMMA.INVERSE
+HYPGEOMDIST = LOI.HYPERGEOMETRIQUE
+LOGINV = LOI.LOGNORMALE.INVERSE
+LOGNORMDIST = LOI.LOGNORMALE
+MODE = MODE
+NEGBINOMDIST = LOI.BINOMIALE.NEG
+NORMDIST = LOI.NORMALE
+NORMINV = LOI.NORMALE.INVERSE
+NORMSDIST = LOI.NORMALE.STANDARD
+NORMSINV = LOI.NORMALE.STANDARD.INVERSE
+PERCENTILE = CENTILE
+PERCENTRANK = RANG.POURCENTAGE
+POISSON = LOI.POISSON
+QUARTILE = QUARTILE
+RANK = RANG
+STDEV = ECARTYPE
+STDEVP = ECARTYPEP
+TDIST = LOI.STUDENT
+TINV = LOI.STUDENT.INVERSE
+TTEST = TEST.STUDENT
+VAR = VAR
+VARP = VAR.P
+WEIBULL = LOI.WEIBULL
+ZTEST = TEST.Z
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/config
new file mode 100644
index 00000000..dc585d71
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Magyar (Hungarian)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #NULLA!
+DIV0 = #ZÉRÓOSZTÓ!
+VALUE = #ÉRTÉK!
+REF = #HIV!
+NAME = #NÉV?
+NUM = #SZÁM!
+NA = #HIÁNYZIK
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions
new file mode 100644
index 00000000..4a375ea2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions
@@ -0,0 +1,538 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Magyar (Hungarian)
+##
+############################################################
+
+
+##
+## Kockafüggvények (Cube Functions)
+##
+CUBEKPIMEMBER = KOCKA.FŐTELJMUT
+CUBEMEMBER = KOCKA.TAG
+CUBEMEMBERPROPERTY = KOCKA.TAG.TUL
+CUBERANKEDMEMBER = KOCKA.HALM.ELEM
+CUBESET = KOCKA.HALM
+CUBESETCOUNT = KOCKA.HALM.DB
+CUBEVALUE = KOCKA.ÉRTÉK
+
+##
+## Adatbázis-kezelő függvények (Database Functions)
+##
+DAVERAGE = AB.ÁTLAG
+DCOUNT = AB.DARAB
+DCOUNTA = AB.DARAB2
+DGET = AB.MEZŐ
+DMAX = AB.MAX
+DMIN = AB.MIN
+DPRODUCT = AB.SZORZAT
+DSTDEV = AB.SZÓRÁS
+DSTDEVP = AB.SZÓRÁS2
+DSUM = AB.SZUM
+DVAR = AB.VAR
+DVARP = AB.VAR2
+
+##
+## Dátumfüggvények (Date & Time Functions)
+##
+DATE = DÁTUM
+DATEDIF = DÁTUMTÓLIG
+DATESTRING = DÁTUMSZÖVEG
+DATEVALUE = DÁTUMÉRTÉK
+DAY = NAP
+DAYS = NAPOK
+DAYS360 = NAP360
+EDATE = KALK.DÁTUM
+EOMONTH = HÓNAP.UTOLSÓ.NAP
+HOUR = ÓRA
+ISOWEEKNUM = ISO.HÉT.SZÁMA
+MINUTE = PERCEK
+MONTH = HÓNAP
+NETWORKDAYS = ÖSSZ.MUNKANAP
+NETWORKDAYS.INTL = ÖSSZ.MUNKANAP.INTL
+NOW = MOST
+SECOND = MPERC
+THAIDAYOFWEEK = THAIHÉTNAPJA
+THAIMONTHOFYEAR = THAIHÓNAP
+THAIYEAR = THAIÉV
+TIME = IDŐ
+TIMEVALUE = IDŐÉRTÉK
+TODAY = MA
+WEEKDAY = HÉT.NAPJA
+WEEKNUM = HÉT.SZÁMA
+WORKDAY = KALK.MUNKANAP
+WORKDAY.INTL = KALK.MUNKANAP.INTL
+YEAR = ÉV
+YEARFRAC = TÖRTÉV
+
+##
+## Mérnöki függvények (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN.DEC
+BIN2HEX = BIN.HEX
+BIN2OCT = BIN.OKT
+BITAND = BIT.ÉS
+BITLSHIFT = BIT.BAL.ELTOL
+BITOR = BIT.VAGY
+BITRSHIFT = BIT.JOBB.ELTOL
+BITXOR = BIT.XVAGY
+COMPLEX = KOMPLEX
+CONVERT = KONVERTÁLÁS
+DEC2BIN = DEC.BIN
+DEC2HEX = DEC.HEX
+DEC2OCT = DEC.OKT
+DELTA = DELTA
+ERF = HIBAF
+ERF.PRECISE = HIBAF.PONTOS
+ERFC = HIBAF.KOMPLEMENTER
+ERFC.PRECISE = HIBAFKOMPLEMENTER.PONTOS
+GESTEP = KÜSZÖBNÉL.NAGYOBB
+HEX2BIN = HEX.BIN
+HEX2DEC = HEX.DEC
+HEX2OCT = HEX.OKT
+IMABS = KÉPZ.ABSZ
+IMAGINARY = KÉPZETES
+IMARGUMENT = KÉPZ.ARGUMENT
+IMCONJUGATE = KÉPZ.KONJUGÁLT
+IMCOS = KÉPZ.COS
+IMCOSH = KÉPZ.COSH
+IMCOT = KÉPZ.COT
+IMCSC = KÉPZ.CSC
+IMCSCH = KÉPZ.CSCH
+IMDIV = KÉPZ.HÁNYAD
+IMEXP = KÉPZ.EXP
+IMLN = KÉPZ.LN
+IMLOG10 = KÉPZ.LOG10
+IMLOG2 = KÉPZ.LOG2
+IMPOWER = KÉPZ.HATV
+IMPRODUCT = KÉPZ.SZORZAT
+IMREAL = KÉPZ.VALÓS
+IMSEC = KÉPZ.SEC
+IMSECH = KÉPZ.SECH
+IMSIN = KÉPZ.SIN
+IMSINH = KÉPZ.SINH
+IMSQRT = KÉPZ.GYÖK
+IMSUB = KÉPZ.KÜL
+IMSUM = KÉPZ.ÖSSZEG
+IMTAN = KÉPZ.TAN
+OCT2BIN = OKT.BIN
+OCT2DEC = OKT.DEC
+OCT2HEX = OKT.HEX
+
+##
+## Pénzügyi függvények (Financial Functions)
+##
+ACCRINT = IDŐSZAKI.KAMAT
+ACCRINTM = LEJÁRATI.KAMAT
+AMORDEGRC = ÉRTÉKCSÖKK.TÉNYEZŐVEL
+AMORLINC = ÉRTÉKCSÖKK
+COUPDAYBS = SZELVÉNYIDŐ.KEZDETTŐL
+COUPDAYS = SZELVÉNYIDŐ
+COUPDAYSNC = SZELVÉNYIDŐ.KIFIZETÉSTŐL
+COUPNCD = ELSŐ.SZELVÉNYDÁTUM
+COUPNUM = SZELVÉNYSZÁM
+COUPPCD = UTOLSÓ.SZELVÉNYDÁTUM
+CUMIPMT = ÖSSZES.KAMAT
+CUMPRINC = ÖSSZES.TŐKERÉSZ
+DB = KCS2
+DDB = KCSA
+DISC = LESZÁM
+DOLLARDE = FORINT.DEC
+DOLLARFR = FORINT.TÖRT
+DURATION = KAMATÉRZ
+EFFECT = TÉNYLEGES
+FV = JBÉ
+FVSCHEDULE = KJÉ
+INTRATE = KAMATRÁTA
+IPMT = RRÉSZLET
+IRR = BMR
+ISPMT = LRÉSZLETKAMAT
+MDURATION = MKAMATÉRZ
+MIRR = MEGTÉRÜLÉS
+NOMINAL = NÉVLEGES
+NPER = PER.SZÁM
+NPV = NMÉ
+ODDFPRICE = ELTÉRŐ.EÁR
+ODDFYIELD = ELTÉRŐ.EHOZAM
+ODDLPRICE = ELTÉRŐ.UÁR
+ODDLYIELD = ELTÉRŐ.UHOZAM
+PDURATION = KAMATÉRZ.PER
+PMT = RÉSZLET
+PPMT = PRÉSZLET
+PRICE = ÁR
+PRICEDISC = ÁR.LESZÁM
+PRICEMAT = ÁR.LEJÁRAT
+PV = MÉ
+RATE = RÁTA
+RECEIVED = KAPOTT
+RRI = MR
+SLN = LCSA
+SYD = ÉSZÖ
+TBILLEQ = KJEGY.EGYENÉRT
+TBILLPRICE = KJEGY.ÁR
+TBILLYIELD = KJEGY.HOZAM
+VDB = ÉCSRI
+XIRR = XBMR
+XNPV = XNJÉ
+YIELD = HOZAM
+YIELDDISC = HOZAM.LESZÁM
+YIELDMAT = HOZAM.LEJÁRAT
+
+##
+## Információs függvények (Information Functions)
+##
+CELL = CELLA
+ERROR.TYPE = HIBA.TÍPUS
+INFO = INFÓ
+ISBLANK = ÜRES
+ISERR = HIBA.E
+ISERROR = HIBÁS
+ISEVEN = PÁROSE
+ISFORMULA = KÉPLET
+ISLOGICAL = LOGIKAI
+ISNA = NINCS
+ISNONTEXT = NEM.SZÖVEG
+ISNUMBER = SZÁM
+ISODD = PÁRATLANE
+ISREF = HIVATKOZÁS
+ISTEXT = SZÖVEG.E
+N = S
+NA = HIÁNYZIK
+SHEET = LAP
+SHEETS = LAPOK
+TYPE = TÍPUS
+
+##
+## Logikai függvények (Logical Functions)
+##
+AND = ÉS
+FALSE = HAMIS
+IF = HA
+IFERROR = HAHIBA
+IFNA = HAHIÁNYZIK
+IFS = HAELSŐIGAZ
+NOT = NEM
+OR = VAGY
+SWITCH = ÁTVÁLT
+TRUE = IGAZ
+XOR = XVAGY
+
+##
+## Keresési és hivatkozási függvények (Lookup & Reference Functions)
+##
+ADDRESS = CÍM
+AREAS = TERÜLET
+CHOOSE = VÁLASZT
+COLUMN = OSZLOP
+COLUMNS = OSZLOPOK
+FORMULATEXT = KÉPLETSZÖVEG
+GETPIVOTDATA = KIMUTATÁSADATOT.VESZ
+HLOOKUP = VKERES
+HYPERLINK = HIPERHIVATKOZÁS
+INDEX = INDEX
+INDIRECT = INDIREKT
+LOOKUP = KERES
+MATCH = HOL.VAN
+OFFSET = ELTOLÁS
+ROW = SOR
+ROWS = SOROK
+RTD = VIA
+TRANSPOSE = TRANSZPONÁLÁS
+VLOOKUP = FKERES
+*RC = SO
+
+##
+## Matematikai és trigonometrikus függvények (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ACOSH
+ACOT = ARCCOT
+ACOTH = ARCCOTH
+AGGREGATE = ÖSSZESÍT
+ARABIC = ARAB
+ASIN = ARCSIN
+ASINH = ASINH
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ATANH
+BASE = ALAP
+CEILING.MATH = PLAFON.MAT
+CEILING.PRECISE = PLAFON.PONTOS
+COMBIN = KOMBINÁCIÓK
+COMBINA = KOMBINÁCIÓK.ISM
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = TIZEDES
+DEGREES = FOK
+ECMA.CEILING = ECMA.PLAFON
+EVEN = PÁROS
+EXP = KITEVŐ
+FACT = FAKT
+FACTDOUBLE = FAKTDUPLA
+FLOOR.MATH = PADLÓ.MAT
+FLOOR.PRECISE = PADLÓ.PONTOS
+GCD = LKO
+INT = INT
+ISO.CEILING = ISO.PLAFON
+LCM = LKT
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = INVERZ.MÁTRIX
+MMULT = MSZORZAT
+MOD = MARADÉK
+MROUND = TÖBBSZ.KEREKÍT
+MULTINOMIAL = SZORHÁNYFAKT
+MUNIT = MMÁTRIX
+ODD = PÁRATLAN
+PI = PI
+POWER = HATVÁNY
+PRODUCT = SZORZAT
+QUOTIENT = KVÓCIENS
+RADIANS = RADIÁN
+RAND = VÉL
+RANDBETWEEN = VÉLETLEN.KÖZÖTT
+ROMAN = RÓMAI
+ROUND = KEREKÍTÉS
+ROUNDBAHTDOWN = BAHTKEREK.LE
+ROUNDBAHTUP = BAHTKEREK.FEL
+ROUNDDOWN = KEREK.LE
+ROUNDUP = KEREK.FEL
+SEC = SEC
+SECH = SECH
+SERIESSUM = SORÖSSZEG
+SIGN = ELŐJEL
+SIN = SIN
+SINH = SINH
+SQRT = GYÖK
+SQRTPI = GYÖKPI
+SUBTOTAL = RÉSZÖSSZEG
+SUM = SZUM
+SUMIF = SZUMHA
+SUMIFS = SZUMHATÖBB
+SUMPRODUCT = SZORZATÖSSZEG
+SUMSQ = NÉGYZETÖSSZEG
+SUMX2MY2 = SZUMX2BŐLY2
+SUMX2PY2 = SZUMX2MEGY2
+SUMXMY2 = SZUMXBŐLY2
+TAN = TAN
+TANH = TANH
+TRUNC = CSONK
+
+##
+## Statisztikai függvények (Statistical Functions)
+##
+AVEDEV = ÁTL.ELTÉRÉS
+AVERAGE = ÁTLAG
+AVERAGEA = ÁTLAGA
+AVERAGEIF = ÁTLAGHA
+AVERAGEIFS = ÁTLAGHATÖBB
+BETA.DIST = BÉTA.ELOSZL
+BETA.INV = BÉTA.INVERZ
+BINOM.DIST = BINOM.ELOSZL
+BINOM.DIST.RANGE = BINOM.ELOSZL.TART
+BINOM.INV = BINOM.INVERZ
+CHISQ.DIST = KHINÉGYZET.ELOSZLÁS
+CHISQ.DIST.RT = KHINÉGYZET.ELOSZLÁS.JOBB
+CHISQ.INV = KHINÉGYZET.INVERZ
+CHISQ.INV.RT = KHINÉGYZET.INVERZ.JOBB
+CHISQ.TEST = KHINÉGYZET.PRÓBA
+CONFIDENCE.NORM = MEGBÍZHATÓSÁG.NORM
+CONFIDENCE.T = MEGBÍZHATÓSÁG.T
+CORREL = KORREL
+COUNT = DARAB
+COUNTA = DARAB2
+COUNTBLANK = DARABÜRES
+COUNTIF = DARABTELI
+COUNTIFS = DARABHATÖBB
+COVARIANCE.P = KOVARIANCIA.S
+COVARIANCE.S = KOVARIANCIA.M
+DEVSQ = SQ
+EXPON.DIST = EXP.ELOSZL
+F.DIST = F.ELOSZL
+F.DIST.RT = F.ELOSZLÁS.JOBB
+F.INV = F.INVERZ
+F.INV.RT = F.INVERZ.JOBB
+F.TEST = F.PRÓB
+FISHER = FISHER
+FISHERINV = INVERZ.FISHER
+FORECAST.ETS = ELŐREJELZÉS.ESIM
+FORECAST.ETS.CONFINT = ELŐREJELZÉS.ESIM.KONFINT
+FORECAST.ETS.SEASONALITY = ELŐREJELZÉS.ESIM.SZEZONALITÁS
+FORECAST.ETS.STAT = ELŐREJELZÉS.ESIM.STAT
+FORECAST.LINEAR = ELŐREJELZÉS.LINEÁRIS
+FREQUENCY = GYAKORISÁG
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.ELOSZL
+GAMMA.INV = GAMMA.INVERZ
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.PONTOS
+GAUSS = GAUSS
+GEOMEAN = MÉRTANI.KÖZÉP
+GROWTH = NÖV
+HARMEAN = HARM.KÖZÉP
+HYPGEOM.DIST = HIPGEOM.ELOSZLÁS
+INTERCEPT = METSZ
+KURT = CSÚCSOSSÁG
+LARGE = NAGY
+LINEST = LIN.ILL
+LOGEST = LOG.ILL
+LOGNORM.DIST = LOGNORM.ELOSZLÁS
+LOGNORM.INV = LOGNORM.INVERZ
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAXHA
+MEDIAN = MEDIÁN
+MIN = MIN
+MINA = MIN2
+MINIFS = MINHA
+MODE.MULT = MÓDUSZ.TÖBB
+MODE.SNGL = MÓDUSZ.EGY
+NEGBINOM.DIST = NEGBINOM.ELOSZLÁS
+NORM.DIST = NORM.ELOSZLÁS
+NORM.INV = NORM.INVERZ
+NORM.S.DIST = NORM.S.ELOSZLÁS
+NORM.S.INV = NORM.S.INVERZ
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTILIS.KIZÁR
+PERCENTILE.INC = PERCENTILIS.TARTALMAZ
+PERCENTRANK.EXC = SZÁZALÉKRANG.KIZÁR
+PERCENTRANK.INC = SZÁZALÉKRANG.TARTALMAZ
+PERMUT = VARIÁCIÓK
+PERMUTATIONA = VARIÁCIÓK.ISM
+PHI = FI
+POISSON.DIST = POISSON.ELOSZLÁS
+PROB = VALÓSZÍNŰSÉG
+QUARTILE.EXC = KVARTILIS.KIZÁR
+QUARTILE.INC = KVARTILIS.TARTALMAZ
+RANK.AVG = RANG.ÁTL
+RANK.EQ = RANG.EGY
+RSQ = RNÉGYZET
+SKEW = FERDESÉG
+SKEW.P = FERDESÉG.P
+SLOPE = MEREDEKSÉG
+SMALL = KICSI
+STANDARDIZE = NORMALIZÁLÁS
+STDEV.P = SZÓR.S
+STDEV.S = SZÓR.M
+STDEVA = SZÓRÁSA
+STDEVPA = SZÓRÁSPA
+STEYX = STHIBAYX
+T.DIST = T.ELOSZL
+T.DIST.2T = T.ELOSZLÁS.2SZ
+T.DIST.RT = T.ELOSZLÁS.JOBB
+T.INV = T.INVERZ
+T.INV.2T = T.INVERZ.2SZ
+T.TEST = T.PRÓB
+TREND = TREND
+TRIMMEAN = RÉSZÁTLAG
+VAR.P = VAR.S
+VAR.S = VAR.M
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.ELOSZLÁS
+Z.TEST = Z.PRÓB
+
+##
+## Szövegműveletekhez használható függvények (Text Functions)
+##
+BAHTTEXT = BAHTSZÖVEG
+CHAR = KARAKTER
+CLEAN = TISZTÍT
+CODE = KÓD
+CONCAT = FŰZ
+DOLLAR = FORINT
+EXACT = AZONOS
+FIND = SZÖVEG.TALÁL
+FIXED = FIX
+ISTHAIDIGIT = ON.THAI.NUMERO
+LEFT = BAL
+LEN = HOSSZ
+LOWER = KISBETŰ
+MID = KÖZÉP
+NUMBERSTRING = SZÁM.BETŰVEL
+NUMBERVALUE = SZÁMÉRTÉK
+PHONETIC = FONETIKUS
+PROPER = TNÉV
+REPLACE = CSERE
+REPT = SOKSZOR
+RIGHT = JOBB
+SEARCH = SZÖVEG.KERES
+SUBSTITUTE = HELYETTE
+T = T
+TEXT = SZÖVEG
+TEXTJOIN = SZÖVEGÖSSZEFŰZÉS
+THAIDIGIT = THAISZÁM
+THAINUMSOUND = THAISZÁMHANG
+THAINUMSTRING = THAISZÁMKAR
+THAISTRINGLENGTH = THAIKARHOSSZ
+TRIM = KIMETSZ
+UNICHAR = UNIKARAKTER
+UNICODE = UNICODE
+UPPER = NAGYBETŰS
+VALUE = ÉRTÉK
+
+##
+## Webes függvények (Web Functions)
+##
+ENCODEURL = URL.KÓDOL
+FILTERXML = XMLSZŰRÉS
+WEBSERVICE = WEBSZOLGÁLTATÁS
+
+##
+## Kompatibilitási függvények (Compatibility Functions)
+##
+BETADIST = BÉTA.ELOSZLÁS
+BETAINV = INVERZ.BÉTA
+BINOMDIST = BINOM.ELOSZLÁS
+CEILING = PLAFON
+CHIDIST = KHI.ELOSZLÁS
+CHIINV = INVERZ.KHI
+CHITEST = KHI.PRÓBA
+CONCATENATE = ÖSSZEFŰZ
+CONFIDENCE = MEGBÍZHATÓSÁG
+COVAR = KOVAR
+CRITBINOM = KRITBINOM
+EXPONDIST = EXP.ELOSZLÁS
+FDIST = F.ELOSZLÁS
+FINV = INVERZ.F
+FLOOR = PADLÓ
+FORECAST = ELŐREJELZÉS
+FTEST = F.PRÓBA
+GAMMADIST = GAMMA.ELOSZLÁS
+GAMMAINV = INVERZ.GAMMA
+HYPGEOMDIST = HIPERGEOM.ELOSZLÁS
+LOGINV = INVERZ.LOG.ELOSZLÁS
+LOGNORMDIST = LOG.ELOSZLÁS
+MODE = MÓDUSZ
+NEGBINOMDIST = NEGBINOM.ELOSZL
+NORMDIST = NORM.ELOSZL
+NORMINV = INVERZ.NORM
+NORMSDIST = STNORMELOSZL
+NORMSINV = INVERZ.STNORM
+PERCENTILE = PERCENTILIS
+PERCENTRANK = SZÁZALÉKRANG
+POISSON = POISSON
+QUARTILE = KVARTILIS
+RANK = SORSZÁM
+STDEV = SZÓRÁS
+STDEVP = SZÓRÁSP
+TDIST = T.ELOSZLÁS
+TINV = INVERZ.T
+TTEST = T.PRÓBA
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = Z.PRÓBA
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/config
new file mode 100644
index 00000000..5c1e4955
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Italiano (Italian)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL
+DIV0
+VALUE = #VALORE!
+REF = #RIF!
+NAME = #NOME?
+NUM
+NA = #N/D
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/functions
new file mode 100644
index 00000000..c14ed85f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/it/functions
@@ -0,0 +1,537 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Italiano (Italian)
+##
+############################################################
+
+
+##
+## Funzioni cubo (Cube Functions)
+##
+CUBEKPIMEMBER = MEMBRO.KPI.CUBO
+CUBEMEMBER = MEMBRO.CUBO
+CUBEMEMBERPROPERTY = PROPRIETÀ.MEMBRO.CUBO
+CUBERANKEDMEMBER = MEMBRO.CUBO.CON.RANGO
+CUBESET = SET.CUBO
+CUBESETCOUNT = CONTA.SET.CUBO
+CUBEVALUE = VALORE.CUBO
+
+##
+## Funzioni di database (Database Functions)
+##
+DAVERAGE = DB.MEDIA
+DCOUNT = DB.CONTA.NUMERI
+DCOUNTA = DB.CONTA.VALORI
+DGET = DB.VALORI
+DMAX = DB.MAX
+DMIN = DB.MIN
+DPRODUCT = DB.PRODOTTO
+DSTDEV = DB.DEV.ST
+DSTDEVP = DB.DEV.ST.POP
+DSUM = DB.SOMMA
+DVAR = DB.VAR
+DVARP = DB.VAR.POP
+
+##
+## Funzioni data e ora (Date & Time Functions)
+##
+DATE = DATA
+DATEDIF = DATA.DIFF
+DATESTRING = DATA.STRINGA
+DATEVALUE = DATA.VALORE
+DAY = GIORNO
+DAYS = GIORNI
+DAYS360 = GIORNO360
+EDATE = DATA.MESE
+EOMONTH = FINE.MESE
+HOUR = ORA
+ISOWEEKNUM = NUM.SETTIMANA.ISO
+MINUTE = MINUTO
+MONTH = MESE
+NETWORKDAYS = GIORNI.LAVORATIVI.TOT
+NETWORKDAYS.INTL = GIORNI.LAVORATIVI.TOT.INTL
+NOW = ADESSO
+SECOND = SECONDO
+THAIDAYOFWEEK = THAIGIORNODELLASETTIMANA
+THAIMONTHOFYEAR = THAIMESEDELLANNO
+THAIYEAR = THAIANNO
+TIME = ORARIO
+TIMEVALUE = ORARIO.VALORE
+TODAY = OGGI
+WEEKDAY = GIORNO.SETTIMANA
+WEEKNUM = NUM.SETTIMANA
+WORKDAY = GIORNO.LAVORATIVO
+WORKDAY.INTL = GIORNO.LAVORATIVO.INTL
+YEAR = ANNO
+YEARFRAC = FRAZIONE.ANNO
+
+##
+## Funzioni ingegneristiche (Engineering Functions)
+##
+BESSELI = BESSEL.I
+BESSELJ = BESSEL.J
+BESSELK = BESSEL.K
+BESSELY = BESSEL.Y
+BIN2DEC = BINARIO.DECIMALE
+BIN2HEX = BINARIO.HEX
+BIN2OCT = BINARIO.OCT
+BITAND = BITAND
+BITLSHIFT = BIT.SPOSTA.SX
+BITOR = BITOR
+BITRSHIFT = BIT.SPOSTA.DX
+BITXOR = BITXOR
+COMPLEX = COMPLESSO
+CONVERT = CONVERTI
+DEC2BIN = DECIMALE.BINARIO
+DEC2HEX = DECIMALE.HEX
+DEC2OCT = DECIMALE.OCT
+DELTA = DELTA
+ERF = FUNZ.ERRORE
+ERF.PRECISE = FUNZ.ERRORE.PRECISA
+ERFC = FUNZ.ERRORE.COMP
+ERFC.PRECISE = FUNZ.ERRORE.COMP.PRECISA
+GESTEP = SOGLIA
+HEX2BIN = HEX.BINARIO
+HEX2DEC = HEX.DECIMALE
+HEX2OCT = HEX.OCT
+IMABS = COMP.MODULO
+IMAGINARY = COMP.IMMAGINARIO
+IMARGUMENT = COMP.ARGOMENTO
+IMCONJUGATE = COMP.CONIUGATO
+IMCOS = COMP.COS
+IMCOSH = COMP.COSH
+IMCOT = COMP.COT
+IMCSC = COMP.CSC
+IMCSCH = COMP.CSCH
+IMDIV = COMP.DIV
+IMEXP = COMP.EXP
+IMLN = COMP.LN
+IMLOG10 = COMP.LOG10
+IMLOG2 = COMP.LOG2
+IMPOWER = COMP.POTENZA
+IMPRODUCT = COMP.PRODOTTO
+IMREAL = COMP.PARTE.REALE
+IMSEC = COMP.SEC
+IMSECH = COMP.SECH
+IMSIN = COMP.SEN
+IMSINH = COMP.SENH
+IMSQRT = COMP.RADQ
+IMSUB = COMP.DIFF
+IMSUM = COMP.SOMMA
+IMTAN = COMP.TAN
+OCT2BIN = OCT.BINARIO
+OCT2DEC = OCT.DECIMALE
+OCT2HEX = OCT.HEX
+
+##
+## Funzioni finanziarie (Financial Functions)
+##
+ACCRINT = INT.MATURATO.PER
+ACCRINTM = INT.MATURATO.SCAD
+AMORDEGRC = AMMORT.DEGR
+AMORLINC = AMMORT.PER
+COUPDAYBS = GIORNI.CED.INIZ.LIQ
+COUPDAYS = GIORNI.CED
+COUPDAYSNC = GIORNI.CED.NUOVA
+COUPNCD = DATA.CED.SUCC
+COUPNUM = NUM.CED
+COUPPCD = DATA.CED.PREC
+CUMIPMT = INT.CUMUL
+CUMPRINC = CAP.CUM
+DB = AMMORT.FISSO
+DDB = AMMORT
+DISC = TASSO.SCONTO
+DOLLARDE = VALUTA.DEC
+DOLLARFR = VALUTA.FRAZ
+DURATION = DURATA
+EFFECT = EFFETTIVO
+FV = VAL.FUT
+FVSCHEDULE = VAL.FUT.CAPITALE
+INTRATE = TASSO.INT
+IPMT = INTERESSI
+IRR = TIR.COST
+ISPMT = INTERESSE.RATA
+MDURATION = DURATA.M
+MIRR = TIR.VAR
+NOMINAL = NOMINALE
+NPER = NUM.RATE
+NPV = VAN
+ODDFPRICE = PREZZO.PRIMO.IRR
+ODDFYIELD = REND.PRIMO.IRR
+ODDLPRICE = PREZZO.ULTIMO.IRR
+ODDLYIELD = REND.ULTIMO.IRR
+PDURATION = DURATA.P
+PMT = RATA
+PPMT = P.RATA
+PRICE = PREZZO
+PRICEDISC = PREZZO.SCONT
+PRICEMAT = PREZZO.SCAD
+PV = VA
+RATE = TASSO
+RECEIVED = RICEV.SCAD
+RRI = RIT.INVEST.EFFETT
+SLN = AMMORT.COST
+SYD = AMMORT.ANNUO
+TBILLEQ = BOT.EQUIV
+TBILLPRICE = BOT.PREZZO
+TBILLYIELD = BOT.REND
+VDB = AMMORT.VAR
+XIRR = TIR.X
+XNPV = VAN.X
+YIELD = REND
+YIELDDISC = REND.TITOLI.SCONT
+YIELDMAT = REND.SCAD
+
+##
+## Funzioni relative alle informazioni (Information Functions)
+##
+CELL = CELLA
+ERROR.TYPE = ERRORE.TIPO
+INFO = AMBIENTE.INFO
+ISBLANK = VAL.VUOTO
+ISERR = VAL.ERR
+ISERROR = VAL.ERRORE
+ISEVEN = VAL.PARI
+ISFORMULA = VAL.FORMULA
+ISLOGICAL = VAL.LOGICO
+ISNA = VAL.NON.DISP
+ISNONTEXT = VAL.NON.TESTO
+ISNUMBER = VAL.NUMERO
+ISODD = VAL.DISPARI
+ISREF = VAL.RIF
+ISTEXT = VAL.TESTO
+N = NUM
+NA = NON.DISP
+SHEET = FOGLIO
+SHEETS = FOGLI
+TYPE = TIPO
+
+##
+## Funzioni logiche (Logical Functions)
+##
+AND = E
+FALSE = FALSO
+IF = SE
+IFERROR = SE.ERRORE
+IFNA = SE.NON.DISP.
+IFS = PIÙ.SE
+NOT = NON
+OR = O
+SWITCH = SWITCH
+TRUE = VERO
+XOR = XOR
+
+##
+## Funzioni di ricerca e di riferimento (Lookup & Reference Functions)
+##
+ADDRESS = INDIRIZZO
+AREAS = AREE
+CHOOSE = SCEGLI
+COLUMN = RIF.COLONNA
+COLUMNS = COLONNE
+FORMULATEXT = TESTO.FORMULA
+GETPIVOTDATA = INFO.DATI.TAB.PIVOT
+HLOOKUP = CERCA.ORIZZ
+HYPERLINK = COLLEG.IPERTESTUALE
+INDEX = INDICE
+INDIRECT = INDIRETTO
+LOOKUP = CERCA
+MATCH = CONFRONTA
+OFFSET = SCARTO
+ROW = RIF.RIGA
+ROWS = RIGHE
+RTD = DATITEMPOREALE
+TRANSPOSE = MATR.TRASPOSTA
+VLOOKUP = CERCA.VERT
+
+##
+## Funzioni matematiche e trigonometriche (Math & Trig Functions)
+##
+ABS = ASS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ARCCOT
+ACOTH = ARCCOTH
+AGGREGATE = AGGREGA
+ARABIC = ARABO
+ASIN = ARCSEN
+ASINH = ARCSENH
+ATAN = ARCTAN
+ATAN2 = ARCTAN.2
+ATANH = ARCTANH
+BASE = BASE
+CEILING.MATH = ARROTONDA.ECCESSO.MAT
+CEILING.PRECISE = ARROTONDA.ECCESSO.PRECISA
+COMBIN = COMBINAZIONE
+COMBINA = COMBINAZIONE.VALORI
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMALE
+DEGREES = GRADI
+ECMA.CEILING = ECMA.ARROTONDA.ECCESSO
+EVEN = PARI
+EXP = EXP
+FACT = FATTORIALE
+FACTDOUBLE = FATT.DOPPIO
+FLOOR.MATH = ARROTONDA.DIFETTO.MAT
+FLOOR.PRECISE = ARROTONDA.DIFETTO.PRECISA
+GCD = MCD
+INT = INT
+ISO.CEILING = ISO.ARROTONDA.ECCESSO
+LCM = MCM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MATR.DETERM
+MINVERSE = MATR.INVERSA
+MMULT = MATR.PRODOTTO
+MOD = RESTO
+MROUND = ARROTONDA.MULTIPLO
+MULTINOMIAL = MULTINOMIALE
+MUNIT = MATR.UNIT
+ODD = DISPARI
+PI = PI.GRECO
+POWER = POTENZA
+PRODUCT = PRODOTTO
+QUOTIENT = QUOZIENTE
+RADIANS = RADIANTI
+RAND = CASUALE
+RANDBETWEEN = CASUALE.TRA
+ROMAN = ROMANO
+ROUND = ARROTONDA
+ROUNDBAHTDOWN = ARROTBAHTGIU
+ROUNDBAHTUP = ARROTBAHTSU
+ROUNDDOWN = ARROTONDA.PER.DIF
+ROUNDUP = ARROTONDA.PER.ECC
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOMMA.SERIE
+SIGN = SEGNO
+SIN = SEN
+SINH = SENH
+SQRT = RADQ
+SQRTPI = RADQ.PI.GRECO
+SUBTOTAL = SUBTOTALE
+SUM = SOMMA
+SUMIF = SOMMA.SE
+SUMIFS = SOMMA.PIÙ.SE
+SUMPRODUCT = MATR.SOMMA.PRODOTTO
+SUMSQ = SOMMA.Q
+SUMX2MY2 = SOMMA.DIFF.Q
+SUMX2PY2 = SOMMA.SOMMA.Q
+SUMXMY2 = SOMMA.Q.DIFF
+TAN = TAN
+TANH = TANH
+TRUNC = TRONCA
+
+##
+## Funzioni statistiche (Statistical Functions)
+##
+AVEDEV = MEDIA.DEV
+AVERAGE = MEDIA
+AVERAGEA = MEDIA.VALORI
+AVERAGEIF = MEDIA.SE
+AVERAGEIFS = MEDIA.PIÙ.SE
+BETA.DIST = DISTRIB.BETA.N
+BETA.INV = INV.BETA.N
+BINOM.DIST = DISTRIB.BINOM.N
+BINOM.DIST.RANGE = INTERVALLO.DISTRIB.BINOM.N.
+BINOM.INV = INV.BINOM
+CHISQ.DIST = DISTRIB.CHI.QUAD
+CHISQ.DIST.RT = DISTRIB.CHI.QUAD.DS
+CHISQ.INV = INV.CHI.QUAD
+CHISQ.INV.RT = INV.CHI.QUAD.DS
+CHISQ.TEST = TEST.CHI.QUAD
+CONFIDENCE.NORM = CONFIDENZA.NORM
+CONFIDENCE.T = CONFIDENZA.T
+CORREL = CORRELAZIONE
+COUNT = CONTA.NUMERI
+COUNTA = CONTA.VALORI
+COUNTBLANK = CONTA.VUOTE
+COUNTIF = CONTA.SE
+COUNTIFS = CONTA.PIÙ.SE
+COVARIANCE.P = COVARIANZA.P
+COVARIANCE.S = COVARIANZA.C
+DEVSQ = DEV.Q
+EXPON.DIST = DISTRIB.EXP.N
+F.DIST = DISTRIBF
+F.DIST.RT = DISTRIB.F.DS
+F.INV = INVF
+F.INV.RT = INV.F.DS
+F.TEST = TESTF
+FISHER = FISHER
+FISHERINV = INV.FISHER
+FORECAST.ETS = PREVISIONE.ETS
+FORECAST.ETS.CONFINT = PREVISIONE.ETS.INTCONF
+FORECAST.ETS.SEASONALITY = PREVISIONE.ETS.STAGIONALITÀ
+FORECAST.ETS.STAT = PREVISIONE.ETS.STAT
+FORECAST.LINEAR = PREVISIONE.LINEARE
+FREQUENCY = FREQUENZA
+GAMMA = GAMMA
+GAMMA.DIST = DISTRIB.GAMMA.N
+GAMMA.INV = INV.GAMMA.N
+GAMMALN = LN.GAMMA
+GAMMALN.PRECISE = LN.GAMMA.PRECISA
+GAUSS = GAUSS
+GEOMEAN = MEDIA.GEOMETRICA
+GROWTH = CRESCITA
+HARMEAN = MEDIA.ARMONICA
+HYPGEOM.DIST = DISTRIB.IPERGEOM.N
+INTERCEPT = INTERCETTA
+KURT = CURTOSI
+LARGE = GRANDE
+LINEST = REGR.LIN
+LOGEST = REGR.LOG
+LOGNORM.DIST = DISTRIB.LOGNORM.N
+LOGNORM.INV = INV.LOGNORM.N
+MAX = MAX
+MAXA = MAX.VALORI
+MAXIFS = MAX.PIÙ.SE
+MEDIAN = MEDIANA
+MIN = MIN
+MINA = MIN.VALORI
+MINIFS = MIN.PIÙ.SE
+MODE.MULT = MODA.MULT
+MODE.SNGL = MODA.SNGL
+NEGBINOM.DIST = DISTRIB.BINOM.NEG.N
+NORM.DIST = DISTRIB.NORM.N
+NORM.INV = INV.NORM.N
+NORM.S.DIST = DISTRIB.NORM.ST.N
+NORM.S.INV = INV.NORM.S
+PEARSON = PEARSON
+PERCENTILE.EXC = ESC.PERCENTILE
+PERCENTILE.INC = INC.PERCENTILE
+PERCENTRANK.EXC = ESC.PERCENT.RANGO
+PERCENTRANK.INC = INC.PERCENT.RANGO
+PERMUT = PERMUTAZIONE
+PERMUTATIONA = PERMUTAZIONE.VALORI
+PHI = PHI
+POISSON.DIST = DISTRIB.POISSON
+PROB = PROBABILITÀ
+QUARTILE.EXC = ESC.QUARTILE
+QUARTILE.INC = INC.QUARTILE
+RANK.AVG = RANGO.MEDIA
+RANK.EQ = RANGO.UG
+RSQ = RQ
+SKEW = ASIMMETRIA
+SKEW.P = ASIMMETRIA.P
+SLOPE = PENDENZA
+SMALL = PICCOLO
+STANDARDIZE = NORMALIZZA
+STDEV.P = DEV.ST.P
+STDEV.S = DEV.ST.C
+STDEVA = DEV.ST.VALORI
+STDEVPA = DEV.ST.POP.VALORI
+STEYX = ERR.STD.YX
+T.DIST = DISTRIB.T.N
+T.DIST.2T = DISTRIB.T.2T
+T.DIST.RT = DISTRIB.T.DS
+T.INV = INVT
+T.INV.2T = INV.T.2T
+T.TEST = TESTT
+TREND = TENDENZA
+TRIMMEAN = MEDIA.TRONCATA
+VAR.P = VAR.P
+VAR.S = VAR.C
+VARA = VAR.VALORI
+VARPA = VAR.POP.VALORI
+WEIBULL.DIST = DISTRIB.WEIBULL
+Z.TEST = TESTZ
+
+##
+## Funzioni di testo (Text Functions)
+##
+BAHTTEXT = BAHTTESTO
+CHAR = CODICE.CARATT
+CLEAN = LIBERA
+CODE = CODICE
+CONCAT = CONCAT
+DOLLAR = VALUTA
+EXACT = IDENTICO
+FIND = TROVA
+FIXED = FISSO
+ISTHAIDIGIT = ÈTHAICIFRA
+LEFT = SINISTRA
+LEN = LUNGHEZZA
+LOWER = MINUSC
+MID = STRINGA.ESTRAI
+NUMBERSTRING = NUMERO.STRINGA
+NUMBERVALUE = NUMERO.VALORE
+PHONETIC = FURIGANA
+PROPER = MAIUSC.INIZ
+REPLACE = RIMPIAZZA
+REPT = RIPETI
+RIGHT = DESTRA
+SEARCH = RICERCA
+SUBSTITUTE = SOSTITUISCI
+T = T
+TEXT = TESTO
+TEXTJOIN = TESTO.UNISCI
+THAIDIGIT = THAICIFRA
+THAINUMSOUND = THAINUMSUONO
+THAINUMSTRING = THAISZÁMKAR
+THAISTRINGLENGTH = THAILUNGSTRINGA
+TRIM = ANNULLA.SPAZI
+UNICHAR = CARATT.UNI
+UNICODE = UNICODE
+UPPER = MAIUSC
+VALUE = VALORE
+
+##
+## Funzioni Web (Web Functions)
+##
+ENCODEURL = CODIFICA.URL
+FILTERXML = FILTRO.XML
+WEBSERVICE = SERVIZIO.WEB
+
+##
+## Funzioni di compatibilità (Compatibility Functions)
+##
+BETADIST = DISTRIB.BETA
+BETAINV = INV.BETA
+BINOMDIST = DISTRIB.BINOM
+CEILING = ARROTONDA.ECCESSO
+CHIDIST = DISTRIB.CHI
+CHIINV = INV.CHI
+CHITEST = TEST.CHI
+CONCATENATE = CONCATENA
+CONFIDENCE = CONFIDENZA
+COVAR = COVARIANZA
+CRITBINOM = CRIT.BINOM
+EXPONDIST = DISTRIB.EXP
+FDIST = DISTRIB.F
+FINV = INV.F
+FLOOR = ARROTONDA.DIFETTO
+FORECAST = PREVISIONE
+FTEST = TEST.F
+GAMMADIST = DISTRIB.GAMMA
+GAMMAINV = INV.GAMMA
+HYPGEOMDIST = DISTRIB.IPERGEOM
+LOGINV = INV.LOGNORM
+LOGNORMDIST = DISTRIB.LOGNORM
+MODE = MODA
+NEGBINOMDIST = DISTRIB.BINOM.NEG
+NORMDIST = DISTRIB.NORM
+NORMINV = INV.NORM
+NORMSDIST = DISTRIB.NORM.ST
+NORMSINV = INV.NORM.ST
+PERCENTILE = PERCENTILE
+PERCENTRANK = PERCENT.RANGO
+POISSON = POISSON
+QUARTILE = QUARTILE
+RANK = RANGO
+STDEV = DEV.ST
+STDEVP = DEV.ST.POP
+TDIST = DISTRIB.T
+TINV = INV.T
+TTEST = TEST.T
+VAR = VAR
+VARP = VAR.POP
+WEIBULL = WEIBULL
+ZTEST = TEST.Z
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/config
new file mode 100644
index 00000000..a7f3be17
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Norsk Bokmål (Norwegian Bokmål)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL
+DIV0
+VALUE = #VERDI!
+REF
+NAME = #NAVN?
+NUM
+NA = #N/D
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions
new file mode 100644
index 00000000..d352e1f4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions
@@ -0,0 +1,539 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Norsk Bokmål (Norwegian Bokmål)
+##
+############################################################
+
+
+##
+## Kubefunksjoner (Cube Functions)
+##
+CUBEKPIMEMBER = KUBEKPIMEDLEM
+CUBEMEMBER = KUBEMEDLEM
+CUBEMEMBERPROPERTY = KUBEMEDLEMEGENSKAP
+CUBERANKEDMEMBER = KUBERANGERTMEDLEM
+CUBESET = KUBESETT
+CUBESETCOUNT = KUBESETTANTALL
+CUBEVALUE = KUBEVERDI
+
+##
+## Databasefunksjoner (Database Functions)
+##
+DAVERAGE = DGJENNOMSNITT
+DCOUNT = DANTALL
+DCOUNTA = DANTALLA
+DGET = DHENT
+DMAX = DMAKS
+DMIN = DMIN
+DPRODUCT = DPRODUKT
+DSTDEV = DSTDAV
+DSTDEVP = DSTDAVP
+DSUM = DSUMMER
+DVAR = DVARIANS
+DVARP = DVARIANSP
+
+##
+## Dato- og tidsfunksjoner (Date & Time Functions)
+##
+DATE = DATO
+DATEDIF = DATODIFF
+DATESTRING = DATOSTRENG
+DATEVALUE = DATOVERDI
+DAY = DAG
+DAYS = DAGER
+DAYS360 = DAGER360
+EDATE = DAG.ETTER
+EOMONTH = MÅNEDSSLUTT
+HOUR = TIME
+ISOWEEKNUM = ISOUKENR
+MINUTE = MINUTT
+MONTH = MÅNED
+NETWORKDAYS = NETT.ARBEIDSDAGER
+NETWORKDAYS.INTL = NETT.ARBEIDSDAGER.INTL
+NOW = NÅ
+SECOND = SEKUND
+THAIDAYOFWEEK = THAIUKEDAG
+THAIMONTHOFYEAR = THAIMÅNED
+THAIYEAR = THAIÅR
+TIME = TID
+TIMEVALUE = TIDSVERDI
+TODAY = IDAG
+WEEKDAY = UKEDAG
+WEEKNUM = UKENR
+WORKDAY = ARBEIDSDAG
+WORKDAY.INTL = ARBEIDSDAG.INTL
+YEAR = ÅR
+YEARFRAC = ÅRDEL
+
+##
+## Tekniske funksjoner (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINTILDES
+BIN2HEX = BINTILHEKS
+BIN2OCT = BINTILOKT
+BITAND = BITOG
+BITLSHIFT = BITVFORSKYV
+BITOR = BITELLER
+BITRSHIFT = BITHFORSKYV
+BITXOR = BITEKSKLUSIVELLER
+COMPLEX = KOMPLEKS
+CONVERT = KONVERTER
+DEC2BIN = DESTILBIN
+DEC2HEX = DESTILHEKS
+DEC2OCT = DESTILOKT
+DELTA = DELTA
+ERF = FEILF
+ERF.PRECISE = FEILF.PRESIS
+ERFC = FEILFK
+ERFC.PRECISE = FEILFK.PRESIS
+GESTEP = GRENSEVERDI
+HEX2BIN = HEKSTILBIN
+HEX2DEC = HEKSTILDES
+HEX2OCT = HEKSTILOKT
+IMABS = IMABS
+IMAGINARY = IMAGINÆR
+IMARGUMENT = IMARGUMENT
+IMCONJUGATE = IMKONJUGERT
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCSC
+IMCSCH = IMCSCH
+IMDIV = IMDIV
+IMEXP = IMEKSP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMOPPHØY
+IMPRODUCT = IMPRODUKT
+IMREAL = IMREELL
+IMSEC = IMSEC
+IMSECH = IMSECH
+IMSIN = IMSIN
+IMSINH = IMSINH
+IMSQRT = IMROT
+IMSUB = IMSUB
+IMSUM = IMSUMMER
+IMTAN = IMTAN
+OCT2BIN = OKTTILBIN
+OCT2DEC = OKTTILDES
+OCT2HEX = OKTTILHEKS
+
+##
+## Økonomiske funksjoner (Financial Functions)
+##
+ACCRINT = PÅLØPT.PERIODISK.RENTE
+ACCRINTM = PÅLØPT.FORFALLSRENTE
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = OBLIG.DAGER.FF
+COUPDAYS = OBLIG.DAGER
+COUPDAYSNC = OBLIG.DAGER.NF
+COUPNCD = OBLIG.DAGER.EF
+COUPNUM = OBLIG.ANTALL
+COUPPCD = OBLIG.DAG.FORRIGE
+CUMIPMT = SAMLET.RENTE
+CUMPRINC = SAMLET.HOVEDSTOL
+DB = DAVSKR
+DDB = DEGRAVS
+DISC = DISKONTERT
+DOLLARDE = DOLLARDE
+DOLLARFR = DOLLARBR
+DURATION = VARIGHET
+EFFECT = EFFEKTIV.RENTE
+FV = SLUTTVERDI
+FVSCHEDULE = SVPLAN
+INTRATE = RENTESATS
+IPMT = RAVDRAG
+IRR = IR
+ISPMT = ER.AVDRAG
+MDURATION = MVARIGHET
+MIRR = MODIR
+NOMINAL = NOMINELL
+NPER = PERIODER
+NPV = NNV
+ODDFPRICE = AVVIKFP.PRIS
+ODDFYIELD = AVVIKFP.AVKASTNING
+ODDLPRICE = AVVIKSP.PRIS
+ODDLYIELD = AVVIKSP.AVKASTNING
+PDURATION = PVARIGHET
+PMT = AVDRAG
+PPMT = AMORT
+PRICE = PRIS
+PRICEDISC = PRIS.DISKONTERT
+PRICEMAT = PRIS.FORFALL
+PV = NÅVERDI
+RATE = RENTE
+RECEIVED = MOTTATT.AVKAST
+RRI = REALISERT.AVKASTNING
+SLN = LINAVS
+SYD = ÅRSAVS
+TBILLEQ = TBILLEKV
+TBILLPRICE = TBILLPRIS
+TBILLYIELD = TBILLAVKASTNING
+VDB = VERDIAVS
+XIRR = XIR
+XNPV = XNNV
+YIELD = AVKAST
+YIELDDISC = AVKAST.DISKONTERT
+YIELDMAT = AVKAST.FORFALL
+
+##
+## Informasjonsfunksjoner (Information Functions)
+##
+CELL = CELLE
+ERROR.TYPE = FEIL.TYPE
+INFO = INFO
+ISBLANK = ERTOM
+ISERR = ERF
+ISERROR = ERFEIL
+ISEVEN = ERPARTALL
+ISFORMULA = ERFORMEL
+ISLOGICAL = ERLOGISK
+ISNA = ERIT
+ISNONTEXT = ERIKKETEKST
+ISNUMBER = ERTALL
+ISODD = ERODDE
+ISREF = ERREF
+ISTEXT = ERTEKST
+N = N
+NA = IT
+SHEET = ARK
+SHEETS = ANTALL.ARK
+TYPE = VERDITYPE
+
+##
+## Logiske funksjoner (Logical Functions)
+##
+AND = OG
+FALSE = USANN
+IF = HVIS
+IFERROR = HVISFEIL
+IFNA = HVIS.IT
+IFS = HVIS.SETT
+NOT = IKKE
+OR = ELLER
+SWITCH = BRYTER
+TRUE = SANN
+XOR = EKSKLUSIVELLER
+
+##
+## Oppslag- og referansefunksjoner (Lookup & Reference Functions)
+##
+ADDRESS = ADRESSE
+AREAS = OMRÅDER
+CHOOSE = VELG
+COLUMN = KOLONNE
+COLUMNS = KOLONNER
+FORMULATEXT = FORMELTEKST
+GETPIVOTDATA = HENTPIVOTDATA
+HLOOKUP = FINN.KOLONNE
+HYPERLINK = HYPERKOBLING
+INDEX = INDEKS
+INDIRECT = INDIREKTE
+LOOKUP = SLÅ.OPP
+MATCH = SAMMENLIGNE
+OFFSET = FORSKYVNING
+ROW = RAD
+ROWS = RADER
+RTD = RTD
+TRANSPOSE = TRANSPONER
+VLOOKUP = FINN.RAD
+*RC = RK
+
+##
+## Matematikk- og trigonometrifunksjoner (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = MENGDE
+ARABIC = ARABISK
+ASIN = ARCSIN
+ASINH = ARCSINH
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ARCTANH
+BASE = GRUNNTALL
+CEILING.MATH = AVRUND.GJELDENDE.MULTIPLUM.OPP.MATEMATISK
+CEILING.PRECISE = AVRUND.GJELDENDE.MULTIPLUM.PRESIS
+COMBIN = KOMBINASJON
+COMBINA = KOMBINASJONA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DESIMAL
+DEGREES = GRADER
+ECMA.CEILING = ECMA.AVRUND.GJELDENDE.MULTIPLUM
+EVEN = AVRUND.TIL.PARTALL
+EXP = EKSP
+FACT = FAKULTET
+FACTDOUBLE = DOBBELFAKT
+FLOOR.MATH = AVRUND.GJELDENDE.MULTIPLUM.NED.MATEMATISK
+FLOOR.PRECISE = AVRUND.GJELDENDE.MULTIPLUM.NED.PRESIS
+GCD = SFF
+INT = HELTALL
+ISO.CEILING = ISO.AVRUND.GJELDENDE.MULTIPLUM
+LCM = MFM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MINVERS
+MMULT = MMULT
+MOD = REST
+MROUND = MRUND
+MULTINOMIAL = MULTINOMINELL
+MUNIT = MENHET
+ODD = AVRUND.TIL.ODDETALL
+PI = PI
+POWER = OPPHØYD.I
+PRODUCT = PRODUKT
+QUOTIENT = KVOTIENT
+RADIANS = RADIANER
+RAND = TILFELDIG
+RANDBETWEEN = TILFELDIGMELLOM
+ROMAN = ROMERTALL
+ROUND = AVRUND
+ROUNDBAHTDOWN = RUNDAVBAHTNEDOVER
+ROUNDBAHTUP = RUNDAVBAHTOPPOVER
+ROUNDDOWN = AVRUND.NED
+ROUNDUP = AVRUND.OPP
+SEC = SEC
+SECH = SECH
+SERIESSUM = SUMMER.REKKE
+SIGN = FORTEGN
+SIN = SIN
+SINH = SINH
+SQRT = ROT
+SQRTPI = ROTPI
+SUBTOTAL = DELSUM
+SUM = SUMMER
+SUMIF = SUMMERHVIS
+SUMIFS = SUMMER.HVIS.SETT
+SUMPRODUCT = SUMMERPRODUKT
+SUMSQ = SUMMERKVADRAT
+SUMX2MY2 = SUMMERX2MY2
+SUMX2PY2 = SUMMERX2PY2
+SUMXMY2 = SUMMERXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = AVKORT
+
+##
+## Statistiske funksjoner (Statistical Functions)
+##
+AVEDEV = GJENNOMSNITTSAVVIK
+AVERAGE = GJENNOMSNITT
+AVERAGEA = GJENNOMSNITTA
+AVERAGEIF = GJENNOMSNITTHVIS
+AVERAGEIFS = GJENNOMSNITT.HVIS.SETT
+BETA.DIST = BETA.FORDELING.N
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.FORDELING.N
+BINOM.DIST.RANGE = BINOM.FORDELING.OMRÅDE
+BINOM.INV = BINOM.INV
+CHISQ.DIST = KJIKVADRAT.FORDELING
+CHISQ.DIST.RT = KJIKVADRAT.FORDELING.H
+CHISQ.INV = KJIKVADRAT.INV
+CHISQ.INV.RT = KJIKVADRAT.INV.H
+CHISQ.TEST = KJIKVADRAT.TEST
+CONFIDENCE.NORM = KONFIDENS.NORM
+CONFIDENCE.T = KONFIDENS.T
+CORREL = KORRELASJON
+COUNT = ANTALL
+COUNTA = ANTALLA
+COUNTBLANK = TELLBLANKE
+COUNTIF = ANTALL.HVIS
+COUNTIFS = ANTALL.HVIS.SETT
+COVARIANCE.P = KOVARIANS.P
+COVARIANCE.S = KOVARIANS.S
+DEVSQ = AVVIK.KVADRERT
+EXPON.DIST = EKSP.FORDELING.N
+F.DIST = F.FORDELING
+F.DIST.RT = F.FORDELING.H
+F.INV = F.INV
+F.INV.RT = F.INV.H
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PROGNOSE.ETS
+FORECAST.ETS.CONFINT = PROGNOSE.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PROGNOSE.ETS.SESONGAVHENGIGHET
+FORECAST.ETS.STAT = PROGNOSE.ETS.STAT
+FORECAST.LINEAR = PROGNOSE.LINEÆR
+FREQUENCY = FREKVENS
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.FORDELING
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.PRESIS
+GAUSS = GAUSS
+GEOMEAN = GJENNOMSNITT.GEOMETRISK
+GROWTH = VEKST
+HARMEAN = GJENNOMSNITT.HARMONISK
+HYPGEOM.DIST = HYPGEOM.FORDELING.N
+INTERCEPT = SKJÆRINGSPUNKT
+KURT = KURT
+LARGE = N.STØRST
+LINEST = RETTLINJE
+LOGEST = KURVE
+LOGNORM.DIST = LOGNORM.FORDELING
+LOGNORM.INV = LOGNORM.INV
+MAX = STØRST
+MAXA = MAKSA
+MAXIFS = MAKS.HVIS.SETT
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.HVIS.SETT
+MODE.MULT = MODUS.MULT
+MODE.SNGL = MODUS.SNGL
+NEGBINOM.DIST = NEGBINOM.FORDELING.N
+NORM.DIST = NORM.FORDELING
+NORM.INV = NORM.INV
+NORM.S.DIST = NORM.S.FORDELING
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = PERSENTIL.EKS
+PERCENTILE.INC = PERSENTIL.INK
+PERCENTRANK.EXC = PROSENTDEL.EKS
+PERCENTRANK.INC = PROSENTDEL.INK
+PERMUT = PERMUTER
+PERMUTATIONA = PERMUTASJONA
+PHI = PHI
+POISSON.DIST = POISSON.FORDELING
+PROB = SANNSYNLIG
+QUARTILE.EXC = KVARTIL.EKS
+QUARTILE.INC = KVARTIL.INK
+RANK.AVG = RANG.GJSN
+RANK.EQ = RANG.EKV
+RSQ = RKVADRAT
+SKEW = SKJEVFORDELING
+SKEW.P = SKJEVFORDELING.P
+SLOPE = STIGNINGSTALL
+SMALL = N.MINST
+STANDARDIZE = NORMALISER
+STDEV.P = STDAV.P
+STDEV.S = STDAV.S
+STDEVA = STDAVVIKA
+STDEVPA = STDAVVIKPA
+STEYX = STANDARDFEIL
+T.DIST = T.FORDELING
+T.DIST.2T = T.FORDELING.2T
+T.DIST.RT = T.FORDELING.H
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = TREND
+TRIMMEAN = TRIMMET.GJENNOMSNITT
+VAR.P = VARIANS.P
+VAR.S = VARIANS.S
+VARA = VARIANSA
+VARPA = VARIANSPA
+WEIBULL.DIST = WEIBULL.DIST.N
+Z.TEST = Z.TEST
+
+##
+## Tekstfunksjoner (Text Functions)
+##
+ASC = STIGENDE
+BAHTTEXT = BAHTTEKST
+CHAR = TEGNKODE
+CLEAN = RENSK
+CODE = KODE
+CONCAT = KJED.SAMMEN
+DOLLAR = VALUTA
+EXACT = EKSAKT
+FIND = FINN
+FIXED = FASTSATT
+ISTHAIDIGIT = ERTHAISIFFER
+LEFT = VENSTRE
+LEN = LENGDE
+LOWER = SMÅ
+MID = DELTEKST
+NUMBERSTRING = TALLSTRENG
+NUMBERVALUE = TALLVERDI
+PHONETIC = FURIGANA
+PROPER = STOR.FORBOKSTAV
+REPLACE = ERSTATT
+REPT = GJENTA
+RIGHT = HØYRE
+SEARCH = SØK
+SUBSTITUTE = BYTT.UT
+T = T
+TEXT = TEKST
+TEXTJOIN = TEKST.KOMBINER
+THAIDIGIT = THAISIFFER
+THAINUMSOUND = THAINUMLYD
+THAINUMSTRING = THAINUMSTRENG
+THAISTRINGLENGTH = THAISTRENGLENGDE
+TRIM = TRIMME
+UNICHAR = UNICODETEGN
+UNICODE = UNICODE
+UPPER = STORE
+VALUE = VERDI
+
+##
+## Nettfunksjoner (Web Functions)
+##
+ENCODEURL = URL.KODE
+FILTERXML = FILTRERXML
+WEBSERVICE = NETTJENESTE
+
+##
+## Kompatibilitetsfunksjoner (Compatibility Functions)
+##
+BETADIST = BETA.FORDELING
+BETAINV = INVERS.BETA.FORDELING
+BINOMDIST = BINOM.FORDELING
+CEILING = AVRUND.GJELDENDE.MULTIPLUM
+CHIDIST = KJI.FORDELING
+CHIINV = INVERS.KJI.FORDELING
+CHITEST = KJI.TEST
+CONCATENATE = KJEDE.SAMMEN
+CONFIDENCE = KONFIDENS
+COVAR = KOVARIANS
+CRITBINOM = GRENSE.BINOM
+EXPONDIST = EKSP.FORDELING
+FDIST = FFORDELING
+FINV = FFORDELING.INVERS
+FLOOR = AVRUND.GJELDENDE.MULTIPLUM.NED
+FORECAST = PROGNOSE
+FTEST = FTEST
+GAMMADIST = GAMMAFORDELING
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOM.FORDELING
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMFORD
+MODE = MODUS
+NEGBINOMDIST = NEGBINOM.FORDELING
+NORMDIST = NORMALFORDELING
+NORMINV = NORMINV
+NORMSDIST = NORMSFORDELING
+NORMSINV = NORMSINV
+PERCENTILE = PERSENTIL
+PERCENTRANK = PROSENTDEL
+POISSON = POISSON
+QUARTILE = KVARTIL
+RANK = RANG
+STDEV = STDAV
+STDEVP = STDAVP
+TDIST = TFORDELING
+TINV = TINV
+TTEST = TTEST
+VAR = VARIANS
+VARP = VARIANSP
+WEIBULL = WEIBULL.FORDELING
+ZTEST = ZTEST
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/config
new file mode 100644
index 00000000..370567a7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Nederlands (Dutch)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #LEEG!
+DIV0 = #DEEL/0!
+VALUE = #WAARDE!
+REF = #VERW!
+NAME = #NAAM?
+NUM = #GETAL!
+NA = #N/B
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions
new file mode 100644
index 00000000..ce0b30cc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions
@@ -0,0 +1,537 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Nederlands (Dutch)
+##
+############################################################
+
+
+##
+## Kubusfuncties (Cube Functions)
+##
+CUBEKPIMEMBER = KUBUSKPILID
+CUBEMEMBER = KUBUSLID
+CUBEMEMBERPROPERTY = KUBUSLIDEIGENSCHAP
+CUBERANKEDMEMBER = KUBUSGERANGSCHIKTLID
+CUBESET = KUBUSSET
+CUBESETCOUNT = KUBUSSETAANTAL
+CUBEVALUE = KUBUSWAARDE
+
+##
+## Databasefuncties (Database Functions)
+##
+DAVERAGE = DBGEMIDDELDE
+DCOUNT = DBAANTAL
+DCOUNTA = DBAANTALC
+DGET = DBLEZEN
+DMAX = DBMAX
+DMIN = DBMIN
+DPRODUCT = DBPRODUCT
+DSTDEV = DBSTDEV
+DSTDEVP = DBSTDEVP
+DSUM = DBSOM
+DVAR = DBVAR
+DVARP = DBVARP
+
+##
+## Datum- en tijdfuncties (Date & Time Functions)
+##
+DATE = DATUM
+DATESTRING = DATUMNOTATIE
+DATEVALUE = DATUMWAARDE
+DAY = DAG
+DAYS = DAGEN
+DAYS360 = DAGEN360
+EDATE = ZELFDE.DAG
+EOMONTH = LAATSTE.DAG
+HOUR = UUR
+ISOWEEKNUM = ISO.WEEKNUMMER
+MINUTE = MINUUT
+MONTH = MAAND
+NETWORKDAYS = NETTO.WERKDAGEN
+NETWORKDAYS.INTL = NETWERKDAGEN.INTL
+NOW = NU
+SECOND = SECONDE
+THAIDAYOFWEEK = THAIS.WEEKDAG
+THAIMONTHOFYEAR = THAIS.MAAND.VAN.JAAR
+THAIYEAR = THAIS.JAAR
+TIME = TIJD
+TIMEVALUE = TIJDWAARDE
+TODAY = VANDAAG
+WEEKDAY = WEEKDAG
+WEEKNUM = WEEKNUMMER
+WORKDAY = WERKDAG
+WORKDAY.INTL = WERKDAG.INTL
+YEAR = JAAR
+YEARFRAC = JAAR.DEEL
+
+##
+## Technische functies (Engineering Functions)
+##
+BESSELI = BESSEL.I
+BESSELJ = BESSEL.J
+BESSELK = BESSEL.K
+BESSELY = BESSEL.Y
+BIN2DEC = BIN.N.DEC
+BIN2HEX = BIN.N.HEX
+BIN2OCT = BIN.N.OCT
+BITAND = BIT.EN
+BITLSHIFT = BIT.VERSCHUIF.LINKS
+BITOR = BIT.OF
+BITRSHIFT = BIT.VERSCHUIF.RECHTS
+BITXOR = BIT.EX.OF
+COMPLEX = COMPLEX
+CONVERT = CONVERTEREN
+DEC2BIN = DEC.N.BIN
+DEC2HEX = DEC.N.HEX
+DEC2OCT = DEC.N.OCT
+DELTA = DELTA
+ERF = FOUTFUNCTIE
+ERF.PRECISE = FOUTFUNCTIE.NAUWKEURIG
+ERFC = FOUT.COMPLEMENT
+ERFC.PRECISE = FOUT.COMPLEMENT.NAUWKEURIG
+GESTEP = GROTER.DAN
+HEX2BIN = HEX.N.BIN
+HEX2DEC = HEX.N.DEC
+HEX2OCT = HEX.N.OCT
+IMABS = C.ABS
+IMAGINARY = C.IM.DEEL
+IMARGUMENT = C.ARGUMENT
+IMCONJUGATE = C.TOEGEVOEGD
+IMCOS = C.COS
+IMCOSH = C.COSH
+IMCOT = C.COT
+IMCSC = C.COSEC
+IMCSCH = C.COSECH
+IMDIV = C.QUOTIENT
+IMEXP = C.EXP
+IMLN = C.LN
+IMLOG10 = C.LOG10
+IMLOG2 = C.LOG2
+IMPOWER = C.MACHT
+IMPRODUCT = C.PRODUCT
+IMREAL = C.REEEL.DEEL
+IMSEC = C.SEC
+IMSECH = C.SECH
+IMSIN = C.SIN
+IMSINH = C.SINH
+IMSQRT = C.WORTEL
+IMSUB = C.VERSCHIL
+IMSUM = C.SOM
+IMTAN = C.TAN
+OCT2BIN = OCT.N.BIN
+OCT2DEC = OCT.N.DEC
+OCT2HEX = OCT.N.HEX
+
+##
+## Financiële functies (Financial Functions)
+##
+ACCRINT = SAMENG.RENTE
+ACCRINTM = SAMENG.RENTE.V
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = COUP.DAGEN.BB
+COUPDAYS = COUP.DAGEN
+COUPDAYSNC = COUP.DAGEN.VV
+COUPNCD = COUP.DATUM.NB
+COUPNUM = COUP.AANTAL
+COUPPCD = COUP.DATUM.VB
+CUMIPMT = CUM.RENTE
+CUMPRINC = CUM.HOOFDSOM
+DB = DB
+DDB = DDB
+DISC = DISCONTO
+DOLLARDE = EURO.DE
+DOLLARFR = EURO.BR
+DURATION = DUUR
+EFFECT = EFFECT.RENTE
+FV = TW
+FVSCHEDULE = TOEK.WAARDE2
+INTRATE = RENTEPERCENTAGE
+IPMT = IBET
+IRR = IR
+ISPMT = ISBET
+MDURATION = AANG.DUUR
+MIRR = GIR
+NOMINAL = NOMINALE.RENTE
+NPER = NPER
+NPV = NHW
+ODDFPRICE = AFW.ET.PRIJS
+ODDFYIELD = AFW.ET.REND
+ODDLPRICE = AFW.LT.PRIJS
+ODDLYIELD = AFW.LT.REND
+PDURATION = PDUUR
+PMT = BET
+PPMT = PBET
+PRICE = PRIJS.NOM
+PRICEDISC = PRIJS.DISCONTO
+PRICEMAT = PRIJS.VERVALDAG
+PV = HW
+RATE = RENTE
+RECEIVED = OPBRENGST
+RRI = RRI
+SLN = LIN.AFSCHR
+SYD = SYD
+TBILLEQ = SCHATK.OBL
+TBILLPRICE = SCHATK.PRIJS
+TBILLYIELD = SCHATK.REND
+VDB = VDB
+XIRR = IR.SCHEMA
+XNPV = NHW2
+YIELD = RENDEMENT
+YIELDDISC = REND.DISCONTO
+YIELDMAT = REND.VERVAL
+
+##
+## Informatiefuncties (Information Functions)
+##
+CELL = CEL
+ERROR.TYPE = TYPE.FOUT
+INFO = INFO
+ISBLANK = ISLEEG
+ISERR = ISFOUT2
+ISERROR = ISFOUT
+ISEVEN = IS.EVEN
+ISFORMULA = ISFORMULE
+ISLOGICAL = ISLOGISCH
+ISNA = ISNB
+ISNONTEXT = ISGEENTEKST
+ISNUMBER = ISGETAL
+ISODD = IS.ONEVEN
+ISREF = ISVERWIJZING
+ISTEXT = ISTEKST
+N = N
+NA = NB
+SHEET = BLAD
+SHEETS = BLADEN
+TYPE = TYPE
+
+##
+## Logische functies (Logical Functions)
+##
+AND = EN
+FALSE = ONWAAR
+IF = ALS
+IFERROR = ALS.FOUT
+IFNA = ALS.NB
+IFS = ALS.VOORWAARDEN
+NOT = NIET
+OR = OF
+SWITCH = SCHAKELEN
+TRUE = WAAR
+XOR = EX.OF
+
+##
+## Zoek- en verwijzingsfuncties (Lookup & Reference Functions)
+##
+ADDRESS = ADRES
+AREAS = BEREIKEN
+CHOOSE = KIEZEN
+COLUMN = KOLOM
+COLUMNS = KOLOMMEN
+FORMULATEXT = FORMULETEKST
+GETPIVOTDATA = DRAAITABEL.OPHALEN
+HLOOKUP = HORIZ.ZOEKEN
+HYPERLINK = HYPERLINK
+INDEX = INDEX
+INDIRECT = INDIRECT
+LOOKUP = ZOEKEN
+MATCH = VERGELIJKEN
+OFFSET = VERSCHUIVING
+ROW = RIJ
+ROWS = RIJEN
+RTD = RTG
+TRANSPOSE = TRANSPONEREN
+VLOOKUP = VERT.ZOEKEN
+*RC = RK
+
+##
+## Wiskundige en trigonometrische functies (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = BOOGCOS
+ACOSH = BOOGCOSH
+ACOT = BOOGCOT
+ACOTH = BOOGCOTH
+AGGREGATE = AGGREGAAT
+ARABIC = ARABISCH
+ASIN = BOOGSIN
+ASINH = BOOGSINH
+ATAN = BOOGTAN
+ATAN2 = BOOGTAN2
+ATANH = BOOGTANH
+BASE = BASIS
+CEILING.MATH = AFRONDEN.BOVEN.WISK
+CEILING.PRECISE = AFRONDEN.BOVEN.NAUWKEURIG
+COMBIN = COMBINATIES
+COMBINA = COMBIN.A
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = COSEC
+CSCH = COSECH
+DECIMAL = DECIMAAL
+DEGREES = GRADEN
+ECMA.CEILING = ECMA.AFRONDEN.BOVEN
+EVEN = EVEN
+EXP = EXP
+FACT = FACULTEIT
+FACTDOUBLE = DUBBELE.FACULTEIT
+FLOOR.MATH = AFRONDEN.BENEDEN.WISK
+FLOOR.PRECISE = AFRONDEN.BENEDEN.NAUWKEURIG
+GCD = GGD
+INT = INTEGER
+ISO.CEILING = ISO.AFRONDEN.BOVEN
+LCM = KGV
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = DETERMINANTMAT
+MINVERSE = INVERSEMAT
+MMULT = PRODUCTMAT
+MOD = REST
+MROUND = AFRONDEN.N.VEELVOUD
+MULTINOMIAL = MULTINOMIAAL
+MUNIT = EENHEIDMAT
+ODD = ONEVEN
+PI = PI
+POWER = MACHT
+PRODUCT = PRODUCT
+QUOTIENT = QUOTIENT
+RADIANS = RADIALEN
+RAND = ASELECT
+RANDBETWEEN = ASELECTTUSSEN
+ROMAN = ROMEINS
+ROUND = AFRONDEN
+ROUNDBAHTDOWN = BAHT.AFR.NAAR.BENEDEN
+ROUNDBAHTUP = BAHT.AFR.NAAR.BOVEN
+ROUNDDOWN = AFRONDEN.NAAR.BENEDEN
+ROUNDUP = AFRONDEN.NAAR.BOVEN
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOM.MACHTREEKS
+SIGN = POS.NEG
+SIN = SIN
+SINH = SINH
+SQRT = WORTEL
+SQRTPI = WORTEL.PI
+SUBTOTAL = SUBTOTAAL
+SUM = SOM
+SUMIF = SOM.ALS
+SUMIFS = SOMMEN.ALS
+SUMPRODUCT = SOMPRODUCT
+SUMSQ = KWADRATENSOM
+SUMX2MY2 = SOM.X2MINY2
+SUMX2PY2 = SOM.X2PLUSY2
+SUMXMY2 = SOM.XMINY.2
+TAN = TAN
+TANH = TANH
+TRUNC = GEHEEL
+
+##
+## Statistische functies (Statistical Functions)
+##
+AVEDEV = GEM.DEVIATIE
+AVERAGE = GEMIDDELDE
+AVERAGEA = GEMIDDELDEA
+AVERAGEIF = GEMIDDELDE.ALS
+AVERAGEIFS = GEMIDDELDEN.ALS
+BETA.DIST = BETA.VERD
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.VERD
+BINOM.DIST.RANGE = BINOM.VERD.BEREIK
+BINOM.INV = BINOMIALE.INV
+CHISQ.DIST = CHIKW.VERD
+CHISQ.DIST.RT = CHIKW.VERD.RECHTS
+CHISQ.INV = CHIKW.INV
+CHISQ.INV.RT = CHIKW.INV.RECHTS
+CHISQ.TEST = CHIKW.TEST
+CONFIDENCE.NORM = VERTROUWELIJKHEID.NORM
+CONFIDENCE.T = VERTROUWELIJKHEID.T
+CORREL = CORRELATIE
+COUNT = AANTAL
+COUNTA = AANTALARG
+COUNTBLANK = AANTAL.LEGE.CELLEN
+COUNTIF = AANTAL.ALS
+COUNTIFS = AANTALLEN.ALS
+COVARIANCE.P = COVARIANTIE.P
+COVARIANCE.S = COVARIANTIE.S
+DEVSQ = DEV.KWAD
+EXPON.DIST = EXPON.VERD.N
+F.DIST = F.VERD
+F.DIST.RT = F.VERD.RECHTS
+F.INV = F.INV
+F.INV.RT = F.INV.RECHTS
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHER.INV
+FORECAST.ETS = VOORSPELLEN.ETS
+FORECAST.ETS.CONFINT = VOORSPELLEN.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = VOORSPELLEN.ETS.SEASONALITY
+FORECAST.ETS.STAT = FORECAST.ETS.STAT
+FORECAST.LINEAR = VOORSPELLEN.LINEAR
+FREQUENCY = INTERVAL
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.VERD.N
+GAMMA.INV = GAMMA.INV.N
+GAMMALN = GAMMA.LN
+GAMMALN.PRECISE = GAMMA.LN.NAUWKEURIG
+GAUSS = GAUSS
+GEOMEAN = MEETK.GEM
+GROWTH = GROEI
+HARMEAN = HARM.GEM
+HYPGEOM.DIST = HYPGEOM.VERD
+INTERCEPT = SNIJPUNT
+KURT = KURTOSIS
+LARGE = GROOTSTE
+LINEST = LIJNSCH
+LOGEST = LOGSCH
+LOGNORM.DIST = LOGNORM.VERD
+LOGNORM.INV = LOGNORM.INV
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAX.ALS.VOORWAARDEN
+MEDIAN = MEDIAAN
+MIN = MIN
+MINA = MINA
+MINIFS = MIN.ALS.VOORWAARDEN
+MODE.MULT = MODUS.MEERV
+MODE.SNGL = MODUS.ENKELV
+NEGBINOM.DIST = NEGBINOM.VERD
+NORM.DIST = NORM.VERD.N
+NORM.INV = NORM.INV.N
+NORM.S.DIST = NORM.S.VERD
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIEL.EXC
+PERCENTILE.INC = PERCENTIEL.INC
+PERCENTRANK.EXC = PROCENTRANG.EXC
+PERCENTRANK.INC = PROCENTRANG.INC
+PERMUT = PERMUTATIES
+PERMUTATIONA = PERMUTATIE.A
+PHI = PHI
+POISSON.DIST = POISSON.VERD
+PROB = KANS
+QUARTILE.EXC = KWARTIEL.EXC
+QUARTILE.INC = KWARTIEL.INC
+RANK.AVG = RANG.GEMIDDELDE
+RANK.EQ = RANG.GELIJK
+RSQ = R.KWADRAAT
+SKEW = SCHEEFHEID
+SKEW.P = SCHEEFHEID.P
+SLOPE = RICHTING
+SMALL = KLEINSTE
+STANDARDIZE = NORMALISEREN
+STDEV.P = STDEV.P
+STDEV.S = STDEV.S
+STDEVA = STDEVA
+STDEVPA = STDEVPA
+STEYX = STAND.FOUT.YX
+T.DIST = T.DIST
+T.DIST.2T = T.VERD.2T
+T.DIST.RT = T.VERD.RECHTS
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = TREND
+TRIMMEAN = GETRIMD.GEM
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.VERD
+Z.TEST = Z.TEST
+
+##
+## Tekstfuncties (Text Functions)
+##
+BAHTTEXT = BAHT.TEKST
+CHAR = TEKEN
+CLEAN = WISSEN.CONTROL
+CODE = CODE
+CONCAT = TEKST.SAMENV
+DOLLAR = EURO
+EXACT = GELIJK
+FIND = VIND.ALLES
+FIXED = VAST
+ISTHAIDIGIT = IS.THAIS.CIJFER
+LEFT = LINKS
+LEN = LENGTE
+LOWER = KLEINE.LETTERS
+MID = DEEL
+NUMBERSTRING = GETALNOTATIE
+NUMBERVALUE = NUMERIEKE.WAARDE
+PHONETIC = FONETISCH
+PROPER = BEGINLETTERS
+REPLACE = VERVANGEN
+REPT = HERHALING
+RIGHT = RECHTS
+SEARCH = VIND.SPEC
+SUBSTITUTE = SUBSTITUEREN
+T = T
+TEXT = TEKST
+TEXTJOIN = TEKST.COMBINEREN
+THAIDIGIT = THAIS.CIJFER
+THAINUMSOUND = THAIS.GETAL.GELUID
+THAINUMSTRING = THAIS.GETAL.REEKS
+THAISTRINGLENGTH = THAIS.REEKS.LENGTE
+TRIM = SPATIES.WISSEN
+UNICHAR = UNITEKEN
+UNICODE = UNICODE
+UPPER = HOOFDLETTERS
+VALUE = WAARDE
+
+##
+## Webfuncties (Web Functions)
+##
+ENCODEURL = URL.CODEREN
+FILTERXML = XML.FILTEREN
+WEBSERVICE = WEBSERVICE
+
+##
+## Compatibiliteitsfuncties (Compatibility Functions)
+##
+BETADIST = BETAVERD
+BETAINV = BETAINV
+BINOMDIST = BINOMIALE.VERD
+CEILING = AFRONDEN.BOVEN
+CHIDIST = CHI.KWADRAAT
+CHIINV = CHI.KWADRAAT.INV
+CHITEST = CHI.TOETS
+CONCATENATE = TEKST.SAMENVOEGEN
+CONFIDENCE = BETROUWBAARHEID
+COVAR = COVARIANTIE
+CRITBINOM = CRIT.BINOM
+EXPONDIST = EXPON.VERD
+FDIST = F.VERDELING
+FINV = F.INVERSE
+FLOOR = AFRONDEN.BENEDEN
+FORECAST = VOORSPELLEN
+FTEST = F.TOETS
+GAMMADIST = GAMMA.VERD
+GAMMAINV = GAMMA.INV
+HYPGEOMDIST = HYPERGEO.VERD
+LOGINV = LOG.NORM.INV
+LOGNORMDIST = LOG.NORM.VERD
+MODE = MODUS
+NEGBINOMDIST = NEG.BINOM.VERD
+NORMDIST = NORM.VERD
+NORMINV = NORM.INV
+NORMSDIST = STAND.NORM.VERD
+NORMSINV = STAND.NORM.INV
+PERCENTILE = PERCENTIEL
+PERCENTRANK = PERCENT.RANG
+POISSON = POISSON
+QUARTILE = KWARTIEL
+RANK = RANG
+STDEV = STDEV
+STDEVP = STDEVP
+TDIST = T.VERD
+TINV = TINV
+TTEST = T.TOETS
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = Z.TOETS
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/config
new file mode 100644
index 00000000..1d8468ba
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Jezyk polski (Polish)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #ZERO!
+DIV0 = #DZIEL/0!
+VALUE = #ARG!
+REF = #ADR!
+NAME = #NAZWA?
+NUM = #LICZBA!
+NA = #N/D!
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/functions
new file mode 100644
index 00000000..d1b43b2e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pl/functions
@@ -0,0 +1,536 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Jezyk polski (Polish)
+##
+############################################################
+
+
+##
+## Funkcje baz danych (Cube Functions)
+##
+CUBEKPIMEMBER = ELEMENT.KPI.MODUŁU
+CUBEMEMBER = ELEMENT.MODUŁU
+CUBEMEMBERPROPERTY = WŁAŚCIWOŚĆ.ELEMENTU.MODUŁU
+CUBERANKEDMEMBER = USZEREGOWANY.ELEMENT.MODUŁU
+CUBESET = ZESTAW.MODUŁÓW
+CUBESETCOUNT = LICZNIK.MODUŁÓW.ZESTAWU
+CUBEVALUE = WARTOŚĆ.MODUŁU
+
+##
+## Funkcje baz danych (Database Functions)
+##
+DAVERAGE = BD.ŚREDNIA
+DCOUNT = BD.ILE.REKORDÓW
+DCOUNTA = BD.ILE.REKORDÓW.A
+DGET = BD.POLE
+DMAX = BD.MAX
+DMIN = BD.MIN
+DPRODUCT = BD.ILOCZYN
+DSTDEV = BD.ODCH.STANDARD
+DSTDEVP = BD.ODCH.STANDARD.POPUL
+DSUM = BD.SUMA
+DVAR = BD.WARIANCJA
+DVARP = BD.WARIANCJA.POPUL
+
+##
+## Funkcje daty i godziny (Date & Time Functions)
+##
+DATE = DATA
+DATEDIF = DATA.RÓŻNICA
+DATESTRING = DATA.CIĄG.ZNAK
+DATEVALUE = DATA.WARTOŚĆ
+DAY = DZIEŃ
+DAYS = DNI
+DAYS360 = DNI.360
+EDATE = NR.SER.DATY
+EOMONTH = NR.SER.OST.DN.MIES
+HOUR = GODZINA
+ISOWEEKNUM = ISO.NUM.TYG
+MINUTE = MINUTA
+MONTH = MIESIĄC
+NETWORKDAYS = DNI.ROBOCZE
+NETWORKDAYS.INTL = DNI.ROBOCZE.NIESTAND
+NOW = TERAZ
+SECOND = SEKUNDA
+THAIDAYOFWEEK = TAJ.DZIEŃ.TYGODNIA
+THAIMONTHOFYEAR = TAJ.MIESIĄC.ROKU
+THAIYEAR = TAJ.ROK
+TIME = CZAS
+TIMEVALUE = CZAS.WARTOŚĆ
+TODAY = DZIŚ
+WEEKDAY = DZIEŃ.TYG
+WEEKNUM = NUM.TYG
+WORKDAY = DZIEŃ.ROBOCZY
+WORKDAY.INTL = DZIEŃ.ROBOCZY.NIESTAND
+YEAR = ROK
+YEARFRAC = CZĘŚĆ.ROKU
+
+##
+## Funkcje inżynierskie (Engineering Functions)
+##
+BESSELI = BESSEL.I
+BESSELJ = BESSEL.J
+BESSELK = BESSEL.K
+BESSELY = BESSEL.Y
+BIN2DEC = DWÓJK.NA.DZIES
+BIN2HEX = DWÓJK.NA.SZESN
+BIN2OCT = DWÓJK.NA.ÓSM
+BITAND = BITAND
+BITLSHIFT = BIT.PRZESUNIĘCIE.W.LEWO
+BITOR = BITOR
+BITRSHIFT = BIT.PRZESUNIĘCIE.W.PRAWO
+BITXOR = BITXOR
+COMPLEX = LICZBA.ZESP
+CONVERT = KONWERTUJ
+DEC2BIN = DZIES.NA.DWÓJK
+DEC2HEX = DZIES.NA.SZESN
+DEC2OCT = DZIES.NA.ÓSM
+DELTA = CZY.RÓWNE
+ERF = FUNKCJA.BŁ
+ERF.PRECISE = FUNKCJA.BŁ.DOKŁ
+ERFC = KOMP.FUNKCJA.BŁ
+ERFC.PRECISE = KOMP.FUNKCJA.BŁ.DOKŁ
+GESTEP = SPRAWDŹ.PRÓG
+HEX2BIN = SZESN.NA.DWÓJK
+HEX2DEC = SZESN.NA.DZIES
+HEX2OCT = SZESN.NA.ÓSM
+IMABS = MODUŁ.LICZBY.ZESP
+IMAGINARY = CZ.UROJ.LICZBY.ZESP
+IMARGUMENT = ARG.LICZBY.ZESP
+IMCONJUGATE = SPRZĘŻ.LICZBY.ZESP
+IMCOS = COS.LICZBY.ZESP
+IMCOSH = COSH.LICZBY.ZESP
+IMCOT = COT.LICZBY.ZESP
+IMCSC = CSC.LICZBY.ZESP
+IMCSCH = CSCH.LICZBY.ZESP
+IMDIV = ILORAZ.LICZB.ZESP
+IMEXP = EXP.LICZBY.ZESP
+IMLN = LN.LICZBY.ZESP
+IMLOG10 = LOG10.LICZBY.ZESP
+IMLOG2 = LOG2.LICZBY.ZESP
+IMPOWER = POTĘGA.LICZBY.ZESP
+IMPRODUCT = ILOCZYN.LICZB.ZESP
+IMREAL = CZ.RZECZ.LICZBY.ZESP
+IMSEC = SEC.LICZBY.ZESP
+IMSECH = SECH.LICZBY.ZESP
+IMSIN = SIN.LICZBY.ZESP
+IMSINH = SINH.LICZBY.ZESP
+IMSQRT = PIERWIASTEK.LICZBY.ZESP
+IMSUB = RÓŻN.LICZB.ZESP
+IMSUM = SUMA.LICZB.ZESP
+IMTAN = TAN.LICZBY.ZESP
+OCT2BIN = ÓSM.NA.DWÓJK
+OCT2DEC = ÓSM.NA.DZIES
+OCT2HEX = ÓSM.NA.SZESN
+
+##
+## Funkcje finansowe (Financial Functions)
+##
+ACCRINT = NAL.ODS
+ACCRINTM = NAL.ODS.WYKUP
+AMORDEGRC = AMORT.NIELIN
+AMORLINC = AMORT.LIN
+COUPDAYBS = WYPŁ.DNI.OD.POCZ
+COUPDAYS = WYPŁ.DNI
+COUPDAYSNC = WYPŁ.DNI.NAST
+COUPNCD = WYPŁ.DATA.NAST
+COUPNUM = WYPŁ.LICZBA
+COUPPCD = WYPŁ.DATA.POPRZ
+CUMIPMT = SPŁAC.ODS
+CUMPRINC = SPŁAC.KAPIT
+DB = DB
+DDB = DDB
+DISC = STOPA.DYSK
+DOLLARDE = CENA.DZIES
+DOLLARFR = CENA.UŁAM
+DURATION = ROCZ.PRZYCH
+EFFECT = EFEKTYWNA
+FV = FV
+FVSCHEDULE = WART.PRZYSZŁ.KAP
+INTRATE = STOPA.PROC
+IPMT = IPMT
+IRR = IRR
+ISPMT = ISPMT
+MDURATION = ROCZ.PRZYCH.M
+MIRR = MIRR
+NOMINAL = NOMINALNA
+NPER = NPER
+NPV = NPV
+ODDFPRICE = CENA.PIERW.OKR
+ODDFYIELD = RENT.PIERW.OKR
+ODDLPRICE = CENA.OST.OKR
+ODDLYIELD = RENT.OST.OKR
+PDURATION = O.CZAS.TRWANIA
+PMT = PMT
+PPMT = PPMT
+PRICE = CENA
+PRICEDISC = CENA.DYSK
+PRICEMAT = CENA.WYKUP
+PV = PV
+RATE = RATE
+RECEIVED = KWOTA.WYKUP
+RRI = RÓWNOW.STOPA.PROC
+SLN = SLN
+SYD = SYD
+TBILLEQ = RENT.EKW.BS
+TBILLPRICE = CENA.BS
+TBILLYIELD = RENT.BS
+VDB = VDB
+XIRR = XIRR
+XNPV = XNPV
+YIELD = RENTOWNOŚĆ
+YIELDDISC = RENT.DYSK
+YIELDMAT = RENT.WYKUP
+
+##
+## Funkcje informacyjne (Information Functions)
+##
+CELL = KOMÓRKA
+ERROR.TYPE = NR.BŁĘDU
+INFO = INFO
+ISBLANK = CZY.PUSTA
+ISERR = CZY.BŁ
+ISERROR = CZY.BŁĄD
+ISEVEN = CZY.PARZYSTE
+ISFORMULA = CZY.FORMUŁA
+ISLOGICAL = CZY.LOGICZNA
+ISNA = CZY.BRAK
+ISNONTEXT = CZY.NIE.TEKST
+ISNUMBER = CZY.LICZBA
+ISODD = CZY.NIEPARZYSTE
+ISREF = CZY.ADR
+ISTEXT = CZY.TEKST
+N = N
+NA = BRAK
+SHEET = ARKUSZ
+SHEETS = ARKUSZE
+TYPE = TYP
+
+##
+## Funkcje logiczne (Logical Functions)
+##
+AND = ORAZ
+FALSE = FAŁSZ
+IF = JEŻELI
+IFERROR = JEŻELI.BŁĄD
+IFNA = JEŻELI.ND
+IFS = WARUNKI
+NOT = NIE
+OR = LUB
+SWITCH = PRZEŁĄCZ
+TRUE = PRAWDA
+XOR = XOR
+
+##
+## Funkcje wyszukiwania i odwołań (Lookup & Reference Functions)
+##
+ADDRESS = ADRES
+AREAS = OBSZARY
+CHOOSE = WYBIERZ
+COLUMN = NR.KOLUMNY
+COLUMNS = LICZBA.KOLUMN
+FORMULATEXT = FORMUŁA.TEKST
+GETPIVOTDATA = WEŹDANETABELI
+HLOOKUP = WYSZUKAJ.POZIOMO
+HYPERLINK = HIPERŁĄCZE
+INDEX = INDEKS
+INDIRECT = ADR.POŚR
+LOOKUP = WYSZUKAJ
+MATCH = PODAJ.POZYCJĘ
+OFFSET = PRZESUNIĘCIE
+ROW = WIERSZ
+ROWS = ILE.WIERSZY
+RTD = DANE.CZASU.RZECZ
+TRANSPOSE = TRANSPONUJ
+VLOOKUP = WYSZUKAJ.PIONOWO
+
+##
+## Funkcje matematyczne i trygonometryczne (Math & Trig Functions)
+##
+ABS = MODUŁ.LICZBY
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGUJ
+ARABIC = ARABSKIE
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = PODSTAWA
+CEILING.MATH = ZAOKR.W.GÓRĘ.MATEMATYCZNE
+CEILING.PRECISE = ZAOKR.W.GÓRĘ.DOKŁ
+COMBIN = KOMBINACJE
+COMBINA = KOMBINACJE.A
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DZIESIĘTNA
+DEGREES = STOPNIE
+ECMA.CEILING = ECMA.ZAOKR.W.GÓRĘ
+EVEN = ZAOKR.DO.PARZ
+EXP = EXP
+FACT = SILNIA
+FACTDOUBLE = SILNIA.DWUKR
+FLOOR.MATH = ZAOKR.W.DÓŁ.MATEMATYCZNE
+FLOOR.PRECISE = ZAOKR.W.DÓŁ.DOKŁ
+GCD = NAJW.WSP.DZIEL
+INT = ZAOKR.DO.CAŁK
+ISO.CEILING = ISO.ZAOKR.W.GÓRĘ
+LCM = NAJMN.WSP.WIEL
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = WYZNACZNIK.MACIERZY
+MINVERSE = MACIERZ.ODW
+MMULT = MACIERZ.ILOCZYN
+MOD = MOD
+MROUND = ZAOKR.DO.WIELOKR
+MULTINOMIAL = WIELOMIAN
+MUNIT = MACIERZ.JEDNOSTKOWA
+ODD = ZAOKR.DO.NPARZ
+PI = PI
+POWER = POTĘGA
+PRODUCT = ILOCZYN
+QUOTIENT = CZ.CAŁK.DZIELENIA
+RADIANS = RADIANY
+RAND = LOS
+RANDBETWEEN = LOS.ZAKR
+ROMAN = RZYMSKIE
+ROUND = ZAOKR
+ROUNDBAHTDOWN = ZAOKR.DÓŁ.BAT
+ROUNDBAHTUP = ZAOKR.GÓRA.BAT
+ROUNDDOWN = ZAOKR.DÓŁ
+ROUNDUP = ZAOKR.GÓRA
+SEC = SEC
+SECH = SECH
+SERIESSUM = SUMA.SZER.POT
+SIGN = ZNAK.LICZBY
+SIN = SIN
+SINH = SINH
+SQRT = PIERWIASTEK
+SQRTPI = PIERW.PI
+SUBTOTAL = SUMY.CZĘŚCIOWE
+SUM = SUMA
+SUMIF = SUMA.JEŻELI
+SUMIFS = SUMA.WARUNKÓW
+SUMPRODUCT = SUMA.ILOCZYNÓW
+SUMSQ = SUMA.KWADRATÓW
+SUMX2MY2 = SUMA.X2.M.Y2
+SUMX2PY2 = SUMA.X2.P.Y2
+SUMXMY2 = SUMA.XMY.2
+TAN = TAN
+TANH = TANH
+TRUNC = LICZBA.CAŁK
+
+##
+## Funkcje statystyczne (Statistical Functions)
+##
+AVEDEV = ODCH.ŚREDNIE
+AVERAGE = ŚREDNIA
+AVERAGEA = ŚREDNIA.A
+AVERAGEIF = ŚREDNIA.JEŻELI
+AVERAGEIFS = ŚREDNIA.WARUNKÓW
+BETA.DIST = ROZKŁ.BETA
+BETA.INV = ROZKŁ.BETA.ODWR
+BINOM.DIST = ROZKŁ.DWUM
+BINOM.DIST.RANGE = ROZKŁ.DWUM.ZAKRES
+BINOM.INV = ROZKŁ.DWUM.ODWR
+CHISQ.DIST = ROZKŁ.CHI
+CHISQ.DIST.RT = ROZKŁ.CHI.PS
+CHISQ.INV = ROZKŁ.CHI.ODWR
+CHISQ.INV.RT = ROZKŁ.CHI.ODWR.PS
+CHISQ.TEST = CHI.TEST
+CONFIDENCE.NORM = UFNOŚĆ.NORM
+CONFIDENCE.T = UFNOŚĆ.T
+CORREL = WSP.KORELACJI
+COUNT = ILE.LICZB
+COUNTA = ILE.NIEPUSTYCH
+COUNTBLANK = LICZ.PUSTE
+COUNTIF = LICZ.JEŻELI
+COUNTIFS = LICZ.WARUNKI
+COVARIANCE.P = KOWARIANCJA.POPUL
+COVARIANCE.S = KOWARIANCJA.PRÓBKI
+DEVSQ = ODCH.KWADRATOWE
+EXPON.DIST = ROZKŁ.EXP
+F.DIST = ROZKŁ.F
+F.DIST.RT = ROZKŁ.F.PS
+F.INV = ROZKŁ.F.ODWR
+F.INV.RT = ROZKŁ.F.ODWR.PS
+F.TEST = F.TEST
+FISHER = ROZKŁAD.FISHER
+FISHERINV = ROZKŁAD.FISHER.ODW
+FORECAST.ETS = REGLINX.ETS
+FORECAST.ETS.CONFINT = REGLINX.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = REGLINX.ETS.SEZONOWOŚĆ
+FORECAST.ETS.STAT = REGLINX.ETS.STATYSTYKA
+FORECAST.LINEAR = REGLINX.LINIOWA
+FREQUENCY = CZĘSTOŚĆ
+GAMMA = GAMMA
+GAMMA.DIST = ROZKŁ.GAMMA
+GAMMA.INV = ROZKŁ.GAMMA.ODWR
+GAMMALN = ROZKŁAD.LIN.GAMMA
+GAMMALN.PRECISE = ROZKŁAD.LIN.GAMMA.DOKŁ
+GAUSS = GAUSS
+GEOMEAN = ŚREDNIA.GEOMETRYCZNA
+GROWTH = REGEXPW
+HARMEAN = ŚREDNIA.HARMONICZNA
+HYPGEOM.DIST = ROZKŁ.HIPERGEOM
+INTERCEPT = ODCIĘTA
+KURT = KURTOZA
+LARGE = MAX.K
+LINEST = REGLINP
+LOGEST = REGEXPP
+LOGNORM.DIST = ROZKŁ.LOG
+LOGNORM.INV = ROZKŁ.LOG.ODWR
+MAX = MAX
+MAXA = MAX.A
+MAXIFS = MAKS.WARUNKÓW
+MEDIAN = MEDIANA
+MIN = MIN
+MINA = MIN.A
+MINIFS = MIN.WARUNKÓW
+MODE.MULT = WYST.NAJCZĘŚCIEJ.TABL
+MODE.SNGL = WYST.NAJCZĘŚCIEJ.WART
+NEGBINOM.DIST = ROZKŁ.DWUM.PRZEC
+NORM.DIST = ROZKŁ.NORMALNY
+NORM.INV = ROZKŁ.NORMALNY.ODWR
+NORM.S.DIST = ROZKŁ.NORMALNY.S
+NORM.S.INV = ROZKŁ.NORMALNY.S.ODWR
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTYL.PRZEDZ.OTW
+PERCENTILE.INC = PERCENTYL.PRZEDZ.ZAMK
+PERCENTRANK.EXC = PROC.POZ.PRZEDZ.OTW
+PERCENTRANK.INC = PROC.POZ.PRZEDZ.ZAMK
+PERMUT = PERMUTACJE
+PERMUTATIONA = PERMUTACJE.A
+PHI = PHI
+POISSON.DIST = ROZKŁ.POISSON
+PROB = PRAWDPD
+QUARTILE.EXC = KWARTYL.PRZEDZ.OTW
+QUARTILE.INC = KWARTYL.PRZEDZ.ZAMK
+RANK.AVG = POZYCJA.ŚR
+RANK.EQ = POZYCJA.NAJW
+RSQ = R.KWADRAT
+SKEW = SKOŚNOŚĆ
+SKEW.P = SKOŚNOŚĆ.P
+SLOPE = NACHYLENIE
+SMALL = MIN.K
+STANDARDIZE = NORMALIZUJ
+STDEV.P = ODCH.STAND.POPUL
+STDEV.S = ODCH.STANDARD.PRÓBKI
+STDEVA = ODCH.STANDARDOWE.A
+STDEVPA = ODCH.STANDARD.POPUL.A
+STEYX = REGBŁSTD
+T.DIST = ROZKŁ.T
+T.DIST.2T = ROZKŁ.T.DS
+T.DIST.RT = ROZKŁ.T.PS
+T.INV = ROZKŁ.T.ODWR
+T.INV.2T = ROZKŁ.T.ODWR.DS
+T.TEST = T.TEST
+TREND = REGLINW
+TRIMMEAN = ŚREDNIA.WEWN
+VAR.P = WARIANCJA.POP
+VAR.S = WARIANCJA.PRÓBKI
+VARA = WARIANCJA.A
+VARPA = WARIANCJA.POPUL.A
+WEIBULL.DIST = ROZKŁ.WEIBULL
+Z.TEST = Z.TEST
+
+##
+## Funkcje tekstowe (Text Functions)
+##
+BAHTTEXT = BAT.TEKST
+CHAR = ZNAK
+CLEAN = OCZYŚĆ
+CODE = KOD
+CONCAT = ZŁĄCZ.TEKST
+DOLLAR = KWOTA
+EXACT = PORÓWNAJ
+FIND = ZNAJDŹ
+FIXED = ZAOKR.DO.TEKST
+ISTHAIDIGIT = CZY.CYFRA.TAJ
+LEFT = LEWY
+LEN = DŁ
+LOWER = LITERY.MAŁE
+MID = FRAGMENT.TEKSTU
+NUMBERSTRING = LICZBA.CIĄG.ZNAK
+NUMBERVALUE = WARTOŚĆ.LICZBOWA
+PROPER = Z.WIELKIEJ.LITERY
+REPLACE = ZASTĄP
+REPT = POWT
+RIGHT = PRAWY
+SEARCH = SZUKAJ.TEKST
+SUBSTITUTE = PODSTAW
+T = T
+TEXT = TEKST
+TEXTJOIN = POŁĄCZ.TEKSTY
+THAIDIGIT = TAJ.CYFRA
+THAINUMSOUND = TAJ.DŹWIĘK.NUM
+THAINUMSTRING = TAJ.CIĄG.NUM
+THAISTRINGLENGTH = TAJ.DŁUGOŚĆ.CIĄGU
+TRIM = USUŃ.ZBĘDNE.ODSTĘPY
+UNICHAR = ZNAK.UNICODE
+UNICODE = UNICODE
+UPPER = LITERY.WIELKIE
+VALUE = WARTOŚĆ
+
+##
+## Funkcje sieci Web (Web Functions)
+##
+ENCODEURL = ENCODEURL
+FILTERXML = FILTERXML
+WEBSERVICE = WEBSERVICE
+
+##
+## Funkcje zgodności (Compatibility Functions)
+##
+BETADIST = ROZKŁAD.BETA
+BETAINV = ROZKŁAD.BETA.ODW
+BINOMDIST = ROZKŁAD.DWUM
+CEILING = ZAOKR.W.GÓRĘ
+CHIDIST = ROZKŁAD.CHI
+CHIINV = ROZKŁAD.CHI.ODW
+CHITEST = TEST.CHI
+CONCATENATE = ZŁĄCZ.TEKSTY
+CONFIDENCE = UFNOŚĆ
+COVAR = KOWARIANCJA
+CRITBINOM = PRÓG.ROZKŁAD.DWUM
+EXPONDIST = ROZKŁAD.EXP
+FDIST = ROZKŁAD.F
+FINV = ROZKŁAD.F.ODW
+FLOOR = ZAOKR.W.DÓŁ
+FORECAST = REGLINX
+FTEST = TEST.F
+GAMMADIST = ROZKŁAD.GAMMA
+GAMMAINV = ROZKŁAD.GAMMA.ODW
+HYPGEOMDIST = ROZKŁAD.HIPERGEOM
+LOGINV = ROZKŁAD.LOG.ODW
+LOGNORMDIST = ROZKŁAD.LOG
+MODE = WYST.NAJCZĘŚCIEJ
+NEGBINOMDIST = ROZKŁAD.DWUM.PRZEC
+NORMDIST = ROZKŁAD.NORMALNY
+NORMINV = ROZKŁAD.NORMALNY.ODW
+NORMSDIST = ROZKŁAD.NORMALNY.S
+NORMSINV = ROZKŁAD.NORMALNY.S.ODW
+PERCENTILE = PERCENTYL
+PERCENTRANK = PROCENT.POZYCJA
+POISSON = ROZKŁAD.POISSON
+QUARTILE = KWARTYL
+RANK = POZYCJA
+STDEV = ODCH.STANDARDOWE
+STDEVP = ODCH.STANDARD.POPUL
+TDIST = ROZKŁAD.T
+TINV = ROZKŁAD.T.ODW
+TTEST = TEST.T
+VAR = WARIANCJA
+VARP = WARIANCJA.POPUL
+WEIBULL = ROZKŁAD.WEIBULL
+ZTEST = TEST.Z
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/config
new file mode 100644
index 00000000..c39057c7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Português Brasileiro (Brazilian Portuguese)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #NULO!
+DIV0
+VALUE = #VALOR!
+REF
+NAME = #NOME?
+NUM = #NÚM!
+NA = #N/D
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
new file mode 100644
index 00000000..5781b0c7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
@@ -0,0 +1,528 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Português Brasileiro (Brazilian Portuguese)
+##
+############################################################
+
+
+##
+## Funções de cubo (Cube Functions)
+##
+CUBEKPIMEMBER = MEMBROKPICUBO
+CUBEMEMBER = MEMBROCUBO
+CUBEMEMBERPROPERTY = PROPRIEDADEMEMBROCUBO
+CUBERANKEDMEMBER = MEMBROCLASSIFICADOCUBO
+CUBESET = CONJUNTOCUBO
+CUBESETCOUNT = CONTAGEMCONJUNTOCUBO
+CUBEVALUE = VALORCUBO
+
+##
+## Funções de banco de dados (Database Functions)
+##
+DAVERAGE = BDMÉDIA
+DCOUNT = BDCONTAR
+DCOUNTA = BDCONTARA
+DGET = BDEXTRAIR
+DMAX = BDMÁX
+DMIN = BDMÍN
+DPRODUCT = BDMULTIPL
+DSTDEV = BDEST
+DSTDEVP = BDDESVPA
+DSUM = BDSOMA
+DVAR = BDVAREST
+DVARP = BDVARP
+
+##
+## Funções de data e hora (Date & Time Functions)
+##
+DATE = DATA
+DATEDIF = DATADIF
+DATESTRING = DATA.SÉRIE
+DATEVALUE = DATA.VALOR
+DAY = DIA
+DAYS = DIAS
+DAYS360 = DIAS360
+EDATE = DATAM
+EOMONTH = FIMMÊS
+HOUR = HORA
+ISOWEEKNUM = NÚMSEMANAISO
+MINUTE = MINUTO
+MONTH = MÊS
+NETWORKDAYS = DIATRABALHOTOTAL
+NETWORKDAYS.INTL = DIATRABALHOTOTAL.INTL
+NOW = AGORA
+SECOND = SEGUNDO
+TIME = TEMPO
+TIMEVALUE = VALOR.TEMPO
+TODAY = HOJE
+WEEKDAY = DIA.DA.SEMANA
+WEEKNUM = NÚMSEMANA
+WORKDAY = DIATRABALHO
+WORKDAY.INTL = DIATRABALHO.INTL
+YEAR = ANO
+YEARFRAC = FRAÇÃOANO
+
+##
+## Funções de engenharia (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINADEC
+BIN2HEX = BINAHEX
+BIN2OCT = BINAOCT
+BITAND = BITAND
+BITLSHIFT = DESLOCESQBIT
+BITOR = BITOR
+BITRSHIFT = DESLOCDIRBIT
+BITXOR = BITXOR
+COMPLEX = COMPLEXO
+CONVERT = CONVERTER
+DEC2BIN = DECABIN
+DEC2HEX = DECAHEX
+DEC2OCT = DECAOCT
+DELTA = DELTA
+ERF = FUNERRO
+ERF.PRECISE = FUNERRO.PRECISO
+ERFC = FUNERROCOMPL
+ERFC.PRECISE = FUNERROCOMPL.PRECISO
+GESTEP = DEGRAU
+HEX2BIN = HEXABIN
+HEX2DEC = HEXADEC
+HEX2OCT = HEXAOCT
+IMABS = IMABS
+IMAGINARY = IMAGINÁRIO
+IMARGUMENT = IMARG
+IMCONJUGATE = IMCONJ
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCOSEC
+IMCSCH = IMCOSECH
+IMDIV = IMDIV
+IMEXP = IMEXP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMPOT
+IMPRODUCT = IMPROD
+IMREAL = IMREAL
+IMSEC = IMSEC
+IMSECH = IMSECH
+IMSIN = IMSENO
+IMSINH = IMSENH
+IMSQRT = IMRAIZ
+IMSUB = IMSUBTR
+IMSUM = IMSOMA
+IMTAN = IMTAN
+OCT2BIN = OCTABIN
+OCT2DEC = OCTADEC
+OCT2HEX = OCTAHEX
+
+##
+## Funções financeiras (Financial Functions)
+##
+ACCRINT = JUROSACUM
+ACCRINTM = JUROSACUMV
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = CUPDIASINLIQ
+COUPDAYS = CUPDIAS
+COUPDAYSNC = CUPDIASPRÓX
+COUPNCD = CUPDATAPRÓX
+COUPNUM = CUPNÚM
+COUPPCD = CUPDATAANT
+CUMIPMT = PGTOJURACUM
+CUMPRINC = PGTOCAPACUM
+DB = BD
+DDB = BDD
+DISC = DESC
+DOLLARDE = MOEDADEC
+DOLLARFR = MOEDAFRA
+DURATION = DURAÇÃO
+EFFECT = EFETIVA
+FV = VF
+FVSCHEDULE = VFPLANO
+INTRATE = TAXAJUROS
+IPMT = IPGTO
+IRR = TIR
+ISPMT = ÉPGTO
+MDURATION = MDURAÇÃO
+MIRR = MTIR
+NOMINAL = NOMINAL
+NPER = NPER
+NPV = VPL
+ODDFPRICE = PREÇOPRIMINC
+ODDFYIELD = LUCROPRIMINC
+ODDLPRICE = PREÇOÚLTINC
+ODDLYIELD = LUCROÚLTINC
+PDURATION = DURAÇÃOP
+PMT = PGTO
+PPMT = PPGTO
+PRICE = PREÇO
+PRICEDISC = PREÇODESC
+PRICEMAT = PREÇOVENC
+PV = VP
+RATE = TAXA
+RECEIVED = RECEBER
+RRI = TAXAJURO
+SLN = DPD
+SYD = SDA
+TBILLEQ = OTN
+TBILLPRICE = OTNVALOR
+TBILLYIELD = OTNLUCRO
+VDB = BDV
+XIRR = XTIR
+XNPV = XVPL
+YIELD = LUCRO
+YIELDDISC = LUCRODESC
+YIELDMAT = LUCROVENC
+
+##
+## Funções de informação (Information Functions)
+##
+CELL = CÉL
+ERROR.TYPE = TIPO.ERRO
+INFO = INFORMAÇÃO
+ISBLANK = ÉCÉL.VAZIA
+ISERR = ÉERRO
+ISERROR = ÉERROS
+ISEVEN = ÉPAR
+ISFORMULA = ÉFÓRMULA
+ISLOGICAL = ÉLÓGICO
+ISNA = É.NÃO.DISP
+ISNONTEXT = É.NÃO.TEXTO
+ISNUMBER = ÉNÚM
+ISODD = ÉIMPAR
+ISREF = ÉREF
+ISTEXT = ÉTEXTO
+N = N
+NA = NÃO.DISP
+SHEET = PLAN
+SHEETS = PLANS
+TYPE = TIPO
+
+##
+## Funções lógicas (Logical Functions)
+##
+AND = E
+FALSE = FALSO
+IF = SE
+IFERROR = SEERRO
+IFNA = SENÃODISP
+IFS = SES
+NOT = NÃO
+OR = OU
+SWITCH = PARÂMETRO
+TRUE = VERDADEIRO
+XOR = XOR
+
+##
+## Funções de pesquisa e referência (Lookup & Reference Functions)
+##
+ADDRESS = ENDEREÇO
+AREAS = ÁREAS
+CHOOSE = ESCOLHER
+COLUMN = COL
+COLUMNS = COLS
+FORMULATEXT = FÓRMULATEXTO
+GETPIVOTDATA = INFODADOSTABELADINÂMICA
+HLOOKUP = PROCH
+HYPERLINK = HIPERLINK
+INDEX = ÍNDICE
+INDIRECT = INDIRETO
+LOOKUP = PROC
+MATCH = CORRESP
+OFFSET = DESLOC
+ROW = LIN
+ROWS = LINS
+RTD = RTD
+TRANSPOSE = TRANSPOR
+VLOOKUP = PROCV
+*RC = LC
+
+##
+## Funções matemáticas e trigonométricas (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGAR
+ARABIC = ARÁBICO
+ASIN = ASEN
+ASINH = ASENH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = BASE
+CEILING.MATH = TETO.MAT
+CEILING.PRECISE = TETO.PRECISO
+COMBIN = COMBIN
+COMBINA = COMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = COSEC
+CSCH = COSECH
+DECIMAL = DECIMAL
+DEGREES = GRAUS
+ECMA.CEILING = ECMA.TETO
+EVEN = PAR
+EXP = EXP
+FACT = FATORIAL
+FACTDOUBLE = FATDUPLO
+FLOOR.MATH = ARREDMULTB.MAT
+FLOOR.PRECISE = ARREDMULTB.PRECISO
+GCD = MDC
+INT = INT
+ISO.CEILING = ISO.TETO
+LCM = MMC
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MATRIZ.DETERM
+MINVERSE = MATRIZ.INVERSO
+MMULT = MATRIZ.MULT
+MOD = MOD
+MROUND = MARRED
+MULTINOMIAL = MULTINOMIAL
+MUNIT = MUNIT
+ODD = ÍMPAR
+PI = PI
+POWER = POTÊNCIA
+PRODUCT = MULT
+QUOTIENT = QUOCIENTE
+RADIANS = RADIANOS
+RAND = ALEATÓRIO
+RANDBETWEEN = ALEATÓRIOENTRE
+ROMAN = ROMANO
+ROUND = ARRED
+ROUNDDOWN = ARREDONDAR.PARA.BAIXO
+ROUNDUP = ARREDONDAR.PARA.CIMA
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOMASEQÜÊNCIA
+SIGN = SINAL
+SIN = SEN
+SINH = SENH
+SQRT = RAIZ
+SQRTPI = RAIZPI
+SUBTOTAL = SUBTOTAL
+SUM = SOMA
+SUMIF = SOMASE
+SUMIFS = SOMASES
+SUMPRODUCT = SOMARPRODUTO
+SUMSQ = SOMAQUAD
+SUMX2MY2 = SOMAX2DY2
+SUMX2PY2 = SOMAX2SY2
+SUMXMY2 = SOMAXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = TRUNCAR
+
+##
+## Funções estatísticas (Statistical Functions)
+##
+AVEDEV = DESV.MÉDIO
+AVERAGE = MÉDIA
+AVERAGEA = MÉDIAA
+AVERAGEIF = MÉDIASE
+AVERAGEIFS = MÉDIASES
+BETA.DIST = DIST.BETA
+BETA.INV = INV.BETA
+BINOM.DIST = DISTR.BINOM
+BINOM.DIST.RANGE = INTERV.DISTR.BINOM
+BINOM.INV = INV.BINOM
+CHISQ.DIST = DIST.QUIQUA
+CHISQ.DIST.RT = DIST.QUIQUA.CD
+CHISQ.INV = INV.QUIQUA
+CHISQ.INV.RT = INV.QUIQUA.CD
+CHISQ.TEST = TESTE.QUIQUA
+CONFIDENCE.NORM = INT.CONFIANÇA.NORM
+CONFIDENCE.T = INT.CONFIANÇA.T
+CORREL = CORREL
+COUNT = CONT.NÚM
+COUNTA = CONT.VALORES
+COUNTBLANK = CONTAR.VAZIO
+COUNTIF = CONT.SE
+COUNTIFS = CONT.SES
+COVARIANCE.P = COVARIAÇÃO.P
+COVARIANCE.S = COVARIAÇÃO.S
+DEVSQ = DESVQ
+EXPON.DIST = DISTR.EXPON
+F.DIST = DIST.F
+F.DIST.RT = DIST.F.CD
+F.INV = INV.F
+F.INV.RT = INV.F.CD
+F.TEST = TESTE.F
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PREVISÃO.ETS
+FORECAST.ETS.CONFINT = PREVISÃO.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PREVISÃO.ETS.SAZONALIDADE
+FORECAST.ETS.STAT = PREVISÃO.ETS.STAT
+FORECAST.LINEAR = PREVISÃO.LINEAR
+FREQUENCY = FREQÜÊNCIA
+GAMMA = GAMA
+GAMMA.DIST = DIST.GAMA
+GAMMA.INV = INV.GAMA
+GAMMALN = LNGAMA
+GAMMALN.PRECISE = LNGAMA.PRECISO
+GAUSS = GAUSS
+GEOMEAN = MÉDIA.GEOMÉTRICA
+GROWTH = CRESCIMENTO
+HARMEAN = MÉDIA.HARMÔNICA
+HYPGEOM.DIST = DIST.HIPERGEOM.N
+INTERCEPT = INTERCEPÇÃO
+KURT = CURT
+LARGE = MAIOR
+LINEST = PROJ.LIN
+LOGEST = PROJ.LOG
+LOGNORM.DIST = DIST.LOGNORMAL.N
+LOGNORM.INV = INV.LOGNORMAL
+MAX = MÁXIMO
+MAXA = MÁXIMOA
+MAXIFS = MÁXIMOSES
+MEDIAN = MED
+MIN = MÍNIMO
+MINA = MÍNIMOA
+MINIFS = MÍNIMOSES
+MODE.MULT = MODO.MULT
+MODE.SNGL = MODO.ÚNICO
+NEGBINOM.DIST = DIST.BIN.NEG.N
+NORM.DIST = DIST.NORM.N
+NORM.INV = INV.NORM.N
+NORM.S.DIST = DIST.NORMP.N
+NORM.S.INV = INV.NORMP.N
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXC
+PERCENTILE.INC = PERCENTIL.INC
+PERCENTRANK.EXC = ORDEM.PORCENTUAL.EXC
+PERCENTRANK.INC = ORDEM.PORCENTUAL.INC
+PERMUT = PERMUT
+PERMUTATIONA = PERMUTAS
+PHI = PHI
+POISSON.DIST = DIST.POISSON
+PROB = PROB
+QUARTILE.EXC = QUARTIL.EXC
+QUARTILE.INC = QUARTIL.INC
+RANK.AVG = ORDEM.MÉD
+RANK.EQ = ORDEM.EQ
+RSQ = RQUAD
+SKEW = DISTORÇÃO
+SKEW.P = DISTORÇÃO.P
+SLOPE = INCLINAÇÃO
+SMALL = MENOR
+STANDARDIZE = PADRONIZAR
+STDEV.P = DESVPAD.P
+STDEV.S = DESVPAD.A
+STDEVA = DESVPADA
+STDEVPA = DESVPADPA
+STEYX = EPADYX
+T.DIST = DIST.T
+T.DIST.2T = DIST.T.BC
+T.DIST.RT = DIST.T.CD
+T.INV = INV.T
+T.INV.2T = INV.T.BC
+T.TEST = TESTE.T
+TREND = TENDÊNCIA
+TRIMMEAN = MÉDIA.INTERNA
+VAR.P = VAR.P
+VAR.S = VAR.A
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = DIST.WEIBULL
+Z.TEST = TESTE.Z
+
+##
+## Funções de texto (Text Functions)
+##
+BAHTTEXT = BAHTTEXT
+CHAR = CARACT
+CLEAN = TIRAR
+CODE = CÓDIGO
+CONCAT = CONCAT
+DOLLAR = MOEDA
+EXACT = EXATO
+FIND = PROCURAR
+FIXED = DEF.NÚM.DEC
+LEFT = ESQUERDA
+LEN = NÚM.CARACT
+LOWER = MINÚSCULA
+MID = EXT.TEXTO
+NUMBERSTRING = SEQÜÊNCIA.NÚMERO
+NUMBERVALUE = VALORNUMÉRICO
+PHONETIC = FONÉTICA
+PROPER = PRI.MAIÚSCULA
+REPLACE = MUDAR
+REPT = REPT
+RIGHT = DIREITA
+SEARCH = LOCALIZAR
+SUBSTITUTE = SUBSTITUIR
+T = T
+TEXT = TEXTO
+TEXTJOIN = UNIRTEXTO
+TRIM = ARRUMAR
+UNICHAR = CARACTUNICODE
+UNICODE = UNICODE
+UPPER = MAIÚSCULA
+VALUE = VALOR
+
+##
+## Funções da Web (Web Functions)
+##
+ENCODEURL = CODIFURL
+FILTERXML = FILTROXML
+WEBSERVICE = SERVIÇOWEB
+
+##
+## Funções de compatibilidade (Compatibility Functions)
+##
+BETADIST = DISTBETA
+BETAINV = BETA.ACUM.INV
+BINOMDIST = DISTRBINOM
+CEILING = TETO
+CHIDIST = DIST.QUI
+CHIINV = INV.QUI
+CHITEST = TESTE.QUI
+CONCATENATE = CONCATENAR
+CONFIDENCE = INT.CONFIANÇA
+COVAR = COVAR
+CRITBINOM = CRIT.BINOM
+EXPONDIST = DISTEXPON
+FDIST = DISTF
+FINV = INVF
+FLOOR = ARREDMULTB
+FORECAST = PREVISÃO
+FTEST = TESTEF
+GAMMADIST = DISTGAMA
+GAMMAINV = INVGAMA
+HYPGEOMDIST = DIST.HIPERGEOM
+LOGINV = INVLOG
+LOGNORMDIST = DIST.LOGNORMAL
+MODE = MODO
+NEGBINOMDIST = DIST.BIN.NEG
+NORMDIST = DISTNORM
+NORMINV = INV.NORM
+NORMSDIST = DISTNORMP
+NORMSINV = INV.NORMP
+PERCENTILE = PERCENTIL
+PERCENTRANK = ORDEM.PORCENTUAL
+POISSON = POISSON
+QUARTILE = QUARTIL
+RANK = ORDEM
+STDEV = DESVPAD
+STDEVP = DESVPADP
+TDIST = DISTT
+TINV = INVT
+TTEST = TESTET
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = TESTEZ
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/config
new file mode 100644
index 00000000..e661830b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Português (Portuguese)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #NULO!
+DIV0
+VALUE = #VALOR!
+REF
+NAME = #NOME?
+NUM = #NÚM!
+NA = #N/D
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions
new file mode 100644
index 00000000..70a3bb0c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions
@@ -0,0 +1,538 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Português (Portuguese)
+##
+############################################################
+
+
+##
+## Funções de cubo (Cube Functions)
+##
+CUBEKPIMEMBER = MEMBROKPICUBO
+CUBEMEMBER = MEMBROCUBO
+CUBEMEMBERPROPERTY = PROPRIEDADEMEMBROCUBO
+CUBERANKEDMEMBER = MEMBROCLASSIFICADOCUBO
+CUBESET = CONJUNTOCUBO
+CUBESETCOUNT = CONTARCONJUNTOCUBO
+CUBEVALUE = VALORCUBO
+
+##
+## Funções de base de dados (Database Functions)
+##
+DAVERAGE = BDMÉDIA
+DCOUNT = BDCONTAR
+DCOUNTA = BDCONTAR.VAL
+DGET = BDOBTER
+DMAX = BDMÁX
+DMIN = BDMÍN
+DPRODUCT = BDMULTIPL
+DSTDEV = BDDESVPAD
+DSTDEVP = BDDESVPADP
+DSUM = BDSOMA
+DVAR = BDVAR
+DVARP = BDVARP
+
+##
+## Funções de data e hora (Date & Time Functions)
+##
+DATE = DATA
+DATEDIF = DATADIF
+DATESTRING = DATA.CADEIA
+DATEVALUE = DATA.VALOR
+DAY = DIA
+DAYS = DIAS
+DAYS360 = DIAS360
+EDATE = DATAM
+EOMONTH = FIMMÊS
+HOUR = HORA
+ISOWEEKNUM = NUMSEMANAISO
+MINUTE = MINUTO
+MONTH = MÊS
+NETWORKDAYS = DIATRABALHOTOTAL
+NETWORKDAYS.INTL = DIATRABALHOTOTAL.INTL
+NOW = AGORA
+SECOND = SEGUNDO
+THAIDAYOFWEEK = DIA.DA.SEMANA.TAILANDÊS
+THAIMONTHOFYEAR = MÊS.DO.ANO.TAILANDÊS
+THAIYEAR = ANO.TAILANDÊS
+TIME = TEMPO
+TIMEVALUE = VALOR.TEMPO
+TODAY = HOJE
+WEEKDAY = DIA.SEMANA
+WEEKNUM = NÚMSEMANA
+WORKDAY = DIATRABALHO
+WORKDAY.INTL = DIATRABALHO.INTL
+YEAR = ANO
+YEARFRAC = FRAÇÃOANO
+
+##
+## Funções de engenharia (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BINADEC
+BIN2HEX = BINAHEX
+BIN2OCT = BINAOCT
+BITAND = BIT.E
+BITLSHIFT = BITDESL.ESQ
+BITOR = BIT.OU
+BITRSHIFT = BITDESL.DIR
+BITXOR = BIT.XOU
+COMPLEX = COMPLEXO
+CONVERT = CONVERTER
+DEC2BIN = DECABIN
+DEC2HEX = DECAHEX
+DEC2OCT = DECAOCT
+DELTA = DELTA
+ERF = FUNCERRO
+ERF.PRECISE = FUNCERRO.PRECISO
+ERFC = FUNCERROCOMPL
+ERFC.PRECISE = FUNCERROCOMPL.PRECISO
+GESTEP = DEGRAU
+HEX2BIN = HEXABIN
+HEX2DEC = HEXADEC
+HEX2OCT = HEXAOCT
+IMABS = IMABS
+IMAGINARY = IMAGINÁRIO
+IMARGUMENT = IMARG
+IMCONJUGATE = IMCONJ
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCSC
+IMCSCH = IMCSCH
+IMDIV = IMDIV
+IMEXP = IMEXP
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMPOT
+IMPRODUCT = IMPROD
+IMREAL = IMREAL
+IMSEC = IMSEC
+IMSECH = IMSECH
+IMSIN = IMSENO
+IMSINH = IMSENOH
+IMSQRT = IMRAIZ
+IMSUB = IMSUBTR
+IMSUM = IMSOMA
+IMTAN = IMTAN
+OCT2BIN = OCTABIN
+OCT2DEC = OCTADEC
+OCT2HEX = OCTAHEX
+
+##
+## Funções financeiras (Financial Functions)
+##
+ACCRINT = JUROSACUM
+ACCRINTM = JUROSACUMV
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = CUPDIASINLIQ
+COUPDAYS = CUPDIAS
+COUPDAYSNC = CUPDIASPRÓX
+COUPNCD = CUPDATAPRÓX
+COUPNUM = CUPNÚM
+COUPPCD = CUPDATAANT
+CUMIPMT = PGTOJURACUM
+CUMPRINC = PGTOCAPACUM
+DB = BD
+DDB = BDD
+DISC = DESC
+DOLLARDE = MOEDADEC
+DOLLARFR = MOEDAFRA
+DURATION = DURAÇÃO
+EFFECT = EFETIVA
+FV = VF
+FVSCHEDULE = VFPLANO
+INTRATE = TAXAJUROS
+IPMT = IPGTO
+IRR = TIR
+ISPMT = É.PGTO
+MDURATION = MDURAÇÃO
+MIRR = MTIR
+NOMINAL = NOMINAL
+NPER = NPER
+NPV = VAL
+ODDFPRICE = PREÇOPRIMINC
+ODDFYIELD = LUCROPRIMINC
+ODDLPRICE = PREÇOÚLTINC
+ODDLYIELD = LUCROÚLTINC
+PDURATION = PDURAÇÃO
+PMT = PGTO
+PPMT = PPGTO
+PRICE = PREÇO
+PRICEDISC = PREÇODESC
+PRICEMAT = PREÇOVENC
+PV = VA
+RATE = TAXA
+RECEIVED = RECEBER
+RRI = DEVOLVERTAXAJUROS
+SLN = AMORT
+SYD = AMORTD
+TBILLEQ = OTN
+TBILLPRICE = OTNVALOR
+TBILLYIELD = OTNLUCRO
+VDB = BDV
+XIRR = XTIR
+XNPV = XVAL
+YIELD = LUCRO
+YIELDDISC = LUCRODESC
+YIELDMAT = LUCROVENC
+
+##
+## Funções de informação (Information Functions)
+##
+CELL = CÉL
+ERROR.TYPE = TIPO.ERRO
+INFO = INFORMAÇÃO
+ISBLANK = É.CÉL.VAZIA
+ISERR = É.ERROS
+ISERROR = É.ERRO
+ISEVEN = ÉPAR
+ISFORMULA = É.FORMULA
+ISLOGICAL = É.LÓGICO
+ISNA = É.NÃO.DISP
+ISNONTEXT = É.NÃO.TEXTO
+ISNUMBER = É.NÚM
+ISODD = ÉÍMPAR
+ISREF = É.REF
+ISTEXT = É.TEXTO
+N = N
+NA = NÃO.DISP
+SHEET = FOLHA
+SHEETS = FOLHAS
+TYPE = TIPO
+
+##
+## Funções lógicas (Logical Functions)
+##
+AND = E
+FALSE = FALSO
+IF = SE
+IFERROR = SE.ERRO
+IFNA = SEND
+IFS = SE.S
+NOT = NÃO
+OR = OU
+SWITCH = PARÂMETRO
+TRUE = VERDADEIRO
+XOR = XOU
+
+##
+## Funções de pesquisa e referência (Lookup & Reference Functions)
+##
+ADDRESS = ENDEREÇO
+AREAS = ÁREAS
+CHOOSE = SELECIONAR
+COLUMN = COL
+COLUMNS = COLS
+FORMULATEXT = FÓRMULA.TEXTO
+GETPIVOTDATA = OBTERDADOSDIN
+HLOOKUP = PROCH
+HYPERLINK = HIPERLIGAÇÃO
+INDEX = ÍNDICE
+INDIRECT = INDIRETO
+LOOKUP = PROC
+MATCH = CORRESP
+OFFSET = DESLOCAMENTO
+ROW = LIN
+ROWS = LINS
+RTD = RTD
+TRANSPOSE = TRANSPOR
+VLOOKUP = PROCV
+*RC = LC
+
+##
+## Funções matemáticas e trigonométricas (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = AGREGAR
+ARABIC = ÁRABE
+ASIN = ASEN
+ASINH = ASENH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = BASE
+CEILING.MATH = ARRED.EXCESSO.MAT
+CEILING.PRECISE = ARRED.EXCESSO.PRECISO
+COMBIN = COMBIN
+COMBINA = COMBIN.R
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = GRAUS
+ECMA.CEILING = ARRED.EXCESSO.ECMA
+EVEN = PAR
+EXP = EXP
+FACT = FATORIAL
+FACTDOUBLE = FATDUPLO
+FLOOR.MATH = ARRED.DEFEITO.MAT
+FLOOR.PRECISE = ARRED.DEFEITO.PRECISO
+GCD = MDC
+INT = INT
+ISO.CEILING = ARRED.EXCESSO.ISO
+LCM = MMC
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MATRIZ.DETERM
+MINVERSE = MATRIZ.INVERSA
+MMULT = MATRIZ.MULT
+MOD = RESTO
+MROUND = MARRED
+MULTINOMIAL = POLINOMIAL
+MUNIT = UNIDM
+ODD = ÍMPAR
+PI = PI
+POWER = POTÊNCIA
+PRODUCT = PRODUTO
+QUOTIENT = QUOCIENTE
+RADIANS = RADIANOS
+RAND = ALEATÓRIO
+RANDBETWEEN = ALEATÓRIOENTRE
+ROMAN = ROMANO
+ROUND = ARRED
+ROUNDBAHTDOWN = ARREDOND.BAHT.BAIXO
+ROUNDBAHTUP = ARREDOND.BAHT.CIMA
+ROUNDDOWN = ARRED.PARA.BAIXO
+ROUNDUP = ARRED.PARA.CIMA
+SEC = SEC
+SECH = SECH
+SERIESSUM = SOMASÉRIE
+SIGN = SINAL
+SIN = SEN
+SINH = SENH
+SQRT = RAIZQ
+SQRTPI = RAIZPI
+SUBTOTAL = SUBTOTAL
+SUM = SOMA
+SUMIF = SOMA.SE
+SUMIFS = SOMA.SE.S
+SUMPRODUCT = SOMARPRODUTO
+SUMSQ = SOMARQUAD
+SUMX2MY2 = SOMAX2DY2
+SUMX2PY2 = SOMAX2SY2
+SUMXMY2 = SOMAXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = TRUNCAR
+
+##
+## Funções estatísticas (Statistical Functions)
+##
+AVEDEV = DESV.MÉDIO
+AVERAGE = MÉDIA
+AVERAGEA = MÉDIAA
+AVERAGEIF = MÉDIA.SE
+AVERAGEIFS = MÉDIA.SE.S
+BETA.DIST = DIST.BETA
+BETA.INV = INV.BETA
+BINOM.DIST = DISTR.BINOM
+BINOM.DIST.RANGE = DIST.BINOM.INTERVALO
+BINOM.INV = INV.BINOM
+CHISQ.DIST = DIST.CHIQ
+CHISQ.DIST.RT = DIST.CHIQ.DIR
+CHISQ.INV = INV.CHIQ
+CHISQ.INV.RT = INV.CHIQ.DIR
+CHISQ.TEST = TESTE.CHIQ
+CONFIDENCE.NORM = INT.CONFIANÇA.NORM
+CONFIDENCE.T = INT.CONFIANÇA.T
+CORREL = CORREL
+COUNT = CONTAR
+COUNTA = CONTAR.VAL
+COUNTBLANK = CONTAR.VAZIO
+COUNTIF = CONTAR.SE
+COUNTIFS = CONTAR.SE.S
+COVARIANCE.P = COVARIÂNCIA.P
+COVARIANCE.S = COVARIÂNCIA.S
+DEVSQ = DESVQ
+EXPON.DIST = DIST.EXPON
+F.DIST = DIST.F
+F.DIST.RT = DIST.F.DIR
+F.INV = INV.F
+F.INV.RT = INV.F.DIR
+F.TEST = TESTE.F
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PREVISÃO.ETS
+FORECAST.ETS.CONFINT = PREVISÃO.ETS.CONFINT
+FORECAST.ETS.SEASONALITY = PREVISÃO.ETS.SAZONALIDADE
+FORECAST.ETS.STAT = PREVISÃO.ETS.ESTATÍSTICA
+FORECAST.LINEAR = PREVISÃO.LINEAR
+FREQUENCY = FREQUÊNCIA
+GAMMA = GAMA
+GAMMA.DIST = DIST.GAMA
+GAMMA.INV = INV.GAMA
+GAMMALN = LNGAMA
+GAMMALN.PRECISE = LNGAMA.PRECISO
+GAUSS = GAUSS
+GEOMEAN = MÉDIA.GEOMÉTRICA
+GROWTH = CRESCIMENTO
+HARMEAN = MÉDIA.HARMÓNICA
+HYPGEOM.DIST = DIST.HIPGEOM
+INTERCEPT = INTERCETAR
+KURT = CURT
+LARGE = MAIOR
+LINEST = PROJ.LIN
+LOGEST = PROJ.LOG
+LOGNORM.DIST = DIST.NORMLOG
+LOGNORM.INV = INV.NORMALLOG
+MAX = MÁXIMO
+MAXA = MÁXIMOA
+MAXIFS = MÁXIMO.SE.S
+MEDIAN = MED
+MIN = MÍNIMO
+MINA = MÍNIMOA
+MINIFS = MÍNIMO.SE.S
+MODE.MULT = MODO.MÚLT
+MODE.SNGL = MODO.SIMPLES
+NEGBINOM.DIST = DIST.BINOM.NEG
+NORM.DIST = DIST.NORMAL
+NORM.INV = INV.NORMAL
+NORM.S.DIST = DIST.S.NORM
+NORM.S.INV = INV.S.NORM
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXC
+PERCENTILE.INC = PERCENTIL.INC
+PERCENTRANK.EXC = ORDEM.PERCENTUAL.EXC
+PERCENTRANK.INC = ORDEM.PERCENTUAL.INC
+PERMUT = PERMUTAR
+PERMUTATIONA = PERMUTAR.R
+PHI = PHI
+POISSON.DIST = DIST.POISSON
+PROB = PROB
+QUARTILE.EXC = QUARTIL.EXC
+QUARTILE.INC = QUARTIL.INC
+RANK.AVG = ORDEM.MÉD
+RANK.EQ = ORDEM.EQ
+RSQ = RQUAD
+SKEW = DISTORÇÃO
+SKEW.P = DISTORÇÃO.P
+SLOPE = DECLIVE
+SMALL = MENOR
+STANDARDIZE = NORMALIZAR
+STDEV.P = DESVPAD.P
+STDEV.S = DESVPAD.S
+STDEVA = DESVPADA
+STDEVPA = DESVPADPA
+STEYX = EPADYX
+T.DIST = DIST.T
+T.DIST.2T = DIST.T.2C
+T.DIST.RT = DIST.T.DIR
+T.INV = INV.T
+T.INV.2T = INV.T.2C
+T.TEST = TESTE.T
+TREND = TENDÊNCIA
+TRIMMEAN = MÉDIA.INTERNA
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = DIST.WEIBULL
+Z.TEST = TESTE.Z
+
+##
+## Funções de texto (Text Functions)
+##
+BAHTTEXT = TEXTO.BAHT
+CHAR = CARÁT
+CLEAN = LIMPARB
+CODE = CÓDIGO
+CONCAT = CONCAT
+DOLLAR = MOEDA
+EXACT = EXATO
+FIND = LOCALIZAR
+FIXED = FIXA
+ISTHAIDIGIT = É.DÍGITO.TAILANDÊS
+LEFT = ESQUERDA
+LEN = NÚM.CARAT
+LOWER = MINÚSCULAS
+MID = SEG.TEXTO
+NUMBERSTRING = NÚMERO.CADEIA
+NUMBERVALUE = VALOR.NÚMERO
+PHONETIC = FONÉTICA
+PROPER = INICIAL.MAIÚSCULA
+REPLACE = SUBSTITUIR
+REPT = REPETIR
+RIGHT = DIREITA
+SEARCH = PROCURAR
+SUBSTITUTE = SUBST
+T = T
+TEXT = TEXTO
+TEXTJOIN = UNIRTEXTO
+THAIDIGIT = DÍGITO.TAILANDÊS
+THAINUMSOUND = SOM.NÚM.TAILANDÊS
+THAINUMSTRING = CADEIA.NÚM.TAILANDÊS
+THAISTRINGLENGTH = COMP.CADEIA.TAILANDÊS
+TRIM = COMPACTAR
+UNICHAR = UNICARÁT
+UNICODE = UNICODE
+UPPER = MAIÚSCULAS
+VALUE = VALOR
+
+##
+## Funções da Web (Web Functions)
+##
+ENCODEURL = CODIFICAÇÃOURL
+FILTERXML = FILTRARXML
+WEBSERVICE = SERVIÇOWEB
+
+##
+## Funções de compatibilidade (Compatibility Functions)
+##
+BETADIST = DISTBETA
+BETAINV = BETA.ACUM.INV
+BINOMDIST = DISTRBINOM
+CEILING = ARRED.EXCESSO
+CHIDIST = DIST.CHI
+CHIINV = INV.CHI
+CHITEST = TESTE.CHI
+CONCATENATE = CONCATENAR
+CONFIDENCE = INT.CONFIANÇA
+COVAR = COVAR
+CRITBINOM = CRIT.BINOM
+EXPONDIST = DISTEXPON
+FDIST = DISTF
+FINV = INVF
+FLOOR = ARRED.DEFEITO
+FORECAST = PREVISÃO
+FTEST = TESTEF
+GAMMADIST = DISTGAMA
+GAMMAINV = INVGAMA
+HYPGEOMDIST = DIST.HIPERGEOM
+LOGINV = INVLOG
+LOGNORMDIST = DIST.NORMALLOG
+MODE = MODA
+NEGBINOMDIST = DIST.BIN.NEG
+NORMDIST = DIST.NORM
+NORMINV = INV.NORM
+NORMSDIST = DIST.NORMP
+NORMSINV = INV.NORMP
+PERCENTILE = PERCENTIL
+PERCENTRANK = ORDEM.PERCENTUAL
+POISSON = POISSON
+QUARTILE = QUARTIL
+RANK = ORDEM
+STDEV = DESVPAD
+STDEVP = DESVPADP
+TDIST = DISTT
+TINV = INVT
+TTEST = TESTET
+VAR = VAR
+VARP = VARP
+WEIBULL = WEIBULL
+ZTEST = TESTEZ
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/config
new file mode 100644
index 00000000..2a5a0db8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## русский язык (Russian)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #ПУСТО!
+DIV0 = #ДЕЛ/0!
+VALUE = #ЗНАЧ!
+REF = #ССЫЛКА!
+NAME = #ИМЯ?
+NUM = #ЧИСЛО!
+NA = #Н/Д
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions
new file mode 100644
index 00000000..9f05d5af
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions
@@ -0,0 +1,555 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## русский язык (Russian)
+##
+############################################################
+
+
+##
+## Функции кубов (Cube Functions)
+##
+CUBEKPIMEMBER = КУБЭЛЕМЕНТКИП
+CUBEMEMBER = КУБЭЛЕМЕНТ
+CUBEMEMBERPROPERTY = КУБСВОЙСТВОЭЛЕМЕНТА
+CUBERANKEDMEMBER = КУБПОРЭЛЕМЕНТ
+CUBESET = КУБМНОЖ
+CUBESETCOUNT = КУБЧИСЛОЭЛМНОЖ
+CUBEVALUE = КУБЗНАЧЕНИЕ
+
+##
+## Функции для работы с базами данных (Database Functions)
+##
+DAVERAGE = ДСРЗНАЧ
+DCOUNT = БСЧЁТ
+DCOUNTA = БСЧЁТА
+DGET = БИЗВЛЕЧЬ
+DMAX = ДМАКС
+DMIN = ДМИН
+DPRODUCT = БДПРОИЗВЕД
+DSTDEV = ДСТАНДОТКЛ
+DSTDEVP = ДСТАНДОТКЛП
+DSUM = БДСУММ
+DVAR = БДДИСП
+DVARP = БДДИСПП
+
+##
+## Функции даты и времени (Date & Time Functions)
+##
+DATE = ДАТА
+DATEDIF = РАЗНДАТ
+DATESTRING = СТРОКАДАННЫХ
+DATEVALUE = ДАТАЗНАЧ
+DAY = ДЕНЬ
+DAYS = ДНИ
+DAYS360 = ДНЕЙ360
+EDATE = ДАТАМЕС
+EOMONTH = КОНМЕСЯЦА
+HOUR = ЧАС
+ISOWEEKNUM = НОМНЕДЕЛИ.ISO
+MINUTE = МИНУТЫ
+MONTH = МЕСЯЦ
+NETWORKDAYS = ЧИСТРАБДНИ
+NETWORKDAYS.INTL = ЧИСТРАБДНИ.МЕЖД
+NOW = ТДАТА
+SECOND = СЕКУНДЫ
+THAIDAYOFWEEK = ТАЙДЕНЬНЕД
+THAIMONTHOFYEAR = ТАЙМЕСЯЦ
+THAIYEAR = ТАЙГОД
+TIME = ВРЕМЯ
+TIMEVALUE = ВРЕМЗНАЧ
+TODAY = СЕГОДНЯ
+WEEKDAY = ДЕНЬНЕД
+WEEKNUM = НОМНЕДЕЛИ
+WORKDAY = РАБДЕНЬ
+WORKDAY.INTL = РАБДЕНЬ.МЕЖД
+YEAR = ГОД
+YEARFRAC = ДОЛЯГОДА
+
+##
+## Инженерные функции (Engineering Functions)
+##
+BESSELI = БЕССЕЛЬ.I
+BESSELJ = БЕССЕЛЬ.J
+BESSELK = БЕССЕЛЬ.K
+BESSELY = БЕССЕЛЬ.Y
+BIN2DEC = ДВ.В.ДЕС
+BIN2HEX = ДВ.В.ШЕСТН
+BIN2OCT = ДВ.В.ВОСЬМ
+BITAND = БИТ.И
+BITLSHIFT = БИТ.СДВИГЛ
+BITOR = БИТ.ИЛИ
+BITRSHIFT = БИТ.СДВИГП
+BITXOR = БИТ.ИСКЛИЛИ
+COMPLEX = КОМПЛЕКСН
+CONVERT = ПРЕОБР
+DEC2BIN = ДЕС.В.ДВ
+DEC2HEX = ДЕС.В.ШЕСТН
+DEC2OCT = ДЕС.В.ВОСЬМ
+DELTA = ДЕЛЬТА
+ERF = ФОШ
+ERF.PRECISE = ФОШ.ТОЧН
+ERFC = ДФОШ
+ERFC.PRECISE = ДФОШ.ТОЧН
+GESTEP = ПОРОГ
+HEX2BIN = ШЕСТН.В.ДВ
+HEX2DEC = ШЕСТН.В.ДЕС
+HEX2OCT = ШЕСТН.В.ВОСЬМ
+IMABS = МНИМ.ABS
+IMAGINARY = МНИМ.ЧАСТЬ
+IMARGUMENT = МНИМ.АРГУМЕНТ
+IMCONJUGATE = МНИМ.СОПРЯЖ
+IMCOS = МНИМ.COS
+IMCOSH = МНИМ.COSH
+IMCOT = МНИМ.COT
+IMCSC = МНИМ.CSC
+IMCSCH = МНИМ.CSCH
+IMDIV = МНИМ.ДЕЛ
+IMEXP = МНИМ.EXP
+IMLN = МНИМ.LN
+IMLOG10 = МНИМ.LOG10
+IMLOG2 = МНИМ.LOG2
+IMPOWER = МНИМ.СТЕПЕНЬ
+IMPRODUCT = МНИМ.ПРОИЗВЕД
+IMREAL = МНИМ.ВЕЩ
+IMSEC = МНИМ.SEC
+IMSECH = МНИМ.SECH
+IMSIN = МНИМ.SIN
+IMSINH = МНИМ.SINH
+IMSQRT = МНИМ.КОРЕНЬ
+IMSUB = МНИМ.РАЗН
+IMSUM = МНИМ.СУММ
+IMTAN = МНИМ.TAN
+OCT2BIN = ВОСЬМ.В.ДВ
+OCT2DEC = ВОСЬМ.В.ДЕС
+OCT2HEX = ВОСЬМ.В.ШЕСТН
+
+##
+## Финансовые функции (Financial Functions)
+##
+ACCRINT = НАКОПДОХОД
+ACCRINTM = НАКОПДОХОДПОГАШ
+AMORDEGRC = АМОРУМ
+AMORLINC = АМОРУВ
+COUPDAYBS = ДНЕЙКУПОНДО
+COUPDAYS = ДНЕЙКУПОН
+COUPDAYSNC = ДНЕЙКУПОНПОСЛЕ
+COUPNCD = ДАТАКУПОНПОСЛЕ
+COUPNUM = ЧИСЛКУПОН
+COUPPCD = ДАТАКУПОНДО
+CUMIPMT = ОБЩПЛАТ
+CUMPRINC = ОБЩДОХОД
+DB = ФУО
+DDB = ДДОБ
+DISC = СКИДКА
+DOLLARDE = РУБЛЬ.ДЕС
+DOLLARFR = РУБЛЬ.ДРОБЬ
+DURATION = ДЛИТ
+EFFECT = ЭФФЕКТ
+FV = БС
+FVSCHEDULE = БЗРАСПИС
+INTRATE = ИНОРМА
+IPMT = ПРПЛТ
+IRR = ВСД
+ISPMT = ПРОЦПЛАТ
+MDURATION = МДЛИТ
+MIRR = МВСД
+NOMINAL = НОМИНАЛ
+NPER = КПЕР
+NPV = ЧПС
+ODDFPRICE = ЦЕНАПЕРВНЕРЕГ
+ODDFYIELD = ДОХОДПЕРВНЕРЕГ
+ODDLPRICE = ЦЕНАПОСЛНЕРЕГ
+ODDLYIELD = ДОХОДПОСЛНЕРЕГ
+PDURATION = ПДЛИТ
+PMT = ПЛТ
+PPMT = ОСПЛТ
+PRICE = ЦЕНА
+PRICEDISC = ЦЕНАСКИДКА
+PRICEMAT = ЦЕНАПОГАШ
+PV = ПС
+RATE = СТАВКА
+RECEIVED = ПОЛУЧЕНО
+RRI = ЭКВ.СТАВКА
+SLN = АПЛ
+SYD = АСЧ
+TBILLEQ = РАВНОКЧЕК
+TBILLPRICE = ЦЕНАКЧЕК
+TBILLYIELD = ДОХОДКЧЕК
+USDOLLAR = ДОЛЛСША
+VDB = ПУО
+XIRR = ЧИСТВНДОХ
+XNPV = ЧИСТНЗ
+YIELD = ДОХОД
+YIELDDISC = ДОХОДСКИДКА
+YIELDMAT = ДОХОДПОГАШ
+
+##
+## Информационные функции (Information Functions)
+##
+CELL = ЯЧЕЙКА
+ERROR.TYPE = ТИП.ОШИБКИ
+INFO = ИНФОРМ
+ISBLANK = ЕПУСТО
+ISERR = ЕОШ
+ISERROR = ЕОШИБКА
+ISEVEN = ЕЧЁТН
+ISFORMULA = ЕФОРМУЛА
+ISLOGICAL = ЕЛОГИЧ
+ISNA = ЕНД
+ISNONTEXT = ЕНЕТЕКСТ
+ISNUMBER = ЕЧИСЛО
+ISODD = ЕНЕЧЁТ
+ISREF = ЕССЫЛКА
+ISTEXT = ЕТЕКСТ
+N = Ч
+NA = НД
+SHEET = ЛИСТ
+SHEETS = ЛИСТЫ
+TYPE = ТИП
+
+##
+## Логические функции (Logical Functions)
+##
+AND = И
+FALSE = ЛОЖЬ
+IF = ЕСЛИ
+IFERROR = ЕСЛИОШИБКА
+IFNA = ЕСНД
+IFS = УСЛОВИЯ
+NOT = НЕ
+OR = ИЛИ
+SWITCH = ПЕРЕКЛЮЧ
+TRUE = ИСТИНА
+XOR = ИСКЛИЛИ
+
+##
+## Функции ссылки и поиска (Lookup & Reference Functions)
+##
+ADDRESS = АДРЕС
+AREAS = ОБЛАСТИ
+CHOOSE = ВЫБОР
+COLUMN = СТОЛБЕЦ
+COLUMNS = ЧИСЛСТОЛБ
+FILTER = ФИЛЬТР
+FORMULATEXT = Ф.ТЕКСТ
+GETPIVOTDATA = ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ
+HLOOKUP = ГПР
+HYPERLINK = ГИПЕРССЫЛКА
+INDEX = ИНДЕКС
+INDIRECT = ДВССЫЛ
+LOOKUP = ПРОСМОТР
+MATCH = ПОИСКПОЗ
+OFFSET = СМЕЩ
+ROW = СТРОКА
+ROWS = ЧСТРОК
+RTD = ДРВ
+SORT = СОРТ
+SORTBY = СОРТПО
+TRANSPOSE = ТРАНСП
+UNIQUE = УНИК
+VLOOKUP = ВПР
+XLOOKUP = ПРОСМОТРX
+XMATCH = ПОИСКПОЗX
+
+##
+## Математические и тригонометрические функции (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = АГРЕГАТ
+ARABIC = АРАБСКОЕ
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = ОСНОВАНИЕ
+CEILING.MATH = ОКРВВЕРХ.МАТ
+CEILING.PRECISE = ОКРВВЕРХ.ТОЧН
+COMBIN = ЧИСЛКОМБ
+COMBINA = ЧИСЛКОМБА
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = ДЕС
+DEGREES = ГРАДУСЫ
+ECMA.CEILING = ECMA.ОКРВВЕРХ
+EVEN = ЧЁТН
+EXP = EXP
+FACT = ФАКТР
+FACTDOUBLE = ДВФАКТР
+FLOOR.MATH = ОКРВНИЗ.МАТ
+FLOOR.PRECISE = ОКРВНИЗ.ТОЧН
+GCD = НОД
+INT = ЦЕЛОЕ
+ISO.CEILING = ISO.ОКРВВЕРХ
+LCM = НОК
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = МОПРЕД
+MINVERSE = МОБР
+MMULT = МУМНОЖ
+MOD = ОСТАТ
+MROUND = ОКРУГЛТ
+MULTINOMIAL = МУЛЬТИНОМ
+MUNIT = МЕДИН
+ODD = НЕЧЁТ
+PI = ПИ
+POWER = СТЕПЕНЬ
+PRODUCT = ПРОИЗВЕД
+QUOTIENT = ЧАСТНОЕ
+RADIANS = РАДИАНЫ
+RAND = СЛЧИС
+RANDARRAY = СЛУЧМАССИВ
+RANDBETWEEN = СЛУЧМЕЖДУ
+ROMAN = РИМСКОЕ
+ROUND = ОКРУГЛ
+ROUNDBAHTDOWN = ОКРУГЛБАТВНИЗ
+ROUNDBAHTUP = ОКРУГЛБАТВВЕРХ
+ROUNDDOWN = ОКРУГЛВНИЗ
+ROUNDUP = ОКРУГЛВВЕРХ
+SEC = SEC
+SECH = SECH
+SERIESSUM = РЯД.СУММ
+SEQUENCE = ПОСЛЕДОВ
+SIGN = ЗНАК
+SIN = SIN
+SINH = SINH
+SQRT = КОРЕНЬ
+SQRTPI = КОРЕНЬПИ
+SUBTOTAL = ПРОМЕЖУТОЧНЫЕ.ИТОГИ
+SUM = СУММ
+SUMIF = СУММЕСЛИ
+SUMIFS = СУММЕСЛИМН
+SUMPRODUCT = СУММПРОИЗВ
+SUMSQ = СУММКВ
+SUMX2MY2 = СУММРАЗНКВ
+SUMX2PY2 = СУММСУММКВ
+SUMXMY2 = СУММКВРАЗН
+TAN = TAN
+TANH = TANH
+TRUNC = ОТБР
+
+##
+## Статистические функции (Statistical Functions)
+##
+AVEDEV = СРОТКЛ
+AVERAGE = СРЗНАЧ
+AVERAGEA = СРЗНАЧА
+AVERAGEIF = СРЗНАЧЕСЛИ
+AVERAGEIFS = СРЗНАЧЕСЛИМН
+BETA.DIST = БЕТА.РАСП
+BETA.INV = БЕТА.ОБР
+BINOM.DIST = БИНОМ.РАСП
+BINOM.DIST.RANGE = БИНОМ.РАСП.ДИАП
+BINOM.INV = БИНОМ.ОБР
+CHISQ.DIST = ХИ2.РАСП
+CHISQ.DIST.RT = ХИ2.РАСП.ПХ
+CHISQ.INV = ХИ2.ОБР
+CHISQ.INV.RT = ХИ2.ОБР.ПХ
+CHISQ.TEST = ХИ2.ТЕСТ
+CONFIDENCE.NORM = ДОВЕРИТ.НОРМ
+CONFIDENCE.T = ДОВЕРИТ.СТЬЮДЕНТ
+CORREL = КОРРЕЛ
+COUNT = СЧЁТ
+COUNTA = СЧЁТЗ
+COUNTBLANK = СЧИТАТЬПУСТОТЫ
+COUNTIF = СЧЁТЕСЛИ
+COUNTIFS = СЧЁТЕСЛИМН
+COVARIANCE.P = КОВАРИАЦИЯ.Г
+COVARIANCE.S = КОВАРИАЦИЯ.В
+DEVSQ = КВАДРОТКЛ
+EXPON.DIST = ЭКСП.РАСП
+F.DIST = F.РАСП
+F.DIST.RT = F.РАСП.ПХ
+F.INV = F.ОБР
+F.INV.RT = F.ОБР.ПХ
+F.TEST = F.ТЕСТ
+FISHER = ФИШЕР
+FISHERINV = ФИШЕРОБР
+FORECAST.ETS = ПРЕДСКАЗ.ETS
+FORECAST.ETS.CONFINT = ПРЕДСКАЗ.ЕTS.ДОВИНТЕРВАЛ
+FORECAST.ETS.SEASONALITY = ПРЕДСКАЗ.ETS.СЕЗОННОСТЬ
+FORECAST.ETS.STAT = ПРЕДСКАЗ.ETS.СТАТ
+FORECAST.LINEAR = ПРЕДСКАЗ.ЛИНЕЙН
+FREQUENCY = ЧАСТОТА
+GAMMA = ГАММА
+GAMMA.DIST = ГАММА.РАСП
+GAMMA.INV = ГАММА.ОБР
+GAMMALN = ГАММАНЛОГ
+GAMMALN.PRECISE = ГАММАНЛОГ.ТОЧН
+GAUSS = ГАУСС
+GEOMEAN = СРГЕОМ
+GROWTH = РОСТ
+HARMEAN = СРГАРМ
+HYPGEOM.DIST = ГИПЕРГЕОМ.РАСП
+INTERCEPT = ОТРЕЗОК
+KURT = ЭКСЦЕСС
+LARGE = НАИБОЛЬШИЙ
+LINEST = ЛИНЕЙН
+LOGEST = ЛГРФПРИБЛ
+LOGNORM.DIST = ЛОГНОРМ.РАСП
+LOGNORM.INV = ЛОГНОРМ.ОБР
+MAX = МАКС
+MAXA = МАКСА
+MAXIFS = МАКСЕСЛИ
+MEDIAN = МЕДИАНА
+MIN = МИН
+MINA = МИНА
+MINIFS = МИНЕСЛИ
+MODE.MULT = МОДА.НСК
+MODE.SNGL = МОДА.ОДН
+NEGBINOM.DIST = ОТРБИНОМ.РАСП
+NORM.DIST = НОРМ.РАСП
+NORM.INV = НОРМ.ОБР
+NORM.S.DIST = НОРМ.СТ.РАСП
+NORM.S.INV = НОРМ.СТ.ОБР
+PEARSON = PEARSON
+PERCENTILE.EXC = ПРОЦЕНТИЛЬ.ИСКЛ
+PERCENTILE.INC = ПРОЦЕНТИЛЬ.ВКЛ
+PERCENTRANK.EXC = ПРОЦЕНТРАНГ.ИСКЛ
+PERCENTRANK.INC = ПРОЦЕНТРАНГ.ВКЛ
+PERMUT = ПЕРЕСТ
+PERMUTATIONA = ПЕРЕСТА
+PHI = ФИ
+POISSON.DIST = ПУАССОН.РАСП
+PROB = ВЕРОЯТНОСТЬ
+QUARTILE.EXC = КВАРТИЛЬ.ИСКЛ
+QUARTILE.INC = КВАРТИЛЬ.ВКЛ
+RANK.AVG = РАНГ.СР
+RANK.EQ = РАНГ.РВ
+RSQ = КВПИРСОН
+SKEW = СКОС
+SKEW.P = СКОС.Г
+SLOPE = НАКЛОН
+SMALL = НАИМЕНЬШИЙ
+STANDARDIZE = НОРМАЛИЗАЦИЯ
+STDEV.P = СТАНДОТКЛОН.Г
+STDEV.S = СТАНДОТКЛОН.В
+STDEVA = СТАНДОТКЛОНА
+STDEVPA = СТАНДОТКЛОНПА
+STEYX = СТОШYX
+T.DIST = СТЬЮДЕНТ.РАСП
+T.DIST.2T = СТЬЮДЕНТ.РАСП.2Х
+T.DIST.RT = СТЬЮДЕНТ.РАСП.ПХ
+T.INV = СТЬЮДЕНТ.ОБР
+T.INV.2T = СТЬЮДЕНТ.ОБР.2Х
+T.TEST = СТЬЮДЕНТ.ТЕСТ
+TREND = ТЕНДЕНЦИЯ
+TRIMMEAN = УРЕЗСРЕДНЕЕ
+VAR.P = ДИСП.Г
+VAR.S = ДИСП.В
+VARA = ДИСПА
+VARPA = ДИСПРА
+WEIBULL.DIST = ВЕЙБУЛЛ.РАСП
+Z.TEST = Z.ТЕСТ
+
+##
+## Текстовые функции (Text Functions)
+##
+ARRAYTOTEXT = МАССИВВТЕКСТ
+BAHTTEXT = БАТТЕКСТ
+CHAR = СИМВОЛ
+CLEAN = ПЕЧСИМВ
+CODE = КОДСИМВ
+CONCAT = СЦЕП
+DBCS = БДЦС
+DOLLAR = РУБЛЬ
+EXACT = СОВПАД
+FIND = НАЙТИ
+FINDB = НАЙТИБ
+FIXED = ФИКСИРОВАННЫЙ
+ISTHAIDIGIT = ЕТАЙЦИФРЫ
+LEFT = ЛЕВСИМВ
+LEFTB = ЛЕВБ
+LEN = ДЛСТР
+LENB = ДЛИНБ
+LOWER = СТРОЧН
+MID = ПСТР
+MIDB = ПСТРБ
+NUMBERSTRING = СТРОКАЧИСЕЛ
+NUMBERVALUE = ЧЗНАЧ
+PROPER = ПРОПНАЧ
+REPLACE = ЗАМЕНИТЬ
+REPLACEB = ЗАМЕНИТЬБ
+REPT = ПОВТОР
+RIGHT = ПРАВСИМВ
+RIGHTB = ПРАВБ
+SEARCH = ПОИСК
+SEARCHB = ПОИСКБ
+SUBSTITUTE = ПОДСТАВИТЬ
+T = Т
+TEXT = ТЕКСТ
+TEXTJOIN = ОБЪЕДИНИТЬ
+THAIDIGIT = ТАЙЦИФРА
+THAINUMSOUND = ТАЙЧИСЛОВЗВУК
+THAINUMSTRING = ТАЙЧИСЛОВСТРОКУ
+THAISTRINGLENGTH = ТАЙДЛИНАСТРОКИ
+TRIM = СЖПРОБЕЛЫ
+UNICHAR = ЮНИСИМВ
+UNICODE = UNICODE
+UPPER = ПРОПИСН
+VALUE = ЗНАЧЕН
+VALUETOTEXT = ЗНАЧЕНИЕВТЕКСТ
+
+##
+## Веб-функции (Web Functions)
+##
+ENCODEURL = КОДИР.URL
+FILTERXML = ФИЛЬТР.XML
+WEBSERVICE = ВЕБСЛУЖБА
+
+##
+## Функции совместимости (Compatibility Functions)
+##
+BETADIST = БЕТАРАСП
+BETAINV = БЕТАОБР
+BINOMDIST = БИНОМРАСП
+CEILING = ОКРВВЕРХ
+CHIDIST = ХИ2РАСП
+CHIINV = ХИ2ОБР
+CHITEST = ХИ2ТЕСТ
+CONCATENATE = СЦЕПИТЬ
+CONFIDENCE = ДОВЕРИТ
+COVAR = КОВАР
+CRITBINOM = КРИТБИНОМ
+EXPONDIST = ЭКСПРАСП
+FDIST = FРАСП
+FINV = FРАСПОБР
+FLOOR = ОКРВНИЗ
+FORECAST = ПРЕДСКАЗ
+FTEST = ФТЕСТ
+GAMMADIST = ГАММАРАСП
+GAMMAINV = ГАММАОБР
+HYPGEOMDIST = ГИПЕРГЕОМЕТ
+LOGINV = ЛОГНОРМОБР
+LOGNORMDIST = ЛОГНОРМРАСП
+MODE = МОДА
+NEGBINOMDIST = ОТРБИНОМРАСП
+NORMDIST = НОРМРАСП
+NORMINV = НОРМОБР
+NORMSDIST = НОРМСТРАСП
+NORMSINV = НОРМСТОБР
+PERCENTILE = ПЕРСЕНТИЛЬ
+PERCENTRANK = ПРОЦЕНТРАНГ
+POISSON = ПУАССОН
+QUARTILE = КВАРТИЛЬ
+RANK = РАНГ
+STDEV = СТАНДОТКЛОН
+STDEVP = СТАНДОТКЛОНП
+TDIST = СТЬЮДРАСП
+TINV = СТЬЮДРАСПОБР
+TTEST = ТТЕСТ
+VAR = ДИСП
+VARP = ДИСПР
+WEIBULL = ВЕЙБУЛЛ
+ZTEST = ZТЕСТ
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/config
new file mode 100644
index 00000000..c7440f71
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Svenska (Swedish)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #SKÄRNING!
+DIV0 = #DIVISION/0!
+VALUE = #VÄRDEFEL!
+REF = #REFERENS!
+NAME = #NAMN?
+NUM = #OGILTIGT!
+NA = #SAKNAS!
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions
new file mode 100644
index 00000000..491ecfb9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions
@@ -0,0 +1,533 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Svenska (Swedish)
+##
+############################################################
+
+
+##
+## Kubfunktioner (Cube Functions)
+##
+CUBEKPIMEMBER = KUBKPIMEDLEM
+CUBEMEMBER = KUBMEDLEM
+CUBEMEMBERPROPERTY = KUBMEDLEMSEGENSKAP
+CUBERANKEDMEMBER = KUBRANGORDNADMEDLEM
+CUBESET = KUBUPPSÄTTNING
+CUBESETCOUNT = KUBUPPSÄTTNINGANTAL
+CUBEVALUE = KUBVÄRDE
+
+##
+## Databasfunktioner (Database Functions)
+##
+DAVERAGE = DMEDEL
+DCOUNT = DANTAL
+DCOUNTA = DANTALV
+DGET = DHÄMTA
+DMAX = DMAX
+DMIN = DMIN
+DPRODUCT = DPRODUKT
+DSTDEV = DSTDAV
+DSTDEVP = DSTDAVP
+DSUM = DSUMMA
+DVAR = DVARIANS
+DVARP = DVARIANSP
+
+##
+## Tid- och datumfunktioner (Date & Time Functions)
+##
+DATE = DATUM
+DATEVALUE = DATUMVÄRDE
+DAY = DAG
+DAYS = DAGAR
+DAYS360 = DAGAR360
+EDATE = EDATUM
+EOMONTH = SLUTMÅNAD
+HOUR = TIMME
+ISOWEEKNUM = ISOVECKONR
+MINUTE = MINUT
+MONTH = MÅNAD
+NETWORKDAYS = NETTOARBETSDAGAR
+NETWORKDAYS.INTL = NETTOARBETSDAGAR.INT
+NOW = NU
+SECOND = SEKUND
+THAIDAYOFWEEK = THAIVECKODAG
+THAIMONTHOFYEAR = THAIMÅNAD
+THAIYEAR = THAIÅR
+TIME = KLOCKSLAG
+TIMEVALUE = TIDVÄRDE
+TODAY = IDAG
+WEEKDAY = VECKODAG
+WEEKNUM = VECKONR
+WORKDAY = ARBETSDAGAR
+WORKDAY.INTL = ARBETSDAGAR.INT
+YEAR = ÅR
+YEARFRAC = ÅRDEL
+
+##
+## Tekniska funktioner (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN.TILL.DEC
+BIN2HEX = BIN.TILL.HEX
+BIN2OCT = BIN.TILL.OKT
+BITAND = BITOCH
+BITLSHIFT = BITVSKIFT
+BITOR = BITELLER
+BITRSHIFT = BITHSKIFT
+BITXOR = BITXELLER
+COMPLEX = KOMPLEX
+CONVERT = KONVERTERA
+DEC2BIN = DEC.TILL.BIN
+DEC2HEX = DEC.TILL.HEX
+DEC2OCT = DEC.TILL.OKT
+DELTA = DELTA
+ERF = FELF
+ERF.PRECISE = FELF.EXAKT
+ERFC = FELFK
+ERFC.PRECISE = FELFK.EXAKT
+GESTEP = SLSTEG
+HEX2BIN = HEX.TILL.BIN
+HEX2DEC = HEX.TILL.DEC
+HEX2OCT = HEX.TILL.OKT
+IMABS = IMABS
+IMAGINARY = IMAGINÄR
+IMARGUMENT = IMARGUMENT
+IMCONJUGATE = IMKONJUGAT
+IMCOS = IMCOS
+IMCOSH = IMCOSH
+IMCOT = IMCOT
+IMCSC = IMCSC
+IMCSCH = IMCSCH
+IMDIV = IMDIV
+IMEXP = IMEUPPHÖJT
+IMLN = IMLN
+IMLOG10 = IMLOG10
+IMLOG2 = IMLOG2
+IMPOWER = IMUPPHÖJT
+IMPRODUCT = IMPRODUKT
+IMREAL = IMREAL
+IMSEC = IMSEK
+IMSECH = IMSEKH
+IMSIN = IMSIN
+IMSINH = IMSINH
+IMSQRT = IMROT
+IMSUB = IMDIFF
+IMSUM = IMSUM
+IMTAN = IMTAN
+OCT2BIN = OKT.TILL.BIN
+OCT2DEC = OKT.TILL.DEC
+OCT2HEX = OKT.TILL.HEX
+
+##
+## Finansiella funktioner (Financial Functions)
+##
+ACCRINT = UPPLRÄNTA
+ACCRINTM = UPPLOBLRÄNTA
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = KUPDAGBB
+COUPDAYS = KUPDAGB
+COUPDAYSNC = KUPDAGNK
+COUPNCD = KUPNKD
+COUPNUM = KUPANT
+COUPPCD = KUPFKD
+CUMIPMT = KUMRÄNTA
+CUMPRINC = KUMPRIS
+DB = DB
+DDB = DEGAVSKR
+DISC = DISK
+DOLLARDE = DECTAL
+DOLLARFR = BRÅK
+DURATION = LÖPTID
+EFFECT = EFFRÄNTA
+FV = SLUTVÄRDE
+FVSCHEDULE = FÖRRÄNTNING
+INTRATE = ÅRSRÄNTA
+IPMT = RBETALNING
+IRR = IR
+ISPMT = RALÅN
+MDURATION = MLÖPTID
+MIRR = MODIR
+NOMINAL = NOMRÄNTA
+NPER = PERIODER
+NPV = NETNUVÄRDE
+ODDFPRICE = UDDAFPRIS
+ODDFYIELD = UDDAFAVKASTNING
+ODDLPRICE = UDDASPRIS
+ODDLYIELD = UDDASAVKASTNING
+PDURATION = PLÖPTID
+PMT = BETALNING
+PPMT = AMORT
+PRICE = PRIS
+PRICEDISC = PRISDISK
+PRICEMAT = PRISFÖRF
+PV = NUVÄRDE
+RATE = RÄNTA
+RECEIVED = BELOPP
+RRI = AVKPÅINVEST
+SLN = LINAVSKR
+SYD = ÅRSAVSKR
+TBILLEQ = SSVXEKV
+TBILLPRICE = SSVXPRIS
+TBILLYIELD = SSVXRÄNTA
+VDB = VDEGRAVSKR
+XIRR = XIRR
+XNPV = XNUVÄRDE
+YIELD = NOMAVK
+YIELDDISC = NOMAVKDISK
+YIELDMAT = NOMAVKFÖRF
+
+##
+## Informationsfunktioner (Information Functions)
+##
+CELL = CELL
+ERROR.TYPE = FEL.TYP
+INFO = INFO
+ISBLANK = ÄRTOM
+ISERR = ÄRF
+ISERROR = ÄRFEL
+ISEVEN = ÄRJÄMN
+ISFORMULA = ÄRFORMEL
+ISLOGICAL = ÄRLOGISK
+ISNA = ÄRSAKNAD
+ISNONTEXT = ÄREJTEXT
+ISNUMBER = ÄRTAL
+ISODD = ÄRUDDA
+ISREF = ÄRREF
+ISTEXT = ÄRTEXT
+N = N
+NA = SAKNAS
+SHEET = BLAD
+SHEETS = ANTALBLAD
+TYPE = VÄRDETYP
+
+##
+## Logiska funktioner (Logical Functions)
+##
+AND = OCH
+FALSE = FALSKT
+IF = OM
+IFERROR = OMFEL
+IFNA = OMSAKNAS
+IFS = IFS
+NOT = ICKE
+OR = ELLER
+SWITCH = VÄXLA
+TRUE = SANT
+XOR = XELLER
+
+##
+## Sök- och referensfunktioner (Lookup & Reference Functions)
+##
+ADDRESS = ADRESS
+AREAS = OMRÅDEN
+CHOOSE = VÄLJ
+COLUMN = KOLUMN
+COLUMNS = KOLUMNER
+FORMULATEXT = FORMELTEXT
+GETPIVOTDATA = HÄMTA.PIVOTDATA
+HLOOKUP = LETAKOLUMN
+HYPERLINK = HYPERLÄNK
+INDEX = INDEX
+INDIRECT = INDIREKT
+LOOKUP = LETAUPP
+MATCH = PASSA
+OFFSET = FÖRSKJUTNING
+ROW = RAD
+ROWS = RADER
+RTD = RTD
+TRANSPOSE = TRANSPONERA
+VLOOKUP = LETARAD
+*RC = RK
+
+##
+## Matematiska och trigonometriska funktioner (Math & Trig Functions)
+##
+ABS = ABS
+ACOS = ARCCOS
+ACOSH = ARCCOSH
+ACOT = ARCCOT
+ACOTH = ARCCOTH
+AGGREGATE = MÄNGD
+ARABIC = ARABISKA
+ASIN = ARCSIN
+ASINH = ARCSINH
+ATAN = ARCTAN
+ATAN2 = ARCTAN2
+ATANH = ARCTANH
+BASE = BAS
+CEILING.MATH = RUNDA.UPP.MATEMATISKT
+CEILING.PRECISE = RUNDA.UPP.EXAKT
+COMBIN = KOMBIN
+COMBINA = KOMBINA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = DECIMAL
+DEGREES = GRADER
+ECMA.CEILING = ECMA.RUNDA.UPP
+EVEN = JÄMN
+EXP = EXP
+FACT = FAKULTET
+FACTDOUBLE = DUBBELFAKULTET
+FLOOR.MATH = RUNDA.NER.MATEMATISKT
+FLOOR.PRECISE = RUNDA.NER.EXAKT
+GCD = SGD
+INT = HELTAL
+ISO.CEILING = ISO.RUNDA.UPP
+LCM = MGM
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = MDETERM
+MINVERSE = MINVERT
+MMULT = MMULT
+MOD = REST
+MROUND = MAVRUNDA
+MULTINOMIAL = MULTINOMIAL
+MUNIT = MENHET
+ODD = UDDA
+PI = PI
+POWER = UPPHÖJT.TILL
+PRODUCT = PRODUKT
+QUOTIENT = KVOT
+RADIANS = RADIANER
+RAND = SLUMP
+RANDBETWEEN = SLUMP.MELLAN
+ROMAN = ROMERSK
+ROUND = AVRUNDA
+ROUNDBAHTDOWN = AVRUNDABAHTNEDÅT
+ROUNDBAHTUP = AVRUNDABAHTUPPÅT
+ROUNDDOWN = AVRUNDA.NEDÅT
+ROUNDUP = AVRUNDA.UPPÅT
+SEC = SEK
+SECH = SEKH
+SERIESSUM = SERIESUMMA
+SIGN = TECKEN
+SIN = SIN
+SINH = SINH
+SQRT = ROT
+SQRTPI = ROTPI
+SUBTOTAL = DELSUMMA
+SUM = SUMMA
+SUMIF = SUMMA.OM
+SUMIFS = SUMMA.OMF
+SUMPRODUCT = PRODUKTSUMMA
+SUMSQ = KVADRATSUMMA
+SUMX2MY2 = SUMMAX2MY2
+SUMX2PY2 = SUMMAX2PY2
+SUMXMY2 = SUMMAXMY2
+TAN = TAN
+TANH = TANH
+TRUNC = AVKORTA
+
+##
+## Statistiska funktioner (Statistical Functions)
+##
+AVEDEV = MEDELAVV
+AVERAGE = MEDEL
+AVERAGEA = AVERAGEA
+AVERAGEIF = MEDEL.OM
+AVERAGEIFS = MEDEL.OMF
+BETA.DIST = BETA.FÖRD
+BETA.INV = BETA.INV
+BINOM.DIST = BINOM.FÖRD
+BINOM.DIST.RANGE = BINOM.FÖRD.INTERVALL
+BINOM.INV = BINOM.INV
+CHISQ.DIST = CHI2.FÖRD
+CHISQ.DIST.RT = CHI2.FÖRD.RT
+CHISQ.INV = CHI2.INV
+CHISQ.INV.RT = CHI2.INV.RT
+CHISQ.TEST = CHI2.TEST
+CONFIDENCE.NORM = KONFIDENS.NORM
+CONFIDENCE.T = KONFIDENS.T
+CORREL = KORREL
+COUNT = ANTAL
+COUNTA = ANTALV
+COUNTBLANK = ANTAL.TOMMA
+COUNTIF = ANTAL.OM
+COUNTIFS = ANTAL.OMF
+COVARIANCE.P = KOVARIANS.P
+COVARIANCE.S = KOVARIANS.S
+DEVSQ = KVADAVV
+EXPON.DIST = EXPON.FÖRD
+F.DIST = F.FÖRD
+F.DIST.RT = F.FÖRD.RT
+F.INV = F.INV
+F.INV.RT = F.INV.RT
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERINV
+FORECAST.ETS = PROGNOS.ETS
+FORECAST.ETS.CONFINT = PROGNOS.ETS.KONFINT
+FORECAST.ETS.SEASONALITY = PROGNOS.ETS.SÄSONGSBEROENDE
+FORECAST.ETS.STAT = PROGNOS.ETS.STAT
+FORECAST.LINEAR = PROGNOS.LINJÄR
+FREQUENCY = FREKVENS
+GAMMA = GAMMA
+GAMMA.DIST = GAMMA.FÖRD
+GAMMA.INV = GAMMA.INV
+GAMMALN = GAMMALN
+GAMMALN.PRECISE = GAMMALN.EXAKT
+GAUSS = GAUSS
+GEOMEAN = GEOMEDEL
+GROWTH = EXPTREND
+HARMEAN = HARMMEDEL
+HYPGEOM.DIST = HYPGEOM.FÖRD
+INTERCEPT = SKÄRNINGSPUNKT
+KURT = TOPPIGHET
+LARGE = STÖRSTA
+LINEST = REGR
+LOGEST = EXPREGR
+LOGNORM.DIST = LOGNORM.FÖRD
+LOGNORM.INV = LOGNORM.INV
+MAX = MAX
+MAXA = MAXA
+MAXIFS = MAXIFS
+MEDIAN = MEDIAN
+MIN = MIN
+MINA = MINA
+MINIFS = MINIFS
+MODE.MULT = TYPVÄRDE.FLERA
+MODE.SNGL = TYPVÄRDE.ETT
+NEGBINOM.DIST = NEGBINOM.FÖRD
+NORM.DIST = NORM.FÖRD
+NORM.INV = NORM.INV
+NORM.S.DIST = NORM.S.FÖRD
+NORM.S.INV = NORM.S.INV
+PEARSON = PEARSON
+PERCENTILE.EXC = PERCENTIL.EXK
+PERCENTILE.INC = PERCENTIL.INK
+PERCENTRANK.EXC = PROCENTRANG.EXK
+PERCENTRANK.INC = PROCENTRANG.INK
+PERMUT = PERMUT
+PERMUTATIONA = PERMUTATIONA
+PHI = PHI
+POISSON.DIST = POISSON.FÖRD
+PROB = SANNOLIKHET
+QUARTILE.EXC = KVARTIL.EXK
+QUARTILE.INC = KVARTIL.INK
+RANK.AVG = RANG.MED
+RANK.EQ = RANG.EKV
+RSQ = RKV
+SKEW = SNEDHET
+SKEW.P = SNEDHET.P
+SLOPE = LUTNING
+SMALL = MINSTA
+STANDARDIZE = STANDARDISERA
+STDEV.P = STDAV.P
+STDEV.S = STDAV.S
+STDEVA = STDEVA
+STDEVPA = STDEVPA
+STEYX = STDFELYX
+T.DIST = T.FÖRD
+T.DIST.2T = T.FÖRD.2T
+T.DIST.RT = T.FÖRD.RT
+T.INV = T.INV
+T.INV.2T = T.INV.2T
+T.TEST = T.TEST
+TREND = TREND
+TRIMMEAN = TRIMMEDEL
+VAR.P = VARIANS.P
+VAR.S = VARIANS.S
+VARA = VARA
+VARPA = VARPA
+WEIBULL.DIST = WEIBULL.FÖRD
+Z.TEST = Z.TEST
+
+##
+## Textfunktioner (Text Functions)
+##
+BAHTTEXT = BAHTTEXT
+CHAR = TECKENKOD
+CLEAN = STÄDA
+CODE = KOD
+CONCAT = SAMMAN
+DOLLAR = VALUTA
+EXACT = EXAKT
+FIND = HITTA
+FIXED = FASTTAL
+LEFT = VÄNSTER
+LEN = LÄNGD
+LOWER = GEMENER
+MID = EXTEXT
+NUMBERVALUE = TALVÄRDE
+PROPER = INITIAL
+REPLACE = ERSÄTT
+REPT = REP
+RIGHT = HÖGER
+SEARCH = SÖK
+SUBSTITUTE = BYT.UT
+T = T
+TEXT = TEXT
+TEXTJOIN = TEXTJOIN
+THAIDIGIT = THAISIFFRA
+THAINUMSOUND = THAITALLJUD
+THAINUMSTRING = THAITALSTRÄNG
+THAISTRINGLENGTH = THAISTRÄNGLÄNGD
+TRIM = RENSA
+UNICHAR = UNITECKENKOD
+UNICODE = UNICODE
+UPPER = VERSALER
+VALUE = TEXTNUM
+
+##
+## Webbfunktioner (Web Functions)
+##
+ENCODEURL = KODAWEBBADRESS
+FILTERXML = FILTRERAXML
+WEBSERVICE = WEBBTJÄNST
+
+##
+## Kompatibilitetsfunktioner (Compatibility Functions)
+##
+BETADIST = BETAFÖRD
+BETAINV = BETAINV
+BINOMDIST = BINOMFÖRD
+CEILING = RUNDA.UPP
+CHIDIST = CHI2FÖRD
+CHIINV = CHI2INV
+CHITEST = CHI2TEST
+CONCATENATE = SAMMANFOGA
+CONFIDENCE = KONFIDENS
+COVAR = KOVAR
+CRITBINOM = KRITBINOM
+EXPONDIST = EXPONFÖRD
+FDIST = FFÖRD
+FINV = FINV
+FLOOR = RUNDA.NER
+FORECAST = PREDIKTION
+FTEST = FTEST
+GAMMADIST = GAMMAFÖRD
+GAMMAINV = GAMMAINV
+HYPGEOMDIST = HYPGEOMFÖRD
+LOGINV = LOGINV
+LOGNORMDIST = LOGNORMFÖRD
+MODE = TYPVÄRDE
+NEGBINOMDIST = NEGBINOMFÖRD
+NORMDIST = NORMFÖRD
+NORMINV = NORMINV
+NORMSDIST = NORMSFÖRD
+NORMSINV = NORMSINV
+PERCENTILE = PERCENTIL
+PERCENTRANK = PROCENTRANG
+POISSON = POISSON
+QUARTILE = KVARTIL
+RANK = RANG
+STDEV = STDAV
+STDEVP = STDAVP
+TDIST = TFÖRD
+TINV = TINV
+TTEST = TTEST
+VAR = VARIANS
+VARP = VARIANSP
+WEIBULL = WEIBULL
+ZTEST = ZTEST
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/config b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/config
new file mode 100644
index 00000000..63d22fd0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/config
@@ -0,0 +1,20 @@
+############################################################
+##
+## PhpSpreadsheet - locale settings
+##
+## Türkçe (Turkish)
+##
+############################################################
+
+ArgumentSeparator = ;
+
+##
+## Error Codes
+##
+NULL = #BOŞ!
+DIV0 = #SAYI/0!
+VALUE = #DEĞER!
+REF = #BAŞV!
+NAME = #AD?
+NUM = #SAYI!
+NA = #YOK
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/functions b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/functions
new file mode 100644
index 00000000..f872274f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/tr/functions
@@ -0,0 +1,537 @@
+############################################################
+##
+## PhpSpreadsheet - function name translations
+##
+## Türkçe (Turkish)
+##
+############################################################
+
+
+##
+## Küp işlevleri (Cube Functions)
+##
+CUBEKPIMEMBER = KÜPKPIÜYESİ
+CUBEMEMBER = KÜPÜYESİ
+CUBEMEMBERPROPERTY = KÜPÜYEÖZELLİĞİ
+CUBERANKEDMEMBER = DERECELİKÜPÜYESİ
+CUBESET = KÜPKÜMESİ
+CUBESETCOUNT = KÜPKÜMESAYISI
+CUBEVALUE = KÜPDEĞERİ
+
+##
+## Veritabanı işlevleri (Database Functions)
+##
+DAVERAGE = VSEÇORT
+DCOUNT = VSEÇSAY
+DCOUNTA = VSEÇSAYDOLU
+DGET = VAL
+DMAX = VSEÇMAK
+DMIN = VSEÇMİN
+DPRODUCT = VSEÇÇARP
+DSTDEV = VSEÇSTDSAPMA
+DSTDEVP = VSEÇSTDSAPMAS
+DSUM = VSEÇTOPLA
+DVAR = VSEÇVAR
+DVARP = VSEÇVARS
+
+##
+## Tarih ve saat işlevleri (Date & Time Functions)
+##
+DATE = TARİH
+DATEDIF = ETARİHLİ
+DATESTRING = TARİHDİZİ
+DATEVALUE = TARİHSAYISI
+DAY = GÜN
+DAYS = GÜNSAY
+DAYS360 = GÜN360
+EDATE = SERİTARİH
+EOMONTH = SERİAY
+HOUR = SAAT
+ISOWEEKNUM = ISOHAFTASAY
+MINUTE = DAKİKA
+MONTH = AY
+NETWORKDAYS = TAMİŞGÜNÜ
+NETWORKDAYS.INTL = TAMİŞGÜNÜ.ULUSL
+NOW = ŞİMDİ
+SECOND = SANİYE
+THAIDAYOFWEEK = TAYHAFTANINGÜNÜ
+THAIMONTHOFYEAR = TAYYILINAYI
+THAIYEAR = TAYYILI
+TIME = ZAMAN
+TIMEVALUE = ZAMANSAYISI
+TODAY = BUGÜN
+WEEKDAY = HAFTANINGÜNÜ
+WEEKNUM = HAFTASAY
+WORKDAY = İŞGÜNÜ
+WORKDAY.INTL = İŞGÜNÜ.ULUSL
+YEAR = YIL
+YEARFRAC = YILORAN
+
+##
+## Mühendislik işlevleri (Engineering Functions)
+##
+BESSELI = BESSELI
+BESSELJ = BESSELJ
+BESSELK = BESSELK
+BESSELY = BESSELY
+BIN2DEC = BIN2DEC
+BIN2HEX = BIN2HEX
+BIN2OCT = BIN2OCT
+BITAND = BİTVE
+BITLSHIFT = BİTSOLAKAYDIR
+BITOR = BİTVEYA
+BITRSHIFT = BİTSAĞAKAYDIR
+BITXOR = BİTÖZELVEYA
+COMPLEX = KARMAŞIK
+CONVERT = ÇEVİR
+DEC2BIN = DEC2BIN
+DEC2HEX = DEC2HEX
+DEC2OCT = DEC2OCT
+DELTA = DELTA
+ERF = HATAİŞLEV
+ERF.PRECISE = HATAİŞLEV.DUYARLI
+ERFC = TÜMHATAİŞLEV
+ERFC.PRECISE = TÜMHATAİŞLEV.DUYARLI
+GESTEP = BESINIR
+HEX2BIN = HEX2BIN
+HEX2DEC = HEX2DEC
+HEX2OCT = HEX2OCT
+IMABS = SANMUTLAK
+IMAGINARY = SANAL
+IMARGUMENT = SANBAĞ_DEĞİŞKEN
+IMCONJUGATE = SANEŞLENEK
+IMCOS = SANCOS
+IMCOSH = SANCOSH
+IMCOT = SANCOT
+IMCSC = SANCSC
+IMCSCH = SANCSCH
+IMDIV = SANBÖL
+IMEXP = SANÜS
+IMLN = SANLN
+IMLOG10 = SANLOG10
+IMLOG2 = SANLOG2
+IMPOWER = SANKUVVET
+IMPRODUCT = SANÇARP
+IMREAL = SANGERÇEK
+IMSEC = SANSEC
+IMSECH = SANSECH
+IMSIN = SANSIN
+IMSINH = SANSINH
+IMSQRT = SANKAREKÖK
+IMSUB = SANTOPLA
+IMSUM = SANÇIKAR
+IMTAN = SANTAN
+OCT2BIN = OCT2BIN
+OCT2DEC = OCT2DEC
+OCT2HEX = OCT2HEX
+
+##
+## Finansal işlevler (Financial Functions)
+##
+ACCRINT = GERÇEKFAİZ
+ACCRINTM = GERÇEKFAİZV
+AMORDEGRC = AMORDEGRC
+AMORLINC = AMORLINC
+COUPDAYBS = KUPONGÜNBD
+COUPDAYS = KUPONGÜN
+COUPDAYSNC = KUPONGÜNDSK
+COUPNCD = KUPONGÜNSKT
+COUPNUM = KUPONSAYI
+COUPPCD = KUPONGÜNÖKT
+CUMIPMT = TOPÖDENENFAİZ
+CUMPRINC = TOPANAPARA
+DB = AZALANBAKİYE
+DDB = ÇİFTAZALANBAKİYE
+DISC = İNDİRİM
+DOLLARDE = LİRAON
+DOLLARFR = LİRAKES
+DURATION = SÜRE
+EFFECT = ETKİN
+FV = GD
+FVSCHEDULE = GDPROGRAM
+INTRATE = FAİZORANI
+IPMT = FAİZTUTARI
+IRR = İÇ_VERİM_ORANI
+ISPMT = ISPMT
+MDURATION = MSÜRE
+MIRR = D_İÇ_VERİM_ORANI
+NOMINAL = NOMİNAL
+NPER = TAKSİT_SAYISI
+NPV = NBD
+ODDFPRICE = TEKYDEĞER
+ODDFYIELD = TEKYÖDEME
+ODDLPRICE = TEKSDEĞER
+ODDLYIELD = TEKSÖDEME
+PDURATION = PSÜRE
+PMT = DEVRESEL_ÖDEME
+PPMT = ANA_PARA_ÖDEMESİ
+PRICE = DEĞER
+PRICEDISC = DEĞERİND
+PRICEMAT = DEĞERVADE
+PV = BD
+RATE = FAİZ_ORANI
+RECEIVED = GETİRİ
+RRI = GERÇEKLEŞENYATIRIMGETİRİSİ
+SLN = DA
+SYD = YAT
+TBILLEQ = HTAHEŞ
+TBILLPRICE = HTAHDEĞER
+TBILLYIELD = HTAHÖDEME
+VDB = DAB
+XIRR = AİÇVERİMORANI
+XNPV = ANBD
+YIELD = ÖDEME
+YIELDDISC = ÖDEMEİND
+YIELDMAT = ÖDEMEVADE
+
+##
+## Bilgi işlevleri (Information Functions)
+##
+CELL = HÜCRE
+ERROR.TYPE = HATA.TİPİ
+INFO = BİLGİ
+ISBLANK = EBOŞSA
+ISERR = EHATA
+ISERROR = EHATALIYSA
+ISEVEN = ÇİFTMİ
+ISFORMULA = EFORMÜLSE
+ISLOGICAL = EMANTIKSALSA
+ISNA = EYOKSA
+ISNONTEXT = EMETİNDEĞİLSE
+ISNUMBER = ESAYIYSA
+ISODD = TEKMİ
+ISREF = EREFSE
+ISTEXT = EMETİNSE
+N = S
+NA = YOKSAY
+SHEET = SAYFA
+SHEETS = SAYFALAR
+TYPE = TÜR
+
+##
+## Mantıksal işlevler (Logical Functions)
+##
+AND = VE
+FALSE = YANLIŞ
+IF = EĞER
+IFERROR = EĞERHATA
+IFNA = EĞERYOKSA
+IFS = ÇOKEĞER
+NOT = DEĞİL
+OR = YADA
+SWITCH = İLKEŞLEŞEN
+TRUE = DOĞRU
+XOR = ÖZELVEYA
+
+##
+## Arama ve başvuru işlevleri (Lookup & Reference Functions)
+##
+ADDRESS = ADRES
+AREAS = ALANSAY
+CHOOSE = ELEMAN
+COLUMN = SÜTUN
+COLUMNS = SÜTUNSAY
+FORMULATEXT = FORMÜLMETNİ
+GETPIVOTDATA = ÖZETVERİAL
+HLOOKUP = YATAYARA
+HYPERLINK = KÖPRÜ
+INDEX = İNDİS
+INDIRECT = DOLAYLI
+LOOKUP = ARA
+MATCH = KAÇINCI
+OFFSET = KAYDIR
+ROW = SATIR
+ROWS = SATIRSAY
+RTD = GZV
+TRANSPOSE = DEVRİK_DÖNÜŞÜM
+VLOOKUP = DÜŞEYARA
+
+##
+## Matematik ve trigonometri işlevleri (Math & Trig Functions)
+##
+ABS = MUTLAK
+ACOS = ACOS
+ACOSH = ACOSH
+ACOT = ACOT
+ACOTH = ACOTH
+AGGREGATE = TOPLAMA
+ARABIC = ARAP
+ASIN = ASİN
+ASINH = ASİNH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+BASE = TABAN
+CEILING.MATH = TAVANAYUVARLA.MATEMATİK
+CEILING.PRECISE = TAVANAYUVARLA.DUYARLI
+COMBIN = KOMBİNASYON
+COMBINA = KOMBİNASYONA
+COS = COS
+COSH = COSH
+COT = COT
+COTH = COTH
+CSC = CSC
+CSCH = CSCH
+DECIMAL = ONDALIK
+DEGREES = DERECE
+ECMA.CEILING = ECMA.TAVAN
+EVEN = ÇİFT
+EXP = ÜS
+FACT = ÇARPINIM
+FACTDOUBLE = ÇİFTFAKTÖR
+FLOOR.MATH = TABANAYUVARLA.MATEMATİK
+FLOOR.PRECISE = TABANAYUVARLA.DUYARLI
+GCD = OBEB
+INT = TAMSAYI
+ISO.CEILING = ISO.TAVAN
+LCM = OKEK
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = DETERMİNANT
+MINVERSE = DİZEY_TERS
+MMULT = DÇARP
+MOD = MOD
+MROUND = KYUVARLA
+MULTINOMIAL = ÇOKTERİMLİ
+MUNIT = BİRİMMATRİS
+ODD = TEK
+PI = Pİ
+POWER = KUVVET
+PRODUCT = ÇARPIM
+QUOTIENT = BÖLÜM
+RADIANS = RADYAN
+RAND = S_SAYI_ÜRET
+RANDBETWEEN = RASTGELEARADA
+ROMAN = ROMEN
+ROUND = YUVARLA
+ROUNDBAHTDOWN = BAHTAŞAĞIYUVARLA
+ROUNDBAHTUP = BAHTYUKARIYUVARLA
+ROUNDDOWN = AŞAĞIYUVARLA
+ROUNDUP = YUKARIYUVARLA
+SEC = SEC
+SECH = SECH
+SERIESSUM = SERİTOPLA
+SIGN = İŞARET
+SIN = SİN
+SINH = SİNH
+SQRT = KAREKÖK
+SQRTPI = KAREKÖKPİ
+SUBTOTAL = ALTTOPLAM
+SUM = TOPLA
+SUMIF = ETOPLA
+SUMIFS = ÇOKETOPLA
+SUMPRODUCT = TOPLA.ÇARPIM
+SUMSQ = TOPKARE
+SUMX2MY2 = TOPX2EY2
+SUMX2PY2 = TOPX2AY2
+SUMXMY2 = TOPXEY2
+TAN = TAN
+TANH = TANH
+TRUNC = NSAT
+
+##
+## İstatistik işlevleri (Statistical Functions)
+##
+AVEDEV = ORTSAP
+AVERAGE = ORTALAMA
+AVERAGEA = ORTALAMAA
+AVERAGEIF = EĞERORTALAMA
+AVERAGEIFS = ÇOKEĞERORTALAMA
+BETA.DIST = BETA.DAĞ
+BETA.INV = BETA.TERS
+BINOM.DIST = BİNOM.DAĞ
+BINOM.DIST.RANGE = BİNOM.DAĞ.ARALIK
+BINOM.INV = BİNOM.TERS
+CHISQ.DIST = KİKARE.DAĞ
+CHISQ.DIST.RT = KİKARE.DAĞ.SAĞK
+CHISQ.INV = KİKARE.TERS
+CHISQ.INV.RT = KİKARE.TERS.SAĞK
+CHISQ.TEST = KİKARE.TEST
+CONFIDENCE.NORM = GÜVENİLİRLİK.NORM
+CONFIDENCE.T = GÜVENİLİRLİK.T
+CORREL = KORELASYON
+COUNT = BAĞ_DEĞ_SAY
+COUNTA = BAĞ_DEĞ_DOLU_SAY
+COUNTBLANK = BOŞLUKSAY
+COUNTIF = EĞERSAY
+COUNTIFS = ÇOKEĞERSAY
+COVARIANCE.P = KOVARYANS.P
+COVARIANCE.S = KOVARYANS.S
+DEVSQ = SAPKARE
+EXPON.DIST = ÜSTEL.DAĞ
+F.DIST = F.DAĞ
+F.DIST.RT = F.DAĞ.SAĞK
+F.INV = F.TERS
+F.INV.RT = F.TERS.SAĞK
+F.TEST = F.TEST
+FISHER = FISHER
+FISHERINV = FISHERTERS
+FORECAST.ETS = TAHMİN.ETS
+FORECAST.ETS.CONFINT = TAHMİN.ETS.GVNARAL
+FORECAST.ETS.SEASONALITY = TAHMİN.ETS.MEVSİMSELLİK
+FORECAST.ETS.STAT = TAHMİN.ETS.İSTAT
+FORECAST.LINEAR = TAHMİN.DOĞRUSAL
+FREQUENCY = SIKLIK
+GAMMA = GAMA
+GAMMA.DIST = GAMA.DAĞ
+GAMMA.INV = GAMA.TERS
+GAMMALN = GAMALN
+GAMMALN.PRECISE = GAMALN.DUYARLI
+GAUSS = GAUSS
+GEOMEAN = GEOORT
+GROWTH = BÜYÜME
+HARMEAN = HARORT
+HYPGEOM.DIST = HİPERGEOM.DAĞ
+INTERCEPT = KESMENOKTASI
+KURT = BASIKLIK
+LARGE = BÜYÜK
+LINEST = DOT
+LOGEST = LOT
+LOGNORM.DIST = LOGNORM.DAĞ
+LOGNORM.INV = LOGNORM.TERS
+MAX = MAK
+MAXA = MAKA
+MAXIFS = ÇOKEĞERMAK
+MEDIAN = ORTANCA
+MIN = MİN
+MINA = MİNA
+MINIFS = ÇOKEĞERMİN
+MODE.MULT = ENÇOK_OLAN.ÇOK
+MODE.SNGL = ENÇOK_OLAN.TEK
+NEGBINOM.DIST = NEGBİNOM.DAĞ
+NORM.DIST = NORM.DAĞ
+NORM.INV = NORM.TERS
+NORM.S.DIST = NORM.S.DAĞ
+NORM.S.INV = NORM.S.TERS
+PEARSON = PEARSON
+PERCENTILE.EXC = YÜZDEBİRLİK.HRC
+PERCENTILE.INC = YÜZDEBİRLİK.DHL
+PERCENTRANK.EXC = YÜZDERANK.HRC
+PERCENTRANK.INC = YÜZDERANK.DHL
+PERMUT = PERMÜTASYON
+PERMUTATIONA = PERMÜTASYONA
+PHI = PHI
+POISSON.DIST = POISSON.DAĞ
+PROB = OLASILIK
+QUARTILE.EXC = DÖRTTEBİRLİK.HRC
+QUARTILE.INC = DÖRTTEBİRLİK.DHL
+RANK.AVG = RANK.ORT
+RANK.EQ = RANK.EŞİT
+RSQ = RKARE
+SKEW = ÇARPIKLIK
+SKEW.P = ÇARPIKLIK.P
+SLOPE = EĞİM
+SMALL = KÜÇÜK
+STANDARDIZE = STANDARTLAŞTIRMA
+STDEV.P = STDSAPMA.P
+STDEV.S = STDSAPMA.S
+STDEVA = STDSAPMAA
+STDEVPA = STDSAPMASA
+STEYX = STHYX
+T.DIST = T.DAĞ
+T.DIST.2T = T.DAĞ.2K
+T.DIST.RT = T.DAĞ.SAĞK
+T.INV = T.TERS
+T.INV.2T = T.TERS.2K
+T.TEST = T.TEST
+TREND = EĞİLİM
+TRIMMEAN = KIRPORTALAMA
+VAR.P = VAR.P
+VAR.S = VAR.S
+VARA = VARA
+VARPA = VARSA
+WEIBULL.DIST = WEIBULL.DAĞ
+Z.TEST = Z.TEST
+
+##
+## Metin işlevleri (Text Functions)
+##
+BAHTTEXT = BAHTMETİN
+CHAR = DAMGA
+CLEAN = TEMİZ
+CODE = KOD
+CONCAT = ARALIKBİRLEŞTİR
+DOLLAR = LİRA
+EXACT = ÖZDEŞ
+FIND = BUL
+FIXED = SAYIDÜZENLE
+ISTHAIDIGIT = TAYRAKAMIYSA
+LEFT = SOLDAN
+LEN = UZUNLUK
+LOWER = KÜÇÜKHARF
+MID = PARÇAAL
+NUMBERSTRING = SAYIDİZİ
+NUMBERVALUE = SAYIDEĞERİ
+PHONETIC = SES
+PROPER = YAZIM.DÜZENİ
+REPLACE = DEĞİŞTİR
+REPT = YİNELE
+RIGHT = SAĞDAN
+SEARCH = MBUL
+SUBSTITUTE = YERİNEKOY
+T = M
+TEXT = METNEÇEVİR
+TEXTJOIN = METİNBİRLEŞTİR
+THAIDIGIT = TAYRAKAM
+THAINUMSOUND = TAYSAYISES
+THAINUMSTRING = TAYSAYIDİZE
+THAISTRINGLENGTH = TAYDİZEUZUNLUĞU
+TRIM = KIRP
+UNICHAR = UNICODEKARAKTERİ
+UNICODE = UNICODE
+UPPER = BÜYÜKHARF
+VALUE = SAYIYAÇEVİR
+
+##
+## Metin işlevleri (Web Functions)
+##
+ENCODEURL = URLKODLA
+FILTERXML = XMLFİLTRELE
+WEBSERVICE = WEBHİZMETİ
+
+##
+## Uyumluluk işlevleri (Compatibility Functions)
+##
+BETADIST = BETADAĞ
+BETAINV = BETATERS
+BINOMDIST = BİNOMDAĞ
+CEILING = TAVANAYUVARLA
+CHIDIST = KİKAREDAĞ
+CHIINV = KİKARETERS
+CHITEST = KİKARETEST
+CONCATENATE = BİRLEŞTİR
+CONFIDENCE = GÜVENİRLİK
+COVAR = KOVARYANS
+CRITBINOM = KRİTİKBİNOM
+EXPONDIST = ÜSTELDAĞ
+FDIST = FDAĞ
+FINV = FTERS
+FLOOR = TABANAYUVARLA
+FORECAST = TAHMİN
+FTEST = FTEST
+GAMMADIST = GAMADAĞ
+GAMMAINV = GAMATERS
+HYPGEOMDIST = HİPERGEOMDAĞ
+LOGINV = LOGTERS
+LOGNORMDIST = LOGNORMDAĞ
+MODE = ENÇOK_OLAN
+NEGBINOMDIST = NEGBİNOMDAĞ
+NORMDIST = NORMDAĞ
+NORMINV = NORMTERS
+NORMSDIST = NORMSDAĞ
+NORMSINV = NORMSTERS
+PERCENTILE = YÜZDEBİRLİK
+PERCENTRANK = YÜZDERANK
+POISSON = POISSON
+QUARTILE = DÖRTTEBİRLİK
+RANK = RANK
+STDEV = STDSAPMA
+STDEVP = STDSAPMAS
+TDIST = TDAĞ
+TINV = TTERS
+TTEST = TTEST
+VAR = VAR
+VARP = VARS
+WEIBULL = WEIBULL
+ZTEST = ZTEST
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php
new file mode 100644
index 00000000..923f9417
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class AddressHelper
+{
+    public const R1C1_COORDINATE_REGEX = '/(R((?:\[-?\d*\])|(?:\d*))?)(C((?:\[-?\d*\])|(?:\d*))?)/i';
+
+    /** @return string[] */
+    public static function getRowAndColumnChars(): array
+    {
+        $rowChar = 'R';
+        $colChar = 'C';
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_EXCEL) {
+            $rowColChars = Calculation::localeFunc('*RC');
+            if (mb_strlen($rowColChars) === 2) {
+                $rowChar = mb_substr($rowColChars, 0, 1);
+                $colChar = mb_substr($rowColChars, 1, 1);
+            }
+        }
+
+        return [$rowChar, $colChar];
+    }
+
+    /**
+     * Converts an R1C1 format cell address to an A1 format cell address.
+     */
+    public static function convertToA1(
+        string $address,
+        int $currentRowNumber = 1,
+        int $currentColumnNumber = 1,
+        bool $useLocale = true
+    ): string {
+        [$rowChar, $colChar] = $useLocale ? self::getRowAndColumnChars() : ['R', 'C'];
+        $regex = '/^(' . $rowChar . '(\[?[-+]?\d*\]?))(' . $colChar . '(\[?[-+]?\d*\]?))$/i';
+        $validityCheck = preg_match($regex, $address, $cellReference);
+
+        if (empty($validityCheck)) {
+            throw new Exception('Invalid R1C1-format Cell Reference');
+        }
+
+        $rowReference = $cellReference[2];
+        //    Empty R reference is the current row
+        if ($rowReference === '') {
+            $rowReference = (string) $currentRowNumber;
+        }
+        //    Bracketed R references are relative to the current row
+        if ($rowReference[0] === '[') {
+            $rowReference = $currentRowNumber + (int) trim($rowReference, '[]');
+        }
+        $columnReference = $cellReference[4];
+        //    Empty C reference is the current column
+        if ($columnReference === '') {
+            $columnReference = (string) $currentColumnNumber;
+        }
+        //    Bracketed C references are relative to the current column
+        if (is_string($columnReference) && $columnReference[0] === '[') {
+            $columnReference = $currentColumnNumber + (int) trim($columnReference, '[]');
+        }
+        $columnReference = (int) $columnReference;
+
+        if ($columnReference <= 0 || $rowReference <= 0) {
+            throw new Exception('Invalid R1C1-format Cell Reference, Value out of range');
+        }
+        $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
+
+        return $A1CellReference;
+    }
+
+    protected static function convertSpreadsheetMLFormula(string $formula): string
+    {
+        $formula = substr($formula, 3);
+        $temp = explode('"', $formula);
+        $key = false;
+        foreach ($temp as &$value) {
+            //    Only replace in alternate array entries (i.e. non-quoted blocks)
+            $key = $key === false;
+            if ($key) {
+                $value = str_replace(['[.', ':.', ']'], ['', ':', ''], $value);
+            }
+        }
+        unset($value);
+
+        return implode('"', $temp);
+    }
+
+    /**
+     * Converts a formula that uses R1C1/SpreadsheetXML format cell address to an A1 format cell address.
+     */
+    public static function convertFormulaToA1(
+        string $formula,
+        int $currentRowNumber = 1,
+        int $currentColumnNumber = 1
+    ): string {
+        if (str_starts_with($formula, 'of:')) {
+            // We have an old-style SpreadsheetML Formula
+            return self::convertSpreadsheetMLFormula($formula);
+        }
+
+        //    Convert R1C1 style references to A1 style references (but only when not quoted)
+        $temp = explode('"', $formula);
+        $key = false;
+        foreach ($temp as &$value) {
+            //    Only replace in alternate array entries (i.e. non-quoted blocks)
+            $key = $key === false;
+            if ($key) {
+                preg_match_all(self::R1C1_COORDINATE_REGEX, $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
+                //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
+                //        through the formula from left to right. Reversing means that we work right to left.through
+                //        the formula
+                $cellReferences = array_reverse($cellReferences);
+                //    Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
+                //        then modify the formula to use that new reference
+                foreach ($cellReferences as $cellReference) {
+                    $A1CellReference = self::convertToA1($cellReference[0][0], $currentRowNumber, $currentColumnNumber, false);
+                    $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
+                }
+            }
+        }
+        unset($value);
+
+        //    Then rebuild the formula string
+        return implode('"', $temp);
+    }
+
+    /**
+     * Converts an A1 format cell address to an R1C1 format cell address.
+     * If $currentRowNumber or $currentColumnNumber are provided, then the R1C1 address will be formatted as a relative address.
+     */
+    public static function convertToR1C1(
+        string $address,
+        ?int $currentRowNumber = null,
+        ?int $currentColumnNumber = null
+    ): string {
+        $validityCheck = preg_match(Coordinate::A1_COORDINATE_REGEX, $address, $cellReference);
+
+        if ($validityCheck === 0) {
+            throw new Exception('Invalid A1-format Cell Reference');
+        }
+
+        if ($cellReference['col'][0] === '$') {
+            // Column must be absolute address
+            $currentColumnNumber = null;
+        }
+        $columnId = Coordinate::columnIndexFromString(ltrim($cellReference['col'], '$'));
+
+        if ($cellReference['row'][0] === '$') {
+            // Row must be absolute address
+            $currentRowNumber = null;
+        }
+        $rowId = (int) ltrim($cellReference['row'], '$');
+
+        if ($currentRowNumber !== null) {
+            if ($rowId === $currentRowNumber) {
+                $rowId = '';
+            } else {
+                $rowId = '[' . ($rowId - $currentRowNumber) . ']';
+            }
+        }
+
+        if ($currentColumnNumber !== null) {
+            if ($columnId === $currentColumnNumber) {
+                $columnId = '';
+            } else {
+                $columnId = '[' . ($columnId - $currentColumnNumber) . ']';
+            }
+        }
+
+        $R1C1Address = "R{$rowId}C{$columnId}";
+
+        return $R1C1Address;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php
new file mode 100644
index 00000000..22e9d11e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+/**
+ * @template T
+ */
+interface AddressRange
+{
+    public const MAX_ROW = 1048576;
+
+    public const MAX_COLUMN = 'XFD';
+
+    public const MAX_COLUMN_INT = 16384;
+
+    /**
+     * @return T
+     */
+    public function from(): mixed;
+
+    /**
+     * @return T
+     */
+    public function to(): mixed;
+
+    public function __toString(): string;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php
new file mode 100644
index 00000000..41686452
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\FormattedNumber;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder
+{
+    /**
+     * Bind value to a cell.
+     *
+     * @param Cell $cell Cell to bind value to
+     * @param mixed $value Value to bind in cell
+     */
+    public function bindValue(Cell $cell, mixed $value = null): bool
+    {
+        if ($value === null) {
+            return parent::bindValue($cell, $value);
+        } elseif (is_string($value)) {
+            // sanitize UTF-8 strings
+            $value = StringHelper::sanitizeUTF8($value);
+        }
+
+        // Find out data type
+        $dataType = parent::dataTypeForValue($value);
+
+        // Style logic - strings
+        if ($dataType === DataType::TYPE_STRING && is_string($value)) {
+            //    Test for booleans using locale-setting
+            if (StringHelper::strToUpper($value) === Calculation::getTRUE()) {
+                $cell->setValueExplicit(true, DataType::TYPE_BOOL);
+
+                return true;
+            } elseif (StringHelper::strToUpper($value) === Calculation::getFALSE()) {
+                $cell->setValueExplicit(false, DataType::TYPE_BOOL);
+
+                return true;
+            }
+
+            // Check for fractions
+            if (preg_match('~^([+-]?)\s*(\d+)\s*/\s*(\d+)$~', $value, $matches)) {
+                return $this->setProperFraction($matches, $cell);
+            } elseif (preg_match('~^([+-]?)(\d+)\s+(\d+)\s*/\s*(\d+)$~', $value, $matches)) {
+                return $this->setImproperFraction($matches, $cell);
+            }
+
+            $decimalSeparatorNoPreg = StringHelper::getDecimalSeparator();
+            $decimalSeparator = preg_quote($decimalSeparatorNoPreg, '/');
+            $thousandsSeparator = preg_quote(StringHelper::getThousandsSeparator(), '/');
+
+            // Check for percentage
+            if (preg_match('/^\-?\d*' . $decimalSeparator . '?\d*\s?\%$/', (string) preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value))) {
+                return $this->setPercentage((string) preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value), $cell);
+            }
+
+            // Check for currency
+            if (preg_match(FormattedNumber::currencyMatcherRegexp(), (string) preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value), $matches, PREG_UNMATCHED_AS_NULL)) {
+                // Convert value to number
+                $sign = ($matches['PrefixedSign'] ?? $matches['PrefixedSign2'] ?? $matches['PostfixedSign']) ?? null;
+                $currencyCode = $matches['PrefixedCurrency'] ?? $matches['PostfixedCurrency'];
+                /** @var string */
+                $temp = str_replace([$decimalSeparatorNoPreg, $currencyCode, ' ', '-'], ['.', '', '', ''], (string) preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value));
+                $value = (float) ($sign . trim($temp));
+
+                return $this->setCurrency($value, $cell, $currencyCode ?? '');
+            }
+
+            // Check for time without seconds e.g. '9:45', '09:45'
+            if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d$/', $value)) {
+                return $this->setTimeHoursMinutes($value, $cell);
+            }
+
+            // Check for time with seconds '9:45:59', '09:45:59'
+            if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d:[0-5]\d$/', $value)) {
+                return $this->setTimeHoursMinutesSeconds($value, $cell);
+            }
+
+            // Check for datetime, e.g. '2008-12-31', '2008-12-31 15:59', '2008-12-31 15:59:10'
+            if (($d = Date::stringToExcel($value)) !== false) {
+                // Convert value to number
+                $cell->setValueExplicit($d, DataType::TYPE_NUMERIC);
+                // Determine style. Either there is a time part or not. Look for ':'
+                if (str_contains($value, ':')) {
+                    $formatCode = 'yyyy-mm-dd h:mm';
+                } else {
+                    $formatCode = 'yyyy-mm-dd';
+                }
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getNumberFormat()->setFormatCode($formatCode);
+
+                return true;
+            }
+
+            // Check for newline character "\n"
+            if (str_contains($value, "\n")) {
+                $cell->setValueExplicit($value, DataType::TYPE_STRING);
+                // Set style
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
+                    ->getAlignment()->setWrapText(true);
+
+                return true;
+            }
+        }
+
+        // Not bound yet? Use parent...
+        return parent::bindValue($cell, $value);
+    }
+
+    protected function setImproperFraction(array $matches, Cell $cell): bool
+    {
+        // Convert value to number
+        $value = $matches[2] + ($matches[3] / $matches[4]);
+        if ($matches[1] === '-') {
+            $value = 0 - $value;
+        }
+        $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC);
+
+        // Build the number format mask based on the size of the matched values
+        $dividend = str_repeat('?', strlen($matches[3]));
+        $divisor = str_repeat('?', strlen($matches[4]));
+        $fractionMask = "# {$dividend}/{$divisor}";
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode($fractionMask);
+
+        return true;
+    }
+
+    protected function setProperFraction(array $matches, Cell $cell): bool
+    {
+        // Convert value to number
+        $value = $matches[2] / $matches[3];
+        if ($matches[1] === '-') {
+            $value = 0 - $value;
+        }
+        $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC);
+
+        // Build the number format mask based on the size of the matched values
+        $dividend = str_repeat('?', strlen($matches[2]));
+        $divisor = str_repeat('?', strlen($matches[3]));
+        $fractionMask = "{$dividend}/{$divisor}";
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode($fractionMask);
+
+        return true;
+    }
+
+    protected function setPercentage(string $value, Cell $cell): bool
+    {
+        // Convert value to number
+        $value = ((float) str_replace('%', '', $value)) / 100;
+        $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
+
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_PERCENTAGE_00);
+
+        return true;
+    }
+
+    protected function setCurrency(float $value, Cell $cell, string $currencyCode): bool
+    {
+        $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode(
+                str_replace('$', '[$' . $currencyCode . ']', NumberFormat::FORMAT_CURRENCY_USD)
+            );
+
+        return true;
+    }
+
+    protected function setTimeHoursMinutes(string $value, Cell $cell): bool
+    {
+        // Convert value to number
+        [$hours, $minutes] = explode(':', $value);
+        $hours = (int) $hours;
+        $minutes = (int) $minutes;
+        $days = ($hours / 24) + ($minutes / 1440);
+        $cell->setValueExplicit($days, DataType::TYPE_NUMERIC);
+
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_TIME3);
+
+        return true;
+    }
+
+    protected function setTimeHoursMinutesSeconds(string $value, Cell $cell): bool
+    {
+        // Convert value to number
+        [$hours, $minutes, $seconds] = explode(':', $value);
+        $hours = (int) $hours;
+        $minutes = (int) $minutes;
+        $seconds = (int) $seconds;
+        $days = ($hours / 24) + ($minutes / 1440) + ($seconds / 86400);
+        $cell->setValueExplicit($days, DataType::TYPE_NUMERIC);
+
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_TIME4);
+
+        return true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php
new file mode 100644
index 00000000..6aed63f2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php
@@ -0,0 +1,851 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Collection\Cells;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDate;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\CellStyleAssessor;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+class Cell implements Stringable
+{
+    /**
+     * Value binder to use.
+     */
+    private static ?IValueBinder $valueBinder = null;
+
+    /**
+     * Value of the cell.
+     */
+    private mixed $value;
+
+    /**
+     *    Calculated value of the cell (used for caching)
+     *    This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
+     *        create the original spreadsheet file.
+     *    Note that this value is not guaranteed to reflect the actual calculated value because it is
+     *        possible that auto-calculation was disabled in the original spreadsheet, and underlying data
+     *        values used by the formula have changed since it was last calculated.
+     *
+     * @var mixed
+     */
+    private $calculatedValue;
+
+    /**
+     * Type of the cell data.
+     */
+    private string $dataType;
+
+    /**
+     * The collection of cells that this cell belongs to (i.e. The Cell Collection for the parent Worksheet).
+     *
+     * @var ?Cells
+     */
+    private ?Cells $parent;
+
+    /**
+     * Index to the cellXf reference for the styling of this cell.
+     */
+    private int $xfIndex = 0;
+
+    /**
+     * Attributes of the formula.
+     */
+    private mixed $formulaAttributes = null;
+
+    private IgnoredErrors $ignoredErrors;
+
+    /**
+     * Update the cell into the cell collection.
+     *
+     * @throws SpreadsheetException
+     */
+    public function updateInCollection(): self
+    {
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new SpreadsheetException('Cannot update when cell is not bound to a worksheet');
+        }
+        $parent->update($this);
+
+        return $this;
+    }
+
+    public function detach(): void
+    {
+        $this->parent = null;
+    }
+
+    public function attach(Cells $parent): void
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Create a new Cell.
+     *
+     * @throws SpreadsheetException
+     */
+    public function __construct(mixed $value, ?string $dataType, Worksheet $worksheet)
+    {
+        // Initialise cell value
+        $this->value = $value;
+
+        // Set worksheet cache
+        $this->parent = $worksheet->getCellCollection();
+
+        // Set datatype?
+        if ($dataType !== null) {
+            if ($dataType == DataType::TYPE_STRING2) {
+                $dataType = DataType::TYPE_STRING;
+            }
+            $this->dataType = $dataType;
+        } elseif (self::getValueBinder()->bindValue($this, $value) === false) {
+            throw new SpreadsheetException('Value could not be bound to cell.');
+        }
+        $this->ignoredErrors = new IgnoredErrors();
+    }
+
+    /**
+     * Get cell coordinate column.
+     *
+     * @throws SpreadsheetException
+     */
+    public function getColumn(): string
+    {
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new SpreadsheetException('Cannot get column when cell is not bound to a worksheet');
+        }
+
+        return $parent->getCurrentColumn();
+    }
+
+    /**
+     * Get cell coordinate row.
+     *
+     * @throws SpreadsheetException
+     */
+    public function getRow(): int
+    {
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new SpreadsheetException('Cannot get row when cell is not bound to a worksheet');
+        }
+
+        return $parent->getCurrentRow();
+    }
+
+    /**
+     * Get cell coordinate.
+     *
+     * @throws SpreadsheetException
+     */
+    public function getCoordinate(): string
+    {
+        $parent = $this->parent;
+        if ($parent !== null) {
+            $coordinate = $parent->getCurrentCoordinate();
+        } else {
+            $coordinate = null;
+        }
+        if ($coordinate === null) {
+            throw new SpreadsheetException('Coordinate no longer exists');
+        }
+
+        return $coordinate;
+    }
+
+    /**
+     * Get cell value.
+     */
+    public function getValue(): mixed
+    {
+        return $this->value;
+    }
+
+    public function getValueString(): string
+    {
+        $value = $this->value;
+
+        return ($value === '' || is_scalar($value) || $value instanceof Stringable) ? "$value" : '';
+    }
+
+    /**
+     * Get cell value with formatting.
+     */
+    public function getFormattedValue(): string
+    {
+        $currentCalendar = SharedDate::getExcelCalendar();
+        SharedDate::setExcelCalendar($this->getWorksheet()->getParent()?->getExcelCalendar());
+        $formattedValue = (string) NumberFormat::toFormattedString(
+            $this->getCalculatedValue(),
+            (string) $this->getStyle()->getNumberFormat()->getFormatCode(true)
+        );
+        SharedDate::setExcelCalendar($currentCalendar);
+
+        return $formattedValue;
+    }
+
+    protected static function updateIfCellIsTableHeader(?Worksheet $workSheet, self $cell, mixed $oldValue, mixed $newValue): void
+    {
+        $oldValue = (is_scalar($oldValue) || $oldValue instanceof Stringable) ? ((string) $oldValue) : null;
+        $newValue = (is_scalar($newValue) || $newValue instanceof Stringable) ? ((string) $newValue) : null;
+        if (StringHelper::strToLower($oldValue ?? '') === StringHelper::strToLower($newValue ?? '') || $workSheet === null) {
+            return;
+        }
+
+        foreach ($workSheet->getTableCollection() as $table) {
+            /** @var Table $table */
+            if ($cell->isInRange($table->getRange())) {
+                $rangeRowsColumns = Coordinate::getRangeBoundaries($table->getRange());
+                if ($cell->getRow() === (int) $rangeRowsColumns[0][1]) {
+                    Table\Column::updateStructuredReferences($workSheet, $oldValue, $newValue);
+                }
+
+                return;
+            }
+        }
+    }
+
+    /**
+     * Set cell value.
+     *
+     *    Sets the value for a cell, automatically determining the datatype using the value binder
+     *
+     * @param mixed $value Value
+     * @param null|IValueBinder $binder Value Binder to override the currently set Value Binder
+     *
+     * @throws SpreadsheetException
+     */
+    public function setValue(mixed $value, ?IValueBinder $binder = null): self
+    {
+        $binder ??= self::getValueBinder();
+        if (!$binder->bindValue($this, $value)) {
+            throw new SpreadsheetException('Value could not be bound to cell.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the value for a cell, with the explicit data type passed to the method (bypassing any use of the value binder).
+     *
+     * @param mixed $value Value
+     * @param string $dataType Explicit data type, see DataType::TYPE_*
+     *        Note that PhpSpreadsheet does not validate that the value and datatype are consistent, in using this
+     *             method, then it is your responsibility as an end-user developer to validate that the value and
+     *             the datatype match.
+     *       If you do mismatch value and datatype, then the value you enter may be changed to match the datatype
+     *          that you specify.
+     *
+     * @throws SpreadsheetException
+     */
+    public function setValueExplicit(mixed $value, string $dataType = DataType::TYPE_STRING): self
+    {
+        $oldValue = $this->value;
+        $quotePrefix = false;
+
+        // set the value according to data type
+        switch ($dataType) {
+            case DataType::TYPE_NULL:
+                $this->value = null;
+
+                break;
+            case DataType::TYPE_STRING2:
+                $dataType = DataType::TYPE_STRING;
+                // no break
+            case DataType::TYPE_STRING:
+                // Synonym for string
+                if (is_string($value) && strlen($value) > 1 && $value[0] === '=') {
+                    $quotePrefix = true;
+                }
+                // no break
+            case DataType::TYPE_INLINE:
+                // Rich text
+                if ($value !== null && !is_scalar($value) && !($value instanceof Stringable)) {
+                    throw new SpreadsheetException('Invalid unstringable value for datatype Inline/String/String2');
+                }
+                $this->value = DataType::checkString(($value instanceof RichText) ? $value : ((string) $value));
+
+                break;
+            case DataType::TYPE_NUMERIC:
+                if (is_string($value) && !is_numeric($value)) {
+                    throw new SpreadsheetException('Invalid numeric value for datatype Numeric');
+                }
+                $this->value = 0 + $value;
+
+                break;
+            case DataType::TYPE_FORMULA:
+                if ($value !== null && !is_scalar($value) && !($value instanceof Stringable)) {
+                    throw new SpreadsheetException('Invalid unstringable value for datatype Formula');
+                }
+                $this->value = (string) $value;
+
+                break;
+            case DataType::TYPE_BOOL:
+                $this->value = (bool) $value;
+
+                break;
+            case DataType::TYPE_ISO_DATE:
+                $this->value = SharedDate::convertIsoDate($value);
+                $dataType = DataType::TYPE_NUMERIC;
+
+                break;
+            case DataType::TYPE_ERROR:
+                $this->value = DataType::checkErrorCode($value);
+
+                break;
+            default:
+                throw new SpreadsheetException('Invalid datatype: ' . $dataType);
+        }
+
+        // set the datatype
+        $this->dataType = $dataType;
+
+        $this->updateInCollection();
+        $cellCoordinate = $this->getCoordinate();
+        self::updateIfCellIsTableHeader($this->getParent()?->getParent(), $this, $oldValue, $value);
+        $this->getWorksheet()->applyStylesFromArray($cellCoordinate, ['quotePrefix' => $quotePrefix]);
+
+        return $this->getParent()?->get($cellCoordinate) ?? $this;
+    }
+
+    public const CALCULATE_DATE_TIME_ASIS = 0;
+    public const CALCULATE_DATE_TIME_FLOAT = 1;
+    public const CALCULATE_TIME_FLOAT = 2;
+
+    private static int $calculateDateTimeType = self::CALCULATE_DATE_TIME_ASIS;
+
+    public static function getCalculateDateTimeType(): int
+    {
+        return self::$calculateDateTimeType;
+    }
+
+    /** @throws CalculationException */
+    public static function setCalculateDateTimeType(int $calculateDateTimeType): void
+    {
+        self::$calculateDateTimeType = match ($calculateDateTimeType) {
+            self::CALCULATE_DATE_TIME_ASIS, self::CALCULATE_DATE_TIME_FLOAT, self::CALCULATE_TIME_FLOAT => $calculateDateTimeType,
+            default => throw new CalculationException("Invalid value $calculateDateTimeType for calculated date time type"),
+        };
+    }
+
+    /**
+     * Convert date, time, or datetime from int to float if desired.
+     */
+    private function convertDateTimeInt(mixed $result): mixed
+    {
+        if (is_int($result)) {
+            if (self::$calculateDateTimeType === self::CALCULATE_TIME_FLOAT) {
+                if (SharedDate::isDateTime($this, $result, false)) {
+                    $result = (float) $result;
+                }
+            } elseif (self::$calculateDateTimeType === self::CALCULATE_DATE_TIME_FLOAT) {
+                if (SharedDate::isDateTime($this, $result, true)) {
+                    $result = (float) $result;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get calculated cell value converted to string.
+     */
+    public function getCalculatedValueString(): string
+    {
+        $value = $this->getCalculatedValue();
+
+        return ($value === '' || is_scalar($value) || $value instanceof Stringable) ? "$value" : '';
+    }
+
+    /**
+     * Get calculated cell value.
+     *
+     * @param bool $resetLog Whether the calculation engine logger should be reset or not
+     *
+     * @throws CalculationException
+     */
+    public function getCalculatedValue(bool $resetLog = true): mixed
+    {
+        if ($this->dataType === DataType::TYPE_FORMULA) {
+            try {
+                $currentCalendar = SharedDate::getExcelCalendar();
+                SharedDate::setExcelCalendar($this->getWorksheet()->getParent()?->getExcelCalendar());
+                $index = $this->getWorksheet()->getParentOrThrow()->getActiveSheetIndex();
+                $selected = $this->getWorksheet()->getSelectedCells();
+                $result = Calculation::getInstance(
+                    $this->getWorksheet()->getParent()
+                )->calculateCellValue($this, $resetLog);
+                $result = $this->convertDateTimeInt($result);
+                $this->getWorksheet()->setSelectedCells($selected);
+                $this->getWorksheet()->getParentOrThrow()->setActiveSheetIndex($index);
+                //    We don't yet handle array returns
+                if (is_array($result)) {
+                    while (is_array($result)) {
+                        $result = array_shift($result);
+                    }
+                }
+            } catch (SpreadsheetException $ex) {
+                SharedDate::setExcelCalendar($currentCalendar);
+                if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {
+                    return $this->calculatedValue; // Fallback for calculations referencing external files.
+                } elseif (preg_match('/[Uu]ndefined (name|offset: 2|array key 2)/', $ex->getMessage()) === 1) {
+                    return ExcelError::NAME();
+                }
+
+                throw new CalculationException(
+                    $this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage(),
+                    $ex->getCode(),
+                    $ex
+                );
+            }
+            SharedDate::setExcelCalendar($currentCalendar);
+
+            if ($result === Functions::NOT_YET_IMPLEMENTED) {
+                return $this->calculatedValue; // Fallback if calculation engine does not support the formula.
+            }
+
+            return $result;
+        } elseif ($this->value instanceof RichText) {
+            return $this->value->getPlainText();
+        }
+
+        return $this->convertDateTimeInt($this->value);
+    }
+
+    /**
+     * Set old calculated value (cached).
+     *
+     * @param mixed $originalValue Value
+     */
+    public function setCalculatedValue(mixed $originalValue, bool $tryNumeric = true): self
+    {
+        if ($originalValue !== null) {
+            $this->calculatedValue = ($tryNumeric && is_numeric($originalValue)) ? (0 + $originalValue) : $originalValue;
+        }
+
+        return $this->updateInCollection();
+    }
+
+    /**
+     *    Get old calculated value (cached)
+     *    This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
+     *        create the original spreadsheet file.
+     *    Note that this value is not guaranteed to reflect the actual calculated value because it is
+     *        possible that auto-calculation was disabled in the original spreadsheet, and underlying data
+     *        values used by the formula have changed since it was last calculated.
+     */
+    public function getOldCalculatedValue(): mixed
+    {
+        return $this->calculatedValue;
+    }
+
+    /**
+     * Get cell data type.
+     */
+    public function getDataType(): string
+    {
+        return $this->dataType;
+    }
+
+    /**
+     * Set cell data type.
+     *
+     * @param string $dataType see DataType::TYPE_*
+     */
+    public function setDataType(string $dataType): self
+    {
+        $this->setValueExplicit($this->value, $dataType);
+
+        return $this;
+    }
+
+    /**
+     * Identify if the cell contains a formula.
+     */
+    public function isFormula(): bool
+    {
+        return $this->dataType === DataType::TYPE_FORMULA && $this->getStyle()->getQuotePrefix() === false;
+    }
+
+    /**
+     *    Does this cell contain Data validation rules?
+     *
+     * @throws SpreadsheetException
+     */
+    public function hasDataValidation(): bool
+    {
+        if (!isset($this->parent)) {
+            throw new SpreadsheetException('Cannot check for data validation when cell is not bound to a worksheet');
+        }
+
+        return $this->getWorksheet()->dataValidationExists($this->getCoordinate());
+    }
+
+    /**
+     * Get Data validation rules.
+     *
+     * @throws SpreadsheetException
+     */
+    public function getDataValidation(): DataValidation
+    {
+        if (!isset($this->parent)) {
+            throw new SpreadsheetException('Cannot get data validation for cell that is not bound to a worksheet');
+        }
+
+        return $this->getWorksheet()->getDataValidation($this->getCoordinate());
+    }
+
+    /**
+     * Set Data validation rules.
+     *
+     * @throws SpreadsheetException
+     */
+    public function setDataValidation(?DataValidation $dataValidation = null): self
+    {
+        if (!isset($this->parent)) {
+            throw new SpreadsheetException('Cannot set data validation for cell that is not bound to a worksheet');
+        }
+
+        $this->getWorksheet()->setDataValidation($this->getCoordinate(), $dataValidation);
+
+        return $this->updateInCollection();
+    }
+
+    /**
+     * Does this cell contain valid value?
+     */
+    public function hasValidValue(): bool
+    {
+        $validator = new DataValidator();
+
+        return $validator->isValid($this);
+    }
+
+    /**
+     * Does this cell contain a Hyperlink?
+     *
+     * @throws SpreadsheetException
+     */
+    public function hasHyperlink(): bool
+    {
+        if (!isset($this->parent)) {
+            throw new SpreadsheetException('Cannot check for hyperlink when cell is not bound to a worksheet');
+        }
+
+        return $this->getWorksheet()->hyperlinkExists($this->getCoordinate());
+    }
+
+    /**
+     * Get Hyperlink.
+     *
+     * @throws SpreadsheetException
+     */
+    public function getHyperlink(): Hyperlink
+    {
+        if (!isset($this->parent)) {
+            throw new SpreadsheetException('Cannot get hyperlink for cell that is not bound to a worksheet');
+        }
+
+        return $this->getWorksheet()->getHyperlink($this->getCoordinate());
+    }
+
+    /**
+     * Set Hyperlink.
+     *
+     * @throws SpreadsheetException
+     */
+    public function setHyperlink(?Hyperlink $hyperlink = null): self
+    {
+        if (!isset($this->parent)) {
+            throw new SpreadsheetException('Cannot set hyperlink for cell that is not bound to a worksheet');
+        }
+
+        $this->getWorksheet()->setHyperlink($this->getCoordinate(), $hyperlink);
+
+        return $this->updateInCollection();
+    }
+
+    /**
+     * Get cell collection.
+     */
+    public function getParent(): ?Cells
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Get parent worksheet.
+     *
+     * @throws SpreadsheetException
+     */
+    public function getWorksheet(): Worksheet
+    {
+        $parent = $this->parent;
+        if ($parent !== null) {
+            $worksheet = $parent->getParent();
+        } else {
+            $worksheet = null;
+        }
+
+        if ($worksheet === null) {
+            throw new SpreadsheetException('Worksheet no longer exists');
+        }
+
+        return $worksheet;
+    }
+
+    public function getWorksheetOrNull(): ?Worksheet
+    {
+        $parent = $this->parent;
+        if ($parent !== null) {
+            $worksheet = $parent->getParent();
+        } else {
+            $worksheet = null;
+        }
+
+        return $worksheet;
+    }
+
+    /**
+     * Is this cell in a merge range.
+     */
+    public function isInMergeRange(): bool
+    {
+        return (bool) $this->getMergeRange();
+    }
+
+    /**
+     * Is this cell the master (top left cell) in a merge range (that holds the actual data value).
+     */
+    public function isMergeRangeValueCell(): bool
+    {
+        if ($mergeRange = $this->getMergeRange()) {
+            $mergeRange = Coordinate::splitRange($mergeRange);
+            [$startCell] = $mergeRange[0];
+
+            return $this->getCoordinate() === $startCell;
+        }
+
+        return false;
+    }
+
+    /**
+     * If this cell is in a merge range, then return the range.
+     *
+     * @return false|string
+     */
+    public function getMergeRange()
+    {
+        foreach ($this->getWorksheet()->getMergeCells() as $mergeRange) {
+            if ($this->isInRange($mergeRange)) {
+                return $mergeRange;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get cell style.
+     */
+    public function getStyle(): Style
+    {
+        return $this->getWorksheet()->getStyle($this->getCoordinate());
+    }
+
+    /**
+     * Get cell style.
+     */
+    public function getAppliedStyle(): Style
+    {
+        if ($this->getWorksheet()->conditionalStylesExists($this->getCoordinate()) === false) {
+            return $this->getStyle();
+        }
+        $range = $this->getWorksheet()->getConditionalRange($this->getCoordinate());
+        if ($range === null) {
+            return $this->getStyle();
+        }
+
+        $matcher = new CellStyleAssessor($this, $range);
+
+        return $matcher->matchConditions($this->getWorksheet()->getConditionalStyles($this->getCoordinate()));
+    }
+
+    /**
+     * Re-bind parent.
+     */
+    public function rebindParent(Worksheet $parent): self
+    {
+        $this->parent = $parent->getCellCollection();
+
+        return $this->updateInCollection();
+    }
+
+    /**
+     *    Is cell in a specific range?
+     *
+     * @param string $range Cell range (e.g. A1:A1)
+     */
+    public function isInRange(string $range): bool
+    {
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range);
+
+        // Translate properties
+        $myColumn = Coordinate::columnIndexFromString($this->getColumn());
+        $myRow = $this->getRow();
+
+        // Verify if cell is in range
+        return ($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn)
+            && ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow);
+    }
+
+    /**
+     * Compare 2 cells.
+     *
+     * @param Cell $a Cell a
+     * @param Cell $b Cell b
+     *
+     * @return int Result of comparison (always -1 or 1, never zero!)
+     */
+    public static function compareCells(self $a, self $b): int
+    {
+        if ($a->getRow() < $b->getRow()) {
+            return -1;
+        } elseif ($a->getRow() > $b->getRow()) {
+            return 1;
+        } elseif (Coordinate::columnIndexFromString($a->getColumn()) < Coordinate::columnIndexFromString($b->getColumn())) {
+            return -1;
+        }
+
+        return 1;
+    }
+
+    /**
+     * Get value binder to use.
+     */
+    public static function getValueBinder(): IValueBinder
+    {
+        if (self::$valueBinder === null) {
+            self::$valueBinder = new DefaultValueBinder();
+        }
+
+        return self::$valueBinder;
+    }
+
+    /**
+     * Set value binder to use.
+     */
+    public static function setValueBinder(IValueBinder $binder): void
+    {
+        self::$valueBinder = $binder;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $propertyName => $propertyValue) {
+            if ((is_object($propertyValue)) && ($propertyName !== 'parent')) {
+                $this->$propertyName = clone $propertyValue;
+            } else {
+                $this->$propertyName = $propertyValue;
+            }
+        }
+    }
+
+    /**
+     * Get index to cellXf.
+     */
+    public function getXfIndex(): int
+    {
+        return $this->xfIndex;
+    }
+
+    /**
+     * Set index to cellXf.
+     */
+    public function setXfIndex(int $indexValue): self
+    {
+        $this->xfIndex = $indexValue;
+
+        return $this->updateInCollection();
+    }
+
+    /**
+     * Set the formula attributes.
+     *
+     * @return $this
+     */
+    public function setFormulaAttributes(mixed $attributes): self
+    {
+        $this->formulaAttributes = $attributes;
+
+        return $this;
+    }
+
+    /**
+     * Get the formula attributes.
+     */
+    public function getFormulaAttributes(): mixed
+    {
+        return $this->formulaAttributes;
+    }
+
+    /**
+     * Convert to string.
+     */
+    public function __toString(): string
+    {
+        $retVal = $this->value;
+
+        return ($retVal === null || is_scalar($retVal) || $retVal instanceof Stringable) ? ((string) $retVal) : '';
+    }
+
+    public function getIgnoredErrors(): IgnoredErrors
+    {
+        return $this->ignoredErrors;
+    }
+
+    public function isLocked(): bool
+    {
+        $protected = $this->parent?->getParent()?->getProtection()?->getSheet();
+        if ($protected !== true) {
+            return false;
+        }
+        $locked = $this->getStyle()->getProtection()->getLocked();
+
+        return $locked !== Protection::PROTECTION_UNPROTECTED;
+    }
+
+    public function isHiddenOnFormulaBar(): bool
+    {
+        if ($this->getDataType() !== DataType::TYPE_FORMULA) {
+            return false;
+        }
+        $protected = $this->parent?->getParent()?->getProtection()?->getSheet();
+        if ($protected !== true) {
+            return false;
+        }
+        $hidden = $this->getStyle()->getProtection()->getHidden();
+
+        return $hidden !== Protection::PROTECTION_UNPROTECTED;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php
new file mode 100644
index 00000000..ab6258e6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+class CellAddress implements Stringable
+{
+    protected ?Worksheet $worksheet;
+
+    protected string $cellAddress;
+
+    protected string $columnName = '';
+
+    protected int $columnId;
+
+    protected int $rowId;
+
+    public function __construct(string $cellAddress, ?Worksheet $worksheet = null)
+    {
+        $this->cellAddress = str_replace('$', '', $cellAddress);
+        [$this->columnId, $this->rowId, $this->columnName] = Coordinate::indexesFromString($this->cellAddress);
+        $this->worksheet = $worksheet;
+    }
+
+    public function __destruct()
+    {
+        unset($this->worksheet);
+    }
+
+    /**
+     * @phpstan-assert int|numeric-string $columnId
+     * @phpstan-assert int|numeric-string $rowId
+     */
+    private static function validateColumnAndRow(int|string $columnId, int|string $rowId): void
+    {
+        if (!is_numeric($columnId) || $columnId <= 0 || !is_numeric($rowId) || $rowId <= 0) {
+            throw new Exception('Row and Column Ids must be positive integer values');
+        }
+    }
+
+    public static function fromColumnAndRow(int|string $columnId, int|string $rowId, ?Worksheet $worksheet = null): self
+    {
+        self::validateColumnAndRow($columnId, $rowId);
+
+        return new self(Coordinate::stringFromColumnIndex($columnId) . $rowId, $worksheet);
+    }
+
+    public static function fromColumnRowArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        [$columnId, $rowId] = $array;
+
+        return self::fromColumnAndRow($columnId, $rowId, $worksheet);
+    }
+
+    public static function fromCellAddress(string $cellAddress, ?Worksheet $worksheet = null): self
+    {
+        return new self($cellAddress, $worksheet);
+    }
+
+    /**
+     * The returned address string will contain the worksheet name as well, if available,
+     *     (ie. if a Worksheet was provided to the constructor).
+     *     e.g. "'Mark''s Worksheet'!C5".
+     */
+    public function fullCellAddress(): string
+    {
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$this->cellAddress}";
+        }
+
+        return $this->cellAddress;
+    }
+
+    public function worksheet(): ?Worksheet
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * The returned address string will contain just the column/row address,
+     *     (even if a Worksheet was provided to the constructor).
+     *     e.g. "C5".
+     */
+    public function cellAddress(): string
+    {
+        return $this->cellAddress;
+    }
+
+    public function rowId(): int
+    {
+        return $this->rowId;
+    }
+
+    public function columnId(): int
+    {
+        return $this->columnId;
+    }
+
+    public function columnName(): string
+    {
+        return $this->columnName;
+    }
+
+    public function nextRow(int $offset = 1): self
+    {
+        $newRowId = $this->rowId + $offset;
+        if ($newRowId < 1) {
+            $newRowId = 1;
+        }
+
+        return self::fromColumnAndRow($this->columnId, $newRowId);
+    }
+
+    public function previousRow(int $offset = 1): self
+    {
+        return $this->nextRow(0 - $offset);
+    }
+
+    public function nextColumn(int $offset = 1): self
+    {
+        $newColumnId = $this->columnId + $offset;
+        if ($newColumnId < 1) {
+            $newColumnId = 1;
+        }
+
+        return self::fromColumnAndRow($newColumnId, $this->rowId);
+    }
+
+    public function previousColumn(int $offset = 1): self
+    {
+        return $this->nextColumn(0 - $offset);
+    }
+
+    /**
+     * The returned address string will contain the worksheet name as well, if available,
+     *     (ie. if a Worksheet was provided to the constructor).
+     *     e.g. "'Mark''s Worksheet'!C5".
+     */
+    public function __toString(): string
+    {
+        return $this->fullCellAddress();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php
new file mode 100644
index 00000000..677009db
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+/**
+ * @implements AddressRange<CellAddress>
+ */
+class CellRange implements AddressRange, Stringable
+{
+    protected CellAddress $from;
+
+    protected CellAddress $to;
+
+    public function __construct(CellAddress $from, CellAddress $to)
+    {
+        $this->validateFromTo($from, $to);
+    }
+
+    private function validateFromTo(CellAddress $from, CellAddress $to): void
+    {
+        // Identify actual top-left and bottom-right values (in case we've been given top-right and bottom-left)
+        $firstColumn = min($from->columnId(), $to->columnId());
+        $firstRow = min($from->rowId(), $to->rowId());
+        $lastColumn = max($from->columnId(), $to->columnId());
+        $lastRow = max($from->rowId(), $to->rowId());
+
+        $fromWorksheet = $from->worksheet();
+        $toWorksheet = $to->worksheet();
+        $this->validateWorksheets($fromWorksheet, $toWorksheet);
+
+        $this->from = $this->cellAddressWrapper($firstColumn, $firstRow, $fromWorksheet);
+        $this->to = $this->cellAddressWrapper($lastColumn, $lastRow, $toWorksheet);
+    }
+
+    private function validateWorksheets(?Worksheet $fromWorksheet, ?Worksheet $toWorksheet): void
+    {
+        if ($fromWorksheet !== null && $toWorksheet !== null) {
+            // We could simply compare worksheets rather than worksheet titles; but at some point we may introduce
+            //    support for 3d ranges; and at that point we drop this check and let the validation fall through
+            //    to the check for same workbook; but unless we check on titles, this test will also detect if the
+            //    worksheets are in different spreadsheets, and the next check will never execute or throw its
+            //    own exception.
+            if ($fromWorksheet->getTitle() !== $toWorksheet->getTitle()) {
+                throw new Exception('3d Cell Ranges are not supported');
+            } elseif ($fromWorksheet->getParent() !== $toWorksheet->getParent()) {
+                throw new Exception('Worksheets must be in the same spreadsheet');
+            }
+        }
+    }
+
+    private function cellAddressWrapper(int $column, int $row, ?Worksheet $worksheet = null): CellAddress
+    {
+        $cellAddress = Coordinate::stringFromColumnIndex($column) . (string) $row;
+
+        return new class ($cellAddress, $worksheet) extends CellAddress {
+            public function nextRow(int $offset = 1): CellAddress
+            {
+                /** @var CellAddress $result */
+                $result = parent::nextRow($offset);
+                $this->rowId = $result->rowId;
+                $this->cellAddress = $result->cellAddress;
+
+                return $this;
+            }
+
+            public function previousRow(int $offset = 1): CellAddress
+            {
+                /** @var CellAddress $result */
+                $result = parent::previousRow($offset);
+                $this->rowId = $result->rowId;
+                $this->cellAddress = $result->cellAddress;
+
+                return $this;
+            }
+
+            public function nextColumn(int $offset = 1): CellAddress
+            {
+                /** @var CellAddress $result */
+                $result = parent::nextColumn($offset);
+                $this->columnId = $result->columnId;
+                $this->columnName = $result->columnName;
+                $this->cellAddress = $result->cellAddress;
+
+                return $this;
+            }
+
+            public function previousColumn(int $offset = 1): CellAddress
+            {
+                /** @var CellAddress $result */
+                $result = parent::previousColumn($offset);
+                $this->columnId = $result->columnId;
+                $this->columnName = $result->columnName;
+                $this->cellAddress = $result->cellAddress;
+
+                return $this;
+            }
+        };
+    }
+
+    public function from(): CellAddress
+    {
+        // Re-order from/to in case the cell addresses have been modified
+        $this->validateFromTo($this->from, $this->to);
+
+        return $this->from;
+    }
+
+    public function to(): CellAddress
+    {
+        // Re-order from/to in case the cell addresses have been modified
+        $this->validateFromTo($this->from, $this->to);
+
+        return $this->to;
+    }
+
+    public function __toString(): string
+    {
+        // Re-order from/to in case the cell addresses have been modified
+        $this->validateFromTo($this->from, $this->to);
+
+        if ($this->from->cellAddress() === $this->to->cellAddress()) {
+            return "{$this->from->fullCellAddress()}";
+        }
+
+        $fromAddress = $this->from->fullCellAddress();
+        $toAddress = $this->to->cellAddress();
+
+        return "{$fromAddress}:{$toAddress}";
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php
new file mode 100644
index 00000000..7f32a05c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+/**
+ * @implements AddressRange<string>
+ */
+class ColumnRange implements AddressRange, Stringable
+{
+    protected ?Worksheet $worksheet;
+
+    protected int $from;
+
+    protected int $to;
+
+    public function __construct(string $from, ?string $to = null, ?Worksheet $worksheet = null)
+    {
+        $this->validateFromTo(
+            Coordinate::columnIndexFromString($from),
+            Coordinate::columnIndexFromString($to ?? $from)
+        );
+        $this->worksheet = $worksheet;
+    }
+
+    public function __destruct()
+    {
+        $this->worksheet = null;
+    }
+
+    public static function fromColumnIndexes(int $from, int $to, ?Worksheet $worksheet = null): self
+    {
+        return new self(Coordinate::stringFromColumnIndex($from), Coordinate::stringFromColumnIndex($to), $worksheet);
+    }
+
+    /**
+     * @param array<int|string> $array
+     */
+    public static function fromArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        array_walk(
+            $array,
+            function (&$column): void {
+                $column = is_numeric($column) ? Coordinate::stringFromColumnIndex((int) $column) : $column;
+            }
+        );
+        /** @var string $from */
+        /** @var string $to */
+        [$from, $to] = $array;
+
+        return new self($from, $to, $worksheet);
+    }
+
+    private function validateFromTo(int $from, int $to): void
+    {
+        // Identify actual top and bottom values (in case we've been given bottom and top)
+        $this->from = min($from, $to);
+        $this->to = max($from, $to);
+    }
+
+    public function columnCount(): int
+    {
+        return $this->to - $this->from + 1;
+    }
+
+    public function shiftDown(int $offset = 1): self
+    {
+        $newFrom = $this->from + $offset;
+        $newFrom = ($newFrom < 1) ? 1 : $newFrom;
+
+        $newTo = $this->to + $offset;
+        $newTo = ($newTo < 1) ? 1 : $newTo;
+
+        return self::fromColumnIndexes($newFrom, $newTo, $this->worksheet);
+    }
+
+    public function shiftUp(int $offset = 1): self
+    {
+        return $this->shiftDown(0 - $offset);
+    }
+
+    public function from(): string
+    {
+        return Coordinate::stringFromColumnIndex($this->from);
+    }
+
+    public function to(): string
+    {
+        return Coordinate::stringFromColumnIndex($this->to);
+    }
+
+    public function fromIndex(): int
+    {
+        return $this->from;
+    }
+
+    public function toIndex(): int
+    {
+        return $this->to;
+    }
+
+    public function toCellRange(): CellRange
+    {
+        return new CellRange(
+            CellAddress::fromColumnAndRow($this->from, 1, $this->worksheet),
+            CellAddress::fromColumnAndRow($this->to, AddressRange::MAX_ROW)
+        );
+    }
+
+    public function __toString(): string
+    {
+        $from = $this->from();
+        $to = $this->to();
+
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$from}:{$to}";
+        }
+
+        return "{$from}:{$to}";
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php
new file mode 100644
index 00000000..313cc3d9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php
@@ -0,0 +1,716 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+/**
+ * Helper class to manipulate cell coordinates.
+ *
+ * Columns indexes and rows are always based on 1, **not** on 0. This match the behavior
+ * that Excel users are used to, and also match the Excel functions `COLUMN()` and `ROW()`.
+ */
+abstract class Coordinate
+{
+    public const A1_COORDINATE_REGEX = '/^(?<col>\$?[A-Z]{1,3})(?<row>\$?\d{1,7})$/i';
+    public const FULL_REFERENCE_REGEX = '/^(?:(?<worksheet>[^!]*)!)?(?<localReference>(?<firstCoordinate>[$]?[A-Z]{1,3}[$]?\d{1,7})(?:\:(?<secondCoordinate>[$]?[A-Z]{1,3}[$]?\d{1,7}))?)$/i';
+
+    /**
+     * Default range variable constant.
+     *
+     * @var string
+     */
+    const DEFAULT_RANGE = 'A1:A1';
+
+    /**
+     * Convert string coordinate to [0 => int column index, 1 => int row index].
+     *
+     * @param string $cellAddress eg: 'A1'
+     *
+     * @return array{0: string, 1: string} Array containing column and row (indexes 0 and 1)
+     */
+    public static function coordinateFromString(string $cellAddress): array
+    {
+        if (preg_match(self::A1_COORDINATE_REGEX, $cellAddress, $matches)) {
+            return [$matches['col'], $matches['row']];
+        } elseif (self::coordinateIsRange($cellAddress)) {
+            throw new Exception('Cell coordinate string can not be a range of cells');
+        } elseif ($cellAddress == '') {
+            throw new Exception('Cell coordinate can not be zero-length string');
+        }
+
+        throw new Exception('Invalid cell coordinate ' . $cellAddress);
+    }
+
+    /**
+     * Convert string coordinate to [0 => int column index, 1 => int row index, 2 => string column string].
+     *
+     * @param string $coordinates eg: 'A1', '$B$12'
+     *
+     * @return array{0: int, 1: int, 2: string} Array containing column and row index, and column string
+     */
+    public static function indexesFromString(string $coordinates): array
+    {
+        [$column, $row] = self::coordinateFromString($coordinates);
+        $column = ltrim($column, '$');
+
+        return [
+            self::columnIndexFromString($column),
+            (int) ltrim($row, '$'),
+            $column,
+        ];
+    }
+
+    /**
+     * Checks if a Cell Address represents a range of cells.
+     *
+     * @param string $cellAddress eg: 'A1' or 'A1:A2' or 'A1:A2,C1:C2'
+     *
+     * @return bool Whether the coordinate represents a range of cells
+     */
+    public static function coordinateIsRange(string $cellAddress): bool
+    {
+        return str_contains($cellAddress, ':') || str_contains($cellAddress, ',');
+    }
+
+    /**
+     * Make string row, column or cell coordinate absolute.
+     *
+     * @param int|string $cellAddress e.g. 'A' or '1' or 'A1'
+     *                    Note that this value can be a row or column reference as well as a cell reference
+     *
+     * @return string Absolute coordinate        e.g. '$A' or '$1' or '$A$1'
+     */
+    public static function absoluteReference(int|string $cellAddress): string
+    {
+        $cellAddress = (string) $cellAddress;
+        if (self::coordinateIsRange($cellAddress)) {
+            throw new Exception('Cell coordinate string can not be a range of cells');
+        }
+
+        // Split out any worksheet name from the reference
+        [$worksheet, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+        if ($worksheet > '') {
+            $worksheet .= '!';
+        }
+
+        // Create absolute coordinate
+        $cellAddress = "$cellAddress";
+        if (ctype_digit($cellAddress)) {
+            return $worksheet . '$' . $cellAddress;
+        } elseif (ctype_alpha($cellAddress)) {
+            return $worksheet . '$' . strtoupper($cellAddress);
+        }
+
+        return $worksheet . self::absoluteCoordinate($cellAddress);
+    }
+
+    /**
+     * Make string coordinate absolute.
+     *
+     * @param string $cellAddress e.g. 'A1'
+     *
+     * @return string Absolute coordinate        e.g. '$A$1'
+     */
+    public static function absoluteCoordinate(string $cellAddress): string
+    {
+        if (self::coordinateIsRange($cellAddress)) {
+            throw new Exception('Cell coordinate string can not be a range of cells');
+        }
+
+        // Split out any worksheet name from the coordinate
+        [$worksheet, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
+        if ($worksheet > '') {
+            $worksheet .= '!';
+        }
+
+        // Create absolute coordinate
+        [$column, $row] = self::coordinateFromString($cellAddress ?? 'A1');
+        $column = ltrim($column, '$');
+        $row = ltrim($row, '$');
+
+        return $worksheet . '$' . $column . '$' . $row;
+    }
+
+    /**
+     * Split range into coordinate strings.
+     *
+     * @param string $range e.g. 'B4:D9' or 'B4:D9,H2:O11' or 'B4'
+     *
+     * @return array Array containing one or more arrays containing one or two coordinate strings
+     *                                e.g. ['B4','D9'] or [['B4','D9'], ['H2','O11']]
+     *                                        or ['B4']
+     */
+    public static function splitRange(string $range): array
+    {
+        // Ensure $pRange is a valid range
+        if (empty($range)) {
+            $range = self::DEFAULT_RANGE;
+        }
+
+        $exploded = explode(',', $range);
+        $outArray = [];
+        foreach ($exploded as $value) {
+            $outArray[] = explode(':', $value);
+        }
+
+        return $outArray;
+    }
+
+    /**
+     * Build range from coordinate strings.
+     *
+     * @param array $range Array containing one or more arrays containing one or two coordinate strings
+     *
+     * @return string String representation of $pRange
+     */
+    public static function buildRange(array $range): string
+    {
+        // Verify range
+        if (empty($range) || !is_array($range[0])) {
+            throw new Exception('Range does not contain any information');
+        }
+
+        // Build range
+        $counter = count($range);
+        for ($i = 0; $i < $counter; ++$i) {
+            $range[$i] = implode(':', $range[$i]);
+        }
+
+        return implode(',', $range);
+    }
+
+    /**
+     * Calculate range boundaries.
+     *
+     * @param string $range Cell range, Single Cell, Row/Column Range (e.g. A1:A1, B2, B:C, 2:3)
+     *
+     * @return array Range coordinates [Start Cell, End Cell]
+     *                    where Start Cell and End Cell are arrays (Column Number, Row Number)
+     */
+    public static function rangeBoundaries(string $range): array
+    {
+        // Ensure $pRange is a valid range
+        if (empty($range)) {
+            $range = self::DEFAULT_RANGE;
+        }
+
+        // Uppercase coordinate
+        $range = strtoupper($range);
+
+        // Extract range
+        if (!str_contains($range, ':')) {
+            $rangeA = $rangeB = $range;
+        } else {
+            [$rangeA, $rangeB] = explode(':', $range);
+        }
+
+        if (is_numeric($rangeA) && is_numeric($rangeB)) {
+            $rangeA = 'A' . $rangeA;
+            $rangeB = AddressRange::MAX_COLUMN . $rangeB;
+        }
+
+        if (ctype_alpha($rangeA) && ctype_alpha($rangeB)) {
+            $rangeA = $rangeA . '1';
+            $rangeB = $rangeB . AddressRange::MAX_ROW;
+        }
+
+        // Calculate range outer borders
+        $rangeStart = self::coordinateFromString($rangeA);
+        $rangeEnd = self::coordinateFromString($rangeB);
+
+        // Translate column into index
+        $rangeStart[0] = self::columnIndexFromString($rangeStart[0]);
+        $rangeEnd[0] = self::columnIndexFromString($rangeEnd[0]);
+
+        return [$rangeStart, $rangeEnd];
+    }
+
+    /**
+     * Calculate range dimension.
+     *
+     * @param string $range Cell range, Single Cell, Row/Column Range (e.g. A1:A1, B2, B:C, 2:3)
+     *
+     * @return array Range dimension (width, height)
+     */
+    public static function rangeDimension(string $range): array
+    {
+        // Calculate range outer borders
+        [$rangeStart, $rangeEnd] = self::rangeBoundaries($range);
+
+        return [($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1)];
+    }
+
+    /**
+     * Calculate range boundaries.
+     *
+     * @param string $range Cell range, Single Cell, Row/Column Range (e.g. A1:A1, B2, B:C, 2:3)
+     *
+     * @return array Range coordinates [Start Cell, End Cell]
+     *                    where Start Cell and End Cell are arrays [Column ID, Row Number]
+     */
+    public static function getRangeBoundaries(string $range): array
+    {
+        [$rangeA, $rangeB] = self::rangeBoundaries($range);
+
+        return [
+            [self::stringFromColumnIndex($rangeA[0]), $rangeA[1]],
+            [self::stringFromColumnIndex($rangeB[0]), $rangeB[1]],
+        ];
+    }
+
+    /**
+     * Check if cell or range reference is valid and return an array with type of reference (cell or range), worksheet (if it was given)
+     * and the coordinate or the first coordinate and second coordinate if it is a range.
+     *
+     * @param string $reference Coordinate or Range (e.g. A1:A1, B2, B:C, 2:3)
+     *
+     * @return array reference data
+     */
+    private static function validateReferenceAndGetData($reference): array
+    {
+        $data = [];
+        preg_match(self::FULL_REFERENCE_REGEX, $reference, $matches);
+        if (count($matches) === 0) {
+            return ['type' => 'invalid'];
+        }
+
+        if (isset($matches['secondCoordinate'])) {
+            $data['type'] = 'range';
+            $data['firstCoordinate'] = str_replace('$', '', $matches['firstCoordinate']);
+            $data['secondCoordinate'] = str_replace('$', '', $matches['secondCoordinate']);
+        } else {
+            $data['type'] = 'coordinate';
+            $data['coordinate'] = str_replace('$', '', $matches['firstCoordinate']);
+        }
+
+        $worksheet = $matches['worksheet'];
+        if ($worksheet !== '') {
+            if (substr($worksheet, 0, 1) === "'" && substr($worksheet, -1, 1) === "'") {
+                $worksheet = substr($worksheet, 1, -1);
+            }
+            $data['worksheet'] = strtolower($worksheet);
+        }
+        $data['localReference'] = str_replace('$', '', $matches['localReference']);
+
+        return $data;
+    }
+
+    /**
+     * Check if coordinate is inside a range.
+     *
+     * @param string $range Cell range, Single Cell, Row/Column Range (e.g. A1:A1, B2, B:C, 2:3)
+     * @param string $coordinate Cell coordinate (e.g. A1)
+     *
+     * @return bool true if coordinate is inside range
+     */
+    public static function coordinateIsInsideRange(string $range, string $coordinate): bool
+    {
+        $rangeData = self::validateReferenceAndGetData($range);
+        if ($rangeData['type'] === 'invalid') {
+            throw new Exception('First argument needs to be a range');
+        }
+
+        $coordinateData = self::validateReferenceAndGetData($coordinate);
+        if ($coordinateData['type'] === 'invalid') {
+            throw new Exception('Second argument needs to be a single coordinate');
+        }
+
+        if (isset($coordinateData['worksheet']) && !isset($rangeData['worksheet'])) {
+            return false;
+        }
+        if (!isset($coordinateData['worksheet']) && isset($rangeData['worksheet'])) {
+            return false;
+        }
+
+        if (isset($coordinateData['worksheet'], $rangeData['worksheet'])) {
+            if ($coordinateData['worksheet'] !== $rangeData['worksheet']) {
+                return false;
+            }
+        }
+
+        $boundaries = self::rangeBoundaries($rangeData['localReference']);
+        $coordinates = self::indexesFromString($coordinateData['localReference']);
+
+        $columnIsInside = $boundaries[0][0] <= $coordinates[0] && $coordinates[0] <= $boundaries[1][0];
+        if (!$columnIsInside) {
+            return false;
+        }
+        $rowIsInside = $boundaries[0][1] <= $coordinates[1] && $coordinates[1] <= $boundaries[1][1];
+        if (!$rowIsInside) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Column index from string.
+     *
+     * @param ?string $columnAddress eg 'A'
+     *
+     * @return int Column index (A = 1)
+     */
+    public static function columnIndexFromString(?string $columnAddress): int
+    {
+        //    Using a lookup cache adds a slight memory overhead, but boosts speed
+        //    caching using a static within the method is faster than a class static,
+        //        though it's additional memory overhead
+        static $indexCache = [];
+        $columnAddress = $columnAddress ?? '';
+
+        if (isset($indexCache[$columnAddress])) {
+            return $indexCache[$columnAddress];
+        }
+        //    It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array
+        //        rather than use ord() and make it case insensitive to get rid of the strtoupper() as well.
+        //        Because it's a static, there's no significant memory overhead either.
+        static $columnLookup = [
+            'A' => 1, 'B' => 2, 'C' => 3, 'D' => 4, 'E' => 5, 'F' => 6, 'G' => 7, 'H' => 8, 'I' => 9, 'J' => 10,
+            'K' => 11, 'L' => 12, 'M' => 13, 'N' => 14, 'O' => 15, 'P' => 16, 'Q' => 17, 'R' => 18, 'S' => 19,
+            'T' => 20, 'U' => 21, 'V' => 22, 'W' => 23, 'X' => 24, 'Y' => 25, 'Z' => 26,
+            'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5, 'f' => 6, 'g' => 7, 'h' => 8, 'i' => 9, 'j' => 10,
+            'k' => 11, 'l' => 12, 'm' => 13, 'n' => 14, 'o' => 15, 'p' => 16, 'q' => 17, 'r' => 18, 's' => 19,
+            't' => 20, 'u' => 21, 'v' => 22, 'w' => 23, 'x' => 24, 'y' => 25, 'z' => 26,
+        ];
+
+        //    We also use the language construct isset() rather than the more costly strlen() function to match the
+        //       length of $columnAddress for improved performance
+        if (isset($columnAddress[0])) {
+            if (!isset($columnAddress[1])) {
+                $indexCache[$columnAddress] = $columnLookup[$columnAddress];
+
+                return $indexCache[$columnAddress];
+            } elseif (!isset($columnAddress[2])) {
+                $indexCache[$columnAddress] = $columnLookup[$columnAddress[0]] * 26
+                    + $columnLookup[$columnAddress[1]];
+
+                return $indexCache[$columnAddress];
+            } elseif (!isset($columnAddress[3])) {
+                $indexCache[$columnAddress] = $columnLookup[$columnAddress[0]] * 676
+                    + $columnLookup[$columnAddress[1]] * 26
+                    + $columnLookup[$columnAddress[2]];
+
+                return $indexCache[$columnAddress];
+            }
+        }
+
+        throw new Exception(
+            'Column string index can not be ' . ((isset($columnAddress[0])) ? 'longer than 3 characters' : 'empty')
+        );
+    }
+
+    /**
+     * String from column index.
+     *
+     * @param int|numeric-string $columnIndex Column index (A = 1)
+     */
+    public static function stringFromColumnIndex(int|string $columnIndex): string
+    {
+        static $indexCache = [];
+        static $lookupCache = ' ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+        if (!isset($indexCache[$columnIndex])) {
+            $indexValue = $columnIndex;
+            $base26 = '';
+            do {
+                $characterValue = ($indexValue % 26) ?: 26;
+                $indexValue = ($indexValue - $characterValue) / 26;
+                $base26 = $lookupCache[$characterValue] . $base26;
+            } while ($indexValue > 0);
+            $indexCache[$columnIndex] = $base26;
+        }
+
+        return $indexCache[$columnIndex];
+    }
+
+    /**
+     * Extract all cell references in range, which may be comprised of multiple cell ranges.
+     *
+     * @param string $cellRange Range: e.g. 'A1' or 'A1:C10' or 'A1:E10,A20:E25' or 'A1:E5 C3:G7' or 'A1:C1,A3:C3 B1:C3'
+     *
+     * @return array Array containing single cell references
+     */
+    public static function extractAllCellReferencesInRange(string $cellRange): array
+    {
+        if (substr_count($cellRange, '!') > 1) {
+            throw new Exception('3-D Range References are not supported');
+        }
+
+        [$worksheet, $cellRange] = Worksheet::extractSheetTitle($cellRange, true);
+        $quoted = '';
+        if ($worksheet) {
+            $quoted = Worksheet::nameRequiresQuotes($worksheet) ? "'" : '';
+            if (str_starts_with($worksheet, "'") && str_ends_with($worksheet, "'")) {
+                $worksheet = substr($worksheet, 1, -1);
+            }
+            $worksheet = str_replace("'", "''", $worksheet);
+        }
+        [$ranges, $operators] = self::getCellBlocksFromRangeString($cellRange ?? 'A1');
+
+        $cells = [];
+        foreach ($ranges as $range) {
+            $cells[] = self::getReferencesForCellBlock($range);
+        }
+
+        $cells = self::processRangeSetOperators($operators, $cells);
+
+        if (empty($cells)) {
+            return [];
+        }
+
+        $cellList = array_merge(...$cells);
+
+        return array_map(
+            fn ($cellAddress) => ($worksheet !== '') ? "{$quoted}{$worksheet}{$quoted}!{$cellAddress}" : $cellAddress,
+            self::sortCellReferenceArray($cellList)
+        );
+    }
+
+    private static function processRangeSetOperators(array $operators, array $cells): array
+    {
+        $operatorCount = count($operators);
+        for ($offset = 0; $offset < $operatorCount; ++$offset) {
+            $operator = $operators[$offset];
+            if ($operator !== ' ') {
+                continue;
+            }
+
+            $cells[$offset] = array_intersect($cells[$offset], $cells[$offset + 1]);
+            unset($operators[$offset], $cells[$offset + 1]);
+            $operators = array_values($operators);
+            $cells = array_values($cells);
+            --$offset;
+            --$operatorCount;
+        }
+
+        return $cells;
+    }
+
+    private static function sortCellReferenceArray(array $cellList): array
+    {
+        //    Sort the result by column and row
+        $sortKeys = [];
+        foreach ($cellList as $coordinate) {
+            $column = '';
+            $row = 0;
+            sscanf($coordinate, '%[A-Z]%d', $column, $row);
+            $key = (--$row * 16384) + self::columnIndexFromString((string) $column);
+            $sortKeys[$key] = $coordinate;
+        }
+        ksort($sortKeys);
+
+        return array_values($sortKeys);
+    }
+
+    /**
+     * Get all cell references applying union and intersection.
+     *
+     * @param string $cellBlock A cell range e.g. A1:B5,D1:E5 B2:C4
+     *
+     * @return string A string without intersection operator.
+     *   If there was no intersection to begin with, return original argument.
+     *   Otherwise, return cells and/or cell ranges in that range separated by comma.
+     */
+    public static function resolveUnionAndIntersection(string $cellBlock, string $implodeCharacter = ','): string
+    {
+        $cellBlock = preg_replace('/  +/', ' ', trim($cellBlock)) ?? $cellBlock;
+        $cellBlock = preg_replace('/ ,/', ',', $cellBlock) ?? $cellBlock;
+        $cellBlock = preg_replace('/, /', ',', $cellBlock) ?? $cellBlock;
+        $array1 = [];
+        $blocks = explode(',', $cellBlock);
+        foreach ($blocks as $block) {
+            $block0 = explode(' ', $block);
+            if (count($block0) === 1) {
+                $array1 = array_merge($array1, $block0);
+            } else {
+                $blockIdx = -1;
+                $array2 = [];
+                foreach ($block0 as $block00) {
+                    ++$blockIdx;
+                    if ($blockIdx === 0) {
+                        $array2 = self::getReferencesForCellBlock($block00);
+                    } else {
+                        $array2 = array_intersect($array2, self::getReferencesForCellBlock($block00));
+                    }
+                }
+                $array1 = array_merge($array1, $array2);
+            }
+        }
+
+        return implode($implodeCharacter, $array1);
+    }
+
+    /**
+     * Get all cell references for an individual cell block.
+     *
+     * @param string $cellBlock A cell range e.g. A4:B5
+     *
+     * @return array All individual cells in that range
+     */
+    private static function getReferencesForCellBlock(string $cellBlock): array
+    {
+        $returnValue = [];
+
+        // Single cell?
+        if (!self::coordinateIsRange($cellBlock)) {
+            return (array) $cellBlock;
+        }
+
+        // Range...
+        $ranges = self::splitRange($cellBlock);
+        foreach ($ranges as $range) {
+            // Single cell?
+            if (!isset($range[1])) {
+                $returnValue[] = $range[0];
+
+                continue;
+            }
+
+            // Range...
+            [$rangeStart, $rangeEnd] = $range;
+            [$startColumn, $startRow] = self::coordinateFromString($rangeStart);
+            [$endColumn, $endRow] = self::coordinateFromString($rangeEnd);
+            $startColumnIndex = self::columnIndexFromString($startColumn);
+            $endColumnIndex = self::columnIndexFromString($endColumn);
+            ++$endColumnIndex;
+
+            // Current data
+            $currentColumnIndex = $startColumnIndex;
+            $currentRow = $startRow;
+
+            self::validateRange($cellBlock, $startColumnIndex, $endColumnIndex, (int) $currentRow, (int) $endRow);
+
+            // Loop cells
+            while ($currentColumnIndex < $endColumnIndex) {
+                while ($currentRow <= $endRow) {
+                    $returnValue[] = self::stringFromColumnIndex($currentColumnIndex) . $currentRow;
+                    ++$currentRow;
+                }
+                ++$currentColumnIndex;
+                $currentRow = $startRow;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Convert an associative array of single cell coordinates to values to an associative array
+     * of cell ranges to values.  Only adjacent cell coordinates with the same
+     * value will be merged.  If the value is an object, it must implement the method getHashCode().
+     *
+     * For example, this function converts:
+     *
+     *    [ 'A1' => 'x', 'A2' => 'x', 'A3' => 'x', 'A4' => 'y' ]
+     *
+     * to:
+     *
+     *    [ 'A1:A3' => 'x', 'A4' => 'y' ]
+     *
+     * @param array $coordinateCollection associative array mapping coordinates to values
+     *
+     * @return array associative array mapping coordinate ranges to valuea
+     */
+    public static function mergeRangesInCollection(array $coordinateCollection): array
+    {
+        $hashedValues = [];
+        $mergedCoordCollection = [];
+
+        foreach ($coordinateCollection as $coord => $value) {
+            if (self::coordinateIsRange($coord)) {
+                $mergedCoordCollection[$coord] = $value;
+
+                continue;
+            }
+
+            [$column, $row] = self::coordinateFromString($coord);
+            $row = (int) (ltrim($row, '$'));
+            $hashCode = $column . '-' . ((is_object($value) && method_exists($value, 'getHashCode')) ? $value->getHashCode() : $value);
+
+            if (!isset($hashedValues[$hashCode])) {
+                $hashedValues[$hashCode] = (object) [
+                    'value' => $value,
+                    'col' => $column,
+                    'rows' => [$row],
+                ];
+            } else {
+                $hashedValues[$hashCode]->rows[] = $row;
+            }
+        }
+
+        ksort($hashedValues);
+
+        foreach ($hashedValues as $hashedValue) {
+            sort($hashedValue->rows);
+            $rowStart = null;
+            $rowEnd = null;
+            $ranges = [];
+
+            foreach ($hashedValue->rows as $row) {
+                if ($rowStart === null) {
+                    $rowStart = $row;
+                    $rowEnd = $row;
+                } elseif ($rowEnd === $row - 1) {
+                    $rowEnd = $row;
+                } else {
+                    if ($rowStart == $rowEnd) {
+                        $ranges[] = $hashedValue->col . $rowStart;
+                    } else {
+                        $ranges[] = $hashedValue->col . $rowStart . ':' . $hashedValue->col . $rowEnd;
+                    }
+
+                    $rowStart = $row;
+                    $rowEnd = $row;
+                }
+            }
+
+            if ($rowStart !== null) {
+                if ($rowStart == $rowEnd) {
+                    $ranges[] = $hashedValue->col . $rowStart;
+                } else {
+                    $ranges[] = $hashedValue->col . $rowStart . ':' . $hashedValue->col . $rowEnd;
+                }
+            }
+
+            foreach ($ranges as $range) {
+                $mergedCoordCollection[$range] = $hashedValue->value;
+            }
+        }
+
+        return $mergedCoordCollection;
+    }
+
+    /**
+     * Get the individual cell blocks from a range string, removing any $ characters.
+     *      then splitting by operators and returning an array with ranges and operators.
+     *
+     * @return array[]
+     */
+    private static function getCellBlocksFromRangeString(string $rangeString): array
+    {
+        $rangeString = str_replace('$', '', strtoupper($rangeString));
+
+        // split range sets on intersection (space) or union (,) operators
+        $tokens = preg_split('/([ ,])/', $rangeString, -1, PREG_SPLIT_DELIM_CAPTURE) ?: [];
+        $split = array_chunk($tokens, 2);
+        $ranges = array_column($split, 0);
+        $operators = array_column($split, 1);
+
+        return [$ranges, $operators];
+    }
+
+    /**
+     * Check that the given range is valid, i.e. that the start column and row are not greater than the end column and
+     * row.
+     *
+     * @param string $cellBlock The original range, for displaying a meaningful error message
+     */
+    private static function validateRange(string $cellBlock, int $startColumnIndex, int $endColumnIndex, int $currentRow, int $endRow): void
+    {
+        if ($startColumnIndex >= $endColumnIndex || $currentRow > $endRow) {
+            throw new Exception('Invalid range: "' . $cellBlock . '"');
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php
new file mode 100644
index 00000000..a213725c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use Stringable;
+
+class DataType
+{
+    // Data types
+    const TYPE_STRING2 = 'str';
+    const TYPE_STRING = 's';
+    const TYPE_FORMULA = 'f';
+    const TYPE_NUMERIC = 'n';
+    const TYPE_BOOL = 'b';
+    const TYPE_NULL = 'null';
+    const TYPE_INLINE = 'inlineStr';
+    const TYPE_ERROR = 'e';
+    const TYPE_ISO_DATE = 'd';
+
+    /**
+     * List of error codes.
+     *
+     * @var array<string, int>
+     */
+    private static array $errorCodes = [
+        '#NULL!' => 0,
+        '#DIV/0!' => 1,
+        '#VALUE!' => 2,
+        '#REF!' => 3,
+        '#NAME?' => 4,
+        '#NUM!' => 5,
+        '#N/A' => 6,
+        '#CALC!' => 7,
+    ];
+
+    public const MAX_STRING_LENGTH = 32767;
+
+    /**
+     * Get list of error codes.
+     *
+     * @return array<string, int>
+     */
+    public static function getErrorCodes(): array
+    {
+        return self::$errorCodes;
+    }
+
+    /**
+     * Check a string that it satisfies Excel requirements.
+     *
+     * @param null|RichText|string $textValue Value to sanitize to an Excel string
+     *
+     * @return RichText|string Sanitized value
+     */
+    public static function checkString(null|RichText|string $textValue): RichText|string
+    {
+        if ($textValue instanceof RichText) {
+            // TODO: Sanitize Rich-Text string (max. character count is 32,767)
+            return $textValue;
+        }
+
+        // string must never be longer than 32,767 characters, truncate if necessary
+        $textValue = StringHelper::substring((string) $textValue, 0, self::MAX_STRING_LENGTH);
+
+        // we require that newline is represented as "\n" in core, not as "\r\n" or "\r"
+        $textValue = str_replace(["\r\n", "\r"], "\n", $textValue);
+
+        return $textValue;
+    }
+
+    /**
+     * Check a value that it is a valid error code.
+     *
+     * @param mixed $value Value to sanitize to an Excel error code
+     *
+     * @return string Sanitized value
+     */
+    public static function checkErrorCode(mixed $value): string
+    {
+        $value = (is_scalar($value) || $value instanceof Stringable) ? ((string) $value) : '#NULL!';
+
+        if (!isset(self::$errorCodes[$value])) {
+            $value = '#NULL!';
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php
new file mode 100644
index 00000000..9a5f44e3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php
@@ -0,0 +1,421 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+class DataValidation
+{
+    // Data validation types
+    const TYPE_NONE = 'none';
+    const TYPE_CUSTOM = 'custom';
+    const TYPE_DATE = 'date';
+    const TYPE_DECIMAL = 'decimal';
+    const TYPE_LIST = 'list';
+    const TYPE_TEXTLENGTH = 'textLength';
+    const TYPE_TIME = 'time';
+    const TYPE_WHOLE = 'whole';
+
+    // Data validation error styles
+    const STYLE_STOP = 'stop';
+    const STYLE_WARNING = 'warning';
+    const STYLE_INFORMATION = 'information';
+
+    // Data validation operators
+    const OPERATOR_BETWEEN = 'between';
+    const OPERATOR_EQUAL = 'equal';
+    const OPERATOR_GREATERTHAN = 'greaterThan';
+    const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual';
+    const OPERATOR_LESSTHAN = 'lessThan';
+    const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual';
+    const OPERATOR_NOTBETWEEN = 'notBetween';
+    const OPERATOR_NOTEQUAL = 'notEqual';
+    private const DEFAULT_OPERATOR = self::OPERATOR_BETWEEN;
+
+    /**
+     * Formula 1.
+     */
+    private string $formula1 = '';
+
+    /**
+     * Formula 2.
+     */
+    private string $formula2 = '';
+
+    /**
+     * Type.
+     */
+    private string $type = self::TYPE_NONE;
+
+    /**
+     * Error style.
+     */
+    private string $errorStyle = self::STYLE_STOP;
+
+    /**
+     * Operator.
+     */
+    private string $operator = self::DEFAULT_OPERATOR;
+
+    /**
+     * Allow Blank.
+     */
+    private bool $allowBlank = false;
+
+    /**
+     * Show DropDown.
+     */
+    private bool $showDropDown = false;
+
+    /**
+     * Show InputMessage.
+     */
+    private bool $showInputMessage = false;
+
+    /**
+     * Show ErrorMessage.
+     */
+    private bool $showErrorMessage = false;
+
+    /**
+     * Error title.
+     */
+    private string $errorTitle = '';
+
+    /**
+     * Error.
+     */
+    private string $error = '';
+
+    /**
+     * Prompt title.
+     */
+    private string $promptTitle = '';
+
+    /**
+     * Prompt.
+     */
+    private string $prompt = '';
+
+    /**
+     * Create a new DataValidation.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get Formula 1.
+     */
+    public function getFormula1(): string
+    {
+        return $this->formula1;
+    }
+
+    /**
+     * Set Formula 1.
+     *
+     * @return $this
+     */
+    public function setFormula1(string $formula): static
+    {
+        $this->formula1 = $formula;
+
+        return $this;
+    }
+
+    /**
+     * Get Formula 2.
+     */
+    public function getFormula2(): string
+    {
+        return $this->formula2;
+    }
+
+    /**
+     * Set Formula 2.
+     *
+     * @return $this
+     */
+    public function setFormula2(string $formula): static
+    {
+        $this->formula2 = $formula;
+
+        return $this;
+    }
+
+    /**
+     * Get Type.
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Set Type.
+     *
+     * @return $this
+     */
+    public function setType(string $type): static
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Get Error style.
+     */
+    public function getErrorStyle(): string
+    {
+        return $this->errorStyle;
+    }
+
+    /**
+     * Set Error style.
+     *
+     * @param string $errorStyle see self::STYLE_*
+     *
+     * @return $this
+     */
+    public function setErrorStyle(string $errorStyle): static
+    {
+        $this->errorStyle = $errorStyle;
+
+        return $this;
+    }
+
+    /**
+     * Get Operator.
+     */
+    public function getOperator(): string
+    {
+        return $this->operator;
+    }
+
+    /**
+     * Set Operator.
+     *
+     * @return $this
+     */
+    public function setOperator(string $operator): static
+    {
+        $this->operator = ($operator === '') ? self::DEFAULT_OPERATOR : $operator;
+
+        return $this;
+    }
+
+    /**
+     * Get Allow Blank.
+     */
+    public function getAllowBlank(): bool
+    {
+        return $this->allowBlank;
+    }
+
+    /**
+     * Set Allow Blank.
+     *
+     * @return $this
+     */
+    public function setAllowBlank(bool $allowBlank): static
+    {
+        $this->allowBlank = $allowBlank;
+
+        return $this;
+    }
+
+    /**
+     * Get Show DropDown.
+     */
+    public function getShowDropDown(): bool
+    {
+        return $this->showDropDown;
+    }
+
+    /**
+     * Set Show DropDown.
+     *
+     * @return $this
+     */
+    public function setShowDropDown(bool $showDropDown): static
+    {
+        $this->showDropDown = $showDropDown;
+
+        return $this;
+    }
+
+    /**
+     * Get Show InputMessage.
+     */
+    public function getShowInputMessage(): bool
+    {
+        return $this->showInputMessage;
+    }
+
+    /**
+     * Set Show InputMessage.
+     *
+     * @return $this
+     */
+    public function setShowInputMessage(bool $showInputMessage): static
+    {
+        $this->showInputMessage = $showInputMessage;
+
+        return $this;
+    }
+
+    /**
+     * Get Show ErrorMessage.
+     */
+    public function getShowErrorMessage(): bool
+    {
+        return $this->showErrorMessage;
+    }
+
+    /**
+     * Set Show ErrorMessage.
+     *
+     * @return $this
+     */
+    public function setShowErrorMessage(bool $showErrorMessage): static
+    {
+        $this->showErrorMessage = $showErrorMessage;
+
+        return $this;
+    }
+
+    /**
+     * Get Error title.
+     */
+    public function getErrorTitle(): string
+    {
+        return $this->errorTitle;
+    }
+
+    /**
+     * Set Error title.
+     *
+     * @return $this
+     */
+    public function setErrorTitle(string $errorTitle): static
+    {
+        $this->errorTitle = $errorTitle;
+
+        return $this;
+    }
+
+    /**
+     * Get Error.
+     */
+    public function getError(): string
+    {
+        return $this->error;
+    }
+
+    /**
+     * Set Error.
+     *
+     * @return $this
+     */
+    public function setError(string $error): static
+    {
+        $this->error = $error;
+
+        return $this;
+    }
+
+    /**
+     * Get Prompt title.
+     */
+    public function getPromptTitle(): string
+    {
+        return $this->promptTitle;
+    }
+
+    /**
+     * Set Prompt title.
+     *
+     * @return $this
+     */
+    public function setPromptTitle(string $promptTitle): static
+    {
+        $this->promptTitle = $promptTitle;
+
+        return $this;
+    }
+
+    /**
+     * Get Prompt.
+     */
+    public function getPrompt(): string
+    {
+        return $this->prompt;
+    }
+
+    /**
+     * Set Prompt.
+     *
+     * @return $this
+     */
+    public function setPrompt(string $prompt): static
+    {
+        $this->prompt = $prompt;
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->formula1
+            . $this->formula2
+            . $this->type
+            . $this->errorStyle
+            . $this->operator
+            . ($this->allowBlank ? 't' : 'f')
+            . ($this->showDropDown ? 't' : 'f')
+            . ($this->showInputMessage ? 't' : 'f')
+            . ($this->showErrorMessage ? 't' : 'f')
+            . $this->errorTitle
+            . $this->error
+            . $this->promptTitle
+            . $this->prompt
+            . $this->sqref
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+
+    private ?string $sqref = null;
+
+    public function getSqref(): ?string
+    {
+        return $this->sqref;
+    }
+
+    public function setSqref(?string $str): self
+    {
+        $this->sqref = $str;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php
new file mode 100644
index 00000000..63ef8999
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+/**
+ * Validate a cell value according to its validation rules.
+ */
+class DataValidator
+{
+    /**
+     * Does this cell contain valid value?
+     *
+     * @param Cell $cell Cell to check the value
+     */
+    public function isValid(Cell $cell): bool
+    {
+        if (!$cell->hasDataValidation() || $cell->getDataValidation()->getType() === DataValidation::TYPE_NONE) {
+            return true;
+        }
+
+        $cellValue = $cell->getValue();
+        $dataValidation = $cell->getDataValidation();
+
+        if (!$dataValidation->getAllowBlank() && ($cellValue === null || $cellValue === '')) {
+            return false;
+        }
+
+        $returnValue = false;
+        $type = $dataValidation->getType();
+        if ($type === DataValidation::TYPE_LIST) {
+            $returnValue = $this->isValueInList($cell);
+        } elseif ($type === DataValidation::TYPE_WHOLE) {
+            if (!is_numeric($cellValue) || fmod((float) $cellValue, 1) != 0) {
+                $returnValue = false;
+            } else {
+                $returnValue = $this->numericOperator($dataValidation, (int) $cellValue);
+            }
+        } elseif ($type === DataValidation::TYPE_DECIMAL || $type === DataValidation::TYPE_DATE || $type === DataValidation::TYPE_TIME) {
+            if (!is_numeric($cellValue)) {
+                $returnValue = false;
+            } else {
+                $returnValue = $this->numericOperator($dataValidation, (float) $cellValue);
+            }
+        } elseif ($type === DataValidation::TYPE_TEXTLENGTH) {
+            $returnValue = $this->numericOperator($dataValidation, mb_strlen($cell->getValueString()));
+        }
+
+        return $returnValue;
+    }
+
+    private function numericOperator(DataValidation $dataValidation, int|float $cellValue): bool
+    {
+        $operator = $dataValidation->getOperator();
+        $formula1 = $dataValidation->getFormula1();
+        $formula2 = $dataValidation->getFormula2();
+        $returnValue = false;
+        if ($operator === DataValidation::OPERATOR_BETWEEN) {
+            $returnValue = $cellValue >= $formula1 && $cellValue <= $formula2;
+        } elseif ($operator === DataValidation::OPERATOR_NOTBETWEEN) {
+            $returnValue = $cellValue < $formula1 || $cellValue > $formula2;
+        } elseif ($operator === DataValidation::OPERATOR_EQUAL) {
+            $returnValue = $cellValue == $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_NOTEQUAL) {
+            $returnValue = $cellValue != $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_LESSTHAN) {
+            $returnValue = $cellValue < $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_LESSTHANOREQUAL) {
+            $returnValue = $cellValue <= $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_GREATERTHAN) {
+            $returnValue = $cellValue > $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_GREATERTHANOREQUAL) {
+            $returnValue = $cellValue >= $formula1;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Does this cell contain valid value, based on list?
+     *
+     * @param Cell $cell Cell to check the value
+     */
+    private function isValueInList(Cell $cell): bool
+    {
+        $cellValueString = $cell->getValueString();
+        $dataValidation = $cell->getDataValidation();
+
+        $formula1 = $dataValidation->getFormula1();
+        if (!empty($formula1)) {
+            // inline values list
+            if ($formula1[0] === '"') {
+                return in_array(strtolower($cellValueString), explode(',', strtolower(trim($formula1, '"'))), true);
+            } elseif (strpos($formula1, ':') > 0) {
+                // values list cells
+                $matchFormula = '=MATCH(' . $cell->getCoordinate() . ', ' . $formula1 . ', 0)';
+                $calculation = Calculation::getInstance($cell->getWorksheet()->getParent());
+
+                try {
+                    $result = $calculation->calculateFormula($matchFormula, $cell->getCoordinate(), $cell);
+                    while (is_array($result)) {
+                        $result = array_pop($result);
+                    }
+
+                    return $result !== ExcelError::NA();
+                } catch (Exception) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php
new file mode 100644
index 00000000..f36934ed
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use Stringable;
+
+class DefaultValueBinder implements IValueBinder
+{
+    /**
+     * Bind value to a cell.
+     *
+     * @param Cell $cell Cell to bind value to
+     * @param mixed $value Value to bind in cell
+     */
+    public function bindValue(Cell $cell, mixed $value): bool
+    {
+        // sanitize UTF-8 strings
+        if (is_string($value)) {
+            $value = StringHelper::sanitizeUTF8($value);
+        } elseif ($value === null || is_scalar($value) || $value instanceof RichText) {
+            // No need to do anything
+        } elseif ($value instanceof DateTimeInterface) {
+            $value = $value->format('Y-m-d H:i:s');
+        } elseif ($value instanceof Stringable) {
+            $value = (string) $value;
+        } else {
+            throw new SpreadsheetException('Unable to bind unstringable ' . gettype($value));
+        }
+
+        // Set value explicit
+        $cell->setValueExplicit($value, static::dataTypeForValue($value));
+
+        // Done!
+        return true;
+    }
+
+    /**
+     * DataType for value.
+     */
+    public static function dataTypeForValue(mixed $value): string
+    {
+        // Match the value against a few data types
+        if ($value === null) {
+            return DataType::TYPE_NULL;
+        }
+        if (is_float($value) || is_int($value)) {
+            return DataType::TYPE_NUMERIC;
+        }
+        if (is_bool($value)) {
+            return DataType::TYPE_BOOL;
+        }
+        if ($value === '') {
+            return DataType::TYPE_STRING;
+        }
+        if ($value instanceof RichText) {
+            return DataType::TYPE_INLINE;
+        }
+        if ($value instanceof Stringable) {
+            $value = (string) $value;
+        }
+        if (!is_string($value)) {
+            $gettype = is_object($value) ? get_class($value) : gettype($value);
+
+            throw new SpreadsheetException("unusable type $gettype");
+        }
+        if (strlen($value) > 1 && $value[0] === '=') {
+            $calculation = new Calculation();
+            $calculation->disableBranchPruning();
+
+            try {
+                if (empty($calculation->parseFormula($value))) {
+                    return DataType::TYPE_STRING;
+                }
+            } catch (CalculationException $e) {
+                $message = $e->getMessage();
+                if (
+                    $message === 'Formula Error: An unexpected error occurred'
+                    || str_contains($message, 'has no operands')
+                ) {
+                    return DataType::TYPE_STRING;
+                }
+            }
+
+            return DataType::TYPE_FORMULA;
+        }
+        if (preg_match('/^[\+\-]?(\d+\\.?\d*|\d*\\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $value)) {
+            $tValue = ltrim($value, '+-');
+            if (strlen($tValue) > 1 && $tValue[0] === '0' && $tValue[1] !== '.') {
+                return DataType::TYPE_STRING;
+            } elseif ((!str_contains($value, '.')) && ($value > PHP_INT_MAX)) {
+                return DataType::TYPE_STRING;
+            } elseif (!is_numeric($value)) {
+                return DataType::TYPE_STRING;
+            }
+
+            return DataType::TYPE_NUMERIC;
+        }
+        $errorCodes = DataType::getErrorCodes();
+        if (isset($errorCodes[$value])) {
+            return DataType::TYPE_ERROR;
+        }
+
+        return DataType::TYPE_STRING;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php
new file mode 100644
index 00000000..3117a7d8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+class Hyperlink
+{
+    /**
+     * URL to link the cell to.
+     */
+    private string $url;
+
+    /**
+     * Tooltip to display on the hyperlink.
+     */
+    private string $tooltip;
+
+    /**
+     * Create a new Hyperlink.
+     *
+     * @param string $url Url to link the cell to
+     * @param string $tooltip Tooltip to display on the hyperlink
+     */
+    public function __construct(string $url = '', string $tooltip = '')
+    {
+        // Initialise member variables
+        $this->url = $url;
+        $this->tooltip = $tooltip;
+    }
+
+    /**
+     * Get URL.
+     */
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    /**
+     * Set URL.
+     *
+     * @return $this
+     */
+    public function setUrl(string $url): static
+    {
+        $this->url = $url;
+
+        return $this;
+    }
+
+    /**
+     * Get tooltip.
+     */
+    public function getTooltip(): string
+    {
+        return $this->tooltip;
+    }
+
+    /**
+     * Set tooltip.
+     *
+     * @return $this
+     */
+    public function setTooltip(string $tooltip): static
+    {
+        $this->tooltip = $tooltip;
+
+        return $this;
+    }
+
+    /**
+     * Is this hyperlink internal? (to another worksheet).
+     */
+    public function isInternal(): bool
+    {
+        return str_contains($this->url, 'sheet://');
+    }
+
+    public function getTypeHyperlink(): string
+    {
+        return $this->isInternal() ? '' : 'External';
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->url
+            . $this->tooltip
+            . __CLASS__
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php
new file mode 100644
index 00000000..b2f7e91a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+interface IValueBinder
+{
+    /**
+     * Bind value to a cell.
+     *
+     * @param Cell $cell Cell to bind value to
+     * @param mixed $value Value to bind in cell
+     */
+    public function bindValue(Cell $cell, mixed $value): bool;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php
new file mode 100644
index 00000000..a7c4d19d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+class IgnoredErrors
+{
+    private bool $numberStoredAsText = false;
+
+    private bool $formula = false;
+
+    private bool $twoDigitTextYear = false;
+
+    private bool $evalError = false;
+
+    public function setNumberStoredAsText(bool $value): self
+    {
+        $this->numberStoredAsText = $value;
+
+        return $this;
+    }
+
+    public function getNumberStoredAsText(): bool
+    {
+        return $this->numberStoredAsText;
+    }
+
+    public function setFormula(bool $value): self
+    {
+        $this->formula = $value;
+
+        return $this;
+    }
+
+    public function getFormula(): bool
+    {
+        return $this->formula;
+    }
+
+    public function setTwoDigitTextYear(bool $value): self
+    {
+        $this->twoDigitTextYear = $value;
+
+        return $this;
+    }
+
+    public function getTwoDigitTextYear(): bool
+    {
+        return $this->twoDigitTextYear;
+    }
+
+    public function setEvalError(bool $value): self
+    {
+        $this->evalError = $value;
+
+        return $this;
+    }
+
+    public function getEvalError(): bool
+    {
+        return $this->evalError;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php
new file mode 100644
index 00000000..4ed232a9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+/**
+ * @implements AddressRange<int>
+ */
+class RowRange implements AddressRange, Stringable
+{
+    protected ?Worksheet $worksheet;
+
+    protected int $from;
+
+    protected int $to;
+
+    public function __construct(int $from, ?int $to = null, ?Worksheet $worksheet = null)
+    {
+        $this->validateFromTo($from, $to ?? $from);
+        $this->worksheet = $worksheet;
+    }
+
+    public function __destruct()
+    {
+        $this->worksheet = null;
+    }
+
+    public static function fromArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        [$from, $to] = $array;
+
+        return new self($from, $to, $worksheet);
+    }
+
+    private function validateFromTo(int $from, int $to): void
+    {
+        // Identify actual top and bottom values (in case we've been given bottom and top)
+        $this->from = min($from, $to);
+        $this->to = max($from, $to);
+    }
+
+    public function from(): int
+    {
+        return $this->from;
+    }
+
+    public function to(): int
+    {
+        return $this->to;
+    }
+
+    public function rowCount(): int
+    {
+        return $this->to - $this->from + 1;
+    }
+
+    public function shiftRight(int $offset = 1): self
+    {
+        $newFrom = $this->from + $offset;
+        $newFrom = ($newFrom < 1) ? 1 : $newFrom;
+
+        $newTo = $this->to + $offset;
+        $newTo = ($newTo < 1) ? 1 : $newTo;
+
+        return new self($newFrom, $newTo, $this->worksheet);
+    }
+
+    public function shiftLeft(int $offset = 1): self
+    {
+        return $this->shiftRight(0 - $offset);
+    }
+
+    public function toCellRange(): CellRange
+    {
+        return new CellRange(
+            CellAddress::fromColumnAndRow(Coordinate::columnIndexFromString('A'), $this->from, $this->worksheet),
+            CellAddress::fromColumnAndRow(Coordinate::columnIndexFromString(AddressRange::MAX_COLUMN), $this->to)
+        );
+    }
+
+    public function __toString(): string
+    {
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$this->from}:{$this->to}";
+        }
+
+        return "{$this->from}:{$this->to}";
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php
new file mode 100644
index 00000000..d86cdabd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use Stringable;
+
+class StringValueBinder extends DefaultValueBinder implements IValueBinder
+{
+    protected bool $convertNull = true;
+
+    protected bool $convertBoolean = true;
+
+    protected bool $convertNumeric = true;
+
+    protected bool $convertFormula = true;
+
+    public function setNullConversion(bool $suppressConversion = false): self
+    {
+        $this->convertNull = $suppressConversion;
+
+        return $this;
+    }
+
+    public function setBooleanConversion(bool $suppressConversion = false): self
+    {
+        $this->convertBoolean = $suppressConversion;
+
+        return $this;
+    }
+
+    public function getBooleanConversion(): bool
+    {
+        return $this->convertBoolean;
+    }
+
+    public function setNumericConversion(bool $suppressConversion = false): self
+    {
+        $this->convertNumeric = $suppressConversion;
+
+        return $this;
+    }
+
+    public function setFormulaConversion(bool $suppressConversion = false): self
+    {
+        $this->convertFormula = $suppressConversion;
+
+        return $this;
+    }
+
+    public function setConversionForAllValueTypes(bool $suppressConversion = false): self
+    {
+        $this->convertNull = $suppressConversion;
+        $this->convertBoolean = $suppressConversion;
+        $this->convertNumeric = $suppressConversion;
+        $this->convertFormula = $suppressConversion;
+
+        return $this;
+    }
+
+    /**
+     * Bind value to a cell.
+     *
+     * @param Cell $cell Cell to bind value to
+     * @param mixed $value Value to bind in cell
+     */
+    public function bindValue(Cell $cell, mixed $value): bool
+    {
+        if (is_object($value)) {
+            return $this->bindObjectValue($cell, $value);
+        }
+        if ($value !== null && !is_scalar($value)) {
+            throw new SpreadsheetException('Unable to bind unstringable ' . gettype($value));
+        }
+
+        // sanitize UTF-8 strings
+        if (is_string($value)) {
+            $value = StringHelper::sanitizeUTF8($value);
+        }
+
+        if ($value === null && $this->convertNull === false) {
+            $cell->setValueExplicit($value, DataType::TYPE_NULL);
+        } elseif (is_bool($value) && $this->convertBoolean === false) {
+            $cell->setValueExplicit($value, DataType::TYPE_BOOL);
+        } elseif ((is_int($value) || is_float($value)) && $this->convertNumeric === false) {
+            $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
+        } elseif (is_string($value) && strlen($value) > 1 && $value[0] === '=' && $this->convertFormula === false && parent::dataTypeForValue($value) === DataType::TYPE_FORMULA) {
+            $cell->setValueExplicit($value, DataType::TYPE_FORMULA);
+        } else {
+            $cell->setValueExplicit((string) $value, DataType::TYPE_STRING);
+        }
+
+        return true;
+    }
+
+    protected function bindObjectValue(Cell $cell, object $value): bool
+    {
+        // Handle any objects that might be injected
+        if ($value instanceof DateTimeInterface) {
+            $value = $value->format('Y-m-d H:i:s');
+            $cell->setValueExplicit($value, DataType::TYPE_STRING);
+        } elseif ($value instanceof RichText) {
+            $cell->setValueExplicit($value, DataType::TYPE_INLINE);
+        } elseif ($value instanceof Stringable) {
+            $cell->setValueExplicit((string) $value, DataType::TYPE_STRING);
+        } else {
+            throw new SpreadsheetException('Unable to bind unstringable object of type ' . get_class($value));
+        }
+
+        return true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php
new file mode 100644
index 00000000..b2f18f6d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class CellReferenceHelper
+{
+    protected string $beforeCellAddress;
+
+    protected int $beforeColumn;
+
+    protected int $beforeRow;
+
+    protected int $numberOfColumns;
+
+    protected int $numberOfRows;
+
+    public function __construct(string $beforeCellAddress = 'A1', int $numberOfColumns = 0, int $numberOfRows = 0)
+    {
+        $this->beforeCellAddress = str_replace('$', '', $beforeCellAddress);
+        $this->numberOfColumns = $numberOfColumns;
+        $this->numberOfRows = $numberOfRows;
+
+        // Get coordinate of $beforeCellAddress
+        [$beforeColumn, $beforeRow] = Coordinate::coordinateFromString($beforeCellAddress);
+        $this->beforeColumn = Coordinate::columnIndexFromString($beforeColumn);
+        $this->beforeRow = (int) $beforeRow;
+    }
+
+    public function beforeCellAddress(): string
+    {
+        return $this->beforeCellAddress;
+    }
+
+    public function refreshRequired(string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): bool
+    {
+        return $this->beforeCellAddress !== $beforeCellAddress
+            || $this->numberOfColumns !== $numberOfColumns
+            || $this->numberOfRows !== $numberOfRows;
+    }
+
+    public function updateCellReference(string $cellReference = 'A1', bool $includeAbsoluteReferences = false, bool $onlyAbsoluteReferences = false): string
+    {
+        if (Coordinate::coordinateIsRange($cellReference)) {
+            throw new Exception('Only single cell references may be passed to this method.');
+        }
+
+        // Get coordinate of $cellReference
+        [$newColumn, $newRow] = Coordinate::coordinateFromString($cellReference);
+        $newColumnIndex = Coordinate::columnIndexFromString(str_replace('$', '', $newColumn));
+        $newRowIndex = (int) str_replace('$', '', $newRow);
+
+        $absoluteColumn = $newColumn[0] === '$' ? '$' : '';
+        $absoluteRow = $newRow[0] === '$' ? '$' : '';
+        // Verify which parts should be updated
+        if ($onlyAbsoluteReferences === true) {
+            $updateColumn = (($absoluteColumn === '$') && $newColumnIndex >= $this->beforeColumn);
+            $updateRow = (($absoluteRow === '$') && $newRowIndex >= $this->beforeRow);
+        } elseif ($includeAbsoluteReferences === false) {
+            $updateColumn = (($absoluteColumn !== '$') && $newColumnIndex >= $this->beforeColumn);
+            $updateRow = (($absoluteRow !== '$') && $newRowIndex >= $this->beforeRow);
+        } else {
+            $updateColumn = ($newColumnIndex >= $this->beforeColumn);
+            $updateRow = ($newRowIndex >= $this->beforeRow);
+        }
+
+        // Create new column reference
+        if ($updateColumn) {
+            $newColumn = $this->updateColumnReference($newColumnIndex, $absoluteColumn);
+        }
+
+        // Create new row reference
+        if ($updateRow) {
+            $newRow = $this->updateRowReference($newRowIndex, $absoluteRow);
+        }
+
+        // Return new reference
+        return "{$newColumn}{$newRow}";
+    }
+
+    public function cellAddressInDeleteRange(string $cellAddress): bool
+    {
+        [$cellColumn, $cellRow] = Coordinate::coordinateFromString($cellAddress);
+        $cellColumnIndex = Coordinate::columnIndexFromString($cellColumn);
+        //    Is cell within the range of rows/columns if we're deleting
+        if (
+            $this->numberOfRows < 0
+            && ($cellRow >= ($this->beforeRow + $this->numberOfRows))
+            && ($cellRow < $this->beforeRow)
+        ) {
+            return true;
+        } elseif (
+            $this->numberOfColumns < 0
+            && ($cellColumnIndex >= ($this->beforeColumn + $this->numberOfColumns))
+            && ($cellColumnIndex < $this->beforeColumn)
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    protected function updateColumnReference(int $newColumnIndex, string $absoluteColumn): string
+    {
+        $newColumn = Coordinate::stringFromColumnIndex(min($newColumnIndex + $this->numberOfColumns, AddressRange::MAX_COLUMN_INT));
+
+        return "{$absoluteColumn}{$newColumn}";
+    }
+
+    protected function updateRowReference(int $newRowIndex, string $absoluteRow): string
+    {
+        $newRow = $newRowIndex + $this->numberOfRows;
+        $newRow = ($newRow > AddressRange::MAX_ROW) ? AddressRange::MAX_ROW : $newRow;
+
+        return "{$absoluteRow}{$newRow}";
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php
new file mode 100644
index 00000000..dc1fca4f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php
@@ -0,0 +1,344 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+/**
+ * Created by PhpStorm.
+ * User: Wiktor Trzonkowski
+ * Date: 6/17/14
+ * Time: 12:11 PM.
+ */
+class Axis extends Properties
+{
+    const AXIS_TYPE_CATEGORY = 'catAx';
+    const AXIS_TYPE_DATE = 'dateAx';
+    const AXIS_TYPE_VALUE = 'valAx';
+
+    const TIME_UNIT_DAYS = 'days';
+    const TIME_UNIT_MONTHS = 'months';
+    const TIME_UNIT_YEARS = 'years';
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->fillColor = new ChartColor();
+    }
+
+    /**
+     * Chart Major Gridlines as.
+     */
+    private ?GridLines $majorGridlines = null;
+
+    /**
+     * Chart Minor Gridlines as.
+     */
+    private ?GridLines $minorGridlines = null;
+
+    /**
+     * Axis Number.
+     *
+     * @var array{format: string, source_linked: int, numeric: ?bool}
+     */
+    private array $axisNumber = [
+        'format' => self::FORMAT_CODE_GENERAL,
+        'source_linked' => 1,
+        'numeric' => null,
+    ];
+
+    private string $axisType = '';
+
+    private ?AxisText $axisText = null;
+
+    private ?Title $dispUnitsTitle = null;
+
+    /**
+     * Axis Options.
+     *
+     * @var array<string, null|string>
+     */
+    private array $axisOptions = [
+        'minimum' => null,
+        'maximum' => null,
+        'major_unit' => null,
+        'minor_unit' => null,
+        'orientation' => self::ORIENTATION_NORMAL,
+        'minor_tick_mark' => self::TICK_MARK_NONE,
+        'major_tick_mark' => self::TICK_MARK_NONE,
+        'axis_labels' => self::AXIS_LABELS_NEXT_TO,
+        'horizontal_crosses' => self::HORIZONTAL_CROSSES_AUTOZERO,
+        'horizontal_crosses_value' => null,
+        'textRotation' => null,
+        'hidden' => null,
+        'majorTimeUnit' => self::TIME_UNIT_YEARS,
+        'minorTimeUnit' => self::TIME_UNIT_MONTHS,
+        'baseTimeUnit' => self::TIME_UNIT_DAYS,
+        'logBase' => null,
+        'dispUnitsBuiltIn' => null,
+    ];
+    public const DISP_UNITS_HUNDREDS = 'hundreds';
+    public const DISP_UNITS_THOUSANDS = 'thousands';
+    public const DISP_UNITS_TEN_THOUSANDS = 'tenThousands';
+    public const DISP_UNITS_HUNDRED_THOUSANDS = 'hundredThousands';
+    public const DISP_UNITS_MILLIONS = 'millions';
+    public const DISP_UNITS_TEN_MILLIONS = 'tenMillions';
+    public const DISP_UNITS_HUNDRED_MILLIONS = 'hundredMillions';
+    public const DISP_UNITS_BILLIONS = 'billions';
+    public const DISP_UNITS_TRILLIONS = 'trillions';
+    public const TRILLION_INDEX = (PHP_INT_SIZE > 4) ? 1000000000000 : '1000000000000';
+    public const DISP_UNITS_BUILTIN_INT = [
+        100 => self::DISP_UNITS_HUNDREDS,
+        1000 => self::DISP_UNITS_THOUSANDS,
+        10000 => self::DISP_UNITS_TEN_THOUSANDS,
+        100000 => self::DISP_UNITS_HUNDRED_THOUSANDS,
+        1000000 => self::DISP_UNITS_MILLIONS,
+        10000000 => self::DISP_UNITS_TEN_MILLIONS,
+        100000000 => self::DISP_UNITS_HUNDRED_MILLIONS,
+        1000000000 => self::DISP_UNITS_BILLIONS,
+        self::TRILLION_INDEX => self::DISP_UNITS_TRILLIONS, // overflow for 32-bit
+    ];
+
+    /**
+     * Fill Properties.
+     */
+    private ChartColor $fillColor;
+
+    private const NUMERIC_FORMAT = [
+        Properties::FORMAT_CODE_NUMBER,
+        Properties::FORMAT_CODE_DATE,
+        Properties::FORMAT_CODE_DATE_ISO8601,
+    ];
+
+    private bool $noFill = false;
+
+    /**
+     * Get Series Data Type.
+     */
+    public function setAxisNumberProperties(string $format_code, ?bool $numeric = null, int $sourceLinked = 0): void
+    {
+        $format = $format_code;
+        $this->axisNumber['format'] = $format;
+        $this->axisNumber['source_linked'] = $sourceLinked;
+        if (is_bool($numeric)) {
+            $this->axisNumber['numeric'] = $numeric;
+        } elseif (in_array($format, self::NUMERIC_FORMAT, true)) {
+            $this->axisNumber['numeric'] = true;
+        }
+    }
+
+    /**
+     * Get Axis Number Format Data Type.
+     */
+    public function getAxisNumberFormat(): string
+    {
+        return $this->axisNumber['format'];
+    }
+
+    /**
+     * Get Axis Number Source Linked.
+     */
+    public function getAxisNumberSourceLinked(): string
+    {
+        return (string) $this->axisNumber['source_linked'];
+    }
+
+    public function getAxisIsNumericFormat(): bool
+    {
+        return $this->axisType === self::AXIS_TYPE_DATE || (bool) $this->axisNumber['numeric'];
+    }
+
+    public function setAxisOption(string $key, null|float|int|string $value): void
+    {
+        if ($value !== null && $value !== '') {
+            $this->axisOptions[$key] = (string) $value;
+        }
+    }
+
+    /**
+     * Set Axis Options Properties.
+     */
+    public function setAxisOptionsProperties(
+        string $axisLabels,
+        ?string $horizontalCrossesValue = null,
+        ?string $horizontalCrosses = null,
+        ?string $axisOrientation = null,
+        ?string $majorTmt = null,
+        ?string $minorTmt = null,
+        null|float|int|string $minimum = null,
+        null|float|int|string $maximum = null,
+        null|float|int|string $majorUnit = null,
+        null|float|int|string $minorUnit = null,
+        null|float|int|string $textRotation = null,
+        ?string $hidden = null,
+        ?string $baseTimeUnit = null,
+        ?string $majorTimeUnit = null,
+        ?string $minorTimeUnit = null,
+        null|float|int|string $logBase = null,
+        ?string $dispUnitsBuiltIn = null
+    ): void {
+        $this->axisOptions['axis_labels'] = $axisLabels;
+        $this->setAxisOption('horizontal_crosses_value', $horizontalCrossesValue);
+        $this->setAxisOption('horizontal_crosses', $horizontalCrosses);
+        $this->setAxisOption('orientation', $axisOrientation);
+        $this->setAxisOption('major_tick_mark', $majorTmt);
+        $this->setAxisOption('minor_tick_mark', $minorTmt);
+        $this->setAxisOption('minimum', $minimum);
+        $this->setAxisOption('maximum', $maximum);
+        $this->setAxisOption('major_unit', $majorUnit);
+        $this->setAxisOption('minor_unit', $minorUnit);
+        $this->setAxisOption('textRotation', $textRotation);
+        $this->setAxisOption('hidden', $hidden);
+        $this->setAxisOption('baseTimeUnit', $baseTimeUnit);
+        $this->setAxisOption('majorTimeUnit', $majorTimeUnit);
+        $this->setAxisOption('minorTimeUnit', $minorTimeUnit);
+        $this->setAxisOption('logBase', $logBase);
+        $this->setAxisOption('dispUnitsBuiltIn', $dispUnitsBuiltIn);
+    }
+
+    /**
+     * Get Axis Options Property.
+     */
+    public function getAxisOptionsProperty(string $property): ?string
+    {
+        if ($property === 'textRotation') {
+            if ($this->axisText !== null) {
+                if ($this->axisText->getRotation() !== null) {
+                    return (string) $this->axisText->getRotation();
+                }
+            }
+        }
+
+        return $this->axisOptions[$property];
+    }
+
+    /**
+     * Set Axis Orientation Property.
+     */
+    public function setAxisOrientation(string $orientation): void
+    {
+        $this->axisOptions['orientation'] = (string) $orientation;
+    }
+
+    public function getAxisType(): string
+    {
+        return $this->axisType;
+    }
+
+    public function setAxisType(string $type): self
+    {
+        if ($type === self::AXIS_TYPE_CATEGORY || $type === self::AXIS_TYPE_VALUE || $type === self::AXIS_TYPE_DATE) {
+            $this->axisType = $type;
+        } else {
+            $this->axisType = '';
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Fill Property.
+     */
+    public function setFillParameters(?string $color, ?int $alpha = null, ?string $AlphaType = ChartColor::EXCEL_COLOR_TYPE_RGB): void
+    {
+        $this->fillColor->setColorProperties($color, $alpha, $AlphaType);
+    }
+
+    /**
+     * Get Fill Property.
+     */
+    public function getFillProperty(string $property): string
+    {
+        return (string) $this->fillColor->getColorProperty($property);
+    }
+
+    public function getFillColorObject(): ChartColor
+    {
+        return $this->fillColor;
+    }
+
+    private string $crossBetween = ''; // 'between' or 'midCat' might be better
+
+    public function setCrossBetween(string $crossBetween): self
+    {
+        $this->crossBetween = $crossBetween;
+
+        return $this;
+    }
+
+    public function getCrossBetween(): string
+    {
+        return $this->crossBetween;
+    }
+
+    public function getMajorGridlines(): ?GridLines
+    {
+        return $this->majorGridlines;
+    }
+
+    public function getMinorGridlines(): ?GridLines
+    {
+        return $this->minorGridlines;
+    }
+
+    public function setMajorGridlines(?GridLines $gridlines): self
+    {
+        $this->majorGridlines = $gridlines;
+
+        return $this;
+    }
+
+    public function setMinorGridlines(?GridLines $gridlines): self
+    {
+        $this->minorGridlines = $gridlines;
+
+        return $this;
+    }
+
+    public function getAxisText(): ?AxisText
+    {
+        return $this->axisText;
+    }
+
+    public function setAxisText(?AxisText $axisText): self
+    {
+        $this->axisText = $axisText;
+
+        return $this;
+    }
+
+    public function setNoFill(bool $noFill): self
+    {
+        $this->noFill = $noFill;
+
+        return $this;
+    }
+
+    public function getNoFill(): bool
+    {
+        return $this->noFill;
+    }
+
+    public function setDispUnitsTitle(?Title $dispUnitsTitle): self
+    {
+        $this->dispUnitsTitle = $dispUnitsTitle;
+
+        return $this;
+    }
+
+    public function getDispUnitsTitle(): ?Title
+    {
+        return $this->dispUnitsTitle;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        parent::__clone();
+        $this->majorGridlines = ($this->majorGridlines === null) ? null : clone $this->majorGridlines;
+        $this->majorGridlines = ($this->minorGridlines === null) ? null : clone $this->minorGridlines;
+        $this->axisText = ($this->axisText === null) ? null : clone $this->axisText;
+        $this->dispUnitsTitle = ($this->dispUnitsTitle === null) ? null : clone $this->dispUnitsTitle;
+        $this->fillColor = clone $this->fillColor;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php
new file mode 100644
index 00000000..09d6b2a5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class AxisText extends Properties
+{
+    private ?int $rotation = null;
+
+    private Font $font;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->font = new Font();
+        $this->font->setSize(null, true);
+    }
+
+    public function setRotation(?int $rotation): self
+    {
+        $this->rotation = $rotation;
+
+        return $this;
+    }
+
+    public function getRotation(): ?int
+    {
+        return $this->rotation;
+    }
+
+    public function getFillColorObject(): ChartColor
+    {
+        $fillColor = $this->font->getChartColor();
+        if ($fillColor === null) {
+            $fillColor = new ChartColor();
+            $this->font->setChartColorFromObject($fillColor);
+        }
+
+        return $fillColor;
+    }
+
+    public function getFont(): Font
+    {
+        return $this->font;
+    }
+
+    public function setFont(Font $font): self
+    {
+        $this->font = $font;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        parent::__clone();
+        $this->font = clone $this->font;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php
new file mode 100644
index 00000000..dae43c95
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php
@@ -0,0 +1,770 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Chart
+{
+    /**
+     * Chart Name.
+     */
+    private string $name;
+
+    /**
+     * Worksheet.
+     */
+    private ?Worksheet $worksheet = null;
+
+    /**
+     * Chart Title.
+     */
+    private ?Title $title;
+
+    /**
+     * Chart Legend.
+     */
+    private ?Legend $legend;
+
+    /**
+     * X-Axis Label.
+     */
+    private ?Title $xAxisLabel;
+
+    /**
+     * Y-Axis Label.
+     */
+    private ?Title $yAxisLabel;
+
+    /**
+     * Chart Plot Area.
+     */
+    private ?PlotArea $plotArea;
+
+    /**
+     * Plot Visible Only.
+     */
+    private bool $plotVisibleOnly;
+
+    /**
+     * Display Blanks as.
+     */
+    private string $displayBlanksAs;
+
+    /**
+     * Chart Asix Y as.
+     */
+    private Axis $yAxis;
+
+    /**
+     * Chart Asix X as.
+     */
+    private Axis $xAxis;
+
+    /**
+     * Top-Left Cell Position.
+     */
+    private string $topLeftCellRef = 'A1';
+
+    /**
+     * Top-Left X-Offset.
+     */
+    private int $topLeftXOffset = 0;
+
+    /**
+     * Top-Left Y-Offset.
+     */
+    private int $topLeftYOffset = 0;
+
+    /**
+     * Bottom-Right Cell Position.
+     */
+    private string $bottomRightCellRef = '';
+
+    /**
+     * Bottom-Right X-Offset.
+     */
+    private int $bottomRightXOffset = 10;
+
+    /**
+     * Bottom-Right Y-Offset.
+     */
+    private int $bottomRightYOffset = 10;
+
+    private ?int $rotX = null;
+
+    private ?int $rotY = null;
+
+    private ?int $rAngAx = null;
+
+    private ?int $perspective = null;
+
+    private bool $oneCellAnchor = false;
+
+    private bool $autoTitleDeleted = false;
+
+    private bool $noFill = false;
+
+    private bool $roundedCorners = false;
+
+    private GridLines $borderLines;
+
+    private ChartColor $fillColor;
+
+    /**
+     * Rendered width in pixels.
+     */
+    private ?float $renderedWidth = null;
+
+    /**
+     * Rendered height in pixels.
+     */
+    private ?float $renderedHeight = null;
+
+    /**
+     * Create a new Chart.
+     * majorGridlines and minorGridlines are deprecated, moved to Axis.
+     */
+    public function __construct(string $name, ?Title $title = null, ?Legend $legend = null, ?PlotArea $plotArea = null, bool $plotVisibleOnly = true, string $displayBlanksAs = DataSeries::EMPTY_AS_GAP, ?Title $xAxisLabel = null, ?Title $yAxisLabel = null, ?Axis $xAxis = null, ?Axis $yAxis = null, ?GridLines $majorGridlines = null, ?GridLines $minorGridlines = null)
+    {
+        $this->name = $name;
+        $this->title = $title;
+        $this->legend = $legend;
+        $this->xAxisLabel = $xAxisLabel;
+        $this->yAxisLabel = $yAxisLabel;
+        $this->plotArea = $plotArea;
+        $this->plotVisibleOnly = $plotVisibleOnly;
+        $this->displayBlanksAs = $displayBlanksAs;
+        $this->xAxis = $xAxis ?? new Axis();
+        $this->yAxis = $yAxis ?? new Axis();
+        if ($majorGridlines !== null) {
+            $this->yAxis->setMajorGridlines($majorGridlines);
+        }
+        if ($minorGridlines !== null) {
+            $this->yAxis->setMinorGridlines($minorGridlines);
+        }
+        $this->fillColor = new ChartColor();
+        $this->borderLines = new GridLines();
+    }
+
+    public function __destruct()
+    {
+        $this->worksheet = null;
+    }
+
+    /**
+     * Get Name.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get Worksheet.
+     */
+    public function getWorksheet(): ?Worksheet
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * Set Worksheet.
+     *
+     * @return $this
+     */
+    public function setWorksheet(?Worksheet $worksheet = null): static
+    {
+        $this->worksheet = $worksheet;
+
+        return $this;
+    }
+
+    public function getTitle(): ?Title
+    {
+        return $this->title;
+    }
+
+    /**
+     * Set Title.
+     *
+     * @return $this
+     */
+    public function setTitle(Title $title): static
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    public function getLegend(): ?Legend
+    {
+        return $this->legend;
+    }
+
+    /**
+     * Set Legend.
+     *
+     * @return $this
+     */
+    public function setLegend(Legend $legend): static
+    {
+        $this->legend = $legend;
+
+        return $this;
+    }
+
+    public function getXAxisLabel(): ?Title
+    {
+        return $this->xAxisLabel;
+    }
+
+    /**
+     * Set X-Axis Label.
+     *
+     * @return $this
+     */
+    public function setXAxisLabel(Title $label): static
+    {
+        $this->xAxisLabel = $label;
+
+        return $this;
+    }
+
+    public function getYAxisLabel(): ?Title
+    {
+        return $this->yAxisLabel;
+    }
+
+    /**
+     * Set Y-Axis Label.
+     *
+     * @return $this
+     */
+    public function setYAxisLabel(Title $label): static
+    {
+        $this->yAxisLabel = $label;
+
+        return $this;
+    }
+
+    public function getPlotArea(): ?PlotArea
+    {
+        return $this->plotArea;
+    }
+
+    public function getPlotAreaOrThrow(): PlotArea
+    {
+        $plotArea = $this->getPlotArea();
+        if ($plotArea !== null) {
+            return $plotArea;
+        }
+
+        throw new Exception('Chart has no PlotArea');
+    }
+
+    /**
+     * Set Plot Area.
+     */
+    public function setPlotArea(PlotArea $plotArea): self
+    {
+        $this->plotArea = $plotArea;
+
+        return $this;
+    }
+
+    /**
+     * Get Plot Visible Only.
+     */
+    public function getPlotVisibleOnly(): bool
+    {
+        return $this->plotVisibleOnly;
+    }
+
+    /**
+     * Set Plot Visible Only.
+     *
+     * @return $this
+     */
+    public function setPlotVisibleOnly(bool $plotVisibleOnly): static
+    {
+        $this->plotVisibleOnly = $plotVisibleOnly;
+
+        return $this;
+    }
+
+    /**
+     * Get Display Blanks as.
+     */
+    public function getDisplayBlanksAs(): string
+    {
+        return $this->displayBlanksAs;
+    }
+
+    /**
+     * Set Display Blanks as.
+     *
+     * @return $this
+     */
+    public function setDisplayBlanksAs(string $displayBlanksAs): static
+    {
+        $this->displayBlanksAs = $displayBlanksAs;
+
+        return $this;
+    }
+
+    public function getChartAxisY(): Axis
+    {
+        return $this->yAxis;
+    }
+
+    /**
+     * Set yAxis.
+     */
+    public function setChartAxisY(?Axis $axis): self
+    {
+        $this->yAxis = $axis ?? new Axis();
+
+        return $this;
+    }
+
+    public function getChartAxisX(): Axis
+    {
+        return $this->xAxis;
+    }
+
+    /**
+     * Set xAxis.
+     */
+    public function setChartAxisX(?Axis $axis): self
+    {
+        $this->xAxis = $axis ?? new Axis();
+
+        return $this;
+    }
+
+    /**
+     * Set the Top Left position for the chart.
+     *
+     * @return $this
+     */
+    public function setTopLeftPosition(string $cellAddress, ?int $xOffset = null, ?int $yOffset = null): static
+    {
+        $this->topLeftCellRef = $cellAddress;
+        if ($xOffset !== null) {
+            $this->setTopLeftXOffset($xOffset);
+        }
+        if ($yOffset !== null) {
+            $this->setTopLeftYOffset($yOffset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the top left position of the chart.
+     *
+     * Returns ['cell' => string cell address, 'xOffset' => int, 'yOffset' => int].
+     *
+     * @return array{cell: string, xOffset: int, yOffset: int} an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
+     */
+    public function getTopLeftPosition(): array
+    {
+        return [
+            'cell' => $this->topLeftCellRef,
+            'xOffset' => $this->topLeftXOffset,
+            'yOffset' => $this->topLeftYOffset,
+        ];
+    }
+
+    /**
+     * Get the cell address where the top left of the chart is fixed.
+     */
+    public function getTopLeftCell(): string
+    {
+        return $this->topLeftCellRef;
+    }
+
+    /**
+     * Set the Top Left cell position for the chart.
+     *
+     * @return $this
+     */
+    public function setTopLeftCell(string $cellAddress): static
+    {
+        $this->topLeftCellRef = $cellAddress;
+
+        return $this;
+    }
+
+    /**
+     * Set the offset position within the Top Left cell for the chart.
+     *
+     * @return $this
+     */
+    public function setTopLeftOffset(?int $xOffset, ?int $yOffset): static
+    {
+        if ($xOffset !== null) {
+            $this->setTopLeftXOffset($xOffset);
+        }
+
+        if ($yOffset !== null) {
+            $this->setTopLeftYOffset($yOffset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the offset position within the Top Left cell for the chart.
+     *
+     * @return int[]
+     */
+    public function getTopLeftOffset(): array
+    {
+        return [
+            'X' => $this->topLeftXOffset,
+            'Y' => $this->topLeftYOffset,
+        ];
+    }
+
+    /**
+     * @return $this
+     */
+    public function setTopLeftXOffset(int $xOffset): static
+    {
+        $this->topLeftXOffset = $xOffset;
+
+        return $this;
+    }
+
+    public function getTopLeftXOffset(): int
+    {
+        return $this->topLeftXOffset;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setTopLeftYOffset(int $yOffset): static
+    {
+        $this->topLeftYOffset = $yOffset;
+
+        return $this;
+    }
+
+    public function getTopLeftYOffset(): int
+    {
+        return $this->topLeftYOffset;
+    }
+
+    /**
+     * Set the Bottom Right position of the chart.
+     *
+     * @return $this
+     */
+    public function setBottomRightPosition(string $cellAddress = '', ?int $xOffset = null, ?int $yOffset = null): static
+    {
+        $this->bottomRightCellRef = $cellAddress;
+        if ($xOffset !== null) {
+            $this->setBottomRightXOffset($xOffset);
+        }
+        if ($yOffset !== null) {
+            $this->setBottomRightYOffset($yOffset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the bottom right position of the chart.
+     *
+     * @return array an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
+     */
+    public function getBottomRightPosition(): array
+    {
+        return [
+            'cell' => $this->bottomRightCellRef,
+            'xOffset' => $this->bottomRightXOffset,
+            'yOffset' => $this->bottomRightYOffset,
+        ];
+    }
+
+    /**
+     * Set the Bottom Right cell for the chart.
+     *
+     * @return $this
+     */
+    public function setBottomRightCell(string $cellAddress = ''): static
+    {
+        $this->bottomRightCellRef = $cellAddress;
+
+        return $this;
+    }
+
+    /**
+     * Get the cell address where the bottom right of the chart is fixed.
+     */
+    public function getBottomRightCell(): string
+    {
+        return $this->bottomRightCellRef;
+    }
+
+    /**
+     * Set the offset position within the Bottom Right cell for the chart.
+     *
+     * @return $this
+     */
+    public function setBottomRightOffset(?int $xOffset, ?int $yOffset): static
+    {
+        if ($xOffset !== null) {
+            $this->setBottomRightXOffset($xOffset);
+        }
+
+        if ($yOffset !== null) {
+            $this->setBottomRightYOffset($yOffset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the offset position within the Bottom Right cell for the chart.
+     *
+     * @return int[]
+     */
+    public function getBottomRightOffset(): array
+    {
+        return [
+            'X' => $this->bottomRightXOffset,
+            'Y' => $this->bottomRightYOffset,
+        ];
+    }
+
+    /**
+     * @return $this
+     */
+    public function setBottomRightXOffset(int $xOffset): static
+    {
+        $this->bottomRightXOffset = $xOffset;
+
+        return $this;
+    }
+
+    public function getBottomRightXOffset(): int
+    {
+        return $this->bottomRightXOffset;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setBottomRightYOffset(int $yOffset): static
+    {
+        $this->bottomRightYOffset = $yOffset;
+
+        return $this;
+    }
+
+    public function getBottomRightYOffset(): int
+    {
+        return $this->bottomRightYOffset;
+    }
+
+    public function refresh(): void
+    {
+        if ($this->worksheet !== null && $this->plotArea !== null) {
+            $this->plotArea->refresh($this->worksheet);
+        }
+    }
+
+    /**
+     * Render the chart to given file (or stream).
+     *
+     * @param ?string $outputDestination Name of the file render to
+     *
+     * @return bool true on success
+     */
+    public function render(?string $outputDestination = null): bool
+    {
+        if ($outputDestination == 'php://output') {
+            $outputDestination = null;
+        }
+
+        $libraryName = Settings::getChartRenderer();
+        if ($libraryName === null) {
+            return false;
+        }
+
+        // Ensure that data series values are up-to-date before we render
+        $this->refresh();
+
+        $renderer = new $libraryName($this);
+
+        return $renderer->render($outputDestination);
+    }
+
+    public function getRotX(): ?int
+    {
+        return $this->rotX;
+    }
+
+    public function setRotX(?int $rotX): self
+    {
+        $this->rotX = $rotX;
+
+        return $this;
+    }
+
+    public function getRotY(): ?int
+    {
+        return $this->rotY;
+    }
+
+    public function setRotY(?int $rotY): self
+    {
+        $this->rotY = $rotY;
+
+        return $this;
+    }
+
+    public function getRAngAx(): ?int
+    {
+        return $this->rAngAx;
+    }
+
+    public function setRAngAx(?int $rAngAx): self
+    {
+        $this->rAngAx = $rAngAx;
+
+        return $this;
+    }
+
+    public function getPerspective(): ?int
+    {
+        return $this->perspective;
+    }
+
+    public function setPerspective(?int $perspective): self
+    {
+        $this->perspective = $perspective;
+
+        return $this;
+    }
+
+    public function getOneCellAnchor(): bool
+    {
+        return $this->oneCellAnchor;
+    }
+
+    public function setOneCellAnchor(bool $oneCellAnchor): self
+    {
+        $this->oneCellAnchor = $oneCellAnchor;
+
+        return $this;
+    }
+
+    public function getAutoTitleDeleted(): bool
+    {
+        return $this->autoTitleDeleted;
+    }
+
+    public function setAutoTitleDeleted(bool $autoTitleDeleted): self
+    {
+        $this->autoTitleDeleted = $autoTitleDeleted;
+
+        return $this;
+    }
+
+    public function getNoFill(): bool
+    {
+        return $this->noFill;
+    }
+
+    public function setNoFill(bool $noFill): self
+    {
+        $this->noFill = $noFill;
+
+        return $this;
+    }
+
+    public function getRoundedCorners(): bool
+    {
+        return $this->roundedCorners;
+    }
+
+    public function setRoundedCorners(?bool $roundedCorners): self
+    {
+        if ($roundedCorners !== null) {
+            $this->roundedCorners = $roundedCorners;
+        }
+
+        return $this;
+    }
+
+    public function getBorderLines(): GridLines
+    {
+        return $this->borderLines;
+    }
+
+    public function setBorderLines(GridLines $borderLines): self
+    {
+        $this->borderLines = $borderLines;
+
+        return $this;
+    }
+
+    public function getFillColor(): ChartColor
+    {
+        return $this->fillColor;
+    }
+
+    public function setRenderedWidth(?float $width): self
+    {
+        $this->renderedWidth = $width;
+
+        return $this;
+    }
+
+    public function getRenderedWidth(): ?float
+    {
+        return $this->renderedWidth;
+    }
+
+    public function setRenderedHeight(?float $height): self
+    {
+        $this->renderedHeight = $height;
+
+        return $this;
+    }
+
+    public function getRenderedHeight(): ?float
+    {
+        return $this->renderedHeight;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->worksheet = null;
+        $this->title = ($this->title === null) ? null : clone $this->title;
+        $this->legend = ($this->legend === null) ? null : clone $this->legend;
+        $this->xAxisLabel = ($this->xAxisLabel === null) ? null : clone $this->xAxisLabel;
+        $this->yAxisLabel = ($this->yAxisLabel === null) ? null : clone $this->yAxisLabel;
+        $this->plotArea = ($this->plotArea === null) ? null : clone $this->plotArea;
+        $this->xAxis = clone $this->xAxis;
+        $this->yAxis = clone $this->yAxis;
+        $this->borderLines = clone $this->borderLines;
+        $this->fillColor = clone $this->fillColor;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php
new file mode 100644
index 00000000..d6306de6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+class ChartColor
+{
+    const EXCEL_COLOR_TYPE_STANDARD = 'prstClr';
+    const EXCEL_COLOR_TYPE_SCHEME = 'schemeClr';
+    const EXCEL_COLOR_TYPE_RGB = 'srgbClr';
+    const EXCEL_COLOR_TYPES = [
+        self::EXCEL_COLOR_TYPE_RGB,
+        self::EXCEL_COLOR_TYPE_SCHEME,
+        self::EXCEL_COLOR_TYPE_STANDARD,
+    ];
+
+    private string $value = '';
+
+    private string $type = '';
+
+    private ?int $alpha = null;
+
+    private ?int $brightness = null;
+
+    /**
+     * @param string|string[] $value
+     */
+    public function __construct($value = '', ?int $alpha = null, ?string $type = null, ?int $brightness = null)
+    {
+        if (is_array($value)) {
+            $this->setColorPropertiesArray($value);
+        } else {
+            $this->setColorProperties($value, $alpha, $type, $brightness);
+        }
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    public function setValue(string $value): self
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function setType(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function getAlpha(): ?int
+    {
+        return $this->alpha;
+    }
+
+    public function setAlpha(?int $alpha): self
+    {
+        $this->alpha = $alpha;
+
+        return $this;
+    }
+
+    public function getBrightness(): ?int
+    {
+        return $this->brightness;
+    }
+
+    public function setBrightness(?int $brightness): self
+    {
+        $this->brightness = $brightness;
+
+        return $this;
+    }
+
+    public function setColorProperties(?string $color, null|float|int|string $alpha = null, ?string $type = null, null|float|int|string $brightness = null): self
+    {
+        if (empty($type) && !empty($color)) {
+            if (str_starts_with($color, '*')) {
+                $type = 'schemeClr';
+                $color = substr($color, 1);
+            } elseif (str_starts_with($color, '/')) {
+                $type = 'prstClr';
+                $color = substr($color, 1);
+            } elseif (preg_match('/^[0-9A-Fa-f]{6}$/', $color) === 1) {
+                $type = 'srgbClr';
+            }
+        }
+        if ($color !== null) {
+            $this->setValue("$color");
+        }
+        if ($type !== null) {
+            $this->setType($type);
+        }
+        if ($alpha === null) {
+            $this->setAlpha(null);
+        } elseif (is_numeric($alpha)) {
+            $this->setAlpha((int) $alpha);
+        }
+        if ($brightness === null) {
+            $this->setBrightness(null);
+        } elseif (is_numeric($brightness)) {
+            $this->setBrightness((int) $brightness);
+        }
+
+        return $this;
+    }
+
+    public function setColorPropertiesArray(array $color): self
+    {
+        return $this->setColorProperties(
+            $color['value'] ?? '',
+            $color['alpha'] ?? null,
+            $color['type'] ?? null,
+            $color['brightness'] ?? null
+        );
+    }
+
+    public function isUsable(): bool
+    {
+        return $this->type !== '' && $this->value !== '';
+    }
+
+    /**
+     * Get Color Property.
+     */
+    public function getColorProperty(string $propertyName): null|int|string
+    {
+        $retVal = null;
+        if ($propertyName === 'value') {
+            $retVal = $this->value;
+        } elseif ($propertyName === 'type') {
+            $retVal = $this->type;
+        } elseif ($propertyName === 'alpha') {
+            $retVal = $this->alpha;
+        } elseif ($propertyName === 'brightness') {
+            $retVal = $this->brightness;
+        }
+
+        return $retVal;
+    }
+
+    public static function alphaToXml(int $alpha): string
+    {
+        return (string) (100 - $alpha) . '000';
+    }
+
+    public static function alphaFromXml(float|int|string $alpha): int
+    {
+        return 100 - ((int) $alpha / 1000);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php
new file mode 100644
index 00000000..c7a92820
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php
@@ -0,0 +1,412 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class DataSeries
+{
+    const TYPE_BARCHART = 'barChart';
+    const TYPE_BARCHART_3D = 'bar3DChart';
+    const TYPE_LINECHART = 'lineChart';
+    const TYPE_LINECHART_3D = 'line3DChart';
+    const TYPE_AREACHART = 'areaChart';
+    const TYPE_AREACHART_3D = 'area3DChart';
+    const TYPE_PIECHART = 'pieChart';
+    const TYPE_PIECHART_3D = 'pie3DChart';
+    const TYPE_DOUGHNUTCHART = 'doughnutChart';
+    const TYPE_DONUTCHART = self::TYPE_DOUGHNUTCHART; // Synonym
+    const TYPE_SCATTERCHART = 'scatterChart';
+    const TYPE_SURFACECHART = 'surfaceChart';
+    const TYPE_SURFACECHART_3D = 'surface3DChart';
+    const TYPE_RADARCHART = 'radarChart';
+    const TYPE_BUBBLECHART = 'bubbleChart';
+    const TYPE_STOCKCHART = 'stockChart';
+    const TYPE_CANDLECHART = self::TYPE_STOCKCHART; // Synonym
+
+    const GROUPING_CLUSTERED = 'clustered';
+    const GROUPING_STACKED = 'stacked';
+    const GROUPING_PERCENT_STACKED = 'percentStacked';
+    const GROUPING_STANDARD = 'standard';
+
+    const DIRECTION_BAR = 'bar';
+    const DIRECTION_HORIZONTAL = self::DIRECTION_BAR;
+    const DIRECTION_COL = 'col';
+    const DIRECTION_COLUMN = self::DIRECTION_COL;
+    const DIRECTION_VERTICAL = self::DIRECTION_COL;
+
+    const STYLE_LINEMARKER = 'lineMarker';
+    const STYLE_SMOOTHMARKER = 'smoothMarker';
+    const STYLE_MARKER = 'marker';
+    const STYLE_FILLED = 'filled';
+
+    const EMPTY_AS_GAP = 'gap';
+    const EMPTY_AS_ZERO = 'zero';
+    const EMPTY_AS_SPAN = 'span';
+
+    /**
+     * Series Plot Type.
+     */
+    private ?string $plotType;
+
+    /**
+     * Plot Grouping Type.
+     */
+    private ?string $plotGrouping;
+
+    /**
+     * Plot Direction.
+     */
+    private string $plotDirection;
+
+    /**
+     * Plot Style.
+     */
+    private ?string $plotStyle;
+
+    /**
+     * Order of plots in Series.
+     *
+     * @var int[]
+     */
+    private array $plotOrder;
+
+    /**
+     * Plot Label.
+     *
+     * @var DataSeriesValues[]
+     */
+    private array $plotLabel;
+
+    /**
+     * Plot Category.
+     *
+     * @var DataSeriesValues[]
+     */
+    private array $plotCategory;
+
+    /**
+     * Smooth Line. Must be specified for both DataSeries and DataSeriesValues.
+     */
+    private bool $smoothLine;
+
+    /**
+     * Plot Values.
+     *
+     * @var DataSeriesValues[]
+     */
+    private array $plotValues;
+
+    /**
+     * Plot Bubble Sizes.
+     *
+     * @var DataSeriesValues[]
+     */
+    private array $plotBubbleSizes = [];
+
+    /**
+     * Create a new DataSeries.
+     *
+     * @param int[] $plotOrder
+     * @param DataSeriesValues[] $plotLabel
+     * @param DataSeriesValues[] $plotCategory
+     * @param DataSeriesValues[] $plotValues
+     */
+    public function __construct(
+        null|string $plotType = null,
+        null|string $plotGrouping = null,
+        array $plotOrder = [],
+        array $plotLabel = [],
+        array $plotCategory = [],
+        array $plotValues = [],
+        ?string $plotDirection = null,
+        bool $smoothLine = false,
+        ?string $plotStyle = null
+    ) {
+        $this->plotType = $plotType;
+        $this->plotGrouping = $plotGrouping;
+        $this->plotOrder = $plotOrder;
+        $keys = array_keys($plotValues);
+        $this->plotValues = $plotValues;
+        if (!isset($plotLabel[$keys[0]])) {
+            $plotLabel[$keys[0]] = new DataSeriesValues();
+        }
+        $this->plotLabel = $plotLabel;
+
+        if (!isset($plotCategory[$keys[0]])) {
+            $plotCategory[$keys[0]] = new DataSeriesValues();
+        }
+        $this->plotCategory = $plotCategory;
+
+        $this->smoothLine = (bool) $smoothLine;
+        $this->plotStyle = $plotStyle;
+
+        if ($plotDirection === null) {
+            $plotDirection = self::DIRECTION_COL;
+        }
+        $this->plotDirection = $plotDirection;
+    }
+
+    /**
+     * Get Plot Type.
+     */
+    public function getPlotType(): ?string
+    {
+        return $this->plotType;
+    }
+
+    /**
+     * Set Plot Type.
+     *
+     * @return $this
+     */
+    public function setPlotType(string $plotType): static
+    {
+        $this->plotType = $plotType;
+
+        return $this;
+    }
+
+    /**
+     * Get Plot Grouping Type.
+     */
+    public function getPlotGrouping(): ?string
+    {
+        return $this->plotGrouping;
+    }
+
+    /**
+     * Set Plot Grouping Type.
+     *
+     * @return $this
+     */
+    public function setPlotGrouping(string $groupingType): static
+    {
+        $this->plotGrouping = $groupingType;
+
+        return $this;
+    }
+
+    /**
+     * Get Plot Direction.
+     */
+    public function getPlotDirection(): string
+    {
+        return $this->plotDirection;
+    }
+
+    /**
+     * Set Plot Direction.
+     *
+     * @return $this
+     */
+    public function setPlotDirection(string $plotDirection): static
+    {
+        $this->plotDirection = $plotDirection;
+
+        return $this;
+    }
+
+    /**
+     * Get Plot Order.
+     *
+     * @return int[]
+     */
+    public function getPlotOrder(): array
+    {
+        return $this->plotOrder;
+    }
+
+    /**
+     * Get Plot Labels.
+     *
+     * @return DataSeriesValues[]
+     */
+    public function getPlotLabels(): array
+    {
+        return $this->plotLabel;
+    }
+
+    /**
+     * Get Plot Label by Index.
+     *
+     * @return DataSeriesValues|false
+     */
+    public function getPlotLabelByIndex(int $index): bool|DataSeriesValues
+    {
+        $keys = array_keys($this->plotLabel);
+        if (in_array($index, $keys)) {
+            return $this->plotLabel[$index];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Plot Categories.
+     *
+     * @return DataSeriesValues[]
+     */
+    public function getPlotCategories(): array
+    {
+        return $this->plotCategory;
+    }
+
+    /**
+     * Get Plot Category by Index.
+     *
+     * @return DataSeriesValues|false
+     */
+    public function getPlotCategoryByIndex(int $index): bool|DataSeriesValues
+    {
+        $keys = array_keys($this->plotCategory);
+        if (in_array($index, $keys)) {
+            return $this->plotCategory[$index];
+        } elseif (isset($keys[$index])) {
+            return $this->plotCategory[$keys[$index]];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Plot Style.
+     */
+    public function getPlotStyle(): ?string
+    {
+        return $this->plotStyle;
+    }
+
+    /**
+     * Set Plot Style.
+     *
+     * @return $this
+     */
+    public function setPlotStyle(?string $plotStyle): static
+    {
+        $this->plotStyle = $plotStyle;
+
+        return $this;
+    }
+
+    /**
+     * Get Plot Values.
+     *
+     * @return DataSeriesValues[]
+     */
+    public function getPlotValues(): array
+    {
+        return $this->plotValues;
+    }
+
+    /**
+     * Get Plot Values by Index.
+     *
+     * @return DataSeriesValues|false
+     */
+    public function getPlotValuesByIndex(int $index): bool|DataSeriesValues
+    {
+        $keys = array_keys($this->plotValues);
+        if (in_array($index, $keys)) {
+            return $this->plotValues[$index];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Plot Bubble Sizes.
+     *
+     * @return DataSeriesValues[]
+     */
+    public function getPlotBubbleSizes(): array
+    {
+        return $this->plotBubbleSizes;
+    }
+
+    /**
+     * Set Plot Bubble Sizes.
+     *
+     * @param DataSeriesValues[] $plotBubbleSizes
+     */
+    public function setPlotBubbleSizes(array $plotBubbleSizes): self
+    {
+        $this->plotBubbleSizes = $plotBubbleSizes;
+
+        return $this;
+    }
+
+    /**
+     * Get Number of Plot Series.
+     */
+    public function getPlotSeriesCount(): int
+    {
+        return count($this->plotValues);
+    }
+
+    /**
+     * Get Smooth Line.
+     */
+    public function getSmoothLine(): bool
+    {
+        return $this->smoothLine;
+    }
+
+    /**
+     * Set Smooth Line.
+     *
+     * @return $this
+     */
+    public function setSmoothLine(bool $smoothLine): static
+    {
+        $this->smoothLine = $smoothLine;
+
+        return $this;
+    }
+
+    public function refresh(Worksheet $worksheet): void
+    {
+        foreach ($this->plotValues as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, true);
+            }
+        }
+        foreach ($this->plotLabel as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, true);
+            }
+        }
+        foreach ($this->plotCategory as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, false);
+            }
+        }
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $plotLabels = $this->plotLabel;
+        $this->plotLabel = [];
+        foreach ($plotLabels as $plotLabel) {
+            $this->plotLabel[] = $plotLabel;
+        }
+        $plotCategories = $this->plotCategory;
+        $this->plotCategory = [];
+        foreach ($plotCategories as $plotCategory) {
+            $this->plotCategory[] = clone $plotCategory;
+        }
+        $plotValues = $this->plotValues;
+        $this->plotValues = [];
+        foreach ($plotValues as $plotValue) {
+            $this->plotValues[] = clone $plotValue;
+        }
+        $plotBubbleSizes = $this->plotBubbleSizes;
+        $this->plotBubbleSizes = [];
+        foreach ($plotBubbleSizes as $plotBubbleSize) {
+            $this->plotBubbleSizes[] = clone $plotBubbleSize;
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php
new file mode 100644
index 00000000..70f90bf7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php
@@ -0,0 +1,571 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class DataSeriesValues extends Properties
+{
+    const DATASERIES_TYPE_STRING = 'String';
+    const DATASERIES_TYPE_NUMBER = 'Number';
+
+    private const DATA_TYPE_VALUES = [
+        self::DATASERIES_TYPE_STRING,
+        self::DATASERIES_TYPE_NUMBER,
+    ];
+
+    /**
+     * Series Data Type.
+     */
+    private string $dataType;
+
+    /**
+     * Series Data Source.
+     */
+    private ?string $dataSource;
+
+    /**
+     * Format Code.
+     */
+    private ?string $formatCode;
+
+    /**
+     * Series Point Marker.
+     */
+    private ?string $pointMarker;
+
+    private ChartColor $markerFillColor;
+
+    private ChartColor $markerBorderColor;
+
+    /**
+     * Series Point Size.
+     */
+    private int $pointSize = 3;
+
+    /**
+     * Point Count (The number of datapoints in the dataseries).
+     */
+    private int $pointCount;
+
+    /**
+     * Data Values.
+     */
+    private ?array $dataValues;
+
+    /**
+     * Fill color (can be array with colors if dataseries have custom colors).
+     *
+     * @var null|ChartColor|ChartColor[]
+     */
+    private $fillColor;
+
+    private bool $scatterLines = true;
+
+    private bool $bubble3D = false;
+
+    private ?Layout $labelLayout = null;
+
+    /** @var TrendLine[] */
+    private array $trendLines = [];
+
+    /**
+     * Create a new DataSeriesValues object.
+     *
+     * @param null|ChartColor|ChartColor[]|string|string[] $fillColor
+     */
+    public function __construct(
+        string $dataType = self::DATASERIES_TYPE_NUMBER,
+        ?string $dataSource = null,
+        ?string $formatCode = null,
+        int $pointCount = 0,
+        ?array $dataValues = [],
+        ?string $marker = null,
+        null|ChartColor|array|string $fillColor = null,
+        int|string $pointSize = 3
+    ) {
+        parent::__construct();
+        $this->markerFillColor = new ChartColor();
+        $this->markerBorderColor = new ChartColor();
+        $this->setDataType($dataType);
+        $this->dataSource = $dataSource;
+        $this->formatCode = $formatCode;
+        $this->pointCount = $pointCount;
+        $this->dataValues = $dataValues;
+        $this->pointMarker = $marker;
+        if ($fillColor !== null) {
+            $this->setFillColor($fillColor);
+        }
+        if (is_numeric($pointSize)) {
+            $this->pointSize = (int) $pointSize;
+        }
+    }
+
+    /**
+     * Get Series Data Type.
+     */
+    public function getDataType(): string
+    {
+        return $this->dataType;
+    }
+
+    /**
+     * Set Series Data Type.
+     *
+     * @param string $dataType Datatype of this data series
+     *                                Typical values are:
+     *                                    DataSeriesValues::DATASERIES_TYPE_STRING
+     *                                        Normally used for axis point values
+     *                                    DataSeriesValues::DATASERIES_TYPE_NUMBER
+     *                                        Normally used for chart data values
+     *
+     * @return $this
+     */
+    public function setDataType(string $dataType): static
+    {
+        if (!in_array($dataType, self::DATA_TYPE_VALUES)) {
+            throw new Exception('Invalid datatype for chart data series values');
+        }
+        $this->dataType = $dataType;
+
+        return $this;
+    }
+
+    /**
+     * Get Series Data Source (formula).
+     */
+    public function getDataSource(): ?string
+    {
+        return $this->dataSource;
+    }
+
+    /**
+     * Set Series Data Source (formula).
+     *
+     * @return $this
+     */
+    public function setDataSource(?string $dataSource): static
+    {
+        $this->dataSource = $dataSource;
+
+        return $this;
+    }
+
+    /**
+     * Get Point Marker.
+     */
+    public function getPointMarker(): ?string
+    {
+        return $this->pointMarker;
+    }
+
+    /**
+     * Set Point Marker.
+     *
+     * @return $this
+     */
+    public function setPointMarker(string $marker): static
+    {
+        $this->pointMarker = $marker;
+
+        return $this;
+    }
+
+    public function getMarkerFillColor(): ChartColor
+    {
+        return $this->markerFillColor;
+    }
+
+    public function getMarkerBorderColor(): ChartColor
+    {
+        return $this->markerBorderColor;
+    }
+
+    /**
+     * Get Point Size.
+     */
+    public function getPointSize(): int
+    {
+        return $this->pointSize;
+    }
+
+    /**
+     * Set Point Size.
+     *
+     * @return $this
+     */
+    public function setPointSize(int $size = 3): static
+    {
+        $this->pointSize = $size;
+
+        return $this;
+    }
+
+    /**
+     * Get Series Format Code.
+     */
+    public function getFormatCode(): ?string
+    {
+        return $this->formatCode;
+    }
+
+    /**
+     * Set Series Format Code.
+     *
+     * @return $this
+     */
+    public function setFormatCode(string $formatCode): static
+    {
+        $this->formatCode = $formatCode;
+
+        return $this;
+    }
+
+    /**
+     * Get Series Point Count.
+     */
+    public function getPointCount(): int
+    {
+        return $this->pointCount;
+    }
+
+    /**
+     * Get fill color object.
+     *
+     * @return null|ChartColor|ChartColor[]
+     */
+    public function getFillColorObject()
+    {
+        return $this->fillColor;
+    }
+
+    private function stringToChartColor(string $fillString): ChartColor
+    {
+        $value = $type = '';
+        if (str_starts_with($fillString, '*')) {
+            $type = 'schemeClr';
+            $value = substr($fillString, 1);
+        } elseif (str_starts_with($fillString, '/')) {
+            $type = 'prstClr';
+            $value = substr($fillString, 1);
+        } elseif ($fillString !== '') {
+            $type = 'srgbClr';
+            $value = $fillString;
+            $this->validateColor($value);
+        }
+
+        return new ChartColor($value, null, $type);
+    }
+
+    private function chartColorToString(ChartColor $chartColor): string
+    {
+        $type = (string) $chartColor->getColorProperty('type');
+        $value = (string) $chartColor->getColorProperty('value');
+        if ($type === '' || $value === '') {
+            return '';
+        }
+        if ($type === 'schemeClr') {
+            return "*$value";
+        }
+        if ($type === 'prstClr') {
+            return "/$value";
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get fill color.
+     *
+     * @return string|string[] HEX color or array with HEX colors
+     */
+    public function getFillColor(): string|array
+    {
+        if ($this->fillColor === null) {
+            return '';
+        }
+        if (is_array($this->fillColor)) {
+            $array = [];
+            foreach ($this->fillColor as $chartColor) {
+                $array[] = $this->chartColorToString($chartColor);
+            }
+
+            return $array;
+        }
+
+        return $this->chartColorToString($this->fillColor);
+    }
+
+    /**
+     * Set fill color for series.
+     *
+     * @param ChartColor|ChartColor[]|string|string[] $color HEX color or array with HEX colors
+     *
+     * @return   $this
+     */
+    public function setFillColor($color): static
+    {
+        if (is_array($color)) {
+            $this->fillColor = [];
+            foreach ($color as $fillString) {
+                if ($fillString instanceof ChartColor) {
+                    $this->fillColor[] = $fillString;
+                } else {
+                    $this->fillColor[] = $this->stringToChartColor($fillString);
+                }
+            }
+        } elseif ($color instanceof ChartColor) {
+            $this->fillColor = $color;
+        } else {
+            $this->fillColor = $this->stringToChartColor($color);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Method for validating hex color.
+     *
+     * @param string $color value for color
+     *
+     * @return bool true if validation was successful
+     */
+    private function validateColor(string $color): bool
+    {
+        if (!preg_match('/^[a-f0-9]{6}$/i', $color)) {
+            throw new Exception(sprintf('Invalid hex color for chart series (color: "%s")', $color));
+        }
+
+        return true;
+    }
+
+    /**
+     * Get line width for series.
+     */
+    public function getLineWidth(): null|float|int
+    {
+        return $this->lineStyleProperties['width'];
+    }
+
+    /**
+     * Set line width for the series.
+     *
+     * @return $this
+     */
+    public function setLineWidth(null|float|int $width): static
+    {
+        $this->lineStyleProperties['width'] = $width;
+
+        return $this;
+    }
+
+    /**
+     * Identify if the Data Series is a multi-level or a simple series.
+     */
+    public function isMultiLevelSeries(): ?bool
+    {
+        if (!empty($this->dataValues)) {
+            return is_array(array_values($this->dataValues)[0]);
+        }
+
+        return null;
+    }
+
+    /**
+     * Return the level count of a multi-level Data Series.
+     */
+    public function multiLevelCount(): int
+    {
+        $levelCount = 0;
+        foreach (($this->dataValues ?? []) as $dataValueSet) {
+            $levelCount = max($levelCount, count($dataValueSet));
+        }
+
+        return $levelCount;
+    }
+
+    /**
+     * Get Series Data Values.
+     */
+    public function getDataValues(): ?array
+    {
+        return $this->dataValues;
+    }
+
+    /**
+     * Get the first Series Data value.
+     */
+    public function getDataValue(): mixed
+    {
+        if ($this->dataValues === null) {
+            return null;
+        }
+        $count = count($this->dataValues);
+        if ($count == 0) {
+            return null;
+        } elseif ($count == 1) {
+            return $this->dataValues[0];
+        }
+
+        return $this->dataValues;
+    }
+
+    /**
+     * Set Series Data Values.
+     *
+     * @return $this
+     */
+    public function setDataValues(array $dataValues): static
+    {
+        $this->dataValues = Functions::flattenArray($dataValues);
+        $this->pointCount = count($dataValues);
+
+        return $this;
+    }
+
+    public function refresh(Worksheet $worksheet, bool $flatten = true): void
+    {
+        if ($this->dataSource !== null) {
+            $calcEngine = Calculation::getInstance($worksheet->getParent());
+            $newDataValues = Calculation::unwrapResult(
+                $calcEngine->_calculateFormulaValue(
+                    '=' . $this->dataSource,
+                    null,
+                    $worksheet->getCell('A1')
+                )
+            );
+            if ($flatten) {
+                $this->dataValues = Functions::flattenArray($newDataValues);
+                foreach ($this->dataValues as &$dataValue) {
+                    if (is_string($dataValue) && !empty($dataValue) && $dataValue[0] == '#') {
+                        $dataValue = 0.0;
+                    }
+                }
+                unset($dataValue);
+            } else {
+                [$worksheet, $cellRange] = Worksheet::extractSheetTitle($this->dataSource, true);
+                $dimensions = Coordinate::rangeDimension(str_replace('$', '', $cellRange ?? ''));
+                if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
+                    $this->dataValues = Functions::flattenArray($newDataValues);
+                } else {
+                    /** @var array<int, array> */
+                    $newDataValuesx = $newDataValues;
+                    $newArray = array_values(array_shift($newDataValuesx) ?? []);
+                    foreach ($newArray as $i => $newDataSet) {
+                        $newArray[$i] = [$newDataSet];
+                    }
+
+                    foreach ($newDataValuesx as $newDataSet) {
+                        $i = 0;
+                        foreach ($newDataSet as $newDataVal) {
+                            array_unshift($newArray[$i++], $newDataVal);
+                        }
+                    }
+                    $this->dataValues = $newArray;
+                }
+            }
+            $this->pointCount = count($this->dataValues);
+        }
+    }
+
+    public function getScatterLines(): bool
+    {
+        return $this->scatterLines;
+    }
+
+    public function setScatterLines(bool $scatterLines): self
+    {
+        $this->scatterLines = $scatterLines;
+
+        return $this;
+    }
+
+    public function getBubble3D(): bool
+    {
+        return $this->bubble3D;
+    }
+
+    public function setBubble3D(bool $bubble3D): self
+    {
+        $this->bubble3D = $bubble3D;
+
+        return $this;
+    }
+
+    /**
+     * Smooth Line. Must be specified for both DataSeries and DataSeriesValues.
+     */
+    private bool $smoothLine = false;
+
+    /**
+     * Get Smooth Line.
+     */
+    public function getSmoothLine(): bool
+    {
+        return $this->smoothLine;
+    }
+
+    /**
+     * Set Smooth Line.
+     *
+     * @return $this
+     */
+    public function setSmoothLine(bool $smoothLine): static
+    {
+        $this->smoothLine = $smoothLine;
+
+        return $this;
+    }
+
+    public function getLabelLayout(): ?Layout
+    {
+        return $this->labelLayout;
+    }
+
+    public function setLabelLayout(?Layout $labelLayout): self
+    {
+        $this->labelLayout = $labelLayout;
+
+        return $this;
+    }
+
+    public function setTrendLines(array $trendLines): self
+    {
+        $this->trendLines = $trendLines;
+
+        return $this;
+    }
+
+    public function getTrendLines(): array
+    {
+        return $this->trendLines;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        parent::__clone();
+        $this->markerFillColor = clone $this->markerFillColor;
+        $this->markerBorderColor = clone $this->markerBorderColor;
+        if (is_array($this->fillColor)) {
+            $fillColor = $this->fillColor;
+            $this->fillColor = [];
+            foreach ($fillColor as $color) {
+                $this->fillColor[] = clone $color;
+            }
+        } elseif ($this->fillColor instanceof ChartColor) {
+            $this->fillColor = clone $this->fillColor;
+        }
+        $this->labelLayout = ($this->labelLayout === null) ? null : clone $this->labelLayout;
+        $trendLines = $this->trendLines;
+        $this->trendLines = [];
+        foreach ($trendLines as $trendLine) {
+            $this->trendLines[] = clone $trendLine;
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Exception.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Exception.php
new file mode 100644
index 00000000..3f95b599
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class Exception extends PhpSpreadsheetException
+{
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php
new file mode 100644
index 00000000..8b86ccbd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+/**
+ * Created by PhpStorm.
+ * User: Wiktor Trzonkowski
+ * Date: 7/2/14
+ * Time: 2:36 PM.
+ */
+class GridLines extends Properties
+{
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php
new file mode 100644
index 00000000..570892ec
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php
@@ -0,0 +1,524 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class Layout
+{
+    /**
+     * layoutTarget.
+     */
+    private ?string $layoutTarget = null;
+
+    /**
+     * X Mode.
+     */
+    private ?string $xMode = null;
+
+    /**
+     * Y Mode.
+     */
+    private ?string $yMode = null;
+
+    /**
+     * X-Position.
+     */
+    private ?float $xPos = null;
+
+    /**
+     * Y-Position.
+     */
+    private ?float $yPos = null;
+
+    /**
+     * width.
+     */
+    private ?float $width = null;
+
+    /**
+     * height.
+     */
+    private ?float $height = null;
+
+    /**
+     * Position - t=top.
+     */
+    private string $dLblPos = '';
+
+    private string $numFmtCode = '';
+
+    private bool $numFmtLinked = false;
+
+    /**
+     * show legend key
+     * Specifies that legend keys should be shown in data labels.
+     */
+    private ?bool $showLegendKey = null;
+
+    /**
+     * show value
+     * Specifies that the value should be shown in a data label.
+     */
+    private ?bool $showVal = null;
+
+    /**
+     * show category name
+     * Specifies that the category name should be shown in the data label.
+     */
+    private ?bool $showCatName = null;
+
+    /**
+     * show data series name
+     * Specifies that the series name should be shown in the data label.
+     */
+    private ?bool $showSerName = null;
+
+    /**
+     * show percentage
+     * Specifies that the percentage should be shown in the data label.
+     */
+    private ?bool $showPercent = null;
+
+    /**
+     * show bubble size.
+     */
+    private ?bool $showBubbleSize = null;
+
+    /**
+     * show leader lines
+     * Specifies that leader lines should be shown for the data label.
+     */
+    private ?bool $showLeaderLines = null;
+
+    private ?ChartColor $labelFillColor = null;
+
+    private ?ChartColor $labelBorderColor = null;
+
+    private ?Font $labelFont = null;
+
+    private ?Properties $labelEffects = null;
+
+    /**
+     * Create a new Layout.
+     */
+    public function __construct(array $layout = [])
+    {
+        if (isset($layout['layoutTarget'])) {
+            $this->layoutTarget = $layout['layoutTarget'];
+        }
+        if (isset($layout['xMode'])) {
+            $this->xMode = $layout['xMode'];
+        }
+        if (isset($layout['yMode'])) {
+            $this->yMode = $layout['yMode'];
+        }
+        if (isset($layout['x'])) {
+            $this->xPos = (float) $layout['x'];
+        }
+        if (isset($layout['y'])) {
+            $this->yPos = (float) $layout['y'];
+        }
+        if (isset($layout['w'])) {
+            $this->width = (float) $layout['w'];
+        }
+        if (isset($layout['h'])) {
+            $this->height = (float) $layout['h'];
+        }
+        if (isset($layout['dLblPos'])) {
+            $this->dLblPos = (string) $layout['dLblPos'];
+        }
+        if (isset($layout['numFmtCode'])) {
+            $this->numFmtCode = (string) $layout['numFmtCode'];
+        }
+        $this->initBoolean($layout, 'showLegendKey');
+        $this->initBoolean($layout, 'showVal');
+        $this->initBoolean($layout, 'showCatName');
+        $this->initBoolean($layout, 'showSerName');
+        $this->initBoolean($layout, 'showPercent');
+        $this->initBoolean($layout, 'showBubbleSize');
+        $this->initBoolean($layout, 'showLeaderLines');
+        $this->initBoolean($layout, 'numFmtLinked');
+        $this->initColor($layout, 'labelFillColor');
+        $this->initColor($layout, 'labelBorderColor');
+        $labelFont = $layout['labelFont'] ?? null;
+        if ($labelFont instanceof Font) {
+            $this->labelFont = $labelFont;
+        }
+        $labelFontColor = $layout['labelFontColor'] ?? null;
+        if ($labelFontColor instanceof ChartColor) {
+            $this->setLabelFontColor($labelFontColor);
+        }
+        $labelEffects = $layout['labelEffects'] ?? null;
+        if ($labelEffects instanceof Properties) {
+            $this->labelEffects = $labelEffects;
+        }
+    }
+
+    private function initBoolean(array $layout, string $name): void
+    {
+        if (isset($layout[$name])) {
+            $this->$name = (bool) $layout[$name];
+        }
+    }
+
+    private function initColor(array $layout, string $name): void
+    {
+        if (isset($layout[$name]) && $layout[$name] instanceof ChartColor) {
+            $this->$name = $layout[$name];
+        }
+    }
+
+    /**
+     * Get Layout Target.
+     */
+    public function getLayoutTarget(): ?string
+    {
+        return $this->layoutTarget;
+    }
+
+    /**
+     * Set Layout Target.
+     *
+     * @return $this
+     */
+    public function setLayoutTarget(?string $target): static
+    {
+        $this->layoutTarget = $target;
+
+        return $this;
+    }
+
+    /**
+     * Get X-Mode.
+     */
+    public function getXMode(): ?string
+    {
+        return $this->xMode;
+    }
+
+    /**
+     * Set X-Mode.
+     *
+     * @return $this
+     */
+    public function setXMode(?string $mode): static
+    {
+        $this->xMode = (string) $mode;
+
+        return $this;
+    }
+
+    /**
+     * Get Y-Mode.
+     */
+    public function getYMode(): ?string
+    {
+        return $this->yMode;
+    }
+
+    /**
+     * Set Y-Mode.
+     *
+     * @return $this
+     */
+    public function setYMode(?string $mode): static
+    {
+        $this->yMode = (string) $mode;
+
+        return $this;
+    }
+
+    /**
+     * Get X-Position.
+     */
+    public function getXPosition(): null|float|int
+    {
+        return $this->xPos;
+    }
+
+    /**
+     * Set X-Position.
+     *
+     * @return $this
+     */
+    public function setXPosition(float $position): static
+    {
+        $this->xPos = $position;
+
+        return $this;
+    }
+
+    /**
+     * Get Y-Position.
+     */
+    public function getYPosition(): ?float
+    {
+        return $this->yPos;
+    }
+
+    /**
+     * Set Y-Position.
+     *
+     * @return $this
+     */
+    public function setYPosition(float $position): static
+    {
+        $this->yPos = $position;
+
+        return $this;
+    }
+
+    /**
+     * Get Width.
+     */
+    public function getWidth(): ?float
+    {
+        return $this->width;
+    }
+
+    /**
+     * Set Width.
+     *
+     * @return $this
+     */
+    public function setWidth(?float $width): static
+    {
+        $this->width = $width;
+
+        return $this;
+    }
+
+    /**
+     * Get Height.
+     */
+    public function getHeight(): ?float
+    {
+        return $this->height;
+    }
+
+    /**
+     * Set Height.
+     *
+     * @return $this
+     */
+    public function setHeight(?float $height): static
+    {
+        $this->height = $height;
+
+        return $this;
+    }
+
+    public function getShowLegendKey(): ?bool
+    {
+        return $this->showLegendKey;
+    }
+
+    /**
+     * Set show legend key
+     * Specifies that legend keys should be shown in data labels.
+     */
+    public function setShowLegendKey(?bool $showLegendKey): self
+    {
+        $this->showLegendKey = $showLegendKey;
+
+        return $this;
+    }
+
+    public function getShowVal(): ?bool
+    {
+        return $this->showVal;
+    }
+
+    /**
+     * Set show val
+     * Specifies that the value should be shown in data labels.
+     */
+    public function setShowVal(?bool $showDataLabelValues): self
+    {
+        $this->showVal = $showDataLabelValues;
+
+        return $this;
+    }
+
+    public function getShowCatName(): ?bool
+    {
+        return $this->showCatName;
+    }
+
+    /**
+     * Set show cat name
+     * Specifies that the category name should be shown in data labels.
+     */
+    public function setShowCatName(?bool $showCategoryName): self
+    {
+        $this->showCatName = $showCategoryName;
+
+        return $this;
+    }
+
+    public function getShowSerName(): ?bool
+    {
+        return $this->showSerName;
+    }
+
+    /**
+     * Set show data series name.
+     * Specifies that the series name should be shown in data labels.
+     */
+    public function setShowSerName(?bool $showSeriesName): self
+    {
+        $this->showSerName = $showSeriesName;
+
+        return $this;
+    }
+
+    public function getShowPercent(): ?bool
+    {
+        return $this->showPercent;
+    }
+
+    /**
+     * Set show percentage.
+     * Specifies that the percentage should be shown in data labels.
+     */
+    public function setShowPercent(?bool $showPercentage): self
+    {
+        $this->showPercent = $showPercentage;
+
+        return $this;
+    }
+
+    public function getShowBubbleSize(): ?bool
+    {
+        return $this->showBubbleSize;
+    }
+
+    /**
+     * Set show bubble size.
+     * Specifies that the bubble size should be shown in data labels.
+     */
+    public function setShowBubbleSize(?bool $showBubbleSize): self
+    {
+        $this->showBubbleSize = $showBubbleSize;
+
+        return $this;
+    }
+
+    public function getShowLeaderLines(): ?bool
+    {
+        return $this->showLeaderLines;
+    }
+
+    /**
+     * Set show leader lines.
+     * Specifies that leader lines should be shown in data labels.
+     */
+    public function setShowLeaderLines(?bool $showLeaderLines): self
+    {
+        $this->showLeaderLines = $showLeaderLines;
+
+        return $this;
+    }
+
+    public function getLabelFillColor(): ?ChartColor
+    {
+        return $this->labelFillColor;
+    }
+
+    public function setLabelFillColor(?ChartColor $chartColor): self
+    {
+        $this->labelFillColor = $chartColor;
+
+        return $this;
+    }
+
+    public function getLabelBorderColor(): ?ChartColor
+    {
+        return $this->labelBorderColor;
+    }
+
+    public function setLabelBorderColor(?ChartColor $chartColor): self
+    {
+        $this->labelBorderColor = $chartColor;
+
+        return $this;
+    }
+
+    public function getLabelFont(): ?Font
+    {
+        return $this->labelFont;
+    }
+
+    public function getLabelEffects(): ?Properties
+    {
+        return $this->labelEffects;
+    }
+
+    public function getLabelFontColor(): ?ChartColor
+    {
+        if ($this->labelFont === null) {
+            return null;
+        }
+
+        return $this->labelFont->getChartColor();
+    }
+
+    public function setLabelFontColor(?ChartColor $chartColor): self
+    {
+        if ($this->labelFont === null) {
+            $this->labelFont = new Font();
+            $this->labelFont->setSize(null, true);
+        }
+        $this->labelFont->setChartColorFromObject($chartColor);
+
+        return $this;
+    }
+
+    public function getDLblPos(): string
+    {
+        return $this->dLblPos;
+    }
+
+    public function setDLblPos(string $dLblPos): self
+    {
+        $this->dLblPos = $dLblPos;
+
+        return $this;
+    }
+
+    public function getNumFmtCode(): string
+    {
+        return $this->numFmtCode;
+    }
+
+    public function setNumFmtCode(string $numFmtCode): self
+    {
+        $this->numFmtCode = $numFmtCode;
+
+        return $this;
+    }
+
+    public function getNumFmtLinked(): bool
+    {
+        return $this->numFmtLinked;
+    }
+
+    public function setNumFmtLinked(bool $numFmtLinked): self
+    {
+        $this->numFmtLinked = $numFmtLinked;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->labelFillColor = ($this->labelFillColor === null) ? null : clone $this->labelFillColor;
+        $this->labelBorderColor = ($this->labelBorderColor === null) ? null : clone $this->labelBorderColor;
+        $this->labelFont = ($this->labelFont === null) ? null : clone $this->labelFont;
+        $this->labelEffects = ($this->labelEffects === null) ? null : clone $this->labelEffects;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php
new file mode 100644
index 00000000..7736fb7a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+class Legend
+{
+    /** Legend positions */
+    const XL_LEGEND_POSITION_BOTTOM = -4107; //    Below the chart.
+    const XL_LEGEND_POSITION_CORNER = 2; //    In the upper right-hand corner of the chart border.
+    const XL_LEGEND_POSITION_CUSTOM = -4161; //    A custom position.
+    const XL_LEGEND_POSITION_LEFT = -4131; //    Left of the chart.
+    const XL_LEGEND_POSITION_RIGHT = -4152; //    Right of the chart.
+    const XL_LEGEND_POSITION_TOP = -4160; //    Above the chart.
+
+    const POSITION_RIGHT = 'r';
+    const POSITION_LEFT = 'l';
+    const POSITION_BOTTOM = 'b';
+    const POSITION_TOP = 't';
+    const POSITION_TOPRIGHT = 'tr';
+
+    const POSITION_XLREF = [
+        self::XL_LEGEND_POSITION_BOTTOM => self::POSITION_BOTTOM,
+        self::XL_LEGEND_POSITION_CORNER => self::POSITION_TOPRIGHT,
+        self::XL_LEGEND_POSITION_CUSTOM => '??',
+        self::XL_LEGEND_POSITION_LEFT => self::POSITION_LEFT,
+        self::XL_LEGEND_POSITION_RIGHT => self::POSITION_RIGHT,
+        self::XL_LEGEND_POSITION_TOP => self::POSITION_TOP,
+    ];
+
+    /**
+     * Legend position.
+     */
+    private string $position = self::POSITION_RIGHT;
+
+    /**
+     * Allow overlay of other elements?
+     */
+    private bool $overlay = true;
+
+    /**
+     * Legend Layout.
+     */
+    private ?Layout $layout;
+
+    private GridLines $borderLines;
+
+    private ChartColor $fillColor;
+
+    private ?AxisText $legendText = null;
+
+    /**
+     * Create a new Legend.
+     */
+    public function __construct(string $position = self::POSITION_RIGHT, ?Layout $layout = null, bool $overlay = false)
+    {
+        $this->setPosition($position);
+        $this->layout = $layout;
+        $this->setOverlay($overlay);
+        $this->borderLines = new GridLines();
+        $this->fillColor = new ChartColor();
+    }
+
+    public function getFillColor(): ChartColor
+    {
+        return $this->fillColor;
+    }
+
+    /**
+     * Get legend position as an excel string value.
+     */
+    public function getPosition(): string
+    {
+        return $this->position;
+    }
+
+    /**
+     * Get legend position using an excel string value.
+     *
+     * @param string $position see self::POSITION_*
+     */
+    public function setPosition(string $position): bool
+    {
+        if (!in_array($position, self::POSITION_XLREF)) {
+            return false;
+        }
+
+        $this->position = $position;
+
+        return true;
+    }
+
+    /**
+     * Get legend position as an Excel internal numeric value.
+     */
+    public function getPositionXL(): false|int
+    {
+        return array_search($this->position, self::POSITION_XLREF);
+    }
+
+    /**
+     * Set legend position using an Excel internal numeric value.
+     *
+     * @param int $positionXL see self::XL_LEGEND_POSITION_*
+     */
+    public function setPositionXL(int $positionXL): bool
+    {
+        if (!isset(self::POSITION_XLREF[$positionXL])) {
+            return false;
+        }
+
+        $this->position = self::POSITION_XLREF[$positionXL];
+
+        return true;
+    }
+
+    /**
+     * Get allow overlay of other elements?
+     */
+    public function getOverlay(): bool
+    {
+        return $this->overlay;
+    }
+
+    /**
+     * Set allow overlay of other elements?
+     */
+    public function setOverlay(bool $overlay): void
+    {
+        $this->overlay = $overlay;
+    }
+
+    /**
+     * Get Layout.
+     */
+    public function getLayout(): ?Layout
+    {
+        return $this->layout;
+    }
+
+    public function getLegendText(): ?AxisText
+    {
+        return $this->legendText;
+    }
+
+    public function setLegendText(?AxisText $legendText): self
+    {
+        $this->legendText = $legendText;
+
+        return $this;
+    }
+
+    public function getBorderLines(): GridLines
+    {
+        return $this->borderLines;
+    }
+
+    public function setBorderLines(GridLines $borderLines): self
+    {
+        $this->borderLines = $borderLines;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->layout = ($this->layout === null) ? null : clone $this->layout;
+        $this->legendText = ($this->legendText === null) ? null : clone $this->legendText;
+        $this->borderLines = clone $this->borderLines;
+        $this->fillColor = clone $this->fillColor;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php
new file mode 100644
index 00000000..228afad4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php
@@ -0,0 +1,207 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class PlotArea
+{
+    /**
+     * No fill in plot area (show Excel gridlines through chart).
+     */
+    private bool $noFill = false;
+
+    /**
+     * PlotArea Gradient Stop list.
+     * Each entry is a 2-element array.
+     *     First is position in %.
+     *     Second is ChartColor.
+     *
+     * @var array[]
+     */
+    private array $gradientFillStops = [];
+
+    /**
+     * PlotArea Gradient Angle.
+     */
+    private ?float $gradientFillAngle = null;
+
+    /**
+     * PlotArea Layout.
+     */
+    private ?Layout $layout;
+
+    /**
+     * Plot Series.
+     *
+     * @var DataSeries[]
+     */
+    private array $plotSeries;
+
+    /**
+     * Create a new PlotArea.
+     *
+     * @param DataSeries[] $plotSeries
+     */
+    public function __construct(?Layout $layout = null, array $plotSeries = [])
+    {
+        $this->layout = $layout;
+        $this->plotSeries = $plotSeries;
+    }
+
+    public function getLayout(): ?Layout
+    {
+        return $this->layout;
+    }
+
+    /**
+     * Get Number of Plot Groups.
+     */
+    public function getPlotGroupCount(): int
+    {
+        return count($this->plotSeries);
+    }
+
+    /**
+     * Get Number of Plot Series.
+     */
+    public function getPlotSeriesCount(): int|float
+    {
+        $seriesCount = 0;
+        foreach ($this->plotSeries as $plot) {
+            $seriesCount += $plot->getPlotSeriesCount();
+        }
+
+        return $seriesCount;
+    }
+
+    /**
+     * Get Plot Series.
+     *
+     * @return DataSeries[]
+     */
+    public function getPlotGroup(): array
+    {
+        return $this->plotSeries;
+    }
+
+    /**
+     * Get Plot Series by Index.
+     */
+    public function getPlotGroupByIndex(int $index): DataSeries
+    {
+        return $this->plotSeries[$index];
+    }
+
+    /**
+     * Set Plot Series.
+     *
+     * @param DataSeries[] $plotSeries
+     *
+     * @return $this
+     */
+    public function setPlotSeries(array $plotSeries): static
+    {
+        $this->plotSeries = $plotSeries;
+
+        return $this;
+    }
+
+    public function refresh(Worksheet $worksheet): void
+    {
+        foreach ($this->plotSeries as $plotSeries) {
+            $plotSeries->refresh($worksheet);
+        }
+    }
+
+    public function setNoFill(bool $noFill): self
+    {
+        $this->noFill = $noFill;
+
+        return $this;
+    }
+
+    public function getNoFill(): bool
+    {
+        return $this->noFill;
+    }
+
+    public function setGradientFillProperties(array $gradientFillStops, ?float $gradientFillAngle): self
+    {
+        $this->gradientFillStops = $gradientFillStops;
+        $this->gradientFillAngle = $gradientFillAngle;
+
+        return $this;
+    }
+
+    /**
+     * Get gradientFillAngle.
+     */
+    public function getGradientFillAngle(): ?float
+    {
+        return $this->gradientFillAngle;
+    }
+
+    /**
+     * Get gradientFillStops.
+     */
+    public function getGradientFillStops(): array
+    {
+        return $this->gradientFillStops;
+    }
+
+    private ?int $gapWidth = null;
+
+    private bool $useUpBars = false;
+
+    private bool $useDownBars = false;
+
+    public function getGapWidth(): ?int
+    {
+        return $this->gapWidth;
+    }
+
+    public function setGapWidth(?int $gapWidth): self
+    {
+        $this->gapWidth = $gapWidth;
+
+        return $this;
+    }
+
+    public function getUseUpBars(): bool
+    {
+        return $this->useUpBars;
+    }
+
+    public function setUseUpBars(bool $useUpBars): self
+    {
+        $this->useUpBars = $useUpBars;
+
+        return $this;
+    }
+
+    public function getUseDownBars(): bool
+    {
+        return $this->useDownBars;
+    }
+
+    public function setUseDownBars(bool $useDownBars): self
+    {
+        $this->useDownBars = $useDownBars;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->layout = ($this->layout === null) ? null : clone $this->layout;
+        $plotSeries = $this->plotSeries;
+        $this->plotSeries = [];
+        foreach ($plotSeries as $series) {
+            $this->plotSeries[] = clone $series;
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php
new file mode 100644
index 00000000..655e79c8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php
@@ -0,0 +1,901 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+/**
+ * Created by PhpStorm.
+ * User: nhw2h8s
+ * Date: 7/2/14
+ * Time: 5:45 PM.
+ */
+abstract class Properties
+{
+    const AXIS_LABELS_LOW = 'low';
+    const AXIS_LABELS_HIGH = 'high';
+    const AXIS_LABELS_NEXT_TO = 'nextTo';
+    const AXIS_LABELS_NONE = 'none';
+
+    const TICK_MARK_NONE = 'none';
+    const TICK_MARK_INSIDE = 'in';
+    const TICK_MARK_OUTSIDE = 'out';
+    const TICK_MARK_CROSS = 'cross';
+
+    const HORIZONTAL_CROSSES_AUTOZERO = 'autoZero';
+    const HORIZONTAL_CROSSES_MAXIMUM = 'max';
+
+    const FORMAT_CODE_GENERAL = 'General';
+    const FORMAT_CODE_NUMBER = '#,##0.00';
+    const FORMAT_CODE_CURRENCY = '$#,##0.00';
+    const FORMAT_CODE_ACCOUNTING = '_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)';
+    const FORMAT_CODE_DATE = 'm/d/yyyy';
+    const FORMAT_CODE_DATE_ISO8601 = 'yyyy-mm-dd';
+    const FORMAT_CODE_TIME = '[$-F400]h:mm:ss AM/PM';
+    const FORMAT_CODE_PERCENTAGE = '0.00%';
+    const FORMAT_CODE_FRACTION = '# ?/?';
+    const FORMAT_CODE_SCIENTIFIC = '0.00E+00';
+    const FORMAT_CODE_TEXT = '@';
+    const FORMAT_CODE_SPECIAL = '00000';
+
+    const ORIENTATION_NORMAL = 'minMax';
+    const ORIENTATION_REVERSED = 'maxMin';
+
+    const LINE_STYLE_COMPOUND_SIMPLE = 'sng';
+    const LINE_STYLE_COMPOUND_DOUBLE = 'dbl';
+    const LINE_STYLE_COMPOUND_THICKTHIN = 'thickThin';
+    const LINE_STYLE_COMPOUND_THINTHICK = 'thinThick';
+    const LINE_STYLE_COMPOUND_TRIPLE = 'tri';
+    const LINE_STYLE_DASH_SOLID = 'solid';
+    const LINE_STYLE_DASH_ROUND_DOT = 'sysDot';
+    const LINE_STYLE_DASH_SQUARE_DOT = 'sysDash';
+    const LINE_STYPE_DASH_DASH = 'dash';
+    const LINE_STYLE_DASH_DASH_DOT = 'dashDot';
+    const LINE_STYLE_DASH_LONG_DASH = 'lgDash';
+    const LINE_STYLE_DASH_LONG_DASH_DOT = 'lgDashDot';
+    const LINE_STYLE_DASH_LONG_DASH_DOT_DOT = 'lgDashDotDot';
+    const LINE_STYLE_CAP_SQUARE = 'sq';
+    const LINE_STYLE_CAP_ROUND = 'rnd';
+    const LINE_STYLE_CAP_FLAT = 'flat';
+    const LINE_STYLE_JOIN_ROUND = 'round';
+    const LINE_STYLE_JOIN_MITER = 'miter';
+    const LINE_STYLE_JOIN_BEVEL = 'bevel';
+    const LINE_STYLE_ARROW_TYPE_NOARROW = null;
+    const LINE_STYLE_ARROW_TYPE_ARROW = 'triangle';
+    const LINE_STYLE_ARROW_TYPE_OPEN = 'arrow';
+    const LINE_STYLE_ARROW_TYPE_STEALTH = 'stealth';
+    const LINE_STYLE_ARROW_TYPE_DIAMOND = 'diamond';
+    const LINE_STYLE_ARROW_TYPE_OVAL = 'oval';
+    const LINE_STYLE_ARROW_SIZE_1 = 1;
+    const LINE_STYLE_ARROW_SIZE_2 = 2;
+    const LINE_STYLE_ARROW_SIZE_3 = 3;
+    const LINE_STYLE_ARROW_SIZE_4 = 4;
+    const LINE_STYLE_ARROW_SIZE_5 = 5;
+    const LINE_STYLE_ARROW_SIZE_6 = 6;
+    const LINE_STYLE_ARROW_SIZE_7 = 7;
+    const LINE_STYLE_ARROW_SIZE_8 = 8;
+    const LINE_STYLE_ARROW_SIZE_9 = 9;
+
+    const SHADOW_PRESETS_NOSHADOW = null;
+    const SHADOW_PRESETS_OUTER_BOTTTOM_RIGHT = 1;
+    const SHADOW_PRESETS_OUTER_BOTTOM = 2;
+    const SHADOW_PRESETS_OUTER_BOTTOM_LEFT = 3;
+    const SHADOW_PRESETS_OUTER_RIGHT = 4;
+    const SHADOW_PRESETS_OUTER_CENTER = 5;
+    const SHADOW_PRESETS_OUTER_LEFT = 6;
+    const SHADOW_PRESETS_OUTER_TOP_RIGHT = 7;
+    const SHADOW_PRESETS_OUTER_TOP = 8;
+    const SHADOW_PRESETS_OUTER_TOP_LEFT = 9;
+    const SHADOW_PRESETS_INNER_BOTTTOM_RIGHT = 10;
+    const SHADOW_PRESETS_INNER_BOTTOM = 11;
+    const SHADOW_PRESETS_INNER_BOTTOM_LEFT = 12;
+    const SHADOW_PRESETS_INNER_RIGHT = 13;
+    const SHADOW_PRESETS_INNER_CENTER = 14;
+    const SHADOW_PRESETS_INNER_LEFT = 15;
+    const SHADOW_PRESETS_INNER_TOP_RIGHT = 16;
+    const SHADOW_PRESETS_INNER_TOP = 17;
+    const SHADOW_PRESETS_INNER_TOP_LEFT = 18;
+    const SHADOW_PRESETS_PERSPECTIVE_BELOW = 19;
+    const SHADOW_PRESETS_PERSPECTIVE_UPPER_RIGHT = 20;
+    const SHADOW_PRESETS_PERSPECTIVE_UPPER_LEFT = 21;
+    const SHADOW_PRESETS_PERSPECTIVE_LOWER_RIGHT = 22;
+    const SHADOW_PRESETS_PERSPECTIVE_LOWER_LEFT = 23;
+
+    const POINTS_WIDTH_MULTIPLIER = 12700;
+    const ANGLE_MULTIPLIER = 60000; // direction and size-kx size-ky
+    const PERCENTAGE_MULTIPLIER = 100000; // size sx and sy
+
+    protected bool $objectState = false; // used only for minor gridlines
+
+    /** @var ?float */
+    protected ?float $glowSize = null;
+
+    protected ChartColor $glowColor;
+
+    protected array $softEdges = [
+        'size' => null,
+    ];
+
+    protected array $shadowProperties = self::PRESETS_OPTIONS[0];
+
+    protected ChartColor $shadowColor;
+
+    public function __construct()
+    {
+        $this->lineColor = new ChartColor();
+        $this->glowColor = new ChartColor();
+        $this->shadowColor = new ChartColor();
+        $this->shadowColor->setType(ChartColor::EXCEL_COLOR_TYPE_STANDARD);
+        $this->shadowColor->setValue('black');
+        $this->shadowColor->setAlpha(40);
+    }
+
+    /**
+     * Get Object State.
+     */
+    public function getObjectState(): bool
+    {
+        return $this->objectState;
+    }
+
+    /**
+     * Change Object State to True.
+     *
+     * @return $this
+     */
+    public function activateObject()
+    {
+        $this->objectState = true;
+
+        return $this;
+    }
+
+    public static function pointsToXml(float $width): string
+    {
+        return (string) (int) ($width * self::POINTS_WIDTH_MULTIPLIER);
+    }
+
+    public static function xmlToPoints(string $width): float
+    {
+        return ((float) $width) / self::POINTS_WIDTH_MULTIPLIER;
+    }
+
+    public static function angleToXml(float $angle): string
+    {
+        return (string) (int) ($angle * self::ANGLE_MULTIPLIER);
+    }
+
+    public static function xmlToAngle(string $angle): float
+    {
+        return ((float) $angle) / self::ANGLE_MULTIPLIER;
+    }
+
+    public static function tenthOfPercentToXml(float $value): string
+    {
+        return (string) (int) ($value * self::PERCENTAGE_MULTIPLIER);
+    }
+
+    public static function xmlToTenthOfPercent(string $value): float
+    {
+        return ((float) $value) / self::PERCENTAGE_MULTIPLIER;
+    }
+
+    protected function setColorProperties(?string $color, null|float|int|string $alpha, ?string $colorType): array
+    {
+        return [
+            'type' => $colorType,
+            'value' => $color,
+            'alpha' => ($alpha === null) ? null : (int) $alpha,
+        ];
+    }
+
+    protected const PRESETS_OPTIONS = [
+        //NONE
+        0 => [
+            'presets' => self::SHADOW_PRESETS_NOSHADOW,
+            'effect' => null,
+            //'color' => [
+            //    'type' => ChartColor::EXCEL_COLOR_TYPE_STANDARD,
+            //    'value' => 'black',
+            //    'alpha' => 40,
+            //],
+            'size' => [
+                'sx' => null,
+                'sy' => null,
+                'kx' => null,
+                'ky' => null,
+            ],
+            'blur' => null,
+            'direction' => null,
+            'distance' => null,
+            'algn' => null,
+            'rotWithShape' => null,
+        ],
+        //OUTER
+        1 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 2700000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'tl',
+            'rotWithShape' => '0',
+        ],
+        2 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 5400000 / self::ANGLE_MULTIPLIER,
+            'algn' => 't',
+            'rotWithShape' => '0',
+        ],
+        3 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 8100000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'tr',
+            'rotWithShape' => '0',
+        ],
+        4 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'algn' => 'l',
+            'rotWithShape' => '0',
+        ],
+        5 => [
+            'effect' => 'outerShdw',
+            'size' => [
+                'sx' => 102000 / self::PERCENTAGE_MULTIPLIER,
+                'sy' => 102000 / self::PERCENTAGE_MULTIPLIER,
+            ],
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'algn' => 'ctr',
+            'rotWithShape' => '0',
+        ],
+        6 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 10800000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'r',
+            'rotWithShape' => '0',
+        ],
+        7 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 18900000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'bl',
+            'rotWithShape' => '0',
+        ],
+        8 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 16200000 / self::ANGLE_MULTIPLIER,
+            'rotWithShape' => '0',
+        ],
+        9 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 13500000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'br',
+            'rotWithShape' => '0',
+        ],
+        //INNER
+        10 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 2700000 / self::ANGLE_MULTIPLIER,
+        ],
+        11 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 5400000 / self::ANGLE_MULTIPLIER,
+        ],
+        12 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 8100000 / self::ANGLE_MULTIPLIER,
+        ],
+        13 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+        ],
+        14 => [
+            'effect' => 'innerShdw',
+            'blur' => 114300 / self::POINTS_WIDTH_MULTIPLIER,
+        ],
+        15 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 10800000 / self::ANGLE_MULTIPLIER,
+        ],
+        16 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 18900000 / self::ANGLE_MULTIPLIER,
+        ],
+        17 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 16200000 / self::ANGLE_MULTIPLIER,
+        ],
+        18 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 13500000 / self::ANGLE_MULTIPLIER,
+        ],
+        //perspective
+        19 => [
+            'effect' => 'outerShdw',
+            'blur' => 152400 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 317500 / self::POINTS_WIDTH_MULTIPLIER,
+            'size' => [
+                'sx' => 90000 / self::PERCENTAGE_MULTIPLIER,
+                'sy' => -19000 / self::PERCENTAGE_MULTIPLIER,
+            ],
+            'direction' => 5400000 / self::ANGLE_MULTIPLIER,
+            'rotWithShape' => '0',
+        ],
+        20 => [
+            'effect' => 'outerShdw',
+            'blur' => 76200 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 18900000 / self::ANGLE_MULTIPLIER,
+            'size' => [
+                'sy' => 23000 / self::PERCENTAGE_MULTIPLIER,
+                'kx' => -1200000 / self::ANGLE_MULTIPLIER,
+            ],
+            'algn' => 'bl',
+            'rotWithShape' => '0',
+        ],
+        21 => [
+            'effect' => 'outerShdw',
+            'blur' => 76200 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 13500000 / self::ANGLE_MULTIPLIER,
+            'size' => [
+                'sy' => 23000 / self::PERCENTAGE_MULTIPLIER,
+                'kx' => 1200000 / self::ANGLE_MULTIPLIER,
+            ],
+            'algn' => 'br',
+            'rotWithShape' => '0',
+        ],
+        22 => [
+            'effect' => 'outerShdw',
+            'blur' => 76200 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 12700 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 2700000 / self::ANGLE_MULTIPLIER,
+            'size' => [
+                'sy' => -23000 / self::PERCENTAGE_MULTIPLIER,
+                'kx' => -800400 / self::ANGLE_MULTIPLIER,
+            ],
+            'algn' => 'bl',
+            'rotWithShape' => '0',
+        ],
+        23 => [
+            'effect' => 'outerShdw',
+            'blur' => 76200 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 12700 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 8100000 / self::ANGLE_MULTIPLIER,
+            'size' => [
+                'sy' => -23000 / self::PERCENTAGE_MULTIPLIER,
+                'kx' => 800400 / self::ANGLE_MULTIPLIER,
+            ],
+            'algn' => 'br',
+            'rotWithShape' => '0',
+        ],
+    ];
+
+    protected function getShadowPresetsMap(int $presetsOption): array
+    {
+        return self::PRESETS_OPTIONS[$presetsOption] ?? self::PRESETS_OPTIONS[0];
+    }
+
+    /**
+     * Get value of array element.
+     */
+    protected function getArrayElementsValue(array $properties, array|int|string $elements): mixed
+    {
+        $reference = &$properties;
+        if (!is_array($elements)) {
+            return $reference[$elements];
+        }
+
+        foreach ($elements as $keys) {
+            $reference = &$reference[$keys];
+        }
+
+        return $reference;
+    }
+
+    /**
+     * Set Glow Properties.
+     */
+    public function setGlowProperties(float $size, ?string $colorValue = null, ?int $colorAlpha = null, ?string $colorType = null): void
+    {
+        $this
+            ->activateObject()
+            ->setGlowSize($size);
+        $this->glowColor->setColorPropertiesArray(
+            [
+                'value' => $colorValue,
+                'type' => $colorType,
+                'alpha' => $colorAlpha,
+            ]
+        );
+    }
+
+    /**
+     * Get Glow Property.
+     */
+    public function getGlowProperty(array|string $property): null|array|float|int|string
+    {
+        $retVal = null;
+        if ($property === 'size') {
+            $retVal = $this->glowSize;
+        } elseif ($property === 'color') {
+            $retVal = [
+                'value' => $this->glowColor->getColorProperty('value'),
+                'type' => $this->glowColor->getColorProperty('type'),
+                'alpha' => $this->glowColor->getColorProperty('alpha'),
+            ];
+        } elseif (is_array($property) && count($property) >= 2 && $property[0] === 'color') {
+            $retVal = $this->glowColor->getColorProperty($property[1]);
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Get Glow Color Property.
+     */
+    public function getGlowColor(string $propertyName): null|int|string
+    {
+        return $this->glowColor->getColorProperty($propertyName);
+    }
+
+    public function getGlowColorObject(): ChartColor
+    {
+        return $this->glowColor;
+    }
+
+    /**
+     * Get Glow Size.
+     */
+    public function getGlowSize(): ?float
+    {
+        return $this->glowSize;
+    }
+
+    /**
+     * Set Glow Size.
+     *
+     * @return $this
+     */
+    protected function setGlowSize(?float $size)
+    {
+        $this->glowSize = $size;
+
+        return $this;
+    }
+
+    /**
+     * Set Soft Edges Size.
+     */
+    public function setSoftEdges(?float $size): void
+    {
+        if ($size !== null) {
+            $this->activateObject();
+            $this->softEdges['size'] = $size;
+        }
+    }
+
+    /**
+     * Get Soft Edges Size.
+     */
+    public function getSoftEdgesSize(): ?float
+    {
+        return $this->softEdges['size'];
+    }
+
+    public function setShadowProperty(string $propertyName, mixed $value): self
+    {
+        $this->activateObject();
+        if ($propertyName === 'color' && is_array($value)) {
+            $this->shadowColor->setColorPropertiesArray($value);
+        } else {
+            $this->shadowProperties[$propertyName] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Properties.
+     */
+    public function setShadowProperties(int $presets, ?string $colorValue = null, ?string $colorType = null, null|float|int|string $colorAlpha = null, ?float $blur = null, ?int $angle = null, ?float $distance = null): void
+    {
+        $this->activateObject()->setShadowPresetsProperties((int) $presets);
+        if ($presets === 0) {
+            $this->shadowColor->setType(ChartColor::EXCEL_COLOR_TYPE_STANDARD);
+            $this->shadowColor->setValue('black');
+            $this->shadowColor->setAlpha(40);
+        }
+        if ($colorValue !== null) {
+            $this->shadowColor->setValue($colorValue);
+        }
+        if ($colorType !== null) {
+            $this->shadowColor->setType($colorType);
+        }
+        if (is_numeric($colorAlpha)) {
+            $this->shadowColor->setAlpha((int) $colorAlpha);
+        }
+        $this
+            ->setShadowBlur($blur)
+            ->setShadowAngle($angle)
+            ->setShadowDistance($distance);
+    }
+
+    /**
+     * Set Shadow Presets Properties.
+     *
+     * @return $this
+     */
+    protected function setShadowPresetsProperties(int $presets)
+    {
+        $this->shadowProperties['presets'] = $presets;
+        $this->setShadowPropertiesMapValues($this->getShadowPresetsMap($presets));
+
+        return $this;
+    }
+
+    protected const SHADOW_ARRAY_KEYS = ['size', 'color'];
+
+    /**
+     * Set Shadow Properties Values.
+     *
+     * @return $this
+     */
+    protected function setShadowPropertiesMapValues(array $propertiesMap, ?array &$reference = null)
+    {
+        $base_reference = $reference;
+        foreach ($propertiesMap as $property_key => $property_val) {
+            if (is_array($property_val)) {
+                if (in_array($property_key, self::SHADOW_ARRAY_KEYS, true)) {
+                    $reference = &$this->shadowProperties[$property_key];
+                    $this->setShadowPropertiesMapValues($property_val, $reference);
+                }
+            } else {
+                if ($base_reference === null) {
+                    $this->shadowProperties[$property_key] = $property_val;
+                } else {
+                    $reference[$property_key] = $property_val;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Blur.
+     *
+     * @return $this
+     */
+    protected function setShadowBlur(?float $blur)
+    {
+        if ($blur !== null) {
+            $this->shadowProperties['blur'] = $blur;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Angle.
+     *
+     * @return $this
+     */
+    protected function setShadowAngle(null|float|int|string $angle)
+    {
+        if (is_numeric($angle)) {
+            $this->shadowProperties['direction'] = $angle;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Distance.
+     *
+     * @return $this
+     */
+    protected function setShadowDistance(?float $distance)
+    {
+        if ($distance !== null) {
+            $this->shadowProperties['distance'] = $distance;
+        }
+
+        return $this;
+    }
+
+    public function getShadowColorObject(): ChartColor
+    {
+        return $this->shadowColor;
+    }
+
+    /**
+     * Get Shadow Property.
+     *
+     * @param string|string[] $elements
+     */
+    public function getShadowProperty($elements): array|string|null
+    {
+        if ($elements === 'color') {
+            return [
+                'value' => $this->shadowColor->getValue(),
+                'type' => $this->shadowColor->getType(),
+                'alpha' => $this->shadowColor->getAlpha(),
+            ];
+        }
+        $retVal = $this->getArrayElementsValue($this->shadowProperties, $elements);
+        if (is_scalar($retVal)) {
+            $retVal = (string) $retVal;
+        } elseif ($retVal !== null && !is_array($retVal)) {
+            // @codeCoverageIgnoreStart
+            throw new Exception('Unexpected value for shadowProperty');
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $retVal;
+    }
+
+    public function getShadowArray(): array
+    {
+        $array = $this->shadowProperties;
+        if ($this->getShadowColorObject()->isUsable()) {
+            $array['color'] = $this->getShadowProperty('color');
+        }
+
+        return $array;
+    }
+
+    protected ChartColor $lineColor;
+
+    protected array $lineStyleProperties = [
+        'width' => null, //'9525',
+        'compound' => '', //self::LINE_STYLE_COMPOUND_SIMPLE,
+        'dash' => '', //self::LINE_STYLE_DASH_SOLID,
+        'cap' => '', //self::LINE_STYLE_CAP_FLAT,
+        'join' => '', //self::LINE_STYLE_JOIN_BEVEL,
+        'arrow' => [
+            'head' => [
+                'type' => '', //self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                'size' => '', //self::LINE_STYLE_ARROW_SIZE_5,
+                'w' => '',
+                'len' => '',
+            ],
+            'end' => [
+                'type' => '', //self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                'size' => '', //self::LINE_STYLE_ARROW_SIZE_8,
+                'w' => '',
+                'len' => '',
+            ],
+        ],
+    ];
+
+    public function copyLineStyles(self $otherProperties): void
+    {
+        $this->lineStyleProperties = $otherProperties->lineStyleProperties;
+        $this->lineColor = $otherProperties->lineColor;
+        $this->glowSize = $otherProperties->glowSize;
+        $this->glowColor = $otherProperties->glowColor;
+        $this->softEdges = $otherProperties->softEdges;
+        $this->shadowProperties = $otherProperties->shadowProperties;
+    }
+
+    public function getLineColor(): ChartColor
+    {
+        return $this->lineColor;
+    }
+
+    /**
+     * Set Line Color Properties.
+     */
+    public function setLineColorProperties(?string $value, ?int $alpha = null, ?string $colorType = null): void
+    {
+        $this->activateObject();
+        $this->lineColor->setColorPropertiesArray(
+            $this->setColorProperties(
+                $value,
+                $alpha,
+                $colorType
+            )
+        );
+    }
+
+    /**
+     * Get Line Color Property.
+     */
+    public function getLineColorProperty(string $propertyName): null|int|string
+    {
+        return $this->lineColor->getColorProperty($propertyName);
+    }
+
+    /**
+     * Set Line Style Properties.
+     */
+    public function setLineStyleProperties(
+        null|float|int|string $lineWidth = null,
+        ?string $compoundType = '',
+        ?string $dashType = '',
+        ?string $capType = '',
+        ?string $joinType = '',
+        ?string $headArrowType = '',
+        int $headArrowSize = 0,
+        ?string $endArrowType = '',
+        int $endArrowSize = 0,
+        ?string $headArrowWidth = '',
+        ?string $headArrowLength = '',
+        ?string $endArrowWidth = '',
+        ?string $endArrowLength = ''
+    ): void {
+        $this->activateObject();
+        if (is_numeric($lineWidth)) {
+            $this->lineStyleProperties['width'] = $lineWidth;
+        }
+        if ($compoundType !== '') {
+            $this->lineStyleProperties['compound'] = $compoundType;
+        }
+        if ($dashType !== '') {
+            $this->lineStyleProperties['dash'] = $dashType;
+        }
+        if ($capType !== '') {
+            $this->lineStyleProperties['cap'] = $capType;
+        }
+        if ($joinType !== '') {
+            $this->lineStyleProperties['join'] = $joinType;
+        }
+        if ($headArrowType !== '') {
+            $this->lineStyleProperties['arrow']['head']['type'] = $headArrowType;
+        }
+        if (isset(self::ARROW_SIZES[$headArrowSize])) {
+            $this->lineStyleProperties['arrow']['head']['size'] = $headArrowSize;
+            $this->lineStyleProperties['arrow']['head']['w'] = self::ARROW_SIZES[$headArrowSize]['w'];
+            $this->lineStyleProperties['arrow']['head']['len'] = self::ARROW_SIZES[$headArrowSize]['len'];
+        }
+        if ($endArrowType !== '') {
+            $this->lineStyleProperties['arrow']['end']['type'] = $endArrowType;
+        }
+        if (isset(self::ARROW_SIZES[$endArrowSize])) {
+            $this->lineStyleProperties['arrow']['end']['size'] = $endArrowSize;
+            $this->lineStyleProperties['arrow']['end']['w'] = self::ARROW_SIZES[$endArrowSize]['w'];
+            $this->lineStyleProperties['arrow']['end']['len'] = self::ARROW_SIZES[$endArrowSize]['len'];
+        }
+        if ($headArrowWidth !== '') {
+            $this->lineStyleProperties['arrow']['head']['w'] = $headArrowWidth;
+        }
+        if ($headArrowLength !== '') {
+            $this->lineStyleProperties['arrow']['head']['len'] = $headArrowLength;
+        }
+        if ($endArrowWidth !== '') {
+            $this->lineStyleProperties['arrow']['end']['w'] = $endArrowWidth;
+        }
+        if ($endArrowLength !== '') {
+            $this->lineStyleProperties['arrow']['end']['len'] = $endArrowLength;
+        }
+    }
+
+    public function getLineStyleArray(): array
+    {
+        return $this->lineStyleProperties;
+    }
+
+    public function setLineStyleArray(array $lineStyleProperties = []): self
+    {
+        $this->activateObject();
+        $this->lineStyleProperties['width'] = $lineStyleProperties['width'] ?? null;
+        $this->lineStyleProperties['compound'] = $lineStyleProperties['compound'] ?? '';
+        $this->lineStyleProperties['dash'] = $lineStyleProperties['dash'] ?? '';
+        $this->lineStyleProperties['cap'] = $lineStyleProperties['cap'] ?? '';
+        $this->lineStyleProperties['join'] = $lineStyleProperties['join'] ?? '';
+        $this->lineStyleProperties['arrow']['head']['type'] = $lineStyleProperties['arrow']['head']['type'] ?? '';
+        $this->lineStyleProperties['arrow']['head']['size'] = $lineStyleProperties['arrow']['head']['size'] ?? '';
+        $this->lineStyleProperties['arrow']['head']['w'] = $lineStyleProperties['arrow']['head']['w'] ?? '';
+        $this->lineStyleProperties['arrow']['head']['len'] = $lineStyleProperties['arrow']['head']['len'] ?? '';
+        $this->lineStyleProperties['arrow']['end']['type'] = $lineStyleProperties['arrow']['end']['type'] ?? '';
+        $this->lineStyleProperties['arrow']['end']['size'] = $lineStyleProperties['arrow']['end']['size'] ?? '';
+        $this->lineStyleProperties['arrow']['end']['w'] = $lineStyleProperties['arrow']['end']['w'] ?? '';
+        $this->lineStyleProperties['arrow']['end']['len'] = $lineStyleProperties['arrow']['end']['len'] ?? '';
+
+        return $this;
+    }
+
+    public function setLineStyleProperty(string $propertyName, mixed $value): self
+    {
+        $this->activateObject();
+        $this->lineStyleProperties[$propertyName] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get Line Style Property.
+     */
+    public function getLineStyleProperty(array|string $elements): ?string
+    {
+        $retVal = $this->getArrayElementsValue($this->lineStyleProperties, $elements);
+        if (is_scalar($retVal)) {
+            $retVal = (string) $retVal;
+        } elseif ($retVal !== null) {
+            // @codeCoverageIgnoreStart
+            throw new Exception('Unexpected value for lineStyleProperty');
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $retVal;
+    }
+
+    protected const ARROW_SIZES = [
+        1 => ['w' => 'sm', 'len' => 'sm'],
+        2 => ['w' => 'sm', 'len' => 'med'],
+        3 => ['w' => 'sm', 'len' => 'lg'],
+        4 => ['w' => 'med', 'len' => 'sm'],
+        5 => ['w' => 'med', 'len' => 'med'],
+        6 => ['w' => 'med', 'len' => 'lg'],
+        7 => ['w' => 'lg', 'len' => 'sm'],
+        8 => ['w' => 'lg', 'len' => 'med'],
+        9 => ['w' => 'lg', 'len' => 'lg'],
+    ];
+
+    /**
+     * Get Line Style Arrow Size.
+     */
+    protected function getLineStyleArrowSize(int $arraySelector, string $arrayKaySelector): string
+    {
+        return self::ARROW_SIZES[$arraySelector][$arrayKaySelector] ?? '';
+    }
+
+    /**
+     * Get Line Style Arrow Parameters.
+     */
+    public function getLineStyleArrowParameters(string $arrowSelector, string $propertySelector): string
+    {
+        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrowSelector]['size'], $propertySelector);
+    }
+
+    /**
+     * Get Line Style Arrow Width.
+     */
+    public function getLineStyleArrowWidth(string $arrow): ?string
+    {
+        return $this->getLineStyleProperty(['arrow', $arrow, 'w']);
+    }
+
+    /**
+     * Get Line Style Arrow Excel Length.
+     */
+    public function getLineStyleArrowLength(string $arrow): ?string
+    {
+        return $this->getLineStyleProperty(['arrow', $arrow, 'len']);
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->lineColor = clone $this->lineColor;
+        $this->glowColor = clone $this->glowColor;
+        $this->shadowColor = clone $this->shadowColor;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php
new file mode 100644
index 00000000..ae28ff4f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+
+interface IRenderer
+{
+    /**
+     * IRenderer constructor.
+     */
+    public function __construct(Chart $chart);
+
+    /**
+     * Render the chart to given file (or stream).
+     *
+     * @param ?string $filename Name of the file render to
+     *
+     * @return bool true on success
+     */
+    public function render(?string $filename): bool;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
new file mode 100644
index 00000000..faadd9a3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+/**
+ * Jpgraph is not oficially maintained in Composer, so the version there
+ * could be out of date. For that reason, all unit test requiring Jpgraph
+ * are skipped. So, do not measure code coverage for this class till that
+ * is fixed.
+ *
+ * This implementation uses abandoned package
+ * https://packagist.org/packages/jpgraph/jpgraph
+ *
+ * @codeCoverageIgnore
+ */
+class JpGraph extends JpGraphRendererBase
+{
+    protected static function init(): void
+    {
+        static $loaded = false;
+        if ($loaded) {
+            return;
+        }
+
+        // JpGraph is no longer included with distribution, but user may install it.
+        // So Scrutinizer's complaint that it can't find it is reasonable, but unfixable.
+        \JpGraph\JpGraph::load();
+        \JpGraph\JpGraph::module('bar');
+        \JpGraph\JpGraph::module('contour');
+        \JpGraph\JpGraph::module('line');
+        \JpGraph\JpGraph::module('pie');
+        \JpGraph\JpGraph::module('pie3d');
+        \JpGraph\JpGraph::module('radar');
+        \JpGraph\JpGraph::module('regstat');
+        \JpGraph\JpGraph::module('scatter');
+        \JpGraph\JpGraph::module('stock');
+
+        $loaded = true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
new file mode 100644
index 00000000..151d5b58
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
@@ -0,0 +1,886 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+use AccBarPlot;
+use AccLinePlot;
+use BarPlot;
+use ContourPlot;
+use Graph;
+use GroupBarPlot;
+use LinePlot;
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PieGraph;
+use PiePlot;
+use PiePlot3D;
+use PiePlotC;
+use RadarGraph;
+use RadarPlot;
+use ScatterPlot;
+use Spline;
+use StockPlot;
+
+/**
+ * Base class for different Jpgraph implementations as charts renderer.
+ */
+abstract class JpGraphRendererBase implements IRenderer
+{
+    private const DEFAULT_WIDTH = 640.0;
+
+    private const DEFAULT_HEIGHT = 480.0;
+
+    private static $colourSet = [
+        'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
+        'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
+        'mediumblue', 'magenta', 'sandybrown', 'cyan',
+        'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
+        'goldenrod2',
+    ];
+
+    private static array $markSet;
+
+    private Chart $chart;
+
+    private $graph;
+
+    private static $plotColour = 0;
+
+    private static $plotMark = 0;
+
+    /**
+     * Create a new jpgraph.
+     */
+    public function __construct(Chart $chart)
+    {
+        static::init();
+        $this->graph = null;
+        $this->chart = $chart;
+
+        self::$markSet = [
+            'diamond' => MARK_DIAMOND,
+            'square' => MARK_SQUARE,
+            'triangle' => MARK_UTRIANGLE,
+            'x' => MARK_X,
+            'star' => MARK_STAR,
+            'dot' => MARK_FILLEDCIRCLE,
+            'dash' => MARK_DTRIANGLE,
+            'circle' => MARK_CIRCLE,
+            'plus' => MARK_CROSS,
+        ];
+    }
+
+    private function getGraphWidth(): float
+    {
+        return $this->chart->getRenderedWidth() ?? self::DEFAULT_WIDTH;
+    }
+
+    private function getGraphHeight(): float
+    {
+        return $this->chart->getRenderedHeight() ?? self::DEFAULT_HEIGHT;
+    }
+
+    /**
+     * This method should be overriden in descendants to do real JpGraph library initialization.
+     */
+    abstract protected static function init(): void;
+
+    private function formatPointMarker($seriesPlot, $markerID)
+    {
+        $plotMarkKeys = array_keys(self::$markSet);
+        if ($markerID === null) {
+            //    Use default plot marker (next marker in the series)
+            self::$plotMark %= count(self::$markSet);
+            $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
+        } elseif ($markerID !== 'none') {
+            //    Use specified plot marker (if it exists)
+            if (isset(self::$markSet[$markerID])) {
+                $seriesPlot->mark->SetType(self::$markSet[$markerID]);
+            } else {
+                //    If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
+                self::$plotMark %= count(self::$markSet);
+                $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
+            }
+        } else {
+            //    Hide plot marker
+            $seriesPlot->mark->Hide();
+        }
+        $seriesPlot->mark->SetColor(self::$colourSet[self::$plotColour]);
+        $seriesPlot->mark->SetFillColor(self::$colourSet[self::$plotColour]);
+        $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+
+        return $seriesPlot;
+    }
+
+    private function formatDataSetLabels(int $groupID, array $datasetLabels, $rotation = '')
+    {
+        $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode() ?? '';
+        //    Retrieve any label formatting code
+        $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
+
+        $testCurrentIndex = 0;
+        foreach ($datasetLabels as $i => $datasetLabel) {
+            if (is_array($datasetLabel)) {
+                if ($rotation == 'bar') {
+                    $datasetLabels[$i] = implode(' ', $datasetLabel);
+                } else {
+                    $datasetLabel = array_reverse($datasetLabel);
+                    $datasetLabels[$i] = implode("\n", $datasetLabel);
+                }
+            } else {
+                //    Format labels according to any formatting code
+                if ($datasetLabelFormatCode !== null) {
+                    $datasetLabels[$i] = NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode);
+                }
+            }
+            ++$testCurrentIndex;
+        }
+
+        return $datasetLabels;
+    }
+
+    private function percentageSumCalculation(int $groupID, $seriesCount)
+    {
+        $sumValues = [];
+        //    Adjust our values to a percentage value across all series in the group
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            if ($i == 0) {
+                $sumValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            } else {
+                $nextValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+                foreach ($nextValues as $k => $value) {
+                    if (isset($sumValues[$k])) {
+                        $sumValues[$k] += $value;
+                    } else {
+                        $sumValues[$k] = $value;
+                    }
+                }
+            }
+        }
+
+        return $sumValues;
+    }
+
+    private function percentageAdjustValues(array $dataValues, array $sumValues)
+    {
+        foreach ($dataValues as $k => $dataValue) {
+            $dataValues[$k] = $dataValue / $sumValues[$k] * 100;
+        }
+
+        return $dataValues;
+    }
+
+    private function getCaption($captionElement)
+    {
+        //    Read any caption
+        $caption = ($captionElement !== null) ? $captionElement->getCaption() : null;
+        //    Test if we have a title caption to display
+        if ($caption !== null) {
+            //    If we do, it could be a plain string or an array
+            if (is_array($caption)) {
+                //    Implode an array to a plain string
+                $caption = implode('', $caption);
+            }
+        }
+
+        return $caption;
+    }
+
+    private function renderTitle(): void
+    {
+        $title = $this->getCaption($this->chart->getTitle());
+        if ($title !== null) {
+            $this->graph->title->Set($title);
+        }
+    }
+
+    private function renderLegend(): void
+    {
+        $legend = $this->chart->getLegend();
+        if ($legend !== null) {
+            $legendPosition = $legend->getPosition();
+            switch ($legendPosition) {
+                case 'r':
+                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //    right
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+                case 'l':
+                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //    left
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+                case 't':
+                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //    top
+
+                    break;
+                case 'b':
+                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //    bottom
+
+                    break;
+                default:
+                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //    top-right
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+            }
+        } else {
+            $this->graph->legend->Hide();
+        }
+    }
+
+    private function renderCartesianPlotArea(string $type = 'textlin'): void
+    {
+        $this->graph = new Graph($this->getGraphWidth(), $this->getGraphHeight());
+        $this->graph->SetScale($type);
+
+        $this->renderTitle();
+
+        //    Rotate for bar rather than column chart
+        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
+        $reverse = $rotation == 'bar';
+
+        $xAxisLabel = $this->chart->getXAxisLabel();
+        if ($xAxisLabel !== null) {
+            $title = $this->getCaption($xAxisLabel);
+            if ($title !== null) {
+                $this->graph->xaxis->SetTitle($title, 'center');
+                $this->graph->xaxis->title->SetMargin(35);
+                if ($reverse) {
+                    $this->graph->xaxis->title->SetAngle(90);
+                    $this->graph->xaxis->title->SetMargin(90);
+                }
+            }
+        }
+
+        $yAxisLabel = $this->chart->getYAxisLabel();
+        if ($yAxisLabel !== null) {
+            $title = $this->getCaption($yAxisLabel);
+            if ($title !== null) {
+                $this->graph->yaxis->SetTitle($title, 'center');
+                if ($reverse) {
+                    $this->graph->yaxis->title->SetAngle(0);
+                    $this->graph->yaxis->title->SetMargin(-55);
+                }
+            }
+        }
+    }
+
+    private function renderPiePlotArea(): void
+    {
+        $this->graph = new PieGraph($this->getGraphWidth(), $this->getGraphHeight());
+
+        $this->renderTitle();
+    }
+
+    private function renderRadarPlotArea(): void
+    {
+        $this->graph = new RadarGraph($this->getGraphWidth(), $this->getGraphHeight());
+        $this->graph->SetScale('lin');
+
+        $this->renderTitle();
+    }
+
+    private function getDataLabel(int $groupId, int $index): mixed
+    {
+        $plotLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupId)->getPlotLabelByIndex($index);
+        if (!$plotLabel) {
+            return '';
+        }
+
+        return $plotLabel->getDataValue();
+    }
+
+    private function renderPlotLine(int $groupID, bool $filled = false, bool $combination = false): void
+    {
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[0];
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+        if ($grouping == 'percentStacked') {
+            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
+        } else {
+            $sumValues = [];
+        }
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[$i];
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointMarker();
+
+            if ($grouping == 'percentStacked') {
+                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
+            }
+
+            //    Fill in any missing values in the $dataValues array
+            $testCurrentIndex = 0;
+            foreach ($dataValues as $k => $dataValue) {
+                while ($k != $testCurrentIndex) {
+                    $dataValues[$testCurrentIndex] = null;
+                    ++$testCurrentIndex;
+                }
+                ++$testCurrentIndex;
+            }
+
+            $seriesPlot = new LinePlot($dataValues);
+            if ($combination) {
+                $seriesPlot->SetBarCenter();
+            }
+
+            if ($filled) {
+                $seriesPlot->SetFilled(true);
+                $seriesPlot->SetColor('black');
+                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
+            } else {
+                //    Set the appropriate plot marker
+                $this->formatPointMarker($seriesPlot, $marker);
+            }
+
+            $seriesPlot->SetLegend($this->getDataLabel($groupID, $index));
+
+            $seriesPlots[] = $seriesPlot;
+        }
+
+        if ($grouping == 'standard') {
+            $groupPlot = $seriesPlots;
+        } else {
+            $groupPlot = new AccLinePlot($seriesPlots);
+        }
+        $this->graph->Add($groupPlot);
+    }
+
+    private function renderPlotBar(int $groupID, ?string $dimensions = '2d'): void
+    {
+        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
+        //    Rotate for bar rather than column chart
+        if (($groupID == 0) && ($rotation == 'bar')) {
+            $this->graph->Set90AndMargin();
+        }
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[0];
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $rotation);
+            //    Rotate for bar rather than column chart
+            if ($rotation == 'bar') {
+                $datasetLabels = array_reverse($datasetLabels);
+                $this->graph->yaxis->SetPos('max');
+                $this->graph->yaxis->SetLabelAlign('center', 'top');
+                $this->graph->yaxis->SetLabelSide(SIDE_RIGHT);
+            }
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+        if ($grouping == 'percentStacked') {
+            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
+        } else {
+            $sumValues = [];
+        }
+
+        //    Loop through each data series in turn
+        for ($j = 0; $j < $seriesCount; ++$j) {
+            $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[$j];
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getDataValues();
+            if ($grouping == 'percentStacked') {
+                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
+            }
+
+            //    Fill in any missing values in the $dataValues array
+            $testCurrentIndex = 0;
+            foreach ($dataValues as $k => $dataValue) {
+                while ($k != $testCurrentIndex) {
+                    $dataValues[$testCurrentIndex] = null;
+                    ++$testCurrentIndex;
+                }
+                ++$testCurrentIndex;
+            }
+
+            //    Reverse the $dataValues order for bar rather than column chart
+            if ($rotation == 'bar') {
+                $dataValues = array_reverse($dataValues);
+            }
+            $seriesPlot = new BarPlot($dataValues);
+            $seriesPlot->SetColor('black');
+            $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
+            if ($dimensions == '3d') {
+                $seriesPlot->SetShadow();
+            }
+
+            $seriesPlot->SetLegend($this->getDataLabel($groupID, $j));
+
+            $seriesPlots[] = $seriesPlot;
+        }
+        //    Reverse the plot order for bar rather than column chart
+        if (($rotation == 'bar') && ($grouping != 'percentStacked')) {
+            $seriesPlots = array_reverse($seriesPlots);
+        }
+
+        if ($grouping == 'clustered') {
+            $groupPlot = new GroupBarPlot($seriesPlots);
+        } elseif ($grouping == 'standard') {
+            $groupPlot = new GroupBarPlot($seriesPlots);
+        } else {
+            $groupPlot = new AccBarPlot($seriesPlots);
+            if ($dimensions == '3d') {
+                $groupPlot->SetShadow();
+            }
+        }
+
+        $this->graph->Add($groupPlot);
+    }
+
+    private function renderPlotScatter(int $groupID, bool $bubble): void
+    {
+        $scatterStyle = $bubbleSize = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $plotCategoryByIndex = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i);
+            if ($plotCategoryByIndex === false) {
+                $plotCategoryByIndex = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0);
+            }
+            $dataValuesY = $plotCategoryByIndex->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+            $redoDataValuesY = true;
+            if ($bubble) {
+                if (!$bubbleSize) {
+                    $bubbleSize = '10';
+                }
+                $redoDataValuesY = false;
+                foreach ($dataValuesY as $dataValueY) {
+                    if (!is_int($dataValueY) && !is_float($dataValueY)) {
+                        $redoDataValuesY = true;
+
+                        break;
+                    }
+                }
+            }
+            if ($redoDataValuesY) {
+                foreach ($dataValuesY as $k => $dataValueY) {
+                    $dataValuesY[$k] = $k;
+                }
+            }
+
+            $seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY);
+            if ($scatterStyle == 'lineMarker') {
+                $seriesPlot->SetLinkPoints();
+                $seriesPlot->link->SetColor(self::$colourSet[self::$plotColour]);
+            } elseif ($scatterStyle == 'smoothMarker') {
+                $spline = new Spline($dataValuesY, $dataValuesX);
+                [$splineDataY, $splineDataX] = $spline->Get(count($dataValuesX) * $this->getGraphWidth() / 20);
+                $lplot = new LinePlot($splineDataX, $splineDataY);
+                $lplot->SetColor(self::$colourSet[self::$plotColour]);
+
+                $this->graph->Add($lplot);
+            }
+
+            if ($bubble) {
+                $this->formatPointMarker($seriesPlot, 'dot');
+                $seriesPlot->mark->SetColor('black');
+                $seriesPlot->mark->SetSize($bubbleSize);
+            } else {
+                $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+                $this->formatPointMarker($seriesPlot, $marker);
+            }
+            $seriesPlot->SetLegend($this->getDataLabel($groupID, $i));
+
+            $this->graph->Add($seriesPlot);
+        }
+    }
+
+    private function renderPlotRadar(int $groupID): void
+    {
+        $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+
+            $dataValues = [];
+            foreach ($dataValuesY as $k => $dataValueY) {
+                $dataValues[$k] = is_array($dataValueY) ? implode(' ', array_reverse($dataValueY)) : $dataValueY;
+            }
+            $tmp = array_shift($dataValues);
+            $dataValues[] = $tmp;
+            $tmp = array_shift($dataValuesX);
+            $dataValuesX[] = $tmp;
+
+            $this->graph->SetTitles(array_reverse($dataValues));
+
+            $seriesPlot = new RadarPlot(array_reverse($dataValuesX));
+
+            $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+            if ($radarStyle == 'filled') {
+                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour]);
+            }
+            $this->formatPointMarker($seriesPlot, $marker);
+            $seriesPlot->SetLegend($this->getDataLabel($groupID, $i));
+
+            $this->graph->Add($seriesPlot);
+        }
+    }
+
+    private function renderPlotContour(int $groupID): void
+    {
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+
+        $dataValues = [];
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+            $dataValues[$i] = $dataValuesX;
+        }
+        $seriesPlot = new ContourPlot($dataValues);
+
+        $this->graph->Add($seriesPlot);
+    }
+
+    private function renderPlotStock(int $groupID): void
+    {
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $plotOrder = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
+
+        $dataValues = [];
+        //    Loop through each data series in turn and build the plot arrays
+        foreach ($plotOrder as $i => $v) {
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v);
+            if ($dataValuesX === false) {
+                continue;
+            }
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
+            foreach ($dataValuesX as $j => $dataValueX) {
+                $dataValues[$plotOrder[$i]][$j] = $dataValueX;
+            }
+        }
+        if (empty($dataValues)) {
+            return;
+        }
+
+        $dataValuesPlot = [];
+        // Flatten the plot arrays to a single dimensional array to work with jpgraph
+        $jMax = count($dataValues[0]);
+        for ($j = 0; $j < $jMax; ++$j) {
+            for ($i = 0; $i < $seriesCount; ++$i) {
+                $dataValuesPlot[] = $dataValues[$i][$j] ?? null;
+            }
+        }
+
+        // Set the x-axis labels
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesPlot = new StockPlot($dataValuesPlot);
+        $seriesPlot->SetWidth(20);
+
+        $this->graph->Add($seriesPlot);
+    }
+
+    private function renderAreaChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotLine($i, true, false);
+        }
+    }
+
+    private function renderLineChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotLine($i, false, false);
+        }
+    }
+
+    private function renderBarChart($groupCount, ?string $dimensions = '2d'): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotBar($i, $dimensions);
+        }
+    }
+
+    private function renderScatterChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('linlin');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotScatter($i, false);
+        }
+    }
+
+    private function renderBubbleChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('linlin');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotScatter($i, true);
+        }
+    }
+
+    private function renderPieChart($groupCount, ?string $dimensions = '2d', bool $doughnut = false, bool $multiplePlots = false): void
+    {
+        $this->renderPiePlotArea();
+
+        $iLimit = ($multiplePlots) ? $groupCount : 1;
+        for ($groupID = 0; $groupID < $iLimit; ++$groupID) {
+            $exploded = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+            $datasetLabels = [];
+            if ($groupID == 0) {
+                $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+                if ($labelCount > 0) {
+                    $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+                    $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
+                }
+            }
+
+            $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+            //    For pie charts, we only display the first series: doughnut charts generally display all series
+            $jLimit = ($multiplePlots) ? $seriesCount : 1;
+            //    Loop through each data series in turn
+            for ($j = 0; $j < $jLimit; ++$j) {
+                $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+
+                //    Fill in any missing values in the $dataValues array
+                $testCurrentIndex = 0;
+                foreach ($dataValues as $k => $dataValue) {
+                    while ($k != $testCurrentIndex) {
+                        $dataValues[$testCurrentIndex] = null;
+                        ++$testCurrentIndex;
+                    }
+                    ++$testCurrentIndex;
+                }
+
+                if ($dimensions == '3d') {
+                    $seriesPlot = new PiePlot3D($dataValues);
+                } else {
+                    if ($doughnut) {
+                        $seriesPlot = new PiePlotC($dataValues);
+                    } else {
+                        $seriesPlot = new PiePlot($dataValues);
+                    }
+                }
+
+                if ($multiplePlots) {
+                    $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
+                }
+
+                if ($doughnut && method_exists($seriesPlot, 'SetMidColor')) {
+                    $seriesPlot->SetMidColor('white');
+                }
+
+                $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+                if (count($datasetLabels) > 0) {
+                    $seriesPlot->SetLabels(array_fill(0, count($datasetLabels), ''));
+                }
+                if ($dimensions != '3d') {
+                    $seriesPlot->SetGuideLines(false);
+                }
+                if ($j == 0) {
+                    if ($exploded) {
+                        $seriesPlot->ExplodeAll();
+                    }
+                    $seriesPlot->SetLegends($datasetLabels);
+                }
+
+                $this->graph->Add($seriesPlot);
+            }
+        }
+    }
+
+    private function renderRadarChart($groupCount): void
+    {
+        $this->renderRadarPlotArea();
+
+        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
+            $this->renderPlotRadar($groupID);
+        }
+    }
+
+    private function renderStockChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('intint');
+
+        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
+            $this->renderPlotStock($groupID);
+        }
+    }
+
+    private function renderContourChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('intint');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotContour($i);
+        }
+    }
+
+    private function renderCombinationChart($groupCount, $outputDestination): bool
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $dimensions = null;
+            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+            switch ($chartType) {
+                case 'area3DChart':
+                case 'areaChart':
+                    $this->renderPlotLine($i, true, true);
+
+                    break;
+                case 'bar3DChart':
+                    $dimensions = '3d';
+                    // no break
+                case 'barChart':
+                    $this->renderPlotBar($i, $dimensions);
+
+                    break;
+                case 'line3DChart':
+                case 'lineChart':
+                    $this->renderPlotLine($i, false, true);
+
+                    break;
+                case 'scatterChart':
+                    $this->renderPlotScatter($i, false);
+
+                    break;
+                case 'bubbleChart':
+                    $this->renderPlotScatter($i, true);
+
+                    break;
+                default:
+                    $this->graph = null;
+
+                    return false;
+            }
+        }
+
+        $this->renderLegend();
+
+        $this->graph->Stroke($outputDestination);
+
+        return true;
+    }
+
+    public function render(?string $outputDestination): bool
+    {
+        self::$plotColour = 0;
+
+        $groupCount = $this->chart->getPlotArea()->getPlotGroupCount();
+
+        $dimensions = null;
+        if ($groupCount == 1) {
+            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
+        } else {
+            $chartTypes = [];
+            for ($i = 0; $i < $groupCount; ++$i) {
+                $chartTypes[] = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+            }
+            $chartTypes = array_unique($chartTypes);
+            if (count($chartTypes) == 1) {
+                $chartType = array_pop($chartTypes);
+            } elseif (count($chartTypes) == 0) {
+                echo 'Chart is not yet implemented<br />';
+
+                return false;
+            } else {
+                return $this->renderCombinationChart($groupCount, $outputDestination);
+            }
+        }
+
+        switch ($chartType) {
+            case 'area3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'areaChart':
+                $this->renderAreaChart($groupCount);
+
+                break;
+            case 'bar3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'barChart':
+                $this->renderBarChart($groupCount, $dimensions);
+
+                break;
+            case 'line3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'lineChart':
+                $this->renderLineChart($groupCount);
+
+                break;
+            case 'pie3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'pieChart':
+                $this->renderPieChart($groupCount, $dimensions, false, false);
+
+                break;
+            case 'doughnut3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'doughnutChart':
+                $this->renderPieChart($groupCount, $dimensions, true, true);
+
+                break;
+            case 'scatterChart':
+                $this->renderScatterChart($groupCount);
+
+                break;
+            case 'bubbleChart':
+                $this->renderBubbleChart($groupCount);
+
+                break;
+            case 'radarChart':
+                $this->renderRadarChart($groupCount);
+
+                break;
+            case 'surface3DChart':
+            case 'surfaceChart':
+                $this->renderContourChart($groupCount);
+
+                break;
+            case 'stockChart':
+                $this->renderStockChart($groupCount);
+
+                break;
+            default:
+                echo $chartType . ' is not yet implemented<br />';
+
+                return false;
+        }
+        $this->renderLegend();
+
+        $this->graph->Stroke($outputDestination);
+
+        return true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
new file mode 100644
index 00000000..96979203
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+use mitoteam\jpgraph\MtJpGraph;
+
+/**
+ * Jpgraph is not officially maintained by Composer at packagist.org.
+ *
+ * This renderer implementation uses package
+ * https://packagist.org/packages/mitoteam/jpgraph
+ *
+ * This package is up to date for June 2023 and has PHP 8.2 support.
+ */
+class MtJpGraphRenderer extends JpGraphRendererBase
+{
+    protected static function init(): void
+    {
+        static $loaded = false;
+        if ($loaded) {
+            return;
+        }
+
+        MtJpGraph::load([
+            'bar',
+            'contour',
+            'line',
+            'pie',
+            'pie3d',
+            'radar',
+            'regstat',
+            'scatter',
+            'stock',
+        ], true); // enable Extended mode
+
+        $loaded = true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt
new file mode 100644
index 00000000..bc940600
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt	
@@ -0,0 +1,23 @@
+ChartDirector
+	https://www.advsofteng.com/cdphp.html
+
+GraPHPite
+	http://graphpite.sourceforge.net/
+
+JpGraph
+	https://jpgraph.net/
+	Used composer packages:
+        https://packagist.org/packages/jpgraph/jpgraph (\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph)
+        https://packagist.org/packages/mitoteam/jpgraph (\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer)
+
+LibChart
+	https://naku.dohcrew.com/libchart/pages/introduction/
+
+pChart
+	http://pchart.sourceforge.net/
+
+TeeChart
+	https://www.steema.com/
+
+PHPGraphLib
+    http://www.ebrueggeman.com/phpgraphlib
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php
new file mode 100644
index 00000000..29ba17b6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class Title
+{
+    public const TITLE_CELL_REFERENCE
+        = '/^(.*)!' // beginning of string, everything up to ! is match[1]
+        . '[$]([A-Z]{1,3})' // absolute column string match[2]
+        . '[$](\d{1,7})$/i'; // absolute row string match[3]
+
+    /**
+     * Title Caption.
+     *
+     * @var array<RichText|string>|RichText|string
+     */
+    private array|RichText|string $caption;
+
+    /**
+     * Allow overlay of other elements?
+     */
+    private bool $overlay = true;
+
+    /**
+     * Title Layout.
+     */
+    private ?Layout $layout;
+
+    private string $cellReference = '';
+
+    private ?Font $font = null;
+
+    /**
+     * Create a new Title.
+     */
+    public function __construct(array|RichText|string $caption = '', ?Layout $layout = null, bool $overlay = false)
+    {
+        $this->caption = $caption;
+        $this->layout = $layout;
+        $this->setOverlay($overlay);
+    }
+
+    /**
+     * Get caption.
+     */
+    public function getCaption(): array|RichText|string
+    {
+        return $this->caption;
+    }
+
+    public function getCaptionText(?Spreadsheet $spreadsheet = null): string
+    {
+        if ($spreadsheet !== null) {
+            $caption = $this->getCalculatedTitle($spreadsheet);
+            if ($caption !== null) {
+                return $caption;
+            }
+        }
+        $caption = $this->caption;
+        if (is_string($caption)) {
+            return $caption;
+        }
+        if ($caption instanceof RichText) {
+            return $caption->getPlainText();
+        }
+        $retVal = '';
+        foreach ($caption as $textx) {
+            /** @var RichText|string $text */
+            $text = $textx;
+            if ($text instanceof RichText) {
+                $retVal .= $text->getPlainText();
+            } else {
+                $retVal .= $text;
+            }
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Set caption.
+     *
+     * @return $this
+     */
+    public function setCaption(array|RichText|string $caption): static
+    {
+        $this->caption = $caption;
+
+        return $this;
+    }
+
+    /**
+     * Get allow overlay of other elements?
+     */
+    public function getOverlay(): bool
+    {
+        return $this->overlay;
+    }
+
+    /**
+     * Set allow overlay of other elements?
+     */
+    public function setOverlay(bool $overlay): self
+    {
+        $this->overlay = $overlay;
+
+        return $this;
+    }
+
+    public function getLayout(): ?Layout
+    {
+        return $this->layout;
+    }
+
+    public function setCellReference(string $cellReference): self
+    {
+        $this->cellReference = $cellReference;
+
+        return $this;
+    }
+
+    public function getCellReference(): string
+    {
+        return $this->cellReference;
+    }
+
+    public function getCalculatedTitle(?Spreadsheet $spreadsheet): ?string
+    {
+        preg_match(self::TITLE_CELL_REFERENCE, $this->cellReference, $matches);
+        if (count($matches) === 0 || $spreadsheet === null) {
+            return null;
+        }
+        $sheetName = preg_replace("/^'(.*)'$/", '$1', $matches[1]) ?? '';
+
+        return $spreadsheet->getSheetByName($sheetName)?->getCell($matches[2] . $matches[3])?->getFormattedValue();
+    }
+
+    public function getFont(): ?Font
+    {
+        return $this->font;
+    }
+
+    public function setFont(?Font $font): self
+    {
+        $this->font = $font;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->layout = ($this->layout === null) ? null : clone $this->layout;
+        $this->font = ($this->font === null) ? null : clone $this->font;
+        if (is_array($this->caption)) {
+            $captions = $this->caption;
+            $this->caption = [];
+            foreach ($captions as $caption) {
+                $this->caption[] = is_object($caption) ? (clone $caption) : $caption;
+            }
+        } else {
+            $this->caption = is_object($this->caption) ? (clone $this->caption) : $this->caption;
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php
new file mode 100644
index 00000000..5814fea4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php
@@ -0,0 +1,217 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+class TrendLine extends Properties
+{
+    const TRENDLINE_EXPONENTIAL = 'exp';
+    const TRENDLINE_LINEAR = 'linear';
+    const TRENDLINE_LOGARITHMIC = 'log';
+    const TRENDLINE_POLYNOMIAL = 'poly'; // + 'order'
+    const TRENDLINE_POWER = 'power';
+    const TRENDLINE_MOVING_AVG = 'movingAvg'; // + 'period'
+    const TRENDLINE_TYPES = [
+        self::TRENDLINE_EXPONENTIAL,
+        self::TRENDLINE_LINEAR,
+        self::TRENDLINE_LOGARITHMIC,
+        self::TRENDLINE_POLYNOMIAL,
+        self::TRENDLINE_POWER,
+        self::TRENDLINE_MOVING_AVG,
+    ];
+
+    private string $trendLineType = 'linear'; // TRENDLINE_LINEAR
+
+    private int $order = 2;
+
+    private int $period = 3;
+
+    private bool $dispRSqr = false;
+
+    private bool $dispEq = false;
+
+    private string $name = '';
+
+    private float $backward = 0.0;
+
+    private float $forward = 0.0;
+
+    private float $intercept = 0.0;
+
+    /**
+     * Create a new TrendLine object.
+     */
+    public function __construct(
+        string $trendLineType = '',
+        ?int $order = null,
+        ?int $period = null,
+        bool $dispRSqr = false,
+        bool $dispEq = false,
+        ?float $backward = null,
+        ?float $forward = null,
+        ?float $intercept = null,
+        ?string $name = null
+    ) {
+        parent::__construct();
+        $this->setTrendLineProperties(
+            $trendLineType,
+            $order,
+            $period,
+            $dispRSqr,
+            $dispEq,
+            $backward,
+            $forward,
+            $intercept,
+            $name
+        );
+    }
+
+    public function getTrendLineType(): string
+    {
+        return $this->trendLineType;
+    }
+
+    public function setTrendLineType(string $trendLineType): self
+    {
+        $this->trendLineType = $trendLineType;
+
+        return $this;
+    }
+
+    public function getOrder(): int
+    {
+        return $this->order;
+    }
+
+    public function setOrder(int $order): self
+    {
+        $this->order = $order;
+
+        return $this;
+    }
+
+    public function getPeriod(): int
+    {
+        return $this->period;
+    }
+
+    public function setPeriod(int $period): self
+    {
+        $this->period = $period;
+
+        return $this;
+    }
+
+    public function getDispRSqr(): bool
+    {
+        return $this->dispRSqr;
+    }
+
+    public function setDispRSqr(bool $dispRSqr): self
+    {
+        $this->dispRSqr = $dispRSqr;
+
+        return $this;
+    }
+
+    public function getDispEq(): bool
+    {
+        return $this->dispEq;
+    }
+
+    public function setDispEq(bool $dispEq): self
+    {
+        $this->dispEq = $dispEq;
+
+        return $this;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getBackward(): float
+    {
+        return $this->backward;
+    }
+
+    public function setBackward(float $backward): self
+    {
+        $this->backward = $backward;
+
+        return $this;
+    }
+
+    public function getForward(): float
+    {
+        return $this->forward;
+    }
+
+    public function setForward(float $forward): self
+    {
+        $this->forward = $forward;
+
+        return $this;
+    }
+
+    public function getIntercept(): float
+    {
+        return $this->intercept;
+    }
+
+    public function setIntercept(float $intercept): self
+    {
+        $this->intercept = $intercept;
+
+        return $this;
+    }
+
+    public function setTrendLineProperties(
+        ?string $trendLineType = null,
+        ?int $order = 0,
+        ?int $period = 0,
+        ?bool $dispRSqr = false,
+        ?bool $dispEq = false,
+        ?float $backward = null,
+        ?float $forward = null,
+        ?float $intercept = null,
+        ?string $name = null
+    ): self {
+        if (!empty($trendLineType)) {
+            $this->setTrendLineType($trendLineType);
+        }
+        if ($order !== null) {
+            $this->setOrder($order);
+        }
+        if ($period !== null) {
+            $this->setPeriod($period);
+        }
+        if ($dispRSqr !== null) {
+            $this->setDispRSqr($dispRSqr);
+        }
+        if ($dispEq !== null) {
+            $this->setDispEq($dispEq);
+        }
+        if ($backward !== null) {
+            $this->setBackward($backward);
+        }
+        if ($forward !== null) {
+            $this->setForward($forward);
+        }
+        if ($intercept !== null) {
+            $this->setIntercept($intercept);
+        }
+        if ($name !== null) {
+            $this->setName($name);
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php
new file mode 100644
index 00000000..c1174532
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php
@@ -0,0 +1,475 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Collection;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Psr\SimpleCache\CacheInterface;
+
+class Cells
+{
+    protected const MAX_COLUMN_ID = 16384;
+
+    private CacheInterface $cache;
+
+    /**
+     * Parent worksheet.
+     */
+    private ?Worksheet $parent;
+
+    /**
+     * The currently active Cell.
+     */
+    private ?Cell $currentCell = null;
+
+    /**
+     * Coordinate of the currently active Cell.
+     */
+    private ?string $currentCoordinate = null;
+
+    /**
+     * Flag indicating whether the currently active Cell requires saving.
+     */
+    private bool $currentCellIsDirty = false;
+
+    /**
+     * An index of existing cells. int pointer to the coordinate (0-base-indexed row * 16,384 + 1-base indexed column)
+     *    indexed by their coordinate.
+     *
+     * @var int[]
+     */
+    private array $index = [];
+
+    /**
+     * Prefix used to uniquely identify cache data for this worksheet.
+     */
+    private string $cachePrefix;
+
+    /**
+     * Initialise this new cell collection.
+     *
+     * @param Worksheet $parent The worksheet for this cell collection
+     */
+    public function __construct(Worksheet $parent, CacheInterface $cache)
+    {
+        // Set our parent worksheet.
+        // This is maintained here to facilitate re-attaching it to Cell objects when
+        // they are woken from a serialized state
+        $this->parent = $parent;
+        $this->cache = $cache;
+        $this->cachePrefix = $this->getUniqueID();
+    }
+
+    /**
+     * Return the parent worksheet for this cell collection.
+     */
+    public function getParent(): ?Worksheet
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Whether the collection holds a cell for the given coordinate.
+     *
+     * @param string $cellCoordinate Coordinate of the cell to check
+     */
+    public function has(string $cellCoordinate): bool
+    {
+        return ($cellCoordinate === $this->currentCoordinate) || isset($this->index[$cellCoordinate]);
+    }
+
+    /**
+     * Add or update a cell in the collection.
+     *
+     * @param Cell $cell Cell to update
+     */
+    public function update(Cell $cell): Cell
+    {
+        return $this->add($cell->getCoordinate(), $cell);
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate.
+     *
+     * @param string $cellCoordinate Coordinate of the cell to delete
+     */
+    public function delete(string $cellCoordinate): void
+    {
+        if ($cellCoordinate === $this->currentCoordinate && $this->currentCell !== null) {
+            $this->currentCell->detach();
+            $this->currentCoordinate = null;
+            $this->currentCell = null;
+            $this->currentCellIsDirty = false;
+        }
+
+        unset($this->index[$cellCoordinate]);
+
+        // Delete the entry from cache
+        $this->cache->delete($this->cachePrefix . $cellCoordinate);
+    }
+
+    /**
+     * Get a list of all cell coordinates currently held in the collection.
+     *
+     * @return string[]
+     */
+    public function getCoordinates(): array
+    {
+        return array_keys($this->index);
+    }
+
+    /**
+     * Get a sorted list of all cell coordinates currently held in the collection by row and column.
+     *
+     * @return string[]
+     */
+    public function getSortedCoordinates(): array
+    {
+        asort($this->index);
+
+        return array_keys($this->index);
+    }
+
+    /**
+     * Get a sorted list of all cell coordinates currently held in the collection by index (16384*row+column).
+     *
+     * @return int[]
+     */
+    public function getSortedCoordinatesInt(): array
+    {
+        asort($this->index);
+
+        return array_values($this->index);
+    }
+
+    /**
+     * Return the cell coordinate of the currently active cell object.
+     */
+    public function getCurrentCoordinate(): ?string
+    {
+        return $this->currentCoordinate;
+    }
+
+    /**
+     * Return the column coordinate of the currently active cell object.
+     */
+    public function getCurrentColumn(): string
+    {
+        $column = 0;
+        $row = '';
+        sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
+
+        return (string) $column;
+    }
+
+    /**
+     * Return the row coordinate of the currently active cell object.
+     */
+    public function getCurrentRow(): int
+    {
+        $column = 0;
+        $row = '';
+        sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
+
+        return (int) $row;
+    }
+
+    /**
+     * Get highest worksheet column and highest row that have cell records.
+     *
+     * @return array Highest column name and highest row number
+     */
+    public function getHighestRowAndColumn(): array
+    {
+        // Lookup highest column and highest row
+        $maxRow = $maxColumn = 1;
+        foreach ($this->index as $coordinate) {
+            $row = (int) floor(($coordinate - 1) / self::MAX_COLUMN_ID) + 1;
+            $maxRow = ($maxRow > $row) ? $maxRow : $row;
+            $column = ($coordinate % self::MAX_COLUMN_ID) ?: self::MAX_COLUMN_ID;
+            $maxColumn = ($maxColumn > $column) ? $maxColumn : $column;
+        }
+
+        return [
+            'row' => $maxRow,
+            'column' => Coordinate::stringFromColumnIndex($maxColumn),
+        ];
+    }
+
+    /**
+     * Get highest worksheet column.
+     *
+     * @param null|int|string $row Return the highest column for the specified row,
+     *                    or the highest column of any row if no row number is passed
+     *
+     * @return string Highest column name
+     */
+    public function getHighestColumn($row = null): string
+    {
+        if ($row === null) {
+            return $this->getHighestRowAndColumn()['column'];
+        }
+
+        $row = (int) $row;
+        if ($row <= 0) {
+            throw new PhpSpreadsheetException('Row number must be a positive integer');
+        }
+
+        $maxColumn = 1;
+        $toRow = $row * self::MAX_COLUMN_ID;
+        $fromRow = --$row * self::MAX_COLUMN_ID;
+        foreach ($this->index as $coordinate) {
+            if ($coordinate < $fromRow || $coordinate >= $toRow) {
+                continue;
+            }
+            $column = ($coordinate % self::MAX_COLUMN_ID) ?: self::MAX_COLUMN_ID;
+            $maxColumn = $maxColumn > $column ? $maxColumn : $column;
+        }
+
+        return Coordinate::stringFromColumnIndex($maxColumn);
+    }
+
+    /**
+     * Get highest worksheet row.
+     *
+     * @param null|string $column Return the highest row for the specified column,
+     *                       or the highest row of any column if no column letter is passed
+     *
+     * @return int Highest row number
+     */
+    public function getHighestRow(?string $column = null): int
+    {
+        if ($column === null) {
+            return $this->getHighestRowAndColumn()['row'];
+        }
+
+        $maxRow = 1;
+        $columnIndex = Coordinate::columnIndexFromString($column);
+        foreach ($this->index as $coordinate) {
+            if ($coordinate % self::MAX_COLUMN_ID !== $columnIndex) {
+                continue;
+            }
+            $row = (int) floor($coordinate / self::MAX_COLUMN_ID) + 1;
+            $maxRow = ($maxRow > $row) ? $maxRow : $row;
+        }
+
+        return $maxRow;
+    }
+
+    /**
+     * Generate a unique ID for cache referencing.
+     *
+     * @return string Unique Reference
+     */
+    private function getUniqueID(): string
+    {
+        $cacheType = Settings::getCache();
+
+        return ($cacheType instanceof Memory\SimpleCache1 || $cacheType instanceof Memory\SimpleCache3)
+            ? random_bytes(7) . ':'
+            : uniqid('phpspreadsheet.', true) . '.';
+    }
+
+    /**
+     * Clone the cell collection.
+     */
+    public function cloneCellCollection(Worksheet $worksheet): static
+    {
+        $this->storeCurrentCell();
+        $newCollection = clone $this;
+
+        $newCollection->parent = $worksheet;
+        $newCollection->cachePrefix = $newCollection->getUniqueID();
+
+        foreach ($this->index as $key => $value) {
+            $newCollection->index[$key] = $value;
+            $stored = $newCollection->cache->set(
+                $newCollection->cachePrefix . $key,
+                clone $this->getCache($key)
+            );
+            if ($stored === false) {
+                $this->destructIfNeeded($newCollection, 'Failed to copy cells in cache');
+            }
+        }
+
+        return $newCollection;
+    }
+
+    /**
+     * Remove a row, deleting all cells in that row.
+     *
+     * @param int|string $row Row number to remove
+     */
+    public function removeRow($row): void
+    {
+        $this->storeCurrentCell();
+        $row = (int) $row;
+        if ($row <= 0) {
+            throw new PhpSpreadsheetException('Row number must be a positive integer');
+        }
+
+        $toRow = $row * self::MAX_COLUMN_ID;
+        $fromRow = --$row * self::MAX_COLUMN_ID;
+        foreach ($this->index as $coordinate) {
+            if ($coordinate >= $fromRow && $coordinate < $toRow) {
+                $row = (int) floor($coordinate / self::MAX_COLUMN_ID) + 1;
+                $column = Coordinate::stringFromColumnIndex($coordinate % self::MAX_COLUMN_ID);
+                $this->delete("{$column}{$row}");
+            }
+        }
+    }
+
+    /**
+     * Remove a column, deleting all cells in that column.
+     *
+     * @param string $column Column ID to remove
+     */
+    public function removeColumn(string $column): void
+    {
+        $this->storeCurrentCell();
+
+        $columnIndex = Coordinate::columnIndexFromString($column);
+        foreach ($this->index as $coordinate) {
+            if ($coordinate % self::MAX_COLUMN_ID === $columnIndex) {
+                $row = (int) floor($coordinate / self::MAX_COLUMN_ID) + 1;
+                $column = Coordinate::stringFromColumnIndex($coordinate % self::MAX_COLUMN_ID);
+                $this->delete("{$column}{$row}");
+            }
+        }
+    }
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     * and the 'nullify' the current cell object.
+     */
+    private function storeCurrentCell(): void
+    {
+        if ($this->currentCellIsDirty && isset($this->currentCoordinate, $this->currentCell)) {
+            $this->currentCell->detach();
+
+            $stored = $this->cache->set($this->cachePrefix . $this->currentCoordinate, $this->currentCell);
+            if ($stored === false) {
+                $this->destructIfNeeded($this, "Failed to store cell {$this->currentCoordinate} in cache");
+            }
+            $this->currentCellIsDirty = false;
+        }
+
+        $this->currentCoordinate = null;
+        $this->currentCell = null;
+    }
+
+    private function destructIfNeeded(self $cells, string $message): void
+    {
+        $cells->__destruct();
+
+        throw new PhpSpreadsheetException($message);
+    }
+
+    /**
+     * Add or update a cell identified by its coordinate into the collection.
+     *
+     * @param string $cellCoordinate Coordinate of the cell to update
+     * @param Cell $cell Cell to update
+     */
+    public function add(string $cellCoordinate, Cell $cell): Cell
+    {
+        if ($cellCoordinate !== $this->currentCoordinate) {
+            $this->storeCurrentCell();
+        }
+        $column = 0;
+        $row = '';
+        sscanf($cellCoordinate, '%[A-Z]%d', $column, $row);
+        $this->index[$cellCoordinate] = (--$row * self::MAX_COLUMN_ID) + Coordinate::columnIndexFromString((string) $column);
+
+        $this->currentCoordinate = $cellCoordinate;
+        $this->currentCell = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate.
+     *
+     * @param string $cellCoordinate Coordinate of the cell
+     *
+     * @return null|Cell Cell that was found, or null if not found
+     */
+    public function get(string $cellCoordinate): ?Cell
+    {
+        if ($cellCoordinate === $this->currentCoordinate) {
+            return $this->currentCell;
+        }
+        $this->storeCurrentCell();
+
+        // Return null if requested entry doesn't exist in collection
+        if ($this->has($cellCoordinate) === false) {
+            return null;
+        }
+
+        $cell = $this->getcache($cellCoordinate);
+
+        // Set current entry to the requested entry
+        $this->currentCoordinate = $cellCoordinate;
+        $this->currentCell = $cell;
+        // Re-attach this as the cell's parent
+        $this->currentCell->attach($this);
+
+        // Return requested entry
+        return $this->currentCell;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent.
+     */
+    public function unsetWorksheetCells(): void
+    {
+        if ($this->currentCell !== null) {
+            $this->currentCell->detach();
+            $this->currentCell = null;
+            $this->currentCoordinate = null;
+        }
+
+        // Flush the cache
+        $this->__destruct();
+
+        $this->index = [];
+
+        // detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Destroy this cell collection.
+     */
+    public function __destruct()
+    {
+        $this->cache->deleteMultiple($this->getAllCacheKeys());
+        $this->parent = null;
+    }
+
+    /**
+     * Returns all known cache keys.
+     *
+     * @return iterable<string>
+     */
+    private function getAllCacheKeys(): iterable
+    {
+        foreach ($this->index as $coordinate => $value) {
+            yield $this->cachePrefix . $coordinate;
+        }
+    }
+
+    private function getCache(string $cellCoordinate): Cell
+    {
+        $cell = $this->cache->get($this->cachePrefix . $cellCoordinate);
+        if (!($cell instanceof Cell)) {
+            throw new PhpSpreadsheetException("Cell entry {$cellCoordinate} no longer exists in cache. This probably means that the cache was cleared by someone else.");
+        }
+
+        return $cell;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php
new file mode 100644
index 00000000..b3833bd8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Collection;
+
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+abstract class CellsFactory
+{
+    /**
+     * Initialise the cache storage.
+     *
+     * @param Worksheet $worksheet Enable cell caching for this worksheet
+     *
+     * */
+    public static function getInstance(Worksheet $worksheet): Cells
+    {
+        return new Cells($worksheet, Settings::getCache());
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
new file mode 100644
index 00000000..b8918c91
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Collection\Memory;
+
+use Psr\SimpleCache\CacheInterface;
+
+/**
+ * This is the default implementation for in-memory cell collection.
+ *
+ * Alternative implementation should leverage off-memory, non-volatile storage
+ * to reduce overall memory usage.
+ */
+class SimpleCache1 implements CacheInterface
+{
+    /**
+     * @var array Cell Cache
+     */
+    private array $cache = [];
+
+    public function clear(): bool
+    {
+        $this->cache = [];
+
+        return true;
+    }
+
+    public function delete($key): bool
+    {
+        unset($this->cache[$key]);
+
+        return true;
+    }
+
+    public function deleteMultiple($keys): bool
+    {
+        foreach ($keys as $key) {
+            $this->delete($key);
+        }
+
+        return true;
+    }
+
+    public function get($key, $default = null): mixed
+    {
+        if ($this->has($key)) {
+            return $this->cache[$key];
+        }
+
+        return $default;
+    }
+
+    public function getMultiple($keys, $default = null): iterable
+    {
+        $results = [];
+        foreach ($keys as $key) {
+            $results[$key] = $this->get($key, $default);
+        }
+
+        return $results;
+    }
+
+    public function has($key): bool
+    {
+        return array_key_exists($key, $this->cache);
+    }
+
+    public function set($key, $value, $ttl = null): bool
+    {
+        $this->cache[$key] = $value;
+
+        return true;
+    }
+
+    public function setMultiple($values, $ttl = null): bool
+    {
+        foreach ($values as $key => $value) {
+            $this->set($key, $value);
+        }
+
+        return true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
new file mode 100644
index 00000000..7b6c460b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Collection\Memory;
+
+use DateInterval;
+use Psr\SimpleCache\CacheInterface;
+
+/**
+ * This is the default implementation for in-memory cell collection.
+ *
+ * Alternative implementation should leverage off-memory, non-volatile storage
+ * to reduce overall memory usage.
+ */
+class SimpleCache3 implements CacheInterface
+{
+    private array $cache = [];
+
+    public function clear(): bool
+    {
+        $this->cache = [];
+
+        return true;
+    }
+
+    public function delete(string $key): bool
+    {
+        unset($this->cache[$key]);
+
+        return true;
+    }
+
+    public function deleteMultiple(iterable $keys): bool
+    {
+        foreach ($keys as $key) {
+            $this->delete($key);
+        }
+
+        return true;
+    }
+
+    public function get(string $key, mixed $default = null): mixed
+    {
+        if ($this->has($key)) {
+            return $this->cache[$key];
+        }
+
+        return $default;
+    }
+
+    public function getMultiple(iterable $keys, mixed $default = null): iterable
+    {
+        $results = [];
+        foreach ($keys as $key) {
+            $results[$key] = $this->get($key, $default);
+        }
+
+        return $results;
+    }
+
+    public function has(string $key): bool
+    {
+        return array_key_exists($key, $this->cache);
+    }
+
+    public function set(string $key, mixed $value, null|int|DateInterval $ttl = null): bool
+    {
+        $this->cache[$key] = $value;
+
+        return true;
+    }
+
+    public function setMultiple(iterable $values, null|int|DateInterval $ttl = null): bool
+    {
+        foreach ($values as $key => $value) {
+            $this->set($key, $value);
+        }
+
+        return true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php
new file mode 100644
index 00000000..2e18270c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php
@@ -0,0 +1,358 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Helper\Size;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use Stringable;
+
+class Comment implements IComparable, Stringable
+{
+    /**
+     * Author.
+     */
+    private string $author;
+
+    /**
+     * Rich text comment.
+     */
+    private RichText $text;
+
+    /**
+     * Comment width (CSS style, i.e. XXpx or YYpt).
+     */
+    private string $width = '96pt';
+
+    /**
+     * Left margin (CSS style, i.e. XXpx or YYpt).
+     */
+    private string $marginLeft = '59.25pt';
+
+    /**
+     * Top margin (CSS style, i.e. XXpx or YYpt).
+     */
+    private string $marginTop = '1.5pt';
+
+    /**
+     * Visible.
+     */
+    private bool $visible = false;
+
+    /**
+     * Comment height (CSS style, i.e. XXpx or YYpt).
+     */
+    private string $height = '55.5pt';
+
+    /**
+     * Comment fill color.
+     */
+    private Color $fillColor;
+
+    /**
+     * Alignment.
+     */
+    private string $alignment;
+
+    /**
+     * Background image in comment.
+     */
+    private Drawing $backgroundImage;
+
+    public const TEXTBOX_DIRECTION_RTL = 'rtl';
+    public const TEXTBOX_DIRECTION_LTR = 'ltr';
+    // MS uses 'auto' in xml but 'context' in UI
+    public const TEXTBOX_DIRECTION_AUTO = 'auto';
+    public const TEXTBOX_DIRECTION_CONTEXT = 'auto';
+
+    private string $textboxDirection = '';
+
+    /**
+     * Create a new Comment.
+     */
+    public function __construct()
+    {
+        // Initialise variables
+        $this->author = 'Author';
+        $this->text = new RichText();
+        $this->fillColor = new Color('FFFFFFE1');
+        $this->alignment = Alignment::HORIZONTAL_GENERAL;
+        $this->backgroundImage = new Drawing();
+    }
+
+    /**
+     * Get Author.
+     */
+    public function getAuthor(): string
+    {
+        return $this->author;
+    }
+
+    /**
+     * Set Author.
+     */
+    public function setAuthor(string $author): self
+    {
+        $this->author = $author;
+
+        return $this;
+    }
+
+    /**
+     * Get Rich text comment.
+     */
+    public function getText(): RichText
+    {
+        return $this->text;
+    }
+
+    /**
+     * Set Rich text comment.
+     */
+    public function setText(RichText $text): self
+    {
+        $this->text = $text;
+
+        return $this;
+    }
+
+    /**
+     * Get comment width (CSS style, i.e. XXpx or YYpt).
+     */
+    public function getWidth(): string
+    {
+        return $this->width;
+    }
+
+    /**
+     * Set comment width (CSS style, i.e. XXpx or YYpt). Default unit is pt.
+     */
+    public function setWidth(string $width): self
+    {
+        $width = new Size($width);
+        if ($width->valid()) {
+            $this->width = (string) $width;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get comment height (CSS style, i.e. XXpx or YYpt).
+     */
+    public function getHeight(): string
+    {
+        return $this->height;
+    }
+
+    /**
+     * Set comment height (CSS style, i.e. XXpx or YYpt). Default unit is pt.
+     */
+    public function setHeight(string $height): self
+    {
+        $height = new Size($height);
+        if ($height->valid()) {
+            $this->height = (string) $height;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get left margin (CSS style, i.e. XXpx or YYpt).
+     */
+    public function getMarginLeft(): string
+    {
+        return $this->marginLeft;
+    }
+
+    /**
+     * Set left margin (CSS style, i.e. XXpx or YYpt). Default unit is pt.
+     */
+    public function setMarginLeft(string $margin): self
+    {
+        $margin = new Size($margin);
+        if ($margin->valid()) {
+            $this->marginLeft = (string) $margin;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get top margin (CSS style, i.e. XXpx or YYpt).
+     */
+    public function getMarginTop(): string
+    {
+        return $this->marginTop;
+    }
+
+    /**
+     * Set top margin (CSS style, i.e. XXpx or YYpt). Default unit is pt.
+     */
+    public function setMarginTop(string $margin): self
+    {
+        $margin = new Size($margin);
+        if ($margin->valid()) {
+            $this->marginTop = (string) $margin;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Is the comment visible by default?
+     */
+    public function getVisible(): bool
+    {
+        return $this->visible;
+    }
+
+    /**
+     * Set comment default visibility.
+     */
+    public function setVisible(bool $visibility): self
+    {
+        $this->visible = $visibility;
+
+        return $this;
+    }
+
+    /**
+     * Set fill color.
+     */
+    public function setFillColor(Color $color): self
+    {
+        $this->fillColor = $color;
+
+        return $this;
+    }
+
+    /**
+     * Get fill color.
+     */
+    public function getFillColor(): Color
+    {
+        return $this->fillColor;
+    }
+
+    public function setAlignment(string $alignment): self
+    {
+        $this->alignment = $alignment;
+
+        return $this;
+    }
+
+    public function getAlignment(): string
+    {
+        return $this->alignment;
+    }
+
+    public function setTextboxDirection(string $textboxDirection): self
+    {
+        $this->textboxDirection = $textboxDirection;
+
+        return $this;
+    }
+
+    public function getTextboxDirection(): string
+    {
+        return $this->textboxDirection;
+    }
+
+    /**
+     * Get hash code.
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->author
+            . $this->text->getHashCode()
+            . $this->width
+            . $this->height
+            . $this->marginLeft
+            . $this->marginTop
+            . ($this->visible ? 1 : 0)
+            . $this->fillColor->getHashCode()
+            . $this->alignment
+            . $this->textboxDirection
+            . ($this->hasBackgroundImage() ? $this->backgroundImage->getHashCode() : '')
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+
+    /**
+     * Convert to string.
+     */
+    public function __toString(): string
+    {
+        return $this->text->getPlainText();
+    }
+
+    /**
+     * Check is background image exists.
+     */
+    public function hasBackgroundImage(): bool
+    {
+        $path = $this->backgroundImage->getPath();
+
+        if (empty($path)) {
+            return false;
+        }
+
+        return getimagesize($path) !== false;
+    }
+
+    /**
+     * Returns background image.
+     */
+    public function getBackgroundImage(): Drawing
+    {
+        return $this->backgroundImage;
+    }
+
+    /**
+     * Sets background image.
+     */
+    public function setBackgroundImage(Drawing $objDrawing): self
+    {
+        if (!array_key_exists($objDrawing->getType(), Drawing::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+        $this->backgroundImage = $objDrawing;
+
+        return $this;
+    }
+
+    /**
+     * Sets size of comment as size of background image.
+     */
+    public function setSizeAsBackgroundImage(): self
+    {
+        if ($this->hasBackgroundImage()) {
+            $this->setWidth(SharedDrawing::pixelsToPoints($this->backgroundImage->getWidth()) . 'pt');
+            $this->setHeight(SharedDrawing::pixelsToPoints($this->backgroundImage->getHeight()) . 'pt');
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php
new file mode 100644
index 00000000..686e56e1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php
@@ -0,0 +1,269 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+abstract class DefinedName
+{
+    protected const REGEXP_IDENTIFY_FORMULA = '[^_\p{N}\p{L}:, \$\'!]';
+
+    /**
+     * Name.
+     */
+    protected string $name;
+
+    /**
+     * Worksheet on which the defined name can be resolved.
+     */
+    protected ?Worksheet $worksheet;
+
+    /**
+     * Value of the named object.
+     */
+    protected string $value;
+
+    /**
+     * Is the defined named local? (i.e. can only be used on $this->worksheet).
+     */
+    protected bool $localOnly;
+
+    /**
+     * Scope.
+     */
+    protected ?Worksheet $scope;
+
+    /**
+     * Whether this is a named range or a named formula.
+     */
+    protected bool $isFormula;
+
+    /**
+     * Create a new Defined Name.
+     */
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $value = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        if ($worksheet === null) {
+            $worksheet = $scope;
+        }
+
+        // Set local members
+        $this->name = $name;
+        $this->worksheet = $worksheet;
+        $this->value = (string) $value;
+        $this->localOnly = $localOnly;
+        // If local only, then the scope will be set to worksheet unless a scope is explicitly set
+        $this->scope = ($localOnly === true) ? (($scope === null) ? $worksheet : $scope) : null;
+        // If the range string contains characters that aren't associated with the range definition (A-Z,1-9
+        //      for cell references, and $, or the range operators (colon comma or space), quotes and ! for
+        //      worksheet names
+        //  then this is treated as a named formula, and not a named range
+        $this->isFormula = self::testIfFormula($this->value);
+    }
+
+    public function __destruct()
+    {
+        $this->worksheet = null;
+        $this->scope = null;
+    }
+
+    /**
+     * Create a new defined name, either a range or a formula.
+     */
+    public static function createInstance(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $value = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ): self {
+        $value = (string) $value;
+        $isFormula = self::testIfFormula($value);
+        if ($isFormula) {
+            return new NamedFormula($name, $worksheet, $value, $localOnly, $scope);
+        }
+
+        return new NamedRange($name, $worksheet, $value, $localOnly, $scope);
+    }
+
+    public static function testIfFormula(string $value): bool
+    {
+        if (str_starts_with($value, '=')) {
+            $value = substr($value, 1);
+        }
+
+        if (is_numeric($value)) {
+            return true;
+        }
+
+        $segMatcher = false;
+        foreach (explode("'", $value) as $subVal) {
+            //    Only test in alternate array entries (the non-quoted blocks)
+            $segMatcher = $segMatcher === false;
+            if (
+                $segMatcher
+                && (preg_match('/' . self::REGEXP_IDENTIFY_FORMULA . '/miu', $subVal))
+            ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get name.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set name.
+     */
+    public function setName(string $name): self
+    {
+        if (!empty($name)) {
+            // Old title
+            $oldTitle = $this->name;
+
+            // Re-attach
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParentOrThrow()->removeNamedRange($this->name, $this->worksheet);
+            }
+            $this->name = $name;
+
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParentOrThrow()->addDefinedName($this);
+            }
+
+            if ($this->worksheet !== null) {
+                // New title
+                $newTitle = $this->name;
+                ReferenceHelper::getInstance()->updateNamedFormulae($this->worksheet->getParentOrThrow(), $oldTitle, $newTitle);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get worksheet.
+     */
+    public function getWorksheet(): ?Worksheet
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * Set worksheet.
+     */
+    public function setWorksheet(?Worksheet $worksheet): self
+    {
+        $this->worksheet = $worksheet;
+
+        return $this;
+    }
+
+    /**
+     * Get range or formula value.
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set range or formula  value.
+     */
+    public function setValue(string $value): self
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get localOnly.
+     */
+    public function getLocalOnly(): bool
+    {
+        return $this->localOnly;
+    }
+
+    /**
+     * Set localOnly.
+     */
+    public function setLocalOnly(bool $localScope): self
+    {
+        $this->localOnly = $localScope;
+        $this->scope = $localScope ? $this->worksheet : null;
+
+        return $this;
+    }
+
+    /**
+     * Get scope.
+     */
+    public function getScope(): ?Worksheet
+    {
+        return $this->scope;
+    }
+
+    /**
+     * Set scope.
+     */
+    public function setScope(?Worksheet $worksheet): self
+    {
+        $this->scope = $worksheet;
+        $this->localOnly = $worksheet !== null;
+
+        return $this;
+    }
+
+    /**
+     * Identify whether this is a named range or a named formula.
+     */
+    public function isFormula(): bool
+    {
+        return $this->isFormula;
+    }
+
+    /**
+     * Resolve a named range to a regular cell range or formula.
+     */
+    public static function resolveName(string $definedName, Worksheet $worksheet, string $sheetName = ''): ?self
+    {
+        if ($sheetName === '') {
+            $worksheet2 = $worksheet;
+        } else {
+            $worksheet2 = $worksheet->getParentOrThrow()->getSheetByName($sheetName);
+            if ($worksheet2 === null) {
+                return null;
+            }
+        }
+
+        return $worksheet->getParentOrThrow()->getDefinedName($definedName, $worksheet2);
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php
new file mode 100644
index 00000000..57621691
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php
@@ -0,0 +1,509 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Document;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Shared\IntOrFloat;
+
+class Properties
+{
+    /** constants */
+    public const PROPERTY_TYPE_BOOLEAN = 'b';
+    public const PROPERTY_TYPE_INTEGER = 'i';
+    public const PROPERTY_TYPE_FLOAT = 'f';
+    public const PROPERTY_TYPE_DATE = 'd';
+    public const PROPERTY_TYPE_STRING = 's';
+    public const PROPERTY_TYPE_UNKNOWN = 'u';
+
+    private const VALID_PROPERTY_TYPE_LIST = [
+        self::PROPERTY_TYPE_BOOLEAN,
+        self::PROPERTY_TYPE_INTEGER,
+        self::PROPERTY_TYPE_FLOAT,
+        self::PROPERTY_TYPE_DATE,
+        self::PROPERTY_TYPE_STRING,
+    ];
+
+    /**
+     * Creator.
+     */
+    private string $creator = 'Unknown Creator';
+
+    /**
+     * LastModifiedBy.
+     */
+    private string $lastModifiedBy;
+
+    /**
+     * Created.
+     */
+    private float|int $created;
+
+    /**
+     * Modified.
+     */
+    private float|int $modified;
+
+    /**
+     * Title.
+     */
+    private string $title = 'Untitled Spreadsheet';
+
+    /**
+     * Description.
+     */
+    private string $description = '';
+
+    /**
+     * Subject.
+     */
+    private string $subject = '';
+
+    /**
+     * Keywords.
+     */
+    private string $keywords = '';
+
+    /**
+     * Category.
+     */
+    private string $category = '';
+
+    /**
+     * Manager.
+     */
+    private string $manager = '';
+
+    /**
+     * Company.
+     */
+    private string $company = '';
+
+    /**
+     * Custom Properties.
+     *
+     * @var array{value: null|bool|float|int|string, type: string}[]
+     */
+    private array $customProperties = [];
+
+    private string $hyperlinkBase = '';
+
+    private string $viewport = '';
+
+    /**
+     * Create a new Document Properties instance.
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->lastModifiedBy = $this->creator;
+        $this->created = self::intOrFloatTimestamp(null);
+        $this->modified = $this->created;
+    }
+
+    /**
+     * Get Creator.
+     */
+    public function getCreator(): string
+    {
+        return $this->creator;
+    }
+
+    /**
+     * Set Creator.
+     *
+     * @return $this
+     */
+    public function setCreator(string $creator): self
+    {
+        $this->creator = $creator;
+
+        return $this;
+    }
+
+    /**
+     * Get Last Modified By.
+     */
+    public function getLastModifiedBy(): string
+    {
+        return $this->lastModifiedBy;
+    }
+
+    /**
+     * Set Last Modified By.
+     *
+     * @return $this
+     */
+    public function setLastModifiedBy(string $modifiedBy): self
+    {
+        $this->lastModifiedBy = $modifiedBy;
+
+        return $this;
+    }
+
+    private static function intOrFloatTimestamp(null|bool|float|int|string $timestamp): float|int
+    {
+        if ($timestamp === null || is_bool($timestamp)) {
+            $timestamp = (float) (new DateTime())->format('U');
+        } elseif (is_string($timestamp)) {
+            if (is_numeric($timestamp)) {
+                $timestamp = (float) $timestamp;
+            } else {
+                $timestamp = (string) preg_replace('/[.][0-9]*$/', '', $timestamp);
+                $timestamp = (string) preg_replace('/^(\\d{4})- (\\d)/', '$1-0$2', $timestamp);
+                $timestamp = (string) preg_replace('/^(\\d{4}-\\d{2})- (\\d)/', '$1-0$2', $timestamp);
+                $timestamp = (float) (new DateTime($timestamp))->format('U');
+            }
+        }
+
+        return IntOrFloat::evaluate($timestamp);
+    }
+
+    /**
+     * Get Created.
+     */
+    public function getCreated(): float|int
+    {
+        return $this->created;
+    }
+
+    /**
+     * Set Created.
+     *
+     * @return $this
+     */
+    public function setCreated(null|float|int|string $timestamp): self
+    {
+        $this->created = self::intOrFloatTimestamp($timestamp);
+
+        return $this;
+    }
+
+    /**
+     * Get Modified.
+     */
+    public function getModified(): float|int
+    {
+        return $this->modified;
+    }
+
+    /**
+     * Set Modified.
+     *
+     * @return $this
+     */
+    public function setModified(null|float|int|string $timestamp): self
+    {
+        $this->modified = self::intOrFloatTimestamp($timestamp);
+
+        return $this;
+    }
+
+    /**
+     * Get Title.
+     */
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * Set Title.
+     *
+     * @return $this
+     */
+    public function setTitle(string $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    /**
+     * Get Description.
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * Set Description.
+     *
+     * @return $this
+     */
+    public function setDescription(string $description): self
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    /**
+     * Get Subject.
+     */
+    public function getSubject(): string
+    {
+        return $this->subject;
+    }
+
+    /**
+     * Set Subject.
+     *
+     * @return $this
+     */
+    public function setSubject(string $subject): self
+    {
+        $this->subject = $subject;
+
+        return $this;
+    }
+
+    /**
+     * Get Keywords.
+     */
+    public function getKeywords(): string
+    {
+        return $this->keywords;
+    }
+
+    /**
+     * Set Keywords.
+     *
+     * @return $this
+     */
+    public function setKeywords(string $keywords): self
+    {
+        $this->keywords = $keywords;
+
+        return $this;
+    }
+
+    /**
+     * Get Category.
+     */
+    public function getCategory(): string
+    {
+        return $this->category;
+    }
+
+    /**
+     * Set Category.
+     *
+     * @return $this
+     */
+    public function setCategory(string $category): self
+    {
+        $this->category = $category;
+
+        return $this;
+    }
+
+    /**
+     * Get Company.
+     */
+    public function getCompany(): string
+    {
+        return $this->company;
+    }
+
+    /**
+     * Set Company.
+     *
+     * @return $this
+     */
+    public function setCompany(string $company): self
+    {
+        $this->company = $company;
+
+        return $this;
+    }
+
+    /**
+     * Get Manager.
+     */
+    public function getManager(): string
+    {
+        return $this->manager;
+    }
+
+    /**
+     * Set Manager.
+     *
+     * @return $this
+     */
+    public function setManager(string $manager): self
+    {
+        $this->manager = $manager;
+
+        return $this;
+    }
+
+    /**
+     * Get a List of Custom Property Names.
+     *
+     * @return string[]
+     */
+    public function getCustomProperties(): array
+    {
+        return array_keys($this->customProperties);
+    }
+
+    /**
+     * Check if a Custom Property is defined.
+     */
+    public function isCustomPropertySet(string $propertyName): bool
+    {
+        return array_key_exists($propertyName, $this->customProperties);
+    }
+
+    /**
+     * Get a Custom Property Value.
+     */
+    public function getCustomPropertyValue(string $propertyName): bool|int|float|string|null
+    {
+        if (isset($this->customProperties[$propertyName])) {
+            return $this->customProperties[$propertyName]['value'];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a Custom Property Type.
+     */
+    public function getCustomPropertyType(string $propertyName): ?string
+    {
+        return $this->customProperties[$propertyName]['type'] ?? null;
+    }
+
+    private function identifyPropertyType(bool|int|float|string|null $propertyValue): string
+    {
+        if (is_float($propertyValue)) {
+            return self::PROPERTY_TYPE_FLOAT;
+        }
+        if (is_int($propertyValue)) {
+            return self::PROPERTY_TYPE_INTEGER;
+        }
+        if (is_bool($propertyValue)) {
+            return self::PROPERTY_TYPE_BOOLEAN;
+        }
+
+        return self::PROPERTY_TYPE_STRING;
+    }
+
+    /**
+     * Set a Custom Property.
+     *
+     * @param ?string $propertyType see `self::VALID_PROPERTY_TYPE_LIST`
+     *
+     * @return $this
+     */
+    public function setCustomProperty(string $propertyName, bool|int|float|string|null $propertyValue = '', ?string $propertyType = null): self
+    {
+        if (($propertyType === null) || (!in_array($propertyType, self::VALID_PROPERTY_TYPE_LIST))) {
+            $propertyType = $this->identifyPropertyType($propertyValue);
+        }
+
+        $this->customProperties[$propertyName] = [
+            'value' => self::convertProperty($propertyValue, $propertyType),
+            'type' => $propertyType,
+        ];
+
+        return $this;
+    }
+
+    private const PROPERTY_TYPE_ARRAY = [
+        'i' => self::PROPERTY_TYPE_INTEGER,      //    Integer
+        'i1' => self::PROPERTY_TYPE_INTEGER,     //    1-Byte Signed Integer
+        'i2' => self::PROPERTY_TYPE_INTEGER,     //    2-Byte Signed Integer
+        'i4' => self::PROPERTY_TYPE_INTEGER,     //    4-Byte Signed Integer
+        'i8' => self::PROPERTY_TYPE_INTEGER,     //    8-Byte Signed Integer
+        'int' => self::PROPERTY_TYPE_INTEGER,    //    Integer
+        'ui1' => self::PROPERTY_TYPE_INTEGER,    //    1-Byte Unsigned Integer
+        'ui2' => self::PROPERTY_TYPE_INTEGER,    //    2-Byte Unsigned Integer
+        'ui4' => self::PROPERTY_TYPE_INTEGER,    //    4-Byte Unsigned Integer
+        'ui8' => self::PROPERTY_TYPE_INTEGER,    //    8-Byte Unsigned Integer
+        'uint' => self::PROPERTY_TYPE_INTEGER,   //    Unsigned Integer
+        'f' => self::PROPERTY_TYPE_FLOAT,        //    Real Number
+        'r4' => self::PROPERTY_TYPE_FLOAT,       //    4-Byte Real Number
+        'r8' => self::PROPERTY_TYPE_FLOAT,       //    8-Byte Real Number
+        'decimal' => self::PROPERTY_TYPE_FLOAT,  //    Decimal
+        's' => self::PROPERTY_TYPE_STRING,       //    String
+        'empty' => self::PROPERTY_TYPE_STRING,   //    Empty
+        'null' => self::PROPERTY_TYPE_STRING,    //    Null
+        'lpstr' => self::PROPERTY_TYPE_STRING,   //    LPSTR
+        'lpwstr' => self::PROPERTY_TYPE_STRING,  //    LPWSTR
+        'bstr' => self::PROPERTY_TYPE_STRING,    //    Basic String
+        'd' => self::PROPERTY_TYPE_DATE,         //    Date and Time
+        'date' => self::PROPERTY_TYPE_DATE,      //    Date and Time
+        'filetime' => self::PROPERTY_TYPE_DATE,  //    File Time
+        'b' => self::PROPERTY_TYPE_BOOLEAN,      //    Boolean
+        'bool' => self::PROPERTY_TYPE_BOOLEAN,   //    Boolean
+    ];
+
+    private const SPECIAL_TYPES = [
+        'empty' => '',
+        'null' => null,
+    ];
+
+    /**
+     * Convert property to form desired by Excel.
+     */
+    public static function convertProperty(bool|int|float|string|null $propertyValue, string $propertyType): bool|int|float|string|null
+    {
+        return self::SPECIAL_TYPES[$propertyType] ?? self::convertProperty2($propertyValue, $propertyType);
+    }
+
+    /**
+     * Convert property to form desired by Excel.
+     */
+    private static function convertProperty2(bool|int|float|string|null $propertyValue, string $type): bool|int|float|string|null
+    {
+        $propertyType = self::convertPropertyType($type);
+        switch ($propertyType) {
+            case self::PROPERTY_TYPE_INTEGER:
+                $intValue = (int) $propertyValue;
+
+                return ($type[0] === 'u') ? abs($intValue) : $intValue;
+            case self::PROPERTY_TYPE_FLOAT:
+                return (float) $propertyValue;
+            case self::PROPERTY_TYPE_DATE:
+                return self::intOrFloatTimestamp($propertyValue);
+            case self::PROPERTY_TYPE_BOOLEAN:
+                return is_bool($propertyValue) ? $propertyValue : ($propertyValue === 'true');
+            default: // includes string
+                return $propertyValue;
+        }
+    }
+
+    public static function convertPropertyType(string $propertyType): string
+    {
+        return self::PROPERTY_TYPE_ARRAY[$propertyType] ?? self::PROPERTY_TYPE_UNKNOWN;
+    }
+
+    public function getHyperlinkBase(): string
+    {
+        return $this->hyperlinkBase;
+    }
+
+    public function setHyperlinkBase(string $hyperlinkBase): self
+    {
+        $this->hyperlinkBase = $hyperlinkBase;
+
+        return $this;
+    }
+
+    public function getViewport(): string
+    {
+        return $this->viewport;
+    }
+
+    public const SUGGESTED_VIEWPORT = 'width=device-width, initial-scale=1';
+
+    public function setViewport(string $viewport): self
+    {
+        $this->viewport = $viewport;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php
new file mode 100644
index 00000000..31a32beb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Document;
+
+use PhpOffice\PhpSpreadsheet\Shared\PasswordHasher;
+
+class Security
+{
+    /**
+     * LockRevision.
+     */
+    private bool $lockRevision = false;
+
+    /**
+     * LockStructure.
+     */
+    private bool $lockStructure = false;
+
+    /**
+     * LockWindows.
+     */
+    private bool $lockWindows = false;
+
+    /**
+     * RevisionsPassword.
+     */
+    private string $revisionsPassword = '';
+
+    /**
+     * WorkbookPassword.
+     */
+    private string $workbookPassword = '';
+
+    /**
+     * Create a new Document Security instance.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Is some sort of document security enabled?
+     */
+    public function isSecurityEnabled(): bool
+    {
+        return $this->lockRevision
+                || $this->lockStructure
+                || $this->lockWindows;
+    }
+
+    public function getLockRevision(): bool
+    {
+        return $this->lockRevision;
+    }
+
+    public function setLockRevision(?bool $locked): self
+    {
+        if ($locked !== null) {
+            $this->lockRevision = $locked;
+        }
+
+        return $this;
+    }
+
+    public function getLockStructure(): bool
+    {
+        return $this->lockStructure;
+    }
+
+    public function setLockStructure(?bool $locked): self
+    {
+        if ($locked !== null) {
+            $this->lockStructure = $locked;
+        }
+
+        return $this;
+    }
+
+    public function getLockWindows(): bool
+    {
+        return $this->lockWindows;
+    }
+
+    public function setLockWindows(?bool $locked): self
+    {
+        if ($locked !== null) {
+            $this->lockWindows = $locked;
+        }
+
+        return $this;
+    }
+
+    public function getRevisionsPassword(): string
+    {
+        return $this->revisionsPassword;
+    }
+
+    /**
+     * Set RevisionsPassword.
+     *
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
+     *
+     * @return $this
+     */
+    public function setRevisionsPassword(?string $password, bool $alreadyHashed = false): static
+    {
+        if ($password !== null) {
+            if (!$alreadyHashed) {
+                $password = PasswordHasher::hashPassword($password);
+            }
+            $this->revisionsPassword = $password;
+        }
+
+        return $this;
+    }
+
+    public function getWorkbookPassword(): string
+    {
+        return $this->workbookPassword;
+    }
+
+    /**
+     * Set WorkbookPassword.
+     *
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
+     *
+     * @return $this
+     */
+    public function setWorkbookPassword(?string $password, bool $alreadyHashed = false): static
+    {
+        if ($password !== null) {
+            if (!$alreadyHashed) {
+                $password = PasswordHasher::hashPassword($password);
+            }
+            $this->workbookPassword = $password;
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php
new file mode 100644
index 00000000..34915807
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use RuntimeException;
+
+class Exception extends RuntimeException
+{
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php
new file mode 100644
index 00000000..94c4836b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+/**
+ * @template T of IComparable
+ */
+class HashTable
+{
+    /**
+     * HashTable elements.
+     *
+     * @var array<string, T>
+     */
+    protected array $items = [];
+
+    /**
+     * HashTable key map.
+     *
+     * @var array<int, string>
+     */
+    protected array $keyMap = [];
+
+    /**
+     * Create a new HashTable.
+     *
+     * @param T[] $source Optional source array to create HashTable from
+     */
+    public function __construct(?array $source = [])
+    {
+        if ($source !== null) {
+            // Create HashTable
+            $this->addFromSource($source);
+        }
+    }
+
+    /**
+     * Add HashTable items from source.
+     *
+     * @param T[] $source Source array to create HashTable from
+     */
+    public function addFromSource(?array $source = null): void
+    {
+        // Check if an array was passed
+        if ($source === null) {
+            return;
+        }
+
+        foreach ($source as $item) {
+            $this->add($item);
+        }
+    }
+
+    /**
+     * Add HashTable item.
+     *
+     * @param T $source Item to add
+     */
+    public function add(IComparable $source): void
+    {
+        $hash = $source->getHashCode();
+        if (!isset($this->items[$hash])) {
+            $this->items[$hash] = $source;
+            $this->keyMap[count($this->items) - 1] = $hash;
+        }
+    }
+
+    /**
+     * Remove HashTable item.
+     *
+     * @param T $source Item to remove
+     */
+    public function remove(IComparable $source): void
+    {
+        $hash = $source->getHashCode();
+        if (isset($this->items[$hash])) {
+            unset($this->items[$hash]);
+
+            $deleteKey = -1;
+            foreach ($this->keyMap as $key => $value) {
+                if ($deleteKey >= 0) {
+                    $this->keyMap[$key - 1] = $value;
+                }
+
+                if ($value == $hash) {
+                    $deleteKey = $key;
+                }
+            }
+            unset($this->keyMap[count($this->keyMap) - 1]);
+        }
+    }
+
+    /**
+     * Clear HashTable.
+     */
+    public function clear(): void
+    {
+        $this->items = [];
+        $this->keyMap = [];
+    }
+
+    /**
+     * Count.
+     */
+    public function count(): int
+    {
+        return count($this->items);
+    }
+
+    /**
+     * Get index for hash code.
+     */
+    public function getIndexForHashCode(string $hashCode): false|int
+    {
+        return array_search($hashCode, $this->keyMap, true);
+    }
+
+    /**
+     * Get by index.
+     *
+     * @return null|T
+     */
+    public function getByIndex(int $index): ?IComparable
+    {
+        if (isset($this->keyMap[$index])) {
+            return $this->getByHashCode($this->keyMap[$index]);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get by hashcode.
+     *
+     * @return null|T
+     */
+    public function getByHashCode(string $hashCode): ?IComparable
+    {
+        if (isset($this->items[$hashCode])) {
+            return $this->items[$hashCode];
+        }
+
+        return null;
+    }
+
+    /**
+     * HashTable to array.
+     *
+     * @return T[]
+     */
+    public function toArray(): array
+    {
+        return $this->items;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            // each member of this class is an array
+            if (is_array($value)) {
+                $array1 = $value;
+                foreach ($array1 as $key1 => $value1) {
+                    if (is_object($value1)) {
+                        $array1[$key1] = clone $value1;
+                    }
+                }
+                $this->$key = $array1;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php
new file mode 100644
index 00000000..a729dfdf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\Drawing;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class Dimension
+{
+    public const UOM_CENTIMETERS = 'cm';
+    public const UOM_MILLIMETERS = 'mm';
+    public const UOM_INCHES = 'in';
+    public const UOM_PIXELS = 'px';
+    public const UOM_POINTS = 'pt';
+    public const UOM_PICA = 'pc';
+
+    /**
+     * Based on 96 dpi.
+     */
+    const ABSOLUTE_UNITS = [
+        self::UOM_CENTIMETERS => 96.0 / 2.54,
+        self::UOM_MILLIMETERS => 96.0 / 25.4,
+        self::UOM_INCHES => 96.0,
+        self::UOM_PIXELS => 1.0,
+        self::UOM_POINTS => 96.0 / 72,
+        self::UOM_PICA => 96.0 * 12 / 72,
+    ];
+
+    /**
+     * Based on a standard column width of 8.54 units in MS Excel.
+     */
+    const RELATIVE_UNITS = [
+        'em' => 10.0 / 8.54,
+        'ex' => 10.0 / 8.54,
+        'ch' => 10.0 / 8.54,
+        'rem' => 10.0 / 8.54,
+        'vw' => 8.54,
+        'vh' => 8.54,
+        'vmin' => 8.54,
+        'vmax' => 8.54,
+        '%' => 8.54 / 100,
+    ];
+
+    /**
+     * @var float|int If this is a width, then size is measured in pixels (if is set)
+     *                   or in Excel's default column width units if $unit is null.
+     *                If this is a height, then size is measured in pixels ()
+     *                   or in points () if $unit is null.
+     */
+    protected float|int $size;
+
+    protected ?string $unit = null;
+
+    /**
+     * Phpstan bug has been fixed; this function allows us to
+     * pass Phpstan whether fixed or not.
+     */
+    private static function stanBugFixed(array|int|null $value): array
+    {
+        return is_array($value) ? $value : [null, null];
+    }
+
+    public function __construct(string $dimension)
+    {
+        [$size, $unit] = self::stanBugFixed(sscanf($dimension, '%[1234567890.]%s'));
+        $unit = strtolower(trim($unit ?? ''));
+        $size = (float) $size;
+
+        // If a UoM is specified, then convert the size to pixels for internal storage
+        if (isset(self::ABSOLUTE_UNITS[$unit])) {
+            $size *= self::ABSOLUTE_UNITS[$unit];
+            $this->unit = self::UOM_PIXELS;
+        } elseif (isset(self::RELATIVE_UNITS[$unit])) {
+            $size *= self::RELATIVE_UNITS[$unit];
+            $size = round($size, 4);
+        }
+
+        $this->size = $size;
+    }
+
+    public function width(): float
+    {
+        return (float) ($this->unit === null)
+            ? $this->size
+            : round(Drawing::pixelsToCellDimension((int) $this->size, new Font(false)), 4);
+    }
+
+    public function height(): float
+    {
+        return (float) ($this->unit === null)
+            ? $this->size
+            : $this->toUnit(self::UOM_POINTS);
+    }
+
+    public function toUnit(string $unitOfMeasure): float
+    {
+        $unitOfMeasure = strtolower($unitOfMeasure);
+        if (!array_key_exists($unitOfMeasure, self::ABSOLUTE_UNITS)) {
+            throw new Exception("{$unitOfMeasure} is not a vaid unit of measure");
+        }
+
+        $size = $this->size;
+        if ($this->unit === null) {
+            $size = Drawing::cellDimensionToPixels($size, new Font(false));
+        }
+
+        return $size / self::ABSOLUTE_UNITS[$unitOfMeasure];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php
new file mode 100644
index 00000000..4e98c792
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+
+/**
+ * Assist downloading files when samples are run in browser.
+ * Never run as part of unit tests, which are command line.
+ *
+ * @codeCoverageIgnore
+ */
+class Downloader
+{
+    protected string $filepath;
+
+    protected string $filename;
+
+    protected string $filetype;
+
+    protected const CONTENT_TYPES = [
+        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'xls' => 'application/vnd.ms-excel',
+        'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+        'csv' => 'text/csv',
+        'html' => 'text/html',
+        'pdf' => 'application/pdf',
+    ];
+
+    public function __construct(string $folder, string $filename, ?string $filetype = null)
+    {
+        if ((is_dir($folder) === false) || (is_readable($folder) === false)) {
+            throw new Exception("Folder {$folder} is not accessable");
+        }
+        $filepath = "{$folder}/{$filename}";
+        $this->filepath = (string) realpath($filepath);
+        $this->filename = basename($filepath);
+        if ((file_exists($this->filepath) === false) || (is_readable($this->filepath) === false)) {
+            throw new Exception("{$this->filename} not found, or cannot be read");
+        }
+
+        $filetype ??= pathinfo($filename, PATHINFO_EXTENSION);
+        if (array_key_exists(strtolower($filetype), self::CONTENT_TYPES) === false) {
+            throw new Exception("Invalid filetype: {$filetype} cannot be downloaded");
+        }
+        $this->filetype = strtolower($filetype);
+    }
+
+    public function download(): void
+    {
+        $this->headers();
+
+        readfile($this->filepath);
+    }
+
+    public function headers(): void
+    {
+        // I cannot tell what this ob_clean is paired with.
+        // I have never seen a problem with it, but someone has - issue 3739.
+        // Perhaps it should be removed altogether,
+        // but making it conditional seems harmless, and safer.
+        if ((int) ob_get_length() > 0) {
+            ob_clean();
+        }
+
+        $this->contentType();
+        $this->contentDisposition();
+        $this->cacheHeaders();
+        $this->fileSize();
+
+        flush();
+    }
+
+    protected function contentType(): void
+    {
+        header('Content-Type: ' . self::CONTENT_TYPES[$this->filetype]);
+    }
+
+    protected function contentDisposition(): void
+    {
+        header('Content-Disposition: attachment;filename="' . $this->filename . '"');
+    }
+
+    protected function cacheHeaders(): void
+    {
+        header('Cache-Control: max-age=0');
+        // If you're serving to IE 9, then the following may be needed
+        header('Cache-Control: max-age=1');
+
+        // If you're serving to IE over SSL, then the following may be needed
+        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
+        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
+        header('Cache-Control: cache, must-revalidate'); // HTTP/1.1
+        header('Pragma: public'); // HTTP/1.0
+    }
+
+    protected function fileSize(): void
+    {
+        header('Content-Length: ' . filesize($this->filepath));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php
new file mode 100644
index 00000000..fb1b9a04
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+class Handler
+{
+    private static string $invalidHex = 'Y';
+
+    // A bunch of methods to show that we continue
+    // to capture messages even using PhpUnit 10.
+    public static function suppressed(): bool
+    {
+        return @trigger_error('hello');
+    }
+
+    public static function deprecated(): string
+    {
+        return (string) hexdec(self::$invalidHex);
+    }
+
+    public static function notice(string $value): void
+    {
+        date_default_timezone_set($value);
+    }
+
+    public static function warning(): bool
+    {
+        return file_get_contents(__FILE__ . 'noexist') !== false;
+    }
+
+    public static function userDeprecated(): bool
+    {
+        return trigger_error('hello', E_USER_DEPRECATED);
+    }
+
+    public static function userNotice(): bool
+    {
+        return trigger_error('userNotice', E_USER_NOTICE);
+    }
+
+    public static function userWarning(): bool
+    {
+        return trigger_error('userWarning', E_USER_WARNING);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php
new file mode 100644
index 00000000..2e9f185d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php
@@ -0,0 +1,862 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use DOMAttr;
+use DOMDocument;
+use DOMElement;
+use DOMNode;
+use DOMText;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class Html
+{
+    private const COLOUR_MAP = [
+        'aliceblue' => 'f0f8ff',
+        'antiquewhite' => 'faebd7',
+        'antiquewhite1' => 'ffefdb',
+        'antiquewhite2' => 'eedfcc',
+        'antiquewhite3' => 'cdc0b0',
+        'antiquewhite4' => '8b8378',
+        'aqua' => '00ffff',
+        'aquamarine1' => '7fffd4',
+        'aquamarine2' => '76eec6',
+        'aquamarine4' => '458b74',
+        'azure1' => 'f0ffff',
+        'azure2' => 'e0eeee',
+        'azure3' => 'c1cdcd',
+        'azure4' => '838b8b',
+        'beige' => 'f5f5dc',
+        'bisque1' => 'ffe4c4',
+        'bisque2' => 'eed5b7',
+        'bisque3' => 'cdb79e',
+        'bisque4' => '8b7d6b',
+        'black' => '000000',
+        'blanchedalmond' => 'ffebcd',
+        'blue' => '0000ff',
+        'blue1' => '0000ff',
+        'blue2' => '0000ee',
+        'blue4' => '00008b',
+        'blueviolet' => '8a2be2',
+        'brown' => 'a52a2a',
+        'brown1' => 'ff4040',
+        'brown2' => 'ee3b3b',
+        'brown3' => 'cd3333',
+        'brown4' => '8b2323',
+        'burlywood' => 'deb887',
+        'burlywood1' => 'ffd39b',
+        'burlywood2' => 'eec591',
+        'burlywood3' => 'cdaa7d',
+        'burlywood4' => '8b7355',
+        'cadetblue' => '5f9ea0',
+        'cadetblue1' => '98f5ff',
+        'cadetblue2' => '8ee5ee',
+        'cadetblue3' => '7ac5cd',
+        'cadetblue4' => '53868b',
+        'chartreuse1' => '7fff00',
+        'chartreuse2' => '76ee00',
+        'chartreuse3' => '66cd00',
+        'chartreuse4' => '458b00',
+        'chocolate' => 'd2691e',
+        'chocolate1' => 'ff7f24',
+        'chocolate2' => 'ee7621',
+        'chocolate3' => 'cd661d',
+        'coral' => 'ff7f50',
+        'coral1' => 'ff7256',
+        'coral2' => 'ee6a50',
+        'coral3' => 'cd5b45',
+        'coral4' => '8b3e2f',
+        'cornflowerblue' => '6495ed',
+        'cornsilk1' => 'fff8dc',
+        'cornsilk2' => 'eee8cd',
+        'cornsilk3' => 'cdc8b1',
+        'cornsilk4' => '8b8878',
+        'cyan1' => '00ffff',
+        'cyan2' => '00eeee',
+        'cyan3' => '00cdcd',
+        'cyan4' => '008b8b',
+        'darkgoldenrod' => 'b8860b',
+        'darkgoldenrod1' => 'ffb90f',
+        'darkgoldenrod2' => 'eead0e',
+        'darkgoldenrod3' => 'cd950c',
+        'darkgoldenrod4' => '8b6508',
+        'darkgreen' => '006400',
+        'darkkhaki' => 'bdb76b',
+        'darkolivegreen' => '556b2f',
+        'darkolivegreen1' => 'caff70',
+        'darkolivegreen2' => 'bcee68',
+        'darkolivegreen3' => 'a2cd5a',
+        'darkolivegreen4' => '6e8b3d',
+        'darkorange' => 'ff8c00',
+        'darkorange1' => 'ff7f00',
+        'darkorange2' => 'ee7600',
+        'darkorange3' => 'cd6600',
+        'darkorange4' => '8b4500',
+        'darkorchid' => '9932cc',
+        'darkorchid1' => 'bf3eff',
+        'darkorchid2' => 'b23aee',
+        'darkorchid3' => '9a32cd',
+        'darkorchid4' => '68228b',
+        'darksalmon' => 'e9967a',
+        'darkseagreen' => '8fbc8f',
+        'darkseagreen1' => 'c1ffc1',
+        'darkseagreen2' => 'b4eeb4',
+        'darkseagreen3' => '9bcd9b',
+        'darkseagreen4' => '698b69',
+        'darkslateblue' => '483d8b',
+        'darkslategray' => '2f4f4f',
+        'darkslategray1' => '97ffff',
+        'darkslategray2' => '8deeee',
+        'darkslategray3' => '79cdcd',
+        'darkslategray4' => '528b8b',
+        'darkturquoise' => '00ced1',
+        'darkviolet' => '9400d3',
+        'deeppink1' => 'ff1493',
+        'deeppink2' => 'ee1289',
+        'deeppink3' => 'cd1076',
+        'deeppink4' => '8b0a50',
+        'deepskyblue1' => '00bfff',
+        'deepskyblue2' => '00b2ee',
+        'deepskyblue3' => '009acd',
+        'deepskyblue4' => '00688b',
+        'dimgray' => '696969',
+        'dodgerblue1' => '1e90ff',
+        'dodgerblue2' => '1c86ee',
+        'dodgerblue3' => '1874cd',
+        'dodgerblue4' => '104e8b',
+        'firebrick' => 'b22222',
+        'firebrick1' => 'ff3030',
+        'firebrick2' => 'ee2c2c',
+        'firebrick3' => 'cd2626',
+        'firebrick4' => '8b1a1a',
+        'floralwhite' => 'fffaf0',
+        'forestgreen' => '228b22',
+        'fuchsia' => 'ff00ff',
+        'gainsboro' => 'dcdcdc',
+        'ghostwhite' => 'f8f8ff',
+        'gold1' => 'ffd700',
+        'gold2' => 'eec900',
+        'gold3' => 'cdad00',
+        'gold4' => '8b7500',
+        'goldenrod' => 'daa520',
+        'goldenrod1' => 'ffc125',
+        'goldenrod2' => 'eeb422',
+        'goldenrod3' => 'cd9b1d',
+        'goldenrod4' => '8b6914',
+        'gray' => 'bebebe',
+        'gray1' => '030303',
+        'gray10' => '1a1a1a',
+        'gray11' => '1c1c1c',
+        'gray12' => '1f1f1f',
+        'gray13' => '212121',
+        'gray14' => '242424',
+        'gray15' => '262626',
+        'gray16' => '292929',
+        'gray17' => '2b2b2b',
+        'gray18' => '2e2e2e',
+        'gray19' => '303030',
+        'gray2' => '050505',
+        'gray20' => '333333',
+        'gray21' => '363636',
+        'gray22' => '383838',
+        'gray23' => '3b3b3b',
+        'gray24' => '3d3d3d',
+        'gray25' => '404040',
+        'gray26' => '424242',
+        'gray27' => '454545',
+        'gray28' => '474747',
+        'gray29' => '4a4a4a',
+        'gray3' => '080808',
+        'gray30' => '4d4d4d',
+        'gray31' => '4f4f4f',
+        'gray32' => '525252',
+        'gray33' => '545454',
+        'gray34' => '575757',
+        'gray35' => '595959',
+        'gray36' => '5c5c5c',
+        'gray37' => '5e5e5e',
+        'gray38' => '616161',
+        'gray39' => '636363',
+        'gray4' => '0a0a0a',
+        'gray40' => '666666',
+        'gray41' => '696969',
+        'gray42' => '6b6b6b',
+        'gray43' => '6e6e6e',
+        'gray44' => '707070',
+        'gray45' => '737373',
+        'gray46' => '757575',
+        'gray47' => '787878',
+        'gray48' => '7a7a7a',
+        'gray49' => '7d7d7d',
+        'gray5' => '0d0d0d',
+        'gray50' => '7f7f7f',
+        'gray51' => '828282',
+        'gray52' => '858585',
+        'gray53' => '878787',
+        'gray54' => '8a8a8a',
+        'gray55' => '8c8c8c',
+        'gray56' => '8f8f8f',
+        'gray57' => '919191',
+        'gray58' => '949494',
+        'gray59' => '969696',
+        'gray6' => '0f0f0f',
+        'gray60' => '999999',
+        'gray61' => '9c9c9c',
+        'gray62' => '9e9e9e',
+        'gray63' => 'a1a1a1',
+        'gray64' => 'a3a3a3',
+        'gray65' => 'a6a6a6',
+        'gray66' => 'a8a8a8',
+        'gray67' => 'ababab',
+        'gray68' => 'adadad',
+        'gray69' => 'b0b0b0',
+        'gray7' => '121212',
+        'gray70' => 'b3b3b3',
+        'gray71' => 'b5b5b5',
+        'gray72' => 'b8b8b8',
+        'gray73' => 'bababa',
+        'gray74' => 'bdbdbd',
+        'gray75' => 'bfbfbf',
+        'gray76' => 'c2c2c2',
+        'gray77' => 'c4c4c4',
+        'gray78' => 'c7c7c7',
+        'gray79' => 'c9c9c9',
+        'gray8' => '141414',
+        'gray80' => 'cccccc',
+        'gray81' => 'cfcfcf',
+        'gray82' => 'd1d1d1',
+        'gray83' => 'd4d4d4',
+        'gray84' => 'd6d6d6',
+        'gray85' => 'd9d9d9',
+        'gray86' => 'dbdbdb',
+        'gray87' => 'dedede',
+        'gray88' => 'e0e0e0',
+        'gray89' => 'e3e3e3',
+        'gray9' => '171717',
+        'gray90' => 'e5e5e5',
+        'gray91' => 'e8e8e8',
+        'gray92' => 'ebebeb',
+        'gray93' => 'ededed',
+        'gray94' => 'f0f0f0',
+        'gray95' => 'f2f2f2',
+        'gray97' => 'f7f7f7',
+        'gray98' => 'fafafa',
+        'gray99' => 'fcfcfc',
+        'green' => '00ff00',
+        'green1' => '00ff00',
+        'green2' => '00ee00',
+        'green3' => '00cd00',
+        'green4' => '008b00',
+        'greenyellow' => 'adff2f',
+        'honeydew1' => 'f0fff0',
+        'honeydew2' => 'e0eee0',
+        'honeydew3' => 'c1cdc1',
+        'honeydew4' => '838b83',
+        'hotpink' => 'ff69b4',
+        'hotpink1' => 'ff6eb4',
+        'hotpink2' => 'ee6aa7',
+        'hotpink3' => 'cd6090',
+        'hotpink4' => '8b3a62',
+        'indianred' => 'cd5c5c',
+        'indianred1' => 'ff6a6a',
+        'indianred2' => 'ee6363',
+        'indianred3' => 'cd5555',
+        'indianred4' => '8b3a3a',
+        'ivory1' => 'fffff0',
+        'ivory2' => 'eeeee0',
+        'ivory3' => 'cdcdc1',
+        'ivory4' => '8b8b83',
+        'khaki' => 'f0e68c',
+        'khaki1' => 'fff68f',
+        'khaki2' => 'eee685',
+        'khaki3' => 'cdc673',
+        'khaki4' => '8b864e',
+        'lavender' => 'e6e6fa',
+        'lavenderblush1' => 'fff0f5',
+        'lavenderblush2' => 'eee0e5',
+        'lavenderblush3' => 'cdc1c5',
+        'lavenderblush4' => '8b8386',
+        'lawngreen' => '7cfc00',
+        'lemonchiffon1' => 'fffacd',
+        'lemonchiffon2' => 'eee9bf',
+        'lemonchiffon3' => 'cdc9a5',
+        'lemonchiffon4' => '8b8970',
+        'light' => 'eedd82',
+        'lightblue' => 'add8e6',
+        'lightblue1' => 'bfefff',
+        'lightblue2' => 'b2dfee',
+        'lightblue3' => '9ac0cd',
+        'lightblue4' => '68838b',
+        'lightcoral' => 'f08080',
+        'lightcyan1' => 'e0ffff',
+        'lightcyan2' => 'd1eeee',
+        'lightcyan3' => 'b4cdcd',
+        'lightcyan4' => '7a8b8b',
+        'lightgoldenrod1' => 'ffec8b',
+        'lightgoldenrod2' => 'eedc82',
+        'lightgoldenrod3' => 'cdbe70',
+        'lightgoldenrod4' => '8b814c',
+        'lightgoldenrodyellow' => 'fafad2',
+        'lightgray' => 'd3d3d3',
+        'lightpink' => 'ffb6c1',
+        'lightpink1' => 'ffaeb9',
+        'lightpink2' => 'eea2ad',
+        'lightpink3' => 'cd8c95',
+        'lightpink4' => '8b5f65',
+        'lightsalmon1' => 'ffa07a',
+        'lightsalmon2' => 'ee9572',
+        'lightsalmon3' => 'cd8162',
+        'lightsalmon4' => '8b5742',
+        'lightseagreen' => '20b2aa',
+        'lightskyblue' => '87cefa',
+        'lightskyblue1' => 'b0e2ff',
+        'lightskyblue2' => 'a4d3ee',
+        'lightskyblue3' => '8db6cd',
+        'lightskyblue4' => '607b8b',
+        'lightslateblue' => '8470ff',
+        'lightslategray' => '778899',
+        'lightsteelblue' => 'b0c4de',
+        'lightsteelblue1' => 'cae1ff',
+        'lightsteelblue2' => 'bcd2ee',
+        'lightsteelblue3' => 'a2b5cd',
+        'lightsteelblue4' => '6e7b8b',
+        'lightyellow1' => 'ffffe0',
+        'lightyellow2' => 'eeeed1',
+        'lightyellow3' => 'cdcdb4',
+        'lightyellow4' => '8b8b7a',
+        'lime' => '00ff00',
+        'limegreen' => '32cd32',
+        'linen' => 'faf0e6',
+        'magenta' => 'ff00ff',
+        'magenta2' => 'ee00ee',
+        'magenta3' => 'cd00cd',
+        'magenta4' => '8b008b',
+        'maroon' => 'b03060',
+        'maroon1' => 'ff34b3',
+        'maroon2' => 'ee30a7',
+        'maroon3' => 'cd2990',
+        'maroon4' => '8b1c62',
+        'medium' => '66cdaa',
+        'mediumaquamarine' => '66cdaa',
+        'mediumblue' => '0000cd',
+        'mediumorchid' => 'ba55d3',
+        'mediumorchid1' => 'e066ff',
+        'mediumorchid2' => 'd15fee',
+        'mediumorchid3' => 'b452cd',
+        'mediumorchid4' => '7a378b',
+        'mediumpurple' => '9370db',
+        'mediumpurple1' => 'ab82ff',
+        'mediumpurple2' => '9f79ee',
+        'mediumpurple3' => '8968cd',
+        'mediumpurple4' => '5d478b',
+        'mediumseagreen' => '3cb371',
+        'mediumslateblue' => '7b68ee',
+        'mediumspringgreen' => '00fa9a',
+        'mediumturquoise' => '48d1cc',
+        'mediumvioletred' => 'c71585',
+        'midnightblue' => '191970',
+        'mintcream' => 'f5fffa',
+        'mistyrose1' => 'ffe4e1',
+        'mistyrose2' => 'eed5d2',
+        'mistyrose3' => 'cdb7b5',
+        'mistyrose4' => '8b7d7b',
+        'moccasin' => 'ffe4b5',
+        'navajowhite1' => 'ffdead',
+        'navajowhite2' => 'eecfa1',
+        'navajowhite3' => 'cdb38b',
+        'navajowhite4' => '8b795e',
+        'navy' => '000080',
+        'navyblue' => '000080',
+        'oldlace' => 'fdf5e6',
+        'olive' => '808000',
+        'olivedrab' => '6b8e23',
+        'olivedrab1' => 'c0ff3e',
+        'olivedrab2' => 'b3ee3a',
+        'olivedrab4' => '698b22',
+        'orange' => 'ffa500',
+        'orange1' => 'ffa500',
+        'orange2' => 'ee9a00',
+        'orange3' => 'cd8500',
+        'orange4' => '8b5a00',
+        'orangered1' => 'ff4500',
+        'orangered2' => 'ee4000',
+        'orangered3' => 'cd3700',
+        'orangered4' => '8b2500',
+        'orchid' => 'da70d6',
+        'orchid1' => 'ff83fa',
+        'orchid2' => 'ee7ae9',
+        'orchid3' => 'cd69c9',
+        'orchid4' => '8b4789',
+        'pale' => 'db7093',
+        'palegoldenrod' => 'eee8aa',
+        'palegreen' => '98fb98',
+        'palegreen1' => '9aff9a',
+        'palegreen2' => '90ee90',
+        'palegreen3' => '7ccd7c',
+        'palegreen4' => '548b54',
+        'paleturquoise' => 'afeeee',
+        'paleturquoise1' => 'bbffff',
+        'paleturquoise2' => 'aeeeee',
+        'paleturquoise3' => '96cdcd',
+        'paleturquoise4' => '668b8b',
+        'palevioletred' => 'db7093',
+        'palevioletred1' => 'ff82ab',
+        'palevioletred2' => 'ee799f',
+        'palevioletred3' => 'cd6889',
+        'palevioletred4' => '8b475d',
+        'papayawhip' => 'ffefd5',
+        'peachpuff1' => 'ffdab9',
+        'peachpuff2' => 'eecbad',
+        'peachpuff3' => 'cdaf95',
+        'peachpuff4' => '8b7765',
+        'pink' => 'ffc0cb',
+        'pink1' => 'ffb5c5',
+        'pink2' => 'eea9b8',
+        'pink3' => 'cd919e',
+        'pink4' => '8b636c',
+        'plum' => 'dda0dd',
+        'plum1' => 'ffbbff',
+        'plum2' => 'eeaeee',
+        'plum3' => 'cd96cd',
+        'plum4' => '8b668b',
+        'powderblue' => 'b0e0e6',
+        'purple' => 'a020f0',
+        'rebeccapurple' => '663399',
+        'purple1' => '9b30ff',
+        'purple2' => '912cee',
+        'purple3' => '7d26cd',
+        'purple4' => '551a8b',
+        'red' => 'ff0000',
+        'red1' => 'ff0000',
+        'red2' => 'ee0000',
+        'red3' => 'cd0000',
+        'red4' => '8b0000',
+        'rosybrown' => 'bc8f8f',
+        'rosybrown1' => 'ffc1c1',
+        'rosybrown2' => 'eeb4b4',
+        'rosybrown3' => 'cd9b9b',
+        'rosybrown4' => '8b6969',
+        'royalblue' => '4169e1',
+        'royalblue1' => '4876ff',
+        'royalblue2' => '436eee',
+        'royalblue3' => '3a5fcd',
+        'royalblue4' => '27408b',
+        'saddlebrown' => '8b4513',
+        'salmon' => 'fa8072',
+        'salmon1' => 'ff8c69',
+        'salmon2' => 'ee8262',
+        'salmon3' => 'cd7054',
+        'salmon4' => '8b4c39',
+        'sandybrown' => 'f4a460',
+        'seagreen1' => '54ff9f',
+        'seagreen2' => '4eee94',
+        'seagreen3' => '43cd80',
+        'seagreen4' => '2e8b57',
+        'seashell1' => 'fff5ee',
+        'seashell2' => 'eee5de',
+        'seashell3' => 'cdc5bf',
+        'seashell4' => '8b8682',
+        'sienna' => 'a0522d',
+        'sienna1' => 'ff8247',
+        'sienna2' => 'ee7942',
+        'sienna3' => 'cd6839',
+        'sienna4' => '8b4726',
+        'silver' => 'c0c0c0',
+        'skyblue' => '87ceeb',
+        'skyblue1' => '87ceff',
+        'skyblue2' => '7ec0ee',
+        'skyblue3' => '6ca6cd',
+        'skyblue4' => '4a708b',
+        'slateblue' => '6a5acd',
+        'slateblue1' => '836fff',
+        'slateblue2' => '7a67ee',
+        'slateblue3' => '6959cd',
+        'slateblue4' => '473c8b',
+        'slategray' => '708090',
+        'slategray1' => 'c6e2ff',
+        'slategray2' => 'b9d3ee',
+        'slategray3' => '9fb6cd',
+        'slategray4' => '6c7b8b',
+        'snow1' => 'fffafa',
+        'snow2' => 'eee9e9',
+        'snow3' => 'cdc9c9',
+        'snow4' => '8b8989',
+        'springgreen1' => '00ff7f',
+        'springgreen2' => '00ee76',
+        'springgreen3' => '00cd66',
+        'springgreen4' => '008b45',
+        'steelblue' => '4682b4',
+        'steelblue1' => '63b8ff',
+        'steelblue2' => '5cacee',
+        'steelblue3' => '4f94cd',
+        'steelblue4' => '36648b',
+        'tan' => 'd2b48c',
+        'tan1' => 'ffa54f',
+        'tan2' => 'ee9a49',
+        'tan3' => 'cd853f',
+        'tan4' => '8b5a2b',
+        'teal' => '008080',
+        'thistle' => 'd8bfd8',
+        'thistle1' => 'ffe1ff',
+        'thistle2' => 'eed2ee',
+        'thistle3' => 'cdb5cd',
+        'thistle4' => '8b7b8b',
+        'tomato1' => 'ff6347',
+        'tomato2' => 'ee5c42',
+        'tomato3' => 'cd4f39',
+        'tomato4' => '8b3626',
+        'turquoise' => '40e0d0',
+        'turquoise1' => '00f5ff',
+        'turquoise2' => '00e5ee',
+        'turquoise3' => '00c5cd',
+        'turquoise4' => '00868b',
+        'violet' => 'ee82ee',
+        'violetred' => 'd02090',
+        'violetred1' => 'ff3e96',
+        'violetred2' => 'ee3a8c',
+        'violetred3' => 'cd3278',
+        'violetred4' => '8b2252',
+        'wheat' => 'f5deb3',
+        'wheat1' => 'ffe7ba',
+        'wheat2' => 'eed8ae',
+        'wheat3' => 'cdba96',
+        'wheat4' => '8b7e66',
+        'white' => 'ffffff',
+        'whitesmoke' => 'f5f5f5',
+        'yellow' => 'ffff00',
+        'yellow1' => 'ffff00',
+        'yellow2' => 'eeee00',
+        'yellow3' => 'cdcd00',
+        'yellow4' => '8b8b00',
+        'yellowgreen' => '9acd32',
+    ];
+
+    /** @var ?string */
+    private ?string $face = null;
+
+    /** @var ?string */
+    private ?string $size = null;
+
+    /** @var ?string */
+    private ?string $color = null;
+
+    private bool $bold = false;
+
+    private bool $italic = false;
+
+    private bool $underline = false;
+
+    private bool $superscript = false;
+
+    private bool $subscript = false;
+
+    private bool $strikethrough = false;
+
+    /** @var callable[] */
+    private array $startTagCallbacks = [
+        'font' => [self::class, 'startFontTag'],
+        'b' => [self::class, 'startBoldTag'],
+        'strong' => [self::class, 'startBoldTag'],
+        'i' => [self::class, 'startItalicTag'],
+        'em' => [self::class, 'startItalicTag'],
+        'u' => [self::class, 'startUnderlineTag'],
+        'ins' => [self::class, 'startUnderlineTag'],
+        'del' => [self::class, 'startStrikethruTag'],
+        'sup' => [self::class, 'startSuperscriptTag'],
+        'sub' => [self::class, 'startSubscriptTag'],
+    ];
+
+    /** @var callable[] */
+    private array $endTagCallbacks = [
+        'font' => [self::class, 'endFontTag'],
+        'b' => [self::class, 'endBoldTag'],
+        'strong' => [self::class, 'endBoldTag'],
+        'i' => [self::class, 'endItalicTag'],
+        'em' => [self::class, 'endItalicTag'],
+        'u' => [self::class, 'endUnderlineTag'],
+        'ins' => [self::class, 'endUnderlineTag'],
+        'del' => [self::class, 'endStrikethruTag'],
+        'sup' => [self::class, 'endSuperscriptTag'],
+        'sub' => [self::class, 'endSubscriptTag'],
+        'br' => [self::class, 'breakTag'],
+        'p' => [self::class, 'breakTag'],
+        'h1' => [self::class, 'breakTag'],
+        'h2' => [self::class, 'breakTag'],
+        'h3' => [self::class, 'breakTag'],
+        'h4' => [self::class, 'breakTag'],
+        'h5' => [self::class, 'breakTag'],
+        'h6' => [self::class, 'breakTag'],
+    ];
+
+    private array $stack = [];
+
+    public string $stringData = '';
+
+    private RichText $richTextObject;
+
+    private bool $preserveWhiteSpace = false;
+
+    private function initialise(): void
+    {
+        $this->face = $this->size = $this->color = null;
+        $this->bold = $this->italic = $this->underline = $this->superscript = $this->subscript = $this->strikethrough = false;
+
+        $this->stack = [];
+
+        $this->stringData = '';
+    }
+
+    /**
+     * Parse HTML formatting and return the resulting RichText.
+     */
+    public function toRichTextObject(string $html, bool $preserveWhiteSpace = false): RichText
+    {
+        $this->initialise();
+
+        //    Create a new DOM object
+        $dom = new DOMDocument();
+        //    Load the HTML file into the DOM object
+        //  Note the use of error suppression, because typically this will be an html fragment, so not fully valid markup
+        $prefix = '<?xml encoding="UTF-8">';
+        @$dom->loadHTML($prefix . $html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+        //    Discard excess white space
+        $dom->preserveWhiteSpace = false;
+
+        $this->richTextObject = new RichText();
+        $this->preserveWhiteSpace = $preserveWhiteSpace;
+        $this->parseElements($dom);
+        $this->preserveWhiteSpace = false;
+
+        // Clean any further spurious whitespace
+        $this->cleanWhitespace();
+
+        return $this->richTextObject;
+    }
+
+    private function cleanWhitespace(): void
+    {
+        foreach ($this->richTextObject->getRichTextElements() as $key => $element) {
+            $text = $element->getText();
+            // Trim any leading spaces on the first run
+            if ($key == 0) {
+                $text = ltrim($text);
+            }
+            // Trim any spaces immediately after a line break
+            $text = (string) preg_replace('/\n */mu', "\n", $text);
+            $element->setText($text);
+        }
+    }
+
+    private function buildTextRun(): void
+    {
+        $text = $this->stringData;
+        if (trim($text) === '') {
+            return;
+        }
+
+        $richtextRun = $this->richTextObject->createTextRun($this->stringData);
+        $font = $richtextRun->getFont();
+        if ($font !== null) {
+            if ($this->face) {
+                $font->setName($this->face);
+            }
+            if ($this->size) {
+                $font->setSize($this->size);
+            }
+            if ($this->color) {
+                $font->setColor(new Color('ff' . $this->color));
+            }
+            if ($this->bold) {
+                $font->setBold(true);
+            }
+            if ($this->italic) {
+                $font->setItalic(true);
+            }
+            if ($this->underline) {
+                $font->setUnderline(Font::UNDERLINE_SINGLE);
+            }
+            if ($this->superscript) {
+                $font->setSuperscript(true);
+            }
+            if ($this->subscript) {
+                $font->setSubscript(true);
+            }
+            if ($this->strikethrough) {
+                $font->setStrikethrough(true);
+            }
+        }
+        $this->stringData = '';
+    }
+
+    private function rgbToColour(string $rgbValue): string
+    {
+        preg_match_all('/\d+/', $rgbValue, $values);
+        foreach ($values[0] as &$value) {
+            $value = str_pad(dechex((int) $value), 2, '0', STR_PAD_LEFT);
+        }
+
+        return implode('', $values[0]);
+    }
+
+    public static function colourNameLookup(string $colorName): string
+    {
+        return self::COLOUR_MAP[$colorName] ?? '';
+    }
+
+    protected function startFontTag(DOMElement $tag): void
+    {
+        $attrs = $tag->attributes;
+        if ($attrs !== null) {
+            /** @var DOMAttr $attribute */
+            foreach ($attrs as $attribute) {
+                $attributeName = strtolower($attribute->name);
+                $attributeName = preg_replace('/^html:/', '', $attributeName) ?? $attributeName; // in case from Xml spreadsheet
+                $attributeValue = $attribute->value;
+
+                if ($attributeName == 'color') {
+                    if (preg_match('/rgb\s*\(/', $attributeValue)) {
+                        $this->$attributeName = $this->rgbToColour($attributeValue);
+                    } elseif (str_starts_with(trim($attributeValue), '#')) {
+                        $this->$attributeName = ltrim($attributeValue, '#');
+                    } else {
+                        $this->$attributeName = static::colourNameLookup($attributeValue);
+                    }
+                } else {
+                    $this->$attributeName = $attributeValue;
+                }
+            }
+        }
+    }
+
+    protected function endFontTag(): void
+    {
+        $this->face = $this->size = $this->color = null;
+    }
+
+    protected function startBoldTag(): void
+    {
+        $this->bold = true;
+    }
+
+    protected function endBoldTag(): void
+    {
+        $this->bold = false;
+    }
+
+    protected function startItalicTag(): void
+    {
+        $this->italic = true;
+    }
+
+    protected function endItalicTag(): void
+    {
+        $this->italic = false;
+    }
+
+    protected function startUnderlineTag(): void
+    {
+        $this->underline = true;
+    }
+
+    protected function endUnderlineTag(): void
+    {
+        $this->underline = false;
+    }
+
+    protected function startSubscriptTag(): void
+    {
+        $this->subscript = true;
+    }
+
+    protected function endSubscriptTag(): void
+    {
+        $this->subscript = false;
+    }
+
+    protected function startSuperscriptTag(): void
+    {
+        $this->superscript = true;
+    }
+
+    protected function endSuperscriptTag(): void
+    {
+        $this->superscript = false;
+    }
+
+    protected function startStrikethruTag(): void
+    {
+        $this->strikethrough = true;
+    }
+
+    protected function endStrikethruTag(): void
+    {
+        $this->strikethrough = false;
+    }
+
+    public function breakTag(): void
+    {
+        $this->stringData .= "\n";
+    }
+
+    private function parseTextNode(DOMText $textNode): void
+    {
+        if ($this->preserveWhiteSpace) {
+            $domText = $textNode->nodeValue ?? '';
+        } else {
+            $domText = (string) preg_replace(
+                '/\s+/u',
+                ' ',
+                str_replace(["\r", "\n"], ' ', $textNode->nodeValue ?? '')
+            );
+        }
+        $this->stringData .= $domText;
+        $this->buildTextRun();
+    }
+
+    public function addStartTagCallback(string $tag, callable $callback): void
+    {
+        $this->startTagCallbacks[$tag] = $callback;
+    }
+
+    public function addEndTagCallback(string $tag, callable $callback): void
+    {
+        $this->endTagCallbacks[$tag] = $callback;
+    }
+
+    /** @param callable[] $callbacks */
+    private function handleCallback(DOMElement $element, string $callbackTag, array $callbacks): void
+    {
+        if (isset($callbacks[$callbackTag])) {
+            $elementHandler = $callbacks[$callbackTag];
+            if (is_callable($elementHandler)) {
+                call_user_func($elementHandler, $element, $this);
+            }
+        }
+    }
+
+    private function parseElementNode(DOMElement $element): void
+    {
+        $callbackTag = strtolower($element->nodeName);
+        $this->stack[] = $callbackTag;
+
+        $this->handleCallback($element, $callbackTag, $this->startTagCallbacks);
+
+        $this->parseElements($element);
+        array_pop($this->stack);
+
+        $this->handleCallback($element, $callbackTag, $this->endTagCallbacks);
+    }
+
+    private function parseElements(DOMNode $element): void
+    {
+        foreach ($element->childNodes as $child) {
+            if ($child instanceof DOMText) {
+                $this->parseTextNode($child);
+            } elseif ($child instanceof DOMElement) {
+                $this->parseElementNode($child);
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php
new file mode 100644
index 00000000..eded9ae4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php
@@ -0,0 +1,295 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Writer\IWriter;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RecursiveRegexIterator;
+use ReflectionClass;
+use RegexIterator;
+use RuntimeException;
+use Throwable;
+
+/**
+ * Helper class to be used in sample code.
+ */
+class Sample
+{
+    /**
+     * Returns whether we run on CLI or browser.
+     */
+    public function isCli(): bool
+    {
+        return PHP_SAPI === 'cli';
+    }
+
+    /**
+     * Return the filename currently being executed.
+     */
+    public function getScriptFilename(): string
+    {
+        return basename($_SERVER['SCRIPT_FILENAME'], '.php');
+    }
+
+    /**
+     * Whether we are executing the index page.
+     */
+    public function isIndex(): bool
+    {
+        return $this->getScriptFilename() === 'index';
+    }
+
+    /**
+     * Return the page title.
+     */
+    public function getPageTitle(): string
+    {
+        return $this->isIndex() ? 'PHPSpreadsheet' : $this->getScriptFilename();
+    }
+
+    /**
+     * Return the page heading.
+     */
+    public function getPageHeading(): string
+    {
+        return $this->isIndex() ? '' : '<h1>' . str_replace('_', ' ', $this->getScriptFilename()) . '</h1>';
+    }
+
+    /**
+     * Returns an array of all known samples.
+     *
+     * @return string[][] [$name => $path]
+     */
+    public function getSamples(): array
+    {
+        // Populate samples
+        $baseDir = realpath(__DIR__ . '/../../../samples');
+        if ($baseDir === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('realpath returned false');
+            // @codeCoverageIgnoreEnd
+        }
+        $directory = new RecursiveDirectoryIterator($baseDir);
+        $iterator = new RecursiveIteratorIterator($directory);
+        $regex = new RegexIterator($iterator, '/^.+\.php$/', RecursiveRegexIterator::GET_MATCH);
+
+        $files = [];
+        /** @var string[] $file */
+        foreach ($regex as $file) {
+            $file = str_replace(str_replace('\\', '/', $baseDir) . '/', '', str_replace('\\', '/', $file[0]));
+            $info = pathinfo($file);
+            $category = str_replace('_', ' ', $info['dirname'] ?? '');
+            $name = str_replace('_', ' ', (string) preg_replace('/(|\.php)/', '', $info['filename']));
+            if (!in_array($category, ['.', 'bootstrap', 'templates']) && $name !== 'Header') {
+                if (!isset($files[$category])) {
+                    $files[$category] = [];
+                }
+                $files[$category][$name] = $file;
+            }
+        }
+
+        // Sort everything
+        ksort($files);
+        foreach ($files as &$f) {
+            asort($f);
+        }
+
+        return $files;
+    }
+
+    /**
+     * Write documents.
+     *
+     * @param string[] $writers
+     */
+    public function write(Spreadsheet $spreadsheet, string $filename, array $writers = ['Xlsx', 'Xls'], bool $withCharts = false, ?callable $writerCallback = null, bool $resetActiveSheet = true): void
+    {
+        // Set active sheet index to the first sheet, so Excel opens this as the first sheet
+        if ($resetActiveSheet) {
+            $spreadsheet->setActiveSheetIndex(0);
+        }
+
+        // Write documents
+        foreach ($writers as $writerType) {
+            $path = $this->getFilename($filename, mb_strtolower($writerType));
+            $writer = IOFactory::createWriter($spreadsheet, $writerType);
+            $writer->setIncludeCharts($withCharts);
+            if ($writerCallback !== null) {
+                $writerCallback($writer);
+            }
+            $callStartTime = microtime(true);
+            $writer->save($path);
+            $this->logWrite($writer, $path, $callStartTime);
+            if ($this->isCli() === false) {
+                // @codeCoverageIgnoreStart
+                echo '<a href="/download.php?type=' . pathinfo($path, PATHINFO_EXTENSION) . '&name=' . basename($path) . '">Download ' . basename($path) . '</a><br />';
+                // @codeCoverageIgnoreEnd
+            }
+        }
+
+        $this->logEndingNotes();
+    }
+
+    protected function isDirOrMkdir(string $folder): bool
+    {
+        return \is_dir($folder) || \mkdir($folder);
+    }
+
+    /**
+     * Returns the temporary directory and make sure it exists.
+     */
+    public function getTemporaryFolder(): string
+    {
+        $tempFolder = sys_get_temp_dir() . '/phpspreadsheet';
+        if (!$this->isDirOrMkdir($tempFolder)) {
+            throw new RuntimeException(sprintf('Directory "%s" was not created', $tempFolder));
+        }
+
+        return $tempFolder;
+    }
+
+    /**
+     * Returns the filename that should be used for sample output.
+     */
+    public function getFilename(string $filename, string $extension = 'xlsx'): string
+    {
+        $originalExtension = pathinfo($filename, PATHINFO_EXTENSION);
+
+        return $this->getTemporaryFolder() . '/' . str_replace('.' . $originalExtension, '.' . $extension, basename($filename));
+    }
+
+    /**
+     * Return a random temporary file name.
+     */
+    public function getTemporaryFilename(string $extension = 'xlsx'): string
+    {
+        $temporaryFilename = tempnam($this->getTemporaryFolder(), 'phpspreadsheet-');
+        if ($temporaryFilename === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('tempnam returned false');
+            // @codeCoverageIgnoreEnd
+        }
+        unlink($temporaryFilename);
+
+        return $temporaryFilename . '.' . $extension;
+    }
+
+    public function log(string $message): void
+    {
+        $eol = $this->isCli() ? PHP_EOL : '<br />';
+        echo ($this->isCli() ? date('H:i:s ') : '') . $message . $eol;
+    }
+
+    /**
+     * Render chart as part of running chart samples in browser.
+     * Charts are not rendered in unit tests, which are command line.
+     *
+     * @codeCoverageIgnore
+     */
+    public function renderChart(Chart $chart, string $fileName, ?Spreadsheet $spreadsheet = null): void
+    {
+        if ($this->isCli() === true) {
+            return;
+        }
+        Settings::setChartRenderer(MtJpGraphRenderer::class);
+
+        $fileName = $this->getFilename($fileName, 'png');
+        $title = $chart->getTitle();
+        $caption = null;
+        if ($title !== null) {
+            $calculatedTitle = $title->getCalculatedTitle($spreadsheet);
+            if ($calculatedTitle !== null) {
+                $caption = $title->getCaption();
+                $title->setCaption($calculatedTitle);
+            }
+        }
+
+        try {
+            $chart->render($fileName);
+            $this->log('Rendered image: ' . $fileName);
+            $imageData = @file_get_contents($fileName);
+            if ($imageData !== false) {
+                echo '<div><img src="data:image/gif;base64,' . base64_encode($imageData) . '" /></div>';
+            } else {
+                $this->log('Unable to open chart' . PHP_EOL);
+            }
+        } catch (Throwable $e) {
+            $this->log('Error rendering chart: ' . $e->getMessage() . PHP_EOL);
+        }
+        if (isset($title, $caption)) {
+            $title->setCaption($caption);
+        }
+        Settings::unsetChartRenderer();
+    }
+
+    public function titles(string $category, string $functionName, ?string $description = null): void
+    {
+        $this->log(sprintf('%s Functions:', $category));
+        $description === null
+            ? $this->log(sprintf('Function: %s()', rtrim($functionName, '()')))
+            : $this->log(sprintf('Function: %s() - %s.', rtrim($functionName, '()'), rtrim($description, '.')));
+    }
+
+    public function displayGrid(array $matrix): void
+    {
+        $renderer = new TextGrid($matrix, $this->isCli());
+        echo $renderer->render();
+    }
+
+    public function logCalculationResult(
+        Worksheet $worksheet,
+        string $functionName,
+        string $formulaCell,
+        ?string $descriptionCell = null
+    ): void {
+        if ($descriptionCell !== null) {
+            $this->log($worksheet->getCell($descriptionCell)->getValueString());
+        }
+        $this->log($worksheet->getCell($formulaCell)->getValueString());
+        $this->log(sprintf('%s() Result is ', $functionName) . $worksheet->getCell($formulaCell)->getCalculatedValueString());
+    }
+
+    /**
+     * Log ending notes.
+     */
+    public function logEndingNotes(): void
+    {
+        // Do not show execution time for index
+        $this->log('Peak memory usage: ' . (memory_get_peak_usage(true) / 1024 / 1024) . 'MB');
+    }
+
+    /**
+     * Log a line about the write operation.
+     */
+    public function logWrite(IWriter $writer, string $path, float $callStartTime): void
+    {
+        $callEndTime = microtime(true);
+        $callTime = $callEndTime - $callStartTime;
+        $reflection = new ReflectionClass($writer);
+        $format = $reflection->getShortName();
+
+        $codePath = $this->isCli() ? $path : "<code>$path</code>";
+        $message = "Write {$format} format to {$codePath}  in " . sprintf('%.4f', $callTime) . ' seconds';
+
+        $this->log($message);
+    }
+
+    /**
+     * Log a line about the read operation.
+     */
+    public function logRead(string $format, string $path, float $callStartTime): void
+    {
+        $callEndTime = microtime(true);
+        $callTime = $callEndTime - $callStartTime;
+        $message = "Read {$format} format from <code>{$path}</code>  in " . sprintf('%.4f', $callTime) . ' seconds';
+
+        $this->log($message);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php
new file mode 100644
index 00000000..575ed890
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use Stringable;
+
+class Size implements Stringable
+{
+    const REGEXP_SIZE_VALIDATION = '/^(?P<size>\d*\.?\d+)(?P<unit>pt|px|em)?$/i';
+
+    protected bool $valid;
+
+    protected string $size = '';
+
+    protected string $unit = '';
+
+    public function __construct(string $size)
+    {
+        $this->valid = (bool) preg_match(self::REGEXP_SIZE_VALIDATION, $size, $matches);
+        if ($this->valid) {
+            $this->size = $matches['size'];
+            $this->unit = $matches['unit'] ?? 'pt';
+        }
+    }
+
+    public function valid(): bool
+    {
+        return $this->valid;
+    }
+
+    public function size(): string
+    {
+        return $this->size;
+    }
+
+    public function unit(): string
+    {
+        return $this->unit;
+    }
+
+    public function __toString(): string
+    {
+        return $this->size . $this->unit;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php
new file mode 100644
index 00000000..f706b58f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+class TextGrid
+{
+    private bool $isCli;
+
+    protected array $matrix;
+
+    protected array $rows;
+
+    protected array $columns;
+
+    private string $gridDisplay;
+
+    public function __construct(array $matrix, bool $isCli = true)
+    {
+        $this->rows = array_keys($matrix);
+        $this->columns = array_keys($matrix[$this->rows[0]]);
+
+        $matrix = array_values($matrix);
+        array_walk(
+            $matrix,
+            function (&$row): void {
+                $row = array_values($row);
+            }
+        );
+
+        $this->matrix = $matrix;
+        $this->isCli = $isCli;
+    }
+
+    public function render(): string
+    {
+        $this->gridDisplay = $this->isCli ? '' : '<pre>';
+
+        $maxRow = max($this->rows);
+        $maxRowLength = mb_strlen((string) $maxRow) + 1;
+        $columnWidths = $this->getColumnWidths();
+
+        $this->renderColumnHeader($maxRowLength, $columnWidths);
+        $this->renderRows($maxRowLength, $columnWidths);
+        $this->renderFooter($maxRowLength, $columnWidths);
+
+        $this->gridDisplay .= $this->isCli ? '' : '</pre>';
+
+        return $this->gridDisplay;
+    }
+
+    private function renderRows(int $maxRowLength, array $columnWidths): void
+    {
+        foreach ($this->matrix as $row => $rowData) {
+            $this->gridDisplay .= '|' . str_pad((string) $this->rows[$row], $maxRowLength, ' ', STR_PAD_LEFT) . ' ';
+            $this->renderCells($rowData, $columnWidths);
+            $this->gridDisplay .= '|' . PHP_EOL;
+        }
+    }
+
+    private function renderCells(array $rowData, array $columnWidths): void
+    {
+        foreach ($rowData as $column => $cell) {
+            $displayCell = ($this->isCli) ? (string) $cell : htmlentities((string) $cell);
+            $this->gridDisplay .= '| ';
+            $this->gridDisplay .= $displayCell . str_repeat(' ', $columnWidths[$column] - mb_strlen($cell ?? '') + 1);
+        }
+    }
+
+    private function renderColumnHeader(int $maxRowLength, array $columnWidths): void
+    {
+        $this->gridDisplay .= str_repeat(' ', $maxRowLength + 2);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '+-' . str_repeat('-', $columnWidths[$column] + 1);
+        }
+        $this->gridDisplay .= '+' . PHP_EOL;
+
+        $this->gridDisplay .= str_repeat(' ', $maxRowLength + 2);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '| ' . str_pad((string) $reference, $columnWidths[$column] + 1, ' ');
+        }
+        $this->gridDisplay .= '|' . PHP_EOL;
+
+        $this->renderFooter($maxRowLength, $columnWidths);
+    }
+
+    private function renderFooter(int $maxRowLength, array $columnWidths): void
+    {
+        $this->gridDisplay .= '+' . str_repeat('-', $maxRowLength + 1);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '+-';
+            $this->gridDisplay .= str_pad((string) '', $columnWidths[$column] + 1, '-');
+        }
+        $this->gridDisplay .= '+' . PHP_EOL;
+    }
+
+    private function getColumnWidths(): array
+    {
+        $columnCount = count($this->matrix, COUNT_RECURSIVE) / count($this->matrix);
+        $columnWidths = [];
+        for ($column = 0; $column < $columnCount; ++$column) {
+            $columnWidths[] = $this->getColumnWidth(array_column($this->matrix, $column));
+        }
+
+        return $columnWidths;
+    }
+
+    private function getColumnWidth(array $columnData): int
+    {
+        $columnWidth = 0;
+        $columnData = array_values($columnData);
+
+        foreach ($columnData as $columnValue) {
+            if (is_string($columnValue)) {
+                $columnWidth = max($columnWidth, mb_strlen($columnValue));
+            } elseif (is_bool($columnValue)) {
+                $columnWidth = max($columnWidth, mb_strlen($columnValue ? 'TRUE' : 'FALSE'));
+            }
+
+            $columnWidth = max($columnWidth, mb_strlen((string) $columnWidth));
+        }
+
+        return $columnWidth;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php
new file mode 100644
index 00000000..64b451ed
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+interface IComparable
+{
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php
new file mode 100644
index 00000000..db8776db
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php
@@ -0,0 +1,236 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Reader\IReader;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Writer\IWriter;
+
+/**
+ * Factory to create readers and writers easily.
+ *
+ * It is not required to use this class, but it should make it easier to read and write files.
+ * Especially for reading files with an unknown format.
+ */
+abstract class IOFactory
+{
+    public const READER_XLSX = 'Xlsx';
+    public const READER_XLS = 'Xls';
+    public const READER_XML = 'Xml';
+    public const READER_ODS = 'Ods';
+    public const READER_SYLK = 'Slk';
+    public const READER_SLK = 'Slk';
+    public const READER_GNUMERIC = 'Gnumeric';
+    public const READER_HTML = 'Html';
+    public const READER_CSV = 'Csv';
+
+    public const WRITER_XLSX = 'Xlsx';
+    public const WRITER_XLS = 'Xls';
+    public const WRITER_ODS = 'Ods';
+    public const WRITER_CSV = 'Csv';
+    public const WRITER_HTML = 'Html';
+
+    /** @var array<string, class-string<IReader>> */
+    private static array $readers = [
+        self::READER_XLSX => Reader\Xlsx::class,
+        self::READER_XLS => Reader\Xls::class,
+        self::READER_XML => Reader\Xml::class,
+        self::READER_ODS => Reader\Ods::class,
+        self::READER_SLK => Reader\Slk::class,
+        self::READER_GNUMERIC => Reader\Gnumeric::class,
+        self::READER_HTML => Reader\Html::class,
+        self::READER_CSV => Reader\Csv::class,
+    ];
+
+    /** @var array<string, class-string<IWriter>> */
+    private static array $writers = [
+        self::WRITER_XLS => Writer\Xls::class,
+        self::WRITER_XLSX => Writer\Xlsx::class,
+        self::WRITER_ODS => Writer\Ods::class,
+        self::WRITER_CSV => Writer\Csv::class,
+        self::WRITER_HTML => Writer\Html::class,
+        'Tcpdf' => Writer\Pdf\Tcpdf::class,
+        'Dompdf' => Writer\Pdf\Dompdf::class,
+        'Mpdf' => Writer\Pdf\Mpdf::class,
+    ];
+
+    /**
+     * Create Writer\IWriter.
+     */
+    public static function createWriter(Spreadsheet $spreadsheet, string $writerType): IWriter
+    {
+        if (!isset(self::$writers[$writerType])) {
+            throw new Writer\Exception("No writer found for type $writerType");
+        }
+
+        // Instantiate writer
+        $className = self::$writers[$writerType];
+
+        return new $className($spreadsheet);
+    }
+
+    /**
+     * Create IReader.
+     */
+    public static function createReader(string $readerType): IReader
+    {
+        if (!isset(self::$readers[$readerType])) {
+            throw new Reader\Exception("No reader found for type $readerType");
+        }
+
+        // Instantiate reader
+        $className = self::$readers[$readerType];
+
+        return new $className();
+    }
+
+    /**
+     * Loads Spreadsheet from file using automatic Reader\IReader resolution.
+     *
+     * @param string $filename The name of the spreadsheet file
+     * @param int $flags the optional second parameter flags may be used to identify specific elements
+     *                       that should be loaded, but which won't be loaded by default, using these values:
+     *                            IReader::LOAD_WITH_CHARTS - Include any charts that are defined in the loaded file.
+     *                            IReader::READ_DATA_ONLY - Read cell values only, not formatting or merge structure.
+     *                            IReader::IGNORE_EMPTY_CELLS - Don't load empty cells into the model.
+     * @param string[] $readers An array of Readers to use to identify the file type. By default, load() will try
+     *                             all possible Readers until it finds a match; but this allows you to pass in a
+     *                             list of Readers so it will only try the subset that you specify here.
+     *                          Values in this list can be any of the constant values defined in the set
+     *                                 IOFactory::READER_*.
+     */
+    public static function load(string $filename, int $flags = 0, ?array $readers = null): Spreadsheet
+    {
+        $reader = self::createReaderForFile($filename, $readers);
+
+        return $reader->load($filename, $flags);
+    }
+
+    /**
+     * Identify file type using automatic IReader resolution.
+     */
+    public static function identify(string $filename, ?array $readers = null): string
+    {
+        $reader = self::createReaderForFile($filename, $readers);
+        $className = $reader::class;
+        $classType = explode('\\', $className);
+        unset($reader);
+
+        return array_pop($classType);
+    }
+
+    /**
+     * Create Reader\IReader for file using automatic IReader resolution.
+     *
+     * @param string[] $readers An array of Readers to use to identify the file type. By default, load() will try
+     *                             all possible Readers until it finds a match; but this allows you to pass in a
+     *                             list of Readers so it will only try the subset that you specify here.
+     *                          Values in this list can be any of the constant values defined in the set
+     *                                 IOFactory::READER_*.
+     */
+    public static function createReaderForFile(string $filename, ?array $readers = null): IReader
+    {
+        File::assertFile($filename);
+
+        $testReaders = self::$readers;
+        if ($readers !== null) {
+            $readers = array_map('strtoupper', $readers);
+            $testReaders = array_filter(
+                self::$readers,
+                fn (string $readerType): bool => in_array(strtoupper($readerType), $readers, true),
+                ARRAY_FILTER_USE_KEY
+            );
+        }
+
+        // First, lucky guess by inspecting file extension
+        $guessedReader = self::getReaderTypeFromExtension($filename);
+        if (($guessedReader !== null) && array_key_exists($guessedReader, $testReaders)) {
+            $reader = self::createReader($guessedReader);
+
+            // Let's see if we are lucky
+            if ($reader->canRead($filename)) {
+                return $reader;
+            }
+        }
+
+        // If we reach here then "lucky guess" didn't give any result
+        // Try walking through all the options in self::$readers (or the selected subset)
+        foreach ($testReaders as $readerType => $class) {
+            //    Ignore our original guess, we know that won't work
+            if ($readerType !== $guessedReader) {
+                $reader = self::createReader($readerType);
+                if ($reader->canRead($filename)) {
+                    return $reader;
+                }
+            }
+        }
+
+        throw new Reader\Exception('Unable to identify a reader for this file');
+    }
+
+    /**
+     * Guess a reader type from the file extension, if any.
+     */
+    private static function getReaderTypeFromExtension(string $filename): ?string
+    {
+        $pathinfo = pathinfo($filename);
+        if (!isset($pathinfo['extension'])) {
+            return null;
+        }
+
+        return match (strtolower($pathinfo['extension'])) {
+            // Excel (OfficeOpenXML) Spreadsheet
+            'xlsx',
+            // Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
+            'xlsm',
+            // Excel (OfficeOpenXML) Template
+            'xltx',
+            // Excel (OfficeOpenXML) Macro Template (macros will be discarded)
+            'xltm' => 'Xlsx',
+            // Excel (BIFF) Spreadsheet
+            'xls',
+            // Excel (BIFF) Template
+            'xlt' => 'Xls',
+            // Open/Libre Offic Calc
+            'ods',
+            // Open/Libre Offic Calc Template
+            'ots' => 'Ods',
+            'slk' => 'Slk',
+            // Excel 2003 SpreadSheetML
+            'xml' => 'Xml',
+            'gnumeric' => 'Gnumeric',
+            'htm', 'html' => 'Html',
+            // Do nothing
+            // We must not try to use CSV reader since it loads
+            // all files including Excel files etc.
+            'csv' => null,
+            default => null,
+        };
+    }
+
+    /**
+     * Register a writer with its type and class name.
+     *
+     * @param class-string<IWriter> $writerClass
+     */
+    public static function registerWriter(string $writerType, string $writerClass): void
+    {
+        if (!is_a($writerClass, IWriter::class, true)) {
+            throw new Writer\Exception('Registered writers must implement ' . IWriter::class);
+        }
+
+        self::$writers[$writerType] = $writerClass;
+    }
+
+    /**
+     * Register a reader with its type and class name.
+     */
+    public static function registerReader(string $readerType, string $readerClass): void
+    {
+        if (!is_a($readerClass, IReader::class, true)) {
+            throw new Reader\Exception('Registered readers must implement ' . IReader::class);
+        }
+
+        self::$readers[$readerType] = $readerClass;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedFormula.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedFormula.php
new file mode 100644
index 00000000..500151f0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedFormula.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class NamedFormula extends DefinedName
+{
+    /**
+     * Create a new Named Formula.
+     */
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $formula = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        // Validate data
+        if (!isset($formula)) {
+            throw new Exception('You must specify a Formula value for a Named Formula');
+        }
+        parent::__construct($name, $worksheet, $formula, $localOnly, $scope);
+    }
+
+    /**
+     * Get the formula value.
+     */
+    public function getFormula(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set the formula value.
+     */
+    public function setFormula(string $formula): self
+    {
+        if (!empty($formula)) {
+            $this->value = $formula;
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php
new file mode 100644
index 00000000..819ddeac
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class NamedRange extends DefinedName
+{
+    /**
+     * Create a new Named Range.
+     */
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        string $range = 'A1',
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        if ($worksheet === null && $scope === null) {
+            throw new Exception('You must specify a worksheet or a scope for a Named Range');
+        }
+        parent::__construct($name, $worksheet, $range, $localOnly, $scope);
+    }
+
+    /**
+     * Get the range value.
+     */
+    public function getRange(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set the range value.
+     */
+    public function setRange(string $range): self
+    {
+        if (!empty($range)) {
+            $this->value = $range;
+        }
+
+        return $this;
+    }
+
+    public function getCellsInRange(): array
+    {
+        $range = $this->value;
+        if (str_starts_with($range, '=')) {
+            $range = substr($range, 1);
+        }
+
+        return Coordinate::extractAllCellReferencesInRange($range);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php
new file mode 100644
index 00000000..1408f7bf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php
@@ -0,0 +1,245 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+abstract class BaseReader implements IReader
+{
+    /**
+     * Read data only?
+     * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
+     *        or whether it should read both data and formatting.
+     */
+    protected bool $readDataOnly = false;
+
+    /**
+     * Read empty cells?
+     * Identifies whether the Reader should read data values for cells all cells, or should ignore cells containing
+     *         null value or empty string.
+     */
+    protected bool $readEmptyCells = true;
+
+    /**
+     * Read charts that are defined in the workbook?
+     * Identifies whether the Reader should read the definitions for any charts that exist in the workbook;.
+     */
+    protected bool $includeCharts = false;
+
+    /**
+     * Restrict which sheets should be loaded?
+     * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+     * This property is ignored for Csv, Html, and Slk.
+     *
+     * @var null|string[]
+     */
+    protected ?array $loadSheetsOnly = null;
+
+    /**
+     * Ignore rows with no cells?
+     * Identifies whether the Reader should ignore rows with no cells.
+     *        Currently implemented only for Xlsx.
+     */
+    protected bool $ignoreRowsWithNoCells = false;
+
+    /**
+     * IReadFilter instance.
+     */
+    protected IReadFilter $readFilter;
+
+    /** @var resource */
+    protected $fileHandle;
+
+    protected ?XmlScanner $securityScanner = null;
+
+    public function __construct()
+    {
+        $this->readFilter = new DefaultReadFilter();
+    }
+
+    public function getReadDataOnly(): bool
+    {
+        return $this->readDataOnly;
+    }
+
+    public function setReadDataOnly(bool $readCellValuesOnly): self
+    {
+        $this->readDataOnly = $readCellValuesOnly;
+
+        return $this;
+    }
+
+    public function getReadEmptyCells(): bool
+    {
+        return $this->readEmptyCells;
+    }
+
+    public function setReadEmptyCells(bool $readEmptyCells): self
+    {
+        $this->readEmptyCells = $readEmptyCells;
+
+        return $this;
+    }
+
+    public function getIgnoreRowsWithNoCells(): bool
+    {
+        return $this->ignoreRowsWithNoCells;
+    }
+
+    public function setIgnoreRowsWithNoCells(bool $ignoreRowsWithNoCells): self
+    {
+        $this->ignoreRowsWithNoCells = $ignoreRowsWithNoCells;
+
+        return $this;
+    }
+
+    public function getIncludeCharts(): bool
+    {
+        return $this->includeCharts;
+    }
+
+    public function setIncludeCharts(bool $includeCharts): self
+    {
+        $this->includeCharts = $includeCharts;
+
+        return $this;
+    }
+
+    public function getLoadSheetsOnly(): ?array
+    {
+        return $this->loadSheetsOnly;
+    }
+
+    public function setLoadSheetsOnly(string|array|null $sheetList): self
+    {
+        if ($sheetList === null) {
+            return $this->setLoadAllSheets();
+        }
+
+        $this->loadSheetsOnly = is_array($sheetList) ? $sheetList : [$sheetList];
+
+        return $this;
+    }
+
+    public function setLoadAllSheets(): self
+    {
+        $this->loadSheetsOnly = null;
+
+        return $this;
+    }
+
+    public function getReadFilter(): IReadFilter
+    {
+        return $this->readFilter;
+    }
+
+    public function setReadFilter(IReadFilter $readFilter): self
+    {
+        $this->readFilter = $readFilter;
+
+        return $this;
+    }
+
+    public function getSecurityScanner(): ?XmlScanner
+    {
+        return $this->securityScanner;
+    }
+
+    public function getSecurityScannerOrThrow(): XmlScanner
+    {
+        if ($this->securityScanner === null) {
+            throw new ReaderException('Security scanner is unexpectedly null');
+        }
+
+        return $this->securityScanner;
+    }
+
+    protected function processFlags(int $flags): void
+    {
+        if (((bool) ($flags & self::LOAD_WITH_CHARTS)) === true) {
+            $this->setIncludeCharts(true);
+        }
+        if (((bool) ($flags & self::READ_DATA_ONLY)) === true) {
+            $this->setReadDataOnly(true);
+        }
+        if (((bool) ($flags & self::SKIP_EMPTY_CELLS) || (bool) ($flags & self::IGNORE_EMPTY_CELLS)) === true) {
+            $this->setReadEmptyCells(false);
+        }
+        if (((bool) ($flags & self::IGNORE_ROWS_WITH_NO_CELLS)) === true) {
+            $this->setIgnoreRowsWithNoCells(true);
+        }
+    }
+
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        throw new PhpSpreadsheetException('Reader classes must implement their own loadSpreadsheetFromFile() method');
+    }
+
+    /**
+     * Loads Spreadsheet from file.
+     *
+     * @param int $flags the optional second parameter flags may be used to identify specific elements
+     *                       that should be loaded, but which won't be loaded by default, using these values:
+     *                            IReader::LOAD_WITH_CHARTS - Include any charts that are defined in the loaded file
+     */
+    public function load(string $filename, int $flags = 0): Spreadsheet
+    {
+        $this->processFlags($flags);
+
+        try {
+            return $this->loadSpreadsheetFromFile($filename);
+        } catch (ReaderException $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Open file for reading.
+     */
+    protected function openFile(string $filename): void
+    {
+        $fileHandle = false;
+        if ($filename) {
+            File::assertFile($filename);
+
+            // Open file
+            $fileHandle = fopen($filename, 'rb');
+        }
+        if ($fileHandle === false) {
+            throw new ReaderException('Could not open file ' . $filename . ' for reading.');
+        }
+
+        $this->fileHandle = $fileHandle;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        throw new PhpSpreadsheetException('Reader classes must implement their own listWorksheetInfo() method');
+    }
+
+    /**
+     * Returns names of the worksheets from a file,
+     * possibly without parsing the whole file to a Spreadsheet object.
+     * Readers will often have a more efficient method with which
+     * they can override this method.
+     */
+    public function listWorksheetNames(string $filename): array
+    {
+        $returnArray = [];
+        $info = $this->listWorksheetInfo($filename);
+        foreach ($info as $infoArray) {
+            if (isset($infoArray['worksheetName'])) {
+                $returnArray[] = $infoArray['worksheetName'];
+            }
+        }
+
+        return $returnArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php
new file mode 100644
index 00000000..ac4fa688
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php
@@ -0,0 +1,652 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Csv\Delimiter;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Csv extends BaseReader
+{
+    const DEFAULT_FALLBACK_ENCODING = 'CP1252';
+    const GUESS_ENCODING = 'guess';
+    const UTF8_BOM = "\xEF\xBB\xBF";
+    const UTF8_BOM_LEN = 3;
+    const UTF16BE_BOM = "\xfe\xff";
+    const UTF16BE_BOM_LEN = 2;
+    const UTF16BE_LF = "\x00\x0a";
+    const UTF16LE_BOM = "\xff\xfe";
+    const UTF16LE_BOM_LEN = 2;
+    const UTF16LE_LF = "\x0a\x00";
+    const UTF32BE_BOM = "\x00\x00\xfe\xff";
+    const UTF32BE_BOM_LEN = 4;
+    const UTF32BE_LF = "\x00\x00\x00\x0a";
+    const UTF32LE_BOM = "\xff\xfe\x00\x00";
+    const UTF32LE_BOM_LEN = 4;
+    const UTF32LE_LF = "\x0a\x00\x00\x00";
+
+    /**
+     * Input encoding.
+     */
+    private string $inputEncoding = 'UTF-8';
+
+    /**
+     * Fallback encoding if guess strikes out.
+     */
+    private string $fallbackEncoding = self::DEFAULT_FALLBACK_ENCODING;
+
+    /**
+     * Delimiter.
+     */
+    private ?string $delimiter = null;
+
+    /**
+     * Enclosure.
+     */
+    private string $enclosure = '"';
+
+    /**
+     * Sheet index to read.
+     */
+    private int $sheetIndex = 0;
+
+    /**
+     * Load rows contiguously.
+     */
+    private bool $contiguous = false;
+
+    /**
+     * The character that can escape the enclosure.
+     */
+    private string $escapeCharacter = '\\';
+
+    /**
+     * Callback for setting defaults in construction.
+     *
+     * @var ?callable
+     */
+    private static $constructorCallback;
+
+    /**
+     * Attempt autodetect line endings (deprecated after PHP8.1)?
+     */
+    private bool $testAutodetect = true;
+
+    protected bool $castFormattedNumberToNumeric = false;
+
+    protected bool $preserveNumericFormatting = false;
+
+    private bool $preserveNullString = false;
+
+    private bool $sheetNameIsFileName = false;
+
+    private string $getTrue = 'true';
+
+    private string $getFalse = 'false';
+
+    private string $thousandsSeparator = ',';
+
+    private string $decimalSeparator = '.';
+
+    /**
+     * Create a new CSV Reader instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $callback = self::$constructorCallback;
+        if ($callback !== null) {
+            $callback($this);
+        }
+    }
+
+    /**
+     * Set a callback to change the defaults.
+     *
+     * The callback must accept the Csv Reader object as the first parameter,
+     * and it should return void.
+     */
+    public static function setConstructorCallback(?callable $callback): void
+    {
+        self::$constructorCallback = $callback;
+    }
+
+    public static function getConstructorCallback(): ?callable
+    {
+        return self::$constructorCallback;
+    }
+
+    public function setInputEncoding(string $encoding): self
+    {
+        $this->inputEncoding = $encoding;
+
+        return $this;
+    }
+
+    public function getInputEncoding(): string
+    {
+        return $this->inputEncoding;
+    }
+
+    public function setFallbackEncoding(string $fallbackEncoding): self
+    {
+        $this->fallbackEncoding = $fallbackEncoding;
+
+        return $this;
+    }
+
+    public function getFallbackEncoding(): string
+    {
+        return $this->fallbackEncoding;
+    }
+
+    /**
+     * Move filepointer past any BOM marker.
+     */
+    protected function skipBOM(): void
+    {
+        rewind($this->fileHandle);
+
+        if (fgets($this->fileHandle, self::UTF8_BOM_LEN + 1) !== self::UTF8_BOM) {
+            rewind($this->fileHandle);
+        }
+    }
+
+    /**
+     * Identify any separator that is explicitly set in the file.
+     */
+    protected function checkSeparator(): void
+    {
+        $line = fgets($this->fileHandle);
+        if ($line === false) {
+            return;
+        }
+
+        if ((strlen(trim($line, "\r\n")) == 5) && (stripos($line, 'sep=') === 0)) {
+            $this->delimiter = substr($line, 4, 1);
+
+            return;
+        }
+
+        $this->skipBOM();
+    }
+
+    /**
+     * Infer the separator if it isn't explicitly set in the file or specified by the user.
+     */
+    protected function inferSeparator(): void
+    {
+        if ($this->delimiter !== null) {
+            return;
+        }
+
+        $inferenceEngine = new Delimiter($this->fileHandle, $this->escapeCharacter, $this->enclosure);
+
+        // If number of lines is 0, nothing to infer : fall back to the default
+        if ($inferenceEngine->linesCounted() === 0) {
+            $this->delimiter = $inferenceEngine->getDefaultDelimiter();
+            $this->skipBOM();
+
+            return;
+        }
+
+        $this->delimiter = $inferenceEngine->infer();
+
+        // If no delimiter could be detected, fall back to the default
+        if ($this->delimiter === null) {
+            $this->delimiter = $inferenceEngine->getDefaultDelimiter();
+        }
+
+        $this->skipBOM();
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        // Open file
+        $this->openFileOrMemory($filename);
+        $fileHandle = $this->fileHandle;
+
+        // Skip BOM, if any
+        $this->skipBOM();
+        $this->checkSeparator();
+        $this->inferSeparator();
+
+        $worksheetInfo = [];
+        $worksheetInfo[0]['worksheetName'] = 'Worksheet';
+        $worksheetInfo[0]['lastColumnLetter'] = 'A';
+        $worksheetInfo[0]['lastColumnIndex'] = 0;
+        $worksheetInfo[0]['totalRows'] = 0;
+        $worksheetInfo[0]['totalColumns'] = 0;
+        $delimiter = $this->delimiter ?? '';
+
+        // Loop through each line of the file in turn
+        $rowData = fgetcsv($fileHandle, 0, $delimiter, $this->enclosure, $this->escapeCharacter);
+        while (is_array($rowData)) {
+            ++$worksheetInfo[0]['totalRows'];
+            $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
+            $rowData = fgetcsv($fileHandle, 0, $delimiter, $this->enclosure, $this->escapeCharacter);
+        }
+
+        $worksheetInfo[0]['lastColumnLetter'] = Coordinate::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex'] + 1);
+        $worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
+
+        // Close file
+        fclose($fileHandle);
+
+        return $worksheetInfo;
+    }
+
+    /**
+     * Loads Spreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+
+        // Load into this instance
+        return $this->loadIntoExisting($filename, $spreadsheet);
+    }
+
+    /**
+     * Loads Spreadsheet from string.
+     */
+    public function loadSpreadsheetFromString(string $contents): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+
+        // Load into this instance
+        return $this->loadStringOrFile('data://text/plain,' . urlencode($contents), $spreadsheet, true);
+    }
+
+    private function openFileOrMemory(string $filename): void
+    {
+        // Open file
+        $fhandle = $this->canRead($filename);
+        if (!$fhandle) {
+            throw new ReaderException($filename . ' is an Invalid Spreadsheet file.');
+        }
+        if ($this->inputEncoding === self::GUESS_ENCODING) {
+            $this->inputEncoding = self::guessEncoding($filename, $this->fallbackEncoding);
+        }
+        $this->openFile($filename);
+        if ($this->inputEncoding !== 'UTF-8') {
+            fclose($this->fileHandle);
+            $entireFile = file_get_contents($filename);
+            $fileHandle = fopen('php://memory', 'r+b');
+            if ($fileHandle !== false && $entireFile !== false) {
+                $this->fileHandle = $fileHandle;
+                $data = StringHelper::convertEncoding($entireFile, 'UTF-8', $this->inputEncoding);
+                fwrite($this->fileHandle, $data);
+                $this->skipBOM();
+            }
+        }
+    }
+
+    public function setTestAutoDetect(bool $value): self
+    {
+        $this->testAutodetect = $value;
+
+        return $this;
+    }
+
+    private function setAutoDetect(?string $value): ?string
+    {
+        $retVal = null;
+        if ($value !== null && $this->testAutodetect) {
+            $retVal2 = @ini_set('auto_detect_line_endings', $value);
+            if (is_string($retVal2)) {
+                $retVal = $retVal2;
+            }
+        }
+
+        return $retVal;
+    }
+
+    public function castFormattedNumberToNumeric(
+        bool $castFormattedNumberToNumeric,
+        bool $preserveNumericFormatting = false
+    ): void {
+        $this->castFormattedNumberToNumeric = $castFormattedNumberToNumeric;
+        $this->preserveNumericFormatting = $preserveNumericFormatting;
+    }
+
+    /**
+     * Open data uri for reading.
+     */
+    private function openDataUri(string $filename): void
+    {
+        $fileHandle = fopen($filename, 'rb');
+        if ($fileHandle === false) {
+            // @codeCoverageIgnoreStart
+            throw new ReaderException('Could not open file ' . $filename . ' for reading.');
+            // @codeCoverageIgnoreEnd
+        }
+
+        $this->fileHandle = $fileHandle;
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
+     */
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
+    {
+        return $this->loadStringOrFile($filename, $spreadsheet, false);
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
+     */
+    private function loadStringOrFile(string $filename, Spreadsheet $spreadsheet, bool $dataUri): Spreadsheet
+    {
+        // Deprecated in Php8.1
+        $iniset = $this->setAutoDetect('1');
+
+        // Open file
+        if ($dataUri) {
+            $this->openDataUri($filename);
+        } else {
+            $this->openFileOrMemory($filename);
+        }
+        $fileHandle = $this->fileHandle;
+
+        // Skip BOM, if any
+        $this->skipBOM();
+        $this->checkSeparator();
+        $this->inferSeparator();
+
+        // Create new PhpSpreadsheet object
+        while ($spreadsheet->getSheetCount() <= $this->sheetIndex) {
+            $spreadsheet->createSheet();
+        }
+        $sheet = $spreadsheet->setActiveSheetIndex($this->sheetIndex);
+        if ($this->sheetNameIsFileName) {
+            $sheet->setTitle(substr(basename($filename, '.csv'), 0, Worksheet::SHEET_TITLE_MAXIMUM_LENGTH));
+        }
+
+        // Set our starting row based on whether we're in contiguous mode or not
+        $currentRow = 1;
+        $outRow = 0;
+
+        // Loop through each line of the file in turn
+        $delimiter = $this->delimiter ?? '';
+        $rowData = fgetcsv($fileHandle, 0, $delimiter, $this->enclosure, $this->escapeCharacter);
+        $valueBinder = Cell::getValueBinder();
+        $preserveBooleanString = method_exists($valueBinder, 'getBooleanConversion') && $valueBinder->getBooleanConversion();
+        $this->getTrue = Calculation::getTRUE();
+        $this->getFalse = Calculation::getFALSE();
+        $this->thousandsSeparator = StringHelper::getThousandsSeparator();
+        $this->decimalSeparator = StringHelper::getDecimalSeparator();
+        while (is_array($rowData)) {
+            $noOutputYet = true;
+            $columnLetter = 'A';
+            foreach ($rowData as $rowDatum) {
+                if ($preserveBooleanString) {
+                    $rowDatum = $rowDatum ?? '';
+                } else {
+                    $this->convertBoolean($rowDatum);
+                }
+                $numberFormatMask = $this->castFormattedNumberToNumeric ? $this->convertFormattedNumber($rowDatum) : '';
+                if (($rowDatum !== '' || $this->preserveNullString) && $this->readFilter->readCell($columnLetter, $currentRow)) {
+                    if ($this->contiguous) {
+                        if ($noOutputYet) {
+                            $noOutputYet = false;
+                            ++$outRow;
+                        }
+                    } else {
+                        $outRow = $currentRow;
+                    }
+                    // Set basic styling for the value (Note that this could be overloaded by styling in a value binder)
+                    if ($numberFormatMask !== '') {
+                        $sheet->getStyle($columnLetter . $outRow)
+                            ->getNumberFormat()
+                            ->setFormatCode($numberFormatMask);
+                    }
+                    // Set cell value
+                    $sheet->getCell($columnLetter . $outRow)->setValue($rowDatum);
+                }
+                ++$columnLetter;
+            }
+            $rowData = fgetcsv($fileHandle, 0, $delimiter, $this->enclosure, $this->escapeCharacter);
+            ++$currentRow;
+        }
+
+        // Close file
+        fclose($fileHandle);
+
+        $this->setAutoDetect($iniset);
+
+        // Return
+        return $spreadsheet;
+    }
+
+    /**
+     * Convert string true/false to boolean, and null to null-string.
+     */
+    private function convertBoolean(mixed &$rowDatum): void
+    {
+        if (is_string($rowDatum)) {
+            if (strcasecmp($this->getTrue, $rowDatum) === 0 || strcasecmp('true', $rowDatum) === 0) {
+                $rowDatum = true;
+            } elseif (strcasecmp($this->getFalse, $rowDatum) === 0 || strcasecmp('false', $rowDatum) === 0) {
+                $rowDatum = false;
+            }
+        } else {
+            $rowDatum = $rowDatum ?? '';
+        }
+    }
+
+    /**
+     * Convert numeric strings to int or float values.
+     */
+    private function convertFormattedNumber(mixed &$rowDatum): string
+    {
+        $numberFormatMask = '';
+        if ($this->castFormattedNumberToNumeric === true && is_string($rowDatum)) {
+            $numeric = str_replace(
+                [$this->thousandsSeparator, $this->decimalSeparator],
+                ['', '.'],
+                $rowDatum
+            );
+
+            if (is_numeric($numeric)) {
+                $decimalPos = strpos($rowDatum, $this->decimalSeparator);
+                if ($this->preserveNumericFormatting === true) {
+                    $numberFormatMask = (str_contains($rowDatum, $this->thousandsSeparator))
+                        ? '#,##0' : '0';
+                    if ($decimalPos !== false) {
+                        $decimals = strlen($rowDatum) - $decimalPos - 1;
+                        $numberFormatMask .= '.' . str_repeat('0', min($decimals, 6));
+                    }
+                }
+
+                $rowDatum = ($decimalPos !== false) ? (float) $numeric : (int) $numeric;
+            }
+        }
+
+        return $numberFormatMask;
+    }
+
+    public function getDelimiter(): ?string
+    {
+        return $this->delimiter;
+    }
+
+    public function setDelimiter(?string $delimiter): self
+    {
+        $this->delimiter = $delimiter;
+
+        return $this;
+    }
+
+    public function getEnclosure(): string
+    {
+        return $this->enclosure;
+    }
+
+    public function setEnclosure(string $enclosure): self
+    {
+        if ($enclosure == '') {
+            $enclosure = '"';
+        }
+        $this->enclosure = $enclosure;
+
+        return $this;
+    }
+
+    public function getSheetIndex(): int
+    {
+        return $this->sheetIndex;
+    }
+
+    public function setSheetIndex(int $indexValue): self
+    {
+        $this->sheetIndex = $indexValue;
+
+        return $this;
+    }
+
+    public function setContiguous(bool $contiguous): self
+    {
+        $this->contiguous = $contiguous;
+
+        return $this;
+    }
+
+    public function getContiguous(): bool
+    {
+        return $this->contiguous;
+    }
+
+    public function setEscapeCharacter(string $escapeCharacter): self
+    {
+        $this->escapeCharacter = $escapeCharacter;
+
+        return $this;
+    }
+
+    public function getEscapeCharacter(): string
+    {
+        return $this->escapeCharacter;
+    }
+
+    /**
+     * Can the current IReader read the file?
+     */
+    public function canRead(string $filename): bool
+    {
+        // Check if file exists
+        try {
+            $this->openFile($filename);
+        } catch (ReaderException) {
+            return false;
+        }
+
+        fclose($this->fileHandle);
+
+        // Trust file extension if any
+        $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+        if (in_array($extension, ['csv', 'tsv'])) {
+            return true;
+        }
+
+        // Attempt to guess mimetype
+        $type = mime_content_type($filename);
+        $supportedTypes = [
+            'application/csv',
+            'text/csv',
+            'text/plain',
+            'inode/x-empty',
+            'text/html',
+        ];
+
+        return in_array($type, $supportedTypes, true);
+    }
+
+    private static function guessEncodingTestNoBom(string &$encoding, string &$contents, string $compare, string $setEncoding): void
+    {
+        if ($encoding === '') {
+            $pos = strpos($contents, $compare);
+            if ($pos !== false && $pos % strlen($compare) === 0) {
+                $encoding = $setEncoding;
+            }
+        }
+    }
+
+    private static function guessEncodingNoBom(string $filename): string
+    {
+        $encoding = '';
+        $contents = file_get_contents($filename);
+        self::guessEncodingTestNoBom($encoding, $contents, self::UTF32BE_LF, 'UTF-32BE');
+        self::guessEncodingTestNoBom($encoding, $contents, self::UTF32LE_LF, 'UTF-32LE');
+        self::guessEncodingTestNoBom($encoding, $contents, self::UTF16BE_LF, 'UTF-16BE');
+        self::guessEncodingTestNoBom($encoding, $contents, self::UTF16LE_LF, 'UTF-16LE');
+        if ($encoding === '' && preg_match('//u', $contents) === 1) {
+            $encoding = 'UTF-8';
+        }
+
+        return $encoding;
+    }
+
+    private static function guessEncodingTestBom(string &$encoding, string $first4, string $compare, string $setEncoding): void
+    {
+        if ($encoding === '') {
+            if (str_starts_with($first4, $compare)) {
+                $encoding = $setEncoding;
+            }
+        }
+    }
+
+    private static function guessEncodingBom(string $filename): string
+    {
+        $encoding = '';
+        $first4 = file_get_contents($filename, false, null, 0, 4);
+        if ($first4 !== false) {
+            self::guessEncodingTestBom($encoding, $first4, self::UTF8_BOM, 'UTF-8');
+            self::guessEncodingTestBom($encoding, $first4, self::UTF16BE_BOM, 'UTF-16BE');
+            self::guessEncodingTestBom($encoding, $first4, self::UTF32BE_BOM, 'UTF-32BE');
+            self::guessEncodingTestBom($encoding, $first4, self::UTF32LE_BOM, 'UTF-32LE');
+            self::guessEncodingTestBom($encoding, $first4, self::UTF16LE_BOM, 'UTF-16LE');
+        }
+
+        return $encoding;
+    }
+
+    public static function guessEncoding(string $filename, string $dflt = self::DEFAULT_FALLBACK_ENCODING): string
+    {
+        $encoding = self::guessEncodingBom($filename);
+        if ($encoding === '') {
+            $encoding = self::guessEncodingNoBom($filename);
+        }
+
+        return ($encoding === '') ? $dflt : $encoding;
+    }
+
+    public function setPreserveNullString(bool $value): self
+    {
+        $this->preserveNullString = $value;
+
+        return $this;
+    }
+
+    public function getPreserveNullString(): bool
+    {
+        return $this->preserveNullString;
+    }
+
+    public function setSheetNameIsFileName(bool $sheetNameIsFileName): self
+    {
+        $this->sheetNameIsFileName = $sheetNameIsFileName;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
new file mode 100644
index 00000000..d13156f3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Csv;
+
+class Delimiter
+{
+    protected const POTENTIAL_DELIMETERS = [',', ';', "\t", '|', ':', ' ', '~'];
+
+    /** @var resource */
+    protected $fileHandle;
+
+    protected string $escapeCharacter;
+
+    protected string $enclosure;
+
+    protected array $counts = [];
+
+    protected int $numberLines = 0;
+
+    /** @var ?string */
+    protected ?string $delimiter = null;
+
+    /**
+     * @param resource $fileHandle
+     */
+    public function __construct($fileHandle, string $escapeCharacter, string $enclosure)
+    {
+        $this->fileHandle = $fileHandle;
+        $this->escapeCharacter = $escapeCharacter;
+        $this->enclosure = $enclosure;
+
+        $this->countPotentialDelimiters();
+    }
+
+    public function getDefaultDelimiter(): string
+    {
+        return self::POTENTIAL_DELIMETERS[0];
+    }
+
+    public function linesCounted(): int
+    {
+        return $this->numberLines;
+    }
+
+    protected function countPotentialDelimiters(): void
+    {
+        $this->counts = array_fill_keys(self::POTENTIAL_DELIMETERS, []);
+        $delimiterKeys = array_flip(self::POTENTIAL_DELIMETERS);
+
+        // Count how many times each of the potential delimiters appears in each line
+        $this->numberLines = 0;
+        while (($line = $this->getNextLine()) !== false && (++$this->numberLines < 1000)) {
+            $this->countDelimiterValues($line, $delimiterKeys);
+        }
+    }
+
+    protected function countDelimiterValues(string $line, array $delimiterKeys): void
+    {
+        $splitString = str_split($line, 1);
+        if (is_array($splitString)) {
+            $distribution = array_count_values($splitString);
+            $countLine = array_intersect_key($distribution, $delimiterKeys);
+
+            foreach (self::POTENTIAL_DELIMETERS as $delimiter) {
+                $this->counts[$delimiter][] = $countLine[$delimiter] ?? 0;
+            }
+        }
+    }
+
+    public function infer(): ?string
+    {
+        // Calculate the mean square deviations for each delimiter
+        //     (ignoring delimiters that haven't been found consistently)
+        $meanSquareDeviations = [];
+        $middleIdx = floor(($this->numberLines - 1) / 2);
+
+        foreach (self::POTENTIAL_DELIMETERS as $delimiter) {
+            $series = $this->counts[$delimiter];
+            sort($series);
+
+            $median = ($this->numberLines % 2)
+                ? $series[$middleIdx]
+                : ($series[$middleIdx] + $series[$middleIdx + 1]) / 2;
+
+            if ($median === 0) {
+                continue;
+            }
+
+            $meanSquareDeviations[$delimiter] = array_reduce(
+                $series,
+                fn ($sum, $value): int|float => $sum + ($value - $median) ** 2
+            ) / count($series);
+        }
+
+        // ... and pick the delimiter with the smallest mean square deviation
+        //         (in case of ties, the order in potentialDelimiters is respected)
+        $min = INF;
+        foreach (self::POTENTIAL_DELIMETERS as $delimiter) {
+            if (!isset($meanSquareDeviations[$delimiter])) {
+                continue;
+            }
+
+            if ($meanSquareDeviations[$delimiter] < $min) {
+                $min = $meanSquareDeviations[$delimiter];
+                $this->delimiter = $delimiter;
+            }
+        }
+
+        return $this->delimiter;
+    }
+
+    /**
+     * Get the next full line from the file.
+     *
+     * @return false|string
+     */
+    public function getNextLine()
+    {
+        $line = '';
+        $enclosure = ($this->escapeCharacter === '' ? ''
+                : ('(?<!' . preg_quote($this->escapeCharacter, '/') . ')'))
+            . preg_quote($this->enclosure, '/');
+
+        do {
+            // Get the next line in the file
+            $newLine = fgets($this->fileHandle);
+
+            // Return false if there is no next line
+            if ($newLine === false) {
+                return false;
+            }
+
+            // Add the new line to the line passed in
+            $line = $line . $newLine;
+
+            // Drop everything that is enclosed to avoid counting false positives in enclosures
+            $line = (string) preg_replace('/(' . $enclosure . '.*' . $enclosure . ')/Us', '', $line);
+
+            // See if we have any enclosures left in the line
+            // if we still have an enclosure then we need to read the next line as well
+        } while (preg_match('/(' . $enclosure . ')/', $line) > 0);
+
+        return ($line !== '') ? $line : false;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php
new file mode 100644
index 00000000..0c4b87b6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+class DefaultReadFilter implements IReadFilter
+{
+    /**
+     * Should this cell be read?
+     *
+     * @param string $columnAddress Column address (as a string value like "A", or "IV")
+     * @param int $row Row number
+     * @param string $worksheetName Optional worksheet name
+     */
+    public function readCell(string $columnAddress, int $row, string $worksheetName = ''): bool
+    {
+        return true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Exception.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Exception.php
new file mode 100644
index 00000000..ddbc9b51
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class Exception extends PhpSpreadsheetException
+{
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
new file mode 100644
index 00000000..723e23bb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -0,0 +1,585 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric\PageSetup;
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric\Properties;
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric\Styles;
+use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\ReferenceHelper;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+use XMLReader;
+
+class Gnumeric extends BaseReader
+{
+    const NAMESPACE_GNM = 'http://www.gnumeric.org/v10.dtd'; // gmr in old sheets
+
+    const NAMESPACE_XSI = 'http://www.w3.org/2001/XMLSchema-instance';
+
+    const NAMESPACE_OFFICE = 'urn:oasis:names:tc:opendocument:xmlns:office:1.0';
+
+    const NAMESPACE_XLINK = 'http://www.w3.org/1999/xlink';
+
+    const NAMESPACE_DC = 'http://purl.org/dc/elements/1.1/';
+
+    const NAMESPACE_META = 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0';
+
+    const NAMESPACE_OOO = 'http://openoffice.org/2004/office';
+
+    /**
+     * Shared Expressions.
+     */
+    private array $expressions = [];
+
+    /**
+     * Spreadsheet shared across all functions.
+     */
+    private Spreadsheet $spreadsheet;
+
+    private ReferenceHelper $referenceHelper;
+
+    public static array $mappings = [
+        'dataType' => [
+            '10' => DataType::TYPE_NULL,
+            '20' => DataType::TYPE_BOOL,
+            '30' => DataType::TYPE_NUMERIC, // Integer doesn't exist in Excel
+            '40' => DataType::TYPE_NUMERIC, // Float
+            '50' => DataType::TYPE_ERROR,
+            '60' => DataType::TYPE_STRING,
+            //'70':        //    Cell Range
+            //'80':        //    Array
+        ],
+    ];
+
+    /**
+     * Create a new Gnumeric.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->referenceHelper = ReferenceHelper::getInstance();
+        $this->securityScanner = XmlScanner::getInstance($this);
+    }
+
+    /**
+     * Can the current IReader read the file?
+     */
+    public function canRead(string $filename): bool
+    {
+        $data = null;
+        if (File::testFileNoThrow($filename)) {
+            $data = $this->gzfileGetContents($filename);
+            if (!str_contains($data, self::NAMESPACE_GNM)) {
+                $data = '';
+            }
+        }
+
+        return !empty($data);
+    }
+
+    private static function matchXml(XMLReader $xml, string $expectedLocalName): bool
+    {
+        return $xml->namespaceURI === self::NAMESPACE_GNM
+            && $xml->localName === $expectedLocalName
+            && $xml->nodeType === XMLReader::ELEMENT;
+    }
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
+     */
+    public function listWorksheetNames(string $filename): array
+    {
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an invalid Gnumeric file.');
+        }
+
+        $xml = new XMLReader();
+        $contents = $this->gzfileGetContents($filename);
+        $xml->xml($contents, null, Settings::getLibXmlLoaderOptions());
+        $xml->setParserProperty(2, true);
+
+        $worksheetNames = [];
+        while ($xml->read()) {
+            if (self::matchXml($xml, 'SheetName')) {
+                $xml->read(); //    Move onto the value node
+                $worksheetNames[] = (string) $xml->value;
+            } elseif (self::matchXml($xml, 'Sheets')) {
+                //    break out of the loop once we've got our sheet names rather than parse the entire file
+                break;
+            }
+        }
+
+        return $worksheetNames;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an invalid Gnumeric file.');
+        }
+
+        $xml = new XMLReader();
+        $contents = $this->gzfileGetContents($filename);
+        $xml->xml($contents, null, Settings::getLibXmlLoaderOptions());
+        $xml->setParserProperty(2, true);
+
+        $worksheetInfo = [];
+        while ($xml->read()) {
+            if (self::matchXml($xml, 'Sheet')) {
+                $tmpInfo = [
+                    'worksheetName' => '',
+                    'lastColumnLetter' => 'A',
+                    'lastColumnIndex' => 0,
+                    'totalRows' => 0,
+                    'totalColumns' => 0,
+                ];
+
+                while ($xml->read()) {
+                    if (self::matchXml($xml, 'Name')) {
+                        $xml->read(); //    Move onto the value node
+                        $tmpInfo['worksheetName'] = (string) $xml->value;
+                    } elseif (self::matchXml($xml, 'MaxCol')) {
+                        $xml->read(); //    Move onto the value node
+                        $tmpInfo['lastColumnIndex'] = (int) $xml->value;
+                        $tmpInfo['totalColumns'] = (int) $xml->value + 1;
+                    } elseif (self::matchXml($xml, 'MaxRow')) {
+                        $xml->read(); //    Move onto the value node
+                        $tmpInfo['totalRows'] = (int) $xml->value + 1;
+
+                        break;
+                    }
+                }
+                $tmpInfo['lastColumnLetter'] = Coordinate::stringFromColumnIndex($tmpInfo['lastColumnIndex'] + 1);
+                $worksheetInfo[] = $tmpInfo;
+            }
+        }
+
+        return $worksheetInfo;
+    }
+
+    private function gzfileGetContents(string $filename): string
+    {
+        $data = '';
+        $contents = @file_get_contents($filename);
+        if ($contents !== false) {
+            if (str_starts_with($contents, "\x1f\x8b")) {
+                // Check if gzlib functions are available
+                if (function_exists('gzdecode')) {
+                    $contents = @gzdecode($contents);
+                    if ($contents !== false) {
+                        $data = $contents;
+                    }
+                }
+            } else {
+                $data = $contents;
+            }
+        }
+        if ($data !== '') {
+            $data = $this->getSecurityScannerOrThrow()->scan($data);
+        }
+
+        return $data;
+    }
+
+    public static function gnumericMappings(): array
+    {
+        return array_merge(self::$mappings, Styles::$mappings);
+    }
+
+    private function processComments(SimpleXMLElement $sheet): void
+    {
+        if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
+            foreach ($sheet->Objects->children(self::NAMESPACE_GNM) as $key => $comment) {
+                $commentAttributes = $comment->attributes();
+                //    Only comment objects are handled at the moment
+                if ($commentAttributes && $commentAttributes->Text) {
+                    $this->spreadsheet->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)
+                        ->setAuthor((string) $commentAttributes->Author)
+                        ->setText($this->parseRichText((string) $commentAttributes->Text));
+                }
+            }
+        }
+    }
+
+    private static function testSimpleXml(mixed $value): SimpleXMLElement
+    {
+        return ($value instanceof SimpleXMLElement) ? $value : new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><root></root>');
+    }
+
+    /**
+     * Loads Spreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
+
+        // Load into this instance
+        return $this->loadIntoExisting($filename, $spreadsheet);
+    }
+
+    /**
+     * Loads from file into Spreadsheet instance.
+     */
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
+    {
+        $this->spreadsheet = $spreadsheet;
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an invalid Gnumeric file.');
+        }
+
+        $gFileData = $this->gzfileGetContents($filename);
+
+        /** @var XmlScanner */
+        $securityScanner = $this->securityScanner;
+        $xml2 = simplexml_load_string($securityScanner->scan($gFileData), 'SimpleXMLElement', Settings::getLibXmlLoaderOptions());
+        $xml = self::testSimpleXml($xml2);
+
+        $gnmXML = $xml->children(self::NAMESPACE_GNM);
+        (new Properties($this->spreadsheet))->readProperties($xml, $gnmXML);
+
+        $worksheetID = 0;
+        foreach ($gnmXML->Sheets->Sheet as $sheetOrNull) {
+            $sheet = self::testSimpleXml($sheetOrNull);
+            $worksheetName = (string) $sheet->Name;
+            if (is_array($this->loadSheetsOnly) && !in_array($worksheetName, $this->loadSheetsOnly, true)) {
+                continue;
+            }
+
+            $maxRow = $maxCol = 0;
+
+            // Create new Worksheet
+            $this->spreadsheet->createSheet();
+            $this->spreadsheet->setActiveSheetIndex($worksheetID);
+            //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
+            //        cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
+            //        name in line with the formula, not the reverse
+            $this->spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
+
+            $visibility = $sheet->attributes()['Visibility'] ?? 'GNM_SHEET_VISIBILITY_VISIBLE';
+            if ((string) $visibility !== 'GNM_SHEET_VISIBILITY_VISIBLE') {
+                $this->spreadsheet->getActiveSheet()->setSheetState(Worksheet::SHEETSTATE_HIDDEN);
+            }
+
+            if (!$this->readDataOnly) {
+                (new PageSetup($this->spreadsheet))
+                    ->printInformation($sheet)
+                    ->sheetMargins($sheet);
+            }
+
+            foreach ($sheet->Cells->Cell as $cellOrNull) {
+                $cell = self::testSimpleXml($cellOrNull);
+                $cellAttributes = self::testSimpleXml($cell->attributes());
+                $row = (int) $cellAttributes->Row + 1;
+                $column = (int) $cellAttributes->Col;
+
+                $maxRow = max($maxRow, $row);
+                $maxCol = max($maxCol, $column);
+
+                $column = Coordinate::stringFromColumnIndex($column + 1);
+
+                // Read cell?
+                if ($this->getReadFilter() !== null) {
+                    if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
+                        continue;
+                    }
+                }
+
+                $this->loadCell($cell, $worksheetName, $cellAttributes, $column, $row);
+            }
+
+            if ($sheet->Styles !== null) {
+                (new Styles($this->spreadsheet, $this->readDataOnly))->read($sheet, $maxRow, $maxCol);
+            }
+
+            $this->processComments($sheet);
+            $this->processColumnWidths($sheet, $maxCol);
+            $this->processRowHeights($sheet, $maxRow);
+            $this->processMergedCells($sheet);
+            $this->processAutofilter($sheet);
+
+            $this->setSelectedCells($sheet);
+            ++$worksheetID;
+        }
+
+        $this->processDefinedNames($gnmXML);
+
+        $this->setSelectedSheet($gnmXML);
+
+        // Return
+        return $this->spreadsheet;
+    }
+
+    private function setSelectedSheet(SimpleXMLElement $gnmXML): void
+    {
+        if (isset($gnmXML->UIData)) {
+            $attributes = self::testSimpleXml($gnmXML->UIData->attributes());
+            $selectedSheet = (int) $attributes['SelectedTab'];
+            $this->spreadsheet->setActiveSheetIndex($selectedSheet);
+        }
+    }
+
+    private function setSelectedCells(?SimpleXMLElement $sheet): void
+    {
+        if ($sheet !== null && isset($sheet->Selections)) {
+            foreach ($sheet->Selections as $selection) {
+                $startCol = (int) ($selection->StartCol ?? 0);
+                $startRow = (int) ($selection->StartRow ?? 0) + 1;
+                $endCol = (int) ($selection->EndCol ?? $startCol);
+                $endRow = (int) ($selection->endRow ?? 0) + 1;
+
+                $startColumn = Coordinate::stringFromColumnIndex($startCol + 1);
+                $endColumn = Coordinate::stringFromColumnIndex($endCol + 1);
+
+                $startCell = "{$startColumn}{$startRow}";
+                $endCell = "{$endColumn}{$endRow}";
+                $selectedRange = $startCell . (($endCell !== $startCell) ? ':' . $endCell : '');
+                $this->spreadsheet->getActiveSheet()->setSelectedCell($selectedRange);
+
+                break;
+            }
+        }
+    }
+
+    private function processMergedCells(?SimpleXMLElement $sheet): void
+    {
+        //    Handle Merged Cells in this worksheet
+        if ($sheet !== null && isset($sheet->MergedRegions)) {
+            foreach ($sheet->MergedRegions->Merge as $mergeCells) {
+                if (str_contains((string) $mergeCells, ':')) {
+                    $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells, Worksheet::MERGE_CELL_CONTENT_HIDE);
+                }
+            }
+        }
+    }
+
+    private function processAutofilter(?SimpleXMLElement $sheet): void
+    {
+        if ($sheet !== null && isset($sheet->Filters)) {
+            foreach ($sheet->Filters->Filter as $autofilter) {
+                if ($autofilter !== null) {
+                    $attributes = $autofilter->attributes();
+                    if (isset($attributes['Area'])) {
+                        $this->spreadsheet->getActiveSheet()->setAutoFilter((string) $attributes['Area']);
+                    }
+                }
+            }
+        }
+    }
+
+    private function setColumnWidth(int $whichColumn, float $defaultWidth): void
+    {
+        $columnDimension = $this->spreadsheet->getActiveSheet()
+            ->getColumnDimension(Coordinate::stringFromColumnIndex($whichColumn + 1));
+        if ($columnDimension !== null) {
+            $columnDimension->setWidth($defaultWidth);
+        }
+    }
+
+    private function setColumnInvisible(int $whichColumn): void
+    {
+        $columnDimension = $this->spreadsheet->getActiveSheet()
+            ->getColumnDimension(Coordinate::stringFromColumnIndex($whichColumn + 1));
+        if ($columnDimension !== null) {
+            $columnDimension->setVisible(false);
+        }
+    }
+
+    private function processColumnLoop(int $whichColumn, int $maxCol, ?SimpleXMLElement $columnOverride, float $defaultWidth): int
+    {
+        $columnOverride = self::testSimpleXml($columnOverride);
+        $columnAttributes = self::testSimpleXml($columnOverride->attributes());
+        $column = $columnAttributes['No'];
+        $columnWidth = ((float) $columnAttributes['Unit']) / 5.4;
+        $hidden = (isset($columnAttributes['Hidden'])) && ((string) $columnAttributes['Hidden'] == '1');
+        $columnCount = (int) ($columnAttributes['Count'] ?? 1);
+        while ($whichColumn < $column) {
+            $this->setColumnWidth($whichColumn, $defaultWidth);
+            ++$whichColumn;
+        }
+        while (($whichColumn < ($column + $columnCount)) && ($whichColumn <= $maxCol)) {
+            $this->setColumnWidth($whichColumn, $columnWidth);
+            if ($hidden) {
+                $this->setColumnInvisible($whichColumn);
+            }
+            ++$whichColumn;
+        }
+
+        return $whichColumn;
+    }
+
+    private function processColumnWidths(?SimpleXMLElement $sheet, int $maxCol): void
+    {
+        if ((!$this->readDataOnly) && $sheet !== null && (isset($sheet->Cols))) {
+            //    Column Widths
+            $defaultWidth = 0;
+            $columnAttributes = $sheet->Cols->attributes();
+            if ($columnAttributes !== null) {
+                $defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
+            }
+            $whichColumn = 0;
+            foreach ($sheet->Cols->ColInfo as $columnOverride) {
+                $whichColumn = $this->processColumnLoop($whichColumn, $maxCol, $columnOverride, $defaultWidth);
+            }
+            while ($whichColumn <= $maxCol) {
+                $this->setColumnWidth($whichColumn, $defaultWidth);
+                ++$whichColumn;
+            }
+        }
+    }
+
+    private function setRowHeight(int $whichRow, float $defaultHeight): void
+    {
+        $rowDimension = $this->spreadsheet->getActiveSheet()->getRowDimension($whichRow);
+        if ($rowDimension !== null) {
+            $rowDimension->setRowHeight($defaultHeight);
+        }
+    }
+
+    private function setRowInvisible(int $whichRow): void
+    {
+        $rowDimension = $this->spreadsheet->getActiveSheet()->getRowDimension($whichRow);
+        if ($rowDimension !== null) {
+            $rowDimension->setVisible(false);
+        }
+    }
+
+    private function processRowLoop(int $whichRow, int $maxRow, ?SimpleXMLElement $rowOverride, float $defaultHeight): int
+    {
+        $rowOverride = self::testSimpleXml($rowOverride);
+        $rowAttributes = self::testSimpleXml($rowOverride->attributes());
+        $row = $rowAttributes['No'];
+        $rowHeight = (float) $rowAttributes['Unit'];
+        $hidden = (isset($rowAttributes['Hidden'])) && ((string) $rowAttributes['Hidden'] == '1');
+        $rowCount = (int) ($rowAttributes['Count'] ?? 1);
+        while ($whichRow < $row) {
+            ++$whichRow;
+            $this->setRowHeight($whichRow, $defaultHeight);
+        }
+        while (($whichRow < ($row + $rowCount)) && ($whichRow < $maxRow)) {
+            ++$whichRow;
+            $this->setRowHeight($whichRow, $rowHeight);
+            if ($hidden) {
+                $this->setRowInvisible($whichRow);
+            }
+        }
+
+        return $whichRow;
+    }
+
+    private function processRowHeights(?SimpleXMLElement $sheet, int $maxRow): void
+    {
+        if ((!$this->readDataOnly) && $sheet !== null && (isset($sheet->Rows))) {
+            //    Row Heights
+            $defaultHeight = 0;
+            $rowAttributes = $sheet->Rows->attributes();
+            if ($rowAttributes !== null) {
+                $defaultHeight = (float) $rowAttributes['DefaultSizePts'];
+            }
+            $whichRow = 0;
+
+            foreach ($sheet->Rows->RowInfo as $rowOverride) {
+                $whichRow = $this->processRowLoop($whichRow, $maxRow, $rowOverride, $defaultHeight);
+            }
+            // never executed, I can't figure out any circumstances
+            // under which it would be executed, and, even if
+            // such exist, I'm not convinced this is needed.
+            //while ($whichRow < $maxRow) {
+            //    ++$whichRow;
+            //    $this->spreadsheet->getActiveSheet()->getRowDimension($whichRow)->setRowHeight($defaultHeight);
+            //}
+        }
+    }
+
+    private function processDefinedNames(?SimpleXMLElement $gnmXML): void
+    {
+        //    Loop through definedNames (global named ranges)
+        if ($gnmXML !== null && isset($gnmXML->Names)) {
+            foreach ($gnmXML->Names->Name as $definedName) {
+                $name = (string) $definedName->name;
+                $value = (string) $definedName->value;
+                if (stripos($value, '#REF!') !== false || empty($value)) {
+                    continue;
+                }
+
+                [$worksheetName] = Worksheet::extractSheetTitle($value, true);
+                $worksheetName = trim($worksheetName, "'");
+                $worksheet = $this->spreadsheet->getSheetByName($worksheetName);
+                // Worksheet might still be null if we're only loading selected sheets rather than the full spreadsheet
+                if ($worksheet !== null) {
+                    $this->spreadsheet->addDefinedName(DefinedName::createInstance($name, $worksheet, $value));
+                }
+            }
+        }
+    }
+
+    private function parseRichText(string $is): RichText
+    {
+        $value = new RichText();
+        $value->createText($is);
+
+        return $value;
+    }
+
+    private function loadCell(
+        SimpleXMLElement $cell,
+        string $worksheetName,
+        SimpleXMLElement $cellAttributes,
+        string $column,
+        int $row
+    ): void {
+        $ValueType = $cellAttributes->ValueType;
+        $ExprID = (string) $cellAttributes->ExprID;
+        $type = DataType::TYPE_FORMULA;
+        if ($ExprID > '') {
+            if (((string) $cell) > '') {
+                $this->expressions[$ExprID] = [
+                    'column' => $cellAttributes->Col,
+                    'row' => $cellAttributes->Row,
+                    'formula' => (string) $cell,
+                ];
+            } else {
+                $expression = $this->expressions[$ExprID];
+
+                $cell = $this->referenceHelper->updateFormulaReferences(
+                    $expression['formula'],
+                    'A1',
+                    $cellAttributes->Col - $expression['column'],
+                    $cellAttributes->Row - $expression['row'],
+                    $worksheetName
+                );
+            }
+            $type = DataType::TYPE_FORMULA;
+        } else {
+            $vtype = (string) $ValueType;
+            if (array_key_exists($vtype, self::$mappings['dataType'])) {
+                $type = self::$mappings['dataType'][$vtype];
+            }
+            if ($vtype === '20') {        //    Boolean
+                $cell = $cell == 'TRUE';
+            }
+        }
+
+        $this->spreadsheet->getActiveSheet()->getCell($column . $row)->setValueExplicit((string) $cell, $type);
+        if (isset($cellAttributes->ValueFormat)) {
+            $this->spreadsheet->getActiveSheet()->getCell($column . $row)
+                ->getStyle()->getNumberFormat()
+                ->setFormatCode((string) $cellAttributes->ValueFormat);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
new file mode 100644
index 00000000..f12b742f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageMargins;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup as WorksheetPageSetup;
+use SimpleXMLElement;
+
+class PageSetup
+{
+    private Spreadsheet $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function printInformation(SimpleXMLElement $sheet): self
+    {
+        if (isset($sheet->PrintInformation, $sheet->PrintInformation[0])) {
+            $printInformation = $sheet->PrintInformation[0];
+            $setup = $this->spreadsheet->getActiveSheet()->getPageSetup();
+
+            $attributes = $printInformation->Scale->attributes();
+            if (isset($attributes['percentage'])) {
+                $setup->setScale((int) $attributes['percentage']);
+            }
+            $pageOrder = (string) $printInformation->order;
+            if ($pageOrder === 'r_then_d') {
+                $setup->setPageOrder(WorksheetPageSetup::PAGEORDER_OVER_THEN_DOWN);
+            } elseif ($pageOrder === 'd_then_r') {
+                $setup->setPageOrder(WorksheetPageSetup::PAGEORDER_DOWN_THEN_OVER);
+            }
+            $orientation = (string) $printInformation->orientation;
+            if ($orientation !== '') {
+                $setup->setOrientation($orientation);
+            }
+            $attributes = $printInformation->hcenter->attributes();
+            if (isset($attributes['value'])) {
+                $setup->setHorizontalCentered((bool) (string) $attributes['value']);
+            }
+            $attributes = $printInformation->vcenter->attributes();
+            if (isset($attributes['value'])) {
+                $setup->setVerticalCentered((bool) (string) $attributes['value']);
+            }
+        }
+
+        return $this;
+    }
+
+    public function sheetMargins(SimpleXMLElement $sheet): self
+    {
+        if (isset($sheet->PrintInformation, $sheet->PrintInformation->Margins)) {
+            $marginSet = [
+                // Default Settings
+                'top' => 0.75,
+                'header' => 0.3,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.75,
+                'footer' => 0.3,
+            ];
+
+            $marginSet = $this->buildMarginSet($sheet, $marginSet);
+            $this->adjustMargins($marginSet);
+        }
+
+        return $this;
+    }
+
+    private function buildMarginSet(SimpleXMLElement $sheet, array $marginSet): array
+    {
+        foreach ($sheet->PrintInformation->Margins->children(Gnumeric::NAMESPACE_GNM) as $key => $margin) {
+            $marginAttributes = $margin->attributes();
+            $marginSize = ($marginAttributes['Points']) ?? 72; //    Default is 72pt
+            // Convert value in points to inches
+            $marginSize = PageMargins::fromPoints((float) $marginSize);
+            $marginSet[$key] = $marginSize;
+        }
+
+        return $marginSet;
+    }
+
+    private function adjustMargins(array $marginSet): void
+    {
+        foreach ($marginSet as $key => $marginSize) {
+            // Gnumeric is quirky in the way it displays the header/footer values:
+            //    header is actually the sum of top and header; footer is actually the sum of bottom and footer
+            //    then top is actually the header value, and bottom is actually the footer value
+            switch ($key) {
+                case 'left':
+                case 'right':
+                    $this->sheetMargin($key, $marginSize);
+
+                    break;
+                case 'top':
+                    $this->sheetMargin($key, $marginSet['header'] ?? 0);
+
+                    break;
+                case 'bottom':
+                    $this->sheetMargin($key, $marginSet['footer'] ?? 0);
+
+                    break;
+                case 'header':
+                    $this->sheetMargin($key, ($marginSet['top'] ?? 0) - $marginSize);
+
+                    break;
+                case 'footer':
+                    $this->sheetMargin($key, ($marginSet['bottom'] ?? 0) - $marginSize);
+
+                    break;
+            }
+        }
+    }
+
+    private function sheetMargin(string $key, float $marginSize): void
+    {
+        switch ($key) {
+            case 'top':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setTop($marginSize);
+
+                break;
+            case 'bottom':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setBottom($marginSize);
+
+                break;
+            case 'left':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setLeft($marginSize);
+
+                break;
+            case 'right':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setRight($marginSize);
+
+                break;
+            case 'header':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setHeader($marginSize);
+
+                break;
+            case 'footer':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setFooter($marginSize);
+
+                break;
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php
new file mode 100644
index 00000000..a60b4534
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class Properties
+{
+    protected Spreadsheet $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    private function docPropertiesOld(SimpleXMLElement $gnmXML): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($gnmXML->Summary->Item as $summaryItem) {
+            $propertyName = $summaryItem->name;
+            $propertyValue = $summaryItem->{'val-string'};
+            switch ($propertyName) {
+                case 'title':
+                    $docProps->setTitle(trim($propertyValue));
+
+                    break;
+                case 'comments':
+                    $docProps->setDescription(trim($propertyValue));
+
+                    break;
+                case 'keywords':
+                    $docProps->setKeywords(trim($propertyValue));
+
+                    break;
+                case 'category':
+                    $docProps->setCategory(trim($propertyValue));
+
+                    break;
+                case 'manager':
+                    $docProps->setManager(trim($propertyValue));
+
+                    break;
+                case 'author':
+                    $docProps->setCreator(trim($propertyValue));
+                    $docProps->setLastModifiedBy(trim($propertyValue));
+
+                    break;
+                case 'company':
+                    $docProps->setCompany(trim($propertyValue));
+
+                    break;
+            }
+        }
+    }
+
+    private function docPropertiesDC(SimpleXMLElement $officePropertyDC): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($officePropertyDC as $propertyName => $propertyValue) {
+            $propertyValue = trim((string) $propertyValue);
+            switch ($propertyName) {
+                case 'title':
+                    $docProps->setTitle($propertyValue);
+
+                    break;
+                case 'subject':
+                    $docProps->setSubject($propertyValue);
+
+                    break;
+                case 'creator':
+                    $docProps->setCreator($propertyValue);
+                    $docProps->setLastModifiedBy($propertyValue);
+
+                    break;
+                case 'date':
+                    $creationDate = $propertyValue;
+                    $docProps->setModified($creationDate);
+
+                    break;
+                case 'description':
+                    $docProps->setDescription($propertyValue);
+
+                    break;
+            }
+        }
+    }
+
+    private function docPropertiesMeta(SimpleXMLElement $officePropertyMeta): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($officePropertyMeta as $propertyName => $propertyValue) {
+            if ($propertyValue !== null) {
+                $attributes = $propertyValue->attributes(Gnumeric::NAMESPACE_META);
+                $propertyValue = trim((string) $propertyValue);
+                switch ($propertyName) {
+                    case 'keyword':
+                        $docProps->setKeywords($propertyValue);
+
+                        break;
+                    case 'initial-creator':
+                        $docProps->setCreator($propertyValue);
+                        $docProps->setLastModifiedBy($propertyValue);
+
+                        break;
+                    case 'creation-date':
+                        $creationDate = $propertyValue;
+                        $docProps->setCreated($creationDate);
+
+                        break;
+                    case 'user-defined':
+                        if ($attributes) {
+                            [, $attrName] = explode(':', (string) $attributes['name']);
+                            $this->userDefinedProperties($attrName, $propertyValue);
+                        }
+
+                        break;
+                }
+            }
+        }
+    }
+
+    private function userDefinedProperties(string $attrName, string $propertyValue): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        switch ($attrName) {
+            case 'publisher':
+                $docProps->setCompany($propertyValue);
+
+                break;
+            case 'category':
+                $docProps->setCategory($propertyValue);
+
+                break;
+            case 'manager':
+                $docProps->setManager($propertyValue);
+
+                break;
+        }
+    }
+
+    public function readProperties(SimpleXMLElement $xml, SimpleXMLElement $gnmXML): void
+    {
+        $officeXML = $xml->children(Gnumeric::NAMESPACE_OFFICE);
+        if (!empty($officeXML)) {
+            $officeDocXML = $officeXML->{'document-meta'};
+            $officeDocMetaXML = $officeDocXML->meta;
+
+            foreach ($officeDocMetaXML as $officePropertyData) {
+                $officePropertyDC = $officePropertyData->children(Gnumeric::NAMESPACE_DC);
+                $this->docPropertiesDC($officePropertyDC);
+
+                $officePropertyMeta = $officePropertyData->children(Gnumeric::NAMESPACE_META);
+                $this->docPropertiesMeta($officePropertyMeta);
+            }
+        } elseif (isset($gnmXML->Summary)) {
+            $this->docPropertiesOld($gnmXML);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php
new file mode 100644
index 00000000..f901c4a9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php
@@ -0,0 +1,273 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use SimpleXMLElement;
+
+class Styles
+{
+    private Spreadsheet $spreadsheet;
+
+    protected bool $readDataOnly;
+
+    public static array $mappings = [
+        'borderStyle' => [
+            '0' => Border::BORDER_NONE,
+            '1' => Border::BORDER_THIN,
+            '2' => Border::BORDER_MEDIUM,
+            '3' => Border::BORDER_SLANTDASHDOT,
+            '4' => Border::BORDER_DASHED,
+            '5' => Border::BORDER_THICK,
+            '6' => Border::BORDER_DOUBLE,
+            '7' => Border::BORDER_DOTTED,
+            '8' => Border::BORDER_MEDIUMDASHED,
+            '9' => Border::BORDER_DASHDOT,
+            '10' => Border::BORDER_MEDIUMDASHDOT,
+            '11' => Border::BORDER_DASHDOTDOT,
+            '12' => Border::BORDER_MEDIUMDASHDOTDOT,
+            '13' => Border::BORDER_MEDIUMDASHDOTDOT,
+        ],
+        'fillType' => [
+            '1' => Fill::FILL_SOLID,
+            '2' => Fill::FILL_PATTERN_DARKGRAY,
+            '3' => Fill::FILL_PATTERN_MEDIUMGRAY,
+            '4' => Fill::FILL_PATTERN_LIGHTGRAY,
+            '5' => Fill::FILL_PATTERN_GRAY125,
+            '6' => Fill::FILL_PATTERN_GRAY0625,
+            '7' => Fill::FILL_PATTERN_DARKHORIZONTAL, // horizontal stripe
+            '8' => Fill::FILL_PATTERN_DARKVERTICAL, // vertical stripe
+            '9' => Fill::FILL_PATTERN_DARKDOWN, // diagonal stripe
+            '10' => Fill::FILL_PATTERN_DARKUP, // reverse diagonal stripe
+            '11' => Fill::FILL_PATTERN_DARKGRID, // diagoanl crosshatch
+            '12' => Fill::FILL_PATTERN_DARKTRELLIS, // thick diagonal crosshatch
+            '13' => Fill::FILL_PATTERN_LIGHTHORIZONTAL,
+            '14' => Fill::FILL_PATTERN_LIGHTVERTICAL,
+            '15' => Fill::FILL_PATTERN_LIGHTUP,
+            '16' => Fill::FILL_PATTERN_LIGHTDOWN,
+            '17' => Fill::FILL_PATTERN_LIGHTGRID, // thin horizontal crosshatch
+            '18' => Fill::FILL_PATTERN_LIGHTTRELLIS, // thin diagonal crosshatch
+        ],
+        'horizontal' => [
+            '1' => Alignment::HORIZONTAL_GENERAL,
+            '2' => Alignment::HORIZONTAL_LEFT,
+            '4' => Alignment::HORIZONTAL_RIGHT,
+            '8' => Alignment::HORIZONTAL_CENTER,
+            '16' => Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+            '32' => Alignment::HORIZONTAL_JUSTIFY,
+            '64' => Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+        ],
+        'underline' => [
+            '1' => Font::UNDERLINE_SINGLE,
+            '2' => Font::UNDERLINE_DOUBLE,
+            '3' => Font::UNDERLINE_SINGLEACCOUNTING,
+            '4' => Font::UNDERLINE_DOUBLEACCOUNTING,
+        ],
+        'vertical' => [
+            '1' => Alignment::VERTICAL_TOP,
+            '2' => Alignment::VERTICAL_BOTTOM,
+            '4' => Alignment::VERTICAL_CENTER,
+            '8' => Alignment::VERTICAL_JUSTIFY,
+        ],
+    ];
+
+    public function __construct(Spreadsheet $spreadsheet, bool $readDataOnly)
+    {
+        $this->spreadsheet = $spreadsheet;
+        $this->readDataOnly = $readDataOnly;
+    }
+
+    public function read(SimpleXMLElement $sheet, int $maxRow, int $maxCol): void
+    {
+        if ($sheet->Styles->StyleRegion !== null) {
+            $this->readStyles($sheet->Styles->StyleRegion, $maxRow, $maxCol);
+        }
+    }
+
+    private function readStyles(SimpleXMLElement $styleRegion, int $maxRow, int $maxCol): void
+    {
+        foreach ($styleRegion as $style) {
+            $styleAttributes = $style->attributes();
+            if ($styleAttributes !== null && ($styleAttributes['startRow'] <= $maxRow) && ($styleAttributes['startCol'] <= $maxCol)) {
+                $cellRange = $this->readStyleRange($styleAttributes, $maxCol, $maxRow);
+
+                $styleAttributes = $style->Style->attributes();
+
+                $styleArray = [];
+                // We still set the number format mask for date/time values, even if readDataOnly is true
+                //    so that we can identify whether a float is a float or a date value
+                $formatCode = $styleAttributes ? (string) $styleAttributes['Format'] : null;
+                if ($formatCode && Date::isDateTimeFormatCode($formatCode)) {
+                    $styleArray['numberFormat']['formatCode'] = $formatCode;
+                }
+                if ($this->readDataOnly === false && $styleAttributes !== null) {
+                    //    If readDataOnly is false, we set all formatting information
+                    $styleArray['numberFormat']['formatCode'] = $formatCode;
+                    $styleArray = $this->readStyle($styleArray, $styleAttributes, $style);
+                }
+                $this->spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
+            }
+        }
+    }
+
+    private function addBorderDiagonal(SimpleXMLElement $srssb, array &$styleArray): void
+    {
+        if (isset($srssb->Diagonal, $srssb->{'Rev-Diagonal'})) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_BOTH;
+        } elseif (isset($srssb->Diagonal)) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_UP;
+        } elseif (isset($srssb->{'Rev-Diagonal'})) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->{'Rev-Diagonal'}->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_DOWN;
+        }
+    }
+
+    private function addBorderStyle(SimpleXMLElement $srssb, array &$styleArray, string $direction): void
+    {
+        $ucDirection = ucfirst($direction);
+        if (isset($srssb->$ucDirection)) {
+            $styleArray['borders'][$direction] = self::parseBorderAttributes($srssb->$ucDirection->attributes());
+        }
+    }
+
+    private function calcRotation(SimpleXMLElement $styleAttributes): int
+    {
+        $rotation = (int) $styleAttributes->Rotation;
+        if ($rotation >= 270 && $rotation <= 360) {
+            $rotation -= 360;
+        }
+        $rotation = (abs($rotation) > 90) ? 0 : $rotation;
+
+        return $rotation;
+    }
+
+    private static function addStyle(array &$styleArray, string $key, string $value): void
+    {
+        if (array_key_exists($value, self::$mappings[$key])) {
+            $styleArray[$key] = self::$mappings[$key][$value];
+        }
+    }
+
+    private static function addStyle2(array &$styleArray, string $key1, string $key, string $value): void
+    {
+        if (array_key_exists($value, self::$mappings[$key])) {
+            $styleArray[$key1][$key] = self::$mappings[$key][$value];
+        }
+    }
+
+    private static function parseBorderAttributes(?SimpleXMLElement $borderAttributes): array
+    {
+        $styleArray = [];
+        if ($borderAttributes !== null) {
+            if (isset($borderAttributes['Color'])) {
+                $styleArray['color']['rgb'] = self::parseGnumericColour($borderAttributes['Color']);
+            }
+
+            self::addStyle($styleArray, 'borderStyle', (string) $borderAttributes['Style']);
+        }
+
+        return $styleArray;
+    }
+
+    private static function parseGnumericColour(string $gnmColour): string
+    {
+        [$gnmR, $gnmG, $gnmB] = explode(':', $gnmColour);
+        $gnmR = substr(str_pad($gnmR, 4, '0', STR_PAD_RIGHT), 0, 2);
+        $gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2);
+        $gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2);
+
+        return $gnmR . $gnmG . $gnmB;
+    }
+
+    private function addColors(array &$styleArray, SimpleXMLElement $styleAttributes): void
+    {
+        $RGB = self::parseGnumericColour((string) $styleAttributes['Fore']);
+        $styleArray['font']['color']['rgb'] = $RGB;
+        $RGB = self::parseGnumericColour((string) $styleAttributes['Back']);
+        $shade = (string) $styleAttributes['Shade'];
+        if (($RGB !== '000000') || ($shade !== '0')) {
+            $RGB2 = self::parseGnumericColour((string) $styleAttributes['PatternColor']);
+            if ($shade === '1') {
+                $styleArray['fill']['startColor']['rgb'] = $RGB;
+                $styleArray['fill']['endColor']['rgb'] = $RGB2;
+            } else {
+                $styleArray['fill']['endColor']['rgb'] = $RGB;
+                $styleArray['fill']['startColor']['rgb'] = $RGB2;
+            }
+            self::addStyle2($styleArray, 'fill', 'fillType', $shade);
+        }
+    }
+
+    private function readStyleRange(SimpleXMLElement $styleAttributes, int $maxCol, int $maxRow): string
+    {
+        $startColumn = Coordinate::stringFromColumnIndex((int) $styleAttributes['startCol'] + 1);
+        $startRow = $styleAttributes['startRow'] + 1;
+
+        $endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
+        $endColumn = Coordinate::stringFromColumnIndex($endColumn + 1);
+
+        $endRow = 1 + (($styleAttributes['endRow'] > $maxRow) ? $maxRow : (int) $styleAttributes['endRow']);
+        $cellRange = $startColumn . $startRow . ':' . $endColumn . $endRow;
+
+        return $cellRange;
+    }
+
+    private function readStyle(array $styleArray, SimpleXMLElement $styleAttributes, SimpleXMLElement $style): array
+    {
+        self::addStyle2($styleArray, 'alignment', 'horizontal', (string) $styleAttributes['HAlign']);
+        self::addStyle2($styleArray, 'alignment', 'vertical', (string) $styleAttributes['VAlign']);
+        $styleArray['alignment']['wrapText'] = $styleAttributes['WrapText'] == '1';
+        $styleArray['alignment']['textRotation'] = $this->calcRotation($styleAttributes);
+        $styleArray['alignment']['shrinkToFit'] = $styleAttributes['ShrinkToFit'] == '1';
+        $styleArray['alignment']['indent'] = ((int) ($styleAttributes['Indent']) > 0) ? $styleAttributes['indent'] : 0;
+
+        $this->addColors($styleArray, $styleAttributes);
+
+        $fontAttributes = $style->Style->Font->attributes();
+        if ($fontAttributes !== null) {
+            $styleArray['font']['name'] = (string) $style->Style->Font;
+            $styleArray['font']['size'] = (int) ($fontAttributes['Unit']);
+            $styleArray['font']['bold'] = $fontAttributes['Bold'] == '1';
+            $styleArray['font']['italic'] = $fontAttributes['Italic'] == '1';
+            $styleArray['font']['strikethrough'] = $fontAttributes['StrikeThrough'] == '1';
+            self::addStyle2($styleArray, 'font', 'underline', (string) $fontAttributes['Underline']);
+
+            switch ($fontAttributes['Script']) {
+                case '1':
+                    $styleArray['font']['superscript'] = true;
+
+                    break;
+                case '-1':
+                    $styleArray['font']['subscript'] = true;
+
+                    break;
+            }
+        }
+
+        if (isset($style->Style->StyleBorder)) {
+            $srssb = $style->Style->StyleBorder;
+            $this->addBorderStyle($srssb, $styleArray, 'top');
+            $this->addBorderStyle($srssb, $styleArray, 'bottom');
+            $this->addBorderStyle($srssb, $styleArray, 'left');
+            $this->addBorderStyle($srssb, $styleArray, 'right');
+            $this->addBorderDiagonal($srssb, $styleArray);
+        }
+        //    TO DO
+        /*
+        if (isset($style->Style->HyperLink)) {
+            $hyperlink = $style->Style->HyperLink->attributes();
+        }
+        */
+
+        return $styleArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
new file mode 100644
index 00000000..cc4a4859
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
@@ -0,0 +1,1150 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use DOMAttr;
+use DOMDocument;
+use DOMElement;
+use DOMNode;
+use DOMText;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
+use PhpOffice\PhpSpreadsheet\Helper\Html as HelperHtml;
+use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Throwable;
+
+class Html extends BaseReader
+{
+    /**
+     * Sample size to read to determine if it's HTML or not.
+     */
+    const TEST_SAMPLE_SIZE = 2048;
+
+    private const STARTS_WITH_BOM = '/^(?:\xfe\xff|\xff\xfe|\xEF\xBB\xBF)/';
+
+    private const DECLARES_CHARSET = '/ charset=/i';
+
+    /**
+     * Input encoding.
+     */
+    protected string $inputEncoding = 'ANSI';
+
+    /**
+     * Sheet index to read.
+     */
+    protected int $sheetIndex = 0;
+
+    /**
+     * Formats.
+     */
+    protected array $formats = [
+        'h1' => [
+            'font' => [
+                'bold' => true,
+                'size' => 24,
+            ],
+        ], //    Bold, 24pt
+        'h2' => [
+            'font' => [
+                'bold' => true,
+                'size' => 18,
+            ],
+        ], //    Bold, 18pt
+        'h3' => [
+            'font' => [
+                'bold' => true,
+                'size' => 13.5,
+            ],
+        ], //    Bold, 13.5pt
+        'h4' => [
+            'font' => [
+                'bold' => true,
+                'size' => 12,
+            ],
+        ], //    Bold, 12pt
+        'h5' => [
+            'font' => [
+                'bold' => true,
+                'size' => 10,
+            ],
+        ], //    Bold, 10pt
+        'h6' => [
+            'font' => [
+                'bold' => true,
+                'size' => 7.5,
+            ],
+        ], //    Bold, 7.5pt
+        'a' => [
+            'font' => [
+                'underline' => true,
+                'color' => [
+                    'argb' => Color::COLOR_BLUE,
+                ],
+            ],
+        ], //    Blue underlined
+        'hr' => [
+            'borders' => [
+                'bottom' => [
+                    'borderStyle' => Border::BORDER_THIN,
+                    'color' => [
+                        Color::COLOR_BLACK,
+                    ],
+                ],
+            ],
+        ], //    Bottom border
+        'strong' => [
+            'font' => [
+                'bold' => true,
+            ],
+        ], //    Bold
+        'b' => [
+            'font' => [
+                'bold' => true,
+            ],
+        ], //    Bold
+        'i' => [
+            'font' => [
+                'italic' => true,
+            ],
+        ], //    Italic
+        'em' => [
+            'font' => [
+                'italic' => true,
+            ],
+        ], //    Italic
+    ];
+
+    protected array $rowspan = [];
+
+    /**
+     * Create a new HTML Reader instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->securityScanner = XmlScanner::getInstance($this);
+    }
+
+    /**
+     * Validate that the current file is an HTML file.
+     */
+    public function canRead(string $filename): bool
+    {
+        // Check if file exists
+        try {
+            $this->openFile($filename);
+        } catch (Exception) {
+            return false;
+        }
+
+        $beginning = preg_replace(self::STARTS_WITH_BOM, '', $this->readBeginning()) ?? '';
+
+        $startWithTag = self::startsWithTag($beginning);
+        $containsTags = self::containsTags($beginning);
+        $endsWithTag = self::endsWithTag($this->readEnding());
+
+        fclose($this->fileHandle);
+
+        return $startWithTag && $containsTags && $endsWithTag;
+    }
+
+    private function readBeginning(): string
+    {
+        fseek($this->fileHandle, 0);
+
+        return (string) fread($this->fileHandle, self::TEST_SAMPLE_SIZE);
+    }
+
+    private function readEnding(): string
+    {
+        $meta = stream_get_meta_data($this->fileHandle);
+        // Phpstan incorrectly flags following line for Php8.2-, corrected in 8.3
+        $filename = $meta['uri']; //@phpstan-ignore-line
+
+        $size = (int) filesize($filename);
+        if ($size === 0) {
+            return '';
+        }
+
+        $blockSize = self::TEST_SAMPLE_SIZE;
+        if ($size < $blockSize) {
+            $blockSize = $size;
+        }
+
+        fseek($this->fileHandle, $size - $blockSize);
+
+        return (string) fread($this->fileHandle, $blockSize);
+    }
+
+    private static function startsWithTag(string $data): bool
+    {
+        return str_starts_with(trim($data), '<');
+    }
+
+    private static function endsWithTag(string $data): bool
+    {
+        return str_ends_with(trim($data), '>');
+    }
+
+    private static function containsTags(string $data): bool
+    {
+        return strlen($data) !== strlen(strip_tags($data));
+    }
+
+    /**
+     * Loads Spreadsheet from file.
+     */
+    public function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+
+        // Load into this instance
+        return $this->loadIntoExisting($filename, $spreadsheet);
+    }
+
+    //    Data Array used for testing only, should write to Spreadsheet object on completion of tests
+
+    protected array $dataArray = [];
+
+    protected int $tableLevel = 0;
+
+    protected array $nestedColumn = ['A'];
+
+    protected function setTableStartColumn(string $column): string
+    {
+        if ($this->tableLevel == 0) {
+            $column = 'A';
+        }
+        ++$this->tableLevel;
+        $this->nestedColumn[$this->tableLevel] = $column;
+
+        return $this->nestedColumn[$this->tableLevel];
+    }
+
+    protected function getTableStartColumn(): string
+    {
+        return $this->nestedColumn[$this->tableLevel];
+    }
+
+    protected function releaseTableStartColumn(): string
+    {
+        --$this->tableLevel;
+
+        return array_pop($this->nestedColumn);
+    }
+
+    /**
+     * Flush cell.
+     */
+    protected function flushCell(Worksheet $sheet, string $column, int|string $row, mixed &$cellContent, array $attributeArray): void
+    {
+        if (is_string($cellContent)) {
+            //    Simple String content
+            if (trim($cellContent) > '') {
+                //    Only actually write it if there's content in the string
+                //    Write to worksheet to be done here...
+                //    ... we return the cell, so we can mess about with styles more easily
+
+                // Set cell value explicitly if there is data-type attribute
+                if (isset($attributeArray['data-type'])) {
+                    $datatype = $attributeArray['data-type'];
+                    if (in_array($datatype, [DataType::TYPE_STRING, DataType::TYPE_STRING2, DataType::TYPE_INLINE])) {
+                        //Prevent to Excel treat string with beginning equal sign or convert big numbers to scientific number
+                        if (str_starts_with($cellContent, '=')) {
+                            $sheet->getCell($column . $row)
+                                ->getStyle()
+                                ->setQuotePrefix(true);
+                        }
+                    }
+
+                    //catching the Exception and ignoring the invalid data types
+                    try {
+                        $sheet->setCellValueExplicit($column . $row, $cellContent, $attributeArray['data-type']);
+                    } catch (SpreadsheetException) {
+                        $sheet->setCellValue($column . $row, $cellContent);
+                    }
+                } else {
+                    $sheet->setCellValue($column . $row, $cellContent);
+                }
+                $this->dataArray[$row][$column] = $cellContent;
+            }
+        } else {
+            //    We have a Rich Text run
+            //    TODO
+            $this->dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
+        }
+        $cellContent = (string) '';
+    }
+
+    private function processDomElementBody(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child): void
+    {
+        $attributeArray = [];
+        /** @var DOMAttr $attribute */
+        foreach ($child->attributes as $attribute) {
+            $attributeArray[$attribute->name] = $attribute->value;
+        }
+
+        if ($child->nodeName === 'body') {
+            $row = 1;
+            $column = 'A';
+            $cellContent = '';
+            $this->tableLevel = 0;
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementTitle($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementTitle(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'title') {
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+
+            try {
+                $sheet->setTitle($cellContent, true, true);
+            } catch (SpreadsheetException) {
+                // leave default title if too long or illegal chars
+            }
+            $cellContent = '';
+        } else {
+            $this->processDomElementSpanEtc($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private const SPAN_ETC = ['span', 'div', 'font', 'i', 'em', 'strong', 'b'];
+
+    private function processDomElementSpanEtc(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if (in_array((string) $child->nodeName, self::SPAN_ETC, true)) {
+            if (isset($attributeArray['class']) && $attributeArray['class'] === 'comment') {
+                $sheet->getComment($column . $row)
+                    ->getText()
+                    ->createTextRun($child->textContent);
+                if (isset($attributeArray['dir']) && $attributeArray['dir'] === 'rtl') {
+                    $sheet->getComment($column . $row)->setTextboxDirection(Comment::TEXTBOX_DIRECTION_RTL);
+                }
+                if (isset($attributeArray['style'])) {
+                    $alignStyle = $attributeArray['style'];
+                    if (preg_match('/\\btext-align:\\s*(left|right|center|justify)\\b/', $alignStyle, $matches) === 1) {
+                        $sheet->getComment($column . $row)->setAlignment($matches[1]);
+                    }
+                }
+            } else {
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            }
+
+            if (isset($this->formats[$child->nodeName])) {
+                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+            }
+        } else {
+            $this->processDomElementHr($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementHr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'hr') {
+            $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+            ++$row;
+            if (isset($this->formats[$child->nodeName])) {
+                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+            }
+            ++$row;
+        }
+        // fall through to br
+        $this->processDomElementBr($sheet, $row, $column, $cellContent, $child, $attributeArray);
+    }
+
+    private function processDomElementBr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'br' || $child->nodeName === 'hr') {
+            if ($this->tableLevel > 0) {
+                //    If we're inside a table, replace with a newline and set the cell to wrap
+                $cellContent .= "\n";
+                $sheet->getStyle($column . $row)->getAlignment()->setWrapText(true);
+            } else {
+                //    Otherwise flush our existing content and move the row cursor on
+                $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+                ++$row;
+            }
+        } else {
+            $this->processDomElementA($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementA(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'a') {
+            foreach ($attributeArray as $attributeName => $attributeValue) {
+                switch ($attributeName) {
+                    case 'href':
+                        $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
+                        if (isset($this->formats[$child->nodeName])) {
+                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                        }
+
+                        break;
+                    case 'class':
+                        if ($attributeValue === 'comment-indicator') {
+                            break; // Ignore - it's just a red square.
+                        }
+                }
+            }
+            // no idea why this should be needed
+            //$cellContent .= ' ';
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementH1Etc($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private const H1_ETC = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'ul', 'p'];
+
+    private function processDomElementH1Etc(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if (in_array((string) $child->nodeName, self::H1_ETC, true)) {
+            if ($this->tableLevel > 0) {
+                //    If we're inside a table, replace with a newline
+                $cellContent .= $cellContent ? "\n" : '';
+                $sheet->getStyle($column . $row)->getAlignment()->setWrapText(true);
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            } else {
+                if ($cellContent > '') {
+                    $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+                    ++$row;
+                }
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+
+                if (isset($this->formats[$child->nodeName])) {
+                    $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                }
+
+                ++$row;
+                $column = 'A';
+            }
+        } else {
+            $this->processDomElementLi($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementLi(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'li') {
+            if ($this->tableLevel > 0) {
+                //    If we're inside a table, replace with a newline
+                $cellContent .= $cellContent ? "\n" : '';
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            } else {
+                if ($cellContent > '') {
+                    $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+                }
+                ++$row;
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+                $column = 'A';
+            }
+        } else {
+            $this->processDomElementImg($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementImg(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'img') {
+            $this->insertImage($sheet, $column, $row, $attributeArray);
+        } else {
+            $this->processDomElementTable($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private string $currentColumn = 'A';
+
+    private function processDomElementTable(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'table') {
+            $this->currentColumn = 'A';
+            $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+            $column = $this->setTableStartColumn($column);
+            if ($this->tableLevel > 1 && $row > 1) {
+                --$row;
+            }
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            $column = $this->releaseTableStartColumn();
+            if ($this->tableLevel > 1) {
+                ++$column;
+            } else {
+                ++$row;
+            }
+        } else {
+            $this->processDomElementTr($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementTr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'col') {
+            $this->applyInlineStyle($sheet, -1, $this->currentColumn, $attributeArray);
+            ++$this->currentColumn;
+        } elseif ($child->nodeName === 'tr') {
+            $column = $this->getTableStartColumn();
+            $cellContent = '';
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+
+            if (isset($attributeArray['height'])) {
+                $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
+            }
+
+            ++$row;
+        } else {
+            $this->processDomElementThTdOther($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementThTdOther(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName !== 'td' && $child->nodeName !== 'th') {
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementThTd($sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementBgcolor(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['bgcolor'])) {
+            $sheet->getStyle("$column$row")->applyFromArray(
+                [
+                    'fill' => [
+                        'fillType' => Fill::FILL_SOLID,
+                        'color' => ['rgb' => $this->getStyleColor($attributeArray['bgcolor'])],
+                    ],
+                ]
+            );
+        }
+    }
+
+    private function processDomElementWidth(Worksheet $sheet, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['width'])) {
+            $sheet->getColumnDimension($column)->setWidth((new CssDimension($attributeArray['width']))->width());
+        }
+    }
+
+    private function processDomElementHeight(Worksheet $sheet, int $row, array $attributeArray): void
+    {
+        if (isset($attributeArray['height'])) {
+            $sheet->getRowDimension($row)->setRowHeight((new CssDimension($attributeArray['height']))->height());
+        }
+    }
+
+    private function processDomElementAlign(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['align'])) {
+            $sheet->getStyle($column . $row)->getAlignment()->setHorizontal($attributeArray['align']);
+        }
+    }
+
+    private function processDomElementVAlign(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['valign'])) {
+            $sheet->getStyle($column . $row)->getAlignment()->setVertical($attributeArray['valign']);
+        }
+    }
+
+    private function processDomElementDataFormat(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['data-format'])) {
+            $sheet->getStyle($column . $row)->getNumberFormat()->setFormatCode($attributeArray['data-format']);
+        }
+    }
+
+    private function processDomElementThTd(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        while (isset($this->rowspan[$column . $row])) {
+            ++$column;
+        }
+        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+
+        // apply inline style
+        $this->applyInlineStyle($sheet, $row, $column, $attributeArray);
+
+        $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
+
+        $this->processDomElementBgcolor($sheet, $row, $column, $attributeArray);
+        $this->processDomElementWidth($sheet, $column, $attributeArray);
+        $this->processDomElementHeight($sheet, $row, $attributeArray);
+        $this->processDomElementAlign($sheet, $row, $column, $attributeArray);
+        $this->processDomElementVAlign($sheet, $row, $column, $attributeArray);
+        $this->processDomElementDataFormat($sheet, $row, $column, $attributeArray);
+
+        if (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
+            //create merging rowspan and colspan
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
+            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
+                $this->rowspan[$value] = true;
+            }
+            $sheet->mergeCells($range);
+            $column = $columnTo;
+        } elseif (isset($attributeArray['rowspan'])) {
+            //create merging rowspan
+            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
+            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
+                $this->rowspan[$value] = true;
+            }
+            $sheet->mergeCells($range);
+        } elseif (isset($attributeArray['colspan'])) {
+            //create merging colspan
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
+            $column = $columnTo;
+        }
+
+        ++$column;
+    }
+
+    protected function processDomElement(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent): void
+    {
+        foreach ($element->childNodes as $child) {
+            if ($child instanceof DOMText) {
+                $domText = (string) preg_replace('/\s+/u', ' ', trim($child->nodeValue ?? ''));
+                if (is_string($cellContent)) {
+                    //    simply append the text if the cell content is a plain text string
+                    $cellContent .= $domText;
+                }
+                //    but if we have a rich text run instead, we need to append it correctly
+                //    TODO
+            } elseif ($child instanceof DOMElement) {
+                $this->processDomElementBody($sheet, $row, $column, $cellContent, $child);
+            }
+        }
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
+     */
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
+    {
+        // Validate
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an Invalid HTML file.');
+        }
+
+        // Create a new DOM object
+        $dom = new DOMDocument();
+
+        // Reload the HTML file into the DOM object
+        try {
+            $convert = $this->getSecurityScannerOrThrow()->scanFile($filename);
+            $convert = self::replaceNonAsciiIfNeeded($convert);
+            $loaded = ($convert === null) ? false : $dom->loadHTML($convert);
+        } catch (Throwable $e) {
+            $loaded = false;
+        }
+        if ($loaded === false) {
+            throw new Exception('Failed to load ' . $filename . ' as a DOM Document', 0, $e ?? null);
+        }
+        self::loadProperties($dom, $spreadsheet);
+
+        return $this->loadDocument($dom, $spreadsheet);
+    }
+
+    private static function loadProperties(DOMDocument $dom, Spreadsheet $spreadsheet): void
+    {
+        $properties = $spreadsheet->getProperties();
+        foreach ($dom->getElementsByTagName('meta') as $meta) {
+            $metaContent = (string) $meta->getAttribute('content');
+            if ($metaContent !== '') {
+                $metaName = (string) $meta->getAttribute('name');
+                switch ($metaName) {
+                    case 'author':
+                        $properties->setCreator($metaContent);
+
+                        break;
+                    case 'category':
+                        $properties->setCategory($metaContent);
+
+                        break;
+                    case 'company':
+                        $properties->setCompany($metaContent);
+
+                        break;
+                    case 'created':
+                        $properties->setCreated($metaContent);
+
+                        break;
+                    case 'description':
+                        $properties->setDescription($metaContent);
+
+                        break;
+                    case 'keywords':
+                        $properties->setKeywords($metaContent);
+
+                        break;
+                    case 'lastModifiedBy':
+                        $properties->setLastModifiedBy($metaContent);
+
+                        break;
+                    case 'manager':
+                        $properties->setManager($metaContent);
+
+                        break;
+                    case 'modified':
+                        $properties->setModified($metaContent);
+
+                        break;
+                    case 'subject':
+                        $properties->setSubject($metaContent);
+
+                        break;
+                    case 'title':
+                        $properties->setTitle($metaContent);
+
+                        break;
+                    case 'viewport':
+                        $properties->setViewport($metaContent);
+
+                        break;
+                    default:
+                        if (preg_match('/^custom[.](bool|date|float|int|string)[.](.+)$/', $metaName, $matches) === 1) {
+                            match ($matches[1]) {
+                                'bool' => $properties->setCustomProperty($matches[2], (bool) $metaContent, Properties::PROPERTY_TYPE_BOOLEAN),
+                                'float' => $properties->setCustomProperty($matches[2], (float) $metaContent, Properties::PROPERTY_TYPE_FLOAT),
+                                'int' => $properties->setCustomProperty($matches[2], (int) $metaContent, Properties::PROPERTY_TYPE_INTEGER),
+                                'date' => $properties->setCustomProperty($matches[2], $metaContent, Properties::PROPERTY_TYPE_DATE),
+                                // string
+                                default => $properties->setCustomProperty($matches[2], $metaContent, Properties::PROPERTY_TYPE_STRING),
+                            };
+                        }
+                }
+            }
+        }
+        if (!empty($dom->baseURI)) {
+            $properties->setHyperlinkBase($dom->baseURI);
+        }
+    }
+
+    private static function replaceNonAscii(array $matches): string
+    {
+        return '&#' . mb_ord($matches[0], 'UTF-8') . ';';
+    }
+
+    private static function replaceNonAsciiIfNeeded(string $convert): ?string
+    {
+        if (preg_match(self::STARTS_WITH_BOM, $convert) !== 1 && preg_match(self::DECLARES_CHARSET, $convert) !== 1) {
+            $lowend = "\u{80}";
+            $highend = "\u{10ffff}";
+            $regexp = "/[$lowend-$highend]/u";
+            /** @var callable $callback */
+            $callback = [self::class, 'replaceNonAscii'];
+            $convert = preg_replace_callback($regexp, $callback, $convert);
+        }
+
+        return $convert;
+    }
+
+    /**
+     * Spreadsheet from content.
+     */
+    public function loadFromString(string $content, ?Spreadsheet $spreadsheet = null): Spreadsheet
+    {
+        //    Create a new DOM object
+        $dom = new DOMDocument();
+
+        //    Reload the HTML file into the DOM object
+        try {
+            $convert = $this->getSecurityScannerOrThrow()->scan($content);
+            $convert = self::replaceNonAsciiIfNeeded($convert);
+            $loaded = ($convert === null) ? false : $dom->loadHTML($convert);
+        } catch (Throwable $e) {
+            $loaded = false;
+        }
+        if ($loaded === false) {
+            throw new Exception('Failed to load content as a DOM Document', 0, $e ?? null);
+        }
+        $spreadsheet = $spreadsheet ?? new Spreadsheet();
+        self::loadProperties($dom, $spreadsheet);
+
+        return $this->loadDocument($dom, $spreadsheet);
+    }
+
+    /**
+     * Loads PhpSpreadsheet from DOMDocument into PhpSpreadsheet instance.
+     */
+    private function loadDocument(DOMDocument $document, Spreadsheet $spreadsheet): Spreadsheet
+    {
+        while ($spreadsheet->getSheetCount() <= $this->sheetIndex) {
+            $spreadsheet->createSheet();
+        }
+        $spreadsheet->setActiveSheetIndex($this->sheetIndex);
+
+        // Discard white space
+        $document->preserveWhiteSpace = false;
+
+        $row = 0;
+        $column = 'A';
+        $content = '';
+        $this->rowspan = [];
+        $this->processDomElement($document, $spreadsheet->getActiveSheet(), $row, $column, $content);
+
+        // Return
+        return $spreadsheet;
+    }
+
+    /**
+     * Get sheet index.
+     */
+    public function getSheetIndex(): int
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index.
+     *
+     * @param int $sheetIndex Sheet index
+     *
+     * @return $this
+     */
+    public function setSheetIndex(int $sheetIndex): static
+    {
+        $this->sheetIndex = $sheetIndex;
+
+        return $this;
+    }
+
+    /**
+     * Apply inline css inline style.
+     *
+     * NOTES :
+     * Currently only intended for td & th element,
+     * and only takes 'background-color' and 'color'; property with HEX color
+     *
+     * TODO :
+     * - Implement to other propertie, such as border
+     */
+    private function applyInlineStyle(Worksheet &$sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (!isset($attributeArray['style'])) {
+            return;
+        }
+
+        if ($row <= 0 || $column === '') {
+            $cellStyle = new Style();
+        } elseif (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
+            $cellStyle = $sheet->getStyle($range);
+        } elseif (isset($attributeArray['rowspan'])) {
+            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
+            $cellStyle = $sheet->getStyle($range);
+        } elseif (isset($attributeArray['colspan'])) {
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $range = $column . $row . ':' . $columnTo . $row;
+            $cellStyle = $sheet->getStyle($range);
+        } else {
+            $cellStyle = $sheet->getStyle($column . $row);
+        }
+
+        // add color styles (background & text) from dom element,currently support : td & th, using ONLY inline css style with RGB color
+        $styles = explode(';', $attributeArray['style']);
+        foreach ($styles as $st) {
+            $value = explode(':', $st);
+            $styleName = isset($value[0]) ? trim($value[0]) : null;
+            $styleValue = isset($value[1]) ? trim($value[1]) : null;
+            $styleValueString = (string) $styleValue;
+
+            if (!$styleName) {
+                continue;
+            }
+
+            switch ($styleName) {
+                case 'background':
+                case 'background-color':
+                    $styleColor = $this->getStyleColor($styleValueString);
+
+                    if (!$styleColor) {
+                        continue 2;
+                    }
+
+                    $cellStyle->applyFromArray(['fill' => ['fillType' => Fill::FILL_SOLID, 'color' => ['rgb' => $styleColor]]]);
+
+                    break;
+                case 'color':
+                    $styleColor = $this->getStyleColor($styleValueString);
+
+                    if (!$styleColor) {
+                        continue 2;
+                    }
+
+                    $cellStyle->applyFromArray(['font' => ['color' => ['rgb' => $styleColor]]]);
+
+                    break;
+
+                case 'border':
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'allBorders');
+
+                    break;
+
+                case 'border-top':
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'top');
+
+                    break;
+
+                case 'border-bottom':
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'bottom');
+
+                    break;
+
+                case 'border-left':
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'left');
+
+                    break;
+
+                case 'border-right':
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'right');
+
+                    break;
+
+                case 'font-size':
+                    $cellStyle->getFont()->setSize(
+                        (float) $styleValue
+                    );
+
+                    break;
+
+                case 'font-weight':
+                    if ($styleValue === 'bold' || $styleValue >= 500) {
+                        $cellStyle->getFont()->setBold(true);
+                    }
+
+                    break;
+
+                case 'font-style':
+                    if ($styleValue === 'italic') {
+                        $cellStyle->getFont()->setItalic(true);
+                    }
+
+                    break;
+
+                case 'font-family':
+                    $cellStyle->getFont()->setName(str_replace('\'', '', $styleValueString));
+
+                    break;
+
+                case 'text-decoration':
+                    switch ($styleValue) {
+                        case 'underline':
+                            $cellStyle->getFont()->setUnderline(Font::UNDERLINE_SINGLE);
+
+                            break;
+                        case 'line-through':
+                            $cellStyle->getFont()->setStrikethrough(true);
+
+                            break;
+                    }
+
+                    break;
+
+                case 'text-align':
+                    $cellStyle->getAlignment()->setHorizontal($styleValueString);
+
+                    break;
+
+                case 'vertical-align':
+                    $cellStyle->getAlignment()->setVertical($styleValueString);
+
+                    break;
+
+                case 'width':
+                    if ($column !== '') {
+                        $sheet->getColumnDimension($column)->setWidth(
+                            (new CssDimension($styleValue ?? ''))->width()
+                        );
+                    }
+
+                    break;
+
+                case 'height':
+                    if ($row > 0) {
+                        $sheet->getRowDimension($row)->setRowHeight(
+                            (new CssDimension($styleValue ?? ''))->height()
+                        );
+                    }
+
+                    break;
+
+                case 'word-wrap':
+                    $cellStyle->getAlignment()->setWrapText(
+                        $styleValue === 'break-word'
+                    );
+
+                    break;
+
+                case 'text-indent':
+                    $cellStyle->getAlignment()->setIndent(
+                        (int) str_replace(['px'], '', $styleValueString)
+                    );
+
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Check if has #, so we can get clean hex.
+     */
+    public function getStyleColor(?string $value): string
+    {
+        $value = (string) $value;
+        if (str_starts_with($value, '#')) {
+            return substr($value, 1);
+        }
+
+        return HelperHtml::colourNameLookup($value);
+    }
+
+    private function insertImage(Worksheet $sheet, string $column, int $row, array $attributes): void
+    {
+        if (!isset($attributes['src'])) {
+            return;
+        }
+
+        $src = urldecode($attributes['src']);
+        $width = isset($attributes['width']) ? (float) $attributes['width'] : null;
+        $height = isset($attributes['height']) ? (float) $attributes['height'] : null;
+        $name = $attributes['alt'] ?? null;
+
+        $drawing = new Drawing();
+        $drawing->setPath($src);
+        $drawing->setWorksheet($sheet);
+        $drawing->setCoordinates($column . $row);
+        $drawing->setOffsetX(0);
+        $drawing->setOffsetY(10);
+        $drawing->setResizeProportional(true);
+
+        if ($name) {
+            $drawing->setName($name);
+        }
+
+        if ($width) {
+            $drawing->setWidth((int) $width);
+        }
+
+        if ($height) {
+            $drawing->setHeight((int) $height);
+        }
+
+        $sheet->getColumnDimension($column)->setWidth(
+            $drawing->getWidth() / 6
+        );
+
+        $sheet->getRowDimension($row)->setRowHeight(
+            $drawing->getHeight() * 0.9
+        );
+    }
+
+    private const BORDER_MAPPINGS = [
+        'dash-dot' => Border::BORDER_DASHDOT,
+        'dash-dot-dot' => Border::BORDER_DASHDOTDOT,
+        'dashed' => Border::BORDER_DASHED,
+        'dotted' => Border::BORDER_DOTTED,
+        'double' => Border::BORDER_DOUBLE,
+        'hair' => Border::BORDER_HAIR,
+        'medium' => Border::BORDER_MEDIUM,
+        'medium-dashed' => Border::BORDER_MEDIUMDASHED,
+        'medium-dash-dot' => Border::BORDER_MEDIUMDASHDOT,
+        'medium-dash-dot-dot' => Border::BORDER_MEDIUMDASHDOTDOT,
+        'none' => Border::BORDER_NONE,
+        'slant-dash-dot' => Border::BORDER_SLANTDASHDOT,
+        'solid' => Border::BORDER_THIN,
+        'thick' => Border::BORDER_THICK,
+    ];
+
+    public static function getBorderMappings(): array
+    {
+        return self::BORDER_MAPPINGS;
+    }
+
+    /**
+     * Map html border style to PhpSpreadsheet border style.
+     */
+    public function getBorderStyle(string $style): ?string
+    {
+        return self::BORDER_MAPPINGS[$style] ?? null;
+    }
+
+    private function setBorderStyle(Style $cellStyle, string $styleValue, string $type): void
+    {
+        if (trim($styleValue) === Border::BORDER_NONE) {
+            $borderStyle = Border::BORDER_NONE;
+            $color = null;
+        } else {
+            $borderArray = explode(' ', $styleValue);
+            $borderCount = count($borderArray);
+            if ($borderCount >= 3) {
+                $borderStyle = $borderArray[1];
+                $color = $borderArray[2];
+            } else {
+                $borderStyle = $borderArray[0];
+                $color = $borderArray[1] ?? null;
+            }
+        }
+
+        $cellStyle->applyFromArray([
+            'borders' => [
+                $type => [
+                    'borderStyle' => $this->getBorderStyle($borderStyle),
+                    'color' => ['rgb' => $this->getStyleColor($color)],
+                ],
+            ],
+        ]);
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        $info = [];
+        $spreadsheet = new Spreadsheet();
+        $this->loadIntoExisting($filename, $spreadsheet);
+        foreach ($spreadsheet->getAllSheets() as $sheet) {
+            $newEntry = ['worksheetName' => $sheet->getTitle()];
+            $newEntry['lastColumnLetter'] = $sheet->getHighestDataColumn();
+            $newEntry['lastColumnIndex'] = Coordinate::columnIndexFromString($sheet->getHighestDataColumn()) - 1;
+            $newEntry['totalRows'] = $sheet->getHighestDataRow();
+            $newEntry['totalColumns'] = $newEntry['lastColumnIndex'] + 1;
+            $info[] = $newEntry;
+        }
+        $spreadsheet->disconnectWorksheets();
+
+        return $info;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php
new file mode 100644
index 00000000..1fd12e56
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+interface IReadFilter
+{
+    /**
+     * Should this cell be read?
+     *
+     * @param string $columnAddress Column address (as a string value like "A", or "IV")
+     * @param int $row Row number
+     * @param string $worksheetName Optional worksheet name
+     */
+    public function readCell(string $columnAddress, int $row, string $worksheetName = ''): bool;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php
new file mode 100644
index 00000000..62c2103a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+interface IReader
+{
+    public const LOAD_WITH_CHARTS = 1;
+
+    public const READ_DATA_ONLY = 2;
+
+    public const SKIP_EMPTY_CELLS = 4;
+    public const IGNORE_EMPTY_CELLS = 4;
+
+    public const IGNORE_ROWS_WITH_NO_CELLS = 8;
+
+    public function __construct();
+
+    /**
+     * Can the current IReader read the file?
+     */
+    public function canRead(string $filename): bool;
+
+    /**
+     * Read data only?
+     *        If this is true, then the Reader will only read data values for cells, it will not read any formatting
+     *           or structural information (like merges).
+     *        If false (the default) it will read data and formatting.
+     */
+    public function getReadDataOnly(): bool;
+
+    /**
+     * Set read data only
+     *        Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting
+     *            or structural information (like merges).
+     *        Set to false (the default) to advise the Reader to read both data and formatting for cells.
+     *
+     * @return $this
+     */
+    public function setReadDataOnly(bool $readDataOnly): self;
+
+    /**
+     * Read empty cells?
+     *        If this is true (the default), then the Reader will read data values for all cells, irrespective of value.
+     *        If false it will not read data for cells containing a null value or an empty string.
+     */
+    public function getReadEmptyCells(): bool;
+
+    /**
+     * Set read empty cells
+     *        Set to true (the default) to advise the Reader read data values for all cells, irrespective of value.
+     *        Set to false to advise the Reader to ignore cells containing a null value or an empty string.
+     *
+     * @return $this
+     */
+    public function setReadEmptyCells(bool $readEmptyCells): self;
+
+    /**
+     * Read charts in workbook?
+     *      If this is true, then the Reader will include any charts that exist in the workbook.
+     *         Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+     *      If false (the default) it will ignore any charts defined in the workbook file.
+     */
+    public function getIncludeCharts(): bool;
+
+    /**
+     * Set read charts in workbook
+     *     Set to true, to advise the Reader to include any charts that exist in the workbook.
+     *         Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+     *     Set to false (the default) to discard charts.
+     *
+     * @return $this
+     */
+    public function setIncludeCharts(bool $includeCharts): self;
+
+    /**
+     * Get which sheets to load
+     * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
+     *        indicating that all worksheets in the workbook should be loaded.
+     */
+    public function getLoadSheetsOnly(): ?array;
+
+    /**
+     * Set which sheets to load.
+     *
+     * @param null|array|string $value This should be either an array of worksheet names to be loaded,
+     *          or a string containing a single worksheet name. If NULL, then it tells the Reader to
+     *          read all worksheets in the workbook
+     *
+     * @return $this
+     */
+    public function setLoadSheetsOnly(string|array|null $value): self;
+
+    /**
+     * Set all sheets to load
+     *        Tells the Reader to load all worksheets from the workbook.
+     *
+     * @return $this
+     */
+    public function setLoadAllSheets(): self;
+
+    /**
+     * Read filter.
+     */
+    public function getReadFilter(): IReadFilter;
+
+    /**
+     * Set read filter.
+     *
+     * @return $this
+     */
+    public function setReadFilter(IReadFilter $readFilter): self;
+
+    /**
+     * Loads PhpSpreadsheet from file.
+     *
+     * @param string $filename The name of the file to load
+     * @param int $flags Flags that can change the behaviour of the Writer:
+     *            self::LOAD_WITH_CHARTS    Load any charts that are defined (if the Reader supports Charts)
+     *            self::READ_DATA_ONLY      Read only data, not style or structure information, from the file
+     *            self::SKIP_EMPTY_CELLS    Don't read empty cells (cells that contain a null value,
+     *                                      empty string, or a string containing only whitespace characters)
+     */
+    public function load(string $filename, int $flags = 0): Spreadsheet;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
new file mode 100644
index 00000000..6f130271
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
@@ -0,0 +1,823 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use DOMAttr;
+use DOMDocument;
+use DOMElement;
+use DOMNode;
+use DOMText;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as HelperDimension;
+use PhpOffice\PhpSpreadsheet\Reader\Ods\AutoFilter;
+use PhpOffice\PhpSpreadsheet\Reader\Ods\DefinedNames;
+use PhpOffice\PhpSpreadsheet\Reader\Ods\FormulaTranslator;
+use PhpOffice\PhpSpreadsheet\Reader\Ods\PageSettings;
+use PhpOffice\PhpSpreadsheet\Reader\Ods\Properties as DocumentProperties;
+use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Throwable;
+use XMLReader;
+use ZipArchive;
+
+class Ods extends BaseReader
+{
+    const INITIAL_FILE = 'content.xml';
+
+    /**
+     * Create a new Ods Reader instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->securityScanner = XmlScanner::getInstance($this);
+    }
+
+    /**
+     * Can the current IReader read the file?
+     */
+    public function canRead(string $filename): bool
+    {
+        $mimeType = 'UNKNOWN';
+
+        // Load file
+
+        if (File::testFileNoThrow($filename, '')) {
+            $zip = new ZipArchive();
+            if ($zip->open($filename) === true) {
+                // check if it is an OOXML archive
+                $stat = $zip->statName('mimetype');
+                if (!empty($stat) && ($stat['size'] <= 255)) {
+                    $mimeType = $zip->getFromName($stat['name']);
+                } elseif ($zip->statName('META-INF/manifest.xml')) {
+                    $xml = simplexml_load_string(
+                        $this->getSecurityScannerOrThrow()->scan($zip->getFromName('META-INF/manifest.xml')),
+                        'SimpleXMLElement',
+                        Settings::getLibXmlLoaderOptions()
+                    );
+                    if ($xml !== false) {
+                        $namespacesContent = $xml->getNamespaces(true);
+                        if (isset($namespacesContent['manifest'])) {
+                            $manifest = $xml->children($namespacesContent['manifest']);
+                            foreach ($manifest as $manifestDataSet) {
+                                $manifestAttributes = $manifestDataSet->attributes($namespacesContent['manifest']);
+                                if ($manifestAttributes && $manifestAttributes->{'full-path'} == '/') {
+                                    $mimeType = (string) $manifestAttributes->{'media-type'};
+
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                $zip->close();
+            }
+        }
+
+        return $mimeType === 'application/vnd.oasis.opendocument.spreadsheet';
+    }
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a PhpSpreadsheet object.
+     *
+     * @return string[]
+     */
+    public function listWorksheetNames(string $filename): array
+    {
+        File::assertFile($filename, self::INITIAL_FILE);
+
+        $worksheetNames = [];
+
+        $xml = new XMLReader();
+        $xml->xml(
+            $this->getSecurityScannerOrThrow()->scanFile('zip://' . realpath($filename) . '#' . self::INITIAL_FILE),
+            null,
+            Settings::getLibXmlLoaderOptions()
+        );
+        $xml->setParserProperty(2, true);
+
+        // Step into the first level of content of the XML
+        $xml->read();
+        while ($xml->read()) {
+            // Quickly jump through to the office:body node
+            while (self::getXmlName($xml) !== 'office:body') {
+                if ($xml->isEmptyElement) {
+                    $xml->read();
+                } else {
+                    $xml->next();
+                }
+            }
+            // Now read each node until we find our first table:table node
+            while ($xml->read()) {
+                $xmlName = self::getXmlName($xml);
+                if ($xmlName == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
+                    // Loop through each table:table node reading the table:name attribute for each worksheet name
+                    do {
+                        $worksheetName = $xml->getAttribute('table:name');
+                        if (!empty($worksheetName)) {
+                            $worksheetNames[] = $worksheetName;
+                        }
+                        $xml->next();
+                    } while (self::getXmlName($xml) == 'table:table' && $xml->nodeType == XMLReader::ELEMENT);
+                }
+            }
+        }
+
+        return $worksheetNames;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        File::assertFile($filename, self::INITIAL_FILE);
+
+        $worksheetInfo = [];
+
+        $xml = new XMLReader();
+        $xml->xml(
+            $this->getSecurityScannerOrThrow()->scanFile('zip://' . realpath($filename) . '#' . self::INITIAL_FILE),
+            null,
+            Settings::getLibXmlLoaderOptions()
+        );
+        $xml->setParserProperty(2, true);
+
+        // Step into the first level of content of the XML
+        $xml->read();
+        while ($xml->read()) {
+            // Quickly jump through to the office:body node
+            while (self::getXmlName($xml) !== 'office:body') {
+                if ($xml->isEmptyElement) {
+                    $xml->read();
+                } else {
+                    $xml->next();
+                }
+            }
+            // Now read each node until we find our first table:table node
+            while ($xml->read()) {
+                if (self::getXmlName($xml) == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
+                    $worksheetNames[] = $xml->getAttribute('table:name');
+
+                    $tmpInfo = [
+                        'worksheetName' => $xml->getAttribute('table:name'),
+                        'lastColumnLetter' => 'A',
+                        'lastColumnIndex' => 0,
+                        'totalRows' => 0,
+                        'totalColumns' => 0,
+                    ];
+
+                    // Loop through each child node of the table:table element reading
+                    $currCells = 0;
+                    do {
+                        $xml->read();
+                        if (self::getXmlName($xml) == 'table:table-row' && $xml->nodeType == XMLReader::ELEMENT) {
+                            $rowspan = $xml->getAttribute('table:number-rows-repeated');
+                            $rowspan = empty($rowspan) ? 1 : $rowspan;
+                            $tmpInfo['totalRows'] += $rowspan;
+                            $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
+                            $currCells = 0;
+                            // Step into the row
+                            $xml->read();
+                            do {
+                                $doread = true;
+                                if (self::getXmlName($xml) == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+                                    if (!$xml->isEmptyElement) {
+                                        ++$currCells;
+                                        $xml->next();
+                                        $doread = false;
+                                    }
+                                } elseif (self::getXmlName($xml) == 'table:covered-table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+                                    $mergeSize = $xml->getAttribute('table:number-columns-repeated');
+                                    $currCells += (int) $mergeSize;
+                                }
+                                if ($doread) {
+                                    $xml->read();
+                                }
+                            } while (self::getXmlName($xml) != 'table:table-row');
+                        }
+                    } while (self::getXmlName($xml) != 'table:table');
+
+                    $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
+                    $tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
+                    $tmpInfo['lastColumnLetter'] = Coordinate::stringFromColumnIndex($tmpInfo['lastColumnIndex'] + 1);
+                    $worksheetInfo[] = $tmpInfo;
+                }
+            }
+        }
+
+        return $worksheetInfo;
+    }
+
+    /**
+     * Counteract Phpstan caching.
+     *
+     * @phpstan-impure
+     */
+    private static function getXmlName(XMLReader $xml): string
+    {
+        return $xml->name;
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
+
+        // Load into this instance
+        return $this->loadIntoExisting($filename, $spreadsheet);
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
+     */
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
+    {
+        File::assertFile($filename, self::INITIAL_FILE);
+
+        $zip = new ZipArchive();
+        $zip->open($filename);
+
+        // Meta
+
+        $xml = @simplexml_load_string(
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('meta.xml')),
+            'SimpleXMLElement',
+            Settings::getLibXmlLoaderOptions()
+        );
+        if ($xml === false) {
+            throw new Exception('Unable to read data from {$pFilename}');
+        }
+
+        $namespacesMeta = $xml->getNamespaces(true);
+
+        (new DocumentProperties($spreadsheet))->load($xml, $namespacesMeta);
+
+        // Styles
+
+        $dom = new DOMDocument('1.01', 'UTF-8');
+        $dom->loadXML(
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('styles.xml')),
+            Settings::getLibXmlLoaderOptions()
+        );
+
+        $pageSettings = new PageSettings($dom);
+
+        // Main Content
+
+        $dom = new DOMDocument('1.01', 'UTF-8');
+        $dom->loadXML(
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName(self::INITIAL_FILE)),
+            Settings::getLibXmlLoaderOptions()
+        );
+
+        $officeNs = (string) $dom->lookupNamespaceUri('office');
+        $tableNs = (string) $dom->lookupNamespaceUri('table');
+        $textNs = (string) $dom->lookupNamespaceUri('text');
+        $xlinkNs = (string) $dom->lookupNamespaceUri('xlink');
+        $styleNs = (string) $dom->lookupNamespaceUri('style');
+
+        $pageSettings->readStyleCrossReferences($dom);
+
+        $autoFilterReader = new AutoFilter($spreadsheet, $tableNs);
+        $definedNameReader = new DefinedNames($spreadsheet, $tableNs);
+        $columnWidths = [];
+        $automaticStyle0 = $dom->getElementsByTagNameNS($officeNs, 'automatic-styles')->item(0);
+        $automaticStyles = ($automaticStyle0 === null) ? [] : $automaticStyle0->getElementsByTagNameNS($styleNs, 'style');
+        foreach ($automaticStyles as $automaticStyle) {
+            $styleName = $automaticStyle->getAttributeNS($styleNs, 'name');
+            $styleFamily = $automaticStyle->getAttributeNS($styleNs, 'family');
+            if ($styleFamily === 'table-column') {
+                $tcprops = $automaticStyle->getElementsByTagNameNS($styleNs, 'table-column-properties');
+                if ($tcprops !== null) {
+                    $tcprop = $tcprops->item(0);
+                    if ($tcprop !== null) {
+                        $columnWidth = $tcprop->getAttributeNs($styleNs, 'column-width');
+                        $columnWidths[$styleName] = $columnWidth;
+                    }
+                }
+            }
+        }
+
+        // Content
+        $item0 = $dom->getElementsByTagNameNS($officeNs, 'body')->item(0);
+        $spreadsheets = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($officeNs, 'spreadsheet');
+
+        foreach ($spreadsheets as $workbookData) {
+            /** @var DOMElement $workbookData */
+            $tables = $workbookData->getElementsByTagNameNS($tableNs, 'table');
+
+            $worksheetID = 0;
+            foreach ($tables as $worksheetDataSet) {
+                /** @var DOMElement $worksheetDataSet */
+                $worksheetName = $worksheetDataSet->getAttributeNS($tableNs, 'name');
+
+                // Check loadSheetsOnly
+                if (
+                    $this->loadSheetsOnly !== null
+                    && $worksheetName
+                    && !in_array($worksheetName, $this->loadSheetsOnly)
+                ) {
+                    continue;
+                }
+
+                $worksheetStyleName = $worksheetDataSet->getAttributeNS($tableNs, 'style-name');
+
+                // Create sheet
+                $spreadsheet->createSheet();
+                $spreadsheet->setActiveSheetIndex($worksheetID);
+
+                if ($worksheetName || is_numeric($worksheetName)) {
+                    // Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
+                    // formula cells... during the load, all formulae should be correct, and we're simply
+                    // bringing the worksheet name in line with the formula, not the reverse
+                    $spreadsheet->getActiveSheet()->setTitle((string) $worksheetName, false, false);
+                }
+
+                // Go through every child of table element
+                $rowID = 1;
+                $tableColumnIndex = 1;
+                foreach ($worksheetDataSet->childNodes as $childNode) {
+                    /** @var DOMElement $childNode */
+
+                    // Filter elements which are not under the "table" ns
+                    if ($childNode->namespaceURI != $tableNs) {
+                        continue;
+                    }
+
+                    $key = $childNode->nodeName;
+
+                    // Remove ns from node name
+                    if (str_contains($key, ':')) {
+                        $keyChunks = explode(':', $key);
+                        $key = array_pop($keyChunks);
+                    }
+
+                    switch ($key) {
+                        case 'table-header-rows':
+                            /// TODO :: Figure this out. This is only a partial implementation I guess.
+                            //          ($rowData it's not used at all and I'm not sure that PHPExcel
+                            //          has an API for this)
+
+//                            foreach ($rowData as $keyRowData => $cellData) {
+//                                $rowData = $cellData;
+//                                break;
+//                            }
+                            break;
+                        case 'table-column':
+                            if ($childNode->hasAttributeNS($tableNs, 'number-columns-repeated')) {
+                                $rowRepeats = (int) $childNode->getAttributeNS($tableNs, 'number-columns-repeated');
+                            } else {
+                                $rowRepeats = 1;
+                            }
+                            $tableStyleName = $childNode->getAttributeNS($tableNs, 'style-name');
+                            if (isset($columnWidths[$tableStyleName])) {
+                                $columnWidth = new HelperDimension($columnWidths[$tableStyleName]);
+                                $tableColumnString = Coordinate::stringFromColumnIndex($tableColumnIndex);
+                                for ($rowRepeats2 = $rowRepeats; $rowRepeats2 > 0; --$rowRepeats2) {
+                                    $spreadsheet->getActiveSheet()
+                                        ->getColumnDimension($tableColumnString)
+                                        ->setWidth($columnWidth->toUnit('cm'), 'cm');
+                                    ++$tableColumnString;
+                                }
+                            }
+                            $tableColumnIndex += $rowRepeats;
+
+                            break;
+                        case 'table-row':
+                            if ($childNode->hasAttributeNS($tableNs, 'number-rows-repeated')) {
+                                $rowRepeats = (int) $childNode->getAttributeNS($tableNs, 'number-rows-repeated');
+                            } else {
+                                $rowRepeats = 1;
+                            }
+
+                            $columnID = 'A';
+                            /** @var DOMElement|DOMText $cellData */
+                            foreach ($childNode->childNodes as $cellData) {
+                                if ($cellData instanceof DOMText) {
+                                    continue; // should just be whitespace
+                                }
+                                if ($this->getReadFilter() !== null) {
+                                    if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+                                        if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
+                                            $colRepeats = (int) $cellData->getAttributeNS($tableNs, 'number-columns-repeated');
+                                        } else {
+                                            $colRepeats = 1;
+                                        }
+
+                                        for ($i = 0; $i < $colRepeats; ++$i) {
+                                            ++$columnID;
+                                        }
+
+                                        continue;
+                                    }
+                                }
+
+                                // Initialize variables
+                                $formatting = $hyperlink = null;
+                                $hasCalculatedValue = false;
+                                $cellDataFormula = '';
+
+                                if ($cellData->hasAttributeNS($tableNs, 'formula')) {
+                                    $cellDataFormula = $cellData->getAttributeNS($tableNs, 'formula');
+                                    $hasCalculatedValue = true;
+                                }
+
+                                // Annotations
+                                $annotation = $cellData->getElementsByTagNameNS($officeNs, 'annotation');
+
+                                if ($annotation->length > 0 && $annotation->item(0) !== null) {
+                                    $textNode = $annotation->item(0)->getElementsByTagNameNS($textNs, 'p');
+                                    $textNodeLength = $textNode->length;
+                                    $newLineOwed = false;
+                                    for ($textNodeIndex = 0; $textNodeIndex < $textNodeLength; ++$textNodeIndex) {
+                                        $textNodeItem = $textNode->item($textNodeIndex);
+                                        if ($textNodeItem !== null) {
+                                            $text = $this->scanElementForText($textNodeItem);
+                                            if ($newLineOwed) {
+                                                $spreadsheet->getActiveSheet()
+                                                    ->getComment($columnID . $rowID)
+                                                    ->getText()
+                                                    ->createText("\n");
+                                            }
+                                            $newLineOwed = true;
+
+                                            $spreadsheet->getActiveSheet()
+                                                ->getComment($columnID . $rowID)
+                                                ->getText()
+                                                ->createText($this->parseRichText($text));
+                                        }
+                                    }
+                                }
+
+                                // Content
+
+                                /** @var DOMElement[] $paragraphs */
+                                $paragraphs = [];
+
+                                foreach ($cellData->childNodes as $item) {
+                                    /** @var DOMElement $item */
+
+                                    // Filter text:p elements
+                                    if ($item->nodeName == 'text:p') {
+                                        $paragraphs[] = $item;
+                                    }
+                                }
+
+                                if (count($paragraphs) > 0) {
+                                    // Consolidate if there are multiple p records (maybe with spans as well)
+                                    $dataArray = [];
+
+                                    // Text can have multiple text:p and within those, multiple text:span.
+                                    // text:p newlines, but text:span does not.
+                                    // Also, here we assume there is no text data is span fields are specified, since
+                                    // we have no way of knowing proper positioning anyway.
+
+                                    foreach ($paragraphs as $pData) {
+                                        $dataArray[] = $this->scanElementForText($pData);
+                                    }
+                                    $allCellDataText = implode("\n", $dataArray);
+
+                                    $type = $cellData->getAttributeNS($officeNs, 'value-type');
+
+                                    switch ($type) {
+                                        case 'string':
+                                            $type = DataType::TYPE_STRING;
+                                            $dataValue = $allCellDataText;
+
+                                            foreach ($paragraphs as $paragraph) {
+                                                $link = $paragraph->getElementsByTagNameNS($textNs, 'a');
+                                                if ($link->length > 0 && $link->item(0) !== null) {
+                                                    $hyperlink = $link->item(0)->getAttributeNS($xlinkNs, 'href');
+                                                }
+                                            }
+
+                                            break;
+                                        case 'boolean':
+                                            $type = DataType::TYPE_BOOL;
+                                            $dataValue = ($cellData->getAttributeNS($officeNs, 'boolean-value') === 'true') ? true : false;
+
+                                            break;
+                                        case 'percentage':
+                                            $type = DataType::TYPE_NUMERIC;
+                                            $dataValue = (float) $cellData->getAttributeNS($officeNs, 'value');
+
+                                            // percentage should always be float
+                                            //if (floor($dataValue) == $dataValue) {
+                                            //    $dataValue = (int) $dataValue;
+                                            //}
+                                            $formatting = NumberFormat::FORMAT_PERCENTAGE_00;
+
+                                            break;
+                                        case 'currency':
+                                            $type = DataType::TYPE_NUMERIC;
+                                            $dataValue = (float) $cellData->getAttributeNS($officeNs, 'value');
+
+                                            if (floor($dataValue) == $dataValue) {
+                                                $dataValue = (int) $dataValue;
+                                            }
+                                            $formatting = NumberFormat::FORMAT_CURRENCY_USD_INTEGER;
+
+                                            break;
+                                        case 'float':
+                                            $type = DataType::TYPE_NUMERIC;
+                                            $dataValue = (float) $cellData->getAttributeNS($officeNs, 'value');
+
+                                            if (floor($dataValue) == $dataValue) {
+                                                if ($dataValue == (int) $dataValue) {
+                                                    $dataValue = (int) $dataValue;
+                                                }
+                                            }
+
+                                            break;
+                                        case 'date':
+                                            $type = DataType::TYPE_NUMERIC;
+                                            $value = $cellData->getAttributeNS($officeNs, 'date-value');
+                                            $dataValue = Date::convertIsoDate($value);
+
+                                            if ($dataValue != floor($dataValue)) {
+                                                $formatting = NumberFormat::FORMAT_DATE_XLSX15
+                                                    . ' '
+                                                    . NumberFormat::FORMAT_DATE_TIME4;
+                                            } else {
+                                                $formatting = NumberFormat::FORMAT_DATE_XLSX15;
+                                            }
+
+                                            break;
+                                        case 'time':
+                                            $type = DataType::TYPE_NUMERIC;
+
+                                            $timeValue = $cellData->getAttributeNS($officeNs, 'time-value');
+
+                                            $dataValue = Date::PHPToExcel(
+                                                strtotime(
+                                                    '01-01-1970 ' . implode(':', sscanf($timeValue, 'PT%dH%dM%dS') ?? [])
+                                                )
+                                            );
+                                            $formatting = NumberFormat::FORMAT_DATE_TIME4;
+
+                                            break;
+                                        default:
+                                            $dataValue = null;
+                                    }
+                                } else {
+                                    $type = DataType::TYPE_NULL;
+                                    $dataValue = null;
+                                }
+
+                                if ($hasCalculatedValue) {
+                                    $type = DataType::TYPE_FORMULA;
+                                    $cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=') + 1);
+                                    $cellDataFormula = FormulaTranslator::convertToExcelFormulaValue($cellDataFormula);
+                                }
+
+                                if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
+                                    $colRepeats = (int) $cellData->getAttributeNS($tableNs, 'number-columns-repeated');
+                                } else {
+                                    $colRepeats = 1;
+                                }
+
+                                if ($type !== null) {
+                                    for ($i = 0; $i < $colRepeats; ++$i) {
+                                        if ($i > 0) {
+                                            ++$columnID;
+                                        }
+
+                                        if ($type !== DataType::TYPE_NULL) {
+                                            for ($rowAdjust = 0; $rowAdjust < $rowRepeats; ++$rowAdjust) {
+                                                $rID = $rowID + $rowAdjust;
+
+                                                $cell = $spreadsheet->getActiveSheet()
+                                                    ->getCell($columnID . $rID);
+
+                                                // Set value
+                                                if ($hasCalculatedValue) {
+                                                    $cell->setValueExplicit($cellDataFormula, $type);
+                                                } else {
+                                                    $cell->setValueExplicit($dataValue, $type);
+                                                }
+
+                                                if ($hasCalculatedValue) {
+                                                    $cell->setCalculatedValue($dataValue, $type === DataType::TYPE_NUMERIC);
+                                                }
+
+                                                // Set other properties
+                                                if ($formatting !== null) {
+                                                    $spreadsheet->getActiveSheet()
+                                                        ->getStyle($columnID . $rID)
+                                                        ->getNumberFormat()
+                                                        ->setFormatCode($formatting);
+                                                } else {
+                                                    $spreadsheet->getActiveSheet()
+                                                        ->getStyle($columnID . $rID)
+                                                        ->getNumberFormat()
+                                                        ->setFormatCode(NumberFormat::FORMAT_GENERAL);
+                                                }
+
+                                                if ($hyperlink !== null) {
+                                                    if ($hyperlink[0] === '#') {
+                                                        $hyperlink = 'sheet://' . substr($hyperlink, 1);
+                                                    }
+                                                    $cell->getHyperlink()
+                                                        ->setUrl($hyperlink);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                // Merged cells
+                                $this->processMergedCells($cellData, $tableNs, $type, $columnID, $rowID, $spreadsheet);
+
+                                ++$columnID;
+                            }
+                            $rowID += $rowRepeats;
+
+                            break;
+                    }
+                }
+                $pageSettings->setVisibilityForWorksheet($spreadsheet->getActiveSheet(), $worksheetStyleName);
+                $pageSettings->setPrintSettingsForWorksheet($spreadsheet->getActiveSheet(), $worksheetStyleName);
+                ++$worksheetID;
+            }
+
+            $autoFilterReader->read($workbookData);
+            $definedNameReader->read($workbookData);
+        }
+        $spreadsheet->setActiveSheetIndex(0);
+
+        if ($zip->locateName('settings.xml') !== false) {
+            $this->processSettings($zip, $spreadsheet);
+        }
+
+        // Return
+        return $spreadsheet;
+    }
+
+    private function processSettings(ZipArchive $zip, Spreadsheet $spreadsheet): void
+    {
+        $dom = new DOMDocument('1.01', 'UTF-8');
+        $dom->loadXML(
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('settings.xml')),
+            Settings::getLibXmlLoaderOptions()
+        );
+        //$xlinkNs = $dom->lookupNamespaceUri('xlink');
+        $configNs = (string) $dom->lookupNamespaceUri('config');
+        //$oooNs = $dom->lookupNamespaceUri('ooo');
+        $officeNs = (string) $dom->lookupNamespaceUri('office');
+        $settings = $dom->getElementsByTagNameNS($officeNs, 'settings')
+            ->item(0);
+        if ($settings !== null) {
+            $this->lookForActiveSheet($settings, $spreadsheet, $configNs);
+            $this->lookForSelectedCells($settings, $spreadsheet, $configNs);
+        }
+    }
+
+    private function lookForActiveSheet(DOMElement $settings, Spreadsheet $spreadsheet, string $configNs): void
+    {
+        /** @var DOMElement $t */
+        foreach ($settings->getElementsByTagNameNS($configNs, 'config-item') as $t) {
+            if ($t->getAttributeNs($configNs, 'name') === 'ActiveTable') {
+                try {
+                    $spreadsheet->setActiveSheetIndexByName($t->nodeValue ?? '');
+                } catch (Throwable) {
+                    // do nothing
+                }
+
+                break;
+            }
+        }
+    }
+
+    private function lookForSelectedCells(DOMElement $settings, Spreadsheet $spreadsheet, string $configNs): void
+    {
+        /** @var DOMElement $t */
+        foreach ($settings->getElementsByTagNameNS($configNs, 'config-item-map-named') as $t) {
+            if ($t->getAttributeNs($configNs, 'name') === 'Tables') {
+                foreach ($t->getElementsByTagNameNS($configNs, 'config-item-map-entry') as $ws) {
+                    $setRow = $setCol = '';
+                    $wsname = $ws->getAttributeNs($configNs, 'name');
+                    foreach ($ws->getElementsByTagNameNS($configNs, 'config-item') as $configItem) {
+                        $attrName = $configItem->getAttributeNs($configNs, 'name');
+                        if ($attrName === 'CursorPositionX') {
+                            $setCol = $configItem->nodeValue;
+                        }
+                        if ($attrName === 'CursorPositionY') {
+                            $setRow = $configItem->nodeValue;
+                        }
+                    }
+                    $this->setSelected($spreadsheet, $wsname, "$setCol", "$setRow");
+                }
+
+                break;
+            }
+        }
+    }
+
+    private function setSelected(Spreadsheet $spreadsheet, string $wsname, string $setCol, string $setRow): void
+    {
+        if (is_numeric($setCol) && is_numeric($setRow)) {
+            $sheet = $spreadsheet->getSheetByName($wsname);
+            if ($sheet !== null) {
+                $sheet->setSelectedCells([(int) $setCol + 1, (int) $setRow + 1]);
+            }
+        }
+    }
+
+    /**
+     * Recursively scan element.
+     */
+    protected function scanElementForText(DOMNode $element): string
+    {
+        $str = '';
+        foreach ($element->childNodes as $child) {
+            /** @var DOMNode $child */
+            if ($child->nodeType == XML_TEXT_NODE) {
+                $str .= $child->nodeValue;
+            } elseif ($child->nodeType == XML_ELEMENT_NODE && $child->nodeName == 'text:line-break') {
+                $str .= "\n";
+            } elseif ($child->nodeType == XML_ELEMENT_NODE && $child->nodeName == 'text:s') {
+                // It's a space
+
+                // Multiple spaces?
+                $attributes = $child->attributes;
+                /** @var ?DOMAttr $cAttr */
+                $cAttr = ($attributes === null) ? null : $attributes->getNamedItem('c');
+                $multiplier = self::getMultiplier($cAttr);
+                $str .= str_repeat(' ', $multiplier);
+            }
+
+            if ($child->hasChildNodes()) {
+                $str .= $this->scanElementForText($child);
+            }
+        }
+
+        return $str;
+    }
+
+    private static function getMultiplier(?DOMAttr $cAttr): int
+    {
+        if ($cAttr) {
+            $multiplier = (int) $cAttr->nodeValue;
+        } else {
+            $multiplier = 1;
+        }
+
+        return $multiplier;
+    }
+
+    private function parseRichText(string $is): RichText
+    {
+        $value = new RichText();
+        $value->createText($is);
+
+        return $value;
+    }
+
+    private function processMergedCells(
+        DOMElement $cellData,
+        string $tableNs,
+        string $type,
+        string $columnID,
+        int $rowID,
+        Spreadsheet $spreadsheet
+    ): void {
+        if (
+            $cellData->hasAttributeNS($tableNs, 'number-columns-spanned')
+            || $cellData->hasAttributeNS($tableNs, 'number-rows-spanned')
+        ) {
+            if (($type !== DataType::TYPE_NULL) || ($this->readDataOnly === false)) {
+                $columnTo = $columnID;
+
+                if ($cellData->hasAttributeNS($tableNs, 'number-columns-spanned')) {
+                    $columnIndex = Coordinate::columnIndexFromString($columnID);
+                    $columnIndex += (int) $cellData->getAttributeNS($tableNs, 'number-columns-spanned');
+                    $columnIndex -= 2;
+
+                    $columnTo = Coordinate::stringFromColumnIndex($columnIndex + 1);
+                }
+
+                $rowTo = $rowID;
+
+                if ($cellData->hasAttributeNS($tableNs, 'number-rows-spanned')) {
+                    $rowTo = $rowTo + (int) $cellData->getAttributeNS($tableNs, 'number-rows-spanned') - 1;
+                }
+
+                $cellRange = $columnID . $rowID . ':' . $columnTo . $rowTo;
+                $spreadsheet->getActiveSheet()->mergeCells($cellRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php
new file mode 100644
index 00000000..1f5f975d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMElement;
+use DOMNode;
+
+class AutoFilter extends BaseLoader
+{
+    public function read(DOMElement $workbookData): void
+    {
+        $this->readAutoFilters($workbookData);
+    }
+
+    protected function readAutoFilters(DOMElement $workbookData): void
+    {
+        $databases = $workbookData->getElementsByTagNameNS($this->tableNs, 'database-ranges');
+
+        foreach ($databases as $autofilters) {
+            foreach ($autofilters->childNodes as $autofilter) {
+                $autofilterRange = $this->getAttributeValue($autofilter, 'target-range-address');
+                if ($autofilterRange !== null) {
+                    $baseAddress = FormulaTranslator::convertToExcelAddressValue($autofilterRange);
+                    $this->spreadsheet->getActiveSheet()->setAutoFilter($baseAddress);
+                }
+            }
+        }
+    }
+
+    protected function getAttributeValue(?DOMNode $node, string $attributeName): ?string
+    {
+        if ($node !== null && $node->attributes !== null) {
+            $attribute = $node->attributes->getNamedItemNS(
+                $this->tableNs,
+                $attributeName
+            );
+
+            if ($attribute !== null) {
+                return $attribute->nodeValue;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php
new file mode 100644
index 00000000..c280c4ec
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMElement;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+abstract class BaseLoader
+{
+    protected Spreadsheet $spreadsheet;
+
+    protected string $tableNs;
+
+    public function __construct(Spreadsheet $spreadsheet, string $tableNs)
+    {
+        $this->spreadsheet = $spreadsheet;
+        $this->tableNs = $tableNs;
+    }
+
+    abstract public function read(DOMElement $workbookData): void;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php
new file mode 100644
index 00000000..a99e3ea7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMElement;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class DefinedNames extends BaseLoader
+{
+    public function read(DOMElement $workbookData): void
+    {
+        $this->readDefinedRanges($workbookData);
+        $this->readDefinedExpressions($workbookData);
+    }
+
+    /**
+     * Read any Named Ranges that are defined in this spreadsheet.
+     */
+    protected function readDefinedRanges(DOMElement $workbookData): void
+    {
+        $namedRanges = $workbookData->getElementsByTagNameNS($this->tableNs, 'named-range');
+        foreach ($namedRanges as $definedNameElement) {
+            $definedName = $definedNameElement->getAttributeNS($this->tableNs, 'name');
+            $baseAddress = $definedNameElement->getAttributeNS($this->tableNs, 'base-cell-address');
+            $range = $definedNameElement->getAttributeNS($this->tableNs, 'cell-range-address');
+
+            /** @var non-empty-string $baseAddress */
+            $baseAddress = FormulaTranslator::convertToExcelAddressValue($baseAddress);
+            $range = FormulaTranslator::convertToExcelAddressValue($range);
+
+            $this->addDefinedName($baseAddress, $definedName, $range);
+        }
+    }
+
+    /**
+     * Read any Named Formulae that are defined in this spreadsheet.
+     */
+    protected function readDefinedExpressions(DOMElement $workbookData): void
+    {
+        $namedExpressions = $workbookData->getElementsByTagNameNS($this->tableNs, 'named-expression');
+        foreach ($namedExpressions as $definedNameElement) {
+            $definedName = $definedNameElement->getAttributeNS($this->tableNs, 'name');
+            $baseAddress = $definedNameElement->getAttributeNS($this->tableNs, 'base-cell-address');
+            $expression = $definedNameElement->getAttributeNS($this->tableNs, 'expression');
+
+            /** @var non-empty-string $baseAddress */
+            $baseAddress = FormulaTranslator::convertToExcelAddressValue($baseAddress);
+            $expression = substr($expression, strpos($expression, ':=') + 1);
+            $expression = FormulaTranslator::convertToExcelFormulaValue($expression);
+
+            $this->addDefinedName($baseAddress, $definedName, $expression);
+        }
+    }
+
+    /**
+     * Assess scope and store the Defined Name.
+     *
+     * @param non-empty-string $baseAddress
+     */
+    private function addDefinedName(string $baseAddress, string $definedName, string $value): void
+    {
+        [$sheetReference] = Worksheet::extractSheetTitle($baseAddress, true);
+        $worksheet = $this->spreadsheet->getSheetByName($sheetReference);
+        // Worksheet might still be null if we're only loading selected sheets rather than the full spreadsheet
+        if ($worksheet !== null) {
+            $this->spreadsheet->addDefinedName(DefinedName::createInstance((string) $definedName, $worksheet, $value));
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php
new file mode 100644
index 00000000..27862d7a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+
+class FormulaTranslator
+{
+    public static function convertToExcelAddressValue(string $openOfficeAddress): string
+    {
+        $excelAddress = $openOfficeAddress;
+
+        // Cell range 3-d reference
+        // As we don't support 3-d ranges, we're just going to take a quick and dirty approach
+        //  and assume that the second worksheet reference is the same as the first
+        $excelAddress = (string) preg_replace(
+            [
+                '/\$?([^\.]+)\.([^\.]+):\$?([^\.]+)\.([^\.]+)/miu',
+                '/\$?([^\.]+)\.([^\.]+):\.([^\.]+)/miu', // Cell range reference in another sheet
+                '/\$?([^\.]+)\.([^\.]+)/miu', // Cell reference in another sheet
+                '/\.([^\.]+):\.([^\.]+)/miu', // Cell range reference
+                '/\.([^\.]+)/miu', // Simple cell reference
+            ],
+            [
+                '$1!$2:$4',
+                '$1!$2:$3',
+                '$1!$2',
+                '$1:$2',
+                '$1',
+            ],
+            $excelAddress
+        );
+
+        return $excelAddress;
+    }
+
+    public static function convertToExcelFormulaValue(string $openOfficeFormula): string
+    {
+        $temp = explode(Calculation::FORMULA_STRING_QUOTE, $openOfficeFormula);
+        $tKey = false;
+        $inMatrixBracesLevel = 0;
+        $inFunctionBracesLevel = 0;
+        foreach ($temp as &$value) {
+            // @var string $value
+            // Only replace in alternate array entries (i.e. non-quoted blocks)
+            //      so that conversion isn't done in string values
+            $tKey = $tKey === false;
+            if ($tKey) {
+                $value = (string) preg_replace(
+                    [
+                        '/\[\$?([^\.]+)\.([^\.]+):\.([^\.]+)\]/miu', // Cell range reference in another sheet
+                        '/\[\$?([^\.]+)\.([^\.]+)\]/miu', // Cell reference in another sheet
+                        '/\[\.([^\.]+):\.([^\.]+)\]/miu', // Cell range reference
+                        '/\[\.([^\.]+)\]/miu', // Simple cell reference
+                    ],
+                    [
+                        '$1!$2:$3',
+                        '$1!$2',
+                        '$1:$2',
+                        '$1',
+                    ],
+                    $value
+                );
+                // Convert references to defined names/formulae
+                $value = str_replace('$$', '', $value);
+
+                // Convert ODS function argument separators to Excel function argument separators
+                $value = Calculation::translateSeparator(';', ',', $value, $inFunctionBracesLevel);
+
+                // Convert ODS matrix separators to Excel matrix separators
+                $value = Calculation::translateSeparator(
+                    ';',
+                    ',',
+                    $value,
+                    $inMatrixBracesLevel,
+                    Calculation::FORMULA_OPEN_MATRIX_BRACE,
+                    Calculation::FORMULA_CLOSE_MATRIX_BRACE
+                );
+                $value = Calculation::translateSeparator(
+                    '|',
+                    ';',
+                    $value,
+                    $inMatrixBracesLevel,
+                    Calculation::FORMULA_OPEN_MATRIX_BRACE,
+                    Calculation::FORMULA_CLOSE_MATRIX_BRACE
+                );
+
+                $value = (string) preg_replace('/COM\.MICROSOFT\./ui', '', $value);
+            }
+        }
+
+        // Then rebuild the formula string
+        $excelFormula = implode('"', $temp);
+
+        return $excelFormula;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
new file mode 100644
index 00000000..fd35de5b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMDocument;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class PageSettings
+{
+    private string $officeNs = '';
+
+    private string $stylesNs = '';
+
+    private string $stylesFo = '';
+
+    private string $tableNs = '';
+
+    /**
+     * @var string[]
+     */
+    private array $tableStylesCrossReference = [];
+
+    private array $pageLayoutStyles = [];
+
+    /**
+     * @var string[]
+     */
+    private array $masterStylesCrossReference = [];
+
+    /**
+     * @var string[]
+     */
+    private array $masterPrintStylesCrossReference = [];
+
+    public function __construct(DOMDocument $styleDom)
+    {
+        $this->setDomNameSpaces($styleDom);
+        $this->readPageSettingStyles($styleDom);
+        $this->readStyleMasterLookup($styleDom);
+    }
+
+    private function setDomNameSpaces(DOMDocument $styleDom): void
+    {
+        $this->officeNs = (string) $styleDom->lookupNamespaceUri('office');
+        $this->stylesNs = (string) $styleDom->lookupNamespaceUri('style');
+        $this->stylesFo = (string) $styleDom->lookupNamespaceUri('fo');
+        $this->tableNs = (string) $styleDom->lookupNamespaceUri('table');
+    }
+
+    private function readPageSettingStyles(DOMDocument $styleDom): void
+    {
+        $item0 = $styleDom->getElementsByTagNameNS($this->officeNs, 'automatic-styles')->item(0);
+        $styles = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($this->stylesNs, 'page-layout');
+
+        foreach ($styles as $styleSet) {
+            $styleName = $styleSet->getAttributeNS($this->stylesNs, 'name');
+            $pageLayoutProperties = $styleSet->getElementsByTagNameNS($this->stylesNs, 'page-layout-properties')->item(0);
+            $styleOrientation = $pageLayoutProperties?->getAttributeNS($this->stylesNs, 'print-orientation');
+            $styleScale = $pageLayoutProperties?->getAttributeNS($this->stylesNs, 'scale-to');
+            $stylePrintOrder = $pageLayoutProperties?->getAttributeNS($this->stylesNs, 'print-page-order');
+            $centered = $pageLayoutProperties?->getAttributeNS($this->stylesNs, 'table-centering');
+
+            $marginLeft = $pageLayoutProperties?->getAttributeNS($this->stylesFo, 'margin-left');
+            $marginRight = $pageLayoutProperties?->getAttributeNS($this->stylesFo, 'margin-right');
+            $marginTop = $pageLayoutProperties?->getAttributeNS($this->stylesFo, 'margin-top');
+            $marginBottom = $pageLayoutProperties?->getAttributeNS($this->stylesFo, 'margin-bottom');
+            $header = $styleSet->getElementsByTagNameNS($this->stylesNs, 'header-style')->item(0);
+            $headerProperties = $header?->getElementsByTagNameNS($this->stylesNs, 'header-footer-properties')?->item(0);
+            $marginHeader = $headerProperties?->getAttributeNS($this->stylesFo, 'min-height');
+            $footer = $styleSet->getElementsByTagNameNS($this->stylesNs, 'footer-style')->item(0);
+            $footerProperties = $footer?->getElementsByTagNameNS($this->stylesNs, 'header-footer-properties')?->item(0);
+            $marginFooter = $footerProperties?->getAttributeNS($this->stylesFo, 'min-height');
+
+            $this->pageLayoutStyles[$styleName] = (object) [
+                'orientation' => $styleOrientation ?: PageSetup::ORIENTATION_DEFAULT,
+                'scale' => $styleScale ?: 100,
+                'printOrder' => $stylePrintOrder,
+                'horizontalCentered' => $centered === 'horizontal' || $centered === 'both',
+                'verticalCentered' => $centered === 'vertical' || $centered === 'both',
+                // margin size is already stored in inches, so no UOM conversion is required
+                'marginLeft' => (float) ($marginLeft ?? 0.7),
+                'marginRight' => (float) ($marginRight ?? 0.7),
+                'marginTop' => (float) ($marginTop ?? 0.3),
+                'marginBottom' => (float) ($marginBottom ?? 0.3),
+                'marginHeader' => (float) ($marginHeader ?? 0.45),
+                'marginFooter' => (float) ($marginFooter ?? 0.45),
+            ];
+        }
+    }
+
+    private function readStyleMasterLookup(DOMDocument $styleDom): void
+    {
+        $item0 = $styleDom->getElementsByTagNameNS($this->officeNs, 'master-styles')->item(0);
+        $styleMasterLookup = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($this->stylesNs, 'master-page');
+
+        foreach ($styleMasterLookup as $styleMasterSet) {
+            $styleMasterName = $styleMasterSet->getAttributeNS($this->stylesNs, 'name');
+            $pageLayoutName = $styleMasterSet->getAttributeNS($this->stylesNs, 'page-layout-name');
+            $this->masterPrintStylesCrossReference[$styleMasterName] = $pageLayoutName;
+        }
+    }
+
+    public function readStyleCrossReferences(DOMDocument $contentDom): void
+    {
+        $item0 = $contentDom->getElementsByTagNameNS($this->officeNs, 'automatic-styles')->item(0);
+        $styleXReferences = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($this->stylesNs, 'style');
+
+        foreach ($styleXReferences as $styleXreferenceSet) {
+            $styleXRefName = $styleXreferenceSet->getAttributeNS($this->stylesNs, 'name');
+            $stylePageLayoutName = $styleXreferenceSet->getAttributeNS($this->stylesNs, 'master-page-name');
+            $styleFamilyName = $styleXreferenceSet->getAttributeNS($this->stylesNs, 'family');
+            if (!empty($styleFamilyName) && $styleFamilyName === 'table') {
+                $styleVisibility = 'true';
+                foreach ($styleXreferenceSet->getElementsByTagNameNS($this->stylesNs, 'table-properties') as $tableProperties) {
+                    $styleVisibility = $tableProperties->getAttributeNS($this->tableNs, 'display');
+                }
+                $this->tableStylesCrossReference[$styleXRefName] = $styleVisibility;
+            }
+            if (!empty($stylePageLayoutName)) {
+                $this->masterStylesCrossReference[$styleXRefName] = $stylePageLayoutName;
+            }
+        }
+    }
+
+    public function setVisibilityForWorksheet(Worksheet $worksheet, string $styleName): void
+    {
+        if (!array_key_exists($styleName, $this->tableStylesCrossReference)) {
+            return;
+        }
+
+        $worksheet->setSheetState(
+            $this->tableStylesCrossReference[$styleName] === 'false'
+                ? Worksheet::SHEETSTATE_HIDDEN
+                : Worksheet::SHEETSTATE_VISIBLE
+        );
+    }
+
+    public function setPrintSettingsForWorksheet(Worksheet $worksheet, string $styleName): void
+    {
+        if (!array_key_exists($styleName, $this->masterStylesCrossReference)) {
+            return;
+        }
+        $masterStyleName = $this->masterStylesCrossReference[$styleName];
+
+        if (!array_key_exists($masterStyleName, $this->masterPrintStylesCrossReference)) {
+            return;
+        }
+        $printSettingsIndex = $this->masterPrintStylesCrossReference[$masterStyleName];
+
+        if (!array_key_exists($printSettingsIndex, $this->pageLayoutStyles)) {
+            return;
+        }
+        $printSettings = $this->pageLayoutStyles[$printSettingsIndex];
+
+        $worksheet->getPageSetup()
+            ->setOrientation($printSettings->orientation ?? PageSetup::ORIENTATION_DEFAULT)
+            ->setPageOrder($printSettings->printOrder === 'ltr' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
+            ->setScale((int) trim($printSettings->scale, '%'))
+            ->setHorizontalCentered($printSettings->horizontalCentered)
+            ->setVerticalCentered($printSettings->verticalCentered);
+
+        $worksheet->getPageMargins()
+            ->setLeft($printSettings->marginLeft)
+            ->setRight($printSettings->marginRight)
+            ->setTop($printSettings->marginTop)
+            ->setBottom($printSettings->marginBottom)
+            ->setHeader($printSettings->marginHeader)
+            ->setFooter($printSettings->marginFooter);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php
new file mode 100644
index 00000000..a5f0c79f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use PhpOffice\PhpSpreadsheet\Document\Properties as DocumentProperties;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class Properties
+{
+    private Spreadsheet $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function load(SimpleXMLElement $xml, array $namespacesMeta): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        $officeProperty = $xml->children($namespacesMeta['office']);
+        foreach ($officeProperty as $officePropertyData) {
+            if (isset($namespacesMeta['dc'])) {
+                $officePropertiesDC = $officePropertyData->children($namespacesMeta['dc']);
+                $this->setCoreProperties($docProps, $officePropertiesDC);
+            }
+
+            $officePropertyMeta = null;
+            if (isset($namespacesMeta['dc'])) {
+                $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
+            }
+            $officePropertyMeta = $officePropertyMeta ?? [];
+            foreach ($officePropertyMeta as $propertyName => $propertyValue) {
+                $this->setMetaProperties($namespacesMeta, $propertyValue, $propertyName, $docProps);
+            }
+        }
+    }
+
+    private function setCoreProperties(DocumentProperties $docProps, SimpleXMLElement $officePropertyDC): void
+    {
+        foreach ($officePropertyDC as $propertyName => $propertyValue) {
+            $propertyValue = (string) $propertyValue;
+            switch ($propertyName) {
+                case 'title':
+                    $docProps->setTitle($propertyValue);
+
+                    break;
+                case 'subject':
+                    $docProps->setSubject($propertyValue);
+
+                    break;
+                case 'creator':
+                    $docProps->setCreator($propertyValue);
+                    $docProps->setLastModifiedBy($propertyValue);
+
+                    break;
+                case 'date':
+                    $docProps->setModified($propertyValue);
+
+                    break;
+                case 'description':
+                    $docProps->setDescription($propertyValue);
+
+                    break;
+            }
+        }
+    }
+
+    private function setMetaProperties(
+        array $namespacesMeta,
+        SimpleXMLElement $propertyValue,
+        string $propertyName,
+        DocumentProperties $docProps
+    ): void {
+        $propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
+        $propertyValue = (string) $propertyValue;
+        switch ($propertyName) {
+            case 'initial-creator':
+                $docProps->setCreator($propertyValue);
+
+                break;
+            case 'keyword':
+                $docProps->setKeywords($propertyValue);
+
+                break;
+            case 'creation-date':
+                $docProps->setCreated($propertyValue);
+
+                break;
+            case 'user-defined':
+                $name2 = (string) ($propertyValueAttributes['name'] ?? '');
+                if ($name2 === 'Company') {
+                    $docProps->setCompany($propertyValue);
+                } elseif ($name2 === 'category') {
+                    $docProps->setCategory($propertyValue);
+                } else {
+                    $this->setUserDefinedProperty($propertyValueAttributes, $propertyValue, $docProps);
+                }
+
+                break;
+        }
+    }
+
+    private function setUserDefinedProperty(iterable $propertyValueAttributes, string $propertyValue, DocumentProperties $docProps): void
+    {
+        $propertyValueName = '';
+        $propertyValueType = DocumentProperties::PROPERTY_TYPE_STRING;
+        foreach ($propertyValueAttributes as $key => $value) {
+            if ($key == 'name') {
+                $propertyValueName = (string) $value;
+            } elseif ($key == 'value-type') {
+                switch ($value) {
+                    case 'date':
+                        $propertyValue = DocumentProperties::convertProperty($propertyValue, 'date');
+                        $propertyValueType = DocumentProperties::PROPERTY_TYPE_DATE;
+
+                        break;
+                    case 'boolean':
+                        $propertyValue = DocumentProperties::convertProperty($propertyValue, 'bool');
+                        $propertyValueType = DocumentProperties::PROPERTY_TYPE_BOOLEAN;
+
+                        break;
+                    case 'float':
+                        $propertyValue = DocumentProperties::convertProperty($propertyValue, 'r4');
+                        $propertyValueType = DocumentProperties::PROPERTY_TYPE_FLOAT;
+
+                        break;
+                    default:
+                        $propertyValueType = DocumentProperties::PROPERTY_TYPE_STRING;
+                }
+            }
+        }
+
+        $docProps->setCustomProperty($propertyValueName, $propertyValue, $propertyValueType);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
new file mode 100644
index 00000000..3946ed00
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Security;
+
+use PhpOffice\PhpSpreadsheet\Reader;
+
+class XmlScanner
+{
+    private string $pattern;
+
+    /** @var ?callable */
+    private $callback;
+
+    public function __construct(string $pattern = '<!DOCTYPE')
+    {
+        $this->pattern = $pattern;
+    }
+
+    public static function getInstance(Reader\IReader $reader): self
+    {
+        $pattern = ($reader instanceof Reader\Html) ? '<!ENTITY' : '<!DOCTYPE';
+
+        return new self($pattern);
+    }
+
+    public function setAdditionalCallback(callable $callback): void
+    {
+        $this->callback = $callback;
+    }
+
+    private static function forceString(mixed $arg): string
+    {
+        return is_string($arg) ? $arg : '';
+    }
+
+    private function toUtf8(string $xml): string
+    {
+        $charset = $this->findCharSet($xml);
+        if ($charset !== 'UTF-8') {
+            $xml = self::forceString(mb_convert_encoding($xml, 'UTF-8', $charset));
+
+            $charset = $this->findCharSet($xml);
+            if ($charset !== 'UTF-8') {
+                throw new Reader\Exception('Suspicious Double-encoded XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
+            }
+        }
+
+        return $xml;
+    }
+
+    private function findCharSet(string $xml): string
+    {
+        $patterns = [
+            '/encoding="([^"]*]?)"/',
+            "/encoding='([^']*?)'/",
+        ];
+
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $xml, $matches)) {
+                return strtoupper($matches[1]);
+            }
+        }
+
+        return 'UTF-8';
+    }
+
+    /**
+     * Scan the XML for use of <!ENTITY to prevent XXE/XEE attacks.
+     *
+     * @param false|string $xml
+     */
+    public function scan($xml): string
+    {
+        $xml = "$xml";
+
+        $xml = $this->toUtf8($xml);
+
+        // Don't rely purely on libxml_disable_entity_loader()
+        $pattern = '/\\0?' . implode('\\0?', str_split($this->pattern)) . '\\0?/';
+
+        if (preg_match($pattern, $xml)) {
+            throw new Reader\Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
+        }
+
+        if ($this->callback !== null) {
+            $xml = call_user_func($this->callback, $xml);
+        }
+
+        return $xml;
+    }
+
+    /**
+     * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks.
+     */
+    public function scanFile(string $filestream): string
+    {
+        return $this->scan(file_get_contents($filestream));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php
new file mode 100644
index 00000000..355ce7f7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php
@@ -0,0 +1,566 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\ReferenceHelper;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Slk extends BaseReader
+{
+    /**
+     * Sheet index to read.
+     */
+    private int $sheetIndex = 0;
+
+    /**
+     * Formats.
+     */
+    private array $formats = [];
+
+    /**
+     * Format Count.
+     */
+    private int $format = 0;
+
+    /**
+     * Fonts.
+     */
+    private array $fonts = [];
+
+    /**
+     * Font Count.
+     */
+    private int $fontcount = 0;
+
+    /**
+     * Create a new SYLK Reader instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Validate that the current file is a SYLK file.
+     */
+    public function canRead(string $filename): bool
+    {
+        try {
+            $this->openFile($filename);
+        } catch (ReaderException) {
+            return false;
+        }
+
+        // Read sample data (first 2 KB will do)
+        $data = (string) fread($this->fileHandle, 2048);
+
+        // Count delimiters in file
+        $delimiterCount = substr_count($data, ';');
+        $hasDelimiter = $delimiterCount > 0;
+
+        // Analyze first line looking for ID; signature
+        $lines = explode("\n", $data);
+        $hasId = str_starts_with($lines[0], 'ID;P');
+
+        fclose($this->fileHandle);
+
+        return $hasDelimiter && $hasId;
+    }
+
+    private function canReadOrBust(string $filename): void
+    {
+        if (!$this->canRead($filename)) {
+            throw new ReaderException($filename . ' is an Invalid SYLK file.');
+        }
+        $this->openFile($filename);
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        // Open file
+        $this->canReadOrBust($filename);
+        $fileHandle = $this->fileHandle;
+        rewind($fileHandle);
+
+        $worksheetInfo = [];
+        $worksheetInfo[0]['worksheetName'] = basename($filename, '.slk');
+
+        // loop through one row (line) at a time in the file
+        $rowIndex = 0;
+        $columnIndex = 0;
+        while (($rowData = fgets($fileHandle)) !== false) {
+            $columnIndex = 0;
+
+            // convert SYLK encoded $rowData to UTF-8
+            $rowData = StringHelper::SYLKtoUTF8($rowData);
+
+            // explode each row at semicolons while taking into account that literal semicolon (;)
+            // is escaped like this (;;)
+            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
+
+            $dataType = array_shift($rowData);
+            if ($dataType == 'B') {
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum[0]) {
+                        case 'X':
+                            $columnIndex = (int) substr($rowDatum, 1) - 1;
+
+                            break;
+                        case 'Y':
+                            $rowIndex = (int) substr($rowDatum, 1);
+
+                            break;
+                    }
+                }
+
+                break;
+            }
+        }
+
+        $worksheetInfo[0]['lastColumnIndex'] = $columnIndex;
+        $worksheetInfo[0]['totalRows'] = $rowIndex;
+        $worksheetInfo[0]['lastColumnLetter'] = Coordinate::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex'] + 1);
+        $worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
+
+        // Close file
+        fclose($fileHandle);
+
+        return $worksheetInfo;
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+
+        // Load into this instance
+        return $this->loadIntoExisting($filename, $spreadsheet);
+    }
+
+    private const COLOR_ARRAY = [
+        'FF00FFFF', // 0 - cyan
+        'FF000000', // 1 - black
+        'FFFFFFFF', // 2 - white
+        'FFFF0000', // 3 - red
+        'FF00FF00', // 4 - green
+        'FF0000FF', // 5 - blue
+        'FFFFFF00', // 6 - yellow
+        'FFFF00FF', // 7 - magenta
+    ];
+
+    private const FONT_STYLE_MAPPINGS = [
+        'B' => 'bold',
+        'I' => 'italic',
+        'U' => 'underline',
+    ];
+
+    private function processFormula(string $rowDatum, bool &$hasCalculatedValue, string &$cellDataFormula, string $row, string $column): void
+    {
+        $cellDataFormula = '=' . substr($rowDatum, 1);
+        //    Convert R1C1 style references to A1 style references (but only when not quoted)
+        $temp = explode('"', $cellDataFormula);
+        $key = false;
+        foreach ($temp as &$value) {
+            //    Only count/replace in alternate array entries
+            $key = $key === false;
+            if ($key) {
+                preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
+                //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
+                //        through the formula from left to right. Reversing means that we work right to left.through
+                //        the formula
+                $cellReferences = array_reverse($cellReferences);
+                //    Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
+                //        then modify the formula to use that new reference
+                foreach ($cellReferences as $cellReference) {
+                    $rowReference = $cellReference[2][0];
+                    //    Empty R reference is the current row
+                    if ($rowReference == '') {
+                        $rowReference = $row;
+                    }
+                    //    Bracketed R references are relative to the current row
+                    if ($rowReference[0] == '[') {
+                        $rowReference = (int) $row + (int) trim($rowReference, '[]');
+                    }
+                    $columnReference = $cellReference[4][0];
+                    //    Empty C reference is the current column
+                    if ($columnReference == '') {
+                        $columnReference = $column;
+                    }
+                    //    Bracketed C references are relative to the current column
+                    if ($columnReference[0] == '[') {
+                        $columnReference = (int) $column + (int) trim($columnReference, '[]');
+                    }
+                    $A1CellReference = Coordinate::stringFromColumnIndex((int) $columnReference) . $rowReference;
+
+                    $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
+                }
+            }
+        }
+        unset($value);
+        //    Then rebuild the formula string
+        $cellDataFormula = implode('"', $temp);
+        $hasCalculatedValue = true;
+    }
+
+    private function processCRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void
+    {
+        //    Read cell value data
+        $hasCalculatedValue = false;
+        $tryNumeric = false;
+        $cellDataFormula = $cellData = '';
+        $sharedColumn = $sharedRow = -1;
+        $sharedFormula = false;
+        foreach ($rowData as $rowDatum) {
+            switch ($rowDatum[0]) {
+                case 'X':
+                    $column = substr($rowDatum, 1);
+
+                    break;
+                case 'Y':
+                    $row = substr($rowDatum, 1);
+
+                    break;
+                case 'K':
+                    $cellData = substr($rowDatum, 1);
+                    $tryNumeric = is_numeric($cellData);
+
+                    break;
+                case 'E':
+                    $this->processFormula($rowDatum, $hasCalculatedValue, $cellDataFormula, $row, $column);
+
+                    break;
+                case 'A':
+                    $comment = substr($rowDatum, 1);
+                    $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+                    $spreadsheet->getActiveSheet()
+                        ->getComment("$columnLetter$row")
+                        ->getText()
+                        ->createText($comment);
+
+                    break;
+                case 'C':
+                    $sharedColumn = (int) substr($rowDatum, 1);
+
+                    break;
+                case 'R':
+                    $sharedRow = (int) substr($rowDatum, 1);
+
+                    break;
+                case 'S':
+                    $sharedFormula = true;
+
+                    break;
+            }
+        }
+        if ($sharedFormula === true && $sharedRow >= 0 && $sharedColumn >= 0) {
+            $thisCoordinate = Coordinate::stringFromColumnIndex((int) $column) . $row;
+            $sharedCoordinate = Coordinate::stringFromColumnIndex($sharedColumn) . $sharedRow;
+            /** @var string */
+            $formula = $spreadsheet->getActiveSheet()->getCell($sharedCoordinate)->getValue();
+            $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setValue($formula);
+            $referenceHelper = ReferenceHelper::getInstance();
+            $newFormula = $referenceHelper->updateFormulaReferences($formula, 'A1', (int) $column - $sharedColumn, (int) $row - $sharedRow, '', true, false);
+            $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setValue($newFormula);
+            //$calc = $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->getCalculatedValue();
+            //$spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setCalculatedValue($calc);
+            $cellData = Calculation::unwrapResult($cellData);
+            $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setCalculatedValue($cellData, $tryNumeric);
+
+            return;
+        }
+        $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+        /** @var string */
+        $cellData = Calculation::unwrapResult($cellData);
+
+        // Set cell value
+        $this->processCFinal($spreadsheet, $hasCalculatedValue, $cellDataFormula, $cellData, "$columnLetter$row", $tryNumeric);
+    }
+
+    private function processCFinal(Spreadsheet &$spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate, bool $tryNumeric): void
+    {
+        // Set cell value
+        $spreadsheet->getActiveSheet()->getCell($coordinate)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
+        if ($hasCalculatedValue) {
+            $cellData = Calculation::unwrapResult($cellData);
+            $spreadsheet->getActiveSheet()->getCell($coordinate)->setCalculatedValue($cellData, $tryNumeric);
+        }
+    }
+
+    private function processFRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void
+    {
+        //    Read cell formatting
+        $formatStyle = $columnWidth = '';
+        $startCol = $endCol = '';
+        $fontStyle = '';
+        $styleData = [];
+        foreach ($rowData as $rowDatum) {
+            switch ($rowDatum[0]) {
+                case 'C':
+                case 'X':
+                    $column = substr($rowDatum, 1);
+
+                    break;
+                case 'R':
+                case 'Y':
+                    $row = substr($rowDatum, 1);
+
+                    break;
+                case 'P':
+                    $formatStyle = $rowDatum;
+
+                    break;
+                case 'W':
+                    [$startCol, $endCol, $columnWidth] = explode(' ', substr($rowDatum, 1));
+
+                    break;
+                case 'S':
+                    $this->styleSettings($rowDatum, $styleData, $fontStyle);
+
+                    break;
+            }
+        }
+        $this->addFormats($spreadsheet, $formatStyle, $row, $column);
+        $this->addFonts($spreadsheet, $fontStyle, $row, $column);
+        $this->addStyle($spreadsheet, $styleData, $row, $column);
+        $this->addWidth($spreadsheet, $columnWidth, $startCol, $endCol);
+    }
+
+    private const STYLE_SETTINGS_FONT = ['D' => 'bold', 'I' => 'italic'];
+
+    private const STYLE_SETTINGS_BORDER = [
+        'B' => 'bottom',
+        'L' => 'left',
+        'R' => 'right',
+        'T' => 'top',
+    ];
+
+    private function styleSettings(string $rowDatum, array &$styleData, string &$fontStyle): void
+    {
+        $styleSettings = substr($rowDatum, 1);
+        $iMax = strlen($styleSettings);
+        for ($i = 0; $i < $iMax; ++$i) {
+            $char = $styleSettings[$i];
+            if (array_key_exists($char, self::STYLE_SETTINGS_FONT)) {
+                $styleData['font'][self::STYLE_SETTINGS_FONT[$char]] = true;
+            } elseif (array_key_exists($char, self::STYLE_SETTINGS_BORDER)) {
+                $styleData['borders'][self::STYLE_SETTINGS_BORDER[$char]]['borderStyle'] = Border::BORDER_THIN;
+            } elseif ($char == 'S') {
+                $styleData['fill']['fillType'] = Fill::FILL_PATTERN_GRAY125;
+            } elseif ($char == 'M') {
+                if (preg_match('/M([1-9]\\d*)/', $styleSettings, $matches)) {
+                    $fontStyle = $matches[1];
+                }
+            }
+        }
+    }
+
+    private function addFormats(Spreadsheet &$spreadsheet, string $formatStyle, string $row, string $column): void
+    {
+        if ($formatStyle && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+            if (isset($this->formats[$formatStyle])) {
+                $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->formats[$formatStyle]);
+            }
+        }
+    }
+
+    private function addFonts(Spreadsheet &$spreadsheet, string $fontStyle, string $row, string $column): void
+    {
+        if ($fontStyle && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+            if (isset($this->fonts[$fontStyle])) {
+                $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->fonts[$fontStyle]);
+            }
+        }
+    }
+
+    private function addStyle(Spreadsheet &$spreadsheet, array $styleData, string $row, string $column): void
+    {
+        if ((!empty($styleData)) && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+            $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($styleData);
+        }
+    }
+
+    private function addWidth(Spreadsheet $spreadsheet, string $columnWidth, string $startCol, string $endCol): void
+    {
+        if ($columnWidth > '') {
+            if ($startCol == $endCol) {
+                $startCol = Coordinate::stringFromColumnIndex((int) $startCol);
+                $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth((float) $columnWidth);
+            } else {
+                $startCol = Coordinate::stringFromColumnIndex((int) $startCol);
+                $endCol = Coordinate::stringFromColumnIndex((int) $endCol);
+                $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth((float) $columnWidth);
+                do {
+                    $spreadsheet->getActiveSheet()->getColumnDimension((string) ++$startCol)->setWidth((float) $columnWidth);
+                } while ($startCol !== $endCol);
+            }
+        }
+    }
+
+    private function processPRecord(array $rowData, Spreadsheet &$spreadsheet): void
+    {
+        //    Read shared styles
+        $formatArray = [];
+        $fromFormats = ['\-', '\ '];
+        $toFormats = ['-', ' '];
+        foreach ($rowData as $rowDatum) {
+            switch ($rowDatum[0]) {
+                case 'P':
+                    $formatArray['numberFormat']['formatCode'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
+
+                    break;
+                case 'E':
+                case 'F':
+                    $formatArray['font']['name'] = substr($rowDatum, 1);
+
+                    break;
+                case 'M':
+                    $formatArray['font']['size'] = ((float) substr($rowDatum, 1)) / 20;
+
+                    break;
+                case 'L':
+                    $this->processPColors($rowDatum, $formatArray);
+
+                    break;
+                case 'S':
+                    $this->processPFontStyles($rowDatum, $formatArray);
+
+                    break;
+            }
+        }
+        $this->processPFinal($spreadsheet, $formatArray);
+    }
+
+    private function processPColors(string $rowDatum, array &$formatArray): void
+    {
+        if (preg_match('/L([1-9]\\d*)/', $rowDatum, $matches)) {
+            $fontColor = $matches[1] % 8;
+            $formatArray['font']['color']['argb'] = self::COLOR_ARRAY[$fontColor];
+        }
+    }
+
+    private function processPFontStyles(string $rowDatum, array &$formatArray): void
+    {
+        $styleSettings = substr($rowDatum, 1);
+        $iMax = strlen($styleSettings);
+        for ($i = 0; $i < $iMax; ++$i) {
+            if (array_key_exists($styleSettings[$i], self::FONT_STYLE_MAPPINGS)) {
+                $formatArray['font'][self::FONT_STYLE_MAPPINGS[$styleSettings[$i]]] = true;
+            }
+        }
+    }
+
+    private function processPFinal(Spreadsheet &$spreadsheet, array $formatArray): void
+    {
+        if (array_key_exists('numberFormat', $formatArray)) {
+            $this->formats['P' . $this->format] = $formatArray;
+            ++$this->format;
+        } elseif (array_key_exists('font', $formatArray)) {
+            ++$this->fontcount;
+            $this->fonts[$this->fontcount] = $formatArray;
+            if ($this->fontcount === 1) {
+                $spreadsheet->getDefaultStyle()->applyFromArray($formatArray);
+            }
+        }
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
+     */
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
+    {
+        // Open file
+        $this->canReadOrBust($filename);
+        $fileHandle = $this->fileHandle;
+        rewind($fileHandle);
+
+        // Create new Worksheets
+        while ($spreadsheet->getSheetCount() <= $this->sheetIndex) {
+            $spreadsheet->createSheet();
+        }
+        $spreadsheet->setActiveSheetIndex($this->sheetIndex);
+        $spreadsheet->getActiveSheet()->setTitle(substr(basename($filename, '.slk'), 0, Worksheet::SHEET_TITLE_MAXIMUM_LENGTH));
+
+        // Loop through file
+        $column = $row = '';
+
+        // loop through one row (line) at a time in the file
+        while (($rowDataTxt = fgets($fileHandle)) !== false) {
+            // convert SYLK encoded $rowData to UTF-8
+            $rowDataTxt = StringHelper::SYLKtoUTF8($rowDataTxt);
+
+            // explode each row at semicolons while taking into account that literal semicolon (;)
+            // is escaped like this (;;)
+            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowDataTxt)))));
+
+            $dataType = array_shift($rowData);
+            if ($dataType == 'P') {
+                //    Read shared styles
+                $this->processPRecord($rowData, $spreadsheet);
+            } elseif ($dataType == 'C') {
+                //    Read cell value data
+                $this->processCRecord($rowData, $spreadsheet, $row, $column);
+            } elseif ($dataType == 'F') {
+                //    Read cell formatting
+                $this->processFRecord($rowData, $spreadsheet, $row, $column);
+            } else {
+                $this->columnRowFromRowData($rowData, $column, $row);
+            }
+        }
+
+        // Close file
+        fclose($fileHandle);
+
+        // Return
+        return $spreadsheet;
+    }
+
+    private function columnRowFromRowData(array $rowData, string &$column, string &$row): void
+    {
+        foreach ($rowData as $rowDatum) {
+            $char0 = $rowDatum[0];
+            if ($char0 === 'X' || $char0 == 'C') {
+                $column = substr($rowDatum, 1);
+            } elseif ($char0 === 'Y' || $char0 == 'R') {
+                $row = substr($rowDatum, 1);
+            }
+        }
+    }
+
+    /**
+     * Get sheet index.
+     */
+    public function getSheetIndex(): int
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index.
+     *
+     * @param int $sheetIndex Sheet index
+     *
+     * @return $this
+     */
+    public function setSheetIndex(int $sheetIndex): static
+    {
+        $this->sheetIndex = $sheetIndex;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
new file mode 100644
index 00000000..be9ccb26
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
@@ -0,0 +1,7647 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Reader\Xls\ConditionalFormatting;
+use PhpOffice\PhpSpreadsheet\Reader\Xls\Style\CellFont;
+use PhpOffice\PhpSpreadsheet\Reader\Xls\Style\FillPattern;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\CodePage;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\Escher;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer\SpContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Shared\OLE;
+use PhpOffice\PhpSpreadsheet\Shared\OLERead;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Shared\Xls as SharedXls;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+// Original file header of ParseXL (used as the base for this class):
+// --------------------------------------------------------------------------------
+// Adapted from Excel_Spreadsheet_Reader developed by users bizon153,
+// trex005, and mmp11 (SourceForge.net)
+// https://sourceforge.net/projects/phpexcelreader/
+// Primary changes made by canyoncasa (dvc) for ParseXL 1.00 ...
+//     Modelled moreso after Perl Excel Parse/Write modules
+//     Added Parse_Excel_Spreadsheet object
+//         Reads a whole worksheet or tab as row,column array or as
+//         associated hash of indexed rows and named column fields
+//     Added variables for worksheet (tab) indexes and names
+//     Added an object call for loading individual woorksheets
+//     Changed default indexing defaults to 0 based arrays
+//     Fixed date/time and percent formats
+//     Includes patches found at SourceForge...
+//         unicode patch by nobody
+//         unpack("d") machine depedency patch by matchy
+//         boundsheet utf16 patch by bjaenichen
+//     Renamed functions for shorter names
+//     General code cleanup and rigor, including <80 column width
+//     Included a testcase Excel file and PHP example calls
+//     Code works for PHP 5.x
+
+// Primary changes made by canyoncasa (dvc) for ParseXL 1.10 ...
+// http://sourceforge.net/tracker/index.php?func=detail&aid=1466964&group_id=99160&atid=623334
+//     Decoding of formula conditions, results, and tokens.
+//     Support for user-defined named cells added as an array "namedcells"
+//         Patch code for user-defined named cells supports single cells only.
+//         NOTE: this patch only works for BIFF8 as BIFF5-7 use a different
+//         external sheet reference structure
+class Xls extends BaseReader
+{
+    private const HIGH_ORDER_BIT = 0x80 << 24;
+    private const FC000000 = 0xFC << 24;
+    private const FE000000 = 0xFE << 24;
+
+    // ParseXL definitions
+    const XLS_BIFF8 = 0x0600;
+    const XLS_BIFF7 = 0x0500;
+    const XLS_WORKBOOKGLOBALS = 0x0005;
+    const XLS_WORKSHEET = 0x0010;
+
+    // record identifiers
+    const XLS_TYPE_FORMULA = 0x0006;
+    const XLS_TYPE_EOF = 0x000A;
+    const XLS_TYPE_PROTECT = 0x0012;
+    const XLS_TYPE_OBJECTPROTECT = 0x0063;
+    const XLS_TYPE_SCENPROTECT = 0x00DD;
+    const XLS_TYPE_PASSWORD = 0x0013;
+    const XLS_TYPE_HEADER = 0x0014;
+    const XLS_TYPE_FOOTER = 0x0015;
+    const XLS_TYPE_EXTERNSHEET = 0x0017;
+    const XLS_TYPE_DEFINEDNAME = 0x0018;
+    const XLS_TYPE_VERTICALPAGEBREAKS = 0x001A;
+    const XLS_TYPE_HORIZONTALPAGEBREAKS = 0x001B;
+    const XLS_TYPE_NOTE = 0x001C;
+    const XLS_TYPE_SELECTION = 0x001D;
+    const XLS_TYPE_DATEMODE = 0x0022;
+    const XLS_TYPE_EXTERNNAME = 0x0023;
+    const XLS_TYPE_LEFTMARGIN = 0x0026;
+    const XLS_TYPE_RIGHTMARGIN = 0x0027;
+    const XLS_TYPE_TOPMARGIN = 0x0028;
+    const XLS_TYPE_BOTTOMMARGIN = 0x0029;
+    const XLS_TYPE_PRINTGRIDLINES = 0x002B;
+    const XLS_TYPE_FILEPASS = 0x002F;
+    const XLS_TYPE_FONT = 0x0031;
+    const XLS_TYPE_CONTINUE = 0x003C;
+    const XLS_TYPE_PANE = 0x0041;
+    const XLS_TYPE_CODEPAGE = 0x0042;
+    const XLS_TYPE_DEFCOLWIDTH = 0x0055;
+    const XLS_TYPE_OBJ = 0x005D;
+    const XLS_TYPE_COLINFO = 0x007D;
+    const XLS_TYPE_IMDATA = 0x007F;
+    const XLS_TYPE_SHEETPR = 0x0081;
+    const XLS_TYPE_HCENTER = 0x0083;
+    const XLS_TYPE_VCENTER = 0x0084;
+    const XLS_TYPE_SHEET = 0x0085;
+    const XLS_TYPE_PALETTE = 0x0092;
+    const XLS_TYPE_SCL = 0x00A0;
+    const XLS_TYPE_PAGESETUP = 0x00A1;
+    const XLS_TYPE_MULRK = 0x00BD;
+    const XLS_TYPE_MULBLANK = 0x00BE;
+    const XLS_TYPE_DBCELL = 0x00D7;
+    const XLS_TYPE_XF = 0x00E0;
+    const XLS_TYPE_MERGEDCELLS = 0x00E5;
+    const XLS_TYPE_MSODRAWINGGROUP = 0x00EB;
+    const XLS_TYPE_MSODRAWING = 0x00EC;
+    const XLS_TYPE_SST = 0x00FC;
+    const XLS_TYPE_LABELSST = 0x00FD;
+    const XLS_TYPE_EXTSST = 0x00FF;
+    const XLS_TYPE_EXTERNALBOOK = 0x01AE;
+    const XLS_TYPE_DATAVALIDATIONS = 0x01B2;
+    const XLS_TYPE_TXO = 0x01B6;
+    const XLS_TYPE_HYPERLINK = 0x01B8;
+    const XLS_TYPE_DATAVALIDATION = 0x01BE;
+    const XLS_TYPE_DIMENSION = 0x0200;
+    const XLS_TYPE_BLANK = 0x0201;
+    const XLS_TYPE_NUMBER = 0x0203;
+    const XLS_TYPE_LABEL = 0x0204;
+    const XLS_TYPE_BOOLERR = 0x0205;
+    const XLS_TYPE_STRING = 0x0207;
+    const XLS_TYPE_ROW = 0x0208;
+    const XLS_TYPE_INDEX = 0x020B;
+    const XLS_TYPE_ARRAY = 0x0221;
+    const XLS_TYPE_DEFAULTROWHEIGHT = 0x0225;
+    const XLS_TYPE_WINDOW2 = 0x023E;
+    const XLS_TYPE_RK = 0x027E;
+    const XLS_TYPE_STYLE = 0x0293;
+    const XLS_TYPE_FORMAT = 0x041E;
+    const XLS_TYPE_SHAREDFMLA = 0x04BC;
+    const XLS_TYPE_BOF = 0x0809;
+    const XLS_TYPE_SHEETPROTECTION = 0x0867;
+    const XLS_TYPE_RANGEPROTECTION = 0x0868;
+    const XLS_TYPE_SHEETLAYOUT = 0x0862;
+    const XLS_TYPE_XFEXT = 0x087D;
+    const XLS_TYPE_PAGELAYOUTVIEW = 0x088B;
+    const XLS_TYPE_CFHEADER = 0x01B0;
+    const XLS_TYPE_CFRULE = 0x01B1;
+    const XLS_TYPE_UNKNOWN = 0xFFFF;
+
+    // Encryption type
+    const MS_BIFF_CRYPTO_NONE = 0;
+    const MS_BIFF_CRYPTO_XOR = 1;
+    const MS_BIFF_CRYPTO_RC4 = 2;
+
+    // Size of stream blocks when using RC4 encryption
+    const REKEY_BLOCK = 0x400;
+
+    // should be consistent with Writer\Xls\Style\CellBorder
+    const BORDER_STYLE_MAP = [
+        Border::BORDER_NONE, // => 0x00,
+        Border::BORDER_THIN,  // => 0x01,
+        Border::BORDER_MEDIUM, // => 0x02,
+        Border::BORDER_DASHED, // => 0x03,
+        Border::BORDER_DOTTED,  // => 0x04,
+        Border::BORDER_THICK, // => 0x05,
+        Border::BORDER_DOUBLE, // => 0x06,
+        Border::BORDER_HAIR, // => 0x07,
+        Border::BORDER_MEDIUMDASHED, // => 0x08,
+        Border::BORDER_DASHDOT, // => 0x09,
+        Border::BORDER_MEDIUMDASHDOT, // => 0x0A,
+        Border::BORDER_DASHDOTDOT, // => 0x0B,
+        Border::BORDER_MEDIUMDASHDOTDOT, // => 0x0C,
+        Border::BORDER_SLANTDASHDOT, // => 0x0D,
+        Border::BORDER_OMIT, // => 0x0E,
+        Border::BORDER_OMIT, // => 0x0F,
+    ];
+
+    /**
+     * Summary Information stream data.
+     */
+    private ?string $summaryInformation = null;
+
+    /**
+     * Extended Summary Information stream data.
+     */
+    private ?string $documentSummaryInformation = null;
+
+    /**
+     * Workbook stream data. (Includes workbook globals substream as well as sheet substreams).
+     */
+    private string $data;
+
+    /**
+     * Size in bytes of $this->data.
+     */
+    private int $dataSize;
+
+    /**
+     * Current position in stream.
+     */
+    private int $pos;
+
+    /**
+     * Workbook to be returned by the reader.
+     */
+    private Spreadsheet $spreadsheet;
+
+    /**
+     * Worksheet that is currently being built by the reader.
+     */
+    private Worksheet $phpSheet;
+
+    /**
+     * BIFF version.
+     */
+    private int $version = 0;
+
+    /**
+     * Codepage set in the Excel file being read. Only important for BIFF5 (Excel 5.0 - Excel 95)
+     * For BIFF8 (Excel 97 - Excel 2003) this will always have the value 'UTF-16LE'.
+     */
+    private string $codepage = '';
+
+    /**
+     * Shared formats.
+     */
+    private array $formats;
+
+    /**
+     * Shared fonts.
+     *
+     * @var Font[]
+     */
+    private array $objFonts;
+
+    /**
+     * Color palette.
+     */
+    private array $palette;
+
+    /**
+     * Worksheets.
+     */
+    private array $sheets;
+
+    /**
+     * External books.
+     */
+    private array $externalBooks;
+
+    /**
+     * REF structures. Only applies to BIFF8.
+     */
+    private array $ref;
+
+    /**
+     * External names.
+     */
+    private array $externalNames;
+
+    /**
+     * Defined names.
+     */
+    private array $definedname;
+
+    /**
+     * Shared strings. Only applies to BIFF8.
+     */
+    private array $sst;
+
+    /**
+     * Panes are frozen? (in sheet currently being read). See WINDOW2 record.
+     */
+    private bool $frozen;
+
+    /**
+     * Fit printout to number of pages? (in sheet currently being read). See SHEETPR record.
+     */
+    private bool $isFitToPages;
+
+    /**
+     * Objects. One OBJ record contributes with one entry.
+     */
+    private array $objs;
+
+    /**
+     * Text Objects. One TXO record corresponds with one entry.
+     */
+    private array $textObjects;
+
+    /**
+     * Cell Annotations (BIFF8).
+     */
+    private array $cellNotes;
+
+    /**
+     * The combined MSODRAWINGGROUP data.
+     */
+    private string $drawingGroupData;
+
+    /**
+     * The combined MSODRAWING data (per sheet).
+     */
+    private string $drawingData;
+
+    /**
+     * Keep track of XF index.
+     */
+    private int $xfIndex;
+
+    /**
+     * Mapping of XF index (that is a cell XF) to final index in cellXf collection.
+     */
+    private array $mapCellXfIndex;
+
+    /**
+     * Mapping of XF index (that is a style XF) to final index in cellStyleXf collection.
+     */
+    private array $mapCellStyleXfIndex;
+
+    /**
+     * The shared formulas in a sheet. One SHAREDFMLA record contributes with one value.
+     */
+    private array $sharedFormulas;
+
+    /**
+     * The shared formula parts in a sheet. One FORMULA record contributes with one value if it
+     * refers to a shared formula.
+     */
+    private array $sharedFormulaParts;
+
+    /**
+     * The type of encryption in use.
+     */
+    private int $encryption = 0;
+
+    /**
+     * The position in the stream after which contents are encrypted.
+     */
+    private int $encryptionStartPos = 0;
+
+    /**
+     * The current RC4 decryption object.
+     *
+     * @var ?Xls\RC4
+     */
+    private ?Xls\RC4 $rc4Key = null;
+
+    /**
+     * The position in the stream that the RC4 decryption object was left at.
+     */
+    private int $rc4Pos = 0;
+
+    /**
+     * The current MD5 context state.
+     * It is never set in the program, so code which uses it is suspect.
+     */
+    private string $md5Ctxt; // @phpstan-ignore-line
+
+    private int $textObjRef;
+
+    private string $baseCell;
+
+    private bool $activeSheetSet = false;
+
+    /**
+     * Create a new Xls Reader instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Can the current IReader read the file?
+     */
+    public function canRead(string $filename): bool
+    {
+        if (File::testFileNoThrow($filename) === false) {
+            return false;
+        }
+
+        try {
+            // Use ParseXL for the hard work.
+            $ole = new OLERead();
+
+            // get excel data
+            $ole->read($filename);
+            if ($ole->wrkbook === null) {
+                throw new Exception('The filename ' . $filename . ' is not recognised as a Spreadsheet file');
+            }
+
+            return true;
+        } catch (PhpSpreadsheetException) {
+            return false;
+        }
+    }
+
+    public function setCodepage(string $codepage): void
+    {
+        if (CodePage::validate($codepage) === false) {
+            throw new PhpSpreadsheetException('Unknown codepage: ' . $codepage);
+        }
+
+        $this->codepage = $codepage;
+    }
+
+    public function getCodepage(): string
+    {
+        return $this->codepage;
+    }
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a PhpSpreadsheet object.
+     */
+    public function listWorksheetNames(string $filename): array
+    {
+        File::assertFile($filename);
+
+        $worksheetNames = [];
+
+        // Read the OLE file
+        $this->loadOLE($filename);
+
+        // total byte size of Excel data (workbook global substream + sheet substreams)
+        $this->dataSize = strlen($this->data);
+
+        $this->pos = 0;
+        $this->sheets = [];
+
+        // Parse Workbook Global Substream
+        while ($this->pos < $this->dataSize) {
+            $code = self::getUInt2d($this->data, $this->pos);
+
+            match ($code) {
+                self::XLS_TYPE_BOF => $this->readBof(),
+                self::XLS_TYPE_SHEET => $this->readSheet(),
+                self::XLS_TYPE_EOF => $this->readDefault(),
+                self::XLS_TYPE_CODEPAGE => $this->readCodepage(),
+                default => $this->readDefault(),
+            };
+
+            if ($code === self::XLS_TYPE_EOF) {
+                break;
+            }
+        }
+
+        foreach ($this->sheets as $sheet) {
+            if ($sheet['sheetType'] != 0x00) {
+                // 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
+                continue;
+            }
+
+            $worksheetNames[] = $sheet['name'];
+        }
+
+        return $worksheetNames;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        File::assertFile($filename);
+
+        $worksheetInfo = [];
+
+        // Read the OLE file
+        $this->loadOLE($filename);
+
+        // total byte size of Excel data (workbook global substream + sheet substreams)
+        $this->dataSize = strlen($this->data);
+
+        // initialize
+        $this->pos = 0;
+        $this->sheets = [];
+
+        // Parse Workbook Global Substream
+        while ($this->pos < $this->dataSize) {
+            $code = self::getUInt2d($this->data, $this->pos);
+
+            match ($code) {
+                self::XLS_TYPE_BOF => $this->readBof(),
+                self::XLS_TYPE_SHEET => $this->readSheet(),
+                self::XLS_TYPE_EOF => $this->readDefault(),
+                self::XLS_TYPE_CODEPAGE => $this->readCodepage(),
+                default => $this->readDefault(),
+            };
+
+            if ($code === self::XLS_TYPE_EOF) {
+                break;
+            }
+        }
+
+        // Parse the individual sheets
+        foreach ($this->sheets as $sheet) {
+            if ($sheet['sheetType'] != 0x00) {
+                // 0x00: Worksheet
+                // 0x02: Chart
+                // 0x06: Visual Basic module
+                continue;
+            }
+
+            $tmpInfo = [];
+            $tmpInfo['worksheetName'] = $sheet['name'];
+            $tmpInfo['lastColumnLetter'] = 'A';
+            $tmpInfo['lastColumnIndex'] = 0;
+            $tmpInfo['totalRows'] = 0;
+            $tmpInfo['totalColumns'] = 0;
+
+            $this->pos = $sheet['offset'];
+
+            while ($this->pos <= $this->dataSize - 4) {
+                $code = self::getUInt2d($this->data, $this->pos);
+
+                switch ($code) {
+                    case self::XLS_TYPE_RK:
+                    case self::XLS_TYPE_LABELSST:
+                    case self::XLS_TYPE_NUMBER:
+                    case self::XLS_TYPE_FORMULA:
+                    case self::XLS_TYPE_BOOLERR:
+                    case self::XLS_TYPE_LABEL:
+                        $length = self::getUInt2d($this->data, $this->pos + 2);
+                        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+                        // move stream pointer to next record
+                        $this->pos += 4 + $length;
+
+                        $rowIndex = self::getUInt2d($recordData, 0) + 1;
+                        $columnIndex = self::getUInt2d($recordData, 2);
+
+                        $tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+                        $tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+
+                        break;
+                    case self::XLS_TYPE_BOF:
+                        $this->readBof();
+
+                        break;
+                    case self::XLS_TYPE_EOF:
+                        $this->readDefault();
+
+                        break 2;
+                    default:
+                        $this->readDefault();
+
+                        break;
+                }
+            }
+
+            $tmpInfo['lastColumnLetter'] = Coordinate::stringFromColumnIndex($tmpInfo['lastColumnIndex'] + 1);
+            $tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+            $worksheetInfo[] = $tmpInfo;
+        }
+
+        return $worksheetInfo;
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        // Read the OLE file
+        $this->loadOLE($filename);
+
+        // Initialisations
+        $this->spreadsheet = new Spreadsheet();
+        $this->spreadsheet->removeSheetByIndex(0); // remove 1st sheet
+        if (!$this->readDataOnly) {
+            $this->spreadsheet->removeCellStyleXfByIndex(0); // remove the default style
+            $this->spreadsheet->removeCellXfByIndex(0); // remove the default style
+        }
+
+        // Read the summary information stream (containing meta data)
+        $this->readSummaryInformation();
+
+        // Read the Additional document summary information stream (containing application-specific meta data)
+        $this->readDocumentSummaryInformation();
+
+        // total byte size of Excel data (workbook global substream + sheet substreams)
+        $this->dataSize = strlen($this->data);
+
+        // initialize
+        $this->pos = 0;
+        $this->codepage = $this->codepage ?: CodePage::DEFAULT_CODE_PAGE;
+        $this->formats = [];
+        $this->objFonts = [];
+        $this->palette = [];
+        $this->sheets = [];
+        $this->externalBooks = [];
+        $this->ref = [];
+        $this->definedname = [];
+        $this->sst = [];
+        $this->drawingGroupData = '';
+        $this->xfIndex = 0;
+        $this->mapCellXfIndex = [];
+        $this->mapCellStyleXfIndex = [];
+
+        // Parse Workbook Global Substream
+        while ($this->pos < $this->dataSize) {
+            $code = self::getUInt2d($this->data, $this->pos);
+
+            match ($code) {
+                self::XLS_TYPE_BOF => $this->readBof(),
+                self::XLS_TYPE_FILEPASS => $this->readFilepass(),
+                self::XLS_TYPE_CODEPAGE => $this->readCodepage(),
+                self::XLS_TYPE_DATEMODE => $this->readDateMode(),
+                self::XLS_TYPE_FONT => $this->readFont(),
+                self::XLS_TYPE_FORMAT => $this->readFormat(),
+                self::XLS_TYPE_XF => $this->readXf(),
+                self::XLS_TYPE_XFEXT => $this->readXfExt(),
+                self::XLS_TYPE_STYLE => $this->readStyle(),
+                self::XLS_TYPE_PALETTE => $this->readPalette(),
+                self::XLS_TYPE_SHEET => $this->readSheet(),
+                self::XLS_TYPE_EXTERNALBOOK => $this->readExternalBook(),
+                self::XLS_TYPE_EXTERNNAME => $this->readExternName(),
+                self::XLS_TYPE_EXTERNSHEET => $this->readExternSheet(),
+                self::XLS_TYPE_DEFINEDNAME => $this->readDefinedName(),
+                self::XLS_TYPE_MSODRAWINGGROUP => $this->readMsoDrawingGroup(),
+                self::XLS_TYPE_SST => $this->readSst(),
+                self::XLS_TYPE_EOF => $this->readDefault(),
+                default => $this->readDefault(),
+            };
+
+            if ($code === self::XLS_TYPE_EOF) {
+                break;
+            }
+        }
+
+        // Resolve indexed colors for font, fill, and border colors
+        // Cannot be resolved already in XF record, because PALETTE record comes afterwards
+        if (!$this->readDataOnly) {
+            foreach ($this->objFonts as $objFont) {
+                if (isset($objFont->colorIndex)) {
+                    $color = Xls\Color::map($objFont->colorIndex, $this->palette, $this->version);
+                    $objFont->getColor()->setRGB($color['rgb']);
+                }
+            }
+
+            foreach ($this->spreadsheet->getCellXfCollection() as $objStyle) {
+                // fill start and end color
+                $fill = $objStyle->getFill();
+
+                if (isset($fill->startcolorIndex)) {
+                    $startColor = Xls\Color::map($fill->startcolorIndex, $this->palette, $this->version);
+                    $fill->getStartColor()->setRGB($startColor['rgb']);
+                }
+                if (isset($fill->endcolorIndex)) {
+                    $endColor = Xls\Color::map($fill->endcolorIndex, $this->palette, $this->version);
+                    $fill->getEndColor()->setRGB($endColor['rgb']);
+                }
+
+                // border colors
+                $top = $objStyle->getBorders()->getTop();
+                $right = $objStyle->getBorders()->getRight();
+                $bottom = $objStyle->getBorders()->getBottom();
+                $left = $objStyle->getBorders()->getLeft();
+                $diagonal = $objStyle->getBorders()->getDiagonal();
+
+                if (isset($top->colorIndex)) {
+                    $borderTopColor = Xls\Color::map($top->colorIndex, $this->palette, $this->version);
+                    $top->getColor()->setRGB($borderTopColor['rgb']);
+                }
+                if (isset($right->colorIndex)) {
+                    $borderRightColor = Xls\Color::map($right->colorIndex, $this->palette, $this->version);
+                    $right->getColor()->setRGB($borderRightColor['rgb']);
+                }
+                if (isset($bottom->colorIndex)) {
+                    $borderBottomColor = Xls\Color::map($bottom->colorIndex, $this->palette, $this->version);
+                    $bottom->getColor()->setRGB($borderBottomColor['rgb']);
+                }
+                if (isset($left->colorIndex)) {
+                    $borderLeftColor = Xls\Color::map($left->colorIndex, $this->palette, $this->version);
+                    $left->getColor()->setRGB($borderLeftColor['rgb']);
+                }
+                if (isset($diagonal->colorIndex)) {
+                    $borderDiagonalColor = Xls\Color::map($diagonal->colorIndex, $this->palette, $this->version);
+                    $diagonal->getColor()->setRGB($borderDiagonalColor['rgb']);
+                }
+            }
+        }
+
+        // treat MSODRAWINGGROUP records, workbook-level Escher
+        $escherWorkbook = null;
+        if (!$this->readDataOnly && $this->drawingGroupData) {
+            $escher = new Escher();
+            $reader = new Xls\Escher($escher);
+            $escherWorkbook = $reader->load($this->drawingGroupData);
+        }
+
+        // Parse the individual sheets
+        $this->activeSheetSet = false;
+        foreach ($this->sheets as $sheet) {
+            $selectedCells = '';
+            if ($sheet['sheetType'] != 0x00) {
+                // 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
+                continue;
+            }
+
+            // check if sheet should be skipped
+            if (isset($this->loadSheetsOnly) && !in_array($sheet['name'], $this->loadSheetsOnly)) {
+                continue;
+            }
+
+            // add sheet to PhpSpreadsheet object
+            $this->phpSheet = $this->spreadsheet->createSheet();
+            //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
+            //        cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
+            //        name in line with the formula, not the reverse
+            $this->phpSheet->setTitle($sheet['name'], false, false);
+            $this->phpSheet->setSheetState($sheet['sheetState']);
+
+            $this->pos = $sheet['offset'];
+
+            // Initialize isFitToPages. May change after reading SHEETPR record.
+            $this->isFitToPages = false;
+
+            // Initialize drawingData
+            $this->drawingData = '';
+
+            // Initialize objs
+            $this->objs = [];
+
+            // Initialize shared formula parts
+            $this->sharedFormulaParts = [];
+
+            // Initialize shared formulas
+            $this->sharedFormulas = [];
+
+            // Initialize text objs
+            $this->textObjects = [];
+
+            // Initialize cell annotations
+            $this->cellNotes = [];
+            $this->textObjRef = -1;
+
+            while ($this->pos <= $this->dataSize - 4) {
+                $code = self::getUInt2d($this->data, $this->pos);
+
+                switch ($code) {
+                    case self::XLS_TYPE_BOF:
+                        $this->readBof();
+
+                        break;
+                    case self::XLS_TYPE_PRINTGRIDLINES:
+                        $this->readPrintGridlines();
+
+                        break;
+                    case self::XLS_TYPE_DEFAULTROWHEIGHT:
+                        $this->readDefaultRowHeight();
+
+                        break;
+                    case self::XLS_TYPE_SHEETPR:
+                        $this->readSheetPr();
+
+                        break;
+                    case self::XLS_TYPE_HORIZONTALPAGEBREAKS:
+                        $this->readHorizontalPageBreaks();
+
+                        break;
+                    case self::XLS_TYPE_VERTICALPAGEBREAKS:
+                        $this->readVerticalPageBreaks();
+
+                        break;
+                    case self::XLS_TYPE_HEADER:
+                        $this->readHeader();
+
+                        break;
+                    case self::XLS_TYPE_FOOTER:
+                        $this->readFooter();
+
+                        break;
+                    case self::XLS_TYPE_HCENTER:
+                        $this->readHcenter();
+
+                        break;
+                    case self::XLS_TYPE_VCENTER:
+                        $this->readVcenter();
+
+                        break;
+                    case self::XLS_TYPE_LEFTMARGIN:
+                        $this->readLeftMargin();
+
+                        break;
+                    case self::XLS_TYPE_RIGHTMARGIN:
+                        $this->readRightMargin();
+
+                        break;
+                    case self::XLS_TYPE_TOPMARGIN:
+                        $this->readTopMargin();
+
+                        break;
+                    case self::XLS_TYPE_BOTTOMMARGIN:
+                        $this->readBottomMargin();
+
+                        break;
+                    case self::XLS_TYPE_PAGESETUP:
+                        $this->readPageSetup();
+
+                        break;
+                    case self::XLS_TYPE_PROTECT:
+                        $this->readProtect();
+
+                        break;
+                    case self::XLS_TYPE_SCENPROTECT:
+                        $this->readScenProtect();
+
+                        break;
+                    case self::XLS_TYPE_OBJECTPROTECT:
+                        $this->readObjectProtect();
+
+                        break;
+                    case self::XLS_TYPE_PASSWORD:
+                        $this->readPassword();
+
+                        break;
+                    case self::XLS_TYPE_DEFCOLWIDTH:
+                        $this->readDefColWidth();
+
+                        break;
+                    case self::XLS_TYPE_COLINFO:
+                        $this->readColInfo();
+
+                        break;
+                    case self::XLS_TYPE_DIMENSION:
+                        $this->readDefault();
+
+                        break;
+                    case self::XLS_TYPE_ROW:
+                        $this->readRow();
+
+                        break;
+                    case self::XLS_TYPE_DBCELL:
+                        $this->readDefault();
+
+                        break;
+                    case self::XLS_TYPE_RK:
+                        $this->readRk();
+
+                        break;
+                    case self::XLS_TYPE_LABELSST:
+                        $this->readLabelSst();
+
+                        break;
+                    case self::XLS_TYPE_MULRK:
+                        $this->readMulRk();
+
+                        break;
+                    case self::XLS_TYPE_NUMBER:
+                        $this->readNumber();
+
+                        break;
+                    case self::XLS_TYPE_FORMULA:
+                        $this->readFormula();
+
+                        break;
+                    case self::XLS_TYPE_SHAREDFMLA:
+                        $this->readSharedFmla();
+
+                        break;
+                    case self::XLS_TYPE_BOOLERR:
+                        $this->readBoolErr();
+
+                        break;
+                    case self::XLS_TYPE_MULBLANK:
+                        $this->readMulBlank();
+
+                        break;
+                    case self::XLS_TYPE_LABEL:
+                        $this->readLabel();
+
+                        break;
+                    case self::XLS_TYPE_BLANK:
+                        $this->readBlank();
+
+                        break;
+                    case self::XLS_TYPE_MSODRAWING:
+                        $this->readMsoDrawing();
+
+                        break;
+                    case self::XLS_TYPE_OBJ:
+                        $this->readObj();
+
+                        break;
+                    case self::XLS_TYPE_WINDOW2:
+                        $this->readWindow2();
+
+                        break;
+                    case self::XLS_TYPE_PAGELAYOUTVIEW:
+                        $this->readPageLayoutView();
+
+                        break;
+                    case self::XLS_TYPE_SCL:
+                        $this->readScl();
+
+                        break;
+                    case self::XLS_TYPE_PANE:
+                        $this->readPane();
+
+                        break;
+                    case self::XLS_TYPE_SELECTION:
+                        $selectedCells = $this->readSelection();
+
+                        break;
+                    case self::XLS_TYPE_MERGEDCELLS:
+                        $this->readMergedCells();
+
+                        break;
+                    case self::XLS_TYPE_HYPERLINK:
+                        $this->readHyperLink();
+
+                        break;
+                    case self::XLS_TYPE_DATAVALIDATIONS:
+                        $this->readDataValidations();
+
+                        break;
+                    case self::XLS_TYPE_DATAVALIDATION:
+                        $this->readDataValidation();
+
+                        break;
+                    case self::XLS_TYPE_CFHEADER:
+                        $cellRangeAddresses = $this->readCFHeader();
+
+                        break;
+                    case self::XLS_TYPE_CFRULE:
+                        $this->readCFRule($cellRangeAddresses ?? []);
+
+                        break;
+                    case self::XLS_TYPE_SHEETLAYOUT:
+                        $this->readSheetLayout();
+
+                        break;
+                    case self::XLS_TYPE_SHEETPROTECTION:
+                        $this->readSheetProtection();
+
+                        break;
+                    case self::XLS_TYPE_RANGEPROTECTION:
+                        $this->readRangeProtection();
+
+                        break;
+                    case self::XLS_TYPE_NOTE:
+                        $this->readNote();
+
+                        break;
+                    case self::XLS_TYPE_TXO:
+                        $this->readTextObject();
+
+                        break;
+                    case self::XLS_TYPE_CONTINUE:
+                        $this->readContinue();
+
+                        break;
+                    case self::XLS_TYPE_EOF:
+                        $this->readDefault();
+
+                        break 2;
+                    default:
+                        $this->readDefault();
+
+                        break;
+                }
+            }
+
+            // treat MSODRAWING records, sheet-level Escher
+            if (!$this->readDataOnly && $this->drawingData) {
+                $escherWorksheet = new Escher();
+                $reader = new Xls\Escher($escherWorksheet);
+                $escherWorksheet = $reader->load($this->drawingData);
+
+                // get all spContainers in one long array, so they can be mapped to OBJ records
+                /** @var SpContainer[] $allSpContainers */
+                $allSpContainers = method_exists($escherWorksheet, 'getDgContainer') ? $escherWorksheet->getDgContainer()->getSpgrContainer()->getAllSpContainers() : [];
+            }
+
+            // treat OBJ records
+            foreach ($this->objs as $n => $obj) {
+                // the first shape container never has a corresponding OBJ record, hence $n + 1
+                if (isset($allSpContainers[$n + 1])) {
+                    $spContainer = $allSpContainers[$n + 1];
+
+                    // we skip all spContainers that are a part of a group shape since we cannot yet handle those
+                    if ($spContainer->getNestingLevel() > 1) {
+                        continue;
+                    }
+
+                    // calculate the width and height of the shape
+                    /** @var int $startRow */
+                    [$startColumn, $startRow] = Coordinate::coordinateFromString($spContainer->getStartCoordinates());
+                    /** @var int $endRow */
+                    [$endColumn, $endRow] = Coordinate::coordinateFromString($spContainer->getEndCoordinates());
+
+                    $startOffsetX = $spContainer->getStartOffsetX();
+                    $startOffsetY = $spContainer->getStartOffsetY();
+                    $endOffsetX = $spContainer->getEndOffsetX();
+                    $endOffsetY = $spContainer->getEndOffsetY();
+
+                    $width = SharedXls::getDistanceX($this->phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
+                    $height = SharedXls::getDistanceY($this->phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
+
+                    // calculate offsetX and offsetY of the shape
+                    $offsetX = (int) ($startOffsetX * SharedXls::sizeCol($this->phpSheet, $startColumn) / 1024);
+                    $offsetY = (int) ($startOffsetY * SharedXls::sizeRow($this->phpSheet, $startRow) / 256);
+
+                    switch ($obj['otObjType']) {
+                        case 0x19:
+                            // Note
+                            if (isset($this->cellNotes[$obj['idObjID']])) {
+                                //$cellNote = $this->cellNotes[$obj['idObjID']];
+
+                                if (isset($this->textObjects[$obj['idObjID']])) {
+                                    $textObject = $this->textObjects[$obj['idObjID']];
+                                    $this->cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
+                                }
+                            }
+
+                            break;
+                        case 0x08:
+                            // picture
+                            // get index to BSE entry (1-based)
+                            $BSEindex = $spContainer->getOPT(0x0104);
+
+                            // If there is no BSE Index, we will fail here and other fields are not read.
+                            // Fix by checking here.
+                            // TODO: Why is there no BSE Index? Is this a new Office Version? Password protected field?
+                            // More likely : a uncompatible picture
+                            if (!$BSEindex) {
+                                continue 2;
+                            }
+
+                            if ($escherWorkbook) {
+                                $BSECollection = method_exists($escherWorkbook, 'getDggContainer') ? $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection() : [];
+                                $BSE = $BSECollection[$BSEindex - 1];
+                                $blipType = $BSE->getBlipType();
+
+                                // need check because some blip types are not supported by Escher reader such as EMF
+                                if ($blip = $BSE->getBlip()) {
+                                    $ih = imagecreatefromstring($blip->getData());
+                                    if ($ih !== false) {
+                                        $drawing = new MemoryDrawing();
+                                        $drawing->setImageResource($ih);
+
+                                        // width, height, offsetX, offsetY
+                                        $drawing->setResizeProportional(false);
+                                        $drawing->setWidth($width);
+                                        $drawing->setHeight($height);
+                                        $drawing->setOffsetX($offsetX);
+                                        $drawing->setOffsetY($offsetY);
+
+                                        switch ($blipType) {
+                                            case BSE::BLIPTYPE_JPEG:
+                                                $drawing->setRenderingFunction(MemoryDrawing::RENDERING_JPEG);
+                                                $drawing->setMimeType(MemoryDrawing::MIMETYPE_JPEG);
+
+                                                break;
+                                            case BSE::BLIPTYPE_PNG:
+                                                imagealphablending($ih, false);
+                                                imagesavealpha($ih, true);
+                                                $drawing->setRenderingFunction(MemoryDrawing::RENDERING_PNG);
+                                                $drawing->setMimeType(MemoryDrawing::MIMETYPE_PNG);
+
+                                                break;
+                                        }
+
+                                        $drawing->setWorksheet($this->phpSheet);
+                                        $drawing->setCoordinates($spContainer->getStartCoordinates());
+                                    }
+                                }
+                            }
+
+                            break;
+                        default:
+                            // other object type
+                            break;
+                    }
+                }
+            }
+
+            // treat SHAREDFMLA records
+            if ($this->version == self::XLS_BIFF8) {
+                foreach ($this->sharedFormulaParts as $cell => $baseCell) {
+                    /** @var int $row */
+                    [$column, $row] = Coordinate::coordinateFromString($cell);
+                    if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($column, $row, $this->phpSheet->getTitle())) {
+                        $formula = $this->getFormulaFromStructure($this->sharedFormulas[$baseCell], $cell);
+                        $this->phpSheet->getCell($cell)->setValueExplicit('=' . $formula, DataType::TYPE_FORMULA);
+                    }
+                }
+            }
+
+            if (!empty($this->cellNotes)) {
+                foreach ($this->cellNotes as $note => $noteDetails) {
+                    if (!isset($noteDetails['objTextData'])) {
+                        if (isset($this->textObjects[$note])) {
+                            $textObject = $this->textObjects[$note];
+                            $noteDetails['objTextData'] = $textObject;
+                        } else {
+                            $noteDetails['objTextData']['text'] = '';
+                        }
+                    }
+                    $cellAddress = str_replace('$', '', $noteDetails['cellRef']);
+                    $this->phpSheet->getComment($cellAddress)->setAuthor($noteDetails['author'])->setText($this->parseRichText($noteDetails['objTextData']['text']));
+                }
+            }
+            if ($selectedCells !== '') {
+                $this->phpSheet->setSelectedCells($selectedCells);
+            }
+        }
+        if ($this->activeSheetSet === false) {
+            $this->spreadsheet->setActiveSheetIndex(0);
+        }
+
+        // add the named ranges (defined names)
+        foreach ($this->definedname as $definedName) {
+            if ($definedName['isBuiltInName']) {
+                switch ($definedName['name']) {
+                    case pack('C', 0x06):
+                        // print area
+                        //    in general, formula looks like this: Foo!$C$7:$J$66,Bar!$A$1:$IV$2
+                        $ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
+
+                        $extractedRanges = [];
+                        $sheetName = '';
+                        /** @var non-empty-string $range */
+                        foreach ($ranges as $range) {
+                            // $range should look like one of these
+                            //        Foo!$C$7:$J$66
+                            //        Bar!$A$1:$IV$2
+                            $explodes = Worksheet::extractSheetTitle($range, true);
+                            $sheetName = trim($explodes[0], "'");
+                            if (!str_contains($explodes[1], ':')) {
+                                $explodes[1] = $explodes[1] . ':' . $explodes[1];
+                            }
+                            $extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
+                        }
+                        if ($docSheet = $this->spreadsheet->getSheetByName($sheetName)) {
+                            $docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
+                        }
+
+                        break;
+                    case pack('C', 0x07):
+                        // print titles (repeating rows)
+                        // Assuming BIFF8, there are 3 cases
+                        // 1. repeating rows
+                        //        formula looks like this: Sheet!$A$1:$IV$2
+                        //        rows 1-2 repeat
+                        // 2. repeating columns
+                        //        formula looks like this: Sheet!$A$1:$B$65536
+                        //        columns A-B repeat
+                        // 3. both repeating rows and repeating columns
+                        //        formula looks like this: Sheet!$A$1:$B$65536,Sheet!$A$1:$IV$2
+                        $ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
+                        foreach ($ranges as $range) {
+                            // $range should look like this one of these
+                            //        Sheet!$A$1:$B$65536
+                            //        Sheet!$A$1:$IV$2
+                            if (str_contains($range, '!')) {
+                                $explodes = Worksheet::extractSheetTitle($range, true);
+                                if ($docSheet = $this->spreadsheet->getSheetByName($explodes[0])) {
+                                    $extractedRange = $explodes[1];
+                                    $extractedRange = str_replace('$', '', $extractedRange);
+
+                                    $coordinateStrings = explode(':', $extractedRange);
+                                    if (count($coordinateStrings) == 2) {
+                                        [$firstColumn, $firstRow] = Coordinate::coordinateFromString($coordinateStrings[0]);
+                                        [$lastColumn, $lastRow] = Coordinate::coordinateFromString($coordinateStrings[1]);
+
+                                        if ($firstColumn == 'A' && $lastColumn == 'IV') {
+                                            // then we have repeating rows
+                                            $docSheet->getPageSetup()->setRowsToRepeatAtTop([$firstRow, $lastRow]);
+                                        } elseif ($firstRow == 1 && $lastRow == 65536) {
+                                            // then we have repeating columns
+                                            $docSheet->getPageSetup()->setColumnsToRepeatAtLeft([$firstColumn, $lastColumn]);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        break;
+                }
+            } else {
+                // Extract range
+                /** @var non-empty-string $formula */
+                $formula = $definedName['formula'];
+                if (str_contains($formula, '!')) {
+                    $explodes = Worksheet::extractSheetTitle($formula, true);
+                    if (
+                        ($docSheet = $this->spreadsheet->getSheetByName($explodes[0]))
+                        || ($docSheet = $this->spreadsheet->getSheetByName(trim($explodes[0], "'")))
+                    ) {
+                        $extractedRange = $explodes[1];
+
+                        $localOnly = ($definedName['scope'] === 0) ? false : true;
+
+                        $scope = ($definedName['scope'] === 0) ? null : $this->spreadsheet->getSheetByName($this->sheets[$definedName['scope'] - 1]['name']);
+
+                        $this->spreadsheet->addNamedRange(new NamedRange((string) $definedName['name'], $docSheet, $extractedRange, $localOnly, $scope));
+                    }
+                }
+                //    Named Value
+                //    TODO Provide support for named values
+            }
+        }
+        $this->data = '';
+
+        return $this->spreadsheet;
+    }
+
+    /**
+     * Read record data from stream, decrypting as required.
+     *
+     * @param string $data Data stream to read from
+     * @param int $pos Position to start reading from
+     * @param int $len Record data length
+     *
+     * @return string Record data
+     */
+    private function readRecordData(string $data, int $pos, int $len): string
+    {
+        $data = substr($data, $pos, $len);
+
+        // File not encrypted, or record before encryption start point
+        if ($this->encryption == self::MS_BIFF_CRYPTO_NONE || $pos < $this->encryptionStartPos) {
+            return $data;
+        }
+
+        $recordData = '';
+        if ($this->encryption == self::MS_BIFF_CRYPTO_RC4) {
+            $oldBlock = floor($this->rc4Pos / self::REKEY_BLOCK);
+            $block = (int) floor($pos / self::REKEY_BLOCK);
+            $endBlock = (int) floor(($pos + $len) / self::REKEY_BLOCK);
+
+            // Spin an RC4 decryptor to the right spot. If we have a decryptor sitting
+            // at a point earlier in the current block, re-use it as we can save some time.
+            if ($block != $oldBlock || $pos < $this->rc4Pos || !$this->rc4Key) {
+                $this->rc4Key = $this->makeKey($block, $this->md5Ctxt);
+                $step = $pos % self::REKEY_BLOCK;
+            } else {
+                $step = $pos - $this->rc4Pos;
+            }
+            $this->rc4Key->RC4(str_repeat("\0", $step));
+
+            // Decrypt record data (re-keying at the end of every block)
+            while ($block != $endBlock) {
+                $step = self::REKEY_BLOCK - ($pos % self::REKEY_BLOCK);
+                $recordData .= $this->rc4Key->RC4(substr($data, 0, $step));
+                $data = substr($data, $step);
+                $pos += $step;
+                $len -= $step;
+                ++$block;
+                $this->rc4Key = $this->makeKey($block, $this->md5Ctxt);
+            }
+            $recordData .= $this->rc4Key->RC4(substr($data, 0, $len));
+
+            // Keep track of the position of this decryptor.
+            // We'll try and re-use it later if we can to speed things up
+            $this->rc4Pos = $pos + $len;
+        } elseif ($this->encryption == self::MS_BIFF_CRYPTO_XOR) {
+            throw new Exception('XOr encryption not supported');
+        }
+
+        return $recordData;
+    }
+
+    /**
+     * Use OLE reader to extract the relevant data streams from the OLE file.
+     */
+    private function loadOLE(string $filename): void
+    {
+        // OLE reader
+        $ole = new OLERead();
+        // get excel data,
+        $ole->read($filename);
+        // Get workbook data: workbook stream + sheet streams
+        $this->data = $ole->getStream($ole->wrkbook); // @phpstan-ignore-line
+        // Get summary information data
+        $this->summaryInformation = $ole->getStream($ole->summaryInformation);
+        // Get additional document summary information data
+        $this->documentSummaryInformation = $ole->getStream($ole->documentSummaryInformation);
+    }
+
+    /**
+     * Read summary information.
+     */
+    private function readSummaryInformation(): void
+    {
+        if (!isset($this->summaryInformation)) {
+            return;
+        }
+
+        // offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
+        // offset: 2; size: 2;
+        // offset: 4; size: 2; OS version
+        // offset: 6; size: 2; OS indicator
+        // offset: 8; size: 16
+        // offset: 24; size: 4; section count
+        //$secCount = self::getInt4d($this->summaryInformation, 24);
+
+        // offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
+        // offset: 44; size: 4
+        $secOffset = self::getInt4d($this->summaryInformation, 44);
+
+        // section header
+        // offset: $secOffset; size: 4; section length
+        //$secLength = self::getInt4d($this->summaryInformation, $secOffset);
+
+        // offset: $secOffset+4; size: 4; property count
+        $countProperties = self::getInt4d($this->summaryInformation, $secOffset + 4);
+
+        // initialize code page (used to resolve string values)
+        $codePage = 'CP1252';
+
+        // offset: ($secOffset+8); size: var
+        // loop through property decarations and properties
+        for ($i = 0; $i < $countProperties; ++$i) {
+            // offset: ($secOffset+8) + (8 * $i); size: 4; property ID
+            $id = self::getInt4d($this->summaryInformation, ($secOffset + 8) + (8 * $i));
+
+            // Use value of property id as appropriate
+            // offset: ($secOffset+12) + (8 * $i); size: 4; offset from beginning of section (48)
+            $offset = self::getInt4d($this->summaryInformation, ($secOffset + 12) + (8 * $i));
+
+            $type = self::getInt4d($this->summaryInformation, $secOffset + $offset);
+
+            // initialize property value
+            $value = null;
+
+            // extract property value based on property type
+            switch ($type) {
+                case 0x02: // 2 byte signed integer
+                    $value = self::getUInt2d($this->summaryInformation, $secOffset + 4 + $offset);
+
+                    break;
+                case 0x03: // 4 byte signed integer
+                    $value = self::getInt4d($this->summaryInformation, $secOffset + 4 + $offset);
+
+                    break;
+                case 0x13: // 4 byte unsigned integer
+                    // not needed yet, fix later if necessary
+                    break;
+                case 0x1E: // null-terminated string prepended by dword string length
+                    $byteLength = self::getInt4d($this->summaryInformation, $secOffset + 4 + $offset);
+                    $value = substr($this->summaryInformation, $secOffset + 8 + $offset, $byteLength);
+                    $value = StringHelper::convertEncoding($value, 'UTF-8', $codePage);
+                    $value = rtrim($value);
+
+                    break;
+                case 0x40: // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                    // PHP-time
+                    $value = OLE::OLE2LocalDate(substr($this->summaryInformation, $secOffset + 4 + $offset, 8));
+
+                    break;
+                case 0x47: // Clipboard format
+                    // not needed yet, fix later if necessary
+                    break;
+            }
+
+            switch ($id) {
+                case 0x01:    //    Code Page
+                    $codePage = CodePage::numberToName((int) $value);
+
+                    break;
+                case 0x02:    //    Title
+                    $this->spreadsheet->getProperties()->setTitle("$value");
+
+                    break;
+                case 0x03:    //    Subject
+                    $this->spreadsheet->getProperties()->setSubject("$value");
+
+                    break;
+                case 0x04:    //    Author (Creator)
+                    $this->spreadsheet->getProperties()->setCreator("$value");
+
+                    break;
+                case 0x05:    //    Keywords
+                    $this->spreadsheet->getProperties()->setKeywords("$value");
+
+                    break;
+                case 0x06:    //    Comments (Description)
+                    $this->spreadsheet->getProperties()->setDescription("$value");
+
+                    break;
+                case 0x07:    //    Template
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x08:    //    Last Saved By (LastModifiedBy)
+                    $this->spreadsheet->getProperties()->setLastModifiedBy("$value");
+
+                    break;
+                case 0x09:    //    Revision
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0A:    //    Total Editing Time
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0B:    //    Last Printed
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0C:    //    Created Date/Time
+                    $this->spreadsheet->getProperties()->setCreated($value);
+
+                    break;
+                case 0x0D:    //    Modified Date/Time
+                    $this->spreadsheet->getProperties()->setModified($value);
+
+                    break;
+                case 0x0E:    //    Number of Pages
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0F:    //    Number of Words
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x10:    //    Number of Characters
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x11:    //    Thumbnail
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x12:    //    Name of creating application
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x13:    //    Security
+                    //    Not supported by PhpSpreadsheet
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Read additional document summary information.
+     */
+    private function readDocumentSummaryInformation(): void
+    {
+        if (!isset($this->documentSummaryInformation)) {
+            return;
+        }
+
+        //    offset: 0;    size: 2;    must be 0xFE 0xFF (UTF-16 LE byte order mark)
+        //    offset: 2;    size: 2;
+        //    offset: 4;    size: 2;    OS version
+        //    offset: 6;    size: 2;    OS indicator
+        //    offset: 8;    size: 16
+        //    offset: 24;    size: 4;    section count
+        //$secCount = self::getInt4d($this->documentSummaryInformation, 24);
+
+        // offset: 28;    size: 16;    first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
+        // offset: 44;    size: 4;    first section offset
+        $secOffset = self::getInt4d($this->documentSummaryInformation, 44);
+
+        //    section header
+        //    offset: $secOffset;    size: 4;    section length
+        //$secLength = self::getInt4d($this->documentSummaryInformation, $secOffset);
+
+        //    offset: $secOffset+4;    size: 4;    property count
+        $countProperties = self::getInt4d($this->documentSummaryInformation, $secOffset + 4);
+
+        // initialize code page (used to resolve string values)
+        $codePage = 'CP1252';
+
+        //    offset: ($secOffset+8);    size: var
+        //    loop through property decarations and properties
+        for ($i = 0; $i < $countProperties; ++$i) {
+            //    offset: ($secOffset+8) + (8 * $i);    size: 4;    property ID
+            $id = self::getInt4d($this->documentSummaryInformation, ($secOffset + 8) + (8 * $i));
+
+            // Use value of property id as appropriate
+            // offset: 60 + 8 * $i;    size: 4;    offset from beginning of section (48)
+            $offset = self::getInt4d($this->documentSummaryInformation, ($secOffset + 12) + (8 * $i));
+
+            $type = self::getInt4d($this->documentSummaryInformation, $secOffset + $offset);
+
+            // initialize property value
+            $value = null;
+
+            // extract property value based on property type
+            switch ($type) {
+                case 0x02:    //    2 byte signed integer
+                    $value = self::getUInt2d($this->documentSummaryInformation, $secOffset + 4 + $offset);
+
+                    break;
+                case 0x03:    //    4 byte signed integer
+                    $value = self::getInt4d($this->documentSummaryInformation, $secOffset + 4 + $offset);
+
+                    break;
+                case 0x0B:  // Boolean
+                    $value = self::getUInt2d($this->documentSummaryInformation, $secOffset + 4 + $offset);
+                    $value = ($value == 0 ? false : true);
+
+                    break;
+                case 0x13:    //    4 byte unsigned integer
+                    // not needed yet, fix later if necessary
+                    break;
+                case 0x1E:    //    null-terminated string prepended by dword string length
+                    $byteLength = self::getInt4d($this->documentSummaryInformation, $secOffset + 4 + $offset);
+                    $value = substr($this->documentSummaryInformation, $secOffset + 8 + $offset, $byteLength);
+                    $value = StringHelper::convertEncoding($value, 'UTF-8', $codePage);
+                    $value = rtrim($value);
+
+                    break;
+                case 0x40:    //    Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                    // PHP-Time
+                    $value = OLE::OLE2LocalDate(substr($this->documentSummaryInformation, $secOffset + 4 + $offset, 8));
+
+                    break;
+                case 0x47:    //    Clipboard format
+                    // not needed yet, fix later if necessary
+                    break;
+            }
+
+            switch ($id) {
+                case 0x01:    //    Code Page
+                    $codePage = CodePage::numberToName((int) $value);
+
+                    break;
+                case 0x02:    //    Category
+                    $this->spreadsheet->getProperties()->setCategory("$value");
+
+                    break;
+                case 0x03:    //    Presentation Target
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x04:    //    Bytes
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x05:    //    Lines
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x06:    //    Paragraphs
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x07:    //    Slides
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x08:    //    Notes
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x09:    //    Hidden Slides
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0A:    //    MM Clips
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0B:    //    Scale Crop
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0C:    //    Heading Pairs
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0D:    //    Titles of Parts
+                    //    Not supported by PhpSpreadsheet
+                    break;
+                case 0x0E:    //    Manager
+                    $this->spreadsheet->getProperties()->setManager("$value");
+
+                    break;
+                case 0x0F:    //    Company
+                    $this->spreadsheet->getProperties()->setCompany("$value");
+
+                    break;
+                case 0x10:    //    Links up-to-date
+                    //    Not supported by PhpSpreadsheet
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Reads a general type of BIFF record. Does nothing except for moving stream pointer forward to next record.
+     */
+    private function readDefault(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+    }
+
+    /**
+     *    The NOTE record specifies a comment associated with a particular cell. In Excel 95 (BIFF7) and earlier versions,
+     *        this record stores a note (cell note). This feature was significantly enhanced in Excel 97.
+     */
+    private function readNote(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        $cellAddress = $this->readBIFF8CellAddress(substr($recordData, 0, 4));
+        if ($this->version == self::XLS_BIFF8) {
+            $noteObjID = self::getUInt2d($recordData, 6);
+            $noteAuthor = self::readUnicodeStringLong(substr($recordData, 8));
+            $noteAuthor = $noteAuthor['value'];
+            $this->cellNotes[$noteObjID] = [
+                'cellRef' => $cellAddress,
+                'objectID' => $noteObjID,
+                'author' => $noteAuthor,
+            ];
+        } else {
+            $extension = false;
+            if ($cellAddress == '$B$65536') {
+                //    If the address row is -1 and the column is 0, (which translates as $B$65536) then this is a continuation
+                //        note from the previous cell annotation. We're not yet handling this, so annotations longer than the
+                //        max 2048 bytes will probably throw a wobbly.
+                //$row = self::getUInt2d($recordData, 0);
+                $extension = true;
+                $arrayKeys = array_keys($this->phpSheet->getComments());
+                $cellAddress = array_pop($arrayKeys);
+            }
+
+            $cellAddress = str_replace('$', '', (string) $cellAddress);
+            //$noteLength = self::getUInt2d($recordData, 4);
+            $noteText = trim(substr($recordData, 6));
+
+            if ($extension) {
+                //    Concatenate this extension with the currently set comment for the cell
+                $comment = $this->phpSheet->getComment($cellAddress);
+                $commentText = $comment->getText()->getPlainText();
+                $comment->setText($this->parseRichText($commentText . $noteText));
+            } else {
+                //    Set comment for the cell
+                $this->phpSheet->getComment($cellAddress)->setText($this->parseRichText($noteText));
+//                                                    ->setAuthor($author)
+            }
+        }
+    }
+
+    /**
+     * The TEXT Object record contains the text associated with a cell annotation.
+     */
+    private function readTextObject(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // recordData consists of an array of subrecords looking like this:
+        //    grbit: 2 bytes; Option Flags
+        //    rot: 2 bytes; rotation
+        //    cchText: 2 bytes; length of the text (in the first continue record)
+        //    cbRuns: 2 bytes; length of the formatting (in the second continue record)
+        // followed by the continuation records containing the actual text and formatting
+        $grbitOpts = self::getUInt2d($recordData, 0);
+        $rot = self::getUInt2d($recordData, 2);
+        //$cchText = self::getUInt2d($recordData, 10);
+        $cbRuns = self::getUInt2d($recordData, 12);
+        $text = $this->getSplicedRecordData();
+
+        $textByte = $text['spliceOffsets'][1] - $text['spliceOffsets'][0] - 1;
+        $textStr = substr($text['recordData'], $text['spliceOffsets'][0] + 1, $textByte);
+        // get 1 byte
+        $is16Bit = ord($text['recordData'][0]);
+        // it is possible to use a compressed format,
+        // which omits the high bytes of all characters, if they are all zero
+        if (($is16Bit & 0x01) === 0) {
+            $textStr = StringHelper::ConvertEncoding($textStr, 'UTF-8', 'ISO-8859-1');
+        } else {
+            $textStr = $this->decodeCodepage($textStr);
+        }
+
+        $this->textObjects[$this->textObjRef] = [
+            'text' => $textStr,
+            'format' => substr($text['recordData'], $text['spliceOffsets'][1], $cbRuns),
+            'alignment' => $grbitOpts,
+            'rotation' => $rot,
+        ];
+    }
+
+    /**
+     * Read BOF.
+     */
+    private function readBof(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = substr($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 2; size: 2; type of the following data
+        $substreamType = self::getUInt2d($recordData, 2);
+
+        switch ($substreamType) {
+            case self::XLS_WORKBOOKGLOBALS:
+                $version = self::getUInt2d($recordData, 0);
+                if (($version != self::XLS_BIFF8) && ($version != self::XLS_BIFF7)) {
+                    throw new Exception('Cannot read this Excel file. Version is too old.');
+                }
+                $this->version = $version;
+
+                break;
+            case self::XLS_WORKSHEET:
+                // do not use this version information for anything
+                // it is unreliable (OpenOffice doc, 5.8), use only version information from the global stream
+                break;
+            default:
+                // substream, e.g. chart
+                // just skip the entire substream
+                do {
+                    $code = self::getUInt2d($this->data, $this->pos);
+                    $this->readDefault();
+                } while ($code != self::XLS_TYPE_EOF && $this->pos < $this->dataSize);
+
+                break;
+        }
+    }
+
+    /**
+     * FILEPASS.
+     *
+     * This record is part of the File Protection Block. It
+     * contains information about the read/write password of the
+     * file. All record contents following this record will be
+     * encrypted.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     *
+     * The decryption functions and objects used from here on in
+     * are based on the source of Spreadsheet-ParseExcel:
+     * https://metacpan.org/release/Spreadsheet-ParseExcel
+     */
+    private function readFilepass(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+
+        if ($length != 54) {
+            throw new Exception('Unexpected file pass record length');
+        }
+
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->verifyPassword('VelvetSweatshop', substr($recordData, 6, 16), substr($recordData, 22, 16), substr($recordData, 38, 16), $this->md5Ctxt)) {
+            throw new Exception('Decryption password incorrect');
+        }
+
+        $this->encryption = self::MS_BIFF_CRYPTO_RC4;
+
+        // Decryption required from the record after next onwards
+        $this->encryptionStartPos = $this->pos + self::getUInt2d($this->data, $this->pos + 2);
+    }
+
+    /**
+     * Make an RC4 decryptor for the given block.
+     *
+     * @param int $block Block for which to create decrypto
+     * @param string $valContext MD5 context state
+     */
+    private function makeKey(int $block, string $valContext): Xls\RC4
+    {
+        $pwarray = str_repeat("\0", 64);
+
+        for ($i = 0; $i < 5; ++$i) {
+            $pwarray[$i] = $valContext[$i];
+        }
+
+        $pwarray[5] = chr($block & 0xFF);
+        $pwarray[6] = chr(($block >> 8) & 0xFF);
+        $pwarray[7] = chr(($block >> 16) & 0xFF);
+        $pwarray[8] = chr(($block >> 24) & 0xFF);
+
+        $pwarray[9] = "\x80";
+        $pwarray[56] = "\x48";
+
+        $md5 = new Xls\MD5();
+        $md5->add($pwarray);
+
+        $s = $md5->getContext();
+
+        return new Xls\RC4($s);
+    }
+
+    /**
+     * Verify RC4 file password.
+     *
+     * @param string $password Password to check
+     * @param string $docid Document id
+     * @param string $salt_data Salt data
+     * @param string $hashedsalt_data Hashed salt data
+     * @param string $valContext Set to the MD5 context of the value
+     *
+     * @return bool Success
+     */
+    private function verifyPassword(string $password, string $docid, string $salt_data, string $hashedsalt_data, string &$valContext): bool
+    {
+        $pwarray = str_repeat("\0", 64);
+
+        $iMax = strlen($password);
+        for ($i = 0; $i < $iMax; ++$i) {
+            $o = ord(substr($password, $i, 1));
+            $pwarray[2 * $i] = chr($o & 0xFF);
+            $pwarray[2 * $i + 1] = chr(($o >> 8) & 0xFF);
+        }
+        $pwarray[2 * $i] = chr(0x80);
+        $pwarray[56] = chr(($i << 4) & 0xFF);
+
+        $md5 = new Xls\MD5();
+        $md5->add($pwarray);
+
+        $mdContext1 = $md5->getContext();
+
+        $offset = 0;
+        $keyoffset = 0;
+        $tocopy = 5;
+
+        $md5->reset();
+
+        while ($offset != 16) {
+            if ((64 - $offset) < 5) {
+                $tocopy = 64 - $offset;
+            }
+            for ($i = 0; $i <= $tocopy; ++$i) {
+                $pwarray[$offset + $i] = $mdContext1[$keyoffset + $i];
+            }
+            $offset += $tocopy;
+
+            if ($offset == 64) {
+                $md5->add($pwarray);
+                $keyoffset = $tocopy;
+                $tocopy = 5 - $tocopy;
+                $offset = 0;
+
+                continue;
+            }
+
+            $keyoffset = 0;
+            $tocopy = 5;
+            for ($i = 0; $i < 16; ++$i) {
+                $pwarray[$offset + $i] = $docid[$i];
+            }
+            $offset += 16;
+        }
+
+        $pwarray[16] = "\x80";
+        for ($i = 0; $i < 47; ++$i) {
+            $pwarray[17 + $i] = "\0";
+        }
+        $pwarray[56] = "\x80";
+        $pwarray[57] = "\x0a";
+
+        $md5->add($pwarray);
+        $valContext = $md5->getContext();
+
+        $key = $this->makeKey(0, $valContext);
+
+        $salt = $key->RC4($salt_data);
+        $hashedsalt = $key->RC4($hashedsalt_data);
+
+        $salt .= "\x80" . str_repeat("\0", 47);
+        $salt[56] = "\x80";
+
+        $md5->reset();
+        $md5->add($salt);
+        $mdContext2 = $md5->getContext();
+
+        return $mdContext2 == $hashedsalt;
+    }
+
+    /**
+     * CODEPAGE.
+     *
+     * This record stores the text encoding used to write byte
+     * strings, stored as MS Windows code page identifier.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readCodepage(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; code page identifier
+        $codepage = self::getUInt2d($recordData, 0);
+
+        $this->codepage = CodePage::numberToName($codepage);
+    }
+
+    /**
+     * DATEMODE.
+     *
+     * This record specifies the base date for displaying date
+     * values. All dates are stored as count of days past this
+     * base date. In BIFF2-BIFF4 this record is part of the
+     * Calculation Settings Block. In BIFF5-BIFF8 it is
+     * stored in the Workbook Globals Substream.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readDateMode(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; 0 = base 1900, 1 = base 1904
+        Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+        $this->spreadsheet->setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+        if (ord($recordData[0]) == 1) {
+            Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
+            $this->spreadsheet->setExcelCalendar(Date::CALENDAR_MAC_1904);
+        }
+    }
+
+    /**
+     * Read a FONT record.
+     */
+    private function readFont(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            $objFont = new Font();
+
+            // offset: 0; size: 2; height of the font (in twips = 1/20 of a point)
+            $size = self::getUInt2d($recordData, 0);
+            $objFont->setSize($size / 20);
+
+            // offset: 2; size: 2; option flags
+            // bit: 0; mask 0x0001; bold (redundant in BIFF5-BIFF8)
+            // bit: 1; mask 0x0002; italic
+            $isItalic = (0x0002 & self::getUInt2d($recordData, 2)) >> 1;
+            if ($isItalic) {
+                $objFont->setItalic(true);
+            }
+
+            // bit: 2; mask 0x0004; underlined (redundant in BIFF5-BIFF8)
+            // bit: 3; mask 0x0008; strikethrough
+            $isStrike = (0x0008 & self::getUInt2d($recordData, 2)) >> 3;
+            if ($isStrike) {
+                $objFont->setStrikethrough(true);
+            }
+
+            // offset: 4; size: 2; colour index
+            $colorIndex = self::getUInt2d($recordData, 4);
+            $objFont->colorIndex = $colorIndex;
+
+            // offset: 6; size: 2; font weight
+            $weight = self::getUInt2d($recordData, 6); // regular=400 bold=700
+            if ($weight >= 550) {
+                $objFont->setBold(true);
+            }
+
+            // offset: 8; size: 2; escapement type
+            $escapement = self::getUInt2d($recordData, 8);
+            CellFont::escapement($objFont, $escapement);
+
+            // offset: 10; size: 1; underline type
+            $underlineType = ord($recordData[10]);
+            CellFont::underline($objFont, $underlineType);
+
+            // offset: 11; size: 1; font family
+            // offset: 12; size: 1; character set
+            // offset: 13; size: 1; not used
+            // offset: 14; size: var; font name
+            if ($this->version == self::XLS_BIFF8) {
+                $string = self::readUnicodeStringShort(substr($recordData, 14));
+            } else {
+                $string = $this->readByteStringShort(substr($recordData, 14));
+            }
+            $objFont->setName($string['value']);
+
+            $this->objFonts[] = $objFont;
+        }
+    }
+
+    /**
+     * FORMAT.
+     *
+     * This record contains information about a number format.
+     * All FORMAT records occur together in a sequential list.
+     *
+     * In BIFF2-BIFF4 other records referencing a FORMAT record
+     * contain a zero-based index into this list. From BIFF5 on
+     * the FORMAT record contains the index itself that will be
+     * used by other records.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readFormat(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            $indexCode = self::getUInt2d($recordData, 0);
+
+            if ($this->version == self::XLS_BIFF8) {
+                $string = self::readUnicodeStringLong(substr($recordData, 2));
+            } else {
+                // BIFF7
+                $string = $this->readByteStringShort(substr($recordData, 2));
+            }
+
+            $formatString = $string['value'];
+            // Apache Open Office sets wrong case writing to xls - issue 2239
+            if ($formatString === 'GENERAL') {
+                $formatString = NumberFormat::FORMAT_GENERAL;
+            }
+            $this->formats[$indexCode] = $formatString;
+        }
+    }
+
+    /**
+     * XF - Extended Format.
+     *
+     * This record contains formatting information for cells, rows, columns or styles.
+     * According to https://support.microsoft.com/en-us/help/147732 there are always at least 15 cell style XF
+     * and 1 cell XF.
+     * Inspection of Excel files generated by MS Office Excel shows that XF records 0-14 are cell style XF
+     * and XF record 15 is a cell XF
+     * We only read the first cell style XF and skip the remaining cell style XF records
+     * We read all cell XF records.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readXf(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        $objStyle = new Style();
+
+        if (!$this->readDataOnly) {
+            // offset:  0; size: 2; Index to FONT record
+            if (self::getUInt2d($recordData, 0) < 4) {
+                $fontIndex = self::getUInt2d($recordData, 0);
+            } else {
+                // this has to do with that index 4 is omitted in all BIFF versions for some strange reason
+                // check the OpenOffice documentation of the FONT record
+                $fontIndex = self::getUInt2d($recordData, 0) - 1;
+            }
+            if (isset($this->objFonts[$fontIndex])) {
+                $objStyle->setFont($this->objFonts[$fontIndex]);
+            }
+
+            // offset:  2; size: 2; Index to FORMAT record
+            $numberFormatIndex = self::getUInt2d($recordData, 2);
+            if (isset($this->formats[$numberFormatIndex])) {
+                // then we have user-defined format code
+                $numberFormat = ['formatCode' => $this->formats[$numberFormatIndex]];
+            } elseif (($code = NumberFormat::builtInFormatCode($numberFormatIndex)) !== '') {
+                // then we have built-in format code
+                $numberFormat = ['formatCode' => $code];
+            } else {
+                // we set the general format code
+                $numberFormat = ['formatCode' => NumberFormat::FORMAT_GENERAL];
+            }
+            $objStyle->getNumberFormat()->setFormatCode($numberFormat['formatCode']);
+
+            // offset:  4; size: 2; XF type, cell protection, and parent style XF
+            // bit 2-0; mask 0x0007; XF_TYPE_PROT
+            $xfTypeProt = self::getUInt2d($recordData, 4);
+            // bit 0; mask 0x01; 1 = cell is locked
+            $isLocked = (0x01 & $xfTypeProt) >> 0;
+            $objStyle->getProtection()->setLocked($isLocked ? Protection::PROTECTION_INHERIT : Protection::PROTECTION_UNPROTECTED);
+
+            // bit 1; mask 0x02; 1 = Formula is hidden
+            $isHidden = (0x02 & $xfTypeProt) >> 1;
+            $objStyle->getProtection()->setHidden($isHidden ? Protection::PROTECTION_PROTECTED : Protection::PROTECTION_UNPROTECTED);
+
+            // bit 2; mask 0x04; 0 = Cell XF, 1 = Cell Style XF
+            $isCellStyleXf = (0x04 & $xfTypeProt) >> 2;
+
+            // offset:  6; size: 1; Alignment and text break
+            // bit 2-0, mask 0x07; horizontal alignment
+            $horAlign = (0x07 & ord($recordData[6])) >> 0;
+            Xls\Style\CellAlignment::horizontal($objStyle->getAlignment(), $horAlign);
+
+            // bit 3, mask 0x08; wrap text
+            $wrapText = (0x08 & ord($recordData[6])) >> 3;
+            Xls\Style\CellAlignment::wrap($objStyle->getAlignment(), $wrapText);
+
+            // bit 6-4, mask 0x70; vertical alignment
+            $vertAlign = (0x70 & ord($recordData[6])) >> 4;
+            Xls\Style\CellAlignment::vertical($objStyle->getAlignment(), $vertAlign);
+
+            if ($this->version == self::XLS_BIFF8) {
+                // offset:  7; size: 1; XF_ROTATION: Text rotation angle
+                $angle = ord($recordData[7]);
+                $rotation = 0;
+                if ($angle <= 90) {
+                    $rotation = $angle;
+                } elseif ($angle <= 180) {
+                    $rotation = 90 - $angle;
+                } elseif ($angle == Alignment::TEXTROTATION_STACK_EXCEL) {
+                    $rotation = Alignment::TEXTROTATION_STACK_PHPSPREADSHEET;
+                }
+                $objStyle->getAlignment()->setTextRotation($rotation);
+
+                // offset:  8; size: 1; Indentation, shrink to cell size, and text direction
+                // bit: 3-0; mask: 0x0F; indent level
+                $indent = (0x0F & ord($recordData[8])) >> 0;
+                $objStyle->getAlignment()->setIndent($indent);
+
+                // bit: 4; mask: 0x10; 1 = shrink content to fit into cell
+                $shrinkToFit = (0x10 & ord($recordData[8])) >> 4;
+                switch ($shrinkToFit) {
+                    case 0:
+                        $objStyle->getAlignment()->setShrinkToFit(false);
+
+                        break;
+                    case 1:
+                        $objStyle->getAlignment()->setShrinkToFit(true);
+
+                        break;
+                }
+
+                // offset:  9; size: 1; Flags used for attribute groups
+
+                // offset: 10; size: 4; Cell border lines and background area
+                // bit: 3-0; mask: 0x0000000F; left style
+                if ($bordersLeftStyle = Xls\Style\Border::lookup((0x0000000F & self::getInt4d($recordData, 10)) >> 0)) {
+                    $objStyle->getBorders()->getLeft()->setBorderStyle($bordersLeftStyle);
+                }
+                // bit: 7-4; mask: 0x000000F0; right style
+                if ($bordersRightStyle = Xls\Style\Border::lookup((0x000000F0 & self::getInt4d($recordData, 10)) >> 4)) {
+                    $objStyle->getBorders()->getRight()->setBorderStyle($bordersRightStyle);
+                }
+                // bit: 11-8; mask: 0x00000F00; top style
+                if ($bordersTopStyle = Xls\Style\Border::lookup((0x00000F00 & self::getInt4d($recordData, 10)) >> 8)) {
+                    $objStyle->getBorders()->getTop()->setBorderStyle($bordersTopStyle);
+                }
+                // bit: 15-12; mask: 0x0000F000; bottom style
+                if ($bordersBottomStyle = Xls\Style\Border::lookup((0x0000F000 & self::getInt4d($recordData, 10)) >> 12)) {
+                    $objStyle->getBorders()->getBottom()->setBorderStyle($bordersBottomStyle);
+                }
+                // bit: 22-16; mask: 0x007F0000; left color
+                $objStyle->getBorders()->getLeft()->colorIndex = (0x007F0000 & self::getInt4d($recordData, 10)) >> 16;
+
+                // bit: 29-23; mask: 0x3F800000; right color
+                $objStyle->getBorders()->getRight()->colorIndex = (0x3F800000 & self::getInt4d($recordData, 10)) >> 23;
+
+                // bit: 30; mask: 0x40000000; 1 = diagonal line from top left to right bottom
+                $diagonalDown = (0x40000000 & self::getInt4d($recordData, 10)) >> 30 ? true : false;
+
+                // bit: 31; mask: 0x800000; 1 = diagonal line from bottom left to top right
+                $diagonalUp = (self::HIGH_ORDER_BIT & self::getInt4d($recordData, 10)) >> 31 ? true : false;
+
+                if ($diagonalUp === false) {
+                    if ($diagonalDown === false) {
+                        $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_NONE);
+                    } else {
+                        $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_DOWN);
+                    }
+                } elseif ($diagonalDown === false) {
+                    $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_UP);
+                } else {
+                    $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_BOTH);
+                }
+
+                // offset: 14; size: 4;
+                // bit: 6-0; mask: 0x0000007F; top color
+                $objStyle->getBorders()->getTop()->colorIndex = (0x0000007F & self::getInt4d($recordData, 14)) >> 0;
+
+                // bit: 13-7; mask: 0x00003F80; bottom color
+                $objStyle->getBorders()->getBottom()->colorIndex = (0x00003F80 & self::getInt4d($recordData, 14)) >> 7;
+
+                // bit: 20-14; mask: 0x001FC000; diagonal color
+                $objStyle->getBorders()->getDiagonal()->colorIndex = (0x001FC000 & self::getInt4d($recordData, 14)) >> 14;
+
+                // bit: 24-21; mask: 0x01E00000; diagonal style
+                if ($bordersDiagonalStyle = Xls\Style\Border::lookup((0x01E00000 & self::getInt4d($recordData, 14)) >> 21)) {
+                    $objStyle->getBorders()->getDiagonal()->setBorderStyle($bordersDiagonalStyle);
+                }
+
+                // bit: 31-26; mask: 0xFC000000 fill pattern
+                if ($fillType = FillPattern::lookup((self::FC000000 & self::getInt4d($recordData, 14)) >> 26)) {
+                    $objStyle->getFill()->setFillType($fillType);
+                }
+                // offset: 18; size: 2; pattern and background colour
+                // bit: 6-0; mask: 0x007F; color index for pattern color
+                $objStyle->getFill()->startcolorIndex = (0x007F & self::getUInt2d($recordData, 18)) >> 0;
+
+                // bit: 13-7; mask: 0x3F80; color index for pattern background
+                $objStyle->getFill()->endcolorIndex = (0x3F80 & self::getUInt2d($recordData, 18)) >> 7;
+            } else {
+                // BIFF5
+
+                // offset: 7; size: 1; Text orientation and flags
+                $orientationAndFlags = ord($recordData[7]);
+
+                // bit: 1-0; mask: 0x03; XF_ORIENTATION: Text orientation
+                $xfOrientation = (0x03 & $orientationAndFlags) >> 0;
+                switch ($xfOrientation) {
+                    case 0:
+                        $objStyle->getAlignment()->setTextRotation(0);
+
+                        break;
+                    case 1:
+                        $objStyle->getAlignment()->setTextRotation(Alignment::TEXTROTATION_STACK_PHPSPREADSHEET);
+
+                        break;
+                    case 2:
+                        $objStyle->getAlignment()->setTextRotation(90);
+
+                        break;
+                    case 3:
+                        $objStyle->getAlignment()->setTextRotation(-90);
+
+                        break;
+                }
+
+                // offset: 8; size: 4; cell border lines and background area
+                $borderAndBackground = self::getInt4d($recordData, 8);
+
+                // bit: 6-0; mask: 0x0000007F; color index for pattern color
+                $objStyle->getFill()->startcolorIndex = (0x0000007F & $borderAndBackground) >> 0;
+
+                // bit: 13-7; mask: 0x00003F80; color index for pattern background
+                $objStyle->getFill()->endcolorIndex = (0x00003F80 & $borderAndBackground) >> 7;
+
+                // bit: 21-16; mask: 0x003F0000; fill pattern
+                $objStyle->getFill()->setFillType(FillPattern::lookup((0x003F0000 & $borderAndBackground) >> 16));
+
+                // bit: 24-22; mask: 0x01C00000; bottom line style
+                $objStyle->getBorders()->getBottom()->setBorderStyle(Xls\Style\Border::lookup((0x01C00000 & $borderAndBackground) >> 22));
+
+                // bit: 31-25; mask: 0xFE000000; bottom line color
+                $objStyle->getBorders()->getBottom()->colorIndex = (self::FE000000 & $borderAndBackground) >> 25;
+
+                // offset: 12; size: 4; cell border lines
+                $borderLines = self::getInt4d($recordData, 12);
+
+                // bit: 2-0; mask: 0x00000007; top line style
+                $objStyle->getBorders()->getTop()->setBorderStyle(Xls\Style\Border::lookup((0x00000007 & $borderLines) >> 0));
+
+                // bit: 5-3; mask: 0x00000038; left line style
+                $objStyle->getBorders()->getLeft()->setBorderStyle(Xls\Style\Border::lookup((0x00000038 & $borderLines) >> 3));
+
+                // bit: 8-6; mask: 0x000001C0; right line style
+                $objStyle->getBorders()->getRight()->setBorderStyle(Xls\Style\Border::lookup((0x000001C0 & $borderLines) >> 6));
+
+                // bit: 15-9; mask: 0x0000FE00; top line color index
+                $objStyle->getBorders()->getTop()->colorIndex = (0x0000FE00 & $borderLines) >> 9;
+
+                // bit: 22-16; mask: 0x007F0000; left line color index
+                $objStyle->getBorders()->getLeft()->colorIndex = (0x007F0000 & $borderLines) >> 16;
+
+                // bit: 29-23; mask: 0x3F800000; right line color index
+                $objStyle->getBorders()->getRight()->colorIndex = (0x3F800000 & $borderLines) >> 23;
+            }
+
+            // add cellStyleXf or cellXf and update mapping
+            if ($isCellStyleXf) {
+                // we only read one style XF record which is always the first
+                if ($this->xfIndex == 0) {
+                    $this->spreadsheet->addCellStyleXf($objStyle);
+                    $this->mapCellStyleXfIndex[$this->xfIndex] = 0;
+                }
+            } else {
+                // we read all cell XF records
+                $this->spreadsheet->addCellXf($objStyle);
+                $this->mapCellXfIndex[$this->xfIndex] = count($this->spreadsheet->getCellXfCollection()) - 1;
+            }
+
+            // update XF index for when we read next record
+            ++$this->xfIndex;
+        }
+    }
+
+    private function readXfExt(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; 0x087D = repeated header
+
+            // offset: 2; size: 2
+
+            // offset: 4; size: 8; not used
+
+            // offset: 12; size: 2; record version
+
+            // offset: 14; size: 2; index to XF record which this record modifies
+            $ixfe = self::getUInt2d($recordData, 14);
+
+            // offset: 16; size: 2; not used
+
+            // offset: 18; size: 2; number of extension properties that follow
+            //$cexts = self::getUInt2d($recordData, 18);
+
+            // start reading the actual extension data
+            $offset = 20;
+            while ($offset < $length) {
+                // extension type
+                $extType = self::getUInt2d($recordData, $offset);
+
+                // extension length
+                $cb = self::getUInt2d($recordData, $offset + 2);
+
+                // extension data
+                $extData = substr($recordData, $offset + 4, $cb);
+
+                switch ($extType) {
+                    case 4:        // fill start color
+                        $xclfType = self::getUInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $fill = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFill();
+                                $fill->getStartColor()->setRGB($rgb);
+                                $fill->startcolorIndex = null; // normal color index does not apply, discard
+                            }
+                        }
+
+                        break;
+                    case 5:        // fill end color
+                        $xclfType = self::getUInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $fill = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFill();
+                                $fill->getEndColor()->setRGB($rgb);
+                                $fill->endcolorIndex = null; // normal color index does not apply, discard
+                            }
+                        }
+
+                        break;
+                    case 7:        // border color top
+                        $xclfType = self::getUInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $top = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getTop();
+                                $top->getColor()->setRGB($rgb);
+                                $top->colorIndex = null; // normal color index does not apply, discard
+                            }
+                        }
+
+                        break;
+                    case 8:        // border color bottom
+                        $xclfType = self::getUInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $bottom = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getBottom();
+                                $bottom->getColor()->setRGB($rgb);
+                                $bottom->colorIndex = null; // normal color index does not apply, discard
+                            }
+                        }
+
+                        break;
+                    case 9:        // border color left
+                        $xclfType = self::getUInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $left = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getLeft();
+                                $left->getColor()->setRGB($rgb);
+                                $left->colorIndex = null; // normal color index does not apply, discard
+                            }
+                        }
+
+                        break;
+                    case 10:        // border color right
+                        $xclfType = self::getUInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $right = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getRight();
+                                $right->getColor()->setRGB($rgb);
+                                $right->colorIndex = null; // normal color index does not apply, discard
+                            }
+                        }
+
+                        break;
+                    case 11:        // border color diagonal
+                        $xclfType = self::getUInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $diagonal = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getBorders()->getDiagonal();
+                                $diagonal->getColor()->setRGB($rgb);
+                                $diagonal->colorIndex = null; // normal color index does not apply, discard
+                            }
+                        }
+
+                        break;
+                    case 13:    // font color
+                        $xclfType = self::getUInt2d($extData, 0); // color type
+                        $xclrValue = substr($extData, 4, 4); // color value (value based on color type)
+
+                        if ($xclfType == 2) {
+                            $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2]));
+
+                            // modify the relevant style property
+                            if (isset($this->mapCellXfIndex[$ixfe])) {
+                                $font = $this->spreadsheet->getCellXfByIndex($this->mapCellXfIndex[$ixfe])->getFont();
+                                $font->getColor()->setRGB($rgb);
+                                $font->colorIndex = null; // normal color index does not apply, discard
+                            }
+                        }
+
+                        break;
+                }
+
+                $offset += $cb;
+            }
+        }
+    }
+
+    /**
+     * Read STYLE record.
+     */
+    private function readStyle(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; index to XF record and flag for built-in style
+            $ixfe = self::getUInt2d($recordData, 0);
+
+            // bit: 11-0; mask 0x0FFF; index to XF record
+            //$xfIndex = (0x0FFF & $ixfe) >> 0;
+
+            // bit: 15; mask 0x8000; 0 = user-defined style, 1 = built-in style
+            $isBuiltIn = (bool) ((0x8000 & $ixfe) >> 15);
+
+            if ($isBuiltIn) {
+                // offset: 2; size: 1; identifier for built-in style
+                $builtInId = ord($recordData[2]);
+
+                switch ($builtInId) {
+                    case 0x00:
+                        // currently, we are not using this for anything
+                        break;
+                    default:
+                        break;
+                }
+            }
+            // user-defined; not supported by PhpSpreadsheet
+        }
+    }
+
+    /**
+     * Read PALETTE record.
+     */
+    private function readPalette(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; number of following colors
+            $nm = self::getUInt2d($recordData, 0);
+
+            // list of RGB colors
+            for ($i = 0; $i < $nm; ++$i) {
+                $rgb = substr($recordData, 2 + 4 * $i, 4);
+                $this->palette[] = self::readRGB($rgb);
+            }
+        }
+    }
+
+    /**
+     * SHEET.
+     *
+     * This record is  located in the  Workbook Globals
+     * Substream  and represents a sheet inside the workbook.
+     * One SHEET record is written for each sheet. It stores the
+     * sheet name and a stream offset to the BOF record of the
+     * respective Sheet Substream within the Workbook Stream.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readSheet(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // offset: 0; size: 4; absolute stream position of the BOF record of the sheet
+        // NOTE: not encrypted
+        $rec_offset = self::getInt4d($this->data, $this->pos + 4);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 4; size: 1; sheet state
+        $sheetState = match (ord($recordData[4])) {
+            0x00 => Worksheet::SHEETSTATE_VISIBLE,
+            0x01 => Worksheet::SHEETSTATE_HIDDEN,
+            0x02 => Worksheet::SHEETSTATE_VERYHIDDEN,
+            default => Worksheet::SHEETSTATE_VISIBLE,
+        };
+
+        // offset: 5; size: 1; sheet type
+        $sheetType = ord($recordData[5]);
+
+        // offset: 6; size: var; sheet name
+        $rec_name = null;
+        if ($this->version == self::XLS_BIFF8) {
+            $string = self::readUnicodeStringShort(substr($recordData, 6));
+            $rec_name = $string['value'];
+        } elseif ($this->version == self::XLS_BIFF7) {
+            $string = $this->readByteStringShort(substr($recordData, 6));
+            $rec_name = $string['value'];
+        }
+
+        $this->sheets[] = [
+            'name' => $rec_name,
+            'offset' => $rec_offset,
+            'sheetState' => $sheetState,
+            'sheetType' => $sheetType,
+        ];
+    }
+
+    /**
+     * Read EXTERNALBOOK record.
+     */
+    private function readExternalBook(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset within record data
+        $offset = 0;
+
+        // there are 4 types of records
+        if (strlen($recordData) > 4) {
+            // external reference
+            // offset: 0; size: 2; number of sheet names ($nm)
+            $nm = self::getUInt2d($recordData, 0);
+            $offset += 2;
+
+            // offset: 2; size: var; encoded URL without sheet name (Unicode string, 16-bit length)
+            $encodedUrlString = self::readUnicodeStringLong(substr($recordData, 2));
+            $offset += $encodedUrlString['size'];
+
+            // offset: var; size: var; list of $nm sheet names (Unicode strings, 16-bit length)
+            $externalSheetNames = [];
+            for ($i = 0; $i < $nm; ++$i) {
+                $externalSheetNameString = self::readUnicodeStringLong(substr($recordData, $offset));
+                $externalSheetNames[] = $externalSheetNameString['value'];
+                $offset += $externalSheetNameString['size'];
+            }
+
+            // store the record data
+            $this->externalBooks[] = [
+                'type' => 'external',
+                'encodedUrl' => $encodedUrlString['value'],
+                'externalSheetNames' => $externalSheetNames,
+            ];
+        } elseif (substr($recordData, 2, 2) == pack('CC', 0x01, 0x04)) {
+            // internal reference
+            // offset: 0; size: 2; number of sheet in this document
+            // offset: 2; size: 2; 0x01 0x04
+            $this->externalBooks[] = [
+                'type' => 'internal',
+            ];
+        } elseif (substr($recordData, 0, 4) == pack('vCC', 0x0001, 0x01, 0x3A)) {
+            // add-in function
+            // offset: 0; size: 2; 0x0001
+            $this->externalBooks[] = [
+                'type' => 'addInFunction',
+            ];
+        } elseif (substr($recordData, 0, 2) == pack('v', 0x0000)) {
+            // DDE links, OLE links
+            // offset: 0; size: 2; 0x0000
+            // offset: 2; size: var; encoded source document name
+            $this->externalBooks[] = [
+                'type' => 'DDEorOLE',
+            ];
+        }
+    }
+
+    /**
+     * Read EXTERNNAME record.
+     */
+    private function readExternName(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // external sheet references provided for named cells
+        if ($this->version == self::XLS_BIFF8) {
+            // offset: 0; size: 2; options
+            //$options = self::getUInt2d($recordData, 0);
+
+            // offset: 2; size: 2;
+
+            // offset: 4; size: 2; not used
+
+            // offset: 6; size: var
+            $nameString = self::readUnicodeStringShort(substr($recordData, 6));
+
+            // offset: var; size: var; formula data
+            $offset = 6 + $nameString['size'];
+            $formula = $this->getFormulaFromStructure(substr($recordData, $offset));
+
+            $this->externalNames[] = [
+                'name' => $nameString['value'],
+                'formula' => $formula,
+            ];
+        }
+    }
+
+    /**
+     * Read EXTERNSHEET record.
+     */
+    private function readExternSheet(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // external sheet references provided for named cells
+        if ($this->version == self::XLS_BIFF8) {
+            // offset: 0; size: 2; number of following ref structures
+            $nm = self::getUInt2d($recordData, 0);
+            for ($i = 0; $i < $nm; ++$i) {
+                $this->ref[] = [
+                    // offset: 2 + 6 * $i; index to EXTERNALBOOK record
+                    'externalBookIndex' => self::getUInt2d($recordData, 2 + 6 * $i),
+                    // offset: 4 + 6 * $i; index to first sheet in EXTERNALBOOK record
+                    'firstSheetIndex' => self::getUInt2d($recordData, 4 + 6 * $i),
+                    // offset: 6 + 6 * $i; index to last sheet in EXTERNALBOOK record
+                    'lastSheetIndex' => self::getUInt2d($recordData, 6 + 6 * $i),
+                ];
+            }
+        }
+    }
+
+    /**
+     * DEFINEDNAME.
+     *
+     * This record is part of a Link Table. It contains the name
+     * and the token array of an internal defined name. Token
+     * arrays of defined names contain tokens with aberrant
+     * token classes.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readDefinedName(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8) {
+            // retrieves named cells
+
+            // offset: 0; size: 2; option flags
+            $opts = self::getUInt2d($recordData, 0);
+
+            // bit: 5; mask: 0x0020; 0 = user-defined name, 1 = built-in-name
+            $isBuiltInName = (0x0020 & $opts) >> 5;
+
+            // offset: 2; size: 1; keyboard shortcut
+
+            // offset: 3; size: 1; length of the name (character count)
+            $nlen = ord($recordData[3]);
+
+            // offset: 4; size: 2; size of the formula data (it can happen that this is zero)
+            // note: there can also be additional data, this is not included in $flen
+            $flen = self::getUInt2d($recordData, 4);
+
+            // offset: 8; size: 2; 0=Global name, otherwise index to sheet (1-based)
+            $scope = self::getUInt2d($recordData, 8);
+
+            // offset: 14; size: var; Name (Unicode string without length field)
+            $string = self::readUnicodeString(substr($recordData, 14), $nlen);
+
+            // offset: var; size: $flen; formula data
+            $offset = 14 + $string['size'];
+            $formulaStructure = pack('v', $flen) . substr($recordData, $offset);
+
+            try {
+                $formula = $this->getFormulaFromStructure($formulaStructure);
+            } catch (PhpSpreadsheetException) {
+                $formula = '';
+                $isBuiltInName = 0;
+            }
+
+            $this->definedname[] = [
+                'isBuiltInName' => $isBuiltInName,
+                'name' => $string['value'],
+                'formula' => $formula,
+                'scope' => $scope,
+            ];
+        }
+    }
+
+    /**
+     * Read MSODRAWINGGROUP record.
+     */
+    private function readMsoDrawingGroup(): void
+    {
+        //$length = self::getUInt2d($this->data, $this->pos + 2);
+
+        // get spliced record data
+        $splicedRecordData = $this->getSplicedRecordData();
+        $recordData = $splicedRecordData['recordData'];
+
+        $this->drawingGroupData .= $recordData;
+    }
+
+    /**
+     * SST - Shared String Table.
+     *
+     * This record contains a list of all strings used anywhere
+     * in the workbook. Each string occurs only once. The
+     * workbook uses indexes into the list to reference the
+     * strings.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readSst(): void
+    {
+        // offset within (spliced) record data
+        $pos = 0;
+
+        // Limit global SST position, further control for bad SST Length in BIFF8 data
+        $limitposSST = 0;
+
+        // get spliced record data
+        $splicedRecordData = $this->getSplicedRecordData();
+
+        $recordData = $splicedRecordData['recordData'];
+        $spliceOffsets = $splicedRecordData['spliceOffsets'];
+
+        // offset: 0; size: 4; total number of strings in the workbook
+        $pos += 4;
+
+        // offset: 4; size: 4; number of following strings ($nm)
+        $nm = self::getInt4d($recordData, 4);
+        $pos += 4;
+
+        // look up limit position
+        foreach ($spliceOffsets as $spliceOffset) {
+            // it can happen that the string is empty, therefore we need
+            // <= and not just <
+            if ($pos <= $spliceOffset) {
+                $limitposSST = $spliceOffset;
+            }
+        }
+
+        // loop through the Unicode strings (16-bit length)
+        for ($i = 0; $i < $nm && $pos < $limitposSST; ++$i) {
+            // number of characters in the Unicode string
+            $numChars = self::getUInt2d($recordData, $pos);
+            $pos += 2;
+
+            // option flags
+            $optionFlags = ord($recordData[$pos]);
+            ++$pos;
+
+            // bit: 0; mask: 0x01; 0 = compressed; 1 = uncompressed
+            $isCompressed = (($optionFlags & 0x01) == 0);
+
+            // bit: 2; mask: 0x02; 0 = ordinary; 1 = Asian phonetic
+            $hasAsian = (($optionFlags & 0x04) != 0);
+
+            // bit: 3; mask: 0x03; 0 = ordinary; 1 = Rich-Text
+            $hasRichText = (($optionFlags & 0x08) != 0);
+
+            $formattingRuns = 0;
+            if ($hasRichText) {
+                // number of Rich-Text formatting runs
+                $formattingRuns = self::getUInt2d($recordData, $pos);
+                $pos += 2;
+            }
+
+            $extendedRunLength = 0;
+            if ($hasAsian) {
+                // size of Asian phonetic setting
+                $extendedRunLength = self::getInt4d($recordData, $pos);
+                $pos += 4;
+            }
+
+            // expected byte length of character array if not split
+            $len = ($isCompressed) ? $numChars : $numChars * 2;
+
+            // look up limit position - Check it again to be sure that no error occurs when parsing SST structure
+            $limitpos = null;
+            foreach ($spliceOffsets as $spliceOffset) {
+                // it can happen that the string is empty, therefore we need
+                // <= and not just <
+                if ($pos <= $spliceOffset) {
+                    $limitpos = $spliceOffset;
+
+                    break;
+                }
+            }
+
+            if ($pos + $len <= $limitpos) {
+                // character array is not split between records
+
+                $retstr = substr($recordData, $pos, $len);
+                $pos += $len;
+            } else {
+                // character array is split between records
+
+                // first part of character array
+                $retstr = substr($recordData, $pos, $limitpos - $pos);
+
+                $bytesRead = $limitpos - $pos;
+
+                // remaining characters in Unicode string
+                $charsLeft = $numChars - (($isCompressed) ? $bytesRead : ($bytesRead / 2));
+
+                $pos = $limitpos;
+
+                // keep reading the characters
+                while ($charsLeft > 0) {
+                    // look up next limit position, in case the string span more than one continue record
+                    foreach ($spliceOffsets as $spliceOffset) {
+                        if ($pos < $spliceOffset) {
+                            $limitpos = $spliceOffset;
+
+                            break;
+                        }
+                    }
+
+                    // repeated option flags
+                    // OpenOffice.org documentation 5.21
+                    $option = ord($recordData[$pos]);
+                    ++$pos;
+
+                    if ($isCompressed && ($option == 0)) {
+                        // 1st fragment compressed
+                        // this fragment compressed
+                        $len = min($charsLeft, $limitpos - $pos);
+                        $retstr .= substr($recordData, $pos, $len);
+                        $charsLeft -= $len;
+                        $isCompressed = true;
+                    } elseif (!$isCompressed && ($option != 0)) {
+                        // 1st fragment uncompressed
+                        // this fragment uncompressed
+                        $len = min($charsLeft * 2, $limitpos - $pos);
+                        $retstr .= substr($recordData, $pos, $len);
+                        $charsLeft -= $len / 2;
+                        $isCompressed = false;
+                    } elseif (!$isCompressed && ($option == 0)) {
+                        // 1st fragment uncompressed
+                        // this fragment compressed
+                        $len = min($charsLeft, $limitpos - $pos);
+                        for ($j = 0; $j < $len; ++$j) {
+                            $retstr .= $recordData[$pos + $j]
+                                . chr(0);
+                        }
+                        $charsLeft -= $len;
+                        $isCompressed = false;
+                    } else {
+                        // 1st fragment compressed
+                        // this fragment uncompressed
+                        $newstr = '';
+                        $jMax = strlen($retstr);
+                        for ($j = 0; $j < $jMax; ++$j) {
+                            $newstr .= $retstr[$j] . chr(0);
+                        }
+                        $retstr = $newstr;
+                        $len = min($charsLeft * 2, $limitpos - $pos);
+                        $retstr .= substr($recordData, $pos, $len);
+                        $charsLeft -= $len / 2;
+                        $isCompressed = false;
+                    }
+
+                    $pos += $len;
+                }
+            }
+
+            // convert to UTF-8
+            $retstr = self::encodeUTF16($retstr, $isCompressed);
+
+            // read additional Rich-Text information, if any
+            $fmtRuns = [];
+            if ($hasRichText) {
+                // list of formatting runs
+                for ($j = 0; $j < $formattingRuns; ++$j) {
+                    // first formatted character; zero-based
+                    $charPos = self::getUInt2d($recordData, $pos + $j * 4);
+
+                    // index to font record
+                    $fontIndex = self::getUInt2d($recordData, $pos + 2 + $j * 4);
+
+                    $fmtRuns[] = [
+                        'charPos' => $charPos,
+                        'fontIndex' => $fontIndex,
+                    ];
+                }
+                $pos += 4 * $formattingRuns;
+            }
+
+            // read additional Asian phonetics information, if any
+            if ($hasAsian) {
+                // For Asian phonetic settings, we skip the extended string data
+                $pos += $extendedRunLength;
+            }
+
+            // store the shared sting
+            $this->sst[] = [
+                'value' => $retstr,
+                'fmtRuns' => $fmtRuns,
+            ];
+        }
+
+        // getSplicedRecordData() takes care of moving current position in data stream
+    }
+
+    /**
+     * Read PRINTGRIDLINES record.
+     */
+    private function readPrintGridlines(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
+            // offset: 0; size: 2; 0 = do not print sheet grid lines; 1 = print sheet gridlines
+            $printGridlines = (bool) self::getUInt2d($recordData, 0);
+            $this->phpSheet->setPrintGridlines($printGridlines);
+        }
+    }
+
+    /**
+     * Read DEFAULTROWHEIGHT record.
+     */
+    private function readDefaultRowHeight(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; option flags
+        // offset: 2; size: 2; default height for unused rows, (twips 1/20 point)
+        $height = self::getUInt2d($recordData, 2);
+        $this->phpSheet->getDefaultRowDimension()->setRowHeight($height / 20);
+    }
+
+    /**
+     * Read SHEETPR record.
+     */
+    private function readSheetPr(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2
+
+        // bit: 6; mask: 0x0040; 0 = outline buttons above outline group
+        $isSummaryBelow = (0x0040 & self::getUInt2d($recordData, 0)) >> 6;
+        $this->phpSheet->setShowSummaryBelow((bool) $isSummaryBelow);
+
+        // bit: 7; mask: 0x0080; 0 = outline buttons left of outline group
+        $isSummaryRight = (0x0080 & self::getUInt2d($recordData, 0)) >> 7;
+        $this->phpSheet->setShowSummaryRight((bool) $isSummaryRight);
+
+        // bit: 8; mask: 0x100; 0 = scale printout in percent, 1 = fit printout to number of pages
+        // this corresponds to radio button setting in page setup dialog in Excel
+        $this->isFitToPages = (bool) ((0x0100 & self::getUInt2d($recordData, 0)) >> 8);
+    }
+
+    /**
+     * Read HORIZONTALPAGEBREAKS record.
+     */
+    private function readHorizontalPageBreaks(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
+            // offset: 0; size: 2; number of the following row index structures
+            $nm = self::getUInt2d($recordData, 0);
+
+            // offset: 2; size: 6 * $nm; list of $nm row index structures
+            for ($i = 0; $i < $nm; ++$i) {
+                $r = self::getUInt2d($recordData, 2 + 6 * $i);
+                $cf = self::getUInt2d($recordData, 2 + 6 * $i + 2);
+                //$cl = self::getUInt2d($recordData, 2 + 6 * $i + 4);
+
+                // not sure why two column indexes are necessary?
+                $this->phpSheet->setBreak([$cf + 1, $r], Worksheet::BREAK_ROW);
+            }
+        }
+    }
+
+    /**
+     * Read VERTICALPAGEBREAKS record.
+     */
+    private function readVerticalPageBreaks(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
+            // offset: 0; size: 2; number of the following column index structures
+            $nm = self::getUInt2d($recordData, 0);
+
+            // offset: 2; size: 6 * $nm; list of $nm row index structures
+            for ($i = 0; $i < $nm; ++$i) {
+                $c = self::getUInt2d($recordData, 2 + 6 * $i);
+                $rf = self::getUInt2d($recordData, 2 + 6 * $i + 2);
+                //$rl = self::getUInt2d($recordData, 2 + 6 * $i + 4);
+
+                // not sure why two row indexes are necessary?
+                $this->phpSheet->setBreak([$c + 1, ($rf > 0) ? $rf : 1], Worksheet::BREAK_COLUMN);
+            }
+        }
+    }
+
+    /**
+     * Read HEADER record.
+     */
+    private function readHeader(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: var
+            // realized that $recordData can be empty even when record exists
+            if ($recordData) {
+                if ($this->version == self::XLS_BIFF8) {
+                    $string = self::readUnicodeStringLong($recordData);
+                } else {
+                    $string = $this->readByteStringShort($recordData);
+                }
+
+                $this->phpSheet->getHeaderFooter()->setOddHeader($string['value']);
+                $this->phpSheet->getHeaderFooter()->setEvenHeader($string['value']);
+            }
+        }
+    }
+
+    /**
+     * Read FOOTER record.
+     */
+    private function readFooter(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: var
+            // realized that $recordData can be empty even when record exists
+            if ($recordData) {
+                if ($this->version == self::XLS_BIFF8) {
+                    $string = self::readUnicodeStringLong($recordData);
+                } else {
+                    $string = $this->readByteStringShort($recordData);
+                }
+                $this->phpSheet->getHeaderFooter()->setOddFooter($string['value']);
+                $this->phpSheet->getHeaderFooter()->setEvenFooter($string['value']);
+            }
+        }
+    }
+
+    /**
+     * Read HCENTER record.
+     */
+    private function readHcenter(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; 0 = print sheet left aligned, 1 = print sheet centered horizontally
+            $isHorizontalCentered = (bool) self::getUInt2d($recordData, 0);
+
+            $this->phpSheet->getPageSetup()->setHorizontalCentered($isHorizontalCentered);
+        }
+    }
+
+    /**
+     * Read VCENTER record.
+     */
+    private function readVcenter(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; 0 = print sheet aligned at top page border, 1 = print sheet vertically centered
+            $isVerticalCentered = (bool) self::getUInt2d($recordData, 0);
+
+            $this->phpSheet->getPageSetup()->setVerticalCentered($isVerticalCentered);
+        }
+    }
+
+    /**
+     * Read LEFTMARGIN record.
+     */
+    private function readLeftMargin(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8
+            $this->phpSheet->getPageMargins()->setLeft(self::extractNumber($recordData));
+        }
+    }
+
+    /**
+     * Read RIGHTMARGIN record.
+     */
+    private function readRightMargin(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8
+            $this->phpSheet->getPageMargins()->setRight(self::extractNumber($recordData));
+        }
+    }
+
+    /**
+     * Read TOPMARGIN record.
+     */
+    private function readTopMargin(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8
+            $this->phpSheet->getPageMargins()->setTop(self::extractNumber($recordData));
+        }
+    }
+
+    /**
+     * Read BOTTOMMARGIN record.
+     */
+    private function readBottomMargin(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8
+            $this->phpSheet->getPageMargins()->setBottom(self::extractNumber($recordData));
+        }
+    }
+
+    /**
+     * Read PAGESETUP record.
+     */
+    private function readPageSetup(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; paper size
+            $paperSize = self::getUInt2d($recordData, 0);
+
+            // offset: 2; size: 2; scaling factor
+            $scale = self::getUInt2d($recordData, 2);
+
+            // offset: 6; size: 2; fit worksheet width to this number of pages, 0 = use as many as needed
+            $fitToWidth = self::getUInt2d($recordData, 6);
+
+            // offset: 8; size: 2; fit worksheet height to this number of pages, 0 = use as many as needed
+            $fitToHeight = self::getUInt2d($recordData, 8);
+
+            // offset: 10; size: 2; option flags
+
+            // bit: 0; mask: 0x0001; 0=down then over, 1=over then down
+            $isOverThenDown = (0x0001 & self::getUInt2d($recordData, 10));
+
+            // bit: 1; mask: 0x0002; 0=landscape, 1=portrait
+            $isPortrait = (0x0002 & self::getUInt2d($recordData, 10)) >> 1;
+
+            // bit: 2; mask: 0x0004; 1= paper size, scaling factor, paper orient. not init
+            // when this bit is set, do not use flags for those properties
+            $isNotInit = (0x0004 & self::getUInt2d($recordData, 10)) >> 2;
+
+            if (!$isNotInit) {
+                $this->phpSheet->getPageSetup()->setPaperSize($paperSize);
+                $this->phpSheet->getPageSetup()->setPageOrder(((bool) $isOverThenDown) ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER);
+                $this->phpSheet->getPageSetup()->setOrientation(((bool) $isPortrait) ? PageSetup::ORIENTATION_PORTRAIT : PageSetup::ORIENTATION_LANDSCAPE);
+
+                $this->phpSheet->getPageSetup()->setScale($scale, false);
+                $this->phpSheet->getPageSetup()->setFitToPage((bool) $this->isFitToPages);
+                $this->phpSheet->getPageSetup()->setFitToWidth($fitToWidth, false);
+                $this->phpSheet->getPageSetup()->setFitToHeight($fitToHeight, false);
+            }
+
+            // offset: 16; size: 8; header margin (IEEE 754 floating-point value)
+            $marginHeader = self::extractNumber(substr($recordData, 16, 8));
+            $this->phpSheet->getPageMargins()->setHeader($marginHeader);
+
+            // offset: 24; size: 8; footer margin (IEEE 754 floating-point value)
+            $marginFooter = self::extractNumber(substr($recordData, 24, 8));
+            $this->phpSheet->getPageMargins()->setFooter($marginFooter);
+        }
+    }
+
+    /**
+     * PROTECT - Sheet protection (BIFF2 through BIFF8)
+     *   if this record is omitted, then it also means no sheet protection.
+     */
+    private function readProtect(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2;
+
+        // bit 0, mask 0x01; 1 = sheet is protected
+        $bool = (0x01 & self::getUInt2d($recordData, 0)) >> 0;
+        $this->phpSheet->getProtection()->setSheet((bool) $bool);
+    }
+
+    /**
+     * SCENPROTECT.
+     */
+    private function readScenProtect(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2;
+
+        // bit: 0, mask 0x01; 1 = scenarios are protected
+        $bool = (0x01 & self::getUInt2d($recordData, 0)) >> 0;
+
+        $this->phpSheet->getProtection()->setScenarios((bool) $bool);
+    }
+
+    /**
+     * OBJECTPROTECT.
+     */
+    private function readObjectProtect(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2;
+
+        // bit: 0, mask 0x01; 1 = objects are protected
+        $bool = (0x01 & self::getUInt2d($recordData, 0)) >> 0;
+
+        $this->phpSheet->getProtection()->setObjects((bool) $bool);
+    }
+
+    /**
+     * PASSWORD - Sheet protection (hashed) password (BIFF2 through BIFF8).
+     */
+    private function readPassword(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; 16-bit hash value of password
+            $password = strtoupper(dechex(self::getUInt2d($recordData, 0))); // the hashed password
+            $this->phpSheet->getProtection()->setPassword($password, true);
+        }
+    }
+
+    /**
+     * Read DEFCOLWIDTH record.
+     */
+    private function readDefColWidth(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; default column width
+        $width = self::getUInt2d($recordData, 0);
+        if ($width != 8) {
+            $this->phpSheet->getDefaultColumnDimension()->setWidth($width);
+        }
+    }
+
+    /**
+     * Read COLINFO record.
+     */
+    private function readColInfo(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; index to first column in range
+            $firstColumnIndex = self::getUInt2d($recordData, 0);
+
+            // offset: 2; size: 2; index to last column in range
+            $lastColumnIndex = self::getUInt2d($recordData, 2);
+
+            // offset: 4; size: 2; width of the column in 1/256 of the width of the zero character
+            $width = self::getUInt2d($recordData, 4);
+
+            // offset: 6; size: 2; index to XF record for default column formatting
+            $xfIndex = self::getUInt2d($recordData, 6);
+
+            // offset: 8; size: 2; option flags
+            // bit: 0; mask: 0x0001; 1= columns are hidden
+            $isHidden = (0x0001 & self::getUInt2d($recordData, 8)) >> 0;
+
+            // bit: 10-8; mask: 0x0700; outline level of the columns (0 = no outline)
+            $level = (0x0700 & self::getUInt2d($recordData, 8)) >> 8;
+
+            // bit: 12; mask: 0x1000; 1 = collapsed
+            $isCollapsed = (bool) ((0x1000 & self::getUInt2d($recordData, 8)) >> 12);
+
+            // offset: 10; size: 2; not used
+
+            for ($i = $firstColumnIndex + 1; $i <= $lastColumnIndex + 1; ++$i) {
+                if ($lastColumnIndex == 255 || $lastColumnIndex == 256) {
+                    $this->phpSheet->getDefaultColumnDimension()->setWidth($width / 256);
+
+                    break;
+                }
+                $this->phpSheet->getColumnDimensionByColumn($i)->setWidth($width / 256);
+                $this->phpSheet->getColumnDimensionByColumn($i)->setVisible(!$isHidden);
+                $this->phpSheet->getColumnDimensionByColumn($i)->setOutlineLevel($level);
+                $this->phpSheet->getColumnDimensionByColumn($i)->setCollapsed($isCollapsed);
+                if (isset($this->mapCellXfIndex[$xfIndex])) {
+                    $this->phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                }
+            }
+        }
+    }
+
+    /**
+     * ROW.
+     *
+     * This record contains the properties of a single row in a
+     * sheet. Rows and cells in a sheet are divided into blocks
+     * of 32 rows.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readRow(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; index of this row
+            $r = self::getUInt2d($recordData, 0);
+
+            // offset: 2; size: 2; index to column of the first cell which is described by a cell record
+
+            // offset: 4; size: 2; index to column of the last cell which is described by a cell record, increased by 1
+
+            // offset: 6; size: 2;
+
+            // bit: 14-0; mask: 0x7FFF; height of the row, in twips = 1/20 of a point
+            $height = (0x7FFF & self::getUInt2d($recordData, 6)) >> 0;
+
+            // bit: 15: mask: 0x8000; 0 = row has custom height; 1= row has default height
+            $useDefaultHeight = (0x8000 & self::getUInt2d($recordData, 6)) >> 15;
+
+            if (!$useDefaultHeight) {
+                $this->phpSheet->getRowDimension($r + 1)->setRowHeight($height / 20);
+            }
+
+            // offset: 8; size: 2; not used
+
+            // offset: 10; size: 2; not used in BIFF5-BIFF8
+
+            // offset: 12; size: 4; option flags and default row formatting
+
+            // bit: 2-0: mask: 0x00000007; outline level of the row
+            $level = (0x00000007 & self::getInt4d($recordData, 12)) >> 0;
+            $this->phpSheet->getRowDimension($r + 1)->setOutlineLevel($level);
+
+            // bit: 4; mask: 0x00000010; 1 = outline group start or ends here... and is collapsed
+            $isCollapsed = (bool) ((0x00000010 & self::getInt4d($recordData, 12)) >> 4);
+            $this->phpSheet->getRowDimension($r + 1)->setCollapsed($isCollapsed);
+
+            // bit: 5; mask: 0x00000020; 1 = row is hidden
+            $isHidden = (0x00000020 & self::getInt4d($recordData, 12)) >> 5;
+            $this->phpSheet->getRowDimension($r + 1)->setVisible(!$isHidden);
+
+            // bit: 7; mask: 0x00000080; 1 = row has explicit format
+            $hasExplicitFormat = (0x00000080 & self::getInt4d($recordData, 12)) >> 7;
+
+            // bit: 27-16; mask: 0x0FFF0000; only applies when hasExplicitFormat = 1; index to XF record
+            $xfIndex = (0x0FFF0000 & self::getInt4d($recordData, 12)) >> 16;
+
+            if ($hasExplicitFormat && isset($this->mapCellXfIndex[$xfIndex])) {
+                $this->phpSheet->getRowDimension($r + 1)->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+    /**
+     * Read RK record
+     * This record represents a cell that contains an RK value
+     * (encoded integer or floating-point value). If a
+     * floating-point value cannot be encoded to an RK value,
+     * a NUMBER record will be written. This record replaces the
+     * record INTEGER written in BIFF2.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readRk(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to column
+        $column = self::getUInt2d($recordData, 2);
+        $columnString = Coordinate::stringFromColumnIndex($column + 1);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; index to XF record
+            $xfIndex = self::getUInt2d($recordData, 4);
+
+            // offset: 6; size: 4; RK value
+            $rknum = self::getInt4d($recordData, 6);
+            $numValue = self::getIEEE754($rknum);
+
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
+                // add style information
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+
+            // add cell
+            $cell->setValueExplicit($numValue, DataType::TYPE_NUMERIC);
+        }
+    }
+
+    /**
+     * Read LABELSST record
+     * This record represents a cell that contains a string. It
+     * replaces the LABEL record and RSTRING record used in
+     * BIFF2-BIFF5.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readLabelSst(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to column
+        $column = self::getUInt2d($recordData, 2);
+        $columnString = Coordinate::stringFromColumnIndex($column + 1);
+
+        $cell = null;
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; index to XF record
+            $xfIndex = self::getUInt2d($recordData, 4);
+
+            // offset: 6; size: 4; index to SST record
+            $index = self::getInt4d($recordData, 6);
+
+            // add cell
+            if (($fmtRuns = $this->sst[$index]['fmtRuns']) && !$this->readDataOnly) {
+                // then we should treat as rich text
+                $richText = new RichText();
+                $charPos = 0;
+                $sstCount = count($this->sst[$index]['fmtRuns']);
+                for ($i = 0; $i <= $sstCount; ++$i) {
+                    if (isset($fmtRuns[$i])) {
+                        $text = StringHelper::substring($this->sst[$index]['value'], $charPos, $fmtRuns[$i]['charPos'] - $charPos);
+                        $charPos = $fmtRuns[$i]['charPos'];
+                    } else {
+                        $text = StringHelper::substring($this->sst[$index]['value'], $charPos, StringHelper::countCharacters($this->sst[$index]['value']));
+                    }
+
+                    if (StringHelper::countCharacters($text) > 0) {
+                        if ($i == 0) { // first text run, no style
+                            $richText->createText($text);
+                        } else {
+                            $textRun = $richText->createTextRun($text);
+                            if (isset($fmtRuns[$i - 1])) {
+                                if ($fmtRuns[$i - 1]['fontIndex'] < 4) {
+                                    $fontIndex = $fmtRuns[$i - 1]['fontIndex'];
+                                } else {
+                                    // this has to do with that index 4 is omitted in all BIFF versions for some stra          nge reason
+                                    // check the OpenOffice documentation of the FONT record
+                                    $fontIndex = $fmtRuns[$i - 1]['fontIndex'] - 1;
+                                }
+                                if (array_key_exists($fontIndex, $this->objFonts) === false) {
+                                    $fontIndex = count($this->objFonts) - 1;
+                                }
+                                $textRun->setFont(clone $this->objFonts[$fontIndex]);
+                            }
+                        }
+                    }
+                }
+                if ($this->readEmptyCells || trim($richText->getPlainText()) !== '') {
+                    $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                    $cell->setValueExplicit($richText, DataType::TYPE_STRING);
+                }
+            } else {
+                if ($this->readEmptyCells || trim($this->sst[$index]['value']) !== '') {
+                    $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                    $cell->setValueExplicit($this->sst[$index]['value'], DataType::TYPE_STRING);
+                }
+            }
+
+            if (!$this->readDataOnly && $cell !== null && isset($this->mapCellXfIndex[$xfIndex])) {
+                // add style information
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+    /**
+     * Read MULRK record
+     * This record represents a cell range containing RK value
+     * cells. All cells are located in the same row.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readMulRk(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to first column
+        $colFirst = self::getUInt2d($recordData, 2);
+
+        // offset: var; size: 2; index to last column
+        $colLast = self::getUInt2d($recordData, $length - 2);
+        $columns = $colLast - $colFirst + 1;
+
+        // offset within record data
+        $offset = 4;
+
+        for ($i = 1; $i <= $columns; ++$i) {
+            $columnString = Coordinate::stringFromColumnIndex($colFirst + $i);
+
+            // Read cell?
+            if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+                // offset: var; size: 2; index to XF record
+                $xfIndex = self::getUInt2d($recordData, $offset);
+
+                // offset: var; size: 4; RK value
+                $numValue = self::getIEEE754(self::getInt4d($recordData, $offset + 2));
+                $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
+                    // add style
+                    $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                }
+
+                // add cell value
+                $cell->setValueExplicit($numValue, DataType::TYPE_NUMERIC);
+            }
+
+            $offset += 6;
+        }
+    }
+
+    /**
+     * Read NUMBER record
+     * This record represents a cell that contains a
+     * floating-point value.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readNumber(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size 2; index to column
+        $column = self::getUInt2d($recordData, 2);
+        $columnString = Coordinate::stringFromColumnIndex($column + 1);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset 4; size: 2; index to XF record
+            $xfIndex = self::getUInt2d($recordData, 4);
+
+            $numValue = self::extractNumber(substr($recordData, 6, 8));
+
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
+                // add cell style
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+
+            // add cell value
+            $cell->setValueExplicit($numValue, DataType::TYPE_NUMERIC);
+        }
+    }
+
+    /**
+     * Read FORMULA record + perhaps a following STRING record if formula result is a string
+     * This record contains the token array and the result of a
+     * formula cell.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readFormula(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; row index
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; col index
+        $column = self::getUInt2d($recordData, 2);
+        $columnString = Coordinate::stringFromColumnIndex($column + 1);
+
+        // offset: 20: size: variable; formula structure
+        $formulaStructure = substr($recordData, 20);
+
+        // offset: 14: size: 2; option flags, recalculate always, recalculate on open etc.
+        $options = self::getUInt2d($recordData, 14);
+
+        // bit: 0; mask: 0x0001; 1 = recalculate always
+        // bit: 1; mask: 0x0002; 1 = calculate on open
+        // bit: 2; mask: 0x0008; 1 = part of a shared formula
+        $isPartOfSharedFormula = (bool) (0x0008 & $options);
+
+        // WARNING:
+        // We can apparently not rely on $isPartOfSharedFormula. Even when $isPartOfSharedFormula = true
+        // the formula data may be ordinary formula data, therefore we need to check
+        // explicitly for the tExp token (0x01)
+        $isPartOfSharedFormula = $isPartOfSharedFormula && ord($formulaStructure[2]) == 0x01;
+
+        if ($isPartOfSharedFormula) {
+            // part of shared formula which means there will be a formula with a tExp token and nothing else
+            // get the base cell, grab tExp token
+            $baseRow = self::getUInt2d($formulaStructure, 3);
+            $baseCol = self::getUInt2d($formulaStructure, 5);
+            $this->baseCell = Coordinate::stringFromColumnIndex($baseCol + 1) . ($baseRow + 1);
+        }
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            if ($isPartOfSharedFormula) {
+                // formula is added to this cell after the sheet has been read
+                $this->sharedFormulaParts[$columnString . ($row + 1)] = $this->baseCell;
+            }
+
+            // offset: 16: size: 4; not used
+
+            // offset: 4; size: 2; XF index
+            $xfIndex = self::getUInt2d($recordData, 4);
+
+            // offset: 6; size: 8; result of the formula
+            if ((ord($recordData[6]) == 0) && (ord($recordData[12]) == 255) && (ord($recordData[13]) == 255)) {
+                // String formula. Result follows in appended STRING record
+                $dataType = DataType::TYPE_STRING;
+
+                // read possible SHAREDFMLA record
+                $code = self::getUInt2d($this->data, $this->pos);
+                if ($code == self::XLS_TYPE_SHAREDFMLA) {
+                    $this->readSharedFmla();
+                }
+
+                // read STRING record
+                $value = $this->readString();
+            } elseif (
+                (ord($recordData[6]) == 1)
+                && (ord($recordData[12]) == 255)
+                && (ord($recordData[13]) == 255)
+            ) {
+                // Boolean formula. Result is in +2; 0=false, 1=true
+                $dataType = DataType::TYPE_BOOL;
+                $value = (bool) ord($recordData[8]);
+            } elseif (
+                (ord($recordData[6]) == 2)
+                && (ord($recordData[12]) == 255)
+                && (ord($recordData[13]) == 255)
+            ) {
+                // Error formula. Error code is in +2
+                $dataType = DataType::TYPE_ERROR;
+                $value = Xls\ErrorCode::lookup(ord($recordData[8]));
+            } elseif (
+                (ord($recordData[6]) == 3)
+                && (ord($recordData[12]) == 255)
+                && (ord($recordData[13]) == 255)
+            ) {
+                // Formula result is a null string
+                $dataType = DataType::TYPE_NULL;
+                $value = '';
+            } else {
+                // forumla result is a number, first 14 bytes like _NUMBER record
+                $dataType = DataType::TYPE_NUMERIC;
+                $value = self::extractNumber(substr($recordData, 6, 8));
+            }
+
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
+                // add cell style
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+
+            // store the formula
+            if (!$isPartOfSharedFormula) {
+                // not part of shared formula
+                // add cell value. If we can read formula, populate with formula, otherwise just used cached value
+                try {
+                    if ($this->version != self::XLS_BIFF8) {
+                        throw new Exception('Not BIFF8. Can only read BIFF8 formulas');
+                    }
+                    $formula = $this->getFormulaFromStructure($formulaStructure); // get formula in human language
+                    $cell->setValueExplicit('=' . $formula, DataType::TYPE_FORMULA);
+                } catch (PhpSpreadsheetException) {
+                    $cell->setValueExplicit($value, $dataType);
+                }
+            } else {
+                if ($this->version == self::XLS_BIFF8) {
+                    // do nothing at this point, formula id added later in the code
+                } else {
+                    $cell->setValueExplicit($value, $dataType);
+                }
+            }
+
+            // store the cached calculated value
+            $cell->setCalculatedValue($value, $dataType === DataType::TYPE_NUMERIC);
+        }
+    }
+
+    /**
+     * Read a SHAREDFMLA record. This function just stores the binary shared formula in the reader,
+     * which usually contains relative references.
+     * These will be used to construct the formula in each shared formula part after the sheet is read.
+     */
+    private function readSharedFmla(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0, size: 6; cell range address of the area used by the shared formula, not used for anything
+        //$cellRange = substr($recordData, 0, 6);
+        //$cellRange = $this->readBIFF5CellRangeAddressFixed($cellRange); // note: even BIFF8 uses BIFF5 syntax
+
+        // offset: 6, size: 1; not used
+
+        // offset: 7, size: 1; number of existing FORMULA records for this shared formula
+        //$no = ord($recordData[7]);
+
+        // offset: 8, size: var; Binary token array of the shared formula
+        $formula = substr($recordData, 8);
+
+        // at this point we only store the shared formula for later use
+        $this->sharedFormulas[$this->baseCell] = $formula;
+    }
+
+    /**
+     * Read a STRING record from current stream position and advance the stream pointer to next record
+     * This record is used for storing result from FORMULA record when it is a string, and
+     * it occurs directly after the FORMULA record.
+     *
+     * @return string The string contents as UTF-8
+     */
+    private function readString(): string
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8) {
+            $string = self::readUnicodeStringLong($recordData);
+            $value = $string['value'];
+        } else {
+            $string = $this->readByteStringLong($recordData);
+            $value = $string['value'];
+        }
+
+        return $value;
+    }
+
+    /**
+     * Read BOOLERR record
+     * This record represents a Boolean value or error value
+     * cell.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readBoolErr(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; row index
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; column index
+        $column = self::getUInt2d($recordData, 2);
+        $columnString = Coordinate::stringFromColumnIndex($column + 1);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; index to XF record
+            $xfIndex = self::getUInt2d($recordData, 4);
+
+            // offset: 6; size: 1; the boolean value or error value
+            $boolErr = ord($recordData[6]);
+
+            // offset: 7; size: 1; 0=boolean; 1=error
+            $isError = ord($recordData[7]);
+
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+            switch ($isError) {
+                case 0: // boolean
+                    $value = (bool) $boolErr;
+
+                    // add cell value
+                    $cell->setValueExplicit($value, DataType::TYPE_BOOL);
+
+                    break;
+                case 1: // error type
+                    $value = Xls\ErrorCode::lookup($boolErr);
+
+                    // add cell value
+                    $cell->setValueExplicit($value, DataType::TYPE_ERROR);
+
+                    break;
+            }
+
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
+                // add cell style
+                $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+    /**
+     * Read MULBLANK record
+     * This record represents a cell range of empty cells. All
+     * cells are located in the same row.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readMulBlank(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to first column
+        $fc = self::getUInt2d($recordData, 2);
+
+        // offset: 4; size: 2 x nc; list of indexes to XF records
+        // add style information
+        if (!$this->readDataOnly && $this->readEmptyCells) {
+            for ($i = 0; $i < $length / 2 - 3; ++$i) {
+                $columnString = Coordinate::stringFromColumnIndex($fc + $i + 1);
+
+                // Read cell?
+                if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+                    $xfIndex = self::getUInt2d($recordData, 4 + 2 * $i);
+                    if (isset($this->mapCellXfIndex[$xfIndex])) {
+                        $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                    }
+                }
+            }
+        }
+
+        // offset: 6; size 2; index to last column (not needed)
+    }
+
+    /**
+     * Read LABEL record
+     * This record represents a cell that contains a string. In
+     * BIFF8 it is usually replaced by the LABELSST record.
+     * Excel still uses this record, if it copies unformatted
+     * text cells to the clipboard.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readLabel(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; index to row
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to column
+        $column = self::getUInt2d($recordData, 2);
+        $columnString = Coordinate::stringFromColumnIndex($column + 1);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; XF index
+            $xfIndex = self::getUInt2d($recordData, 4);
+
+            // add cell value
+            // todo: what if string is very long? continue record
+            if ($this->version == self::XLS_BIFF8) {
+                $string = self::readUnicodeStringLong(substr($recordData, 6));
+                $value = $string['value'];
+            } else {
+                $string = $this->readByteStringLong(substr($recordData, 6));
+                $value = $string['value'];
+            }
+            if ($this->readEmptyCells || trim($value) !== '') {
+                $cell = $this->phpSheet->getCell($columnString . ($row + 1));
+                $cell->setValueExplicit($value, DataType::TYPE_STRING);
+
+                if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
+                    // add cell style
+                    $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Read BLANK record.
+     */
+    private function readBlank(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; row index
+        $row = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; col index
+        $col = self::getUInt2d($recordData, 2);
+        $columnString = Coordinate::stringFromColumnIndex($col + 1);
+
+        // Read cell?
+        if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
+            // offset: 4; size: 2; XF index
+            $xfIndex = self::getUInt2d($recordData, 4);
+
+            // add style information
+            if (!$this->readDataOnly && $this->readEmptyCells && isset($this->mapCellXfIndex[$xfIndex])) {
+                $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+            }
+        }
+    }
+
+    /**
+     * Read MSODRAWING record.
+     */
+    private function readMsoDrawing(): void
+    {
+        //$length = self::getUInt2d($this->data, $this->pos + 2);
+
+        // get spliced record data
+        $splicedRecordData = $this->getSplicedRecordData();
+        $recordData = $splicedRecordData['recordData'];
+
+        $this->drawingData .= $recordData;
+    }
+
+    /**
+     * Read OBJ record.
+     */
+    private function readObj(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly || $this->version != self::XLS_BIFF8) {
+            return;
+        }
+
+        // recordData consists of an array of subrecords looking like this:
+        //    ft: 2 bytes; ftCmo type (0x15)
+        //    cb: 2 bytes; size in bytes of ftCmo data
+        //    ot: 2 bytes; Object Type
+        //    id: 2 bytes; Object id number
+        //    grbit: 2 bytes; Option Flags
+        //    data: var; subrecord data
+
+        // for now, we are just interested in the second subrecord containing the object type
+        $ftCmoType = self::getUInt2d($recordData, 0);
+        $cbCmoSize = self::getUInt2d($recordData, 2);
+        $otObjType = self::getUInt2d($recordData, 4);
+        $idObjID = self::getUInt2d($recordData, 6);
+        $grbitOpts = self::getUInt2d($recordData, 6);
+
+        $this->objs[] = [
+            'ftCmoType' => $ftCmoType,
+            'cbCmoSize' => $cbCmoSize,
+            'otObjType' => $otObjType,
+            'idObjID' => $idObjID,
+            'grbitOpts' => $grbitOpts,
+        ];
+        $this->textObjRef = $idObjID;
+    }
+
+    /**
+     * Read WINDOW2 record.
+     */
+    private function readWindow2(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; option flags
+        $options = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; index to first visible row
+        //$firstVisibleRow = self::getUInt2d($recordData, 2);
+
+        // offset: 4; size: 2; index to first visible colum
+        //$firstVisibleColumn = self::getUInt2d($recordData, 4);
+        $zoomscaleInPageBreakPreview = 0;
+        $zoomscaleInNormalView = 0;
+        if ($this->version === self::XLS_BIFF8) {
+            // offset:  8; size: 2; not used
+            // offset: 10; size: 2; cached magnification factor in page break preview (in percent); 0 = Default (60%)
+            // offset: 12; size: 2; cached magnification factor in normal view (in percent); 0 = Default (100%)
+            // offset: 14; size: 4; not used
+            if (!isset($recordData[10])) {
+                $zoomscaleInPageBreakPreview = 0;
+            } else {
+                $zoomscaleInPageBreakPreview = self::getUInt2d($recordData, 10);
+            }
+
+            if ($zoomscaleInPageBreakPreview === 0) {
+                $zoomscaleInPageBreakPreview = 60;
+            }
+
+            if (!isset($recordData[12])) {
+                $zoomscaleInNormalView = 0;
+            } else {
+                $zoomscaleInNormalView = self::getUInt2d($recordData, 12);
+            }
+
+            if ($zoomscaleInNormalView === 0) {
+                $zoomscaleInNormalView = 100;
+            }
+        }
+
+        // bit: 1; mask: 0x0002; 0 = do not show gridlines, 1 = show gridlines
+        $showGridlines = (bool) ((0x0002 & $options) >> 1);
+        $this->phpSheet->setShowGridlines($showGridlines);
+
+        // bit: 2; mask: 0x0004; 0 = do not show headers, 1 = show headers
+        $showRowColHeaders = (bool) ((0x0004 & $options) >> 2);
+        $this->phpSheet->setShowRowColHeaders($showRowColHeaders);
+
+        // bit: 3; mask: 0x0008; 0 = panes are not frozen, 1 = panes are frozen
+        $this->frozen = (bool) ((0x0008 & $options) >> 3);
+
+        // bit: 6; mask: 0x0040; 0 = columns from left to right, 1 = columns from right to left
+        $this->phpSheet->setRightToLeft((bool) ((0x0040 & $options) >> 6));
+
+        // bit: 10; mask: 0x0400; 0 = sheet not active, 1 = sheet active
+        $isActive = (bool) ((0x0400 & $options) >> 10);
+        if ($isActive) {
+            $this->spreadsheet->setActiveSheetIndex($this->spreadsheet->getIndex($this->phpSheet));
+            $this->activeSheetSet = true;
+        }
+
+        // bit: 11; mask: 0x0800; 0 = normal view, 1 = page break view
+        $isPageBreakPreview = (bool) ((0x0800 & $options) >> 11);
+
+        //FIXME: set $firstVisibleRow and $firstVisibleColumn
+
+        if ($this->phpSheet->getSheetView()->getView() !== SheetView::SHEETVIEW_PAGE_LAYOUT) {
+            //NOTE: this setting is inferior to page layout view(Excel2007-)
+            $view = $isPageBreakPreview ? SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW : SheetView::SHEETVIEW_NORMAL;
+            $this->phpSheet->getSheetView()->setView($view);
+            if ($this->version === self::XLS_BIFF8) {
+                $zoomScale = $isPageBreakPreview ? $zoomscaleInPageBreakPreview : $zoomscaleInNormalView;
+                $this->phpSheet->getSheetView()->setZoomScale($zoomScale);
+                $this->phpSheet->getSheetView()->setZoomScaleNormal($zoomscaleInNormalView);
+            }
+        }
+    }
+
+    /**
+     * Read PLV Record(Created by Excel2007 or upper).
+     */
+    private function readPageLayoutView(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; rt
+        //->ignore
+        //$rt = self::getUInt2d($recordData, 0);
+        // offset: 2; size: 2; grbitfr
+        //->ignore
+        //$grbitFrt = self::getUInt2d($recordData, 2);
+        // offset: 4; size: 8; reserved
+        //->ignore
+
+        // offset: 12; size 2; zoom scale
+        $wScalePLV = self::getUInt2d($recordData, 12);
+        // offset: 14; size 2; grbit
+        $grbit = self::getUInt2d($recordData, 14);
+
+        // decomprise grbit
+        $fPageLayoutView = $grbit & 0x01;
+        //$fRulerVisible = ($grbit >> 1) & 0x01; //no support
+        //$fWhitespaceHidden = ($grbit >> 3) & 0x01; //no support
+
+        if ($fPageLayoutView === 1) {
+            $this->phpSheet->getSheetView()->setView(SheetView::SHEETVIEW_PAGE_LAYOUT);
+            $this->phpSheet->getSheetView()->setZoomScale($wScalePLV); //set by Excel2007 only if SHEETVIEW_PAGE_LAYOUT
+        }
+        //otherwise, we cannot know whether SHEETVIEW_PAGE_LAYOUT or SHEETVIEW_PAGE_BREAK_PREVIEW.
+    }
+
+    /**
+     * Read SCL record.
+     */
+    private function readScl(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // offset: 0; size: 2; numerator of the view magnification
+        $numerator = self::getUInt2d($recordData, 0);
+
+        // offset: 2; size: 2; numerator of the view magnification
+        $denumerator = self::getUInt2d($recordData, 2);
+
+        // set the zoom scale (in percent)
+        $this->phpSheet->getSheetView()->setZoomScale($numerator * 100 / $denumerator);
+    }
+
+    /**
+     * Read PANE record.
+     */
+    private function readPane(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; position of vertical split
+            $px = self::getUInt2d($recordData, 0);
+
+            // offset: 2; size: 2; position of horizontal split
+            $py = self::getUInt2d($recordData, 2);
+
+            // offset: 4; size: 2; top most visible row in the bottom pane
+            $rwTop = self::getUInt2d($recordData, 4);
+
+            // offset: 6; size: 2; first visible left column in the right pane
+            $colLeft = self::getUInt2d($recordData, 6);
+
+            if ($this->frozen) {
+                // frozen panes
+                $cell = Coordinate::stringFromColumnIndex($px + 1) . ($py + 1);
+                $topLeftCell = Coordinate::stringFromColumnIndex($colLeft + 1) . ($rwTop + 1);
+                $this->phpSheet->freezePane($cell, $topLeftCell);
+            }
+            // unfrozen panes; split windows; not supported by PhpSpreadsheet core
+        }
+    }
+
+    /**
+     * Read SELECTION record. There is one such record for each pane in the sheet.
+     */
+    private function readSelection(): string
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+        $selectedCells = '';
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 1; pane identifier
+            //$paneId = ord($recordData[0]);
+
+            // offset: 1; size: 2; index to row of the active cell
+            //$r = self::getUInt2d($recordData, 1);
+
+            // offset: 3; size: 2; index to column of the active cell
+            //$c = self::getUInt2d($recordData, 3);
+
+            // offset: 5; size: 2; index into the following cell range list to the
+            //  entry that contains the active cell
+            //$index = self::getUInt2d($recordData, 5);
+
+            // offset: 7; size: var; cell range address list containing all selected cell ranges
+            $data = substr($recordData, 7);
+            $cellRangeAddressList = $this->readBIFF5CellRangeAddressList($data); // note: also BIFF8 uses BIFF5 syntax
+
+            $selectedCells = $cellRangeAddressList['cellRangeAddresses'][0];
+
+            // first row '1' + last row '16384' indicates that full column is selected (apparently also in BIFF8!)
+            if (preg_match('/^([A-Z]+1\:[A-Z]+)16384$/', $selectedCells)) {
+                $selectedCells = (string) preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '${1}1048576', $selectedCells);
+            }
+
+            // first row '1' + last row '65536' indicates that full column is selected
+            if (preg_match('/^([A-Z]+1\:[A-Z]+)65536$/', $selectedCells)) {
+                $selectedCells = (string) preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '${1}1048576', $selectedCells);
+            }
+
+            // first column 'A' + last column 'IV' indicates that full row is selected
+            if (preg_match('/^(A\d+\:)IV(\d+)$/', $selectedCells)) {
+                $selectedCells = (string) preg_replace('/^(A\d+\:)IV(\d+)$/', '${1}XFD${2}', $selectedCells);
+            }
+
+            $this->phpSheet->setSelectedCells($selectedCells);
+        }
+
+        return $selectedCells;
+    }
+
+    private function includeCellRangeFiltered(string $cellRangeAddress): bool
+    {
+        $includeCellRange = true;
+        if ($this->getReadFilter() !== null) {
+            $includeCellRange = false;
+            $rangeBoundaries = Coordinate::getRangeBoundaries($cellRangeAddress);
+            ++$rangeBoundaries[1][0];
+            for ($row = $rangeBoundaries[0][1]; $row <= $rangeBoundaries[1][1]; ++$row) {
+                for ($column = $rangeBoundaries[0][0]; $column != $rangeBoundaries[1][0]; ++$column) {
+                    if ($this->getReadFilter()->readCell($column, $row, $this->phpSheet->getTitle())) {
+                        $includeCellRange = true;
+
+                        break 2;
+                    }
+                }
+            }
+        }
+
+        return $includeCellRange;
+    }
+
+    /**
+     * MERGEDCELLS.
+     *
+     * This record contains the addresses of merged cell ranges
+     * in the current sheet.
+     *
+     * --    "OpenOffice.org's Documentation of the Microsoft
+     *         Excel File Format"
+     */
+    private function readMergedCells(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
+            $cellRangeAddressList = $this->readBIFF8CellRangeAddressList($recordData);
+            foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
+                if (
+                    (str_contains($cellRangeAddress, ':'))
+                    && ($this->includeCellRangeFiltered($cellRangeAddress))
+                ) {
+                    $this->phpSheet->mergeCells($cellRangeAddress, Worksheet::MERGE_CELL_CONTENT_HIDE);
+                }
+            }
+        }
+    }
+
+    /**
+     * Read HYPERLINK record.
+     */
+    private function readHyperLink(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 8; cell range address of all cells containing this hyperlink
+            try {
+                $cellRange = $this->readBIFF8CellRangeAddressFixed($recordData);
+            } catch (PhpSpreadsheetException) {
+                return;
+            }
+
+            // offset: 8, size: 16; GUID of StdLink
+
+            // offset: 24, size: 4; unknown value
+
+            // offset: 28, size: 4; option flags
+            // bit: 0; mask: 0x00000001; 0 = no link or extant, 1 = file link or URL
+            $isFileLinkOrUrl = (0x00000001 & self::getUInt2d($recordData, 28)) >> 0;
+
+            // bit: 1; mask: 0x00000002; 0 = relative path, 1 = absolute path or URL
+            //$isAbsPathOrUrl = (0x00000001 & self::getUInt2d($recordData, 28)) >> 1;
+
+            // bit: 2 (and 4); mask: 0x00000014; 0 = no description
+            $hasDesc = (0x00000014 & self::getUInt2d($recordData, 28)) >> 2;
+
+            // bit: 3; mask: 0x00000008; 0 = no text, 1 = has text
+            $hasText = (0x00000008 & self::getUInt2d($recordData, 28)) >> 3;
+
+            // bit: 7; mask: 0x00000080; 0 = no target frame, 1 = has target frame
+            $hasFrame = (0x00000080 & self::getUInt2d($recordData, 28)) >> 7;
+
+            // bit: 8; mask: 0x00000100; 0 = file link or URL, 1 = UNC path (inc. server name)
+            $isUNC = (0x00000100 & self::getUInt2d($recordData, 28)) >> 8;
+
+            // offset within record data
+            $offset = 32;
+
+            if ($hasDesc) {
+                // offset: 32; size: var; character count of description text
+                $dl = self::getInt4d($recordData, 32);
+                // offset: 36; size: var; character array of description text, no Unicode string header, always 16-bit characters, zero terminated
+                //$desc = self::encodeUTF16(substr($recordData, 36, 2 * ($dl - 1)), false);
+                $offset += 4 + 2 * $dl;
+            }
+            if ($hasFrame) {
+                $fl = self::getInt4d($recordData, $offset);
+                $offset += 4 + 2 * $fl;
+            }
+
+            // detect type of hyperlink (there are 4 types)
+            $hyperlinkType = null;
+
+            if ($isUNC) {
+                $hyperlinkType = 'UNC';
+            } elseif (!$isFileLinkOrUrl) {
+                $hyperlinkType = 'workbook';
+            } elseif (ord($recordData[$offset]) == 0x03) {
+                $hyperlinkType = 'local';
+            } elseif (ord($recordData[$offset]) == 0xE0) {
+                $hyperlinkType = 'URL';
+            }
+
+            switch ($hyperlinkType) {
+                case 'URL':
+                    // section 5.58.2: Hyperlink containing a URL
+                    // e.g. http://example.org/index.php
+
+                    // offset: var; size: 16; GUID of URL Moniker
+                    $offset += 16;
+                    // offset: var; size: 4; size (in bytes) of character array of the URL including trailing zero word
+                    $us = self::getInt4d($recordData, $offset);
+                    $offset += 4;
+                    // offset: var; size: $us; character array of the URL, no Unicode string header, always 16-bit characters, zero-terminated
+                    $url = self::encodeUTF16(substr($recordData, $offset, $us - 2), false);
+                    $nullOffset = strpos($url, chr(0x00));
+                    if ($nullOffset) {
+                        $url = substr($url, 0, $nullOffset);
+                    }
+                    $url .= $hasText ? '#' : '';
+                    $offset += $us;
+
+                    break;
+                case 'local':
+                    // section 5.58.3: Hyperlink to local file
+                    // examples:
+                    //   mydoc.txt
+                    //   ../../somedoc.xls#Sheet!A1
+
+                    // offset: var; size: 16; GUI of File Moniker
+                    $offset += 16;
+
+                    // offset: var; size: 2; directory up-level count.
+                    $upLevelCount = self::getUInt2d($recordData, $offset);
+                    $offset += 2;
+
+                    // offset: var; size: 4; character count of the shortened file path and name, including trailing zero word
+                    $sl = self::getInt4d($recordData, $offset);
+                    $offset += 4;
+
+                    // offset: var; size: sl; character array of the shortened file path and name in 8.3-DOS-format (compressed Unicode string)
+                    $shortenedFilePath = substr($recordData, $offset, $sl);
+                    $shortenedFilePath = self::encodeUTF16($shortenedFilePath, true);
+                    $shortenedFilePath = substr($shortenedFilePath, 0, -1); // remove trailing zero
+
+                    $offset += $sl;
+
+                    // offset: var; size: 24; unknown sequence
+                    $offset += 24;
+
+                    // extended file path
+                    // offset: var; size: 4; size of the following file link field including string lenth mark
+                    $sz = self::getInt4d($recordData, $offset);
+                    $offset += 4;
+
+                    $extendedFilePath = '';
+                    // only present if $sz > 0
+                    if ($sz > 0) {
+                        // offset: var; size: 4; size of the character array of the extended file path and name
+                        $xl = self::getInt4d($recordData, $offset);
+                        $offset += 4;
+
+                        // offset: var; size 2; unknown
+                        $offset += 2;
+
+                        // offset: var; size $xl; character array of the extended file path and name.
+                        $extendedFilePath = substr($recordData, $offset, $xl);
+                        $extendedFilePath = self::encodeUTF16($extendedFilePath, false);
+                        $offset += $xl;
+                    }
+
+                    // construct the path
+                    $url = str_repeat('..\\', $upLevelCount);
+                    $url .= ($sz > 0) ? $extendedFilePath : $shortenedFilePath; // use extended path if available
+                    $url .= $hasText ? '#' : '';
+
+                    break;
+                case 'UNC':
+                    // section 5.58.4: Hyperlink to a File with UNC (Universal Naming Convention) Path
+                    // todo: implement
+                    return;
+                case 'workbook':
+                    // section 5.58.5: Hyperlink to the Current Workbook
+                    // e.g. Sheet2!B1:C2, stored in text mark field
+                    $url = 'sheet://';
+
+                    break;
+                default:
+                    return;
+            }
+
+            if ($hasText) {
+                // offset: var; size: 4; character count of text mark including trailing zero word
+                $tl = self::getInt4d($recordData, $offset);
+                $offset += 4;
+                // offset: var; size: var; character array of the text mark without the # sign, no Unicode header, always 16-bit characters, zero-terminated
+                $text = self::encodeUTF16(substr($recordData, $offset, 2 * ($tl - 1)), false);
+                $url .= $text;
+            }
+
+            // apply the hyperlink to all the relevant cells
+            foreach (Coordinate::extractAllCellReferencesInRange($cellRange) as $coordinate) {
+                $this->phpSheet->getCell($coordinate)->getHyperLink()->setUrl($url);
+            }
+        }
+    }
+
+    /**
+     * Read DATAVALIDATIONS record.
+     */
+    private function readDataValidations(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        //$recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+    }
+
+    /**
+     * Read DATAVALIDATION record.
+     */
+    private function readDataValidation(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 4; Options
+        $options = self::getInt4d($recordData, 0);
+
+        // bit: 0-3; mask: 0x0000000F; type
+        $type = (0x0000000F & $options) >> 0;
+        $type = Xls\DataValidationHelper::type($type);
+
+        // bit: 4-6; mask: 0x00000070; error type
+        $errorStyle = (0x00000070 & $options) >> 4;
+        $errorStyle = Xls\DataValidationHelper::errorStyle($errorStyle);
+
+        // bit: 7; mask: 0x00000080; 1= formula is explicit (only applies to list)
+        // I have only seen cases where this is 1
+        //$explicitFormula = (0x00000080 & $options) >> 7;
+
+        // bit: 8; mask: 0x00000100; 1= empty cells allowed
+        $allowBlank = (0x00000100 & $options) >> 8;
+
+        // bit: 9; mask: 0x00000200; 1= suppress drop down arrow in list type validity
+        $suppressDropDown = (0x00000200 & $options) >> 9;
+
+        // bit: 18; mask: 0x00040000; 1= show prompt box if cell selected
+        $showInputMessage = (0x00040000 & $options) >> 18;
+
+        // bit: 19; mask: 0x00080000; 1= show error box if invalid values entered
+        $showErrorMessage = (0x00080000 & $options) >> 19;
+
+        // bit: 20-23; mask: 0x00F00000; condition operator
+        $operator = (0x00F00000 & $options) >> 20;
+        $operator = Xls\DataValidationHelper::operator($operator);
+
+        if ($type === null || $errorStyle === null || $operator === null) {
+            return;
+        }
+
+        // offset: 4; size: var; title of the prompt box
+        $offset = 4;
+        $string = self::readUnicodeStringLong(substr($recordData, $offset));
+        $promptTitle = $string['value'] !== chr(0) ? $string['value'] : '';
+        $offset += $string['size'];
+
+        // offset: var; size: var; title of the error box
+        $string = self::readUnicodeStringLong(substr($recordData, $offset));
+        $errorTitle = $string['value'] !== chr(0) ? $string['value'] : '';
+        $offset += $string['size'];
+
+        // offset: var; size: var; text of the prompt box
+        $string = self::readUnicodeStringLong(substr($recordData, $offset));
+        $prompt = $string['value'] !== chr(0) ? $string['value'] : '';
+        $offset += $string['size'];
+
+        // offset: var; size: var; text of the error box
+        $string = self::readUnicodeStringLong(substr($recordData, $offset));
+        $error = $string['value'] !== chr(0) ? $string['value'] : '';
+        $offset += $string['size'];
+
+        // offset: var; size: 2; size of the formula data for the first condition
+        $sz1 = self::getUInt2d($recordData, $offset);
+        $offset += 2;
+
+        // offset: var; size: 2; not used
+        $offset += 2;
+
+        // offset: var; size: $sz1; formula data for first condition (without size field)
+        $formula1 = substr($recordData, $offset, $sz1);
+        $formula1 = pack('v', $sz1) . $formula1; // prepend the length
+
+        try {
+            $formula1 = $this->getFormulaFromStructure($formula1);
+
+            // in list type validity, null characters are used as item separators
+            if ($type == DataValidation::TYPE_LIST) {
+                $formula1 = str_replace(chr(0), ',', $formula1);
+            }
+        } catch (PhpSpreadsheetException $e) {
+            return;
+        }
+        $offset += $sz1;
+
+        // offset: var; size: 2; size of the formula data for the first condition
+        $sz2 = self::getUInt2d($recordData, $offset);
+        $offset += 2;
+
+        // offset: var; size: 2; not used
+        $offset += 2;
+
+        // offset: var; size: $sz2; formula data for second condition (without size field)
+        $formula2 = substr($recordData, $offset, $sz2);
+        $formula2 = pack('v', $sz2) . $formula2; // prepend the length
+
+        try {
+            $formula2 = $this->getFormulaFromStructure($formula2);
+        } catch (PhpSpreadsheetException) {
+            return;
+        }
+        $offset += $sz2;
+
+        // offset: var; size: var; cell range address list with
+        $cellRangeAddressList = $this->readBIFF8CellRangeAddressList(substr($recordData, $offset));
+        $cellRangeAddresses = $cellRangeAddressList['cellRangeAddresses'];
+
+        foreach ($cellRangeAddresses as $cellRange) {
+            $stRange = $this->phpSheet->shrinkRangeToFit($cellRange);
+            foreach (Coordinate::extractAllCellReferencesInRange($stRange) as $coordinate) {
+                $objValidation = $this->phpSheet->getCell($coordinate)->getDataValidation();
+                $objValidation->setType($type);
+                $objValidation->setErrorStyle($errorStyle);
+                $objValidation->setAllowBlank((bool) $allowBlank);
+                $objValidation->setShowInputMessage((bool) $showInputMessage);
+                $objValidation->setShowErrorMessage((bool) $showErrorMessage);
+                $objValidation->setShowDropDown(!$suppressDropDown);
+                $objValidation->setOperator($operator);
+                $objValidation->setErrorTitle($errorTitle);
+                $objValidation->setError($error);
+                $objValidation->setPromptTitle($promptTitle);
+                $objValidation->setPrompt($prompt);
+                $objValidation->setFormula1($formula1);
+                $objValidation->setFormula2($formula2);
+            }
+        }
+    }
+
+    /**
+     * Read SHEETLAYOUT record. Stores sheet tab color information.
+     */
+    private function readSheetLayout(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if (!$this->readDataOnly) {
+            // offset: 0; size: 2; repeated record identifier 0x0862
+
+            // offset: 2; size: 10; not used
+
+            // offset: 12; size: 4; size of record data
+            // Excel 2003 uses size of 0x14 (documented), Excel 2007 uses size of 0x28 (not documented?)
+            $sz = self::getInt4d($recordData, 12);
+
+            switch ($sz) {
+                case 0x14:
+                    // offset: 16; size: 2; color index for sheet tab
+                    $colorIndex = self::getUInt2d($recordData, 16);
+                    $color = Xls\Color::map($colorIndex, $this->palette, $this->version);
+                    $this->phpSheet->getTabColor()->setRGB($color['rgb']);
+
+                    break;
+                case 0x28:
+                    // TODO: Investigate structure for .xls SHEETLAYOUT record as saved by MS Office Excel 2007
+                    return;
+            }
+        }
+    }
+
+    /**
+     * Read SHEETPROTECTION record (FEATHEADR).
+     */
+    private function readSheetProtection(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2; repeated record header
+
+        // offset: 2; size: 2; FRT cell reference flag (=0 currently)
+
+        // offset: 4; size: 8; Currently not used and set to 0
+
+        // offset: 12; size: 2; Shared feature type index (2=Enhanced Protetion, 4=SmartTag)
+        $isf = self::getUInt2d($recordData, 12);
+        if ($isf != 2) {
+            return;
+        }
+
+        // offset: 14; size: 1; =1 since this is a feat header
+
+        // offset: 15; size: 4; size of rgbHdrSData
+
+        // rgbHdrSData, assume "Enhanced Protection"
+        // offset: 19; size: 2; option flags
+        $options = self::getUInt2d($recordData, 19);
+
+        // bit: 0; mask 0x0001; 1 = user may edit objects, 0 = users must not edit objects
+        // Note - do not negate $bool
+        $bool = (0x0001 & $options) >> 0;
+        $this->phpSheet->getProtection()->setObjects((bool) $bool);
+
+        // bit: 1; mask 0x0002; edit scenarios
+        // Note - do not negate $bool
+        $bool = (0x0002 & $options) >> 1;
+        $this->phpSheet->getProtection()->setScenarios((bool) $bool);
+
+        // bit: 2; mask 0x0004; format cells
+        $bool = (0x0004 & $options) >> 2;
+        $this->phpSheet->getProtection()->setFormatCells(!$bool);
+
+        // bit: 3; mask 0x0008; format columns
+        $bool = (0x0008 & $options) >> 3;
+        $this->phpSheet->getProtection()->setFormatColumns(!$bool);
+
+        // bit: 4; mask 0x0010; format rows
+        $bool = (0x0010 & $options) >> 4;
+        $this->phpSheet->getProtection()->setFormatRows(!$bool);
+
+        // bit: 5; mask 0x0020; insert columns
+        $bool = (0x0020 & $options) >> 5;
+        $this->phpSheet->getProtection()->setInsertColumns(!$bool);
+
+        // bit: 6; mask 0x0040; insert rows
+        $bool = (0x0040 & $options) >> 6;
+        $this->phpSheet->getProtection()->setInsertRows(!$bool);
+
+        // bit: 7; mask 0x0080; insert hyperlinks
+        $bool = (0x0080 & $options) >> 7;
+        $this->phpSheet->getProtection()->setInsertHyperlinks(!$bool);
+
+        // bit: 8; mask 0x0100; delete columns
+        $bool = (0x0100 & $options) >> 8;
+        $this->phpSheet->getProtection()->setDeleteColumns(!$bool);
+
+        // bit: 9; mask 0x0200; delete rows
+        $bool = (0x0200 & $options) >> 9;
+        $this->phpSheet->getProtection()->setDeleteRows(!$bool);
+
+        // bit: 10; mask 0x0400; select locked cells
+        // Note that this is opposite of most of above.
+        $bool = (0x0400 & $options) >> 10;
+        $this->phpSheet->getProtection()->setSelectLockedCells((bool) $bool);
+
+        // bit: 11; mask 0x0800; sort cell range
+        $bool = (0x0800 & $options) >> 11;
+        $this->phpSheet->getProtection()->setSort(!$bool);
+
+        // bit: 12; mask 0x1000; auto filter
+        $bool = (0x1000 & $options) >> 12;
+        $this->phpSheet->getProtection()->setAutoFilter(!$bool);
+
+        // bit: 13; mask 0x2000; pivot tables
+        $bool = (0x2000 & $options) >> 13;
+        $this->phpSheet->getProtection()->setPivotTables(!$bool);
+
+        // bit: 14; mask 0x4000; select unlocked cells
+        // Note that this is opposite of most of above.
+        $bool = (0x4000 & $options) >> 14;
+        $this->phpSheet->getProtection()->setSelectUnlockedCells((bool) $bool);
+
+        // offset: 21; size: 2; not used
+    }
+
+    /**
+     * Read RANGEPROTECTION record
+     * Reading of this record is based on Microsoft Office Excel 97-2000 Binary File Format Specification,
+     * where it is referred to as FEAT record.
+     */
+    private function readRangeProtection(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+
+        // local pointer in record data
+        $offset = 0;
+
+        if (!$this->readDataOnly) {
+            $offset += 12;
+
+            // offset: 12; size: 2; shared feature type, 2 = enhanced protection, 4 = smart tag
+            $isf = self::getUInt2d($recordData, 12);
+            if ($isf != 2) {
+                // we only read FEAT records of type 2
+                return;
+            }
+            $offset += 2;
+
+            $offset += 5;
+
+            // offset: 19; size: 2; count of ref ranges this feature is on
+            $cref = self::getUInt2d($recordData, 19);
+            $offset += 2;
+
+            $offset += 6;
+
+            // offset: 27; size: 8 * $cref; list of cell ranges (like in hyperlink record)
+            $cellRanges = [];
+            for ($i = 0; $i < $cref; ++$i) {
+                try {
+                    $cellRange = $this->readBIFF8CellRangeAddressFixed(substr($recordData, 27 + 8 * $i, 8));
+                } catch (PhpSpreadsheetException) {
+                    return;
+                }
+                $cellRanges[] = $cellRange;
+                $offset += 8;
+            }
+
+            // offset: var; size: var; variable length of feature specific data
+            //$rgbFeat = substr($recordData, $offset);
+            $offset += 4;
+
+            // offset: var; size: 4; the encrypted password (only 16-bit although field is 32-bit)
+            $wPassword = self::getInt4d($recordData, $offset);
+            $offset += 4;
+
+            // Apply range protection to sheet
+            if ($cellRanges) {
+                $this->phpSheet->protectCells(implode(' ', $cellRanges), ($wPassword === 0) ? '' : strtoupper(dechex($wPassword)), true);
+            }
+        }
+    }
+
+    /**
+     * Read a free CONTINUE record. Free CONTINUE record may be a camouflaged MSODRAWING record
+     * When MSODRAWING data on a sheet exceeds 8224 bytes, CONTINUE records are used instead. Undocumented.
+     * In this case, we must treat the CONTINUE record as a MSODRAWING record.
+     */
+    private function readContinue(): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // check if we are reading drawing data
+        // this is in case a free CONTINUE record occurs in other circumstances we are unaware of
+        if ($this->drawingData == '') {
+            // move stream pointer to next record
+            $this->pos += 4 + $length;
+
+            return;
+        }
+
+        // check if record data is at least 4 bytes long, otherwise there is no chance this is MSODRAWING data
+        if ($length < 4) {
+            // move stream pointer to next record
+            $this->pos += 4 + $length;
+
+            return;
+        }
+
+        // dirty check to see if CONTINUE record could be a camouflaged MSODRAWING record
+        // look inside CONTINUE record to see if it looks like a part of an Escher stream
+        // we know that Escher stream may be split at least at
+        //        0xF003 MsofbtSpgrContainer
+        //        0xF004 MsofbtSpContainer
+        //        0xF00D MsofbtClientTextbox
+        $validSplitPoints = [0xF003, 0xF004, 0xF00D]; // add identifiers if we find more
+
+        $splitPoint = self::getUInt2d($recordData, 2);
+        if (in_array($splitPoint, $validSplitPoints)) {
+            // get spliced record data (and move pointer to next record)
+            $splicedRecordData = $this->getSplicedRecordData();
+            $this->drawingData .= $splicedRecordData['recordData'];
+
+            return;
+        }
+
+        // move stream pointer to next record
+        $this->pos += 4 + $length;
+    }
+
+    /**
+     * Reads a record from current position in data stream and continues reading data as long as CONTINUE
+     * records are found. Splices the record data pieces and returns the combined string as if record data
+     * is in one piece.
+     * Moves to next current position in data stream to start of next record different from a CONtINUE record.
+     */
+    private function getSplicedRecordData(): array
+    {
+        $data = '';
+        $spliceOffsets = [];
+
+        $i = 0;
+        $spliceOffsets[0] = 0;
+
+        do {
+            ++$i;
+
+            // offset: 0; size: 2; identifier
+            //$identifier = self::getUInt2d($this->data, $this->pos);
+            // offset: 2; size: 2; length
+            $length = self::getUInt2d($this->data, $this->pos + 2);
+            $data .= $this->readRecordData($this->data, $this->pos + 4, $length);
+
+            $spliceOffsets[$i] = $spliceOffsets[$i - 1] + $length;
+
+            $this->pos += 4 + $length;
+            $nextIdentifier = self::getUInt2d($this->data, $this->pos);
+        } while ($nextIdentifier == self::XLS_TYPE_CONTINUE);
+
+        return [
+            'recordData' => $data,
+            'spliceOffsets' => $spliceOffsets,
+        ];
+    }
+
+    /**
+     * Convert formula structure into human readable Excel formula like 'A3+A5*5'.
+     *
+     * @param string $formulaStructure The complete binary data for the formula
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     *
+     * @return string Human readable formula
+     */
+    private function getFormulaFromStructure(string $formulaStructure, string $baseCell = 'A1'): string
+    {
+        // offset: 0; size: 2; size of the following formula data
+        $sz = self::getUInt2d($formulaStructure, 0);
+
+        // offset: 2; size: sz
+        $formulaData = substr($formulaStructure, 2, $sz);
+
+        // offset: 2 + sz; size: variable (optional)
+        if (strlen($formulaStructure) > 2 + $sz) {
+            $additionalData = substr($formulaStructure, 2 + $sz);
+        } else {
+            $additionalData = '';
+        }
+
+        return $this->getFormulaFromData($formulaData, $additionalData, $baseCell);
+    }
+
+    /**
+     * Take formula data and additional data for formula and return human readable formula.
+     *
+     * @param string $formulaData The binary data for the formula itself
+     * @param string $additionalData Additional binary data going with the formula
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     *
+     * @return string Human readable formula
+     */
+    private function getFormulaFromData(string $formulaData, string $additionalData = '', string $baseCell = 'A1'): string
+    {
+        // start parsing the formula data
+        $tokens = [];
+
+        while ($formulaData !== '' && $token = $this->getNextToken($formulaData, $baseCell)) {
+            $tokens[] = $token;
+            $formulaData = substr($formulaData, $token['size']);
+        }
+
+        $formulaString = $this->createFormulaFromTokens($tokens, $additionalData);
+
+        return $formulaString;
+    }
+
+    /**
+     * Take array of tokens together with additional data for formula and return human readable formula.
+     *
+     * @param string $additionalData Additional binary data going with the formula
+     *
+     * @return string Human readable formula
+     */
+    private function createFormulaFromTokens(array $tokens, string $additionalData): string
+    {
+        // empty formula?
+        if (empty($tokens)) {
+            return '';
+        }
+
+        $formulaStrings = [];
+        foreach ($tokens as $token) {
+            // initialize spaces
+            $space0 = $space0 ?? ''; // spaces before next token, not tParen
+            $space1 = $space1 ?? ''; // carriage returns before next token, not tParen
+            $space2 = $space2 ?? ''; // spaces before opening parenthesis
+            $space3 = $space3 ?? ''; // carriage returns before opening parenthesis
+            $space4 = $space4 ?? ''; // spaces before closing parenthesis
+            $space5 = $space5 ?? ''; // carriage returns before closing parenthesis
+
+            switch ($token['name']) {
+                case 'tAdd': // addition
+                case 'tConcat': // addition
+                case 'tDiv': // division
+                case 'tEQ': // equality
+                case 'tGE': // greater than or equal
+                case 'tGT': // greater than
+                case 'tIsect': // intersection
+                case 'tLE': // less than or equal
+                case 'tList': // less than or equal
+                case 'tLT': // less than
+                case 'tMul': // multiplication
+                case 'tNE': // multiplication
+                case 'tPower': // power
+                case 'tRange': // range
+                case 'tSub': // subtraction
+                    $op2 = array_pop($formulaStrings);
+                    $op1 = array_pop($formulaStrings);
+                    $formulaStrings[] = "$op1$space1$space0{$token['data']}$op2";
+                    unset($space0, $space1);
+
+                    break;
+                case 'tUplus': // unary plus
+                case 'tUminus': // unary minus
+                    $op = array_pop($formulaStrings);
+                    $formulaStrings[] = "$space1$space0{$token['data']}$op";
+                    unset($space0, $space1);
+
+                    break;
+                case 'tPercent': // percent sign
+                    $op = array_pop($formulaStrings);
+                    $formulaStrings[] = "$op$space1$space0{$token['data']}";
+                    unset($space0, $space1);
+
+                    break;
+                case 'tAttrVolatile': // indicates volatile function
+                case 'tAttrIf':
+                case 'tAttrSkip':
+                case 'tAttrChoose':
+                    // token is only important for Excel formula evaluator
+                    // do nothing
+                    break;
+                case 'tAttrSpace': // space / carriage return
+                    // space will be used when next token arrives, do not alter formulaString stack
+                    switch ($token['data']['spacetype']) {
+                        case 'type0':
+                            $space0 = str_repeat(' ', $token['data']['spacecount']);
+
+                            break;
+                        case 'type1':
+                            $space1 = str_repeat("\n", $token['data']['spacecount']);
+
+                            break;
+                        case 'type2':
+                            $space2 = str_repeat(' ', $token['data']['spacecount']);
+
+                            break;
+                        case 'type3':
+                            $space3 = str_repeat("\n", $token['data']['spacecount']);
+
+                            break;
+                        case 'type4':
+                            $space4 = str_repeat(' ', $token['data']['spacecount']);
+
+                            break;
+                        case 'type5':
+                            $space5 = str_repeat("\n", $token['data']['spacecount']);
+
+                            break;
+                    }
+
+                    break;
+                case 'tAttrSum': // SUM function with one parameter
+                    $op = array_pop($formulaStrings);
+                    $formulaStrings[] = "{$space1}{$space0}SUM($op)";
+                    unset($space0, $space1);
+
+                    break;
+                case 'tFunc': // function with fixed number of arguments
+                case 'tFuncV': // function with variable number of arguments
+                    if ($token['data']['function'] != '') {
+                        // normal function
+                        $ops = []; // array of operators
+                        for ($i = 0; $i < $token['data']['args']; ++$i) {
+                            $ops[] = array_pop($formulaStrings);
+                        }
+                        $ops = array_reverse($ops);
+                        $formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ')';
+                        unset($space0, $space1);
+                    } else {
+                        // add-in function
+                        $ops = []; // array of operators
+                        for ($i = 0; $i < $token['data']['args'] - 1; ++$i) {
+                            $ops[] = array_pop($formulaStrings);
+                        }
+                        $ops = array_reverse($ops);
+                        $function = array_pop($formulaStrings);
+                        $formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ')';
+                        unset($space0, $space1);
+                    }
+
+                    break;
+                case 'tParen': // parenthesis
+                    $expression = array_pop($formulaStrings);
+                    $formulaStrings[] = "$space3$space2($expression$space5$space4)";
+                    unset($space2, $space3, $space4, $space5);
+
+                    break;
+                case 'tArray': // array constant
+                    $constantArray = self::readBIFF8ConstantArray($additionalData);
+                    $formulaStrings[] = $space1 . $space0 . $constantArray['value'];
+                    $additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
+                    unset($space0, $space1);
+
+                    break;
+                case 'tMemArea':
+                    // bite off chunk of additional data
+                    $cellRangeAddressList = $this->readBIFF8CellRangeAddressList($additionalData);
+                    $additionalData = substr($additionalData, $cellRangeAddressList['size']);
+                    $formulaStrings[] = "$space1$space0{$token['data']}";
+                    unset($space0, $space1);
+
+                    break;
+                case 'tArea': // cell range address
+                case 'tBool': // boolean
+                case 'tErr': // error code
+                case 'tInt': // integer
+                case 'tMemErr':
+                case 'tMemFunc':
+                case 'tMissArg':
+                case 'tName':
+                case 'tNameX':
+                case 'tNum': // number
+                case 'tRef': // single cell reference
+                case 'tRef3d': // 3d cell reference
+                case 'tArea3d': // 3d cell range reference
+                case 'tRefN':
+                case 'tAreaN':
+                case 'tStr': // string
+                    $formulaStrings[] = "$space1$space0{$token['data']}";
+                    unset($space0, $space1);
+
+                    break;
+            }
+        }
+        $formulaString = $formulaStrings[0];
+
+        return $formulaString;
+    }
+
+    /**
+     * Fetch next token from binary formula data.
+     *
+     * @param string $formulaData Formula data
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     */
+    private function getNextToken(string $formulaData, string $baseCell = 'A1'): array
+    {
+        // offset: 0; size: 1; token id
+        $id = ord($formulaData[0]); // token id
+        $name = false; // initialize token name
+
+        switch ($id) {
+            case 0x03:
+                $name = 'tAdd';
+                $size = 1;
+                $data = '+';
+
+                break;
+            case 0x04:
+                $name = 'tSub';
+                $size = 1;
+                $data = '-';
+
+                break;
+            case 0x05:
+                $name = 'tMul';
+                $size = 1;
+                $data = '*';
+
+                break;
+            case 0x06:
+                $name = 'tDiv';
+                $size = 1;
+                $data = '/';
+
+                break;
+            case 0x07:
+                $name = 'tPower';
+                $size = 1;
+                $data = '^';
+
+                break;
+            case 0x08:
+                $name = 'tConcat';
+                $size = 1;
+                $data = '&';
+
+                break;
+            case 0x09:
+                $name = 'tLT';
+                $size = 1;
+                $data = '<';
+
+                break;
+            case 0x0A:
+                $name = 'tLE';
+                $size = 1;
+                $data = '<=';
+
+                break;
+            case 0x0B:
+                $name = 'tEQ';
+                $size = 1;
+                $data = '=';
+
+                break;
+            case 0x0C:
+                $name = 'tGE';
+                $size = 1;
+                $data = '>=';
+
+                break;
+            case 0x0D:
+                $name = 'tGT';
+                $size = 1;
+                $data = '>';
+
+                break;
+            case 0x0E:
+                $name = 'tNE';
+                $size = 1;
+                $data = '<>';
+
+                break;
+            case 0x0F:
+                $name = 'tIsect';
+                $size = 1;
+                $data = ' ';
+
+                break;
+            case 0x10:
+                $name = 'tList';
+                $size = 1;
+                $data = ',';
+
+                break;
+            case 0x11:
+                $name = 'tRange';
+                $size = 1;
+                $data = ':';
+
+                break;
+            case 0x12:
+                $name = 'tUplus';
+                $size = 1;
+                $data = '+';
+
+                break;
+            case 0x13:
+                $name = 'tUminus';
+                $size = 1;
+                $data = '-';
+
+                break;
+            case 0x14:
+                $name = 'tPercent';
+                $size = 1;
+                $data = '%';
+
+                break;
+            case 0x15:    //    parenthesis
+                $name = 'tParen';
+                $size = 1;
+                $data = null;
+
+                break;
+            case 0x16:    //    missing argument
+                $name = 'tMissArg';
+                $size = 1;
+                $data = '';
+
+                break;
+            case 0x17:    //    string
+                $name = 'tStr';
+                // offset: 1; size: var; Unicode string, 8-bit string length
+                $string = self::readUnicodeStringShort(substr($formulaData, 1));
+                $size = 1 + $string['size'];
+                $data = self::UTF8toExcelDoubleQuoted($string['value']);
+
+                break;
+            case 0x19:    //    Special attribute
+                // offset: 1; size: 1; attribute type flags:
+                switch (ord($formulaData[1])) {
+                    case 0x01:
+                        $name = 'tAttrVolatile';
+                        $size = 4;
+                        $data = null;
+
+                        break;
+                    case 0x02:
+                        $name = 'tAttrIf';
+                        $size = 4;
+                        $data = null;
+
+                        break;
+                    case 0x04:
+                        $name = 'tAttrChoose';
+                        // offset: 2; size: 2; number of choices in the CHOOSE function ($nc, number of parameters decreased by 1)
+                        $nc = self::getUInt2d($formulaData, 2);
+                        // offset: 4; size: 2 * $nc
+                        // offset: 4 + 2 * $nc; size: 2
+                        $size = 2 * $nc + 6;
+                        $data = null;
+
+                        break;
+                    case 0x08:
+                        $name = 'tAttrSkip';
+                        $size = 4;
+                        $data = null;
+
+                        break;
+                    case 0x10:
+                        $name = 'tAttrSum';
+                        $size = 4;
+                        $data = null;
+
+                        break;
+                    case 0x40:
+                    case 0x41:
+                        $name = 'tAttrSpace';
+                        $size = 4;
+                        // offset: 2; size: 2; space type and position
+                        $spacetype = match (ord($formulaData[2])) {
+                            0x00 => 'type0',
+                            0x01 => 'type1',
+                            0x02 => 'type2',
+                            0x03 => 'type3',
+                            0x04 => 'type4',
+                            0x05 => 'type5',
+                            default => throw new Exception('Unrecognized space type in tAttrSpace token'),
+                        };
+                        // offset: 3; size: 1; number of inserted spaces/carriage returns
+                        $spacecount = ord($formulaData[3]);
+
+                        $data = ['spacetype' => $spacetype, 'spacecount' => $spacecount];
+
+                        break;
+                    default:
+                        throw new Exception('Unrecognized attribute flag in tAttr token');
+                }
+
+                break;
+            case 0x1C:    //    error code
+                // offset: 1; size: 1; error code
+                $name = 'tErr';
+                $size = 2;
+                $data = Xls\ErrorCode::lookup(ord($formulaData[1]));
+
+                break;
+            case 0x1D:    //    boolean
+                // offset: 1; size: 1; 0 = false, 1 = true;
+                $name = 'tBool';
+                $size = 2;
+                $data = ord($formulaData[1]) ? 'TRUE' : 'FALSE';
+
+                break;
+            case 0x1E:    //    integer
+                // offset: 1; size: 2; unsigned 16-bit integer
+                $name = 'tInt';
+                $size = 3;
+                $data = self::getUInt2d($formulaData, 1);
+
+                break;
+            case 0x1F:    //    number
+                // offset: 1; size: 8;
+                $name = 'tNum';
+                $size = 9;
+                $data = self::extractNumber(substr($formulaData, 1));
+                $data = str_replace(',', '.', (string) $data); // in case non-English locale
+
+                break;
+            case 0x20:    //    array constant
+            case 0x40:
+            case 0x60:
+                // offset: 1; size: 7; not used
+                $name = 'tArray';
+                $size = 8;
+                $data = null;
+
+                break;
+            case 0x21:    //    function with fixed number of arguments
+            case 0x41:
+            case 0x61:
+                $name = 'tFunc';
+                $size = 3;
+                // offset: 1; size: 2; index to built-in sheet function
+                switch (self::getUInt2d($formulaData, 1)) {
+                    case 2:
+                        $function = 'ISNA';
+                        $args = 1;
+
+                        break;
+                    case 3:
+                        $function = 'ISERROR';
+                        $args = 1;
+
+                        break;
+                    case 10:
+                        $function = 'NA';
+                        $args = 0;
+
+                        break;
+                    case 15:
+                        $function = 'SIN';
+                        $args = 1;
+
+                        break;
+                    case 16:
+                        $function = 'COS';
+                        $args = 1;
+
+                        break;
+                    case 17:
+                        $function = 'TAN';
+                        $args = 1;
+
+                        break;
+                    case 18:
+                        $function = 'ATAN';
+                        $args = 1;
+
+                        break;
+                    case 19:
+                        $function = 'PI';
+                        $args = 0;
+
+                        break;
+                    case 20:
+                        $function = 'SQRT';
+                        $args = 1;
+
+                        break;
+                    case 21:
+                        $function = 'EXP';
+                        $args = 1;
+
+                        break;
+                    case 22:
+                        $function = 'LN';
+                        $args = 1;
+
+                        break;
+                    case 23:
+                        $function = 'LOG10';
+                        $args = 1;
+
+                        break;
+                    case 24:
+                        $function = 'ABS';
+                        $args = 1;
+
+                        break;
+                    case 25:
+                        $function = 'INT';
+                        $args = 1;
+
+                        break;
+                    case 26:
+                        $function = 'SIGN';
+                        $args = 1;
+
+                        break;
+                    case 27:
+                        $function = 'ROUND';
+                        $args = 2;
+
+                        break;
+                    case 30:
+                        $function = 'REPT';
+                        $args = 2;
+
+                        break;
+                    case 31:
+                        $function = 'MID';
+                        $args = 3;
+
+                        break;
+                    case 32:
+                        $function = 'LEN';
+                        $args = 1;
+
+                        break;
+                    case 33:
+                        $function = 'VALUE';
+                        $args = 1;
+
+                        break;
+                    case 34:
+                        $function = 'TRUE';
+                        $args = 0;
+
+                        break;
+                    case 35:
+                        $function = 'FALSE';
+                        $args = 0;
+
+                        break;
+                    case 38:
+                        $function = 'NOT';
+                        $args = 1;
+
+                        break;
+                    case 39:
+                        $function = 'MOD';
+                        $args = 2;
+
+                        break;
+                    case 40:
+                        $function = 'DCOUNT';
+                        $args = 3;
+
+                        break;
+                    case 41:
+                        $function = 'DSUM';
+                        $args = 3;
+
+                        break;
+                    case 42:
+                        $function = 'DAVERAGE';
+                        $args = 3;
+
+                        break;
+                    case 43:
+                        $function = 'DMIN';
+                        $args = 3;
+
+                        break;
+                    case 44:
+                        $function = 'DMAX';
+                        $args = 3;
+
+                        break;
+                    case 45:
+                        $function = 'DSTDEV';
+                        $args = 3;
+
+                        break;
+                    case 48:
+                        $function = 'TEXT';
+                        $args = 2;
+
+                        break;
+                    case 61:
+                        $function = 'MIRR';
+                        $args = 3;
+
+                        break;
+                    case 63:
+                        $function = 'RAND';
+                        $args = 0;
+
+                        break;
+                    case 65:
+                        $function = 'DATE';
+                        $args = 3;
+
+                        break;
+                    case 66:
+                        $function = 'TIME';
+                        $args = 3;
+
+                        break;
+                    case 67:
+                        $function = 'DAY';
+                        $args = 1;
+
+                        break;
+                    case 68:
+                        $function = 'MONTH';
+                        $args = 1;
+
+                        break;
+                    case 69:
+                        $function = 'YEAR';
+                        $args = 1;
+
+                        break;
+                    case 71:
+                        $function = 'HOUR';
+                        $args = 1;
+
+                        break;
+                    case 72:
+                        $function = 'MINUTE';
+                        $args = 1;
+
+                        break;
+                    case 73:
+                        $function = 'SECOND';
+                        $args = 1;
+
+                        break;
+                    case 74:
+                        $function = 'NOW';
+                        $args = 0;
+
+                        break;
+                    case 75:
+                        $function = 'AREAS';
+                        $args = 1;
+
+                        break;
+                    case 76:
+                        $function = 'ROWS';
+                        $args = 1;
+
+                        break;
+                    case 77:
+                        $function = 'COLUMNS';
+                        $args = 1;
+
+                        break;
+                    case 83:
+                        $function = 'TRANSPOSE';
+                        $args = 1;
+
+                        break;
+                    case 86:
+                        $function = 'TYPE';
+                        $args = 1;
+
+                        break;
+                    case 97:
+                        $function = 'ATAN2';
+                        $args = 2;
+
+                        break;
+                    case 98:
+                        $function = 'ASIN';
+                        $args = 1;
+
+                        break;
+                    case 99:
+                        $function = 'ACOS';
+                        $args = 1;
+
+                        break;
+                    case 105:
+                        $function = 'ISREF';
+                        $args = 1;
+
+                        break;
+                    case 111:
+                        $function = 'CHAR';
+                        $args = 1;
+
+                        break;
+                    case 112:
+                        $function = 'LOWER';
+                        $args = 1;
+
+                        break;
+                    case 113:
+                        $function = 'UPPER';
+                        $args = 1;
+
+                        break;
+                    case 114:
+                        $function = 'PROPER';
+                        $args = 1;
+
+                        break;
+                    case 117:
+                        $function = 'EXACT';
+                        $args = 2;
+
+                        break;
+                    case 118:
+                        $function = 'TRIM';
+                        $args = 1;
+
+                        break;
+                    case 119:
+                        $function = 'REPLACE';
+                        $args = 4;
+
+                        break;
+                    case 121:
+                        $function = 'CODE';
+                        $args = 1;
+
+                        break;
+                    case 126:
+                        $function = 'ISERR';
+                        $args = 1;
+
+                        break;
+                    case 127:
+                        $function = 'ISTEXT';
+                        $args = 1;
+
+                        break;
+                    case 128:
+                        $function = 'ISNUMBER';
+                        $args = 1;
+
+                        break;
+                    case 129:
+                        $function = 'ISBLANK';
+                        $args = 1;
+
+                        break;
+                    case 130:
+                        $function = 'T';
+                        $args = 1;
+
+                        break;
+                    case 131:
+                        $function = 'N';
+                        $args = 1;
+
+                        break;
+                    case 140:
+                        $function = 'DATEVALUE';
+                        $args = 1;
+
+                        break;
+                    case 141:
+                        $function = 'TIMEVALUE';
+                        $args = 1;
+
+                        break;
+                    case 142:
+                        $function = 'SLN';
+                        $args = 3;
+
+                        break;
+                    case 143:
+                        $function = 'SYD';
+                        $args = 4;
+
+                        break;
+                    case 162:
+                        $function = 'CLEAN';
+                        $args = 1;
+
+                        break;
+                    case 163:
+                        $function = 'MDETERM';
+                        $args = 1;
+
+                        break;
+                    case 164:
+                        $function = 'MINVERSE';
+                        $args = 1;
+
+                        break;
+                    case 165:
+                        $function = 'MMULT';
+                        $args = 2;
+
+                        break;
+                    case 184:
+                        $function = 'FACT';
+                        $args = 1;
+
+                        break;
+                    case 189:
+                        $function = 'DPRODUCT';
+                        $args = 3;
+
+                        break;
+                    case 190:
+                        $function = 'ISNONTEXT';
+                        $args = 1;
+
+                        break;
+                    case 195:
+                        $function = 'DSTDEVP';
+                        $args = 3;
+
+                        break;
+                    case 196:
+                        $function = 'DVARP';
+                        $args = 3;
+
+                        break;
+                    case 198:
+                        $function = 'ISLOGICAL';
+                        $args = 1;
+
+                        break;
+                    case 199:
+                        $function = 'DCOUNTA';
+                        $args = 3;
+
+                        break;
+                    case 207:
+                        $function = 'REPLACEB';
+                        $args = 4;
+
+                        break;
+                    case 210:
+                        $function = 'MIDB';
+                        $args = 3;
+
+                        break;
+                    case 211:
+                        $function = 'LENB';
+                        $args = 1;
+
+                        break;
+                    case 212:
+                        $function = 'ROUNDUP';
+                        $args = 2;
+
+                        break;
+                    case 213:
+                        $function = 'ROUNDDOWN';
+                        $args = 2;
+
+                        break;
+                    case 214:
+                        $function = 'ASC';
+                        $args = 1;
+
+                        break;
+                    case 215:
+                        $function = 'DBCS';
+                        $args = 1;
+
+                        break;
+                    case 221:
+                        $function = 'TODAY';
+                        $args = 0;
+
+                        break;
+                    case 229:
+                        $function = 'SINH';
+                        $args = 1;
+
+                        break;
+                    case 230:
+                        $function = 'COSH';
+                        $args = 1;
+
+                        break;
+                    case 231:
+                        $function = 'TANH';
+                        $args = 1;
+
+                        break;
+                    case 232:
+                        $function = 'ASINH';
+                        $args = 1;
+
+                        break;
+                    case 233:
+                        $function = 'ACOSH';
+                        $args = 1;
+
+                        break;
+                    case 234:
+                        $function = 'ATANH';
+                        $args = 1;
+
+                        break;
+                    case 235:
+                        $function = 'DGET';
+                        $args = 3;
+
+                        break;
+                    case 244:
+                        $function = 'INFO';
+                        $args = 1;
+
+                        break;
+                    case 252:
+                        $function = 'FREQUENCY';
+                        $args = 2;
+
+                        break;
+                    case 261:
+                        $function = 'ERROR.TYPE';
+                        $args = 1;
+
+                        break;
+                    case 271:
+                        $function = 'GAMMALN';
+                        $args = 1;
+
+                        break;
+                    case 273:
+                        $function = 'BINOMDIST';
+                        $args = 4;
+
+                        break;
+                    case 274:
+                        $function = 'CHIDIST';
+                        $args = 2;
+
+                        break;
+                    case 275:
+                        $function = 'CHIINV';
+                        $args = 2;
+
+                        break;
+                    case 276:
+                        $function = 'COMBIN';
+                        $args = 2;
+
+                        break;
+                    case 277:
+                        $function = 'CONFIDENCE';
+                        $args = 3;
+
+                        break;
+                    case 278:
+                        $function = 'CRITBINOM';
+                        $args = 3;
+
+                        break;
+                    case 279:
+                        $function = 'EVEN';
+                        $args = 1;
+
+                        break;
+                    case 280:
+                        $function = 'EXPONDIST';
+                        $args = 3;
+
+                        break;
+                    case 281:
+                        $function = 'FDIST';
+                        $args = 3;
+
+                        break;
+                    case 282:
+                        $function = 'FINV';
+                        $args = 3;
+
+                        break;
+                    case 283:
+                        $function = 'FISHER';
+                        $args = 1;
+
+                        break;
+                    case 284:
+                        $function = 'FISHERINV';
+                        $args = 1;
+
+                        break;
+                    case 285:
+                        $function = 'FLOOR';
+                        $args = 2;
+
+                        break;
+                    case 286:
+                        $function = 'GAMMADIST';
+                        $args = 4;
+
+                        break;
+                    case 287:
+                        $function = 'GAMMAINV';
+                        $args = 3;
+
+                        break;
+                    case 288:
+                        $function = 'CEILING';
+                        $args = 2;
+
+                        break;
+                    case 289:
+                        $function = 'HYPGEOMDIST';
+                        $args = 4;
+
+                        break;
+                    case 290:
+                        $function = 'LOGNORMDIST';
+                        $args = 3;
+
+                        break;
+                    case 291:
+                        $function = 'LOGINV';
+                        $args = 3;
+
+                        break;
+                    case 292:
+                        $function = 'NEGBINOMDIST';
+                        $args = 3;
+
+                        break;
+                    case 293:
+                        $function = 'NORMDIST';
+                        $args = 4;
+
+                        break;
+                    case 294:
+                        $function = 'NORMSDIST';
+                        $args = 1;
+
+                        break;
+                    case 295:
+                        $function = 'NORMINV';
+                        $args = 3;
+
+                        break;
+                    case 296:
+                        $function = 'NORMSINV';
+                        $args = 1;
+
+                        break;
+                    case 297:
+                        $function = 'STANDARDIZE';
+                        $args = 3;
+
+                        break;
+                    case 298:
+                        $function = 'ODD';
+                        $args = 1;
+
+                        break;
+                    case 299:
+                        $function = 'PERMUT';
+                        $args = 2;
+
+                        break;
+                    case 300:
+                        $function = 'POISSON';
+                        $args = 3;
+
+                        break;
+                    case 301:
+                        $function = 'TDIST';
+                        $args = 3;
+
+                        break;
+                    case 302:
+                        $function = 'WEIBULL';
+                        $args = 4;
+
+                        break;
+                    case 303:
+                        $function = 'SUMXMY2';
+                        $args = 2;
+
+                        break;
+                    case 304:
+                        $function = 'SUMX2MY2';
+                        $args = 2;
+
+                        break;
+                    case 305:
+                        $function = 'SUMX2PY2';
+                        $args = 2;
+
+                        break;
+                    case 306:
+                        $function = 'CHITEST';
+                        $args = 2;
+
+                        break;
+                    case 307:
+                        $function = 'CORREL';
+                        $args = 2;
+
+                        break;
+                    case 308:
+                        $function = 'COVAR';
+                        $args = 2;
+
+                        break;
+                    case 309:
+                        $function = 'FORECAST';
+                        $args = 3;
+
+                        break;
+                    case 310:
+                        $function = 'FTEST';
+                        $args = 2;
+
+                        break;
+                    case 311:
+                        $function = 'INTERCEPT';
+                        $args = 2;
+
+                        break;
+                    case 312:
+                        $function = 'PEARSON';
+                        $args = 2;
+
+                        break;
+                    case 313:
+                        $function = 'RSQ';
+                        $args = 2;
+
+                        break;
+                    case 314:
+                        $function = 'STEYX';
+                        $args = 2;
+
+                        break;
+                    case 315:
+                        $function = 'SLOPE';
+                        $args = 2;
+
+                        break;
+                    case 316:
+                        $function = 'TTEST';
+                        $args = 4;
+
+                        break;
+                    case 325:
+                        $function = 'LARGE';
+                        $args = 2;
+
+                        break;
+                    case 326:
+                        $function = 'SMALL';
+                        $args = 2;
+
+                        break;
+                    case 327:
+                        $function = 'QUARTILE';
+                        $args = 2;
+
+                        break;
+                    case 328:
+                        $function = 'PERCENTILE';
+                        $args = 2;
+
+                        break;
+                    case 331:
+                        $function = 'TRIMMEAN';
+                        $args = 2;
+
+                        break;
+                    case 332:
+                        $function = 'TINV';
+                        $args = 2;
+
+                        break;
+                    case 337:
+                        $function = 'POWER';
+                        $args = 2;
+
+                        break;
+                    case 342:
+                        $function = 'RADIANS';
+                        $args = 1;
+
+                        break;
+                    case 343:
+                        $function = 'DEGREES';
+                        $args = 1;
+
+                        break;
+                    case 346:
+                        $function = 'COUNTIF';
+                        $args = 2;
+
+                        break;
+                    case 347:
+                        $function = 'COUNTBLANK';
+                        $args = 1;
+
+                        break;
+                    case 350:
+                        $function = 'ISPMT';
+                        $args = 4;
+
+                        break;
+                    case 351:
+                        $function = 'DATEDIF';
+                        $args = 3;
+
+                        break;
+                    case 352:
+                        $function = 'DATESTRING';
+                        $args = 1;
+
+                        break;
+                    case 353:
+                        $function = 'NUMBERSTRING';
+                        $args = 2;
+
+                        break;
+                    case 360:
+                        $function = 'PHONETIC';
+                        $args = 1;
+
+                        break;
+                    case 368:
+                        $function = 'BAHTTEXT';
+                        $args = 1;
+
+                        break;
+                    default:
+                        throw new Exception('Unrecognized function in formula');
+                }
+                $data = ['function' => $function, 'args' => $args];
+
+                break;
+            case 0x22:    //    function with variable number of arguments
+            case 0x42:
+            case 0x62:
+                $name = 'tFuncV';
+                $size = 4;
+                // offset: 1; size: 1; number of arguments
+                $args = ord($formulaData[1]);
+                // offset: 2: size: 2; index to built-in sheet function
+                $index = self::getUInt2d($formulaData, 2);
+                $function = match ($index) {
+                    0 => 'COUNT',
+                    1 => 'IF',
+                    4 => 'SUM',
+                    5 => 'AVERAGE',
+                    6 => 'MIN',
+                    7 => 'MAX',
+                    8 => 'ROW',
+                    9 => 'COLUMN',
+                    11 => 'NPV',
+                    12 => 'STDEV',
+                    13 => 'DOLLAR',
+                    14 => 'FIXED',
+                    28 => 'LOOKUP',
+                    29 => 'INDEX',
+                    36 => 'AND',
+                    37 => 'OR',
+                    46 => 'VAR',
+                    49 => 'LINEST',
+                    50 => 'TREND',
+                    51 => 'LOGEST',
+                    52 => 'GROWTH',
+                    56 => 'PV',
+                    57 => 'FV',
+                    58 => 'NPER',
+                    59 => 'PMT',
+                    60 => 'RATE',
+                    62 => 'IRR',
+                    64 => 'MATCH',
+                    70 => 'WEEKDAY',
+                    78 => 'OFFSET',
+                    82 => 'SEARCH',
+                    100 => 'CHOOSE',
+                    101 => 'HLOOKUP',
+                    102 => 'VLOOKUP',
+                    109 => 'LOG',
+                    115 => 'LEFT',
+                    116 => 'RIGHT',
+                    120 => 'SUBSTITUTE',
+                    124 => 'FIND',
+                    125 => 'CELL',
+                    144 => 'DDB',
+                    148 => 'INDIRECT',
+                    167 => 'IPMT',
+                    168 => 'PPMT',
+                    169 => 'COUNTA',
+                    183 => 'PRODUCT',
+                    193 => 'STDEVP',
+                    194 => 'VARP',
+                    197 => 'TRUNC',
+                    204 => 'USDOLLAR',
+                    205 => 'FINDB',
+                    206 => 'SEARCHB',
+                    208 => 'LEFTB',
+                    209 => 'RIGHTB',
+                    216 => 'RANK',
+                    219 => 'ADDRESS',
+                    220 => 'DAYS360',
+                    222 => 'VDB',
+                    227 => 'MEDIAN',
+                    228 => 'SUMPRODUCT',
+                    247 => 'DB',
+                    255 => '',
+                    269 => 'AVEDEV',
+                    270 => 'BETADIST',
+                    272 => 'BETAINV',
+                    317 => 'PROB',
+                    318 => 'DEVSQ',
+                    319 => 'GEOMEAN',
+                    320 => 'HARMEAN',
+                    321 => 'SUMSQ',
+                    322 => 'KURT',
+                    323 => 'SKEW',
+                    324 => 'ZTEST',
+                    329 => 'PERCENTRANK',
+                    330 => 'MODE',
+                    336 => 'CONCATENATE',
+                    344 => 'SUBTOTAL',
+                    345 => 'SUMIF',
+                    354 => 'ROMAN',
+                    358 => 'GETPIVOTDATA',
+                    359 => 'HYPERLINK',
+                    361 => 'AVERAGEA',
+                    362 => 'MAXA',
+                    363 => 'MINA',
+                    364 => 'STDEVPA',
+                    365 => 'VARPA',
+                    366 => 'STDEVA',
+                    367 => 'VARA',
+                    default => throw new Exception('Unrecognized function in formula'),
+                };
+                $data = ['function' => $function, 'args' => $args];
+
+                break;
+            case 0x23:    //    index to defined name
+            case 0x43:
+            case 0x63:
+                $name = 'tName';
+                $size = 5;
+                // offset: 1; size: 2; one-based index to definedname record
+                $definedNameIndex = self::getUInt2d($formulaData, 1) - 1;
+                // offset: 2; size: 2; not used
+                $data = $this->definedname[$definedNameIndex]['name'] ?? '';
+
+                break;
+            case 0x24:    //    single cell reference e.g. A5
+            case 0x44:
+            case 0x64:
+                $name = 'tRef';
+                $size = 5;
+                $data = $this->readBIFF8CellAddress(substr($formulaData, 1, 4));
+
+                break;
+            case 0x25:    //    cell range reference to cells in the same sheet (2d)
+            case 0x45:
+            case 0x65:
+                $name = 'tArea';
+                $size = 9;
+                $data = $this->readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
+
+                break;
+            case 0x26:    //    Constant reference sub-expression
+            case 0x46:
+            case 0x66:
+                $name = 'tMemArea';
+                // offset: 1; size: 4; not used
+                // offset: 5; size: 2; size of the following subexpression
+                $subSize = self::getUInt2d($formulaData, 5);
+                $size = 7 + $subSize;
+                $data = $this->getFormulaFromData(substr($formulaData, 7, $subSize));
+
+                break;
+            case 0x27:    //    Deleted constant reference sub-expression
+            case 0x47:
+            case 0x67:
+                $name = 'tMemErr';
+                // offset: 1; size: 4; not used
+                // offset: 5; size: 2; size of the following subexpression
+                $subSize = self::getUInt2d($formulaData, 5);
+                $size = 7 + $subSize;
+                $data = $this->getFormulaFromData(substr($formulaData, 7, $subSize));
+
+                break;
+            case 0x29:    //    Variable reference sub-expression
+            case 0x49:
+            case 0x69:
+                $name = 'tMemFunc';
+                // offset: 1; size: 2; size of the following sub-expression
+                $subSize = self::getUInt2d($formulaData, 1);
+                $size = 3 + $subSize;
+                $data = $this->getFormulaFromData(substr($formulaData, 3, $subSize));
+
+                break;
+            case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places
+            case 0x4C:
+            case 0x6C:
+                $name = 'tRefN';
+                $size = 5;
+                $data = $this->readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell);
+
+                break;
+            case 0x2D:    //    Relative 2d range reference
+            case 0x4D:
+            case 0x6D:
+                $name = 'tAreaN';
+                $size = 9;
+                $data = $this->readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell);
+
+                break;
+            case 0x39:    //    External name
+            case 0x59:
+            case 0x79:
+                $name = 'tNameX';
+                $size = 7;
+                // offset: 1; size: 2; index to REF entry in EXTERNSHEET record
+                // offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
+                $index = self::getUInt2d($formulaData, 3);
+                // assume index is to EXTERNNAME record
+                $data = $this->externalNames[$index - 1]['name'] ?? '';
+
+                // offset: 5; size: 2; not used
+                break;
+            case 0x3A:    //    3d reference to cell
+            case 0x5A:
+            case 0x7A:
+                $name = 'tRef3d';
+                $size = 7;
+
+                try {
+                    // offset: 1; size: 2; index to REF entry
+                    $sheetRange = $this->readSheetRangeByRefIndex(self::getUInt2d($formulaData, 1));
+                    // offset: 3; size: 4; cell address
+                    $cellAddress = $this->readBIFF8CellAddress(substr($formulaData, 3, 4));
+
+                    $data = "$sheetRange!$cellAddress";
+                } catch (PhpSpreadsheetException) {
+                    // deleted sheet reference
+                    $data = '#REF!';
+                }
+
+                break;
+            case 0x3B:    //    3d reference to cell range
+            case 0x5B:
+            case 0x7B:
+                $name = 'tArea3d';
+                $size = 11;
+
+                try {
+                    // offset: 1; size: 2; index to REF entry
+                    $sheetRange = $this->readSheetRangeByRefIndex(self::getUInt2d($formulaData, 1));
+                    // offset: 3; size: 8; cell address
+                    $cellRangeAddress = $this->readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
+
+                    $data = "$sheetRange!$cellRangeAddress";
+                } catch (PhpSpreadsheetException) {
+                    // deleted sheet reference
+                    $data = '#REF!';
+                }
+
+                break;
+                // Unknown cases    // don't know how to deal with
+            default:
+                throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
+        }
+
+        return [
+            'id' => $id,
+            'name' => $name,
+            'size' => $size,
+            'data' => $data,
+        ];
+    }
+
+    /**
+     * Reads a cell address in BIFF8 e.g. 'A2' or '$A$2'
+     * section 3.3.4.
+     */
+    private function readBIFF8CellAddress(string $cellAddressStructure): string
+    {
+        // offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
+        $row = self::getUInt2d($cellAddressStructure, 0) + 1;
+
+        // offset: 2; size: 2; index to column or column offset + relative flags
+        // bit: 7-0; mask 0x00FF; column index
+        $column = Coordinate::stringFromColumnIndex((0x00FF & self::getUInt2d($cellAddressStructure, 2)) + 1);
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getUInt2d($cellAddressStructure, 2))) {
+            $column = '$' . $column;
+        }
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getUInt2d($cellAddressStructure, 2))) {
+            $row = '$' . $row;
+        }
+
+        return $column . $row;
+    }
+
+    /**
+     * Reads a cell address in BIFF8 for shared formulas. Uses positive and negative values for row and column
+     * to indicate offsets from a base cell
+     * section 3.3.4.
+     *
+     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     */
+    private function readBIFF8CellAddressB(string $cellAddressStructure, string $baseCell = 'A1'): string
+    {
+        [$baseCol, $baseRow] = Coordinate::coordinateFromString($baseCell);
+        $baseCol = Coordinate::columnIndexFromString($baseCol) - 1;
+        $baseRow = (int) $baseRow;
+
+        // offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
+        $rowIndex = self::getUInt2d($cellAddressStructure, 0);
+        $row = self::getUInt2d($cellAddressStructure, 0) + 1;
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getUInt2d($cellAddressStructure, 2))) {
+            // offset: 2; size: 2; index to column or column offset + relative flags
+            // bit: 7-0; mask 0x00FF; column index
+            $colIndex = 0x00FF & self::getUInt2d($cellAddressStructure, 2);
+
+            $column = Coordinate::stringFromColumnIndex($colIndex + 1);
+            $column = '$' . $column;
+        } else {
+            // offset: 2; size: 2; index to column or column offset + relative flags
+            // bit: 7-0; mask 0x00FF; column index
+            $relativeColIndex = 0x00FF & self::getInt2d($cellAddressStructure, 2);
+            $colIndex = $baseCol + $relativeColIndex;
+            $colIndex = ($colIndex < 256) ? $colIndex : $colIndex - 256;
+            $colIndex = ($colIndex >= 0) ? $colIndex : $colIndex + 256;
+            $column = Coordinate::stringFromColumnIndex($colIndex + 1);
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getUInt2d($cellAddressStructure, 2))) {
+            $row = '$' . $row;
+        } else {
+            $rowIndex = ($rowIndex <= 32767) ? $rowIndex : $rowIndex - 65536;
+            $row = $baseRow + $rowIndex;
+        }
+
+        return $column . $row;
+    }
+
+    /**
+     * Reads a cell range address in BIFF5 e.g. 'A2:B6' or 'A1'
+     * always fixed range
+     * section 2.5.14.
+     */
+    private function readBIFF5CellRangeAddressFixed(string $subData): string
+    {
+        // offset: 0; size: 2; index to first row
+        $fr = self::getUInt2d($subData, 0) + 1;
+
+        // offset: 2; size: 2; index to last row
+        $lr = self::getUInt2d($subData, 2) + 1;
+
+        // offset: 4; size: 1; index to first column
+        $fc = ord($subData[4]);
+
+        // offset: 5; size: 1; index to last column
+        $lc = ord($subData[5]);
+
+        // check values
+        if ($fr > $lr || $fc > $lc) {
+            throw new Exception('Not a cell range address');
+        }
+
+        // column index to letter
+        $fc = Coordinate::stringFromColumnIndex($fc + 1);
+        $lc = Coordinate::stringFromColumnIndex($lc + 1);
+
+        if ($fr == $lr && $fc == $lc) {
+            return "$fc$fr";
+        }
+
+        return "$fc$fr:$lc$lr";
+    }
+
+    /**
+     * Reads a cell range address in BIFF8 e.g. 'A2:B6' or 'A1'
+     * always fixed range
+     * section 2.5.14.
+     */
+    private function readBIFF8CellRangeAddressFixed(string $subData): string
+    {
+        // offset: 0; size: 2; index to first row
+        $fr = self::getUInt2d($subData, 0) + 1;
+
+        // offset: 2; size: 2; index to last row
+        $lr = self::getUInt2d($subData, 2) + 1;
+
+        // offset: 4; size: 2; index to first column
+        $fc = self::getUInt2d($subData, 4);
+
+        // offset: 6; size: 2; index to last column
+        $lc = self::getUInt2d($subData, 6);
+
+        // check values
+        if ($fr > $lr || $fc > $lc) {
+            throw new Exception('Not a cell range address');
+        }
+
+        // column index to letter
+        $fc = Coordinate::stringFromColumnIndex($fc + 1);
+        $lc = Coordinate::stringFromColumnIndex($lc + 1);
+
+        if ($fr == $lr && $fc == $lc) {
+            return "$fc$fr";
+        }
+
+        return "$fc$fr:$lc$lr";
+    }
+
+    /**
+     * Reads a cell range address in BIFF8 e.g. 'A2:B6' or '$A$2:$B$6'
+     * there are flags indicating whether column/row index is relative
+     * section 3.3.4.
+     */
+    private function readBIFF8CellRangeAddress(string $subData): string
+    {
+        // todo: if cell range is just a single cell, should this funciton
+        // not just return e.g. 'A1' and not 'A1:A1' ?
+
+        // offset: 0; size: 2; index to first row (0... 65535) (or offset (-32768... 32767))
+        $fr = self::getUInt2d($subData, 0) + 1;
+
+        // offset: 2; size: 2; index to last row (0... 65535) (or offset (-32768... 32767))
+        $lr = self::getUInt2d($subData, 2) + 1;
+
+        // offset: 4; size: 2; index to first column or column offset + relative flags
+
+        // bit: 7-0; mask 0x00FF; column index
+        $fc = Coordinate::stringFromColumnIndex((0x00FF & self::getUInt2d($subData, 4)) + 1);
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getUInt2d($subData, 4))) {
+            $fc = '$' . $fc;
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getUInt2d($subData, 4))) {
+            $fr = '$' . $fr;
+        }
+
+        // offset: 6; size: 2; index to last column or column offset + relative flags
+
+        // bit: 7-0; mask 0x00FF; column index
+        $lc = Coordinate::stringFromColumnIndex((0x00FF & self::getUInt2d($subData, 6)) + 1);
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getUInt2d($subData, 6))) {
+            $lc = '$' . $lc;
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getUInt2d($subData, 6))) {
+            $lr = '$' . $lr;
+        }
+
+        return "$fc$fr:$lc$lr";
+    }
+
+    /**
+     * Reads a cell range address in BIFF8 for shared formulas. Uses positive and negative values for row and column
+     * to indicate offsets from a base cell
+     * section 3.3.4.
+     *
+     * @param string $baseCell Base cell
+     *
+     * @return string Cell range address
+     */
+    private function readBIFF8CellRangeAddressB(string $subData, string $baseCell = 'A1'): string
+    {
+        [$baseCol, $baseRow] = Coordinate::indexesFromString($baseCell);
+        $baseCol = $baseCol - 1;
+
+        // TODO: if cell range is just a single cell, should this funciton
+        // not just return e.g. 'A1' and not 'A1:A1' ?
+
+        // offset: 0; size: 2; first row
+        $frIndex = self::getUInt2d($subData, 0); // adjust below
+
+        // offset: 2; size: 2; relative index to first row (0... 65535) should be treated as offset (-32768... 32767)
+        $lrIndex = self::getUInt2d($subData, 2); // adjust below
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getUInt2d($subData, 4))) {
+            // absolute column index
+            // offset: 4; size: 2; first column with relative/absolute flags
+            // bit: 7-0; mask 0x00FF; column index
+            $fcIndex = 0x00FF & self::getUInt2d($subData, 4);
+            $fc = Coordinate::stringFromColumnIndex($fcIndex + 1);
+            $fc = '$' . $fc;
+        } else {
+            // column offset
+            // offset: 4; size: 2; first column with relative/absolute flags
+            // bit: 7-0; mask 0x00FF; column index
+            $relativeFcIndex = 0x00FF & self::getInt2d($subData, 4);
+            $fcIndex = $baseCol + $relativeFcIndex;
+            $fcIndex = ($fcIndex < 256) ? $fcIndex : $fcIndex - 256;
+            $fcIndex = ($fcIndex >= 0) ? $fcIndex : $fcIndex + 256;
+            $fc = Coordinate::stringFromColumnIndex($fcIndex + 1);
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getUInt2d($subData, 4))) {
+            // absolute row index
+            $fr = $frIndex + 1;
+            $fr = '$' . $fr;
+        } else {
+            // row offset
+            $frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
+            $fr = $baseRow + $frIndex;
+        }
+
+        // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+        if (!(0x4000 & self::getUInt2d($subData, 6))) {
+            // absolute column index
+            // offset: 6; size: 2; last column with relative/absolute flags
+            // bit: 7-0; mask 0x00FF; column index
+            $lcIndex = 0x00FF & self::getUInt2d($subData, 6);
+            $lc = Coordinate::stringFromColumnIndex($lcIndex + 1);
+            $lc = '$' . $lc;
+        } else {
+            // column offset
+            // offset: 4; size: 2; first column with relative/absolute flags
+            // bit: 7-0; mask 0x00FF; column index
+            $relativeLcIndex = 0x00FF & self::getInt2d($subData, 4);
+            $lcIndex = $baseCol + $relativeLcIndex;
+            $lcIndex = ($lcIndex < 256) ? $lcIndex : $lcIndex - 256;
+            $lcIndex = ($lcIndex >= 0) ? $lcIndex : $lcIndex + 256;
+            $lc = Coordinate::stringFromColumnIndex($lcIndex + 1);
+        }
+
+        // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+        if (!(0x8000 & self::getUInt2d($subData, 6))) {
+            // absolute row index
+            $lr = $lrIndex + 1;
+            $lr = '$' . $lr;
+        } else {
+            // row offset
+            $lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
+            $lr = $baseRow + $lrIndex;
+        }
+
+        return "$fc$fr:$lc$lr";
+    }
+
+    /**
+     * Read BIFF8 cell range address list
+     * section 2.5.15.
+     */
+    private function readBIFF8CellRangeAddressList(string $subData): array
+    {
+        $cellRangeAddresses = [];
+
+        // offset: 0; size: 2; number of the following cell range addresses
+        $nm = self::getUInt2d($subData, 0);
+
+        $offset = 2;
+        // offset: 2; size: 8 * $nm; list of $nm (fixed) cell range addresses
+        for ($i = 0; $i < $nm; ++$i) {
+            $cellRangeAddresses[] = $this->readBIFF8CellRangeAddressFixed(substr($subData, $offset, 8));
+            $offset += 8;
+        }
+
+        return [
+            'size' => 2 + 8 * $nm,
+            'cellRangeAddresses' => $cellRangeAddresses,
+        ];
+    }
+
+    /**
+     * Read BIFF5 cell range address list
+     * section 2.5.15.
+     */
+    private function readBIFF5CellRangeAddressList(string $subData): array
+    {
+        $cellRangeAddresses = [];
+
+        // offset: 0; size: 2; number of the following cell range addresses
+        $nm = self::getUInt2d($subData, 0);
+
+        $offset = 2;
+        // offset: 2; size: 6 * $nm; list of $nm (fixed) cell range addresses
+        for ($i = 0; $i < $nm; ++$i) {
+            $cellRangeAddresses[] = $this->readBIFF5CellRangeAddressFixed(substr($subData, $offset, 6));
+            $offset += 6;
+        }
+
+        return [
+            'size' => 2 + 6 * $nm,
+            'cellRangeAddresses' => $cellRangeAddresses,
+        ];
+    }
+
+    /**
+     * Get a sheet range like Sheet1:Sheet3 from REF index
+     * Note: If there is only one sheet in the range, one gets e.g Sheet1
+     * It can also happen that the REF structure uses the -1 (FFFF) code to indicate deleted sheets,
+     * in which case an Exception is thrown.
+     */
+    private function readSheetRangeByRefIndex(int $index): string|false
+    {
+        if (isset($this->ref[$index])) {
+            $type = $this->externalBooks[$this->ref[$index]['externalBookIndex']]['type'];
+
+            switch ($type) {
+                case 'internal':
+                    // check if we have a deleted 3d reference
+                    if ($this->ref[$index]['firstSheetIndex'] == 0xFFFF || $this->ref[$index]['lastSheetIndex'] == 0xFFFF) {
+                        throw new Exception('Deleted sheet reference');
+                    }
+
+                    // we have normal sheet range (collapsed or uncollapsed)
+                    $firstSheetName = $this->sheets[$this->ref[$index]['firstSheetIndex']]['name'];
+                    $lastSheetName = $this->sheets[$this->ref[$index]['lastSheetIndex']]['name'];
+
+                    if ($firstSheetName == $lastSheetName) {
+                        // collapsed sheet range
+                        $sheetRange = $firstSheetName;
+                    } else {
+                        $sheetRange = "$firstSheetName:$lastSheetName";
+                    }
+
+                    // escape the single-quotes
+                    $sheetRange = str_replace("'", "''", $sheetRange);
+
+                    // if there are special characters, we need to enclose the range in single-quotes
+                    // todo: check if we have identified the whole set of special characters
+                    // it seems that the following characters are not accepted for sheet names
+                    // and we may assume that they are not present: []*/:\?
+                    if (preg_match("/[ !\"@#£$%&{()}<>=+'|^,;-]/u", $sheetRange)) {
+                        $sheetRange = "'$sheetRange'";
+                    }
+
+                    return $sheetRange;
+                default:
+                    // TODO: external sheet support
+                    throw new Exception('Xls reader only supports internal sheets in formulas');
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * read BIFF8 constant value array from array data
+     * returns e.g. ['value' => '{1,2;3,4}', 'size' => 40]
+     * section 2.5.8.
+     */
+    private static function readBIFF8ConstantArray(string $arrayData): array
+    {
+        // offset: 0; size: 1; number of columns decreased by 1
+        $nc = ord($arrayData[0]);
+
+        // offset: 1; size: 2; number of rows decreased by 1
+        $nr = self::getUInt2d($arrayData, 1);
+        $size = 3; // initialize
+        $arrayData = substr($arrayData, 3);
+
+        // offset: 3; size: var; list of ($nc + 1) * ($nr + 1) constant values
+        $matrixChunks = [];
+        for ($r = 1; $r <= $nr + 1; ++$r) {
+            $items = [];
+            for ($c = 1; $c <= $nc + 1; ++$c) {
+                $constant = self::readBIFF8Constant($arrayData);
+                $items[] = $constant['value'];
+                $arrayData = substr($arrayData, $constant['size']);
+                $size += $constant['size'];
+            }
+            $matrixChunks[] = implode(',', $items); // looks like e.g. '1,"hello"'
+        }
+        $matrix = '{' . implode(';', $matrixChunks) . '}';
+
+        return [
+            'value' => $matrix,
+            'size' => $size,
+        ];
+    }
+
+    /**
+     * read BIFF8 constant value which may be 'Empty Value', 'Number', 'String Value', 'Boolean Value', 'Error Value'
+     * section 2.5.7
+     * returns e.g. ['value' => '5', 'size' => 9].
+     */
+    private static function readBIFF8Constant(string $valueData): array
+    {
+        // offset: 0; size: 1; identifier for type of constant
+        $identifier = ord($valueData[0]);
+
+        switch ($identifier) {
+            case 0x00: // empty constant (what is this?)
+                $value = '';
+                $size = 9;
+
+                break;
+            case 0x01: // number
+                // offset: 1; size: 8; IEEE 754 floating-point value
+                $value = self::extractNumber(substr($valueData, 1, 8));
+                $size = 9;
+
+                break;
+            case 0x02: // string value
+                // offset: 1; size: var; Unicode string, 16-bit string length
+                $string = self::readUnicodeStringLong(substr($valueData, 1));
+                $value = '"' . $string['value'] . '"';
+                $size = 1 + $string['size'];
+
+                break;
+            case 0x04: // boolean
+                // offset: 1; size: 1; 0 = FALSE, 1 = TRUE
+                if (ord($valueData[1])) {
+                    $value = 'TRUE';
+                } else {
+                    $value = 'FALSE';
+                }
+                $size = 9;
+
+                break;
+            case 0x10: // error code
+                // offset: 1; size: 1; error code
+                $value = Xls\ErrorCode::lookup(ord($valueData[1]));
+                $size = 9;
+
+                break;
+            default:
+                throw new PhpSpreadsheetException('Unsupported BIFF8 constant');
+        }
+
+        return [
+            'value' => $value,
+            'size' => $size,
+        ];
+    }
+
+    /**
+     * Extract RGB color
+     * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.4.
+     *
+     * @param string $rgb Encoded RGB value (4 bytes)
+     */
+    private static function readRGB(string $rgb): array
+    {
+        // offset: 0; size 1; Red component
+        $r = ord($rgb[0]);
+
+        // offset: 1; size: 1; Green component
+        $g = ord($rgb[1]);
+
+        // offset: 2; size: 1; Blue component
+        $b = ord($rgb[2]);
+
+        // HEX notation, e.g. 'FF00FC'
+        $rgb = sprintf('%02X%02X%02X', $r, $g, $b);
+
+        return ['rgb' => $rgb];
+    }
+
+    /**
+     * Read byte string (8-bit string length)
+     * OpenOffice documentation: 2.5.2.
+     */
+    private function readByteStringShort(string $subData): array
+    {
+        // offset: 0; size: 1; length of the string (character count)
+        $ln = ord($subData[0]);
+
+        // offset: 1: size: var; character array (8-bit characters)
+        $value = $this->decodeCodepage(substr($subData, 1, $ln));
+
+        return [
+            'value' => $value,
+            'size' => 1 + $ln, // size in bytes of data structure
+        ];
+    }
+
+    /**
+     * Read byte string (16-bit string length)
+     * OpenOffice documentation: 2.5.2.
+     */
+    private function readByteStringLong(string $subData): array
+    {
+        // offset: 0; size: 2; length of the string (character count)
+        $ln = self::getUInt2d($subData, 0);
+
+        // offset: 2: size: var; character array (8-bit characters)
+        $value = $this->decodeCodepage(substr($subData, 2));
+
+        //return $string;
+        return [
+            'value' => $value,
+            'size' => 2 + $ln, // size in bytes of data structure
+        ];
+    }
+
+    /**
+     * Extracts an Excel Unicode short string (8-bit string length)
+     * OpenOffice documentation: 2.5.3
+     * function will automatically find out where the Unicode string ends.
+     */
+    private static function readUnicodeStringShort(string $subData): array
+    {
+        // offset: 0: size: 1; length of the string (character count)
+        $characterCount = ord($subData[0]);
+
+        $string = self::readUnicodeString(substr($subData, 1), $characterCount);
+
+        // add 1 for the string length
+        ++$string['size'];
+
+        return $string;
+    }
+
+    /**
+     * Extracts an Excel Unicode long string (16-bit string length)
+     * OpenOffice documentation: 2.5.3
+     * this function is under construction, needs to support rich text, and Asian phonetic settings.
+     */
+    private static function readUnicodeStringLong(string $subData): array
+    {
+        // offset: 0: size: 2; length of the string (character count)
+        $characterCount = self::getUInt2d($subData, 0);
+
+        $string = self::readUnicodeString(substr($subData, 2), $characterCount);
+
+        // add 2 for the string length
+        $string['size'] += 2;
+
+        return $string;
+    }
+
+    /**
+     * Read Unicode string with no string length field, but with known character count
+     * this function is under construction, needs to support rich text, and Asian phonetic settings
+     * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.3.
+     */
+    private static function readUnicodeString(string $subData, int $characterCount): array
+    {
+        // offset: 0: size: 1; option flags
+        // bit: 0; mask: 0x01; character compression (0 = compressed 8-bit, 1 = uncompressed 16-bit)
+        $isCompressed = !((0x01 & ord($subData[0])) >> 0);
+
+        // bit: 2; mask: 0x04; Asian phonetic settings
+        //$hasAsian = (0x04) & ord($subData[0]) >> 2;
+
+        // bit: 3; mask: 0x08; Rich-Text settings
+        //$hasRichText = (0x08) & ord($subData[0]) >> 3;
+
+        // offset: 1: size: var; character array
+        // this offset assumes richtext and Asian phonetic settings are off which is generally wrong
+        // needs to be fixed
+        $value = self::encodeUTF16(substr($subData, 1, $isCompressed ? $characterCount : 2 * $characterCount), $isCompressed);
+
+        return [
+            'value' => $value,
+            'size' => $isCompressed ? 1 + $characterCount : 1 + 2 * $characterCount, // the size in bytes including the option flags
+        ];
+    }
+
+    /**
+     * Convert UTF-8 string to string surounded by double quotes. Used for explicit string tokens in formulas.
+     * Example:  hello"world  -->  "hello""world".
+     *
+     * @param string $value UTF-8 encoded string
+     */
+    private static function UTF8toExcelDoubleQuoted(string $value): string
+    {
+        return '"' . str_replace('"', '""', $value) . '"';
+    }
+
+    /**
+     * Reads first 8 bytes of a string and return IEEE 754 float.
+     *
+     * @param string $data Binary string that is at least 8 bytes long
+     */
+    private static function extractNumber(string $data): int|float
+    {
+        $rknumhigh = self::getInt4d($data, 4);
+        $rknumlow = self::getInt4d($data, 0);
+        $sign = ($rknumhigh & self::HIGH_ORDER_BIT) >> 31;
+        $exp = (($rknumhigh & 0x7FF00000) >> 20) - 1023;
+        $mantissa = (0x100000 | ($rknumhigh & 0x000FFFFF));
+        $mantissalow1 = ($rknumlow & self::HIGH_ORDER_BIT) >> 31;
+        $mantissalow2 = ($rknumlow & 0x7FFFFFFF);
+        $value = $mantissa / 2 ** (20 - $exp);
+
+        if ($mantissalow1 != 0) {
+            $value += 1 / 2 ** (21 - $exp);
+        }
+
+        if ($mantissalow2 != 0) {
+            $value += $mantissalow2 / 2 ** (52 - $exp);
+        }
+        if ($sign) {
+            $value *= -1;
+        }
+
+        return $value;
+    }
+
+    private static function getIEEE754(int $rknum): float|int
+    {
+        if (($rknum & 0x02) != 0) {
+            $value = $rknum >> 2;
+        } else {
+            // changes by mmp, info on IEEE754 encoding from
+            // research.microsoft.com/~hollasch/cgindex/coding/ieeefloat.html
+            // The RK format calls for using only the most significant 30 bits
+            // of the 64 bit floating point value. The other 34 bits are assumed
+            // to be 0 so we use the upper 30 bits of $rknum as follows...
+            $sign = ($rknum & self::HIGH_ORDER_BIT) >> 31;
+            $exp = ($rknum & 0x7FF00000) >> 20;
+            $mantissa = (0x100000 | ($rknum & 0x000FFFFC));
+            $value = $mantissa / 2 ** (20 - ($exp - 1023));
+            if ($sign) {
+                $value = -1 * $value;
+            }
+            //end of changes by mmp
+        }
+        if (($rknum & 0x01) != 0) {
+            $value /= 100;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get UTF-8 string from (compressed or uncompressed) UTF-16 string.
+     */
+    private static function encodeUTF16(string $string, bool $compressed = false): string
+    {
+        if ($compressed) {
+            $string = self::uncompressByteString($string);
+        }
+
+        return StringHelper::convertEncoding($string, 'UTF-8', 'UTF-16LE');
+    }
+
+    /**
+     * Convert UTF-16 string in compressed notation to uncompressed form. Only used for BIFF8.
+     */
+    private static function uncompressByteString(string $string): string
+    {
+        $uncompressedString = '';
+        $strLen = strlen($string);
+        for ($i = 0; $i < $strLen; ++$i) {
+            $uncompressedString .= $string[$i] . "\0";
+        }
+
+        return $uncompressedString;
+    }
+
+    /**
+     * Convert string to UTF-8. Only used for BIFF5.
+     */
+    private function decodeCodepage(string $string): string
+    {
+        return StringHelper::convertEncoding($string, 'UTF-8', $this->codepage);
+    }
+
+    /**
+     * Read 16-bit unsigned integer.
+     */
+    public static function getUInt2d(string $data, int $pos): int
+    {
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8);
+    }
+
+    /**
+     * Read 16-bit signed integer.
+     */
+    public static function getInt2d(string $data, int $pos): int
+    {
+        return unpack('s', $data[$pos] . $data[$pos + 1])[1]; // @phpstan-ignore-line
+    }
+
+    /**
+     * Read 32-bit signed integer.
+     */
+    public static function getInt4d(string $data, int $pos): int
+    {
+        // FIX: represent numbers correctly on 64-bit system
+        // http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
+        // Changed by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
+        $_or_24 = ord($data[$pos + 3]);
+        if ($_or_24 >= 128) {
+            // negative number
+            $_ord_24 = -abs((256 - $_or_24) << 24);
+        } else {
+            $_ord_24 = ($_or_24 & 127) << 24;
+        }
+
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
+    }
+
+    private function parseRichText(string $is): RichText
+    {
+        $value = new RichText();
+        $value->createText($is);
+
+        return $value;
+    }
+
+    /**
+     * Phpstan 1.4.4 complains that this property is never read.
+     * So, we might be able to get rid of it altogether.
+     * For now, however, this function makes it readable,
+     * which satisfies Phpstan.
+     *
+     * @codeCoverageIgnore
+     */
+    public function getMapCellStyleXfIndex(): array
+    {
+        return $this->mapCellStyleXfIndex;
+    }
+
+    /**
+     * Parse conditional formatting blocks.
+     *
+     * @see https://www.openoffice.org/sc/excelfileformat.pdf Search for CFHEADER followed by CFRULE
+     */
+    private function readCFHeader(): array
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return [];
+        }
+
+        // offset: 0; size: 2; Rule Count
+//        $ruleCount = self::getUInt2d($recordData, 0);
+
+        // offset: var; size: var; cell range address list with
+        $cellRangeAddressList = ($this->version == self::XLS_BIFF8)
+            ? $this->readBIFF8CellRangeAddressList(substr($recordData, 12))
+            : $this->readBIFF5CellRangeAddressList(substr($recordData, 12));
+        $cellRangeAddresses = $cellRangeAddressList['cellRangeAddresses'];
+
+        return $cellRangeAddresses;
+    }
+
+    private function readCFRule(array $cellRangeAddresses): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2; Options
+        $cfRule = self::getUInt2d($recordData, 0);
+
+        // bit: 8-15; mask: 0x00FF; type
+        $type = (0x00FF & $cfRule) >> 0;
+        $type = ConditionalFormatting::type($type);
+
+        // bit: 0-7; mask: 0xFF00; type
+        $operator = (0xFF00 & $cfRule) >> 8;
+        $operator = ConditionalFormatting::operator($operator);
+
+        if ($type === null || $operator === null) {
+            return;
+        }
+
+        // offset: 2; size: 2; Size1
+        $size1 = self::getUInt2d($recordData, 2);
+
+        // offset: 4; size: 2; Size2
+        $size2 = self::getUInt2d($recordData, 4);
+
+        // offset: 6; size: 4; Options
+        $options = self::getInt4d($recordData, 6);
+
+        $style = new Style(false, true); // non-supervisor, conditional
+        $noFormatSet = true;
+        //$this->getCFStyleOptions($options, $style);
+
+        $hasFontRecord = (bool) ((0x04000000 & $options) >> 26);
+        $hasAlignmentRecord = (bool) ((0x08000000 & $options) >> 27);
+        $hasBorderRecord = (bool) ((0x10000000 & $options) >> 28);
+        $hasFillRecord = (bool) ((0x20000000 & $options) >> 29);
+        $hasProtectionRecord = (bool) ((0x40000000 & $options) >> 30);
+        // note unexpected values for following 4
+        $hasBorderLeft = !(bool) (0x00000400 & $options);
+        $hasBorderRight = !(bool) (0x00000800 & $options);
+        $hasBorderTop = !(bool) (0x00001000 & $options);
+        $hasBorderBottom = !(bool) (0x00002000 & $options);
+
+        $offset = 12;
+
+        if ($hasFontRecord === true) {
+            $fontStyle = substr($recordData, $offset, 118);
+            $this->getCFFontStyle($fontStyle, $style);
+            $offset += 118;
+            $noFormatSet = false;
+        }
+
+        if ($hasAlignmentRecord === true) {
+            //$alignmentStyle = substr($recordData, $offset, 8);
+            //$this->getCFAlignmentStyle($alignmentStyle, $style);
+            $offset += 8;
+        }
+
+        if ($hasBorderRecord === true) {
+            $borderStyle = substr($recordData, $offset, 8);
+            $this->getCFBorderStyle($borderStyle, $style, $hasBorderLeft, $hasBorderRight, $hasBorderTop, $hasBorderBottom);
+            $offset += 8;
+            $noFormatSet = false;
+        }
+
+        if ($hasFillRecord === true) {
+            $fillStyle = substr($recordData, $offset, 4);
+            $this->getCFFillStyle($fillStyle, $style);
+            $offset += 4;
+            $noFormatSet = false;
+        }
+
+        if ($hasProtectionRecord === true) {
+            //$protectionStyle = substr($recordData, $offset, 4);
+            //$this->getCFProtectionStyle($protectionStyle, $style);
+            $offset += 2;
+        }
+
+        $formula1 = $formula2 = null;
+        if ($size1 > 0) {
+            $formula1 = $this->readCFFormula($recordData, $offset, $size1);
+            if ($formula1 === null) {
+                return;
+            }
+
+            $offset += $size1;
+        }
+
+        if ($size2 > 0) {
+            $formula2 = $this->readCFFormula($recordData, $offset, $size2);
+            if ($formula2 === null) {
+                return;
+            }
+
+            $offset += $size2;
+        }
+
+        $this->setCFRules($cellRangeAddresses, $type, $operator, $formula1, $formula2, $style, $noFormatSet);
+    }
+
+    /*private function getCFStyleOptions(int $options, Style $style): void
+    {
+    }*/
+
+    private function getCFFontStyle(string $options, Style $style): void
+    {
+        $fontSize = self::getInt4d($options, 64);
+        if ($fontSize !== -1) {
+            $style->getFont()->setSize($fontSize / 20); // Convert twips to points
+        }
+        $options68 = self::getInt4d($options, 68);
+        $options88 = self::getInt4d($options, 88);
+
+        if (($options88 & 2) === 0) {
+            $bold = self::getUInt2d($options, 72); // 400 = normal, 700 = bold
+            if ($bold !== 0) {
+                $style->getFont()->setBold($bold >= 550);
+            }
+            if (($options68 & 2) !== 0) {
+                $style->getFont()->setItalic(true);
+            }
+        }
+        if (($options88 & 0x80) === 0) {
+            if (($options68 & 0x80) !== 0) {
+                $style->getFont()->setStrikethrough(true);
+            }
+        }
+
+        $color = self::getInt4d($options, 80);
+
+        if ($color !== -1) {
+            $style->getFont()->getColor()->setRGB(Xls\Color::map($color, $this->palette, $this->version)['rgb']);
+        }
+    }
+
+    /*private function getCFAlignmentStyle(string $options, Style $style): void
+    {
+    }*/
+
+    private function getCFBorderStyle(string $options, Style $style, bool $hasBorderLeft, bool $hasBorderRight, bool $hasBorderTop, bool $hasBorderBottom): void
+    {
+        $valueArray = unpack('V', $options);
+        $value = is_array($valueArray) ? $valueArray[1] : 0;
+        $left = $value & 15;
+        $right = ($value >> 4) & 15;
+        $top = ($value >> 8) & 15;
+        $bottom = ($value >> 12) & 15;
+        $leftc = ($value >> 16) & 0x7F;
+        $rightc = ($value >> 23) & 0x7F;
+        $valueArray = unpack('V', substr($options, 4));
+        $value = is_array($valueArray) ? $valueArray[1] : 0;
+        $topc = $value & 0x7F;
+        $bottomc = ($value & 0x3F80) >> 7;
+        if ($hasBorderLeft) {
+            $style->getBorders()->getLeft()
+                ->setBorderStyle(self::BORDER_STYLE_MAP[$left]);
+            $style->getBorders()->getLeft()->getColor()
+                ->setRGB(Xls\Color::map($leftc, $this->palette, $this->version)['rgb']);
+        }
+        if ($hasBorderRight) {
+            $style->getBorders()->getRight()
+                ->setBorderStyle(self::BORDER_STYLE_MAP[$right]);
+            $style->getBorders()->getRight()->getColor()
+                ->setRGB(Xls\Color::map($rightc, $this->palette, $this->version)['rgb']);
+        }
+        if ($hasBorderTop) {
+            $style->getBorders()->getTop()
+                ->setBorderStyle(self::BORDER_STYLE_MAP[$top]);
+            $style->getBorders()->getTop()->getColor()
+                ->setRGB(Xls\Color::map($topc, $this->palette, $this->version)['rgb']);
+        }
+        if ($hasBorderBottom) {
+            $style->getBorders()->getBottom()
+                ->setBorderStyle(self::BORDER_STYLE_MAP[$bottom]);
+            $style->getBorders()->getBottom()->getColor()
+                ->setRGB(Xls\Color::map($bottomc, $this->palette, $this->version)['rgb']);
+        }
+    }
+
+    private function getCFFillStyle(string $options, Style $style): void
+    {
+        $fillPattern = self::getUInt2d($options, 0);
+        // bit: 10-15; mask: 0xFC00; type
+        $fillPattern = (0xFC00 & $fillPattern) >> 10;
+        $fillPattern = FillPattern::lookup($fillPattern);
+        $fillPattern = $fillPattern === Fill::FILL_NONE ? Fill::FILL_SOLID : $fillPattern;
+
+        if ($fillPattern !== Fill::FILL_NONE) {
+            $style->getFill()->setFillType($fillPattern);
+
+            $fillColors = self::getUInt2d($options, 2);
+
+            // bit: 0-6; mask: 0x007F; type
+            $color1 = (0x007F & $fillColors) >> 0;
+
+            // bit: 7-13; mask: 0x3F80; type
+            $color2 = (0x3F80 & $fillColors) >> 7;
+            if ($fillPattern === Fill::FILL_SOLID) {
+                $style->getFill()->getStartColor()->setRGB(Xls\Color::map($color2, $this->palette, $this->version)['rgb']);
+            } else {
+                $style->getFill()->getStartColor()->setRGB(Xls\Color::map($color1, $this->palette, $this->version)['rgb']);
+                $style->getFill()->getEndColor()->setRGB(Xls\Color::map($color2, $this->palette, $this->version)['rgb']);
+            }
+        }
+    }
+
+    /*private function getCFProtectionStyle(string $options, Style $style): void
+    {
+    }*/
+
+    private function readCFFormula(string $recordData, int $offset, int $size): float|int|string|null
+    {
+        try {
+            $formula = substr($recordData, $offset, $size);
+            $formula = pack('v', $size) . $formula; // prepend the length
+
+            $formula = $this->getFormulaFromStructure($formula);
+            if (is_numeric($formula)) {
+                return (str_contains($formula, '.')) ? (float) $formula : (int) $formula;
+            }
+
+            return $formula;
+        } catch (PhpSpreadsheetException) {
+            return null;
+        }
+    }
+
+    private function setCFRules(array $cellRanges, string $type, string $operator, null|float|int|string $formula1, null|float|int|string $formula2, Style $style, bool $noFormatSet): void
+    {
+        foreach ($cellRanges as $cellRange) {
+            $conditional = new Conditional();
+            $conditional->setNoFormatSet($noFormatSet);
+            $conditional->setConditionType($type);
+            $conditional->setOperatorType($operator);
+            $conditional->setStopIfTrue(true);
+            if ($formula1 !== null) {
+                $conditional->addCondition($formula1);
+            }
+            if ($formula2 !== null) {
+                $conditional->addCondition($formula2);
+            }
+            $conditional->setStyle($style);
+
+            $conditionalStyles = $this->phpSheet->getStyle($cellRange)->getConditionalStyles();
+            $conditionalStyles[] = $conditional;
+
+            $this->phpSheet->getStyle($cellRange)->setConditionalStyles($conditionalStyles);
+        }
+    }
+
+    public function getVersion(): int
+    {
+        return $this->version;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php
new file mode 100644
index 00000000..6fd346bf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+class Color
+{
+    /**
+     * Read color.
+     *
+     * @param int $color Indexed color
+     * @param array $palette Color palette
+     *
+     * @return array RGB color value, example: ['rgb' => 'FF0000']
+     */
+    public static function map(int $color, array $palette, int $version): array
+    {
+        if ($color <= 0x07 || $color >= 0x40) {
+            // special built-in color
+            return Color\BuiltIn::lookup($color);
+        } elseif (isset($palette[$color - 8])) {
+            // palette color, color index 0x08 maps to pallete index 0
+            return $palette[$color - 8];
+        }
+
+        // default color table
+        if ($version == Xls::XLS_BIFF8) {
+            return Color\BIFF8::lookup($color);
+        }
+
+        // BIFF5
+        return Color\BIFF5::lookup($color);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
new file mode 100644
index 00000000..2c0790c9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Color;
+
+class BIFF5
+{
+    private const BIFF5_COLOR_MAP = [
+        0x08 => '000000',
+        0x09 => 'FFFFFF',
+        0x0A => 'FF0000',
+        0x0B => '00FF00',
+        0x0C => '0000FF',
+        0x0D => 'FFFF00',
+        0x0E => 'FF00FF',
+        0x0F => '00FFFF',
+        0x10 => '800000',
+        0x11 => '008000',
+        0x12 => '000080',
+        0x13 => '808000',
+        0x14 => '800080',
+        0x15 => '008080',
+        0x16 => 'C0C0C0',
+        0x17 => '808080',
+        0x18 => '8080FF',
+        0x19 => '802060',
+        0x1A => 'FFFFC0',
+        0x1B => 'A0E0F0',
+        0x1C => '600080',
+        0x1D => 'FF8080',
+        0x1E => '0080C0',
+        0x1F => 'C0C0FF',
+        0x20 => '000080',
+        0x21 => 'FF00FF',
+        0x22 => 'FFFF00',
+        0x23 => '00FFFF',
+        0x24 => '800080',
+        0x25 => '800000',
+        0x26 => '008080',
+        0x27 => '0000FF',
+        0x28 => '00CFFF',
+        0x29 => '69FFFF',
+        0x2A => 'E0FFE0',
+        0x2B => 'FFFF80',
+        0x2C => 'A6CAF0',
+        0x2D => 'DD9CB3',
+        0x2E => 'B38FEE',
+        0x2F => 'E3E3E3',
+        0x30 => '2A6FF9',
+        0x31 => '3FB8CD',
+        0x32 => '488436',
+        0x33 => '958C41',
+        0x34 => '8E5E42',
+        0x35 => 'A0627A',
+        0x36 => '624FAC',
+        0x37 => '969696',
+        0x38 => '1D2FBE',
+        0x39 => '286676',
+        0x3A => '004500',
+        0x3B => '453E01',
+        0x3C => '6A2813',
+        0x3D => '85396A',
+        0x3E => '4A3285',
+        0x3F => '424242',
+    ];
+
+    /**
+     * Map color array from BIFF5 built-in color index.
+     */
+    public static function lookup(int $color): array
+    {
+        return ['rgb' => self::BIFF5_COLOR_MAP[$color] ?? '000000'];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
new file mode 100644
index 00000000..914034df
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Color;
+
+class BIFF8
+{
+    private const BIFF8_COLOR_MAP = [
+        0x08 => '000000',
+        0x09 => 'FFFFFF',
+        0x0A => 'FF0000',
+        0x0B => '00FF00',
+        0x0C => '0000FF',
+        0x0D => 'FFFF00',
+        0x0E => 'FF00FF',
+        0x0F => '00FFFF',
+        0x10 => '800000',
+        0x11 => '008000',
+        0x12 => '000080',
+        0x13 => '808000',
+        0x14 => '800080',
+        0x15 => '008080',
+        0x16 => 'C0C0C0',
+        0x17 => '808080',
+        0x18 => '9999FF',
+        0x19 => '993366',
+        0x1A => 'FFFFCC',
+        0x1B => 'CCFFFF',
+        0x1C => '660066',
+        0x1D => 'FF8080',
+        0x1E => '0066CC',
+        0x1F => 'CCCCFF',
+        0x20 => '000080',
+        0x21 => 'FF00FF',
+        0x22 => 'FFFF00',
+        0x23 => '00FFFF',
+        0x24 => '800080',
+        0x25 => '800000',
+        0x26 => '008080',
+        0x27 => '0000FF',
+        0x28 => '00CCFF',
+        0x29 => 'CCFFFF',
+        0x2A => 'CCFFCC',
+        0x2B => 'FFFF99',
+        0x2C => '99CCFF',
+        0x2D => 'FF99CC',
+        0x2E => 'CC99FF',
+        0x2F => 'FFCC99',
+        0x30 => '3366FF',
+        0x31 => '33CCCC',
+        0x32 => '99CC00',
+        0x33 => 'FFCC00',
+        0x34 => 'FF9900',
+        0x35 => 'FF6600',
+        0x36 => '666699',
+        0x37 => '969696',
+        0x38 => '003366',
+        0x39 => '339966',
+        0x3A => '003300',
+        0x3B => '333300',
+        0x3C => '993300',
+        0x3D => '993366',
+        0x3E => '333399',
+        0x3F => '333333',
+    ];
+
+    /**
+     * Map color array from BIFF8 built-in color index.
+     */
+    public static function lookup(int $color): array
+    {
+        return ['rgb' => self::BIFF8_COLOR_MAP[$color] ?? '000000'];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
new file mode 100644
index 00000000..a715b110
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Color;
+
+class BuiltIn
+{
+    private const BUILTIN_COLOR_MAP = [
+        0x00 => '000000',
+        0x01 => 'FFFFFF',
+        0x02 => 'FF0000',
+        0x03 => '00FF00',
+        0x04 => '0000FF',
+        0x05 => 'FFFF00',
+        0x06 => 'FF00FF',
+        0x07 => '00FFFF',
+        0x40 => '000000', // system window text color
+        0x41 => 'FFFFFF', // system window background color
+    ];
+
+    /**
+     * Map built-in color to RGB value.
+     *
+     * @param int $color Indexed color
+     */
+    public static function lookup(int $color): array
+    {
+        return ['rgb' => self::BUILTIN_COLOR_MAP[$color] ?? '000000'];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ConditionalFormatting.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ConditionalFormatting.php
new file mode 100644
index 00000000..fbd31d56
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ConditionalFormatting.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+
+class ConditionalFormatting
+{
+    /**
+     * @var array<int, string>
+     */
+    private static array $types = [
+        0x01 => Conditional::CONDITION_CELLIS,
+        0x02 => Conditional::CONDITION_EXPRESSION,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    private static array $operators = [
+        0x00 => Conditional::OPERATOR_NONE,
+        0x01 => Conditional::OPERATOR_BETWEEN,
+        0x02 => Conditional::OPERATOR_NOTBETWEEN,
+        0x03 => Conditional::OPERATOR_EQUAL,
+        0x04 => Conditional::OPERATOR_NOTEQUAL,
+        0x05 => Conditional::OPERATOR_GREATERTHAN,
+        0x06 => Conditional::OPERATOR_LESSTHAN,
+        0x07 => Conditional::OPERATOR_GREATERTHANOREQUAL,
+        0x08 => Conditional::OPERATOR_LESSTHANOREQUAL,
+    ];
+
+    public static function type(int $type): ?string
+    {
+        if (isset(self::$types[$type])) {
+            return self::$types[$type];
+        }
+
+        return null;
+    }
+
+    public static function operator(int $operator): ?string
+    {
+        if (isset(self::$operators[$operator])) {
+            return self::$operators[$operator];
+        }
+
+        return null;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/DataValidationHelper.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/DataValidationHelper.php
new file mode 100644
index 00000000..874e6994
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/DataValidationHelper.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+
+class DataValidationHelper
+{
+    /**
+     * @var array<int, string>
+     */
+    private static array $types = [
+        0x00 => DataValidation::TYPE_NONE,
+        0x01 => DataValidation::TYPE_WHOLE,
+        0x02 => DataValidation::TYPE_DECIMAL,
+        0x03 => DataValidation::TYPE_LIST,
+        0x04 => DataValidation::TYPE_DATE,
+        0x05 => DataValidation::TYPE_TIME,
+        0x06 => DataValidation::TYPE_TEXTLENGTH,
+        0x07 => DataValidation::TYPE_CUSTOM,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    private static array $errorStyles = [
+        0x00 => DataValidation::STYLE_STOP,
+        0x01 => DataValidation::STYLE_WARNING,
+        0x02 => DataValidation::STYLE_INFORMATION,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    private static array $operators = [
+        0x00 => DataValidation::OPERATOR_BETWEEN,
+        0x01 => DataValidation::OPERATOR_NOTBETWEEN,
+        0x02 => DataValidation::OPERATOR_EQUAL,
+        0x03 => DataValidation::OPERATOR_NOTEQUAL,
+        0x04 => DataValidation::OPERATOR_GREATERTHAN,
+        0x05 => DataValidation::OPERATOR_LESSTHAN,
+        0x06 => DataValidation::OPERATOR_GREATERTHANOREQUAL,
+        0x07 => DataValidation::OPERATOR_LESSTHANOREQUAL,
+    ];
+
+    public static function type(int $type): ?string
+    {
+        if (isset(self::$types[$type])) {
+            return self::$types[$type];
+        }
+
+        return null;
+    }
+
+    public static function errorStyle(int $errorStyle): ?string
+    {
+        if (isset(self::$errorStyles[$errorStyle])) {
+            return self::$errorStyles[$errorStyle];
+        }
+
+        return null;
+    }
+
+    public static function operator(int $operator): ?string
+    {
+        if (isset(self::$operators[$operator])) {
+            return self::$operators[$operator];
+        }
+
+        return null;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
new file mode 100644
index 00000000..fa8f8cd5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+class ErrorCode
+{
+    private const ERROR_CODE_MAP = [
+        0x00 => '#NULL!',
+        0x07 => '#DIV/0!',
+        0x0F => '#VALUE!',
+        0x17 => '#REF!',
+        0x1D => '#NAME?',
+        0x24 => '#NUM!',
+        0x2A => '#N/A',
+    ];
+
+    /**
+     * Map error code, e.g. '#N/A'.
+     */
+    public static function lookup(int $code): string|bool
+    {
+        return self::ERROR_CODE_MAP[$code] ?? false;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php
new file mode 100644
index 00000000..094c19e8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php
@@ -0,0 +1,607 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer\SpContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE\Blip;
+
+class Escher
+{
+    const DGGCONTAINER = 0xF000;
+    const BSTORECONTAINER = 0xF001;
+    const DGCONTAINER = 0xF002;
+    const SPGRCONTAINER = 0xF003;
+    const SPCONTAINER = 0xF004;
+    const DGG = 0xF006;
+    const BSE = 0xF007;
+    const DG = 0xF008;
+    const SPGR = 0xF009;
+    const SP = 0xF00A;
+    const OPT = 0xF00B;
+    const CLIENTTEXTBOX = 0xF00D;
+    const CLIENTANCHOR = 0xF010;
+    const CLIENTDATA = 0xF011;
+    const BLIPJPEG = 0xF01D;
+    const BLIPPNG = 0xF01E;
+    const SPLITMENUCOLORS = 0xF11E;
+    const TERTIARYOPT = 0xF122;
+
+    /**
+     * Escher stream data (binary).
+     */
+    private string $data;
+
+    /**
+     * Size in bytes of the Escher stream data.
+     */
+    private int $dataSize;
+
+    /**
+     * Current position of stream pointer in Escher stream data.
+     */
+    private int $pos;
+
+    /**
+     * The object to be returned by the reader. Modified during load.
+     */
+    private BSE|BstoreContainer|DgContainer|DggContainer|\PhpOffice\PhpSpreadsheet\Shared\Escher|SpContainer|SpgrContainer $object;
+
+    /**
+     * Create a new Escher instance.
+     */
+    public function __construct(BSE|BstoreContainer|DgContainer|DggContainer|\PhpOffice\PhpSpreadsheet\Shared\Escher|SpContainer|SpgrContainer $object)
+    {
+        $this->object = $object;
+    }
+
+    private const WHICH_ROUTINE = [
+        self::DGGCONTAINER => 'readDggContainer',
+        self::DGG => 'readDgg',
+        self::BSTORECONTAINER => 'readBstoreContainer',
+        self::BSE => 'readBSE',
+        self::BLIPJPEG => 'readBlipJPEG',
+        self::BLIPPNG => 'readBlipPNG',
+        self::OPT => 'readOPT',
+        self::TERTIARYOPT => 'readTertiaryOPT',
+        self::SPLITMENUCOLORS => 'readSplitMenuColors',
+        self::DGCONTAINER => 'readDgContainer',
+        self::DG => 'readDg',
+        self::SPGRCONTAINER => 'readSpgrContainer',
+        self::SPCONTAINER => 'readSpContainer',
+        self::SPGR => 'readSpgr',
+        self::SP => 'readSp',
+        self::CLIENTTEXTBOX => 'readClientTextbox',
+        self::CLIENTANCHOR => 'readClientAnchor',
+        self::CLIENTDATA => 'readClientData',
+    ];
+
+    /**
+     * Load Escher stream data. May be a partial Escher stream.
+     */
+    public function load(string $data): BSE|BstoreContainer|DgContainer|DggContainer|\PhpOffice\PhpSpreadsheet\Shared\Escher|SpContainer|SpgrContainer
+    {
+        $this->data = $data;
+
+        // total byte size of Excel data (workbook global substream + sheet substreams)
+        $this->dataSize = strlen($this->data);
+
+        $this->pos = 0;
+
+        // Parse Escher stream
+        while ($this->pos < $this->dataSize) {
+            // offset: 2; size: 2: Record Type
+            $fbt = Xls::getUInt2d($this->data, $this->pos + 2);
+            $routine = self::WHICH_ROUTINE[$fbt] ?? 'readDefault';
+            if (method_exists($this, $routine)) {
+                $this->$routine();
+            }
+        }
+
+        return $this->object;
+    }
+
+    /**
+     * Read a generic record.
+     */
+    private function readDefault(): void
+    {
+        // offset 0; size: 2; recVer and recInstance
+        //$verInstance = Xls::getUInt2d($this->data, $this->pos);
+
+        // offset: 2; size: 2: Record Type
+        //$fbt = Xls::getUInt2d($this->data, $this->pos + 2);
+
+        // bit: 0-3; mask: 0x000F; recVer
+        //$recVer = (0x000F & $verInstance) >> 0;
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read DggContainer record (Drawing Group Container).
+     */
+    private function readDggContainer(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $dggContainer = new DggContainer();
+        $this->applyAttribute('setDggContainer', $dggContainer);
+        $reader = new self($dggContainer);
+        $reader->load($recordData);
+    }
+
+    /**
+     * Read Dgg record (Drawing Group).
+     */
+    private function readDgg(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read BstoreContainer record (Blip Store Container).
+     */
+    private function readBstoreContainer(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $bstoreContainer = new BstoreContainer();
+        $this->applyAttribute('setBstoreContainer', $bstoreContainer);
+        $reader = new self($bstoreContainer);
+        $reader->load($recordData);
+    }
+
+    /**
+     * Read BSE record.
+     */
+    private function readBSE(): void
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // add BSE to BstoreContainer
+        $BSE = new BSE();
+        $this->applyAttribute('addBSE', $BSE);
+
+        $BSE->setBLIPType($recInstance);
+
+        // offset: 0; size: 1; btWin32 (MSOBLIPTYPE)
+        //$btWin32 = ord($recordData[0]);
+
+        // offset: 1; size: 1; btWin32 (MSOBLIPTYPE)
+        //$btMacOS = ord($recordData[1]);
+
+        // offset: 2; size: 16; MD4 digest
+        //$rgbUid = substr($recordData, 2, 16);
+
+        // offset: 18; size: 2; tag
+        //$tag = Xls::getUInt2d($recordData, 18);
+
+        // offset: 20; size: 4; size of BLIP in bytes
+        //$size = Xls::getInt4d($recordData, 20);
+
+        // offset: 24; size: 4; number of references to this BLIP
+        //$cRef = Xls::getInt4d($recordData, 24);
+
+        // offset: 28; size: 4; MSOFO file offset
+        //$foDelay = Xls::getInt4d($recordData, 28);
+
+        // offset: 32; size: 1; unused1
+        //$unused1 = ord($recordData[32]);
+
+        // offset: 33; size: 1; size of nameData in bytes (including null terminator)
+        $cbName = ord($recordData[33]);
+
+        // offset: 34; size: 1; unused2
+        //$unused2 = ord($recordData[34]);
+
+        // offset: 35; size: 1; unused3
+        //$unused3 = ord($recordData[35]);
+
+        // offset: 36; size: $cbName; nameData
+        //$nameData = substr($recordData, 36, $cbName);
+
+        // offset: 36 + $cbName, size: var; the BLIP data
+        $blipData = substr($recordData, 36 + $cbName);
+
+        // record is a container, read contents
+        $reader = new self($BSE);
+        $reader->load($blipData);
+    }
+
+    /**
+     * Read BlipJPEG record. Holds raw JPEG image data.
+     */
+    private function readBlipJPEG(): void
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        $pos = 0;
+
+        // offset: 0; size: 16; rgbUid1 (MD4 digest of)
+        //$rgbUid1 = substr($recordData, 0, 16);
+        $pos += 16;
+
+        // offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
+        if (in_array($recInstance, [0x046B, 0x06E3])) {
+            //$rgbUid2 = substr($recordData, 16, 16);
+            $pos += 16;
+        }
+
+        // offset: var; size: 1; tag
+        //$tag = ord($recordData[$pos]);
+        ++$pos;
+
+        // offset: var; size: var; the raw image data
+        $data = substr($recordData, $pos);
+
+        $blip = new Blip();
+        $blip->setData($data);
+
+        $this->applyAttribute('setBlip', $blip);
+    }
+
+    /**
+     * Read BlipPNG record. Holds raw PNG image data.
+     */
+    private function readBlipPNG(): void
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        $pos = 0;
+
+        // offset: 0; size: 16; rgbUid1 (MD4 digest of)
+        //$rgbUid1 = substr($recordData, 0, 16);
+        $pos += 16;
+
+        // offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
+        if ($recInstance == 0x06E1) {
+            //$rgbUid2 = substr($recordData, 16, 16);
+            $pos += 16;
+        }
+
+        // offset: var; size: 1; tag
+        //$tag = ord($recordData[$pos]);
+        ++$pos;
+
+        // offset: var; size: var; the raw image data
+        $data = substr($recordData, $pos);
+
+        $blip = new Blip();
+        $blip->setData($data);
+
+        $this->applyAttribute('setBlip', $blip);
+    }
+
+    /**
+     * Read OPT record. This record may occur within DggContainer record or SpContainer.
+     */
+    private function readOPT(): void
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        $recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        $this->readOfficeArtRGFOPTE($recordData, $recInstance);
+    }
+
+    /**
+     * Read TertiaryOPT record.
+     */
+    private function readTertiaryOPT(): void
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        //$recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read SplitMenuColors record.
+     */
+    private function readSplitMenuColors(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read DgContainer record (Drawing Container).
+     */
+    private function readDgContainer(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $dgContainer = new DgContainer();
+        $this->applyAttribute('setDgContainer', $dgContainer);
+        $reader = new self($dgContainer);
+        $reader->load($recordData);
+    }
+
+    /**
+     * Read Dg record (Drawing).
+     */
+    private function readDg(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read SpgrContainer record (Shape Group Container).
+     */
+    private function readSpgrContainer(): void
+    {
+        // context is either context DgContainer or SpgrContainer
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $spgrContainer = new SpgrContainer();
+
+        if ($this->object instanceof DgContainer) {
+            // DgContainer
+            $this->object->setSpgrContainer($spgrContainer);
+        } elseif ($this->object instanceof SpgrContainer) {
+            // SpgrContainer
+            $this->object->addChild($spgrContainer);
+        }
+
+        $reader = new self($spgrContainer);
+        $reader->load($recordData);
+    }
+
+    /**
+     * Read SpContainer record (Shape Container).
+     */
+    private function readSpContainer(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // add spContainer to spgrContainer
+        $spContainer = new SpContainer();
+        $this->applyAttribute('addChild', $spContainer);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // record is a container, read contents
+        $reader = new self($spContainer);
+        $reader->load($recordData);
+    }
+
+    /**
+     * Read Spgr record (Shape Group).
+     */
+    private function readSpgr(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read Sp record (Shape).
+     */
+    private function readSp(): void
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        //$recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read ClientTextbox record.
+     */
+    private function readClientTextbox(): void
+    {
+        // offset: 0; size: 2; recVer and recInstance
+
+        // bit: 4-15; mask: 0xFFF0; recInstance
+        //$recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read ClientAnchor record. This record holds information about where the shape is anchored in worksheet.
+     */
+    private function readClientAnchor(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+
+        // offset: 2; size: 2; upper-left corner column index (0-based)
+        $c1 = Xls::getUInt2d($recordData, 2);
+
+        // offset: 4; size: 2; upper-left corner horizontal offset in 1/1024 of column width
+        $startOffsetX = Xls::getUInt2d($recordData, 4);
+
+        // offset: 6; size: 2; upper-left corner row index (0-based)
+        $r1 = Xls::getUInt2d($recordData, 6);
+
+        // offset: 8; size: 2; upper-left corner vertical offset in 1/256 of row height
+        $startOffsetY = Xls::getUInt2d($recordData, 8);
+
+        // offset: 10; size: 2; bottom-right corner column index (0-based)
+        $c2 = Xls::getUInt2d($recordData, 10);
+
+        // offset: 12; size: 2; bottom-right corner horizontal offset in 1/1024 of column width
+        $endOffsetX = Xls::getUInt2d($recordData, 12);
+
+        // offset: 14; size: 2; bottom-right corner row index (0-based)
+        $r2 = Xls::getUInt2d($recordData, 14);
+
+        // offset: 16; size: 2; bottom-right corner vertical offset in 1/256 of row height
+        $endOffsetY = Xls::getUInt2d($recordData, 16);
+
+        $this->applyAttribute('setStartCoordinates', Coordinate::stringFromColumnIndex($c1 + 1) . ($r1 + 1));
+        $this->applyAttribute('setStartOffsetX', $startOffsetX);
+        $this->applyAttribute('setStartOffsetY', $startOffsetY);
+        $this->applyAttribute('setEndCoordinates', Coordinate::stringFromColumnIndex($c2 + 1) . ($r2 + 1));
+        $this->applyAttribute('setEndOffsetX', $endOffsetX);
+        $this->applyAttribute('setEndOffsetY', $endOffsetY);
+    }
+
+    private function applyAttribute(string $name, mixed $value): void
+    {
+        if (method_exists($this->object, $name)) {
+            $this->object->$name($value);
+        }
+    }
+
+    /**
+     * Read ClientData record.
+     */
+    private function readClientData(): void
+    {
+        $length = Xls::getInt4d($this->data, $this->pos + 4);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
+
+        // move stream pointer to next record
+        $this->pos += 8 + $length;
+    }
+
+    /**
+     * Read OfficeArtRGFOPTE table of property-value pairs.
+     *
+     * @param string $data Binary data
+     * @param int $n Number of properties
+     */
+    private function readOfficeArtRGFOPTE(string $data, int $n): void
+    {
+        $splicedComplexData = substr($data, 6 * $n);
+
+        // loop through property-value pairs
+        for ($i = 0; $i < $n; ++$i) {
+            // read 6 bytes at a time
+            $fopte = substr($data, 6 * $i, 6);
+
+            // offset: 0; size: 2; opid
+            $opid = Xls::getUInt2d($fopte, 0);
+
+            // bit: 0-13; mask: 0x3FFF; opid.opid
+            $opidOpid = (0x3FFF & $opid) >> 0;
+
+            // bit: 14; mask 0x4000; 1 = value in op field is BLIP identifier
+            //$opidFBid = (0x4000 & $opid) >> 14;
+
+            // bit: 15; mask 0x8000; 1 = this is a complex property, op field specifies size of complex data
+            $opidFComplex = (0x8000 & $opid) >> 15;
+
+            // offset: 2; size: 4; the value for this property
+            $op = Xls::getInt4d($fopte, 2);
+
+            if ($opidFComplex) {
+                $complexData = substr($splicedComplexData, 0, $op);
+                $splicedComplexData = substr($splicedComplexData, $op);
+
+                // we store string value with complex data
+                $value = $complexData;
+            } else {
+                // we store integer value
+                $value = $op;
+            }
+
+            if (method_exists($this->object, 'setOPT')) {
+                $this->object->setOPT($opidOpid, $value);
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php
new file mode 100644
index 00000000..7da2eeee
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+class MD5
+{
+    private int $a;
+
+    private int $b;
+
+    private int $c;
+
+    private int $d;
+
+    private static int $allOneBits;
+
+    /**
+     * MD5 stream constructor.
+     */
+    public function __construct()
+    {
+        self::$allOneBits = self::signedInt(0xFFFFFFFF);
+        $this->reset();
+    }
+
+    /**
+     * Reset the MD5 stream context.
+     */
+    public function reset(): void
+    {
+        $this->a = 0x67452301;
+        $this->b = self::signedInt(0xEFCDAB89);
+        $this->c = self::signedInt(0x98BADCFE);
+        $this->d = 0x10325476;
+    }
+
+    /**
+     * Get MD5 stream context.
+     */
+    public function getContext(): string
+    {
+        $s = '';
+        foreach (['a', 'b', 'c', 'd'] as $i) {
+            $v = $this->{$i};
+            $s .= chr($v & 0xFF);
+            $s .= chr(($v >> 8) & 0xFF);
+            $s .= chr(($v >> 16) & 0xFF);
+            $s .= chr(($v >> 24) & 0xFF);
+        }
+
+        return $s;
+    }
+
+    /**
+     * Add data to context.
+     *
+     * @param string $data Data to add
+     */
+    public function add(string $data): void
+    {
+        // @phpstan-ignore-next-line
+        $words = array_values(unpack('V16', $data));
+
+        $A = $this->a;
+        $B = $this->b;
+        $C = $this->c;
+        $D = $this->d;
+
+        $F = [self::class, 'f'];
+        $G = [self::class, 'g'];
+        $H = [self::class, 'h'];
+        $I = [self::class, 'i'];
+
+        // ROUND 1
+        self::step($F, $A, $B, $C, $D, $words[0], 7, 0xD76AA478);
+        self::step($F, $D, $A, $B, $C, $words[1], 12, 0xE8C7B756);
+        self::step($F, $C, $D, $A, $B, $words[2], 17, 0x242070DB);
+        self::step($F, $B, $C, $D, $A, $words[3], 22, 0xC1BDCEEE);
+        self::step($F, $A, $B, $C, $D, $words[4], 7, 0xF57C0FAF);
+        self::step($F, $D, $A, $B, $C, $words[5], 12, 0x4787C62A);
+        self::step($F, $C, $D, $A, $B, $words[6], 17, 0xA8304613);
+        self::step($F, $B, $C, $D, $A, $words[7], 22, 0xFD469501);
+        self::step($F, $A, $B, $C, $D, $words[8], 7, 0x698098D8);
+        self::step($F, $D, $A, $B, $C, $words[9], 12, 0x8B44F7AF);
+        self::step($F, $C, $D, $A, $B, $words[10], 17, 0xFFFF5BB1);
+        self::step($F, $B, $C, $D, $A, $words[11], 22, 0x895CD7BE);
+        self::step($F, $A, $B, $C, $D, $words[12], 7, 0x6B901122);
+        self::step($F, $D, $A, $B, $C, $words[13], 12, 0xFD987193);
+        self::step($F, $C, $D, $A, $B, $words[14], 17, 0xA679438E);
+        self::step($F, $B, $C, $D, $A, $words[15], 22, 0x49B40821);
+
+        // ROUND 2
+        self::step($G, $A, $B, $C, $D, $words[1], 5, 0xF61E2562);
+        self::step($G, $D, $A, $B, $C, $words[6], 9, 0xC040B340);
+        self::step($G, $C, $D, $A, $B, $words[11], 14, 0x265E5A51);
+        self::step($G, $B, $C, $D, $A, $words[0], 20, 0xE9B6C7AA);
+        self::step($G, $A, $B, $C, $D, $words[5], 5, 0xD62F105D);
+        self::step($G, $D, $A, $B, $C, $words[10], 9, 0x02441453);
+        self::step($G, $C, $D, $A, $B, $words[15], 14, 0xD8A1E681);
+        self::step($G, $B, $C, $D, $A, $words[4], 20, 0xE7D3FBC8);
+        self::step($G, $A, $B, $C, $D, $words[9], 5, 0x21E1CDE6);
+        self::step($G, $D, $A, $B, $C, $words[14], 9, 0xC33707D6);
+        self::step($G, $C, $D, $A, $B, $words[3], 14, 0xF4D50D87);
+        self::step($G, $B, $C, $D, $A, $words[8], 20, 0x455A14ED);
+        self::step($G, $A, $B, $C, $D, $words[13], 5, 0xA9E3E905);
+        self::step($G, $D, $A, $B, $C, $words[2], 9, 0xFCEFA3F8);
+        self::step($G, $C, $D, $A, $B, $words[7], 14, 0x676F02D9);
+        self::step($G, $B, $C, $D, $A, $words[12], 20, 0x8D2A4C8A);
+
+        // ROUND 3
+        self::step($H, $A, $B, $C, $D, $words[5], 4, 0xFFFA3942);
+        self::step($H, $D, $A, $B, $C, $words[8], 11, 0x8771F681);
+        self::step($H, $C, $D, $A, $B, $words[11], 16, 0x6D9D6122);
+        self::step($H, $B, $C, $D, $A, $words[14], 23, 0xFDE5380C);
+        self::step($H, $A, $B, $C, $D, $words[1], 4, 0xA4BEEA44);
+        self::step($H, $D, $A, $B, $C, $words[4], 11, 0x4BDECFA9);
+        self::step($H, $C, $D, $A, $B, $words[7], 16, 0xF6BB4B60);
+        self::step($H, $B, $C, $D, $A, $words[10], 23, 0xBEBFBC70);
+        self::step($H, $A, $B, $C, $D, $words[13], 4, 0x289B7EC6);
+        self::step($H, $D, $A, $B, $C, $words[0], 11, 0xEAA127FA);
+        self::step($H, $C, $D, $A, $B, $words[3], 16, 0xD4EF3085);
+        self::step($H, $B, $C, $D, $A, $words[6], 23, 0x04881D05);
+        self::step($H, $A, $B, $C, $D, $words[9], 4, 0xD9D4D039);
+        self::step($H, $D, $A, $B, $C, $words[12], 11, 0xE6DB99E5);
+        self::step($H, $C, $D, $A, $B, $words[15], 16, 0x1FA27CF8);
+        self::step($H, $B, $C, $D, $A, $words[2], 23, 0xC4AC5665);
+
+        // ROUND 4
+        self::step($I, $A, $B, $C, $D, $words[0], 6, 0xF4292244);
+        self::step($I, $D, $A, $B, $C, $words[7], 10, 0x432AFF97);
+        self::step($I, $C, $D, $A, $B, $words[14], 15, 0xAB9423A7);
+        self::step($I, $B, $C, $D, $A, $words[5], 21, 0xFC93A039);
+        self::step($I, $A, $B, $C, $D, $words[12], 6, 0x655B59C3);
+        self::step($I, $D, $A, $B, $C, $words[3], 10, 0x8F0CCC92);
+        self::step($I, $C, $D, $A, $B, $words[10], 15, 0xFFEFF47D);
+        self::step($I, $B, $C, $D, $A, $words[1], 21, 0x85845DD1);
+        self::step($I, $A, $B, $C, $D, $words[8], 6, 0x6FA87E4F);
+        self::step($I, $D, $A, $B, $C, $words[15], 10, 0xFE2CE6E0);
+        self::step($I, $C, $D, $A, $B, $words[6], 15, 0xA3014314);
+        self::step($I, $B, $C, $D, $A, $words[13], 21, 0x4E0811A1);
+        self::step($I, $A, $B, $C, $D, $words[4], 6, 0xF7537E82);
+        self::step($I, $D, $A, $B, $C, $words[11], 10, 0xBD3AF235);
+        self::step($I, $C, $D, $A, $B, $words[2], 15, 0x2AD7D2BB);
+        self::step($I, $B, $C, $D, $A, $words[9], 21, 0xEB86D391);
+
+        $this->a = ($this->a + $A) & self::$allOneBits;
+        $this->b = ($this->b + $B) & self::$allOneBits;
+        $this->c = ($this->c + $C) & self::$allOneBits;
+        $this->d = ($this->d + $D) & self::$allOneBits;
+    }
+
+    private static function f(int $X, int $Y, int $Z): int
+    {
+        return ($X & $Y) | ((~$X) & $Z); // X AND Y OR NOT X AND Z
+    }
+
+    private static function g(int $X, int $Y, int $Z): int
+    {
+        return ($X & $Z) | ($Y & (~$Z)); // X AND Z OR Y AND NOT Z
+    }
+
+    private static function h(int $X, int $Y, int $Z): int
+    {
+        return $X ^ $Y ^ $Z; // X XOR Y XOR Z
+    }
+
+    private static function i(int $X, int $Y, int $Z): int
+    {
+        return $Y ^ ($X | (~$Z)); // Y XOR (X OR NOT Z)
+    }
+
+    /** @param float|int $t may be float on 32-bit system */
+    private static function step(callable $func, int &$A, int $B, int $C, int $D, int $M, int $s, $t): void
+    {
+        $t = self::signedInt($t);
+        $A = (int) ($A + call_user_func($func, $B, $C, $D) + $M + $t) & self::$allOneBits;
+        $A = self::rotate($A, $s);
+        $A = (int) ($B + $A) & self::$allOneBits;
+    }
+
+    /** @param float|int $result may be float on 32-bit system */
+    private static function signedInt($result): int
+    {
+        return is_int($result) ? $result : (int) (PHP_INT_MIN + $result - 1 - PHP_INT_MAX);
+    }
+
+    private static function rotate(int $decimal, int $bits): int
+    {
+        $binary = str_pad(decbin($decimal), 32, '0', STR_PAD_LEFT);
+
+        return self::signedInt(bindec(substr($binary, $bits) . substr($binary, 0, $bits)));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php
new file mode 100644
index 00000000..663f3672
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+class RC4
+{
+    /** @var int[] */
+    protected array $s = []; // Context
+
+    protected int $i = 0;
+
+    protected int $j = 0;
+
+    /**
+     * RC4 stream decryption/encryption constrcutor.
+     *
+     * @param string $key Encryption key/passphrase
+     */
+    public function __construct(string $key)
+    {
+        $len = strlen($key);
+
+        for ($this->i = 0; $this->i < 256; ++$this->i) {
+            $this->s[$this->i] = $this->i;
+        }
+
+        $this->j = 0;
+        for ($this->i = 0; $this->i < 256; ++$this->i) {
+            $this->j = ($this->j + $this->s[$this->i] + ord($key[$this->i % $len])) % 256;
+            $t = $this->s[$this->i];
+            $this->s[$this->i] = $this->s[$this->j];
+            $this->s[$this->j] = $t;
+        }
+        $this->i = $this->j = 0;
+    }
+
+    /**
+     * Symmetric decryption/encryption function.
+     *
+     * @param string $data Data to encrypt/decrypt
+     */
+    public function RC4(string $data): string
+    {
+        $len = strlen($data);
+        for ($c = 0; $c < $len; ++$c) {
+            $this->i = ($this->i + 1) % 256;
+            $this->j = ($this->j + $this->s[$this->i]) % 256;
+            $t = $this->s[$this->i];
+            $this->s[$this->i] = $this->s[$this->j];
+            $this->s[$this->j] = $t;
+
+            $t = ($this->s[$this->i] + $this->s[$this->j]) % 256;
+
+            $data[$c] = chr(ord($data[$c]) ^ $this->s[$t]);
+        }
+
+        return $data;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php
new file mode 100644
index 00000000..97cebbd4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Border as StyleBorder;
+
+class Border
+{
+    /**
+     * @var array<int, string>
+     */
+    protected static array $borderStyleMap = [
+        0x00 => StyleBorder::BORDER_NONE,
+        0x01 => StyleBorder::BORDER_THIN,
+        0x02 => StyleBorder::BORDER_MEDIUM,
+        0x03 => StyleBorder::BORDER_DASHED,
+        0x04 => StyleBorder::BORDER_DOTTED,
+        0x05 => StyleBorder::BORDER_THICK,
+        0x06 => StyleBorder::BORDER_DOUBLE,
+        0x07 => StyleBorder::BORDER_HAIR,
+        0x08 => StyleBorder::BORDER_MEDIUMDASHED,
+        0x09 => StyleBorder::BORDER_DASHDOT,
+        0x0A => StyleBorder::BORDER_MEDIUMDASHDOT,
+        0x0B => StyleBorder::BORDER_DASHDOTDOT,
+        0x0C => StyleBorder::BORDER_MEDIUMDASHDOTDOT,
+        0x0D => StyleBorder::BORDER_SLANTDASHDOT,
+    ];
+
+    public static function lookup(int $index): string
+    {
+        if (isset(self::$borderStyleMap[$index])) {
+            return self::$borderStyleMap[$index];
+        }
+
+        return StyleBorder::BORDER_NONE;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php
new file mode 100644
index 00000000..6b89d27e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+class CellAlignment
+{
+    /**
+     * @var array<int, string>
+     */
+    protected static array $horizontalAlignmentMap = [
+        0 => Alignment::HORIZONTAL_GENERAL,
+        1 => Alignment::HORIZONTAL_LEFT,
+        2 => Alignment::HORIZONTAL_CENTER,
+        3 => Alignment::HORIZONTAL_RIGHT,
+        4 => Alignment::HORIZONTAL_FILL,
+        5 => Alignment::HORIZONTAL_JUSTIFY,
+        6 => Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    protected static array $verticalAlignmentMap = [
+        0 => Alignment::VERTICAL_TOP,
+        1 => Alignment::VERTICAL_CENTER,
+        2 => Alignment::VERTICAL_BOTTOM,
+        3 => Alignment::VERTICAL_JUSTIFY,
+    ];
+
+    public static function horizontal(Alignment $alignment, int $horizontal): void
+    {
+        if (array_key_exists($horizontal, self::$horizontalAlignmentMap)) {
+            $alignment->setHorizontal(self::$horizontalAlignmentMap[$horizontal]);
+        }
+    }
+
+    public static function vertical(Alignment $alignment, int $vertical): void
+    {
+        if (array_key_exists($vertical, self::$verticalAlignmentMap)) {
+            $alignment->setVertical(self::$verticalAlignmentMap[$vertical]);
+        }
+    }
+
+    public static function wrap(Alignment $alignment, int $wrap): void
+    {
+        $alignment->setWrapText((bool) $wrap);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php
new file mode 100644
index 00000000..2c6d2f7f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class CellFont
+{
+    public static function escapement(Font $font, int $escapement): void
+    {
+        switch ($escapement) {
+            case 0x0001:
+                $font->setSuperscript(true);
+
+                break;
+            case 0x0002:
+                $font->setSubscript(true);
+
+                break;
+        }
+    }
+
+    /**
+     * @var array<int, string>
+     */
+    protected static array $underlineMap = [
+        0x01 => Font::UNDERLINE_SINGLE,
+        0x02 => Font::UNDERLINE_DOUBLE,
+        0x21 => Font::UNDERLINE_SINGLEACCOUNTING,
+        0x22 => Font::UNDERLINE_DOUBLEACCOUNTING,
+    ];
+
+    public static function underline(Font $font, int $underline): void
+    {
+        if (array_key_exists($underline, self::$underlineMap)) {
+            $font->setUnderline(self::$underlineMap[$underline]);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php
new file mode 100644
index 00000000..4e379509
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+class FillPattern
+{
+    /**
+     * @var array<int, string>
+     */
+    protected static array $fillPatternMap = [
+        0x00 => Fill::FILL_NONE,
+        0x01 => Fill::FILL_SOLID,
+        0x02 => Fill::FILL_PATTERN_MEDIUMGRAY,
+        0x03 => Fill::FILL_PATTERN_DARKGRAY,
+        0x04 => Fill::FILL_PATTERN_LIGHTGRAY,
+        0x05 => Fill::FILL_PATTERN_DARKHORIZONTAL,
+        0x06 => Fill::FILL_PATTERN_DARKVERTICAL,
+        0x07 => Fill::FILL_PATTERN_DARKDOWN,
+        0x08 => Fill::FILL_PATTERN_DARKUP,
+        0x09 => Fill::FILL_PATTERN_DARKGRID,
+        0x0A => Fill::FILL_PATTERN_DARKTRELLIS,
+        0x0B => Fill::FILL_PATTERN_LIGHTHORIZONTAL,
+        0x0C => Fill::FILL_PATTERN_LIGHTVERTICAL,
+        0x0D => Fill::FILL_PATTERN_LIGHTDOWN,
+        0x0E => Fill::FILL_PATTERN_LIGHTUP,
+        0x0F => Fill::FILL_PATTERN_LIGHTGRID,
+        0x10 => Fill::FILL_PATTERN_LIGHTTRELLIS,
+        0x11 => Fill::FILL_PATTERN_GRAY125,
+        0x12 => Fill::FILL_PATTERN_GRAY0625,
+    ];
+
+    /**
+     * Get fill pattern from index
+     * OpenOffice documentation: 2.5.12.
+     */
+    public static function lookup(int $index): string
+    {
+        if (isset(self::$fillPatternMap[$index])) {
+            return self::$fillPatternMap[$index];
+        }
+
+        return Fill::FILL_NONE;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
new file mode 100644
index 00000000..882f2964
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -0,0 +1,2360 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
+use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\AutoFilter;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Chart;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\ColumnAndRowAttributes;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\ConditionalStyles;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\DataValidations;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Hyperlinks;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\PageSetup;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Properties as PropertyReader;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\SharedFormula;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\SheetViewOptions;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\SheetViews;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Styles;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\TableReader;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Theme;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\WorkbookView;
+use PhpOffice\PhpSpreadsheet\ReferenceHelper;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\Drawing;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Shared\Font;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Font as StyleFont;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooterDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+use Throwable;
+use XMLReader;
+use ZipArchive;
+
+class Xlsx extends BaseReader
+{
+    const INITIAL_FILE = '_rels/.rels';
+
+    /**
+     * ReferenceHelper instance.
+     */
+    private ReferenceHelper $referenceHelper;
+
+    private ZipArchive $zip;
+
+    private Styles $styleReader;
+
+    private array $sharedFormulae = [];
+
+    /**
+     * Create a new Xlsx Reader instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->referenceHelper = ReferenceHelper::getInstance();
+        $this->securityScanner = XmlScanner::getInstance($this);
+    }
+
+    /**
+     * Can the current IReader read the file?
+     */
+    public function canRead(string $filename): bool
+    {
+        if (!File::testFileNoThrow($filename, self::INITIAL_FILE)) {
+            return false;
+        }
+
+        $result = false;
+        $this->zip = $zip = new ZipArchive();
+
+        if ($zip->open($filename) === true) {
+            [$workbookBasename] = $this->getWorkbookBaseName();
+            $result = !empty($workbookBasename);
+
+            $zip->close();
+        }
+
+        return $result;
+    }
+
+    public static function testSimpleXml(mixed $value): SimpleXMLElement
+    {
+        return ($value instanceof SimpleXMLElement) ? $value : new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><root></root>');
+    }
+
+    public static function getAttributes(?SimpleXMLElement $value, string $ns = ''): SimpleXMLElement
+    {
+        return self::testSimpleXml($value === null ? $value : $value->attributes($ns));
+    }
+
+    // Phpstan thinks, correctly, that xpath can return false.
+    private static function xpathNoFalse(SimpleXMLElement $sxml, string $path): array
+    {
+        return self::falseToArray($sxml->xpath($path));
+    }
+
+    public static function falseToArray(mixed $value): array
+    {
+        return is_array($value) ? $value : [];
+    }
+
+    private function loadZip(string $filename, string $ns = '', bool $replaceUnclosedBr = false): SimpleXMLElement
+    {
+        $contents = $this->getFromZipArchive($this->zip, $filename);
+        if ($replaceUnclosedBr) {
+            $contents = str_replace('<br>', '<br/>', $contents);
+        }
+        $rels = @simplexml_load_string(
+            $this->getSecurityScannerOrThrow()->scan($contents),
+            'SimpleXMLElement',
+            Settings::getLibXmlLoaderOptions(),
+            $ns
+        );
+
+        return self::testSimpleXml($rels);
+    }
+
+    // This function is just to identify cases where I'm not sure
+    // why empty namespace is required.
+    private function loadZipNonamespace(string $filename, string $ns): SimpleXMLElement
+    {
+        $contents = $this->getFromZipArchive($this->zip, $filename);
+        $rels = simplexml_load_string(
+            $this->getSecurityScannerOrThrow()->scan($contents),
+            'SimpleXMLElement',
+            Settings::getLibXmlLoaderOptions(),
+            ($ns === '' ? $ns : '')
+        );
+
+        return self::testSimpleXml($rels);
+    }
+
+    private const REL_TO_MAIN = [
+        Namespaces::PURL_OFFICE_DOCUMENT => Namespaces::PURL_MAIN,
+        Namespaces::THUMBNAIL => '',
+    ];
+
+    private const REL_TO_DRAWING = [
+        Namespaces::PURL_RELATIONSHIPS => Namespaces::PURL_DRAWING,
+    ];
+
+    private const REL_TO_CHART = [
+        Namespaces::PURL_RELATIONSHIPS => Namespaces::PURL_CHART,
+    ];
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
+     */
+    public function listWorksheetNames(string $filename): array
+    {
+        File::assertFile($filename, self::INITIAL_FILE);
+
+        $worksheetNames = [];
+
+        $this->zip = $zip = new ZipArchive();
+        $zip->open($filename);
+
+        //    The files we're looking at here are small enough that simpleXML is more efficient than XMLReader
+        $rels = $this->loadZip(self::INITIAL_FILE, Namespaces::RELATIONSHIPS);
+        foreach ($rels->Relationship as $relx) {
+            $rel = self::getAttributes($relx);
+            $relType = (string) $rel['Type'];
+            $mainNS = self::REL_TO_MAIN[$relType] ?? Namespaces::MAIN;
+            if ($mainNS !== '') {
+                $xmlWorkbook = $this->loadZip((string) $rel['Target'], $mainNS);
+
+                if ($xmlWorkbook->sheets) {
+                    foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+                        // Check if sheet should be skipped
+                        $worksheetNames[] = (string) self::getAttributes($eleSheet)['name'];
+                    }
+                }
+            }
+        }
+
+        $zip->close();
+
+        return $worksheetNames;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        File::assertFile($filename, self::INITIAL_FILE);
+
+        $worksheetInfo = [];
+
+        $this->zip = $zip = new ZipArchive();
+        $zip->open($filename);
+
+        $rels = $this->loadZip(self::INITIAL_FILE, Namespaces::RELATIONSHIPS);
+        foreach ($rels->Relationship as $relx) {
+            $rel = self::getAttributes($relx);
+            $relType = (string) $rel['Type'];
+            $mainNS = self::REL_TO_MAIN[$relType] ?? Namespaces::MAIN;
+            if ($mainNS !== '') {
+                $relTarget = (string) $rel['Target'];
+                $dir = dirname($relTarget);
+                $namespace = dirname($relType);
+                $relsWorkbook = $this->loadZip("$dir/_rels/" . basename($relTarget) . '.rels', Namespaces::RELATIONSHIPS);
+
+                $worksheets = [];
+                foreach ($relsWorkbook->Relationship as $elex) {
+                    $ele = self::getAttributes($elex);
+                    if (
+                        ((string) $ele['Type'] === "$namespace/worksheet")
+                        || ((string) $ele['Type'] === "$namespace/chartsheet")
+                    ) {
+                        $worksheets[(string) $ele['Id']] = $ele['Target'];
+                    }
+                }
+
+                $xmlWorkbook = $this->loadZip($relTarget, $mainNS);
+                if ($xmlWorkbook->sheets) {
+                    $dir = dirname($relTarget);
+
+                    /** @var SimpleXMLElement $eleSheet */
+                    foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+                        $tmpInfo = [
+                            'worksheetName' => (string) self::getAttributes($eleSheet)['name'],
+                            'lastColumnLetter' => 'A',
+                            'lastColumnIndex' => 0,
+                            'totalRows' => 0,
+                            'totalColumns' => 0,
+                        ];
+
+                        $fileWorksheet = (string) $worksheets[(string) self::getArrayItem(self::getAttributes($eleSheet, $namespace), 'id')];
+                        $fileWorksheetPath = str_starts_with($fileWorksheet, '/') ? substr($fileWorksheet, 1) : "$dir/$fileWorksheet";
+
+                        $xml = new XMLReader();
+                        $xml->xml(
+                            $this->getSecurityScannerOrThrow()->scan(
+                                $this->getFromZipArchive($this->zip, $fileWorksheetPath)
+                            ),
+                            null,
+                            Settings::getLibXmlLoaderOptions()
+                        );
+                        $xml->setParserProperty(2, true);
+
+                        $currCells = 0;
+                        while ($xml->read()) {
+                            if ($xml->localName == 'row' && $xml->nodeType == XMLReader::ELEMENT && $xml->namespaceURI === $mainNS) {
+                                $row = $xml->getAttribute('r');
+                                $tmpInfo['totalRows'] = $row;
+                                $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
+                                $currCells = 0;
+                            } elseif ($xml->localName == 'c' && $xml->nodeType == XMLReader::ELEMENT && $xml->namespaceURI === $mainNS) {
+                                $cell = $xml->getAttribute('r');
+                                $currCells = $cell ? max($currCells, Coordinate::indexesFromString($cell)[0]) : ($currCells + 1);
+                            }
+                        }
+                        $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
+                        $xml->close();
+
+                        $tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
+                        $tmpInfo['lastColumnLetter'] = Coordinate::stringFromColumnIndex($tmpInfo['lastColumnIndex'] + 1);
+
+                        $worksheetInfo[] = $tmpInfo;
+                    }
+                }
+            }
+        }
+
+        $zip->close();
+
+        return $worksheetInfo;
+    }
+
+    private static function castToBoolean(SimpleXMLElement $c): bool
+    {
+        $value = isset($c->v) ? (string) $c->v : null;
+        if ($value == '0') {
+            return false;
+        } elseif ($value == '1') {
+            return true;
+        }
+
+        return (bool) $c->v;
+    }
+
+    private static function castToError(?SimpleXMLElement $c): ?string
+    {
+        return isset($c, $c->v) ? (string) $c->v : null;
+    }
+
+    private static function castToString(?SimpleXMLElement $c): ?string
+    {
+        return isset($c, $c->v) ? (string) $c->v : null;
+    }
+
+    private function castToFormula(?SimpleXMLElement $c, string $r, string &$cellDataType, mixed &$value, mixed &$calculatedValue, string $castBaseType, bool $updateSharedCells = true): void
+    {
+        if ($c === null) {
+            return;
+        }
+        $attr = $c->f->attributes();
+        $cellDataType = DataType::TYPE_FORMULA;
+        $value = "={$c->f}";
+        $calculatedValue = self::$castBaseType($c);
+
+        // Shared formula?
+        if (isset($attr['t']) && strtolower((string) $attr['t']) == 'shared') {
+            $instance = (string) $attr['si'];
+
+            if (!isset($this->sharedFormulae[(string) $attr['si']])) {
+                $this->sharedFormulae[$instance] = new SharedFormula($r, $value);
+            } elseif ($updateSharedCells === true) {
+                // It's only worth the overhead of adjusting the shared formula for this cell if we're actually loading
+                //     the cell, which may not be the case if we're using a read filter.
+                $master = Coordinate::indexesFromString($this->sharedFormulae[$instance]->master());
+                $current = Coordinate::indexesFromString($r);
+
+                $difference = [0, 0];
+                $difference[0] = $current[0] - $master[0];
+                $difference[1] = $current[1] - $master[1];
+
+                $value = $this->referenceHelper->updateFormulaReferences($this->sharedFormulae[$instance]->formula(), 'A1', $difference[0], $difference[1]);
+            }
+        }
+    }
+
+    private function fileExistsInArchive(ZipArchive $archive, string $fileName = ''): bool
+    {
+        // Root-relative paths
+        if (str_contains($fileName, '//')) {
+            $fileName = substr($fileName, strpos($fileName, '//') + 1);
+        }
+        $fileName = File::realpath($fileName);
+
+        // Sadly, some 3rd party xlsx generators don't use consistent case for filenaming
+        //    so we need to load case-insensitively from the zip file
+
+        // Apache POI fixes
+        $contents = $archive->locateName($fileName, ZipArchive::FL_NOCASE);
+        if ($contents === false) {
+            $contents = $archive->locateName(substr($fileName, 1), ZipArchive::FL_NOCASE);
+        }
+
+        return $contents !== false;
+    }
+
+    private function getFromZipArchive(ZipArchive $archive, string $fileName = ''): string
+    {
+        // Root-relative paths
+        if (str_contains($fileName, '//')) {
+            $fileName = substr($fileName, strpos($fileName, '//') + 1);
+        }
+        // Relative paths generated by dirname($filename) when $filename
+        // has no path (i.e.files in root of the zip archive)
+        $fileName = (string) preg_replace('/^\.\//', '', $fileName);
+        $fileName = File::realpath($fileName);
+
+        // Sadly, some 3rd party xlsx generators don't use consistent case for filenaming
+        //    so we need to load case-insensitively from the zip file
+
+        $contents = $archive->getFromName($fileName, 0, ZipArchive::FL_NOCASE);
+
+        // Apache POI fixes
+        if ($contents === false) {
+            $contents = $archive->getFromName(substr($fileName, 1), 0, ZipArchive::FL_NOCASE);
+        }
+
+        // Has the file been saved with Windoze directory separators rather than unix?
+        if ($contents === false) {
+            $contents = $archive->getFromName(str_replace('/', '\\', $fileName), 0, ZipArchive::FL_NOCASE);
+        }
+
+        return ($contents === false) ? '' : $contents;
+    }
+
+    /**
+     * Loads Spreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        File::assertFile($filename, self::INITIAL_FILE);
+
+        // Initialisations
+        $excel = new Spreadsheet();
+        $excel->removeSheetByIndex(0);
+        $addingFirstCellStyleXf = true;
+        $addingFirstCellXf = true;
+
+        $unparsedLoadedData = [];
+
+        $this->zip = $zip = new ZipArchive();
+        $zip->open($filename);
+
+        //    Read the theme first, because we need the colour scheme when reading the styles
+        [$workbookBasename, $xmlNamespaceBase] = $this->getWorkbookBaseName();
+        $drawingNS = self::REL_TO_DRAWING[$xmlNamespaceBase] ?? Namespaces::DRAWINGML;
+        $chartNS = self::REL_TO_CHART[$xmlNamespaceBase] ?? Namespaces::CHART;
+        $wbRels = $this->loadZip("xl/_rels/{$workbookBasename}.rels", Namespaces::RELATIONSHIPS);
+        $theme = null;
+        $this->styleReader = new Styles();
+        foreach ($wbRels->Relationship as $relx) {
+            $rel = self::getAttributes($relx);
+            $relTarget = (string) $rel['Target'];
+            if (str_starts_with($relTarget, '/xl/')) {
+                $relTarget = substr($relTarget, 4);
+            }
+            switch ($rel['Type']) {
+                case "$xmlNamespaceBase/theme":
+                    if (!$this->fileExistsInArchive($zip, "xl/{$relTarget}")) {
+                        break; // issue3770
+                    }
+                    $themeOrderArray = ['lt1', 'dk1', 'lt2', 'dk2'];
+                    $themeOrderAdditional = count($themeOrderArray);
+
+                    $xmlTheme = $this->loadZip("xl/{$relTarget}", $drawingNS);
+                    $xmlThemeName = self::getAttributes($xmlTheme);
+                    $xmlTheme = $xmlTheme->children($drawingNS);
+                    $themeName = (string) $xmlThemeName['name'];
+
+                    $colourScheme = self::getAttributes($xmlTheme->themeElements->clrScheme);
+                    $colourSchemeName = (string) $colourScheme['name'];
+                    $excel->getTheme()->setThemeColorName($colourSchemeName);
+                    $colourScheme = $xmlTheme->themeElements->clrScheme->children($drawingNS);
+
+                    $themeColours = [];
+                    foreach ($colourScheme as $k => $xmlColour) {
+                        $themePos = array_search($k, $themeOrderArray);
+                        if ($themePos === false) {
+                            $themePos = $themeOrderAdditional++;
+                        }
+                        if (isset($xmlColour->sysClr)) {
+                            $xmlColourData = self::getAttributes($xmlColour->sysClr);
+                            $themeColours[$themePos] = (string) $xmlColourData['lastClr'];
+                            $excel->getTheme()->setThemeColor($k, (string) $xmlColourData['lastClr']);
+                        } elseif (isset($xmlColour->srgbClr)) {
+                            $xmlColourData = self::getAttributes($xmlColour->srgbClr);
+                            $themeColours[$themePos] = (string) $xmlColourData['val'];
+                            $excel->getTheme()->setThemeColor($k, (string) $xmlColourData['val']);
+                        }
+                    }
+                    $theme = new Theme($themeName, $colourSchemeName, $themeColours);
+                    $this->styleReader->setTheme($theme);
+
+                    $fontScheme = self::getAttributes($xmlTheme->themeElements->fontScheme);
+                    $fontSchemeName = (string) $fontScheme['name'];
+                    $excel->getTheme()->setThemeFontName($fontSchemeName);
+                    $majorFonts = [];
+                    $minorFonts = [];
+                    $fontScheme = $xmlTheme->themeElements->fontScheme->children($drawingNS);
+                    $majorLatin = self::getAttributes($fontScheme->majorFont->latin)['typeface'] ?? '';
+                    $majorEastAsian = self::getAttributes($fontScheme->majorFont->ea)['typeface'] ?? '';
+                    $majorComplexScript = self::getAttributes($fontScheme->majorFont->cs)['typeface'] ?? '';
+                    $minorLatin = self::getAttributes($fontScheme->minorFont->latin)['typeface'] ?? '';
+                    $minorEastAsian = self::getAttributes($fontScheme->minorFont->ea)['typeface'] ?? '';
+                    $minorComplexScript = self::getAttributes($fontScheme->minorFont->cs)['typeface'] ?? '';
+
+                    foreach ($fontScheme->majorFont->font as $xmlFont) {
+                        $fontAttributes = self::getAttributes($xmlFont);
+                        $script = (string) ($fontAttributes['script'] ?? '');
+                        if (!empty($script)) {
+                            $majorFonts[$script] = (string) ($fontAttributes['typeface'] ?? '');
+                        }
+                    }
+                    foreach ($fontScheme->minorFont->font as $xmlFont) {
+                        $fontAttributes = self::getAttributes($xmlFont);
+                        $script = (string) ($fontAttributes['script'] ?? '');
+                        if (!empty($script)) {
+                            $minorFonts[$script] = (string) ($fontAttributes['typeface'] ?? '');
+                        }
+                    }
+                    $excel->getTheme()->setMajorFontValues($majorLatin, $majorEastAsian, $majorComplexScript, $majorFonts);
+                    $excel->getTheme()->setMinorFontValues($minorLatin, $minorEastAsian, $minorComplexScript, $minorFonts);
+
+                    break;
+            }
+        }
+
+        $rels = $this->loadZip(self::INITIAL_FILE, Namespaces::RELATIONSHIPS);
+
+        $propertyReader = new PropertyReader($this->getSecurityScannerOrThrow(), $excel->getProperties());
+        $charts = $chartDetails = [];
+        foreach ($rels->Relationship as $relx) {
+            $rel = self::getAttributes($relx);
+            $relTarget = (string) $rel['Target'];
+            // issue 3553
+            if ($relTarget[0] === '/') {
+                $relTarget = substr($relTarget, 1);
+            }
+            $relType = (string) $rel['Type'];
+            $mainNS = self::REL_TO_MAIN[$relType] ?? Namespaces::MAIN;
+            switch ($relType) {
+                case Namespaces::CORE_PROPERTIES:
+                    $propertyReader->readCoreProperties($this->getFromZipArchive($zip, $relTarget));
+
+                    break;
+                case "$xmlNamespaceBase/extended-properties":
+                    $propertyReader->readExtendedProperties($this->getFromZipArchive($zip, $relTarget));
+
+                    break;
+                case "$xmlNamespaceBase/custom-properties":
+                    $propertyReader->readCustomProperties($this->getFromZipArchive($zip, $relTarget));
+
+                    break;
+                    //Ribbon
+                case Namespaces::EXTENSIBILITY:
+                    $customUI = $relTarget;
+                    if ($customUI) {
+                        $this->readRibbon($excel, $customUI, $zip);
+                    }
+
+                    break;
+                case "$xmlNamespaceBase/officeDocument":
+                    $dir = dirname($relTarget);
+
+                    // Do not specify namespace in next stmt - do it in Xpath
+                    $relsWorkbook = $this->loadZip("$dir/_rels/" . basename($relTarget) . '.rels', Namespaces::RELATIONSHIPS);
+                    $relsWorkbook->registerXPathNamespace('rel', Namespaces::RELATIONSHIPS);
+
+                    $worksheets = [];
+                    $macros = $customUI = null;
+                    foreach ($relsWorkbook->Relationship as $elex) {
+                        $ele = self::getAttributes($elex);
+                        switch ($ele['Type']) {
+                            case Namespaces::WORKSHEET:
+                            case Namespaces::PURL_WORKSHEET:
+                                $worksheets[(string) $ele['Id']] = $ele['Target'];
+
+                                break;
+                            case Namespaces::CHARTSHEET:
+                                if ($this->includeCharts === true) {
+                                    $worksheets[(string) $ele['Id']] = $ele['Target'];
+                                }
+
+                                break;
+                                // a vbaProject ? (: some macros)
+                            case Namespaces::VBA:
+                                $macros = $ele['Target'];
+
+                                break;
+                        }
+                    }
+
+                    if ($macros !== null) {
+                        $macrosCode = $this->getFromZipArchive($zip, 'xl/vbaProject.bin'); //vbaProject.bin always in 'xl' dir and always named vbaProject.bin
+                        if ($macrosCode !== false) {
+                            $excel->setMacrosCode($macrosCode);
+                            $excel->setHasMacros(true);
+                            //short-circuit : not reading vbaProject.bin.rel to get Signature =>allways vbaProjectSignature.bin in 'xl' dir
+                            $Certificate = $this->getFromZipArchive($zip, 'xl/vbaProjectSignature.bin');
+                            if ($Certificate !== false) {
+                                $excel->setMacrosCertificate($Certificate);
+                            }
+                        }
+                    }
+
+                    $relType = "rel:Relationship[@Type='"
+                        . "$xmlNamespaceBase/styles"
+                        . "']";
+                    $xpath = self::getArrayItem(self::xpathNoFalse($relsWorkbook, $relType));
+
+                    if ($xpath === null) {
+                        $xmlStyles = self::testSimpleXml(null);
+                    } else {
+                        $stylesTarget = (string) $xpath['Target'];
+                        $stylesTarget = str_starts_with($stylesTarget, '/') ? substr($stylesTarget, 1) : "$dir/$stylesTarget";
+                        $xmlStyles = $this->loadZip($stylesTarget, $mainNS);
+                    }
+
+                    $palette = self::extractPalette($xmlStyles);
+                    $this->styleReader->setWorkbookPalette($palette);
+                    $fills = self::extractStyles($xmlStyles, 'fills', 'fill');
+                    $fonts = self::extractStyles($xmlStyles, 'fonts', 'font');
+                    $borders = self::extractStyles($xmlStyles, 'borders', 'border');
+                    $xfTags = self::extractStyles($xmlStyles, 'cellXfs', 'xf');
+                    $cellXfTags = self::extractStyles($xmlStyles, 'cellStyleXfs', 'xf');
+
+                    $styles = [];
+                    $cellStyles = [];
+                    $numFmts = null;
+                    if (/*$xmlStyles && */ $xmlStyles->numFmts[0]) {
+                        $numFmts = $xmlStyles->numFmts[0];
+                    }
+                    if (isset($numFmts) && ($numFmts !== null)) {
+                        $numFmts->registerXPathNamespace('sml', $mainNS);
+                    }
+                    $this->styleReader->setNamespace($mainNS);
+                    if (!$this->readDataOnly/* && $xmlStyles*/) {
+                        foreach ($xfTags as $xfTag) {
+                            $xf = self::getAttributes($xfTag);
+                            $numFmt = null;
+
+                            if ($xf['numFmtId']) {
+                                if (isset($numFmts)) {
+                                    $tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
+
+                                    if (isset($tmpNumFmt['formatCode'])) {
+                                        $numFmt = (string) $tmpNumFmt['formatCode'];
+                                    }
+                                }
+
+                                // We shouldn't override any of the built-in MS Excel values (values below id 164)
+                                //  But there's a lot of naughty homebrew xlsx writers that do use "reserved" id values that aren't actually used
+                                //  So we make allowance for them rather than lose formatting masks
+                                if (
+                                    $numFmt === null
+                                    && (int) $xf['numFmtId'] < 164
+                                    && NumberFormat::builtInFormatCode((int) $xf['numFmtId']) !== ''
+                                ) {
+                                    $numFmt = NumberFormat::builtInFormatCode((int) $xf['numFmtId']);
+                                }
+                            }
+                            $quotePrefix = (bool) (string) ($xf['quotePrefix'] ?? '');
+
+                            $style = (object) [
+                                'numFmt' => $numFmt ?? NumberFormat::FORMAT_GENERAL,
+                                'font' => $fonts[(int) ($xf['fontId'])],
+                                'fill' => $fills[(int) ($xf['fillId'])],
+                                'border' => $borders[(int) ($xf['borderId'])],
+                                'alignment' => $xfTag->alignment,
+                                'protection' => $xfTag->protection,
+                                'quotePrefix' => $quotePrefix,
+                            ];
+                            $styles[] = $style;
+
+                            // add style to cellXf collection
+                            $objStyle = new Style();
+                            $this->styleReader->readStyle($objStyle, $style);
+                            if ($addingFirstCellXf) {
+                                $excel->removeCellXfByIndex(0); // remove the default style
+                                $addingFirstCellXf = false;
+                            }
+                            $excel->addCellXf($objStyle);
+                        }
+
+                        foreach ($cellXfTags as $xfTag) {
+                            $xf = self::getAttributes($xfTag);
+                            $numFmt = NumberFormat::FORMAT_GENERAL;
+                            if ($numFmts && $xf['numFmtId']) {
+                                $tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
+                                if (isset($tmpNumFmt['formatCode'])) {
+                                    $numFmt = (string) $tmpNumFmt['formatCode'];
+                                } elseif ((int) $xf['numFmtId'] < 165) {
+                                    $numFmt = NumberFormat::builtInFormatCode((int) $xf['numFmtId']);
+                                }
+                            }
+
+                            $quotePrefix = (bool) (string) ($xf['quotePrefix'] ?? '');
+
+                            $cellStyle = (object) [
+                                'numFmt' => $numFmt,
+                                'font' => $fonts[(int) ($xf['fontId'])],
+                                'fill' => $fills[((int) $xf['fillId'])],
+                                'border' => $borders[(int) ($xf['borderId'])],
+                                'alignment' => $xfTag->alignment,
+                                'protection' => $xfTag->protection,
+                                'quotePrefix' => $quotePrefix,
+                            ];
+                            $cellStyles[] = $cellStyle;
+
+                            // add style to cellStyleXf collection
+                            $objStyle = new Style();
+                            $this->styleReader->readStyle($objStyle, $cellStyle);
+                            if ($addingFirstCellStyleXf) {
+                                $excel->removeCellStyleXfByIndex(0); // remove the default style
+                                $addingFirstCellStyleXf = false;
+                            }
+                            $excel->addCellStyleXf($objStyle);
+                        }
+                    }
+                    $this->styleReader->setStyleXml($xmlStyles);
+                    $this->styleReader->setNamespace($mainNS);
+                    $this->styleReader->setStyleBaseData($theme, $styles, $cellStyles);
+                    $dxfs = $this->styleReader->dxfs($this->readDataOnly);
+                    $styles = $this->styleReader->styles();
+
+                    // Read content after setting the styles
+                    $sharedStrings = [];
+                    $relType = "rel:Relationship[@Type='"
+                        //. Namespaces::SHARED_STRINGS
+                        . "$xmlNamespaceBase/sharedStrings"
+                        . "']";
+                    $xpath = self::getArrayItem($relsWorkbook->xpath($relType));
+
+                    if ($xpath) {
+                        $sharedStringsTarget = (string) $xpath['Target'];
+                        $sharedStringsTarget = str_starts_with($sharedStringsTarget, '/') ? substr($sharedStringsTarget, 1) : "$dir/$sharedStringsTarget";
+                        $xmlStrings = $this->loadZip($sharedStringsTarget, $mainNS);
+                        if (isset($xmlStrings->si)) {
+                            foreach ($xmlStrings->si as $val) {
+                                if (isset($val->t)) {
+                                    $sharedStrings[] = StringHelper::controlCharacterOOXML2PHP((string) $val->t);
+                                } elseif (isset($val->r)) {
+                                    $sharedStrings[] = $this->parseRichText($val);
+                                } else {
+                                    $sharedStrings[] = '';
+                                }
+                            }
+                        }
+                    }
+
+                    $xmlWorkbook = $this->loadZipNoNamespace($relTarget, $mainNS);
+                    $xmlWorkbookNS = $this->loadZip($relTarget, $mainNS);
+
+                    // Set base date
+                    $excel->setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+                    if ($xmlWorkbookNS->workbookPr) {
+                        Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+                        $attrs1904 = self::getAttributes($xmlWorkbookNS->workbookPr);
+                        if (isset($attrs1904['date1904'])) {
+                            if (self::boolean((string) $attrs1904['date1904'])) {
+                                Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
+                                $excel->setExcelCalendar(Date::CALENDAR_MAC_1904);
+                            }
+                        }
+                    }
+
+                    // Set protection
+                    $this->readProtection($excel, $xmlWorkbook);
+
+                    $sheetId = 0; // keep track of new sheet id in final workbook
+                    $oldSheetId = -1; // keep track of old sheet id in final workbook
+                    $countSkippedSheets = 0; // keep track of number of skipped sheets
+                    $mapSheetId = []; // mapping of sheet ids from old to new
+
+                    $charts = $chartDetails = [];
+
+                    if ($xmlWorkbookNS->sheets) {
+                        /** @var SimpleXMLElement $eleSheet */
+                        foreach ($xmlWorkbookNS->sheets->sheet as $eleSheet) {
+                            $eleSheetAttr = self::getAttributes($eleSheet);
+                            ++$oldSheetId;
+
+                            // Check if sheet should be skipped
+                            if (is_array($this->loadSheetsOnly) && !in_array((string) $eleSheetAttr['name'], $this->loadSheetsOnly)) {
+                                ++$countSkippedSheets;
+                                $mapSheetId[$oldSheetId] = null;
+
+                                continue;
+                            }
+
+                            $sheetReferenceId = (string) self::getArrayItem(self::getAttributes($eleSheet, $xmlNamespaceBase), 'id');
+                            if (isset($worksheets[$sheetReferenceId]) === false) {
+                                ++$countSkippedSheets;
+                                $mapSheetId[$oldSheetId] = null;
+
+                                continue;
+                            }
+                            // Map old sheet id in original workbook to new sheet id.
+                            // They will differ if loadSheetsOnly() is being used
+                            $mapSheetId[$oldSheetId] = $oldSheetId - $countSkippedSheets;
+
+                            // Load sheet
+                            $docSheet = $excel->createSheet();
+                            //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet
+                            //        references in formula cells... during the load, all formulae should be correct,
+                            //        and we're simply bringing the worksheet name in line with the formula, not the
+                            //        reverse
+                            $docSheet->setTitle((string) $eleSheetAttr['name'], false, false);
+
+                            $fileWorksheet = (string) $worksheets[$sheetReferenceId];
+                            // issue 3665 adds test for /.
+                            // This broke XlsxRootZipFilesTest,
+                            //  but Excel reports an error with that file.
+                            //  Testing dir for . avoids this problem.
+                            //  It might be better just to drop the test.
+                            if ($fileWorksheet[0] == '/' && $dir !== '.') {
+                                $fileWorksheet = substr($fileWorksheet, strlen($dir) + 2);
+                            }
+                            $xmlSheet = $this->loadZipNoNamespace("$dir/$fileWorksheet", $mainNS);
+                            $xmlSheetNS = $this->loadZip("$dir/$fileWorksheet", $mainNS);
+
+                            // Shared Formula table is unique to each Worksheet, so we need to reset it here
+                            $this->sharedFormulae = [];
+
+                            if (isset($eleSheetAttr['state']) && (string) $eleSheetAttr['state'] != '') {
+                                $docSheet->setSheetState((string) $eleSheetAttr['state']);
+                            }
+                            if ($xmlSheetNS) {
+                                $xmlSheetMain = $xmlSheetNS->children($mainNS);
+                                // Setting Conditional Styles adjusts selected cells, so we need to execute this
+                                //    before reading the sheet view data to get the actual selected cells
+                                if (!$this->readDataOnly && ($xmlSheet->conditionalFormatting)) {
+                                    (new ConditionalStyles($docSheet, $xmlSheet, $dxfs, $this->styleReader))->load();
+                                }
+                                if (!$this->readDataOnly && $xmlSheet->extLst) {
+                                    (new ConditionalStyles($docSheet, $xmlSheet, $dxfs, $this->styleReader))->loadFromExt();
+                                }
+                                if (isset($xmlSheetMain->sheetViews, $xmlSheetMain->sheetViews->sheetView)) {
+                                    $sheetViews = new SheetViews($xmlSheetMain->sheetViews->sheetView, $docSheet);
+                                    $sheetViews->load();
+                                }
+
+                                $sheetViewOptions = new SheetViewOptions($docSheet, $xmlSheetNS);
+                                $sheetViewOptions->load($this->readDataOnly, $this->styleReader);
+
+                                (new ColumnAndRowAttributes($docSheet, $xmlSheetNS))
+                                    ->load($this->getReadFilter(), $this->readDataOnly, $this->ignoreRowsWithNoCells);
+                            }
+
+                            $holdSelectedCells = $docSheet->getSelectedCells();
+                            if ($xmlSheetNS && $xmlSheetNS->sheetData && $xmlSheetNS->sheetData->row) {
+                                $cIndex = 1; // Cell Start from 1
+                                foreach ($xmlSheetNS->sheetData->row as $row) {
+                                    $rowIndex = 1;
+                                    foreach ($row->c as $c) {
+                                        $cAttr = self::getAttributes($c);
+                                        $r = (string) $cAttr['r'];
+                                        if ($r == '') {
+                                            $r = Coordinate::stringFromColumnIndex($rowIndex) . $cIndex;
+                                        }
+                                        $cellDataType = (string) $cAttr['t'];
+                                        $originalCellDataTypeNumeric = $cellDataType === '';
+                                        $value = null;
+                                        $calculatedValue = null;
+
+                                        // Read cell?
+                                        if ($this->getReadFilter() !== null) {
+                                            $coordinates = Coordinate::coordinateFromString($r);
+
+                                            if (!$this->getReadFilter()->readCell($coordinates[0], (int) $coordinates[1], $docSheet->getTitle())) {
+                                                // Normally, just testing for the f attribute should identify this cell as containing a formula
+                                                // that we need to read, even though it is outside of the filter range, in case it is a shared formula.
+                                                // But in some cases, this attribute isn't set; so we need to delve a level deeper and look at
+                                                // whether or not the cell has a child formula element that is shared.
+                                                if (isset($cAttr->f) || (isset($c->f, $c->f->attributes()['t']) && strtolower((string) $c->f->attributes()['t']) === 'shared')) {
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToError', false);
+                                                }
+                                                ++$rowIndex;
+
+                                                continue;
+                                            }
+                                        }
+
+                                        // Read cell!
+                                        switch ($cellDataType) {
+                                            case 's':
+                                                if ((string) $c->v != '') {
+                                                    $value = $sharedStrings[(int) ($c->v)];
+
+                                                    if ($value instanceof RichText) {
+                                                        $value = clone $value;
+                                                    }
+                                                } else {
+                                                    $value = '';
+                                                }
+
+                                                break;
+                                            case 'b':
+                                                if (!isset($c->f)) {
+                                                    if (isset($c->v)) {
+                                                        $value = self::castToBoolean($c);
+                                                    } else {
+                                                        $value = null;
+                                                        $cellDataType = DataType::TYPE_NULL;
+                                                    }
+                                                } else {
+                                                    // Formula
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToBoolean');
+                                                    if (isset($c->f['t'])) {
+                                                        $att = $c->f;
+                                                        $docSheet->getCell($r)->setFormulaAttributes($att);
+                                                    }
+                                                }
+
+                                                break;
+                                            case 'inlineStr':
+                                                if (isset($c->f)) {
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToError');
+                                                } else {
+                                                    $value = $this->parseRichText($c->is);
+                                                }
+
+                                                break;
+                                            case 'e':
+                                                if (!isset($c->f)) {
+                                                    $value = self::castToError($c);
+                                                } else {
+                                                    // Formula
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToError');
+                                                }
+
+                                                break;
+                                            default:
+                                                if (!isset($c->f)) {
+                                                    $value = self::castToString($c);
+                                                } else {
+                                                    // Formula
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToString');
+                                                    if (isset($c->f['t'])) {
+                                                        $attributes = $c->f['t'];
+                                                        $docSheet->getCell($r)->setFormulaAttributes(['t' => (string) $attributes]);
+                                                    }
+                                                }
+
+                                                break;
+                                        }
+
+                                        // read empty cells or the cells are not empty
+                                        if ($this->readEmptyCells || ($value !== null && $value !== '')) {
+                                            // Rich text?
+                                            if ($value instanceof RichText && $this->readDataOnly) {
+                                                $value = $value->getPlainText();
+                                            }
+
+                                            $cell = $docSheet->getCell($r);
+                                            // Assign value
+                                            if ($cellDataType != '') {
+                                                // it is possible, that datatype is numeric but with an empty string, which result in an error
+                                                if ($cellDataType === DataType::TYPE_NUMERIC && ($value === '' || $value === null)) {
+                                                    $cellDataType = DataType::TYPE_NULL;
+                                                }
+                                                if ($cellDataType !== DataType::TYPE_NULL) {
+                                                    $cell->setValueExplicit($value, $cellDataType);
+                                                }
+                                            } else {
+                                                $cell->setValue($value);
+                                            }
+                                            if ($calculatedValue !== null) {
+                                                $cell->setCalculatedValue($calculatedValue, $originalCellDataTypeNumeric);
+                                            }
+
+                                            // Style information?
+                                            if (!$this->readDataOnly) {
+                                                $holdSelected = $docSheet->getSelectedCells();
+                                                $cAttrS = (int) ($cAttr['s'] ?? 0);
+                                                // no style index means 0, it seems
+                                                $cAttrS = isset($styles[$cAttrS]) ? $cAttrS : 0;
+                                                $cell->setXfIndex($cAttrS);
+                                                // issue 3495
+                                                if ($cellDataType === DataType::TYPE_FORMULA && $styles[$cAttrS]->quotePrefix === true) {
+                                                    $cell->getStyle()->setQuotePrefix(false);
+                                                }
+                                                $docSheet->setSelectedCells($holdSelected);
+                                            }
+                                        }
+                                        ++$rowIndex;
+                                    }
+                                    ++$cIndex;
+                                }
+                            }
+                            $docSheet->setSelectedCells($holdSelectedCells);
+                            if ($xmlSheetNS && $xmlSheetNS->ignoredErrors) {
+                                foreach ($xmlSheetNS->ignoredErrors->ignoredError as $ignoredErrorx) {
+                                    $ignoredError = self::testSimpleXml($ignoredErrorx);
+                                    $this->processIgnoredErrors($ignoredError, $docSheet);
+                                }
+                            }
+
+                            if (!$this->readDataOnly && $xmlSheetNS && $xmlSheetNS->sheetProtection) {
+                                $protAttr = $xmlSheetNS->sheetProtection->attributes() ?? [];
+                                foreach ($protAttr as $key => $value) {
+                                    $method = 'set' . ucfirst($key);
+                                    $docSheet->getProtection()->$method(self::boolean((string) $value));
+                                }
+                            }
+
+                            if ($xmlSheet) {
+                                $this->readSheetProtection($docSheet, $xmlSheet);
+                            }
+
+                            if ($this->readDataOnly === false) {
+                                $this->readAutoFilter($xmlSheetNS, $docSheet);
+                                $this->readBackgroundImage($xmlSheetNS, $docSheet, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels');
+                            }
+
+                            $this->readTables($xmlSheetNS, $docSheet, $dir, $fileWorksheet, $zip, $mainNS);
+
+                            if ($xmlSheetNS && $xmlSheetNS->mergeCells && $xmlSheetNS->mergeCells->mergeCell && !$this->readDataOnly) {
+                                foreach ($xmlSheetNS->mergeCells->mergeCell as $mergeCellx) {
+                                    $mergeCell = $mergeCellx->attributes();
+                                    $mergeRef = (string) ($mergeCell['ref'] ?? '');
+                                    if (str_contains($mergeRef, ':')) {
+                                        $docSheet->mergeCells($mergeRef, Worksheet::MERGE_CELL_CONTENT_HIDE);
+                                    }
+                                }
+                            }
+
+                            if ($xmlSheet && !$this->readDataOnly) {
+                                $unparsedLoadedData = (new PageSetup($docSheet, $xmlSheet))->load($unparsedLoadedData);
+                            }
+
+                            if ($xmlSheet !== false && isset($xmlSheet->extLst->ext)) {
+                                foreach ($xmlSheet->extLst->ext as $extlst) {
+                                    $extAttrs = $extlst->attributes() ?? [];
+                                    $extUri = (string) ($extAttrs['uri'] ?? '');
+                                    if ($extUri !== '{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}') {
+                                        continue;
+                                    }
+                                    // Create dataValidations node if does not exists, maybe is better inside the foreach ?
+                                    if (!$xmlSheet->dataValidations) {
+                                        $xmlSheet->addChild('dataValidations');
+                                    }
+
+                                    foreach ($extlst->children(Namespaces::DATA_VALIDATIONS1)->dataValidations->dataValidation as $item) {
+                                        $item = self::testSimpleXml($item);
+                                        $node = self::testSimpleXml($xmlSheet->dataValidations)->addChild('dataValidation');
+                                        foreach ($item->attributes() ?? [] as $attr) {
+                                            $node->addAttribute($attr->getName(), $attr);
+                                        }
+                                        $node->addAttribute('sqref', $item->children(Namespaces::DATA_VALIDATIONS2)->sqref);
+                                        if (isset($item->formula1)) {
+                                            $childNode = $node->addChild('formula1');
+                                            if ($childNode !== null) { // null should never happen
+                                                // see https://github.com/phpstan/phpstan/issues/8236
+                                                $childNode[0] = (string) $item->formula1->children(Namespaces::DATA_VALIDATIONS2)->f; // @phpstan-ignore-line
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            if ($xmlSheet && $xmlSheet->dataValidations && !$this->readDataOnly) {
+                                (new DataValidations($docSheet, $xmlSheet))->load();
+                            }
+
+                            // unparsed sheet AlternateContent
+                            if ($xmlSheet && !$this->readDataOnly) {
+                                $mc = $xmlSheet->children(Namespaces::COMPATIBILITY);
+                                if ($mc->AlternateContent) {
+                                    foreach ($mc->AlternateContent as $alternateContent) {
+                                        $alternateContent = self::testSimpleXml($alternateContent);
+                                        $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['AlternateContents'][] = $alternateContent->asXML();
+                                    }
+                                }
+                            }
+
+                            // Add hyperlinks
+                            if (!$this->readDataOnly) {
+                                $hyperlinkReader = new Hyperlinks($docSheet);
+                                // Locate hyperlink relations
+                                $relationsFileName = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+                                if ($zip->locateName($relationsFileName) !== false) {
+                                    $relsWorksheet = $this->loadZip($relationsFileName, Namespaces::RELATIONSHIPS);
+                                    $hyperlinkReader->readHyperlinks($relsWorksheet);
+                                }
+
+                                // Loop through hyperlinks
+                                if ($xmlSheetNS && $xmlSheetNS->children($mainNS)->hyperlinks) {
+                                    $hyperlinkReader->setHyperlinks($xmlSheetNS->children($mainNS)->hyperlinks);
+                                }
+                            }
+
+                            // Add comments
+                            $comments = [];
+                            $vmlComments = [];
+                            if (!$this->readDataOnly) {
+                                // Locate comment relations
+                                $commentRelations = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+                                if ($zip->locateName($commentRelations) !== false) {
+                                    $relsWorksheet = $this->loadZip($commentRelations, Namespaces::RELATIONSHIPS);
+                                    foreach ($relsWorksheet->Relationship as $elex) {
+                                        $ele = self::getAttributes($elex);
+                                        if ($ele['Type'] == Namespaces::COMMENTS) {
+                                            $comments[(string) $ele['Id']] = (string) $ele['Target'];
+                                        }
+                                        if ($ele['Type'] == Namespaces::VML) {
+                                            $vmlComments[(string) $ele['Id']] = (string) $ele['Target'];
+                                        }
+                                    }
+                                }
+
+                                // Loop through comments
+                                foreach ($comments as $relName => $relPath) {
+                                    // Load comments file
+                                    $relPath = File::realpath(dirname("$dir/$fileWorksheet") . '/' . $relPath);
+                                    // okay to ignore namespace - using xpath
+                                    $commentsFile = $this->loadZip($relPath, '');
+
+                                    // Utility variables
+                                    $authors = [];
+                                    $commentsFile->registerXpathNamespace('com', $mainNS);
+                                    $authorPath = self::xpathNoFalse($commentsFile, 'com:authors/com:author');
+                                    foreach ($authorPath as $author) {
+                                        $authors[] = (string) $author;
+                                    }
+
+                                    // Loop through contents
+                                    $contentPath = self::xpathNoFalse($commentsFile, 'com:commentList/com:comment');
+                                    foreach ($contentPath as $comment) {
+                                        $commentx = $comment->attributes();
+                                        $commentModel = $docSheet->getComment((string) $commentx['ref']);
+                                        if (isset($commentx['authorId'])) {
+                                            $commentModel->setAuthor($authors[(int) $commentx['authorId']]);
+                                        }
+                                        $commentModel->setText($this->parseRichText($comment->children($mainNS)->text));
+                                    }
+                                }
+
+                                // later we will remove from it real vmlComments
+                                $unparsedVmlDrawings = $vmlComments;
+                                $vmlDrawingContents = [];
+
+                                // Loop through VML comments
+                                foreach ($vmlComments as $relName => $relPath) {
+                                    // Load VML comments file
+                                    $relPath = File::realpath(dirname("$dir/$fileWorksheet") . '/' . $relPath);
+
+                                    try {
+                                        // no namespace okay - processed with Xpath
+                                        $vmlCommentsFile = $this->loadZip($relPath, '', true);
+                                        $vmlCommentsFile->registerXPathNamespace('v', Namespaces::URN_VML);
+                                    } catch (Throwable) {
+                                        //Ignore unparsable vmlDrawings. Later they will be moved from $unparsedVmlDrawings to $unparsedLoadedData
+                                        continue;
+                                    }
+
+                                    // Locate VML drawings image relations
+                                    $drowingImages = [];
+                                    $VMLDrawingsRelations = dirname($relPath) . '/_rels/' . basename($relPath) . '.rels';
+                                    $vmlDrawingContents[$relName] = $this->getSecurityScannerOrThrow()->scan($this->getFromZipArchive($zip, $relPath));
+                                    if ($zip->locateName($VMLDrawingsRelations) !== false) {
+                                        $relsVMLDrawing = $this->loadZip($VMLDrawingsRelations, Namespaces::RELATIONSHIPS);
+                                        foreach ($relsVMLDrawing->Relationship as $elex) {
+                                            $ele = self::getAttributes($elex);
+                                            if ($ele['Type'] == Namespaces::IMAGE) {
+                                                $drowingImages[(string) $ele['Id']] = (string) $ele['Target'];
+                                            }
+                                        }
+                                    }
+
+                                    $shapes = self::xpathNoFalse($vmlCommentsFile, '//v:shape');
+                                    foreach ($shapes as $shape) {
+                                        $shape->registerXPathNamespace('v', Namespaces::URN_VML);
+
+                                        if (isset($shape['style'])) {
+                                            $style = (string) $shape['style'];
+                                            $fillColor = strtoupper(substr((string) $shape['fillcolor'], 1));
+                                            $column = null;
+                                            $row = null;
+                                            $textHAlign = null;
+                                            $fillImageRelId = null;
+                                            $fillImageTitle = '';
+
+                                            $clientData = $shape->xpath('.//x:ClientData');
+                                            $textboxDirection = '';
+                                            $textboxPath = $shape->xpath('.//v:textbox');
+                                            $textbox = (string) ($textboxPath[0]['style'] ?? '');
+                                            if (preg_match('/rtl/i', $textbox) === 1) {
+                                                $textboxDirection = Comment::TEXTBOX_DIRECTION_RTL;
+                                            } elseif (preg_match('/ltr/i', $textbox) === 1) {
+                                                $textboxDirection = Comment::TEXTBOX_DIRECTION_LTR;
+                                            }
+                                            if (is_array($clientData) && !empty($clientData)) {
+                                                $clientData = $clientData[0];
+
+                                                if (isset($clientData['ObjectType']) && (string) $clientData['ObjectType'] == 'Note') {
+                                                    $temp = $clientData->xpath('.//x:Row');
+                                                    if (is_array($temp)) {
+                                                        $row = $temp[0];
+                                                    }
+
+                                                    $temp = $clientData->xpath('.//x:Column');
+                                                    if (is_array($temp)) {
+                                                        $column = $temp[0];
+                                                    }
+                                                    $temp = $clientData->xpath('.//x:TextHAlign');
+                                                    if (!empty($temp)) {
+                                                        $textHAlign = strtolower($temp[0]);
+                                                    }
+                                                }
+                                            }
+                                            $rowx = (string) $row;
+                                            $colx = (string) $column;
+                                            if (is_numeric($rowx) && is_numeric($colx) && $textHAlign !== null) {
+                                                $docSheet->getComment([1 + (int) $colx, 1 + (int) $rowx], false)->setAlignment((string) $textHAlign);
+                                            }
+                                            if (is_numeric($rowx) && is_numeric($colx) && $textboxDirection !== '') {
+                                                $docSheet->getComment([1 + (int) $colx, 1 + (int) $rowx], false)->setTextboxDirection($textboxDirection);
+                                            }
+
+                                            $fillImageRelNode = $shape->xpath('.//v:fill/@o:relid');
+                                            if (is_array($fillImageRelNode) && !empty($fillImageRelNode)) {
+                                                $fillImageRelNode = $fillImageRelNode[0];
+
+                                                if (isset($fillImageRelNode['relid'])) {
+                                                    $fillImageRelId = (string) $fillImageRelNode['relid'];
+                                                }
+                                            }
+
+                                            $fillImageTitleNode = $shape->xpath('.//v:fill/@o:title');
+                                            if (is_array($fillImageTitleNode) && !empty($fillImageTitleNode)) {
+                                                $fillImageTitleNode = $fillImageTitleNode[0];
+
+                                                if (isset($fillImageTitleNode['title'])) {
+                                                    $fillImageTitle = (string) $fillImageTitleNode['title'];
+                                                }
+                                            }
+
+                                            if (($column !== null) && ($row !== null)) {
+                                                // Set comment properties
+                                                $comment = $docSheet->getComment([$column + 1, $row + 1]);
+                                                $comment->getFillColor()->setRGB($fillColor);
+                                                if (isset($drowingImages[$fillImageRelId])) {
+                                                    $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
+                                                    $objDrawing->setName($fillImageTitle);
+                                                    $imagePath = str_replace(['../', '/xl/'], 'xl/', $drowingImages[$fillImageRelId]);
+                                                    $objDrawing->setPath(
+                                                        'zip://' . File::realpath($filename) . '#' . $imagePath,
+                                                        true,
+                                                        $zip
+                                                    );
+                                                    $comment->setBackgroundImage($objDrawing);
+                                                }
+
+                                                // Parse style
+                                                $styleArray = explode(';', str_replace(' ', '', $style));
+                                                foreach ($styleArray as $stylePair) {
+                                                    $stylePair = explode(':', $stylePair);
+
+                                                    if ($stylePair[0] == 'margin-left') {
+                                                        $comment->setMarginLeft($stylePair[1]);
+                                                    }
+                                                    if ($stylePair[0] == 'margin-top') {
+                                                        $comment->setMarginTop($stylePair[1]);
+                                                    }
+                                                    if ($stylePair[0] == 'width') {
+                                                        $comment->setWidth($stylePair[1]);
+                                                    }
+                                                    if ($stylePair[0] == 'height') {
+                                                        $comment->setHeight($stylePair[1]);
+                                                    }
+                                                    if ($stylePair[0] == 'visibility') {
+                                                        $comment->setVisible($stylePair[1] == 'visible');
+                                                    }
+                                                }
+
+                                                unset($unparsedVmlDrawings[$relName]);
+                                            }
+                                        }
+                                    }
+                                }
+
+                                // unparsed vmlDrawing
+                                if ($unparsedVmlDrawings) {
+                                    foreach ($unparsedVmlDrawings as $rId => $relPath) {
+                                        $rId = substr($rId, 3); // rIdXXX
+                                        $unparsedVmlDrawing = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['vmlDrawings'];
+                                        $unparsedVmlDrawing[$rId] = [];
+                                        $unparsedVmlDrawing[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $relPath);
+                                        $unparsedVmlDrawing[$rId]['relFilePath'] = $relPath;
+                                        $unparsedVmlDrawing[$rId]['content'] = $this->getSecurityScannerOrThrow()->scan($this->getFromZipArchive($zip, $unparsedVmlDrawing[$rId]['filePath']));
+                                        unset($unparsedVmlDrawing);
+                                    }
+                                }
+
+                                // Header/footer images
+                                if ($xmlSheetNS && $xmlSheetNS->legacyDrawingHF) {
+                                    $vmlHfRid = '';
+                                    $vmlHfRidAttr = $xmlSheetNS->legacyDrawingHF->attributes(Namespaces::SCHEMA_OFFICE_DOCUMENT);
+                                    if ($vmlHfRidAttr !== null && isset($vmlHfRidAttr['id'])) {
+                                        $vmlHfRid = (string) $vmlHfRidAttr['id'][0];
+                                    }
+                                    if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels') !== false) {
+                                        $relsWorksheet = $this->loadZipNoNamespace(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels', Namespaces::RELATIONSHIPS);
+                                        $vmlRelationship = '';
+
+                                        foreach ($relsWorksheet->Relationship as $ele) {
+                                            if ((string) $ele['Type'] == Namespaces::VML && (string) $ele['Id'] === $vmlHfRid) {
+                                                $vmlRelationship = self::dirAdd("$dir/$fileWorksheet", $ele['Target']);
+
+                                                break;
+                                            }
+                                        }
+
+                                        if ($vmlRelationship != '') {
+                                            // Fetch linked images
+                                            $relsVML = $this->loadZipNoNamespace(dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels', Namespaces::RELATIONSHIPS);
+                                            $drawings = [];
+                                            if (isset($relsVML->Relationship)) {
+                                                foreach ($relsVML->Relationship as $ele) {
+                                                    if ($ele['Type'] == Namespaces::IMAGE) {
+                                                        $drawings[(string) $ele['Id']] = self::dirAdd($vmlRelationship, $ele['Target']);
+                                                    }
+                                                }
+                                            }
+                                            // Fetch VML document
+                                            $vmlDrawing = $this->loadZipNoNamespace($vmlRelationship, '');
+                                            $vmlDrawing->registerXPathNamespace('v', Namespaces::URN_VML);
+
+                                            $hfImages = [];
+
+                                            $shapes = self::xpathNoFalse($vmlDrawing, '//v:shape');
+                                            foreach ($shapes as $idx => $shape) {
+                                                $shape->registerXPathNamespace('v', Namespaces::URN_VML);
+                                                $imageData = $shape->xpath('//v:imagedata');
+
+                                                if (empty($imageData)) {
+                                                    continue;
+                                                }
+
+                                                $imageData = $imageData[$idx];
+
+                                                $imageData = self::getAttributes($imageData, Namespaces::URN_MSOFFICE);
+                                                $style = self::toCSSArray((string) $shape['style']);
+
+                                                if (array_key_exists((string) $imageData['relid'], $drawings)) {
+                                                    $shapeId = (string) $shape['id'];
+                                                    $hfImages[$shapeId] = new HeaderFooterDrawing();
+                                                    if (isset($imageData['title'])) {
+                                                        $hfImages[$shapeId]->setName((string) $imageData['title']);
+                                                    }
+
+                                                    $hfImages[$shapeId]->setPath('zip://' . File::realpath($filename) . '#' . $drawings[(string) $imageData['relid']], false);
+                                                    $hfImages[$shapeId]->setResizeProportional(false);
+                                                    $hfImages[$shapeId]->setWidth($style['width']);
+                                                    $hfImages[$shapeId]->setHeight($style['height']);
+                                                    if (isset($style['margin-left'])) {
+                                                        $hfImages[$shapeId]->setOffsetX($style['margin-left']);
+                                                    }
+                                                    $hfImages[$shapeId]->setOffsetY($style['margin-top']);
+                                                    $hfImages[$shapeId]->setResizeProportional(true);
+                                                }
+                                            }
+
+                                            $docSheet->getHeaderFooter()->setImages($hfImages);
+                                        }
+                                    }
+                                }
+                            }
+
+                            // TODO: Autoshapes from twoCellAnchors!
+                            $drawingFilename = dirname("$dir/$fileWorksheet")
+                                . '/_rels/'
+                                . basename($fileWorksheet)
+                                . '.rels';
+                            if (str_starts_with($drawingFilename, 'xl//xl/')) {
+                                $drawingFilename = substr($drawingFilename, 4);
+                            }
+                            if (str_starts_with($drawingFilename, '/xl//xl/')) {
+                                $drawingFilename = substr($drawingFilename, 5);
+                            }
+                            if ($zip->locateName($drawingFilename) !== false) {
+                                $relsWorksheet = $this->loadZip($drawingFilename, Namespaces::RELATIONSHIPS);
+                                $drawings = [];
+                                foreach ($relsWorksheet->Relationship as $elex) {
+                                    $ele = self::getAttributes($elex);
+                                    if ((string) $ele['Type'] === "$xmlNamespaceBase/drawing") {
+                                        $eleTarget = (string) $ele['Target'];
+                                        if (str_starts_with($eleTarget, '/xl/')) {
+                                            $drawings[(string) $ele['Id']] = substr($eleTarget, 1);
+                                        } else {
+                                            $drawings[(string) $ele['Id']] = self::dirAdd("$dir/$fileWorksheet", $ele['Target']);
+                                        }
+                                    }
+                                }
+
+                                if ($xmlSheetNS->drawing && !$this->readDataOnly) {
+                                    $unparsedDrawings = [];
+                                    $fileDrawing = null;
+                                    foreach ($xmlSheetNS->drawing as $drawing) {
+                                        $drawingRelId = (string) self::getArrayItem(self::getAttributes($drawing, $xmlNamespaceBase), 'id');
+                                        $fileDrawing = $drawings[$drawingRelId];
+                                        $drawingFilename = dirname($fileDrawing) . '/_rels/' . basename($fileDrawing) . '.rels';
+                                        $relsDrawing = $this->loadZip($drawingFilename, Namespaces::RELATIONSHIPS);
+
+                                        $images = [];
+                                        $hyperlinks = [];
+                                        if ($relsDrawing && $relsDrawing->Relationship) {
+                                            foreach ($relsDrawing->Relationship as $elex) {
+                                                $ele = self::getAttributes($elex);
+                                                $eleType = (string) $ele['Type'];
+                                                if ($eleType === Namespaces::HYPERLINK) {
+                                                    $hyperlinks[(string) $ele['Id']] = (string) $ele['Target'];
+                                                }
+                                                if ($eleType === "$xmlNamespaceBase/image") {
+                                                    $eleTarget = (string) $ele['Target'];
+                                                    if (str_starts_with($eleTarget, '/xl/')) {
+                                                        $eleTarget = substr($eleTarget, 1);
+                                                        $images[(string) $ele['Id']] = $eleTarget;
+                                                    } else {
+                                                        $images[(string) $ele['Id']] = self::dirAdd($fileDrawing, $eleTarget);
+                                                    }
+                                                } elseif ($eleType === "$xmlNamespaceBase/chart") {
+                                                    if ($this->includeCharts) {
+                                                        $eleTarget = (string) $ele['Target'];
+                                                        if (str_starts_with($eleTarget, '/xl/')) {
+                                                            $index = substr($eleTarget, 1);
+                                                        } else {
+                                                            $index = self::dirAdd($fileDrawing, $eleTarget);
+                                                        }
+                                                        $charts[$index] = [
+                                                            'id' => (string) $ele['Id'],
+                                                            'sheet' => $docSheet->getTitle(),
+                                                        ];
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                        $xmlDrawing = $this->loadZipNoNamespace($fileDrawing, '');
+                                        $xmlDrawingChildren = $xmlDrawing->children(Namespaces::SPREADSHEET_DRAWING);
+
+                                        if ($xmlDrawingChildren->oneCellAnchor) {
+                                            foreach ($xmlDrawingChildren->oneCellAnchor as $oneCellAnchor) {
+                                                $oneCellAnchor = self::testSimpleXml($oneCellAnchor);
+                                                if ($oneCellAnchor->pic->blipFill) {
+                                                    /** @var SimpleXMLElement $blip */
+                                                    $blip = $oneCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->blip;
+                                                    /** @var SimpleXMLElement $xfrm */
+                                                    $xfrm = $oneCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->xfrm;
+                                                    /** @var SimpleXMLElement $outerShdw */
+                                                    $outerShdw = $oneCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->effectLst->outerShdw;
+
+                                                    $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
+                                                    $objDrawing->setName((string) self::getArrayItem(self::getAttributes($oneCellAnchor->pic->nvPicPr->cNvPr), 'name'));
+                                                    $objDrawing->setDescription((string) self::getArrayItem(self::getAttributes($oneCellAnchor->pic->nvPicPr->cNvPr), 'descr'));
+                                                    $embedImageKey = (string) self::getArrayItem(
+                                                        self::getAttributes($blip, $xmlNamespaceBase),
+                                                        'embed'
+                                                    );
+                                                    if (isset($images[$embedImageKey])) {
+                                                        $objDrawing->setPath(
+                                                            'zip://' . File::realpath($filename) . '#'
+                                                            . $images[$embedImageKey],
+                                                            false
+                                                        );
+                                                    } else {
+                                                        $linkImageKey = (string) self::getArrayItem(
+                                                            $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
+                                                            'link'
+                                                        );
+                                                        if (isset($images[$linkImageKey])) {
+                                                            $url = str_replace('xl/drawings/', '', $images[$linkImageKey]);
+                                                            $objDrawing->setPath($url);
+                                                        }
+                                                    }
+                                                    $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((int) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1));
+
+                                                    $objDrawing->setOffsetX((int) Drawing::EMUToPixels($oneCellAnchor->from->colOff));
+                                                    $objDrawing->setOffsetY(Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
+                                                    $objDrawing->setResizeProportional(false);
+                                                    $objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cx')));
+                                                    $objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cy')));
+                                                    if ($xfrm) {
+                                                        $objDrawing->setRotation((int) Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($xfrm), 'rot')));
+                                                        $objDrawing->setFlipVertical((bool) self::getArrayItem(self::getAttributes($xfrm), 'flipV'));
+                                                        $objDrawing->setFlipHorizontal((bool) self::getArrayItem(self::getAttributes($xfrm), 'flipH'));
+                                                    }
+                                                    if ($outerShdw) {
+                                                        $shadow = $objDrawing->getShadow();
+                                                        $shadow->setVisible(true);
+                                                        $shadow->setBlurRadius(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($outerShdw), 'blurRad')));
+                                                        $shadow->setDistance(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($outerShdw), 'dist')));
+                                                        $shadow->setDirection(Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($outerShdw), 'dir')));
+                                                        $shadow->setAlignment((string) self::getArrayItem(self::getAttributes($outerShdw), 'algn'));
+                                                        $clr = $outerShdw->srgbClr ?? $outerShdw->prstClr;
+                                                        $shadow->getColor()->setRGB(self::getArrayItem(self::getAttributes($clr), 'val'));
+                                                        $shadow->setAlpha(self::getArrayItem(self::getAttributes($clr->alpha), 'val') / 1000);
+                                                    }
+
+                                                    $this->readHyperLinkDrawing($objDrawing, $oneCellAnchor, $hyperlinks);
+
+                                                    $objDrawing->setWorksheet($docSheet);
+                                                } elseif ($this->includeCharts && $oneCellAnchor->graphicFrame) {
+                                                    // Exported XLSX from Google Sheets positions charts with a oneCellAnchor
+                                                    $coordinates = Coordinate::stringFromColumnIndex(((int) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1);
+                                                    $offsetX = Drawing::EMUToPixels($oneCellAnchor->from->colOff);
+                                                    $offsetY = Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
+                                                    $width = Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cx'));
+                                                    $height = Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cy'));
+
+                                                    $graphic = $oneCellAnchor->graphicFrame->children(Namespaces::DRAWINGML)->graphic;
+                                                    /** @var SimpleXMLElement $chartRef */
+                                                    $chartRef = $graphic->graphicData->children(Namespaces::CHART)->chart;
+                                                    $thisChart = (string) self::getAttributes($chartRef, $xmlNamespaceBase);
+
+                                                    $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
+                                                        'fromCoordinate' => $coordinates,
+                                                        'fromOffsetX' => $offsetX,
+                                                        'fromOffsetY' => $offsetY,
+                                                        'width' => $width,
+                                                        'height' => $height,
+                                                        'worksheetTitle' => $docSheet->getTitle(),
+                                                        'oneCellAnchor' => true,
+                                                    ];
+                                                }
+                                            }
+                                        }
+                                        if ($xmlDrawingChildren->twoCellAnchor) {
+                                            foreach ($xmlDrawingChildren->twoCellAnchor as $twoCellAnchor) {
+                                                $twoCellAnchor = self::testSimpleXml($twoCellAnchor);
+                                                if ($twoCellAnchor->pic->blipFill) {
+                                                    $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
+                                                    $blip = $twoCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->blip;
+                                                    if (isset($twoCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->srcRect)) {
+                                                        $objDrawing->setSrcRect($twoCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->srcRect->attributes());
+                                                    }
+                                                    $xfrm = $twoCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->xfrm;
+                                                    $outerShdw = $twoCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->effectLst->outerShdw;
+                                                    $editAs = $twoCellAnchor->attributes();
+                                                    if (isset($editAs, $editAs['editAs'])) {
+                                                        $objDrawing->setEditAs($editAs['editAs']);
+                                                    }
+                                                    $objDrawing->setName((string) self::getArrayItem(self::getAttributes($twoCellAnchor->pic->nvPicPr->cNvPr), 'name'));
+                                                    $objDrawing->setDescription((string) self::getArrayItem(self::getAttributes($twoCellAnchor->pic->nvPicPr->cNvPr), 'descr'));
+                                                    $embedImageKey = (string) self::getArrayItem(
+                                                        self::getAttributes($blip, $xmlNamespaceBase),
+                                                        'embed'
+                                                    );
+                                                    if (isset($images[$embedImageKey])) {
+                                                        $objDrawing->setPath(
+                                                            'zip://' . File::realpath($filename) . '#'
+                                                            . $images[$embedImageKey],
+                                                            false
+                                                        );
+                                                    } else {
+                                                        $linkImageKey = (string) self::getArrayItem(
+                                                            $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
+                                                            'link'
+                                                        );
+                                                        if (isset($images[$linkImageKey])) {
+                                                            $url = str_replace('xl/drawings/', '', $images[$linkImageKey]);
+                                                            $objDrawing->setPath($url);
+                                                        }
+                                                    }
+                                                    $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1));
+
+                                                    $objDrawing->setOffsetX(Drawing::EMUToPixels($twoCellAnchor->from->colOff));
+                                                    $objDrawing->setOffsetY(Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
+
+                                                    $objDrawing->setCoordinates2(Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->to->col) + 1) . ($twoCellAnchor->to->row + 1));
+
+                                                    $objDrawing->setOffsetX2(Drawing::EMUToPixels($twoCellAnchor->to->colOff));
+                                                    $objDrawing->setOffsetY2(Drawing::EMUToPixels($twoCellAnchor->to->rowOff));
+
+                                                    $objDrawing->setResizeProportional(false);
+
+                                                    if ($xfrm) {
+                                                        $objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($xfrm->ext), 'cx')));
+                                                        $objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($xfrm->ext), 'cy')));
+                                                        $objDrawing->setRotation(Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($xfrm), 'rot')));
+                                                        $objDrawing->setFlipVertical((bool) self::getArrayItem(self::getAttributes($xfrm), 'flipV'));
+                                                        $objDrawing->setFlipHorizontal((bool) self::getArrayItem(self::getAttributes($xfrm), 'flipH'));
+                                                    }
+                                                    if ($outerShdw) {
+                                                        $shadow = $objDrawing->getShadow();
+                                                        $shadow->setVisible(true);
+                                                        $shadow->setBlurRadius(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($outerShdw), 'blurRad')));
+                                                        $shadow->setDistance(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($outerShdw), 'dist')));
+                                                        $shadow->setDirection(Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($outerShdw), 'dir')));
+                                                        $shadow->setAlignment((string) self::getArrayItem(self::getAttributes($outerShdw), 'algn'));
+                                                        $clr = $outerShdw->srgbClr ?? $outerShdw->prstClr;
+                                                        $shadow->getColor()->setRGB(self::getArrayItem(self::getAttributes($clr), 'val'));
+                                                        $shadow->setAlpha(self::getArrayItem(self::getAttributes($clr->alpha), 'val') / 1000);
+                                                    }
+
+                                                    $this->readHyperLinkDrawing($objDrawing, $twoCellAnchor, $hyperlinks);
+
+                                                    $objDrawing->setWorksheet($docSheet);
+                                                } elseif (($this->includeCharts) && ($twoCellAnchor->graphicFrame)) {
+                                                    $fromCoordinate = Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1);
+                                                    $fromOffsetX = Drawing::EMUToPixels($twoCellAnchor->from->colOff);
+                                                    $fromOffsetY = Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
+                                                    $toCoordinate = Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->to->col) + 1) . ($twoCellAnchor->to->row + 1);
+                                                    $toOffsetX = Drawing::EMUToPixels($twoCellAnchor->to->colOff);
+                                                    $toOffsetY = Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
+                                                    $graphic = $twoCellAnchor->graphicFrame->children(Namespaces::DRAWINGML)->graphic;
+                                                    /** @var SimpleXMLElement $chartRef */
+                                                    $chartRef = $graphic->graphicData->children(Namespaces::CHART)->chart;
+                                                    $thisChart = (string) self::getAttributes($chartRef, $xmlNamespaceBase);
+
+                                                    $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
+                                                        'fromCoordinate' => $fromCoordinate,
+                                                        'fromOffsetX' => $fromOffsetX,
+                                                        'fromOffsetY' => $fromOffsetY,
+                                                        'toCoordinate' => $toCoordinate,
+                                                        'toOffsetX' => $toOffsetX,
+                                                        'toOffsetY' => $toOffsetY,
+                                                        'worksheetTitle' => $docSheet->getTitle(),
+                                                    ];
+                                                }
+                                            }
+                                        }
+                                        if ($xmlDrawingChildren->absoluteAnchor) {
+                                            foreach ($xmlDrawingChildren->absoluteAnchor as $absoluteAnchor) {
+                                                if (($this->includeCharts) && ($absoluteAnchor->graphicFrame)) {
+                                                    $graphic = $absoluteAnchor->graphicFrame->children(Namespaces::DRAWINGML)->graphic;
+                                                    /** @var SimpleXMLElement $chartRef */
+                                                    $chartRef = $graphic->graphicData->children(Namespaces::CHART)->chart;
+                                                    $thisChart = (string) self::getAttributes($chartRef, $xmlNamespaceBase);
+                                                    $width = Drawing::EMUToPixels((int) self::getArrayItem(self::getAttributes($absoluteAnchor->ext), 'cx')[0]);
+                                                    $height = Drawing::EMUToPixels((int) self::getArrayItem(self::getAttributes($absoluteAnchor->ext), 'cy')[0]);
+
+                                                    $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
+                                                        'fromCoordinate' => 'A1',
+                                                        'fromOffsetX' => 0,
+                                                        'fromOffsetY' => 0,
+                                                        'width' => $width,
+                                                        'height' => $height,
+                                                        'worksheetTitle' => $docSheet->getTitle(),
+                                                    ];
+                                                }
+                                            }
+                                        }
+                                        if (empty($relsDrawing) && $xmlDrawing->count() == 0) {
+                                            // Save Drawing without rels and children as unparsed
+                                            $unparsedDrawings[$drawingRelId] = $xmlDrawing->asXML();
+                                        }
+                                    }
+
+                                    // store original rId of drawing files
+                                    $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingOriginalIds'] = [];
+                                    foreach ($relsWorksheet->Relationship as $elex) {
+                                        $ele = self::getAttributes($elex);
+                                        if ((string) $ele['Type'] === "$xmlNamespaceBase/drawing") {
+                                            $drawingRelId = (string) $ele['Id'];
+                                            $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingOriginalIds'][(string) $ele['Target']] = $drawingRelId;
+                                            if (isset($unparsedDrawings[$drawingRelId])) {
+                                                $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['Drawings'][$drawingRelId] = $unparsedDrawings[$drawingRelId];
+                                            }
+                                        }
+                                    }
+                                    if ($xmlSheet->legacyDrawing && !$this->readDataOnly) {
+                                        foreach ($xmlSheet->legacyDrawing as $drawing) {
+                                            $drawingRelId = (string) self::getArrayItem(self::getAttributes($drawing, $xmlNamespaceBase), 'id');
+                                            if (isset($vmlDrawingContents[$drawingRelId])) {
+                                                $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['legacyDrawing'] = $vmlDrawingContents[$drawingRelId];
+                                            }
+                                        }
+                                    }
+
+                                    // unparsed drawing AlternateContent
+                                    $xmlAltDrawing = $this->loadZip((string) $fileDrawing, Namespaces::COMPATIBILITY);
+
+                                    if ($xmlAltDrawing->AlternateContent) {
+                                        foreach ($xmlAltDrawing->AlternateContent as $alternateContent) {
+                                            $alternateContent = self::testSimpleXml($alternateContent);
+                                            $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingAlternateContents'][] = $alternateContent->asXML();
+                                        }
+                                    }
+                                }
+                            }
+
+                            $this->readFormControlProperties($excel, $dir, $fileWorksheet, $docSheet, $unparsedLoadedData);
+                            $this->readPrinterSettings($excel, $dir, $fileWorksheet, $docSheet, $unparsedLoadedData);
+
+                            // Loop through definedNames
+                            if ($xmlWorkbook->definedNames) {
+                                foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
+                                    // Extract range
+                                    $extractedRange = (string) $definedName;
+                                    if (($spos = strpos($extractedRange, '!')) !== false) {
+                                        $extractedRange = substr($extractedRange, 0, $spos) . str_replace('$', '', substr($extractedRange, $spos));
+                                    } else {
+                                        $extractedRange = str_replace('$', '', $extractedRange);
+                                    }
+
+                                    // Valid range?
+                                    if ($extractedRange == '') {
+                                        continue;
+                                    }
+
+                                    // Some definedNames are only applicable if we are on the same sheet...
+                                    if ((string) $definedName['localSheetId'] != '' && (string) $definedName['localSheetId'] == $oldSheetId) {
+                                        // Switch on type
+                                        switch ((string) $definedName['name']) {
+                                            case '_xlnm._FilterDatabase':
+                                                if ((string) $definedName['hidden'] !== '1') {
+                                                    $extractedRange = explode(',', $extractedRange);
+                                                    foreach ($extractedRange as $range) {
+                                                        $autoFilterRange = $range;
+                                                        if (str_contains($autoFilterRange, ':')) {
+                                                            $docSheet->getAutoFilter()->setRange($autoFilterRange);
+                                                        }
+                                                    }
+                                                }
+
+                                                break;
+                                            case '_xlnm.Print_Titles':
+                                                // Split $extractedRange
+                                                $extractedRange = explode(',', $extractedRange);
+
+                                                // Set print titles
+                                                foreach ($extractedRange as $range) {
+                                                    $matches = [];
+                                                    $range = str_replace('$', '', $range);
+
+                                                    // check for repeating columns, e g. 'A:A' or 'A:D'
+                                                    if (preg_match('/!?([A-Z]+)\:([A-Z]+)$/', $range, $matches)) {
+                                                        $docSheet->getPageSetup()->setColumnsToRepeatAtLeft([$matches[1], $matches[2]]);
+                                                    } elseif (preg_match('/!?(\d+)\:(\d+)$/', $range, $matches)) {
+                                                        // check for repeating rows, e.g. '1:1' or '1:5'
+                                                        $docSheet->getPageSetup()->setRowsToRepeatAtTop([$matches[1], $matches[2]]);
+                                                    }
+                                                }
+
+                                                break;
+                                            case '_xlnm.Print_Area':
+                                                $rangeSets = preg_split("/('?(?:.*?)'?(?:![A-Z0-9]+:[A-Z0-9]+)),?/", $extractedRange, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) ?: [];
+                                                $newRangeSets = [];
+                                                foreach ($rangeSets as $rangeSet) {
+                                                    [, $rangeSet] = Worksheet::extractSheetTitle($rangeSet, true);
+                                                    if (empty($rangeSet)) {
+                                                        continue;
+                                                    }
+                                                    if (!str_contains($rangeSet, ':')) {
+                                                        $rangeSet = $rangeSet . ':' . $rangeSet;
+                                                    }
+                                                    $newRangeSets[] = str_replace('$', '', $rangeSet);
+                                                }
+                                                if (count($newRangeSets) > 0) {
+                                                    $docSheet->getPageSetup()->setPrintArea(implode(',', $newRangeSets));
+                                                }
+
+                                                break;
+                                            default:
+                                                break;
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Next sheet id
+                            ++$sheetId;
+                        }
+
+                        // Loop through definedNames
+                        if ($xmlWorkbook->definedNames) {
+                            foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
+                                // Extract range
+                                $extractedRange = (string) $definedName;
+
+                                // Valid range?
+                                if ($extractedRange == '') {
+                                    continue;
+                                }
+
+                                // Some definedNames are only applicable if we are on the same sheet...
+                                if ((string) $definedName['localSheetId'] != '') {
+                                    // Local defined name
+                                    // Switch on type
+                                    switch ((string) $definedName['name']) {
+                                        case '_xlnm._FilterDatabase':
+                                        case '_xlnm.Print_Titles':
+                                        case '_xlnm.Print_Area':
+                                            break;
+                                        default:
+                                            if ($mapSheetId[(int) $definedName['localSheetId']] !== null) {
+                                                $range = Worksheet::extractSheetTitle($extractedRange, true);
+                                                $scope = $excel->getSheet($mapSheetId[(int) $definedName['localSheetId']]);
+                                                if (str_contains((string) $definedName, '!')) {
+                                                    $range[0] = str_replace("''", "'", $range[0]);
+                                                    $range[0] = str_replace("'", '', $range[0]);
+                                                    if ($worksheet = $excel->getSheetByName($range[0])) {
+                                                        $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
+                                                    } else {
+                                                        $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true, $scope));
+                                                    }
+                                                } else {
+                                                    $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true));
+                                                }
+                                            }
+
+                                            break;
+                                    }
+                                } elseif (!isset($definedName['localSheetId'])) {
+                                    // "Global" definedNames
+                                    $locatedSheet = null;
+                                    if (str_contains((string) $definedName, '!')) {
+                                        // Modify range, and extract the first worksheet reference
+                                        // Need to split on a comma or a space if not in quotes, and extract the first part.
+                                        $definedNameValueParts = preg_split("/[ ,](?=([^']*'[^']*')*[^']*$)/miuU", $extractedRange);
+                                        if (is_array($definedNameValueParts)) {
+                                            // Extract sheet name
+                                            [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true);
+                                            $extractedSheetName = trim((string) $extractedSheetName, "'");
+
+                                            // Locate sheet
+                                            $locatedSheet = $excel->getSheetByName($extractedSheetName);
+                                        }
+                                    }
+
+                                    if ($locatedSheet === null && !DefinedName::testIfFormula($extractedRange)) {
+                                        $extractedRange = '#REF!';
+                                    }
+                                    $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $locatedSheet, $extractedRange, false));
+                                }
+                            }
+                        }
+                    }
+
+                    (new WorkbookView($excel))->viewSettings($xmlWorkbook, $mainNS, $mapSheetId, $this->readDataOnly);
+
+                    break;
+            }
+        }
+
+        if (!$this->readDataOnly) {
+            $contentTypes = $this->loadZip('[Content_Types].xml');
+
+            // Default content types
+            foreach ($contentTypes->Default as $contentType) {
+                switch ($contentType['ContentType']) {
+                    case 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings':
+                        $unparsedLoadedData['default_content_types'][(string) $contentType['Extension']] = (string) $contentType['ContentType'];
+
+                        break;
+                }
+            }
+
+            // Override content types
+            foreach ($contentTypes->Override as $contentType) {
+                switch ($contentType['ContentType']) {
+                    case 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml':
+                        if ($this->includeCharts) {
+                            $chartEntryRef = ltrim((string) $contentType['PartName'], '/');
+                            $chartElements = $this->loadZip($chartEntryRef);
+                            $chartReader = new Chart($chartNS, $drawingNS);
+                            $objChart = $chartReader->readChart($chartElements, basename($chartEntryRef, '.xml'));
+                            if (isset($charts[$chartEntryRef])) {
+                                $chartPositionRef = $charts[$chartEntryRef]['sheet'] . '!' . $charts[$chartEntryRef]['id'];
+                                if (isset($chartDetails[$chartPositionRef]) && $excel->getSheetByName($charts[$chartEntryRef]['sheet']) !== null) {
+                                    $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
+                                    $objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
+                                    // For oneCellAnchor or absoluteAnchor positioned charts,
+                                    //     toCoordinate is not in the data. Does it need to be calculated?
+                                    if (array_key_exists('toCoordinate', $chartDetails[$chartPositionRef])) {
+                                        // twoCellAnchor
+                                        $objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'], $chartDetails[$chartPositionRef]['fromOffsetX'], $chartDetails[$chartPositionRef]['fromOffsetY']);
+                                        $objChart->setBottomRightPosition($chartDetails[$chartPositionRef]['toCoordinate'], $chartDetails[$chartPositionRef]['toOffsetX'], $chartDetails[$chartPositionRef]['toOffsetY']);
+                                    } else {
+                                        // oneCellAnchor or absoluteAnchor (e.g. Chart sheet)
+                                        $objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'], $chartDetails[$chartPositionRef]['fromOffsetX'], $chartDetails[$chartPositionRef]['fromOffsetY']);
+                                        $objChart->setBottomRightPosition('', $chartDetails[$chartPositionRef]['width'], $chartDetails[$chartPositionRef]['height']);
+                                        if (array_key_exists('oneCellAnchor', $chartDetails[$chartPositionRef])) {
+                                            $objChart->setOneCellAnchor($chartDetails[$chartPositionRef]['oneCellAnchor']);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        break;
+
+                        // unparsed
+                    case 'application/vnd.ms-excel.controlproperties+xml':
+                        $unparsedLoadedData['override_content_types'][(string) $contentType['PartName']] = (string) $contentType['ContentType'];
+
+                        break;
+                }
+            }
+        }
+
+        $excel->setUnparsedLoadedData($unparsedLoadedData);
+
+        $zip->close();
+
+        return $excel;
+    }
+
+    private function parseRichText(?SimpleXMLElement $is): RichText
+    {
+        $value = new RichText();
+
+        if (isset($is->t)) {
+            $value->createText(StringHelper::controlCharacterOOXML2PHP((string) $is->t));
+        } elseif ($is !== null) {
+            if (is_object($is->r)) {
+                /** @var SimpleXMLElement $run */
+                foreach ($is->r as $run) {
+                    if (!isset($run->rPr)) {
+                        $value->createText(StringHelper::controlCharacterOOXML2PHP((string) $run->t));
+                    } else {
+                        $objText = $value->createTextRun(StringHelper::controlCharacterOOXML2PHP((string) $run->t));
+                        $objFont = $objText->getFont() ?? new StyleFont();
+
+                        if (isset($run->rPr->rFont)) {
+                            $attr = $run->rPr->rFont->attributes();
+                            if (isset($attr['val'])) {
+                                $objFont->setName((string) $attr['val']);
+                            }
+                        }
+                        if (isset($run->rPr->sz)) {
+                            $attr = $run->rPr->sz->attributes();
+                            if (isset($attr['val'])) {
+                                $objFont->setSize((float) $attr['val']);
+                            }
+                        }
+                        if (isset($run->rPr->color)) {
+                            $objFont->setColor(new Color($this->styleReader->readColor($run->rPr->color)));
+                        }
+                        if (isset($run->rPr->b)) {
+                            $attr = $run->rPr->b->attributes();
+                            if (
+                                (isset($attr['val']) && self::boolean((string) $attr['val']))
+                                || (!isset($attr['val']))
+                            ) {
+                                $objFont->setBold(true);
+                            }
+                        }
+                        if (isset($run->rPr->i)) {
+                            $attr = $run->rPr->i->attributes();
+                            if (
+                                (isset($attr['val']) && self::boolean((string) $attr['val']))
+                                || (!isset($attr['val']))
+                            ) {
+                                $objFont->setItalic(true);
+                            }
+                        }
+                        if (isset($run->rPr->vertAlign)) {
+                            $attr = $run->rPr->vertAlign->attributes();
+                            if (isset($attr['val'])) {
+                                $vertAlign = strtolower((string) $attr['val']);
+                                if ($vertAlign == 'superscript') {
+                                    $objFont->setSuperscript(true);
+                                }
+                                if ($vertAlign == 'subscript') {
+                                    $objFont->setSubscript(true);
+                                }
+                            }
+                        }
+                        if (isset($run->rPr->u)) {
+                            $attr = $run->rPr->u->attributes();
+                            if (!isset($attr['val'])) {
+                                $objFont->setUnderline(StyleFont::UNDERLINE_SINGLE);
+                            } else {
+                                $objFont->setUnderline((string) $attr['val']);
+                            }
+                        }
+                        if (isset($run->rPr->strike)) {
+                            $attr = $run->rPr->strike->attributes();
+                            if (
+                                (isset($attr['val']) && self::boolean((string) $attr['val']))
+                                || (!isset($attr['val']))
+                            ) {
+                                $objFont->setStrikethrough(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    private function readRibbon(Spreadsheet $excel, string $customUITarget, ZipArchive $zip): void
+    {
+        $baseDir = dirname($customUITarget);
+        $nameCustomUI = basename($customUITarget);
+        // get the xml file (ribbon)
+        $localRibbon = $this->getFromZipArchive($zip, $customUITarget);
+        $customUIImagesNames = [];
+        $customUIImagesBinaries = [];
+        // something like customUI/_rels/customUI.xml.rels
+        $pathRels = $baseDir . '/_rels/' . $nameCustomUI . '.rels';
+        $dataRels = $this->getFromZipArchive($zip, $pathRels);
+        if ($dataRels) {
+            // exists and not empty if the ribbon have some pictures (other than internal MSO)
+            $UIRels = simplexml_load_string(
+                $this->getSecurityScannerOrThrow()->scan($dataRels),
+                'SimpleXMLElement',
+                Settings::getLibXmlLoaderOptions()
+            );
+            if (false !== $UIRels) {
+                // we need to save id and target to avoid parsing customUI.xml and "guess" if it's a pseudo callback who load the image
+                foreach ($UIRels->Relationship as $ele) {
+                    if ((string) $ele['Type'] === Namespaces::SCHEMA_OFFICE_DOCUMENT . '/image') {
+                        // an image ?
+                        $customUIImagesNames[(string) $ele['Id']] = (string) $ele['Target'];
+                        $customUIImagesBinaries[(string) $ele['Target']] = $this->getFromZipArchive($zip, $baseDir . '/' . (string) $ele['Target']);
+                    }
+                }
+            }
+        }
+        if ($localRibbon) {
+            $excel->setRibbonXMLData($customUITarget, $localRibbon);
+            if (count($customUIImagesNames) > 0 && count($customUIImagesBinaries) > 0) {
+                $excel->setRibbonBinObjects($customUIImagesNames, $customUIImagesBinaries);
+            } else {
+                $excel->setRibbonBinObjects(null, null);
+            }
+        } else {
+            $excel->setRibbonXMLData(null, null);
+            $excel->setRibbonBinObjects(null, null);
+        }
+    }
+
+    private static function getArrayItem(null|array|bool|SimpleXMLElement $array, int|string $key = 0): mixed
+    {
+        return ($array === null || is_bool($array)) ? null : ($array[$key] ?? null);
+    }
+
+    private static function dirAdd(null|SimpleXMLElement|string $base, null|SimpleXMLElement|string $add): string
+    {
+        $base = (string) $base;
+        $add = (string) $add;
+
+        return (string) preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
+    }
+
+    private static function toCSSArray(string $style): array
+    {
+        $style = self::stripWhiteSpaceFromStyleString($style);
+
+        $temp = explode(';', $style);
+        $style = [];
+        foreach ($temp as $item) {
+            $item = explode(':', $item);
+
+            if (str_contains($item[1], 'px')) {
+                $item[1] = str_replace('px', '', $item[1]);
+            }
+            if (str_contains($item[1], 'pt')) {
+                $item[1] = str_replace('pt', '', $item[1]);
+                $item[1] = (string) Font::fontSizeToPixels((int) $item[1]);
+            }
+            if (str_contains($item[1], 'in')) {
+                $item[1] = str_replace('in', '', $item[1]);
+                $item[1] = (string) Font::inchSizeToPixels((int) $item[1]);
+            }
+            if (str_contains($item[1], 'cm')) {
+                $item[1] = str_replace('cm', '', $item[1]);
+                $item[1] = (string) Font::centimeterSizeToPixels((int) $item[1]);
+            }
+
+            $style[$item[0]] = $item[1];
+        }
+
+        return $style;
+    }
+
+    public static function stripWhiteSpaceFromStyleString(string $string): string
+    {
+        return trim(str_replace(["\r", "\n", ' '], '', $string), ';');
+    }
+
+    private static function boolean(string $value): bool
+    {
+        if (is_numeric($value)) {
+            return (bool) $value;
+        }
+
+        return $value === 'true' || $value === 'TRUE';
+    }
+
+    private function readHyperLinkDrawing(\PhpOffice\PhpSpreadsheet\Worksheet\Drawing $objDrawing, SimpleXMLElement $cellAnchor, array $hyperlinks): void
+    {
+        $hlinkClick = $cellAnchor->pic->nvPicPr->cNvPr->children(Namespaces::DRAWINGML)->hlinkClick;
+
+        if ($hlinkClick->count() === 0) {
+            return;
+        }
+
+        $hlinkId = (string) self::getAttributes($hlinkClick, Namespaces::SCHEMA_OFFICE_DOCUMENT)['id'];
+        $hyperlink = new Hyperlink(
+            $hyperlinks[$hlinkId],
+            (string) self::getArrayItem(self::getAttributes($cellAnchor->pic->nvPicPr->cNvPr), 'name')
+        );
+        $objDrawing->setHyperlink($hyperlink);
+    }
+
+    private function readProtection(Spreadsheet $excel, SimpleXMLElement $xmlWorkbook): void
+    {
+        if (!$xmlWorkbook->workbookProtection) {
+            return;
+        }
+
+        $excel->getSecurity()->setLockRevision(self::getLockValue($xmlWorkbook->workbookProtection, 'lockRevision'));
+        $excel->getSecurity()->setLockStructure(self::getLockValue($xmlWorkbook->workbookProtection, 'lockStructure'));
+        $excel->getSecurity()->setLockWindows(self::getLockValue($xmlWorkbook->workbookProtection, 'lockWindows'));
+
+        if ($xmlWorkbook->workbookProtection['revisionsPassword']) {
+            $excel->getSecurity()->setRevisionsPassword(
+                (string) $xmlWorkbook->workbookProtection['revisionsPassword'],
+                true
+            );
+        }
+
+        if ($xmlWorkbook->workbookProtection['workbookPassword']) {
+            $excel->getSecurity()->setWorkbookPassword(
+                (string) $xmlWorkbook->workbookProtection['workbookPassword'],
+                true
+            );
+        }
+    }
+
+    private static function getLockValue(SimpleXMLElement $protection, string $key): ?bool
+    {
+        $returnValue = null;
+        $protectKey = $protection[$key];
+        if (!empty($protectKey)) {
+            $protectKey = (string) $protectKey;
+            $returnValue = $protectKey !== 'false' && (bool) $protectKey;
+        }
+
+        return $returnValue;
+    }
+
+    private function readFormControlProperties(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
+    {
+        $zip = $this->zip;
+        if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels') === false) {
+            return;
+        }
+
+        $filename = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+        $relsWorksheet = $this->loadZipNoNamespace($filename, Namespaces::RELATIONSHIPS);
+        $ctrlProps = [];
+        foreach ($relsWorksheet->Relationship as $ele) {
+            if ((string) $ele['Type'] === Namespaces::SCHEMA_OFFICE_DOCUMENT . '/ctrlProp') {
+                $ctrlProps[(string) $ele['Id']] = $ele;
+            }
+        }
+
+        $unparsedCtrlProps = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['ctrlProps'];
+        foreach ($ctrlProps as $rId => $ctrlProp) {
+            $rId = substr($rId, 3); // rIdXXX
+            $unparsedCtrlProps[$rId] = [];
+            $unparsedCtrlProps[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $ctrlProp['Target']);
+            $unparsedCtrlProps[$rId]['relFilePath'] = (string) $ctrlProp['Target'];
+            $unparsedCtrlProps[$rId]['content'] = $this->getSecurityScannerOrThrow()->scan($this->getFromZipArchive($zip, $unparsedCtrlProps[$rId]['filePath']));
+        }
+        unset($unparsedCtrlProps);
+    }
+
+    private function readPrinterSettings(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
+    {
+        $zip = $this->zip;
+        if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels') === false) {
+            return;
+        }
+
+        $filename = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+        $relsWorksheet = $this->loadZipNoNamespace($filename, Namespaces::RELATIONSHIPS);
+        $sheetPrinterSettings = [];
+        foreach ($relsWorksheet->Relationship as $ele) {
+            if ((string) $ele['Type'] === Namespaces::SCHEMA_OFFICE_DOCUMENT . '/printerSettings') {
+                $sheetPrinterSettings[(string) $ele['Id']] = $ele;
+            }
+        }
+
+        $unparsedPrinterSettings = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['printerSettings'];
+        foreach ($sheetPrinterSettings as $rId => $printerSettings) {
+            $rId = substr($rId, 3); // rIdXXX
+            if (!str_ends_with($rId, 'ps')) {
+                $rId = $rId . 'ps'; // rIdXXX, add 'ps' suffix to avoid identical resource identifier collision with unparsed vmlDrawing
+            }
+            $unparsedPrinterSettings[$rId] = [];
+            $target = (string) str_replace('/xl/', '../', (string) $printerSettings['Target']);
+            $unparsedPrinterSettings[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $target);
+            $unparsedPrinterSettings[$rId]['relFilePath'] = $target;
+            $unparsedPrinterSettings[$rId]['content'] = $this->getSecurityScannerOrThrow()->scan($this->getFromZipArchive($zip, $unparsedPrinterSettings[$rId]['filePath']));
+        }
+        unset($unparsedPrinterSettings);
+    }
+
+    private function getWorkbookBaseName(): array
+    {
+        $workbookBasename = '';
+        $xmlNamespaceBase = '';
+
+        // check if it is an OOXML archive
+        $rels = $this->loadZip(self::INITIAL_FILE);
+        foreach ($rels->children(Namespaces::RELATIONSHIPS)->Relationship as $rel) {
+            $rel = self::getAttributes($rel);
+            $type = (string) $rel['Type'];
+            switch ($type) {
+                case Namespaces::OFFICE_DOCUMENT:
+                case Namespaces::PURL_OFFICE_DOCUMENT:
+                    $basename = basename((string) $rel['Target']);
+                    $xmlNamespaceBase = dirname($type);
+                    if (preg_match('/workbook.*\.xml/', $basename)) {
+                        $workbookBasename = $basename;
+                    }
+
+                    break;
+            }
+        }
+
+        return [$workbookBasename, $xmlNamespaceBase];
+    }
+
+    private function readSheetProtection(Worksheet $docSheet, SimpleXMLElement $xmlSheet): void
+    {
+        if ($this->readDataOnly || !$xmlSheet->sheetProtection) {
+            return;
+        }
+
+        $algorithmName = (string) $xmlSheet->sheetProtection['algorithmName'];
+        $protection = $docSheet->getProtection();
+        $protection->setAlgorithm($algorithmName);
+
+        if ($algorithmName) {
+            $protection->setPassword((string) $xmlSheet->sheetProtection['hashValue'], true);
+            $protection->setSalt((string) $xmlSheet->sheetProtection['saltValue']);
+            $protection->setSpinCount((int) $xmlSheet->sheetProtection['spinCount']);
+        } else {
+            $protection->setPassword((string) $xmlSheet->sheetProtection['password'], true);
+        }
+
+        if ($xmlSheet->protectedRanges->protectedRange) {
+            foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
+                $docSheet->protectCells((string) $protectedRange['sqref'], (string) $protectedRange['password'], true, (string) $protectedRange['name'], (string) $protectedRange['securityDescriptor']);
+            }
+        }
+    }
+
+    private function readAutoFilter(
+        SimpleXMLElement $xmlSheet,
+        Worksheet $docSheet
+    ): void {
+        if ($xmlSheet && $xmlSheet->autoFilter) {
+            (new AutoFilter($docSheet, $xmlSheet))->load();
+        }
+    }
+
+    private function readBackgroundImage(
+        SimpleXMLElement $xmlSheet,
+        Worksheet $docSheet,
+        string $relsName
+    ): void {
+        if ($xmlSheet && $xmlSheet->picture) {
+            $id = (string) self::getArrayItem(self::getAttributes($xmlSheet->picture, Namespaces::SCHEMA_OFFICE_DOCUMENT), 'id');
+            $rels = $this->loadZip($relsName);
+            foreach ($rels->Relationship as $rel) {
+                $attrs = $rel->attributes() ?? [];
+                $rid = (string) ($attrs['Id'] ?? '');
+                $target = (string) ($attrs['Target'] ?? '');
+                if ($rid === $id && substr($target, 0, 2) === '..') {
+                    $target = 'xl' . substr($target, 2);
+                    $content = $this->getFromZipArchive($this->zip, $target);
+                    $docSheet->setBackgroundImage($content);
+                }
+            }
+        }
+    }
+
+    private function readTables(
+        SimpleXMLElement $xmlSheet,
+        Worksheet $docSheet,
+        string $dir,
+        string $fileWorksheet,
+        ZipArchive $zip,
+        string $namespaceTable
+    ): void {
+        if ($xmlSheet && $xmlSheet->tableParts) {
+            $attributes = $xmlSheet->tableParts->attributes() ?? ['count' => 0];
+            if (((int) $attributes['count']) > 0) {
+                $this->readTablesInTablesFile($xmlSheet, $dir, $fileWorksheet, $zip, $docSheet, $namespaceTable);
+            }
+        }
+    }
+
+    private function readTablesInTablesFile(
+        SimpleXMLElement $xmlSheet,
+        string $dir,
+        string $fileWorksheet,
+        ZipArchive $zip,
+        Worksheet $docSheet,
+        string $namespaceTable
+    ): void {
+        foreach ($xmlSheet->tableParts->tablePart as $tablePart) {
+            $relation = self::getAttributes($tablePart, Namespaces::SCHEMA_OFFICE_DOCUMENT);
+            $tablePartRel = (string) $relation['id'];
+            $relationsFileName = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+
+            if ($zip->locateName($relationsFileName) !== false) {
+                $relsTableReferences = $this->loadZip($relationsFileName, Namespaces::RELATIONSHIPS);
+                foreach ($relsTableReferences->Relationship as $relationship) {
+                    $relationshipAttributes = self::getAttributes($relationship, '');
+
+                    if ((string) $relationshipAttributes['Id'] === $tablePartRel) {
+                        $relationshipFileName = (string) $relationshipAttributes['Target'];
+                        $relationshipFilePath = dirname("$dir/$fileWorksheet") . '/' . $relationshipFileName;
+                        $relationshipFilePath = File::realpath($relationshipFilePath);
+
+                        if ($this->fileExistsInArchive($this->zip, $relationshipFilePath)) {
+                            $tableXml = $this->loadZip($relationshipFilePath, $namespaceTable);
+                            (new TableReader($docSheet, $tableXml))->load();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static function extractStyles(?SimpleXMLElement $sxml, string $node1, string $node2): array
+    {
+        $array = [];
+        if ($sxml && $sxml->{$node1}->{$node2}) {
+            foreach ($sxml->{$node1}->{$node2} as $node) {
+                $array[] = $node;
+            }
+        }
+
+        return $array;
+    }
+
+    private static function extractPalette(?SimpleXMLElement $sxml): array
+    {
+        $array = [];
+        if ($sxml && $sxml->colors->indexedColors) {
+            foreach ($sxml->colors->indexedColors->rgbColor as $node) {
+                if ($node !== null) {
+                    $attr = $node->attributes();
+                    if (isset($attr['rgb'])) {
+                        $array[] = (string) $attr['rgb'];
+                    }
+                }
+            }
+        }
+
+        return $array;
+    }
+
+    private function processIgnoredErrors(SimpleXMLElement $xml, Worksheet $sheet): void
+    {
+        $attributes = self::getAttributes($xml);
+        $sqref = (string) ($attributes['sqref'] ?? '');
+        $numberStoredAsText = (string) ($attributes['numberStoredAsText'] ?? '');
+        $formula = (string) ($attributes['formula'] ?? '');
+        $twoDigitTextYear = (string) ($attributes['twoDigitTextYear'] ?? '');
+        $evalError = (string) ($attributes['evalError'] ?? '');
+        if (!empty($sqref)) {
+            $explodedSqref = explode(' ', $sqref);
+            $pattern1 = '/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/';
+            foreach ($explodedSqref as $sqref1) {
+                if (preg_match($pattern1, $sqref1, $matches) === 1) {
+                    $firstRow = $matches[2];
+                    $firstCol = $matches[1];
+                    if (array_key_exists(3, $matches)) {
+                        $lastCol = $matches[4];
+                        $lastRow = $matches[5];
+                    } else {
+                        $lastCol = $firstCol;
+                        $lastRow = $firstRow;
+                    }
+                    ++$lastCol;
+                    for ($row = $firstRow; $row <= $lastRow; ++$row) {
+                        for ($col = $firstCol; $col !== $lastCol; ++$col) {
+                            if ($numberStoredAsText === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setNumberStoredAsText(true);
+                            }
+                            if ($formula === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setFormula(true);
+                            }
+                            if ($twoDigitTextYear === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setTwoDigitTextYear(true);
+                            }
+                            if ($evalError === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setEvalError(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
new file mode 100644
index 00000000..49fe3609
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class AutoFilter
+{
+    private Table|Worksheet $parent;
+
+    private SimpleXMLElement $worksheetXml;
+
+    public function __construct(Table|Worksheet $parent, SimpleXMLElement $worksheetXml)
+    {
+        $this->parent = $parent;
+        $this->worksheetXml = $worksheetXml;
+    }
+
+    public function load(): void
+    {
+        // Remove all "$" in the auto filter range
+        $attrs = $this->worksheetXml->autoFilter->attributes() ?? [];
+        $autoFilterRange = (string) preg_replace('/\$/', '', $attrs['ref'] ?? '');
+        if (str_contains($autoFilterRange, ':')) {
+            $this->readAutoFilter($autoFilterRange);
+        }
+    }
+
+    private function readAutoFilter(string $autoFilterRange): void
+    {
+        $autoFilter = $this->parent->getAutoFilter();
+        $autoFilter->setRange($autoFilterRange);
+
+        foreach ($this->worksheetXml->autoFilter->filterColumn as $filterColumn) {
+            $attributes = $filterColumn->attributes() ?? [];
+            $column = $autoFilter->getColumnByOffset((int) ($attributes['colId'] ?? 0));
+            //    Check for standard filters
+            if ($filterColumn->filters) {
+                $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_FILTER);
+                $filters = Xlsx::testSimpleXml($filterColumn->filters->attributes());
+                if ((isset($filters['blank'])) && ((int) $filters['blank'] == 1)) {
+                    //    Operator is undefined, but always treated as EQUAL
+                    $column->createRule()->setRule('', '')->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+                }
+                //    Standard filters are always an OR join, so no join rule needs to be set
+                //    Entries can be either filter elements
+                foreach ($filterColumn->filters->filter as $filterRule) {
+                    //    Operator is undefined, but always treated as EQUAL
+                    $attr2 = $filterRule->attributes() ?? ['val' => ''];
+                    $column->createRule()->setRule('', (string) $attr2['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+                }
+
+                //    Or Date Group elements
+                $this->readDateRangeAutoFilter($filterColumn->filters, $column);
+            }
+
+            //    Check for custom filters
+            $this->readCustomAutoFilter($filterColumn, $column);
+            //    Check for dynamic filters
+            $this->readDynamicAutoFilter($filterColumn, $column);
+            //    Check for dynamic filters
+            $this->readTopTenAutoFilter($filterColumn, $column);
+        }
+        $autoFilter->setEvaluated(true);
+    }
+
+    private function readDateRangeAutoFilter(SimpleXMLElement $filters, Column $column): void
+    {
+        foreach ($filters->dateGroupItem as $dateGroupItemx) {
+            //    Operator is undefined, but always treated as EQUAL
+            $dateGroupItem = $dateGroupItemx->attributes();
+            if ($dateGroupItem !== null) {
+                $column->createRule()->setRule(
+                    '',
+                    [
+                        'year' => (string) $dateGroupItem['year'],
+                        'month' => (string) $dateGroupItem['month'],
+                        'day' => (string) $dateGroupItem['day'],
+                        'hour' => (string) $dateGroupItem['hour'],
+                        'minute' => (string) $dateGroupItem['minute'],
+                        'second' => (string) $dateGroupItem['second'],
+                    ],
+                    (string) $dateGroupItem['dateTimeGrouping']
+                )->setRuleType(Rule::AUTOFILTER_RULETYPE_DATEGROUP);
+            }
+        }
+    }
+
+    private function readCustomAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
+    {
+        if (isset($filterColumn, $filterColumn->customFilters)) {
+            $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
+            $customFilters = $filterColumn->customFilters;
+            $attributes = $customFilters->attributes();
+            //    Custom filters can an AND or an OR join;
+            //        and there should only ever be one or two entries
+            if ((isset($attributes['and'])) && ((string) $attributes['and'] === '1')) {
+                $column->setJoin(Column::AUTOFILTER_COLUMN_JOIN_AND);
+            }
+            foreach ($customFilters->customFilter as $filterRule) {
+                $attr2 = $filterRule->attributes() ?? ['operator' => '', 'val' => ''];
+                $column->createRule()->setRule(
+                    (string) $attr2['operator'],
+                    (string) $attr2['val']
+                )->setRuleType(Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
+            }
+        }
+    }
+
+    private function readDynamicAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
+    {
+        if (isset($filterColumn, $filterColumn->dynamicFilter)) {
+            $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
+            //    We should only ever have one dynamic filter
+            foreach ($filterColumn->dynamicFilter as $filterRule) {
+                //    Operator is undefined, but always treated as EQUAL
+                $attr2 = $filterRule->attributes() ?? [];
+                $column->createRule()->setRule(
+                    '',
+                    (string) ($attr2['val'] ?? ''),
+                    (string) ($attr2['type'] ?? '')
+                )->setRuleType(Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
+                if (isset($attr2['val'])) {
+                    $column->setAttribute('val', (string) $attr2['val']);
+                }
+                if (isset($attr2['maxVal'])) {
+                    $column->setAttribute('maxVal', (string) $attr2['maxVal']);
+                }
+            }
+        }
+    }
+
+    private function readTopTenAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
+    {
+        if (isset($filterColumn, $filterColumn->top10)) {
+            $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
+            //    We should only ever have one top10 filter
+            foreach ($filterColumn->top10 as $filterRule) {
+                $attr2 = $filterRule->attributes() ?? [];
+                $column->createRule()->setRule(
+                    (
+                        ((isset($attr2['percent'])) && ((string) $attr2['percent'] === '1'))
+                        ? Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT
+                        : Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE
+                    ),
+                    (string) ($attr2['val'] ?? ''),
+                    (
+                        ((isset($attr2['top'])) && ((string) $attr2['top'] === '1'))
+                        ? Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP
+                        : Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
+                    )
+                )->setRuleType(Rule::AUTOFILTER_RULETYPE_TOPTENFILTER);
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
new file mode 100644
index 00000000..beea6bb5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use Stringable;
+
+class BaseParserClass
+{
+    protected static function boolean(mixed $value): bool
+    {
+        if (is_object($value)) {
+            $value = ($value instanceof Stringable) ? ((string) $value) : 'true';
+        }
+
+        if (is_numeric($value)) {
+            return (bool) $value;
+        }
+
+        return $value === 'true' || $value === 'TRUE';
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
new file mode 100644
index 00000000..94d9c6af
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -0,0 +1,1572 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\AxisText;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
+use PhpOffice\PhpSpreadsheet\Chart\GridLines;
+use PhpOffice\PhpSpreadsheet\Chart\Layout;
+use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
+use PhpOffice\PhpSpreadsheet\Chart\Properties as ChartProperties;
+use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use SimpleXMLElement;
+
+class Chart
+{
+    private string $cNamespace;
+
+    private string $aNamespace;
+
+    public function __construct(string $cNamespace = Namespaces::CHART, string $aNamespace = Namespaces::DRAWINGML)
+    {
+        $this->cNamespace = $cNamespace;
+        $this->aNamespace = $aNamespace;
+    }
+
+    private static function getAttributeString(SimpleXMLElement $component, string $name): string|null
+    {
+        $attributes = $component->attributes();
+        if (@isset($attributes[$name])) {
+            return (string) $attributes[$name];
+        }
+
+        return null;
+    }
+
+    private static function getAttributeInteger(SimpleXMLElement $component, string $name): int|null
+    {
+        $attributes = $component->attributes();
+        if (@isset($attributes[$name])) {
+            return (int) $attributes[$name];
+        }
+
+        return null;
+    }
+
+    private static function getAttributeBoolean(SimpleXMLElement $component, string $name): bool|null
+    {
+        $attributes = $component->attributes();
+        if (@isset($attributes[$name])) {
+            $value = (string) $attributes[$name];
+
+            return $value === 'true' || $value === '1';
+        }
+
+        return null;
+    }
+
+    private static function getAttributeFloat(SimpleXMLElement $component, string $name): float|null
+    {
+        $attributes = $component->attributes();
+        if (@isset($attributes[$name])) {
+            return (float) $attributes[$name];
+        }
+
+        return null;
+    }
+
+    public function readChart(SimpleXMLElement $chartElements, string $chartName): \PhpOffice\PhpSpreadsheet\Chart\Chart
+    {
+        $chartElementsC = $chartElements->children($this->cNamespace);
+
+        $XaxisLabel = $YaxisLabel = $legend = $title = null;
+        $dispBlanksAs = null;
+        $plotVisOnly = false;
+        $plotArea = null;
+        $rotX = $rotY = $rAngAx = $perspective = null;
+        $xAxis = new Axis();
+        $yAxis = new Axis();
+        $autoTitleDeleted = null;
+        $chartNoFill = false;
+        $chartBorderLines = null;
+        $chartFillColor = null;
+        $gradientArray = [];
+        $gradientLin = null;
+        $roundedCorners = false;
+        $gapWidth = null;
+        $useUpBars = null;
+        $useDownBars = null;
+        foreach ($chartElementsC as $chartElementKey => $chartElement) {
+            switch ($chartElementKey) {
+                case 'spPr':
+                    $children = $chartElementsC->spPr->children($this->aNamespace);
+                    if (isset($children->noFill)) {
+                        $chartNoFill = true;
+                    }
+                    if (isset($children->solidFill)) {
+                        $chartFillColor = $this->readColor($children->solidFill);
+                    }
+                    if (isset($children->ln)) {
+                        $chartBorderLines = new GridLines();
+                        $this->readLineStyle($chartElementsC, $chartBorderLines);
+                    }
+
+                    break;
+                case 'roundedCorners':
+                    /** @var bool $roundedCorners */
+                    $roundedCorners = self::getAttributeBoolean($chartElementsC->roundedCorners, 'val');
+
+                    break;
+                case 'chart':
+                    foreach ($chartElement as $chartDetailsKey => $chartDetails) {
+                        $chartDetails = Xlsx::testSimpleXml($chartDetails);
+                        switch ($chartDetailsKey) {
+                            case 'autoTitleDeleted':
+                                /** @var bool $autoTitleDeleted */
+                                $autoTitleDeleted = self::getAttributeBoolean($chartElementsC->chart->autoTitleDeleted, 'val');
+
+                                break;
+                            case 'view3D':
+                                $rotX = self::getAttributeInteger($chartDetails->rotX, 'val');
+                                $rotY = self::getAttributeInteger($chartDetails->rotY, 'val');
+                                $rAngAx = self::getAttributeInteger($chartDetails->rAngAx, 'val');
+                                $perspective = self::getAttributeInteger($chartDetails->perspective, 'val');
+
+                                break;
+                            case 'plotArea':
+                                $plotAreaLayout = $XaxisLabel = $YaxisLabel = null;
+                                $plotSeries = $plotAttributes = [];
+                                $catAxRead = false;
+                                $plotNoFill = false;
+                                foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    $chartDetail = Xlsx::testSimpleXml($chartDetail);
+                                    switch ($chartDetailKey) {
+                                        case 'spPr':
+                                            $possibleNoFill = $chartDetails->spPr->children($this->aNamespace);
+                                            if (isset($possibleNoFill->noFill)) {
+                                                $plotNoFill = true;
+                                            }
+                                            if (isset($possibleNoFill->gradFill->gsLst)) {
+                                                foreach ($possibleNoFill->gradFill->gsLst->gs as $gradient) {
+                                                    $gradient = Xlsx::testSimpleXml($gradient);
+                                                    /** @var float $pos */
+                                                    $pos = self::getAttributeFloat($gradient, 'pos');
+                                                    $gradientArray[] = [
+                                                        $pos / ChartProperties::PERCENTAGE_MULTIPLIER,
+                                                        new ChartColor($this->readColor($gradient)),
+                                                    ];
+                                                }
+                                            }
+                                            if (isset($possibleNoFill->gradFill->lin)) {
+                                                $gradientLin = ChartProperties::XmlToAngle((string) self::getAttributeString($possibleNoFill->gradFill->lin, 'ang'));
+                                            }
+
+                                            break;
+                                        case 'layout':
+                                            $plotAreaLayout = $this->chartLayoutDetails($chartDetail);
+
+                                            break;
+                                        case Axis::AXIS_TYPE_CATEGORY:
+                                        case Axis::AXIS_TYPE_DATE:
+                                            $catAxRead = true;
+                                            if (isset($chartDetail->title)) {
+                                                $XaxisLabel = $this->chartTitle($chartDetail->title->children($this->cNamespace));
+                                            }
+                                            $xAxis->setAxisType($chartDetailKey);
+                                            $this->readEffects($chartDetail, $xAxis);
+                                            $this->readLineStyle($chartDetail, $xAxis);
+                                            if (isset($chartDetail->spPr)) {
+                                                $sppr = $chartDetail->spPr->children($this->aNamespace);
+                                                if (isset($sppr->solidFill)) {
+                                                    $axisColorArray = $this->readColor($sppr->solidFill);
+                                                    $xAxis->setFillParameters($axisColorArray['value'], $axisColorArray['alpha'], $axisColorArray['type']);
+                                                }
+                                                if (isset($chartDetail->spPr->ln->noFill)) {
+                                                    $xAxis->setNoFill(true);
+                                                }
+                                            }
+                                            if (isset($chartDetail->majorGridlines)) {
+                                                $majorGridlines = new GridLines();
+                                                if (isset($chartDetail->majorGridlines->spPr)) {
+                                                    $this->readEffects($chartDetail->majorGridlines, $majorGridlines);
+                                                    $this->readLineStyle($chartDetail->majorGridlines, $majorGridlines);
+                                                }
+                                                $xAxis->setMajorGridlines($majorGridlines);
+                                            }
+                                            if (isset($chartDetail->minorGridlines)) {
+                                                $minorGridlines = new GridLines();
+                                                $minorGridlines->activateObject();
+                                                if (isset($chartDetail->minorGridlines->spPr)) {
+                                                    $this->readEffects($chartDetail->minorGridlines, $minorGridlines);
+                                                    $this->readLineStyle($chartDetail->minorGridlines, $minorGridlines);
+                                                }
+                                                $xAxis->setMinorGridlines($minorGridlines);
+                                            }
+                                            $this->setAxisProperties($chartDetail, $xAxis);
+
+                                            break;
+                                        case Axis::AXIS_TYPE_VALUE:
+                                            $whichAxis = null;
+                                            $axPos = null;
+                                            if (isset($chartDetail->axPos)) {
+                                                $axPos = self::getAttributeString($chartDetail->axPos, 'val');
+                                            }
+                                            if ($catAxRead) {
+                                                $whichAxis = $yAxis;
+                                                $yAxis->setAxisType($chartDetailKey);
+                                            } elseif (!empty($axPos)) {
+                                                switch ($axPos) {
+                                                    case 't':
+                                                    case 'b':
+                                                        $whichAxis = $xAxis;
+                                                        $xAxis->setAxisType($chartDetailKey);
+
+                                                        break;
+                                                    case 'r':
+                                                    case 'l':
+                                                        $whichAxis = $yAxis;
+                                                        $yAxis->setAxisType($chartDetailKey);
+
+                                                        break;
+                                                }
+                                            }
+                                            if (isset($chartDetail->title)) {
+                                                $axisLabel = $this->chartTitle($chartDetail->title->children($this->cNamespace));
+
+                                                switch ($axPos) {
+                                                    case 't':
+                                                    case 'b':
+                                                        $XaxisLabel = $axisLabel;
+
+                                                        break;
+                                                    case 'r':
+                                                    case 'l':
+                                                        $YaxisLabel = $axisLabel;
+
+                                                        break;
+                                                }
+                                            }
+                                            $this->readEffects($chartDetail, $whichAxis);
+                                            $this->readLineStyle($chartDetail, $whichAxis);
+                                            if ($whichAxis !== null && isset($chartDetail->spPr)) {
+                                                $sppr = $chartDetail->spPr->children($this->aNamespace);
+                                                if (isset($sppr->solidFill)) {
+                                                    $axisColorArray = $this->readColor($sppr->solidFill);
+                                                    $whichAxis->setFillParameters($axisColorArray['value'], $axisColorArray['alpha'], $axisColorArray['type']);
+                                                }
+                                                if (isset($sppr->ln->noFill)) {
+                                                    $whichAxis->setNoFill(true);
+                                                }
+                                            }
+                                            if ($whichAxis !== null && isset($chartDetail->majorGridlines)) {
+                                                $majorGridlines = new GridLines();
+                                                if (isset($chartDetail->majorGridlines->spPr)) {
+                                                    $this->readEffects($chartDetail->majorGridlines, $majorGridlines);
+                                                    $this->readLineStyle($chartDetail->majorGridlines, $majorGridlines);
+                                                }
+                                                $whichAxis->setMajorGridlines($majorGridlines);
+                                            }
+                                            if ($whichAxis !== null && isset($chartDetail->minorGridlines)) {
+                                                $minorGridlines = new GridLines();
+                                                $minorGridlines->activateObject();
+                                                if (isset($chartDetail->minorGridlines->spPr)) {
+                                                    $this->readEffects($chartDetail->minorGridlines, $minorGridlines);
+                                                    $this->readLineStyle($chartDetail->minorGridlines, $minorGridlines);
+                                                }
+                                                $whichAxis->setMinorGridlines($minorGridlines);
+                                            }
+                                            $this->setAxisProperties($chartDetail, $whichAxis);
+
+                                            break;
+                                        case 'barChart':
+                                        case 'bar3DChart':
+                                            $barDirection = self::getAttributeString($chartDetail->barDir, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotDirection("$barDirection");
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                        case 'lineChart':
+                                        case 'line3DChart':
+                                            $plotSeries[] = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                        case 'areaChart':
+                                        case 'area3DChart':
+                                            $plotSeries[] = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                        case 'doughnutChart':
+                                        case 'pieChart':
+                                        case 'pie3DChart':
+                                            $explosion = self::getAttributeString($chartDetail->ser->explosion, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle("$explosion");
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                        case 'scatterChart':
+                                            /** @var string $scatterStyle */
+                                            $scatterStyle = self::getAttributeString($chartDetail->scatterStyle, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle($scatterStyle);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                        case 'bubbleChart':
+                                            $bubbleScale = self::getAttributeInteger($chartDetail->bubbleScale, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle("$bubbleScale");
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                        case 'radarChart':
+                                            /** @var string $radarStyle */
+                                            $radarStyle = self::getAttributeString($chartDetail->radarStyle, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle($radarStyle);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                        case 'surfaceChart':
+                                        case 'surface3DChart':
+                                            $wireFrame = self::getAttributeBoolean($chartDetail->wireframe, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle("$wireFrame");
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                        case 'stockChart':
+                                            $plotSeries[] = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            if (isset($chartDetail->upDownBars->gapWidth)) {
+                                                $gapWidth = self::getAttributeInteger($chartDetail->upDownBars->gapWidth, 'val');
+                                            }
+                                            if (isset($chartDetail->upDownBars->upBars)) {
+                                                $useUpBars = true;
+                                            }
+                                            if (isset($chartDetail->upDownBars->downBars)) {
+                                                $useDownBars = true;
+                                            }
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
+
+                                            break;
+                                    }
+                                }
+                                if ($plotAreaLayout == null) {
+                                    $plotAreaLayout = new Layout();
+                                }
+                                $plotArea = new PlotArea($plotAreaLayout, $plotSeries);
+                                $this->setChartAttributes($plotAreaLayout, $plotAttributes);
+                                if ($plotNoFill) {
+                                    $plotArea->setNoFill(true);
+                                }
+                                if (!empty($gradientArray)) {
+                                    $plotArea->setGradientFillProperties($gradientArray, $gradientLin);
+                                }
+                                if (is_int($gapWidth)) {
+                                    $plotArea->setGapWidth($gapWidth);
+                                }
+                                if ($useUpBars === true) {
+                                    $plotArea->setUseUpBars(true);
+                                }
+                                if ($useDownBars === true) {
+                                    $plotArea->setUseDownBars(true);
+                                }
+
+                                break;
+                            case 'plotVisOnly':
+                                $plotVisOnly = (bool) self::getAttributeString($chartDetails, 'val');
+
+                                break;
+                            case 'dispBlanksAs':
+                                $dispBlanksAs = self::getAttributeString($chartDetails, 'val');
+
+                                break;
+                            case 'title':
+                                $title = $this->chartTitle($chartDetails);
+
+                                break;
+                            case 'legend':
+                                $legendPos = 'r';
+                                $legendLayout = null;
+                                $legendOverlay = false;
+                                $legendBorderLines = null;
+                                $legendFillColor = null;
+                                $legendText = null;
+                                $addLegendText = false;
+                                foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    $chartDetail = Xlsx::testSimpleXml($chartDetail);
+                                    switch ($chartDetailKey) {
+                                        case 'legendPos':
+                                            $legendPos = self::getAttributeString($chartDetail, 'val');
+
+                                            break;
+                                        case 'overlay':
+                                            $legendOverlay = self::getAttributeBoolean($chartDetail, 'val');
+
+                                            break;
+                                        case 'layout':
+                                            $legendLayout = $this->chartLayoutDetails($chartDetail);
+
+                                            break;
+                                        case 'spPr':
+                                            $children = $chartDetails->spPr->children($this->aNamespace);
+                                            if (isset($children->solidFill)) {
+                                                $legendFillColor = $this->readColor($children->solidFill);
+                                            }
+                                            if (isset($children->ln)) {
+                                                $legendBorderLines = new GridLines();
+                                                $this->readLineStyle($chartDetails, $legendBorderLines);
+                                            }
+
+                                            break;
+                                        case 'txPr':
+                                            $children = $chartDetails->txPr->children($this->aNamespace);
+                                            $addLegendText = false;
+                                            $legendText = new AxisText();
+                                            if (isset($children->p->pPr->defRPr->solidFill)) {
+                                                $colorArray = $this->readColor($children->p->pPr->defRPr->solidFill);
+                                                $legendText->getFillColorObject()->setColorPropertiesArray($colorArray);
+                                                $addLegendText = true;
+                                            }
+                                            if (isset($children->p->pPr->defRPr->effectLst)) {
+                                                $this->readEffects($children->p->pPr->defRPr, $legendText, false);
+                                                $addLegendText = true;
+                                            }
+
+                                            break;
+                                    }
+                                }
+                                $legend = new Legend("$legendPos", $legendLayout, (bool) $legendOverlay);
+                                if ($legendFillColor !== null) {
+                                    $legend->getFillColor()->setColorPropertiesArray($legendFillColor);
+                                }
+                                if ($legendBorderLines !== null) {
+                                    $legend->setBorderLines($legendBorderLines);
+                                }
+                                if ($addLegendText) {
+                                    $legend->setLegendText($legendText);
+                                }
+
+                                break;
+                        }
+                    }
+            }
+        }
+        $chart = new \PhpOffice\PhpSpreadsheet\Chart\Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, (string) $dispBlanksAs, $XaxisLabel, $YaxisLabel, $xAxis, $yAxis);
+        if ($chartNoFill) {
+            $chart->setNoFill(true);
+        }
+        if ($chartFillColor !== null) {
+            $chart->getFillColor()->setColorPropertiesArray($chartFillColor);
+        }
+        if ($chartBorderLines !== null) {
+            $chart->setBorderLines($chartBorderLines);
+        }
+        $chart->setRoundedCorners($roundedCorners);
+        if (is_bool($autoTitleDeleted)) {
+            $chart->setAutoTitleDeleted($autoTitleDeleted);
+        }
+        if (is_int($rotX)) {
+            $chart->setRotX($rotX);
+        }
+        if (is_int($rotY)) {
+            $chart->setRotY($rotY);
+        }
+        if (is_int($rAngAx)) {
+            $chart->setRAngAx($rAngAx);
+        }
+        if (is_int($perspective)) {
+            $chart->setPerspective($perspective);
+        }
+
+        return $chart;
+    }
+
+    private function chartTitle(SimpleXMLElement $titleDetails): Title
+    {
+        $caption = '';
+        $titleLayout = null;
+        $titleOverlay = false;
+        $titleFormula = null;
+        $titleFont = null;
+        foreach ($titleDetails as $titleDetailKey => $chartDetail) {
+            $chartDetail = Xlsx::testSimpleXml($chartDetail);
+            switch ($titleDetailKey) {
+                case 'tx':
+                    $caption = [];
+                    if (isset($chartDetail->rich)) {
+                        $titleDetails = $chartDetail->rich->children($this->aNamespace);
+                        foreach ($titleDetails as $titleKey => $titleDetail) {
+                            $titleDetail = Xlsx::testSimpleXml($titleDetail);
+                            switch ($titleKey) {
+                                case 'p':
+                                    $titleDetailPart = $titleDetail->children($this->aNamespace);
+                                    $caption[] = $this->parseRichText($titleDetailPart);
+                            }
+                        }
+                    } elseif (isset($chartDetail->strRef->strCache)) {
+                        foreach ($chartDetail->strRef->strCache->pt as $pt) {
+                            if (isset($pt->v)) {
+                                $caption[] = (string) $pt->v;
+                            }
+                        }
+                        if (isset($chartDetail->strRef->f)) {
+                            $titleFormula = (string) $chartDetail->strRef->f;
+                        }
+                    }
+
+                    break;
+                case 'overlay':
+                    $titleOverlay = self::getAttributeBoolean($chartDetail, 'val');
+
+                    break;
+                case 'layout':
+                    $titleLayout = $this->chartLayoutDetails($chartDetail);
+
+                    break;
+                case 'txPr':
+                    if (isset($chartDetail->children($this->aNamespace)->p)) {
+                        $titleFont = $this->parseFont($chartDetail->children($this->aNamespace)->p);
+                    }
+
+                    break;
+            }
+        }
+        $title = new Title($caption, $titleLayout, (bool) $titleOverlay);
+        if (!empty($titleFormula)) {
+            $title->setCellReference($titleFormula);
+        }
+        if ($titleFont !== null) {
+            $title->setFont($titleFont);
+        }
+
+        return $title;
+    }
+
+    private function chartLayoutDetails(SimpleXMLElement $chartDetail): ?Layout
+    {
+        if (!isset($chartDetail->manualLayout)) {
+            return null;
+        }
+        $details = $chartDetail->manualLayout->children($this->cNamespace);
+        if ($details === null) {
+            return null;
+        }
+        $layout = [];
+        foreach ($details as $detailKey => $detail) {
+            $detail = Xlsx::testSimpleXml($detail);
+            $layout[$detailKey] = self::getAttributeString($detail, 'val');
+        }
+
+        return new Layout($layout);
+    }
+
+    private function chartDataSeries(SimpleXMLElement $chartDetail, string $plotType): DataSeries
+    {
+        $multiSeriesType = null;
+        $smoothLine = false;
+        $seriesLabel = $seriesCategory = $seriesValues = $plotOrder = $seriesBubbles = [];
+        $plotDirection = null;
+
+        $seriesDetailSet = $chartDetail->children($this->cNamespace);
+        foreach ($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
+            switch ($seriesDetailKey) {
+                case 'grouping':
+                    $multiSeriesType = self::getAttributeString($chartDetail->grouping, 'val');
+
+                    break;
+                case 'ser':
+                    $marker = null;
+                    $seriesIndex = '';
+                    $fillColor = null;
+                    $pointSize = null;
+                    $noFill = false;
+                    $bubble3D = false;
+                    $dptColors = [];
+                    $markerFillColor = null;
+                    $markerBorderColor = null;
+                    $lineStyle = null;
+                    $labelLayout = null;
+                    $trendLines = [];
+                    foreach ($seriesDetails as $seriesKey => $seriesDetail) {
+                        $seriesDetail = Xlsx::testSimpleXml($seriesDetail);
+                        switch ($seriesKey) {
+                            case 'idx':
+                                $seriesIndex = self::getAttributeInteger($seriesDetail, 'val');
+
+                                break;
+                            case 'order':
+                                $seriesOrder = self::getAttributeInteger($seriesDetail, 'val');
+                                if ($seriesOrder !== null) {
+                                    $plotOrder[$seriesIndex] = $seriesOrder;
+                                }
+
+                                break;
+                            case 'tx':
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail);
+                                if ($temp !== null) {
+                                    $seriesLabel[$seriesIndex] = $temp;
+                                }
+
+                                break;
+                            case 'spPr':
+                                $children = $seriesDetail->children($this->aNamespace);
+                                if (isset($children->ln)) {
+                                    $ln = $children->ln;
+                                    if (is_countable($ln->noFill) && count($ln->noFill) === 1) {
+                                        $noFill = true;
+                                    }
+                                    $lineStyle = new GridLines();
+                                    $this->readLineStyle($seriesDetails, $lineStyle);
+                                }
+                                if (isset($children->effectLst)) {
+                                    if ($lineStyle === null) {
+                                        $lineStyle = new GridLines();
+                                    }
+                                    $this->readEffects($seriesDetails, $lineStyle);
+                                }
+                                if (isset($children->solidFill)) {
+                                    $fillColor = new ChartColor($this->readColor($children->solidFill));
+                                }
+
+                                break;
+                            case 'dPt':
+                                $dptIdx = (int) self::getAttributeString($seriesDetail->idx, 'val');
+                                if (isset($seriesDetail->spPr)) {
+                                    $children = $seriesDetail->spPr->children($this->aNamespace);
+                                    if (isset($children->solidFill)) {
+                                        $arrayColors = $this->readColor($children->solidFill);
+                                        $dptColors[$dptIdx] = new ChartColor($arrayColors);
+                                    }
+                                }
+
+                                break;
+                            case 'trendline':
+                                $trendLine = new TrendLine();
+                                $this->readLineStyle($seriesDetail, $trendLine);
+                                $trendLineType = self::getAttributeString($seriesDetail->trendlineType, 'val');
+                                $dispRSqr = self::getAttributeBoolean($seriesDetail->dispRSqr, 'val');
+                                $dispEq = self::getAttributeBoolean($seriesDetail->dispEq, 'val');
+                                $order = self::getAttributeInteger($seriesDetail->order, 'val');
+                                $period = self::getAttributeInteger($seriesDetail->period, 'val');
+                                $forward = self::getAttributeFloat($seriesDetail->forward, 'val');
+                                $backward = self::getAttributeFloat($seriesDetail->backward, 'val');
+                                $intercept = self::getAttributeFloat($seriesDetail->intercept, 'val');
+                                $name = (string) $seriesDetail->name;
+                                $trendLine->setTrendLineProperties(
+                                    $trendLineType,
+                                    $order,
+                                    $period,
+                                    $dispRSqr,
+                                    $dispEq,
+                                    $backward,
+                                    $forward,
+                                    $intercept,
+                                    $name
+                                );
+                                $trendLines[] = $trendLine;
+
+                                break;
+                            case 'marker':
+                                $marker = self::getAttributeString($seriesDetail->symbol, 'val');
+                                $pointSize = self::getAttributeString($seriesDetail->size, 'val');
+                                $pointSize = is_numeric($pointSize) ? ((int) $pointSize) : null;
+                                if (isset($seriesDetail->spPr)) {
+                                    $children = $seriesDetail->spPr->children($this->aNamespace);
+                                    if (isset($children->solidFill)) {
+                                        $markerFillColor = $this->readColor($children->solidFill);
+                                    }
+                                    if (isset($children->ln->solidFill)) {
+                                        $markerBorderColor = $this->readColor($children->ln->solidFill);
+                                    }
+                                }
+
+                                break;
+                            case 'smooth':
+                                $smoothLine = self::getAttributeBoolean($seriesDetail, 'val') ?? false;
+
+                                break;
+                            case 'cat':
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail);
+                                if ($temp !== null) {
+                                    $seriesCategory[$seriesIndex] = $temp;
+                                }
+
+                                break;
+                            case 'val':
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+                                if ($temp !== null) {
+                                    $seriesValues[$seriesIndex] = $temp;
+                                }
+
+                                break;
+                            case 'xVal':
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+                                if ($temp !== null) {
+                                    $seriesCategory[$seriesIndex] = $temp;
+                                }
+
+                                break;
+                            case 'yVal':
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+                                if ($temp !== null) {
+                                    $seriesValues[$seriesIndex] = $temp;
+                                }
+
+                                break;
+                            case 'bubbleSize':
+                                $seriesBubble = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+                                if ($seriesBubble !== null) {
+                                    $seriesBubbles[$seriesIndex] = $seriesBubble;
+                                }
+
+                                break;
+                            case 'bubble3D':
+                                $bubble3D = self::getAttributeBoolean($seriesDetail, 'val');
+
+                                break;
+                            case 'dLbls':
+                                $labelLayout = new Layout($this->readChartAttributes($seriesDetails));
+
+                                break;
+                        }
+                    }
+                    if ($labelLayout) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setLabelLayout($labelLayout);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setLabelLayout($labelLayout);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setLabelLayout($labelLayout);
+                        }
+                    }
+                    if ($noFill) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setScatterLines(false);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setScatterLines(false);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setScatterLines(false);
+                        }
+                    }
+                    if ($lineStyle !== null) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->copyLineStyles($lineStyle);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->copyLineStyles($lineStyle);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->copyLineStyles($lineStyle);
+                        }
+                    }
+                    if ($bubble3D) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setBubble3D($bubble3D);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setBubble3D($bubble3D);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setBubble3D($bubble3D);
+                        }
+                    }
+                    if (!empty($dptColors)) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setFillColor($dptColors);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setFillColor($dptColors);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setFillColor($dptColors);
+                        }
+                    }
+                    if ($markerFillColor !== null) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->getMarkerFillColor()->setColorPropertiesArray($markerFillColor);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->getMarkerFillColor()->setColorPropertiesArray($markerFillColor);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->getMarkerFillColor()->setColorPropertiesArray($markerFillColor);
+                        }
+                    }
+                    if ($markerBorderColor !== null) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->getMarkerBorderColor()->setColorPropertiesArray($markerBorderColor);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->getMarkerBorderColor()->setColorPropertiesArray($markerBorderColor);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->getMarkerBorderColor()->setColorPropertiesArray($markerBorderColor);
+                        }
+                    }
+                    if ($smoothLine) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setSmoothLine(true);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setSmoothLine(true);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setSmoothLine(true);
+                        }
+                    }
+                    if (!empty($trendLines)) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setTrendLines($trendLines);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setTrendLines($trendLines);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setTrendLines($trendLines);
+                        }
+                    }
+            }
+        }
+        $series = new DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $plotDirection, $smoothLine);
+        $series->setPlotBubbleSizes($seriesBubbles);
+
+        return $series;
+    }
+
+    private function chartDataSeriesValueSet(SimpleXMLElement $seriesDetail, ?string $marker = null, ?ChartColor $fillColor = null, ?string $pointSize = null): ?DataSeriesValues
+    {
+        if (isset($seriesDetail->strRef)) {
+            $seriesSource = (string) $seriesDetail->strRef->f;
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
+
+            if (isset($seriesDetail->strRef->strCache)) {
+                $seriesData = $this->chartDataSeriesValues($seriesDetail->strRef->strCache->children($this->cNamespace), 's');
+                $seriesValues
+                    ->setFormatCode($seriesData['formatCode'])
+                    ->setDataValues($seriesData['dataValues']);
+            }
+
+            return $seriesValues;
+        } elseif (isset($seriesDetail->numRef)) {
+            $seriesSource = (string) $seriesDetail->numRef->f;
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
+            if (isset($seriesDetail->numRef->numCache)) {
+                $seriesData = $this->chartDataSeriesValues($seriesDetail->numRef->numCache->children($this->cNamespace));
+                $seriesValues
+                    ->setFormatCode($seriesData['formatCode'])
+                    ->setDataValues($seriesData['dataValues']);
+            }
+
+            return $seriesValues;
+        } elseif (isset($seriesDetail->multiLvlStrRef)) {
+            $seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
+
+            if (isset($seriesDetail->multiLvlStrRef->multiLvlStrCache)) {
+                $seriesData = $this->chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($this->cNamespace), 's');
+                $seriesValues
+                    ->setFormatCode($seriesData['formatCode'])
+                    ->setDataValues($seriesData['dataValues']);
+            }
+
+            return $seriesValues;
+        } elseif (isset($seriesDetail->multiLvlNumRef)) {
+            $seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
+
+            if (isset($seriesDetail->multiLvlNumRef->multiLvlNumCache)) {
+                $seriesData = $this->chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($this->cNamespace), 's');
+                $seriesValues
+                    ->setFormatCode($seriesData['formatCode'])
+                    ->setDataValues($seriesData['dataValues']);
+            }
+
+            return $seriesValues;
+        }
+
+        if (isset($seriesDetail->v)) {
+            return new DataSeriesValues(
+                DataSeriesValues::DATASERIES_TYPE_STRING,
+                null,
+                null,
+                1,
+                [(string) $seriesDetail->v]
+            );
+        }
+
+        return null;
+    }
+
+    private function chartDataSeriesValues(SimpleXMLElement $seriesValueSet, string $dataType = 'n'): array
+    {
+        $seriesVal = [];
+        $formatCode = '';
+        $pointCount = 0;
+
+        foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
+            $seriesValue = Xlsx::testSimpleXml($seriesValue);
+            switch ($seriesValueIdx) {
+                case 'ptCount':
+                    $pointCount = self::getAttributeInteger($seriesValue, 'val');
+
+                    break;
+                case 'formatCode':
+                    $formatCode = (string) $seriesValue;
+
+                    break;
+                case 'pt':
+                    $pointVal = self::getAttributeInteger($seriesValue, 'idx');
+                    if ($dataType == 's') {
+                        $seriesVal[$pointVal] = (string) $seriesValue->v;
+                    } elseif ((string) $seriesValue->v === ExcelError::NA()) {
+                        $seriesVal[$pointVal] = null;
+                    } else {
+                        $seriesVal[$pointVal] = (float) $seriesValue->v;
+                    }
+
+                    break;
+            }
+        }
+
+        return [
+            'formatCode' => $formatCode,
+            'pointCount' => $pointCount,
+            'dataValues' => $seriesVal,
+        ];
+    }
+
+    private function chartDataSeriesValuesMultiLevel(SimpleXMLElement $seriesValueSet, string $dataType = 'n'): array
+    {
+        $seriesVal = [];
+        $formatCode = '';
+        $pointCount = 0;
+
+        foreach ($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
+            foreach ($seriesLevel as $seriesValueIdx => $seriesValue) {
+                $seriesValue = Xlsx::testSimpleXml($seriesValue);
+                switch ($seriesValueIdx) {
+                    case 'ptCount':
+                        $pointCount = self::getAttributeInteger($seriesValue, 'val');
+
+                        break;
+                    case 'formatCode':
+                        $formatCode = (string) $seriesValue;
+
+                        break;
+                    case 'pt':
+                        $pointVal = self::getAttributeInteger($seriesValue, 'idx');
+                        if ($dataType == 's') {
+                            $seriesVal[$pointVal][] = (string) $seriesValue->v;
+                        } elseif ((string) $seriesValue->v === ExcelError::NA()) {
+                            $seriesVal[$pointVal] = null;
+                        } else {
+                            $seriesVal[$pointVal][] = (float) $seriesValue->v;
+                        }
+
+                        break;
+                }
+            }
+        }
+
+        return [
+            'formatCode' => $formatCode,
+            'pointCount' => $pointCount,
+            'dataValues' => $seriesVal,
+        ];
+    }
+
+    private function parseRichText(SimpleXMLElement $titleDetailPart): RichText
+    {
+        $value = new RichText();
+        $defaultFontSize = null;
+        $defaultBold = null;
+        $defaultItalic = null;
+        $defaultUnderscore = null;
+        $defaultStrikethrough = null;
+        $defaultBaseline = null;
+        $defaultFontName = null;
+        $defaultLatin = null;
+        $defaultEastAsian = null;
+        $defaultComplexScript = null;
+        $defaultFontColor = null;
+        if (isset($titleDetailPart->pPr->defRPr)) {
+            $defaultFontSize = self::getAttributeInteger($titleDetailPart->pPr->defRPr, 'sz');
+            $defaultBold = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'b');
+            $defaultItalic = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'i');
+            $defaultUnderscore = self::getAttributeString($titleDetailPart->pPr->defRPr, 'u');
+            $defaultStrikethrough = self::getAttributeString($titleDetailPart->pPr->defRPr, 'strike');
+            $defaultBaseline = self::getAttributeInteger($titleDetailPart->pPr->defRPr, 'baseline');
+            if (isset($titleDetailPart->defRPr->rFont['val'])) {
+                $defaultFontName = (string) $titleDetailPart->defRPr->rFont['val'];
+            }
+            if (isset($titleDetailPart->pPr->defRPr->latin)) {
+                $defaultLatin = self::getAttributeString($titleDetailPart->pPr->defRPr->latin, 'typeface');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->ea)) {
+                $defaultEastAsian = self::getAttributeString($titleDetailPart->pPr->defRPr->ea, 'typeface');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->cs)) {
+                $defaultComplexScript = self::getAttributeString($titleDetailPart->pPr->defRPr->cs, 'typeface');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->solidFill)) {
+                $defaultFontColor = $this->readColor($titleDetailPart->pPr->defRPr->solidFill);
+            }
+        }
+        foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
+            if (
+                (string) $titleDetailElementKey !== 'r'
+                || !isset($titleDetailElement->t)
+            ) {
+                continue;
+            }
+            $objText = $value->createTextRun((string) $titleDetailElement->t);
+            if ($objText->getFont() === null) {
+                // @codeCoverageIgnoreStart
+                continue;
+                // @codeCoverageIgnoreEnd
+            }
+            $fontSize = null;
+            $bold = null;
+            $italic = null;
+            $underscore = null;
+            $strikethrough = null;
+            $baseline = null;
+            $fontName = null;
+            $latinName = null;
+            $eastAsian = null;
+            $complexScript = null;
+            $fontColor = null;
+            $underlineColor = null;
+            if (isset($titleDetailElement->rPr)) {
+                // not used now, not sure it ever was, grandfathering
+                if (isset($titleDetailElement->rPr->rFont['val'])) {
+                    // @codeCoverageIgnoreStart
+                    $fontName = (string) $titleDetailElement->rPr->rFont['val'];
+                    // @codeCoverageIgnoreEnd
+                }
+                if (isset($titleDetailElement->rPr->latin)) {
+                    $latinName = self::getAttributeString($titleDetailElement->rPr->latin, 'typeface');
+                }
+                if (isset($titleDetailElement->rPr->ea)) {
+                    $eastAsian = self::getAttributeString($titleDetailElement->rPr->ea, 'typeface');
+                }
+                if (isset($titleDetailElement->rPr->cs)) {
+                    $complexScript = self::getAttributeString($titleDetailElement->rPr->cs, 'typeface');
+                }
+                $fontSize = self::getAttributeInteger($titleDetailElement->rPr, 'sz');
+
+                // not used now, not sure it ever was, grandfathering
+                if (isset($titleDetailElement->rPr->solidFill)) {
+                    $fontColor = $this->readColor($titleDetailElement->rPr->solidFill);
+                }
+
+                $bold = self::getAttributeBoolean($titleDetailElement->rPr, 'b');
+                $italic = self::getAttributeBoolean($titleDetailElement->rPr, 'i');
+                $baseline = self::getAttributeInteger($titleDetailElement->rPr, 'baseline');
+                $underscore = self::getAttributeString($titleDetailElement->rPr, 'u');
+                if (isset($titleDetailElement->rPr->uFill->solidFill)) {
+                    $underlineColor = $this->readColor($titleDetailElement->rPr->uFill->solidFill);
+                }
+
+                $strikethrough = self::getAttributeString($titleDetailElement->rPr, 'strike');
+            }
+
+            $fontFound = false;
+            $latinName = $latinName ?? $defaultLatin;
+            if ($latinName !== null) {
+                $objText->getFont()->setLatin($latinName);
+                $fontFound = true;
+            }
+            $eastAsian = $eastAsian ?? $defaultEastAsian;
+            if ($eastAsian !== null) {
+                $objText->getFont()->setEastAsian($eastAsian);
+                $fontFound = true;
+            }
+            $complexScript = $complexScript ?? $defaultComplexScript;
+            if ($complexScript !== null) {
+                $objText->getFont()->setComplexScript($complexScript);
+                $fontFound = true;
+            }
+            $fontName = $fontName ?? $defaultFontName;
+            if ($fontName !== null) {
+                // @codeCoverageIgnoreStart
+                $objText->getFont()->setName($fontName);
+                $fontFound = true;
+                // @codeCoverageIgnoreEnd
+            }
+
+            $fontSize = $fontSize ?? $defaultFontSize;
+            if (is_int($fontSize)) {
+                $objText->getFont()->setSize(floor($fontSize / 100));
+                $fontFound = true;
+            } else {
+                $objText->getFont()->setSize(null, true);
+            }
+
+            $fontColor = $fontColor ?? $defaultFontColor;
+            if (!empty($fontColor)) {
+                $objText->getFont()->setChartColor($fontColor);
+                $fontFound = true;
+            }
+
+            $bold = $bold ?? $defaultBold;
+            if ($bold !== null) {
+                $objText->getFont()->setBold($bold);
+                $fontFound = true;
+            }
+
+            $italic = $italic ?? $defaultItalic;
+            if ($italic !== null) {
+                $objText->getFont()->setItalic($italic);
+                $fontFound = true;
+            }
+
+            $baseline = $baseline ?? $defaultBaseline;
+            if ($baseline !== null) {
+                $objText->getFont()->setBaseLine($baseline);
+                if ($baseline > 0) {
+                    $objText->getFont()->setSuperscript(true);
+                } elseif ($baseline < 0) {
+                    $objText->getFont()->setSubscript(true);
+                }
+                $fontFound = true;
+            }
+
+            $underscore = $underscore ?? $defaultUnderscore;
+            if ($underscore !== null) {
+                if ($underscore == 'sng') {
+                    $objText->getFont()->setUnderline(Font::UNDERLINE_SINGLE);
+                } elseif ($underscore == 'dbl') {
+                    $objText->getFont()->setUnderline(Font::UNDERLINE_DOUBLE);
+                } elseif ($underscore !== '') {
+                    $objText->getFont()->setUnderline($underscore);
+                } else {
+                    $objText->getFont()->setUnderline(Font::UNDERLINE_NONE);
+                }
+                $fontFound = true;
+                if ($underlineColor) {
+                    $objText->getFont()->setUnderlineColor($underlineColor);
+                }
+            }
+
+            $strikethrough = $strikethrough ?? $defaultStrikethrough;
+            if ($strikethrough !== null) {
+                $objText->getFont()->setStrikeType($strikethrough);
+                if ($strikethrough == 'noStrike') {
+                    $objText->getFont()->setStrikethrough(false);
+                } else {
+                    $objText->getFont()->setStrikethrough(true);
+                }
+                $fontFound = true;
+            }
+            if ($fontFound === false) {
+                $objText->setFont(null);
+            }
+        }
+
+        return $value;
+    }
+
+    private function parseFont(SimpleXMLElement $titleDetailPart): ?Font
+    {
+        if (!isset($titleDetailPart->pPr->defRPr)) {
+            return null;
+        }
+        $fontArray = [];
+        $fontArray['size'] = self::getAttributeInteger($titleDetailPart->pPr->defRPr, 'sz');
+        $fontArray['bold'] = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'b');
+        $fontArray['italic'] = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'i');
+        $fontArray['underscore'] = self::getAttributeString($titleDetailPart->pPr->defRPr, 'u');
+        $fontArray['strikethrough'] = self::getAttributeString($titleDetailPart->pPr->defRPr, 'strike');
+        $fontArray['cap'] = self::getAttributeString($titleDetailPart->pPr->defRPr, 'cap');
+
+        if (isset($titleDetailPart->pPr->defRPr->latin)) {
+            $fontArray['latin'] = self::getAttributeString($titleDetailPart->pPr->defRPr->latin, 'typeface');
+        }
+        if (isset($titleDetailPart->pPr->defRPr->ea)) {
+            $fontArray['eastAsian'] = self::getAttributeString($titleDetailPart->pPr->defRPr->ea, 'typeface');
+        }
+        if (isset($titleDetailPart->pPr->defRPr->cs)) {
+            $fontArray['complexScript'] = self::getAttributeString($titleDetailPart->pPr->defRPr->cs, 'typeface');
+        }
+        if (isset($titleDetailPart->pPr->defRPr->solidFill)) {
+            $fontArray['chartColor'] = new ChartColor($this->readColor($titleDetailPart->pPr->defRPr->solidFill));
+        }
+        $font = new Font();
+        $font->setSize(null, true);
+        $font->applyFromArray($fontArray);
+
+        return $font;
+    }
+
+    private function readChartAttributes(?SimpleXMLElement $chartDetail): array
+    {
+        $plotAttributes = [];
+        if (isset($chartDetail->dLbls)) {
+            if (isset($chartDetail->dLbls->dLblPos)) {
+                $plotAttributes['dLblPos'] = self::getAttributeString($chartDetail->dLbls->dLblPos, 'val');
+            }
+            if (isset($chartDetail->dLbls->numFmt)) {
+                $plotAttributes['numFmtCode'] = self::getAttributeString($chartDetail->dLbls->numFmt, 'formatCode');
+                $plotAttributes['numFmtLinked'] = self::getAttributeBoolean($chartDetail->dLbls->numFmt, 'sourceLinked');
+            }
+            if (isset($chartDetail->dLbls->showLegendKey)) {
+                $plotAttributes['showLegendKey'] = self::getAttributeString($chartDetail->dLbls->showLegendKey, 'val');
+            }
+            if (isset($chartDetail->dLbls->showVal)) {
+                $plotAttributes['showVal'] = self::getAttributeString($chartDetail->dLbls->showVal, 'val');
+            }
+            if (isset($chartDetail->dLbls->showCatName)) {
+                $plotAttributes['showCatName'] = self::getAttributeString($chartDetail->dLbls->showCatName, 'val');
+            }
+            if (isset($chartDetail->dLbls->showSerName)) {
+                $plotAttributes['showSerName'] = self::getAttributeString($chartDetail->dLbls->showSerName, 'val');
+            }
+            if (isset($chartDetail->dLbls->showPercent)) {
+                $plotAttributes['showPercent'] = self::getAttributeString($chartDetail->dLbls->showPercent, 'val');
+            }
+            if (isset($chartDetail->dLbls->showBubbleSize)) {
+                $plotAttributes['showBubbleSize'] = self::getAttributeString($chartDetail->dLbls->showBubbleSize, 'val');
+            }
+            if (isset($chartDetail->dLbls->showLeaderLines)) {
+                $plotAttributes['showLeaderLines'] = self::getAttributeString($chartDetail->dLbls->showLeaderLines, 'val');
+            }
+            if (isset($chartDetail->dLbls->spPr)) {
+                $sppr = $chartDetail->dLbls->spPr->children($this->aNamespace);
+                if (isset($sppr->solidFill)) {
+                    $plotAttributes['labelFillColor'] = new ChartColor($this->readColor($sppr->solidFill));
+                }
+                if (isset($sppr->ln->solidFill)) {
+                    $plotAttributes['labelBorderColor'] = new ChartColor($this->readColor($sppr->ln->solidFill));
+                }
+            }
+            if (isset($chartDetail->dLbls->txPr)) {
+                $txpr = $chartDetail->dLbls->txPr->children($this->aNamespace);
+                if (isset($txpr->p)) {
+                    $plotAttributes['labelFont'] = $this->parseFont($txpr->p);
+                    if (isset($txpr->p->pPr->defRPr->effectLst)) {
+                        $labelEffects = new GridLines();
+                        $this->readEffects($txpr->p->pPr->defRPr, $labelEffects, false);
+                        $plotAttributes['labelEffects'] = $labelEffects;
+                    }
+                }
+            }
+        }
+
+        return $plotAttributes;
+    }
+
+    private function setChartAttributes(Layout $plotArea, array $plotAttributes): void
+    {
+        foreach ($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
+            switch ($plotAttributeKey) {
+                case 'showLegendKey':
+                    $plotArea->setShowLegendKey($plotAttributeValue);
+
+                    break;
+                case 'showVal':
+                    $plotArea->setShowVal($plotAttributeValue);
+
+                    break;
+                case 'showCatName':
+                    $plotArea->setShowCatName($plotAttributeValue);
+
+                    break;
+                case 'showSerName':
+                    $plotArea->setShowSerName($plotAttributeValue);
+
+                    break;
+                case 'showPercent':
+                    $plotArea->setShowPercent($plotAttributeValue);
+
+                    break;
+                case 'showBubbleSize':
+                    $plotArea->setShowBubbleSize($plotAttributeValue);
+
+                    break;
+                case 'showLeaderLines':
+                    $plotArea->setShowLeaderLines($plotAttributeValue);
+
+                    break;
+            }
+        }
+    }
+
+    private function readEffects(SimpleXMLElement $chartDetail, ?ChartProperties $chartObject, bool $getSppr = true): void
+    {
+        if (!isset($chartObject)) {
+            return;
+        }
+        if ($getSppr) {
+            if (!isset($chartDetail->spPr)) {
+                return;
+            }
+            $sppr = $chartDetail->spPr->children($this->aNamespace);
+        } else {
+            $sppr = $chartDetail;
+        }
+        if (isset($sppr->effectLst->glow)) {
+            $axisGlowSize = (float) self::getAttributeInteger($sppr->effectLst->glow, 'rad') / ChartProperties::POINTS_WIDTH_MULTIPLIER;
+            if ($axisGlowSize != 0.0) {
+                $colorArray = $this->readColor($sppr->effectLst->glow);
+                $chartObject->setGlowProperties($axisGlowSize, $colorArray['value'], $colorArray['alpha'], $colorArray['type']);
+            }
+        }
+
+        if (isset($sppr->effectLst->softEdge)) {
+            $softEdgeSize = self::getAttributeString($sppr->effectLst->softEdge, 'rad');
+            if (is_numeric($softEdgeSize)) {
+                $chartObject->setSoftEdges((float) ChartProperties::xmlToPoints($softEdgeSize));
+            }
+        }
+
+        $type = '';
+        foreach (self::SHADOW_TYPES as $shadowType) {
+            if (isset($sppr->effectLst->$shadowType)) {
+                $type = $shadowType;
+
+                break;
+            }
+        }
+        if ($type !== '') {
+            $blur = self::getAttributeString($sppr->effectLst->$type, 'blurRad');
+            $blur = is_numeric($blur) ? ChartProperties::xmlToPoints($blur) : null;
+            $dist = self::getAttributeString($sppr->effectLst->$type, 'dist');
+            $dist = is_numeric($dist) ? ChartProperties::xmlToPoints($dist) : null;
+            $direction = self::getAttributeString($sppr->effectLst->$type, 'dir');
+            $direction = is_numeric($direction) ? ChartProperties::xmlToAngle($direction) : null;
+            $algn = self::getAttributeString($sppr->effectLst->$type, 'algn');
+            $rot = self::getAttributeString($sppr->effectLst->$type, 'rotWithShape');
+            $size = [];
+            foreach (['sx', 'sy'] as $sizeType) {
+                $sizeValue = self::getAttributeString($sppr->effectLst->$type, $sizeType);
+                if (is_numeric($sizeValue)) {
+                    $size[$sizeType] = ChartProperties::xmlToTenthOfPercent((string) $sizeValue);
+                } else {
+                    $size[$sizeType] = null;
+                }
+            }
+            foreach (['kx', 'ky'] as $sizeType) {
+                $sizeValue = self::getAttributeString($sppr->effectLst->$type, $sizeType);
+                if (is_numeric($sizeValue)) {
+                    $size[$sizeType] = ChartProperties::xmlToAngle((string) $sizeValue);
+                } else {
+                    $size[$sizeType] = null;
+                }
+            }
+            $colorArray = $this->readColor($sppr->effectLst->$type);
+            $chartObject
+                ->setShadowProperty('effect', $type)
+                ->setShadowProperty('blur', $blur)
+                ->setShadowProperty('direction', $direction)
+                ->setShadowProperty('distance', $dist)
+                ->setShadowProperty('algn', $algn)
+                ->setShadowProperty('rotWithShape', $rot)
+                ->setShadowProperty('size', $size)
+                ->setShadowProperty('color', $colorArray);
+        }
+    }
+
+    private const SHADOW_TYPES = [
+        'outerShdw',
+        'innerShdw',
+    ];
+
+    private function readColor(SimpleXMLElement $colorXml): array
+    {
+        $result = [
+            'type' => null,
+            'value' => null,
+            'alpha' => null,
+            'brightness' => null,
+        ];
+        foreach (ChartColor::EXCEL_COLOR_TYPES as $type) {
+            if (isset($colorXml->$type)) {
+                $result['type'] = $type;
+                $result['value'] = self::getAttributeString($colorXml->$type, 'val');
+                if (isset($colorXml->$type->alpha)) {
+                    $alpha = self::getAttributeString($colorXml->$type->alpha, 'val');
+                    if (is_numeric($alpha)) {
+                        $result['alpha'] = ChartColor::alphaFromXml($alpha);
+                    }
+                }
+                if (isset($colorXml->$type->lumMod)) {
+                    $brightness = self::getAttributeString($colorXml->$type->lumMod, 'val');
+                    if (is_numeric($brightness)) {
+                        $result['brightness'] = ChartColor::alphaFromXml($brightness);
+                    }
+                }
+
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    private function readLineStyle(SimpleXMLElement $chartDetail, ?ChartProperties $chartObject): void
+    {
+        if (!isset($chartObject, $chartDetail->spPr)) {
+            return;
+        }
+        $sppr = $chartDetail->spPr->children($this->aNamespace);
+
+        if (!isset($sppr->ln)) {
+            return;
+        }
+        $lineWidth = null;
+        $lineWidthTemp = self::getAttributeString($sppr->ln, 'w');
+        if (is_numeric($lineWidthTemp)) {
+            $lineWidth = ChartProperties::xmlToPoints($lineWidthTemp);
+        }
+        /** @var string $compoundType */
+        $compoundType = self::getAttributeString($sppr->ln, 'cmpd');
+        /** @var string $dashType */
+        $dashType = self::getAttributeString($sppr->ln->prstDash, 'val');
+        /** @var string $capType */
+        $capType = self::getAttributeString($sppr->ln, 'cap');
+        if (isset($sppr->ln->miter)) {
+            $joinType = ChartProperties::LINE_STYLE_JOIN_MITER;
+        } elseif (isset($sppr->ln->bevel)) {
+            $joinType = ChartProperties::LINE_STYLE_JOIN_BEVEL;
+        } else {
+            $joinType = '';
+        }
+        $headArrowSize = 0;
+        $endArrowSize = 0;
+        $headArrowType = self::getAttributeString($sppr->ln->headEnd, 'type');
+        $headArrowWidth = self::getAttributeString($sppr->ln->headEnd, 'w');
+        $headArrowLength = self::getAttributeString($sppr->ln->headEnd, 'len');
+        $endArrowType = self::getAttributeString($sppr->ln->tailEnd, 'type');
+        $endArrowWidth = self::getAttributeString($sppr->ln->tailEnd, 'w');
+        $endArrowLength = self::getAttributeString($sppr->ln->tailEnd, 'len');
+        $chartObject->setLineStyleProperties(
+            $lineWidth,
+            $compoundType,
+            $dashType,
+            $capType,
+            $joinType,
+            $headArrowType,
+            $headArrowSize,
+            $endArrowType,
+            $endArrowSize,
+            $headArrowWidth,
+            $headArrowLength,
+            $endArrowWidth,
+            $endArrowLength
+        );
+        $colorArray = $this->readColor($sppr->ln->solidFill);
+        $chartObject->getLineColor()->setColorPropertiesArray($colorArray);
+    }
+
+    private function setAxisProperties(SimpleXMLElement $chartDetail, ?Axis $whichAxis): void
+    {
+        if (!isset($whichAxis)) {
+            return;
+        }
+        if (isset($chartDetail->delete)) {
+            $whichAxis->setAxisOption('hidden', (string) self::getAttributeString($chartDetail->delete, 'val'));
+        }
+        if (isset($chartDetail->numFmt)) {
+            $whichAxis->setAxisNumberProperties(
+                (string) self::getAttributeString($chartDetail->numFmt, 'formatCode'),
+                null,
+                (int) self::getAttributeInteger($chartDetail->numFmt, 'sourceLinked')
+            );
+        }
+        if (isset($chartDetail->crossBetween)) {
+            $whichAxis->setCrossBetween((string) self::getAttributeString($chartDetail->crossBetween, 'val'));
+        }
+        if (isset($chartDetail->dispUnits, $chartDetail->dispUnits->builtInUnit)) {
+            $whichAxis->setAxisOption('dispUnitsBuiltIn', (string) self::getAttributeString($chartDetail->dispUnits->builtInUnit, 'val'));
+            if (isset($chartDetail->dispUnits->dispUnitsLbl)) {
+                $whichAxis->setDispUnitsTitle(new Title());
+                // TODO parse title elements
+            }
+        }
+        if (isset($chartDetail->majorTickMark)) {
+            $whichAxis->setAxisOption('major_tick_mark', (string) self::getAttributeString($chartDetail->majorTickMark, 'val'));
+        }
+        if (isset($chartDetail->minorTickMark)) {
+            $whichAxis->setAxisOption('minor_tick_mark', (string) self::getAttributeString($chartDetail->minorTickMark, 'val'));
+        }
+        if (isset($chartDetail->tickLblPos)) {
+            $whichAxis->setAxisOption('axis_labels', (string) self::getAttributeString($chartDetail->tickLblPos, 'val'));
+        }
+        if (isset($chartDetail->crosses)) {
+            $whichAxis->setAxisOption('horizontal_crosses', (string) self::getAttributeString($chartDetail->crosses, 'val'));
+        }
+        if (isset($chartDetail->crossesAt)) {
+            $whichAxis->setAxisOption('horizontal_crosses_value', (string) self::getAttributeString($chartDetail->crossesAt, 'val'));
+        }
+        if (isset($chartDetail->scaling->logBase)) {
+            $whichAxis->setAxisOption('logBase', (string) self::getAttributeString($chartDetail->scaling->logBase, 'val'));
+        }
+        if (isset($chartDetail->scaling->orientation)) {
+            $whichAxis->setAxisOption('orientation', (string) self::getAttributeString($chartDetail->scaling->orientation, 'val'));
+        }
+        if (isset($chartDetail->scaling->max)) {
+            $whichAxis->setAxisOption('maximum', (string) self::getAttributeString($chartDetail->scaling->max, 'val'));
+        }
+        if (isset($chartDetail->scaling->min)) {
+            $whichAxis->setAxisOption('minimum', (string) self::getAttributeString($chartDetail->scaling->min, 'val'));
+        }
+        if (isset($chartDetail->scaling->min)) {
+            $whichAxis->setAxisOption('minimum', (string) self::getAttributeString($chartDetail->scaling->min, 'val'));
+        }
+        if (isset($chartDetail->majorUnit)) {
+            $whichAxis->setAxisOption('major_unit', (string) self::getAttributeString($chartDetail->majorUnit, 'val'));
+        }
+        if (isset($chartDetail->minorUnit)) {
+            $whichAxis->setAxisOption('minor_unit', (string) self::getAttributeString($chartDetail->minorUnit, 'val'));
+        }
+        if (isset($chartDetail->baseTimeUnit)) {
+            $whichAxis->setAxisOption('baseTimeUnit', (string) self::getAttributeString($chartDetail->baseTimeUnit, 'val'));
+        }
+        if (isset($chartDetail->majorTimeUnit)) {
+            $whichAxis->setAxisOption('majorTimeUnit', (string) self::getAttributeString($chartDetail->majorTimeUnit, 'val'));
+        }
+        if (isset($chartDetail->minorTimeUnit)) {
+            $whichAxis->setAxisOption('minorTimeUnit', (string) self::getAttributeString($chartDetail->minorTimeUnit, 'val'));
+        }
+        if (isset($chartDetail->txPr)) {
+            $children = $chartDetail->txPr->children($this->aNamespace);
+            $addAxisText = false;
+            $axisText = new AxisText();
+            if (isset($children->bodyPr)) {
+                $textRotation = self::getAttributeString($children->bodyPr, 'rot');
+                if (is_numeric($textRotation)) {
+                    $axisText->setRotation((int) ChartProperties::xmlToAngle($textRotation));
+                    $addAxisText = true;
+                }
+            }
+            if (isset($children->p->pPr->defRPr)) {
+                $font = $this->parseFont($children->p);
+                if ($font !== null) {
+                    $axisText->setFont($font);
+                    $addAxisText = true;
+                }
+            }
+            if (isset($children->p->pPr->defRPr->effectLst)) {
+                $this->readEffects($children->p->pPr->defRPr, $axisText, false);
+                $addAxisText = true;
+            }
+            if ($addAxisText) {
+                $whichAxis->setAxisText($axisText);
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
new file mode 100644
index 00000000..cf9046ce
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
@@ -0,0 +1,219 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\DefaultReadFilter;
+use PhpOffice\PhpSpreadsheet\Reader\IReadFilter;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class ColumnAndRowAttributes extends BaseParserClass
+{
+    private Worksheet $worksheet;
+
+    private ?SimpleXMLElement $worksheetXml;
+
+    public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
+    {
+        $this->worksheet = $workSheet;
+        $this->worksheetXml = $worksheetXml;
+    }
+
+    /**
+     * Set Worksheet column attributes by attributes array passed.
+     *
+     * @param string $columnAddress A, B, ... DX, ...
+     * @param array $columnAttributes array of attributes (indexes are attribute name, values are value)
+     *                               'xfIndex', 'visible', 'collapsed', 'outlineLevel', 'width', ... ?
+     */
+    private function setColumnAttributes(string $columnAddress, array $columnAttributes): void
+    {
+        if (isset($columnAttributes['xfIndex'])) {
+            $this->worksheet->getColumnDimension($columnAddress)->setXfIndex($columnAttributes['xfIndex']);
+        }
+        if (isset($columnAttributes['visible'])) {
+            $this->worksheet->getColumnDimension($columnAddress)->setVisible($columnAttributes['visible']);
+        }
+        if (isset($columnAttributes['collapsed'])) {
+            $this->worksheet->getColumnDimension($columnAddress)->setCollapsed($columnAttributes['collapsed']);
+        }
+        if (isset($columnAttributes['outlineLevel'])) {
+            $this->worksheet->getColumnDimension($columnAddress)->setOutlineLevel($columnAttributes['outlineLevel']);
+        }
+        if (isset($columnAttributes['width'])) {
+            $this->worksheet->getColumnDimension($columnAddress)->setWidth($columnAttributes['width']);
+        }
+    }
+
+    /**
+     * Set Worksheet row attributes by attributes array passed.
+     *
+     * @param int $rowNumber 1, 2, 3, ... 99, ...
+     * @param array $rowAttributes array of attributes (indexes are attribute name, values are value)
+     *                               'xfIndex', 'visible', 'collapsed', 'outlineLevel', 'rowHeight', ... ?
+     */
+    private function setRowAttributes(int $rowNumber, array $rowAttributes): void
+    {
+        if (isset($rowAttributes['xfIndex'])) {
+            $this->worksheet->getRowDimension($rowNumber)->setXfIndex($rowAttributes['xfIndex']);
+        }
+        if (isset($rowAttributes['visible'])) {
+            $this->worksheet->getRowDimension($rowNumber)->setVisible($rowAttributes['visible']);
+        }
+        if (isset($rowAttributes['collapsed'])) {
+            $this->worksheet->getRowDimension($rowNumber)->setCollapsed($rowAttributes['collapsed']);
+        }
+        if (isset($rowAttributes['outlineLevel'])) {
+            $this->worksheet->getRowDimension($rowNumber)->setOutlineLevel($rowAttributes['outlineLevel']);
+        }
+        if (isset($rowAttributes['rowHeight'])) {
+            $this->worksheet->getRowDimension($rowNumber)->setRowHeight($rowAttributes['rowHeight']);
+        }
+    }
+
+    public function load(?IReadFilter $readFilter = null, bool $readDataOnly = false, bool $ignoreRowsWithNoCells = false): void
+    {
+        if ($this->worksheetXml === null) {
+            return;
+        }
+
+        $columnsAttributes = [];
+        $rowsAttributes = [];
+        if (isset($this->worksheetXml->cols)) {
+            $columnsAttributes = $this->readColumnAttributes($this->worksheetXml->cols, $readDataOnly);
+        }
+
+        if ($this->worksheetXml->sheetData && $this->worksheetXml->sheetData->row) {
+            $rowsAttributes = $this->readRowAttributes($this->worksheetXml->sheetData->row, $readDataOnly, $ignoreRowsWithNoCells);
+        }
+
+        if ($readFilter !== null && $readFilter::class === DefaultReadFilter::class) {
+            $readFilter = null;
+        }
+
+        // set columns/rows attributes
+        $columnsAttributesAreSet = [];
+        foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
+            if (
+                $readFilter === null
+                || !$this->isFilteredColumn($readFilter, $columnCoordinate, $rowsAttributes)
+            ) {
+                if (!isset($columnsAttributesAreSet[$columnCoordinate])) {
+                    $this->setColumnAttributes($columnCoordinate, $columnAttributes);
+                    $columnsAttributesAreSet[$columnCoordinate] = true;
+                }
+            }
+        }
+
+        $rowsAttributesAreSet = [];
+        foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
+            if (
+                $readFilter === null
+                || !$this->isFilteredRow($readFilter, $rowCoordinate, $columnsAttributes)
+            ) {
+                if (!isset($rowsAttributesAreSet[$rowCoordinate])) {
+                    $this->setRowAttributes($rowCoordinate, $rowAttributes);
+                    $rowsAttributesAreSet[$rowCoordinate] = true;
+                }
+            }
+        }
+    }
+
+    private function isFilteredColumn(IReadFilter $readFilter, string $columnCoordinate, array $rowsAttributes): bool
+    {
+        foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
+            if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function readColumnAttributes(SimpleXMLElement $worksheetCols, bool $readDataOnly): array
+    {
+        $columnAttributes = [];
+
+        foreach ($worksheetCols->col as $columnx) {
+            $column = $columnx->attributes();
+            if ($column !== null) {
+                $startColumn = Coordinate::stringFromColumnIndex((int) $column['min']);
+                $endColumn = Coordinate::stringFromColumnIndex((int) $column['max']);
+                ++$endColumn;
+                for ($columnAddress = $startColumn; $columnAddress !== $endColumn; ++$columnAddress) {
+                    $columnAttributes[$columnAddress] = $this->readColumnRangeAttributes($column, $readDataOnly);
+
+                    if ((int) ($column['max']) == 16384) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $columnAttributes;
+    }
+
+    private function readColumnRangeAttributes(?SimpleXMLElement $column, bool $readDataOnly): array
+    {
+        $columnAttributes = [];
+        if ($column !== null) {
+            if (isset($column['style']) && !$readDataOnly) {
+                $columnAttributes['xfIndex'] = (int) $column['style'];
+            }
+            if (isset($column['hidden']) && self::boolean($column['hidden'])) {
+                $columnAttributes['visible'] = false;
+            }
+            if (isset($column['collapsed']) && self::boolean($column['collapsed'])) {
+                $columnAttributes['collapsed'] = true;
+            }
+            if (isset($column['outlineLevel']) && ((int) $column['outlineLevel']) > 0) {
+                $columnAttributes['outlineLevel'] = (int) $column['outlineLevel'];
+            }
+            if (isset($column['width'])) {
+                $columnAttributes['width'] = (float) $column['width'];
+            }
+        }
+
+        return $columnAttributes;
+    }
+
+    private function isFilteredRow(IReadFilter $readFilter, int $rowCoordinate, array $columnsAttributes): bool
+    {
+        foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
+            if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function readRowAttributes(SimpleXMLElement $worksheetRow, bool $readDataOnly, bool $ignoreRowsWithNoCells): array
+    {
+        $rowAttributes = [];
+
+        foreach ($worksheetRow as $rowx) {
+            $row = $rowx->attributes();
+            if ($row !== null && (!$ignoreRowsWithNoCells || isset($rowx->c))) {
+                if (isset($row['ht']) && !$readDataOnly) {
+                    $rowAttributes[(int) $row['r']]['rowHeight'] = (float) $row['ht'];
+                }
+                if (isset($row['hidden']) && self::boolean($row['hidden'])) {
+                    $rowAttributes[(int) $row['r']]['visible'] = false;
+                }
+                if (isset($row['collapsed']) && self::boolean($row['collapsed'])) {
+                    $rowAttributes[(int) $row['r']]['collapsed'] = true;
+                }
+                if (isset($row['outlineLevel']) && (int) $row['outlineLevel'] > 0) {
+                    $rowAttributes[(int) $row['r']]['outlineLevel'] = (int) $row['outlineLevel'];
+                }
+                if (isset($row['s']) && !$readDataOnly) {
+                    $rowAttributes[(int) $row['r']]['xfIndex'] = (int) $row['s'];
+                }
+            }
+        }
+
+        return $rowAttributes;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
new file mode 100644
index 00000000..cb562ef6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
@@ -0,0 +1,336 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Styles as StyleReader;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalColorScale;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalDataBar;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormattingRuleExtension;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormatValueObject;
+use PhpOffice\PhpSpreadsheet\Style\Style as Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+use stdClass;
+
+class ConditionalStyles
+{
+    private Worksheet $worksheet;
+
+    private SimpleXMLElement $worksheetXml;
+
+    private array $ns;
+
+    private array $dxfs;
+
+    private StyleReader $styleReader;
+
+    public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml, array $dxfs, StyleReader $styleReader)
+    {
+        $this->worksheet = $workSheet;
+        $this->worksheetXml = $worksheetXml;
+        $this->dxfs = $dxfs;
+        $this->styleReader = $styleReader;
+    }
+
+    public function load(): void
+    {
+        $selectedCells = $this->worksheet->getSelectedCells();
+
+        $this->setConditionalStyles(
+            $this->worksheet,
+            $this->readConditionalStyles($this->worksheetXml),
+            $this->worksheetXml->extLst
+        );
+
+        $this->worksheet->setSelectedCells($selectedCells);
+    }
+
+    public function loadFromExt(): void
+    {
+        $selectedCells = $this->worksheet->getSelectedCells();
+
+        $this->ns = $this->worksheetXml->getNamespaces(true);
+        $this->setConditionalsFromExt(
+            $this->readConditionalsFromExt($this->worksheetXml->extLst)
+        );
+
+        $this->worksheet->setSelectedCells($selectedCells);
+    }
+
+    private function setConditionalsFromExt(array $conditionals): void
+    {
+        foreach ($conditionals as $conditionalRange => $cfRules) {
+            ksort($cfRules);
+            // Priority is used as the key for sorting; but may not start at 0,
+            // so we use array_values to reset the index after sorting.
+            $this->worksheet->getStyle($conditionalRange)
+                ->setConditionalStyles(array_values($cfRules));
+        }
+    }
+
+    private function readConditionalsFromExt(SimpleXMLElement $extLst): array
+    {
+        $conditionals = [];
+        if (!isset($extLst->ext)) {
+            return $conditionals;
+        }
+
+        foreach ($extLst->ext as $extlstcond) {
+            $extAttrs = $extlstcond->attributes() ?? [];
+            $extUri = (string) ($extAttrs['uri'] ?? '');
+            if ($extUri !== '{78C0D931-6437-407d-A8EE-F0AAD7539E65}') {
+                continue;
+            }
+            $conditionalFormattingRuleXml = $extlstcond->children($this->ns['x14']);
+            if (!$conditionalFormattingRuleXml->conditionalFormattings) {
+                return [];
+            }
+
+            foreach ($conditionalFormattingRuleXml->children($this->ns['x14']) as $extFormattingXml) {
+                $extFormattingRangeXml = $extFormattingXml->children($this->ns['xm']);
+                if (!$extFormattingRangeXml->sqref) {
+                    continue;
+                }
+
+                $sqref = (string) $extFormattingRangeXml->sqref;
+                $extCfRuleXml = $extFormattingXml->cfRule;
+
+                $attributes = $extCfRuleXml->attributes();
+                if (!$attributes) {
+                    continue;
+                }
+                $conditionType = (string) $attributes->type;
+                if (
+                    !Conditional::isValidConditionType($conditionType)
+                    || $conditionType === Conditional::CONDITION_DATABAR
+                ) {
+                    continue;
+                }
+
+                $priority = (int) $attributes->priority;
+
+                $conditional = $this->readConditionalRuleFromExt($extCfRuleXml, $attributes);
+                $cfStyle = $this->readStyleFromExt($extCfRuleXml);
+                $conditional->setStyle($cfStyle);
+                $conditionals[$sqref][$priority] = $conditional;
+            }
+        }
+
+        return $conditionals;
+    }
+
+    private function readConditionalRuleFromExt(SimpleXMLElement $cfRuleXml, SimpleXMLElement $attributes): Conditional
+    {
+        $conditionType = (string) $attributes->type;
+        $operatorType = (string) $attributes->operator;
+
+        $operands = [];
+        foreach ($cfRuleXml->children($this->ns['xm']) as $cfRuleOperandsXml) {
+            $operands[] = (string) $cfRuleOperandsXml;
+        }
+
+        $conditional = new Conditional();
+        $conditional->setConditionType($conditionType);
+        $conditional->setOperatorType($operatorType);
+        if (
+            $conditionType === Conditional::CONDITION_CONTAINSTEXT
+            || $conditionType === Conditional::CONDITION_NOTCONTAINSTEXT
+            || $conditionType === Conditional::CONDITION_BEGINSWITH
+            || $conditionType === Conditional::CONDITION_ENDSWITH
+            || $conditionType === Conditional::CONDITION_TIMEPERIOD
+        ) {
+            $conditional->setText(array_pop($operands) ?? '');
+        }
+        $conditional->setConditions($operands);
+
+        return $conditional;
+    }
+
+    private function readStyleFromExt(SimpleXMLElement $extCfRuleXml): Style
+    {
+        $cfStyle = new Style(false, true);
+        if ($extCfRuleXml->dxf) {
+            $styleXML = $extCfRuleXml->dxf->children();
+
+            if ($styleXML->borders) {
+                $this->styleReader->readBorderStyle($cfStyle->getBorders(), $styleXML->borders);
+            }
+            if ($styleXML->fill) {
+                $this->styleReader->readFillStyle($cfStyle->getFill(), $styleXML->fill);
+            }
+        }
+
+        return $cfStyle;
+    }
+
+    private function readConditionalStyles(SimpleXMLElement $xmlSheet): array
+    {
+        $conditionals = [];
+        foreach ($xmlSheet->conditionalFormatting as $conditional) {
+            foreach ($conditional->cfRule as $cfRule) {
+                if (Conditional::isValidConditionType((string) $cfRule['type']) && (!isset($cfRule['dxfId']) || isset($this->dxfs[(int) ($cfRule['dxfId'])]))) {
+                    $conditionals[(string) $conditional['sqref']][(int) ($cfRule['priority'])] = $cfRule;
+                } elseif ((string) $cfRule['type'] == Conditional::CONDITION_DATABAR) {
+                    $conditionals[(string) $conditional['sqref']][(int) ($cfRule['priority'])] = $cfRule;
+                }
+            }
+        }
+
+        return $conditionals;
+    }
+
+    private function setConditionalStyles(Worksheet $worksheet, array $conditionals, SimpleXMLElement $xmlExtLst): void
+    {
+        foreach ($conditionals as $cellRangeReference => $cfRules) {
+            ksort($cfRules);
+            $conditionalStyles = $this->readStyleRules($cfRules, $xmlExtLst);
+
+            // Extract all cell references in $cellRangeReference
+            // N.B. In Excel UI, intersection is space and union is comma.
+            // But in Xml, intersection is comma and union is space.
+            $cellRangeReference = str_replace(['$', ' ', ',', '^'], ['', '^', ' ', ','], strtoupper($cellRangeReference));
+            $worksheet->getStyle($cellRangeReference)->setConditionalStyles($conditionalStyles);
+        }
+    }
+
+    private function readStyleRules(array $cfRules, SimpleXMLElement $extLst): array
+    {
+        $conditionalFormattingRuleExtensions = ConditionalFormattingRuleExtension::parseExtLstXml($extLst);
+        $conditionalStyles = [];
+
+        /** @var SimpleXMLElement $cfRule */
+        foreach ($cfRules as $cfRule) {
+            $objConditional = new Conditional();
+            $objConditional->setConditionType((string) $cfRule['type']);
+            $objConditional->setOperatorType((string) $cfRule['operator']);
+            $objConditional->setNoFormatSet(!isset($cfRule['dxfId']));
+
+            if ((string) $cfRule['text'] != '') {
+                $objConditional->setText((string) $cfRule['text']);
+            } elseif ((string) $cfRule['timePeriod'] != '') {
+                $objConditional->setText((string) $cfRule['timePeriod']);
+            }
+
+            if (isset($cfRule['stopIfTrue']) && (int) $cfRule['stopIfTrue'] === 1) {
+                $objConditional->setStopIfTrue(true);
+            }
+
+            if (count($cfRule->formula) >= 1) {
+                foreach ($cfRule->formula as $formulax) {
+                    $formula = (string) $formulax;
+                    if ($formula === 'TRUE') {
+                        $objConditional->addCondition(true);
+                    } elseif ($formula === 'FALSE') {
+                        $objConditional->addCondition(false);
+                    } else {
+                        $objConditional->addCondition($formula);
+                    }
+                }
+            } else {
+                $objConditional->addCondition('');
+            }
+
+            if (isset($cfRule->dataBar)) {
+                $objConditional->setDataBar(
+                    $this->readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions)
+                );
+            } elseif (isset($cfRule->colorScale)) {
+                $objConditional->setColorScale(
+                    $this->readColorScale($cfRule)
+                );
+            } elseif (isset($cfRule['dxfId'])) {
+                $objConditional->setStyle(clone $this->dxfs[(int) ($cfRule['dxfId'])]);
+            }
+
+            $conditionalStyles[] = $objConditional;
+        }
+
+        return $conditionalStyles;
+    }
+
+    private function readDataBarOfConditionalRule(SimpleXMLElement $cfRule, array $conditionalFormattingRuleExtensions): ConditionalDataBar
+    {
+        $dataBar = new ConditionalDataBar();
+        //dataBar attribute
+        if (isset($cfRule->dataBar['showValue'])) {
+            $dataBar->setShowValue((bool) $cfRule->dataBar['showValue']);
+        }
+
+        //dataBar children
+        //conditionalFormatValueObjects
+        $cfvoXml = $cfRule->dataBar->cfvo;
+        $cfvoIndex = 0;
+        foreach ((count($cfvoXml) > 1 ? $cfvoXml : [$cfvoXml]) as $cfvo) { //* @phpstan-ignore-line
+            if ($cfvoIndex === 0) {
+                $dataBar->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo['type'], (string) $cfvo['val']));
+            }
+            if ($cfvoIndex === 1) {
+                $dataBar->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo['type'], (string) $cfvo['val']));
+            }
+            ++$cfvoIndex;
+        }
+
+        //color
+        if (isset($cfRule->dataBar->color)) {
+            $dataBar->setColor($this->styleReader->readColor($cfRule->dataBar->color));
+        }
+        //extLst
+        $this->readDataBarExtLstOfConditionalRule($dataBar, $cfRule, $conditionalFormattingRuleExtensions);
+
+        return $dataBar;
+    }
+
+    private function readColorScale(SimpleXMLElement|stdClass $cfRule): ConditionalColorScale
+    {
+        $colorScale = new ConditionalColorScale();
+        $count = count($cfRule->colorScale->cfvo);
+        $idx = 0;
+        foreach ($cfRule->colorScale->cfvo as $cfvoXml) {
+            $attr = $cfvoXml->attributes() ?? [];
+            $type = (string) ($attr['type'] ?? '');
+            $val = $attr['val'] ?? null;
+            if ($idx === 0) {
+                $method = 'setMinimumConditionalFormatValueObject';
+            } elseif ($idx === 1 && $count === 3) {
+                $method = 'setMidpointConditionalFormatValueObject';
+            } else {
+                $method = 'setMaximumConditionalFormatValueObject';
+            }
+            if ($type !== 'formula') {
+                $colorScale->$method(new ConditionalFormatValueObject($type, $val));
+            } else {
+                $colorScale->$method(new ConditionalFormatValueObject($type, null, $val));
+            }
+            ++$idx;
+        }
+        $idx = 0;
+        foreach ($cfRule->colorScale->color as $color) {
+            $rgb = $this->styleReader->readColor($color);
+            if ($idx === 0) {
+                $colorScale->setMinimumColor(new Color($rgb));
+            } elseif ($idx === 1 && $count === 3) {
+                $colorScale->setMidpointColor(new Color($rgb));
+            } else {
+                $colorScale->setMaximumColor(new Color($rgb));
+            }
+            ++$idx;
+        }
+
+        return $colorScale;
+    }
+
+    private function readDataBarExtLstOfConditionalRule(ConditionalDataBar $dataBar, SimpleXMLElement $cfRule, array $conditionalFormattingRuleExtensions): void
+    {
+        if (isset($cfRule->extLst)) {
+            $ns = $cfRule->extLst->getNamespaces(true);
+            foreach ((count($cfRule->extLst) > 0 ? $cfRule->extLst->ext : [$cfRule->extLst->ext]) as $ext) { //* @phpstan-ignore-line
+                $extId = (string) $ext->children($ns['x14'])->id;
+                if (isset($conditionalFormattingRuleExtensions[$extId]) && (string) $ext['uri'] === '{B025F937-C7B1-47D3-B67F-A62EFF666E3E}') {
+                    $dataBar->setConditionalFormattingRuleExt($conditionalFormattingRuleExtensions[$extId]);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
new file mode 100644
index 00000000..d494dc9d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class DataValidations
+{
+    private Worksheet $worksheet;
+
+    private SimpleXMLElement $worksheetXml;
+
+    public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml)
+    {
+        $this->worksheet = $workSheet;
+        $this->worksheetXml = $worksheetXml;
+    }
+
+    public function load(): void
+    {
+        foreach ($this->worksheetXml->dataValidations->dataValidation as $dataValidation) {
+            // Uppercase coordinate
+            $range = strtoupper((string) $dataValidation['sqref']);
+            $rangeSet = explode(' ', $range);
+            foreach ($rangeSet as $range) {
+                if (preg_match('/^[A-Z]{1,3}\\d{1,7}/', $range, $matches) === 1) {
+                    // Ensure left/top row of range exists, thereby
+                    // adjusting high row/column.
+                    $this->worksheet->getCell($matches[0]);
+                }
+            }
+        }
+        foreach ($this->worksheetXml->dataValidations->dataValidation as $dataValidation) {
+            // Uppercase coordinate
+            $range = strtoupper((string) $dataValidation['sqref']);
+            $rangeSet = explode(' ', $range);
+            foreach ($rangeSet as $range) {
+                $stRange = $this->worksheet->shrinkRangeToFit($range);
+
+                // Extract all cell references in $range
+                foreach (Coordinate::extractAllCellReferencesInRange($stRange) as $reference) {
+                    // Create validation
+                    $docValidation = $this->worksheet->getCell($reference)->getDataValidation();
+                    $docValidation->setType((string) $dataValidation['type']);
+                    $docValidation->setErrorStyle((string) $dataValidation['errorStyle']);
+                    $docValidation->setOperator((string) $dataValidation['operator']);
+                    $docValidation->setAllowBlank(filter_var($dataValidation['allowBlank'], FILTER_VALIDATE_BOOLEAN));
+                    // showDropDown is inverted (works as hideDropDown if true)
+                    $docValidation->setShowDropDown(!filter_var($dataValidation['showDropDown'], FILTER_VALIDATE_BOOLEAN));
+                    $docValidation->setShowInputMessage(filter_var($dataValidation['showInputMessage'], FILTER_VALIDATE_BOOLEAN));
+                    $docValidation->setShowErrorMessage(filter_var($dataValidation['showErrorMessage'], FILTER_VALIDATE_BOOLEAN));
+                    $docValidation->setErrorTitle((string) $dataValidation['errorTitle']);
+                    $docValidation->setError((string) $dataValidation['error']);
+                    $docValidation->setPromptTitle((string) $dataValidation['promptTitle']);
+                    $docValidation->setPrompt((string) $dataValidation['prompt']);
+                    $docValidation->setFormula1((string) $dataValidation->formula1);
+                    $docValidation->setFormula2((string) $dataValidation->formula2);
+                    $docValidation->setSqref($range);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
new file mode 100644
index 00000000..0c5b9a1b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class Hyperlinks
+{
+    private Worksheet $worksheet;
+
+    private array $hyperlinks = [];
+
+    public function __construct(Worksheet $workSheet)
+    {
+        $this->worksheet = $workSheet;
+    }
+
+    public function readHyperlinks(SimpleXMLElement $relsWorksheet): void
+    {
+        foreach ($relsWorksheet->children(Namespaces::RELATIONSHIPS)->Relationship as $elementx) {
+            $element = Xlsx::getAttributes($elementx);
+            if ($element->Type == Namespaces::HYPERLINK) {
+                $this->hyperlinks[(string) $element->Id] = (string) $element->Target;
+            }
+        }
+    }
+
+    public function setHyperlinks(SimpleXMLElement $worksheetXml): void
+    {
+        foreach ($worksheetXml->children(Namespaces::MAIN)->hyperlink as $hyperlink) {
+            if ($hyperlink !== null) {
+                $this->setHyperlink($hyperlink, $this->worksheet);
+            }
+        }
+    }
+
+    private function setHyperlink(SimpleXMLElement $hyperlink, Worksheet $worksheet): void
+    {
+        // Link url
+        $linkRel = Xlsx::getAttributes($hyperlink, Namespaces::SCHEMA_OFFICE_DOCUMENT);
+
+        $attributes = Xlsx::getAttributes($hyperlink);
+        foreach (Coordinate::extractAllCellReferencesInRange($attributes->ref) as $cellReference) {
+            $cell = $worksheet->getCell($cellReference);
+            if (isset($linkRel['id'])) {
+                $hyperlinkUrl = $this->hyperlinks[(string) $linkRel['id']] ?? null;
+                if (isset($attributes['location'])) {
+                    $hyperlinkUrl .= '#' . (string) $attributes['location'];
+                }
+                $cell->getHyperlink()->setUrl($hyperlinkUrl);
+            } elseif (isset($attributes['location'])) {
+                $cell->getHyperlink()->setUrl('sheet://' . (string) $attributes['location']);
+            }
+
+            // Tooltip
+            if (isset($attributes['tooltip'])) {
+                $cell->getHyperlink()->setTooltip((string) $attributes['tooltip']);
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php
new file mode 100644
index 00000000..fa3e57e7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+class Namespaces
+{
+    const SCHEMAS = 'http://schemas.openxmlformats.org';
+
+    const RELATIONSHIPS = 'http://schemas.openxmlformats.org/package/2006/relationships';
+
+    // This one used in Reader\Xlsx
+    const CORE_PROPERTIES = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties';
+
+    // This one used in Reader\Xlsx\Properties
+    const CORE_PROPERTIES2 = 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties';
+
+    const THUMBNAIL = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail';
+
+    const THEME = 'http://schemas.openxmlformats.org/package/2006/relationships/theme';
+
+    const THEME2 = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme';
+
+    const COMPATIBILITY = 'http://schemas.openxmlformats.org/markup-compatibility/2006';
+
+    const MAIN = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main';
+
+    const RELATIONSHIPS_DRAWING = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing';
+
+    const DRAWINGML = 'http://schemas.openxmlformats.org/drawingml/2006/main';
+
+    const CHART = 'http://schemas.openxmlformats.org/drawingml/2006/chart';
+
+    const CHART_ALTERNATE = 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart';
+
+    const RELATIONSHIPS_CHART = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart';
+
+    const SPREADSHEET_DRAWING = 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing';
+
+    const SCHEMA_OFFICE_DOCUMENT = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships';
+
+    const COMMENTS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments';
+
+    const RELATIONSHIPS_CUSTOM_PROPERTIES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties';
+
+    const RELATIONSHIPS_EXTENDED_PROPERTIES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties';
+
+    const RELATIONSHIPS_CTRLPROP = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp';
+
+    const CUSTOM_PROPERTIES = 'http://schemas.openxmlformats.org/officeDocument/2006/custom-properties';
+
+    const EXTENDED_PROPERTIES = 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties';
+
+    const PROPERTIES_VTYPES = 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes';
+
+    const HYPERLINK = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink';
+
+    const OFFICE_DOCUMENT = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument';
+
+    const SHARED_STRINGS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings';
+
+    const STYLES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles';
+
+    const IMAGE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image';
+
+    const VML = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing';
+
+    const WORKSHEET = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet';
+
+    const CHARTSHEET = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet';
+
+    const SCHEMA_MICROSOFT = 'http://schemas.microsoft.com/office/2006/relationships';
+
+    const EXTENSIBILITY = 'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility';
+
+    const VBA = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject';
+
+    const VBA_SIGNATURE = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject';
+
+    const DATA_VALIDATIONS1 = 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/main';
+
+    const DATA_VALIDATIONS2 = 'http://schemas.microsoft.com/office/excel/2006/main';
+
+    const CONTENT_TYPES = 'http://schemas.openxmlformats.org/package/2006/content-types';
+
+    const RELATIONSHIPS_PRINTER_SETTINGS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings';
+
+    const RELATIONSHIPS_TABLE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table';
+
+    const SPREADSHEETML_AC = 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac';
+
+    const DC_ELEMENTS = 'http://purl.org/dc/elements/1.1/';
+
+    const DC_TERMS = 'http://purl.org/dc/terms/';
+
+    const DC_DCMITYPE = 'http://purl.org/dc/dcmitype/';
+
+    const SCHEMA_INSTANCE = 'http://www.w3.org/2001/XMLSchema-instance';
+
+    const URN_EXCEL = 'urn:schemas-microsoft-com:office:excel';
+
+    const URN_MSOFFICE = 'urn:schemas-microsoft-com:office:office';
+
+    const URN_VML = 'urn:schemas-microsoft-com:vml';
+
+    const SCHEMA_PURL = 'http://purl.oclc.org/ooxml';
+
+    const PURL_OFFICE_DOCUMENT = 'http://purl.oclc.org/ooxml/officeDocument/relationships/officeDocument';
+
+    const PURL_RELATIONSHIPS = 'http://purl.oclc.org/ooxml/officeDocument/relationships';
+
+    const PURL_MAIN = 'http://purl.oclc.org/ooxml/spreadsheetml/main';
+
+    const PURL_DRAWING = 'http://purl.oclc.org/ooxml/drawingml/main';
+
+    const PURL_CHART = 'http://purl.oclc.org/ooxml/drawingml/chart';
+
+    const PURL_WORKSHEET = 'http://purl.oclc.org/ooxml/officeDocument/relationships/worksheet';
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
new file mode 100644
index 00000000..5e6cc88b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class PageSetup extends BaseParserClass
+{
+    private Worksheet $worksheet;
+
+    private ?SimpleXMLElement $worksheetXml;
+
+    public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
+    {
+        $this->worksheet = $workSheet;
+        $this->worksheetXml = $worksheetXml;
+    }
+
+    public function load(array $unparsedLoadedData): array
+    {
+        $worksheetXml = $this->worksheetXml;
+        if ($worksheetXml === null) {
+            return $unparsedLoadedData;
+        }
+
+        $this->margins($worksheetXml, $this->worksheet);
+        $unparsedLoadedData = $this->pageSetup($worksheetXml, $this->worksheet, $unparsedLoadedData);
+        $this->headerFooter($worksheetXml, $this->worksheet);
+        $this->pageBreaks($worksheetXml, $this->worksheet);
+
+        return $unparsedLoadedData;
+    }
+
+    private function margins(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
+    {
+        if ($xmlSheet->pageMargins) {
+            $docPageMargins = $worksheet->getPageMargins();
+            $docPageMargins->setLeft((float) ($xmlSheet->pageMargins['left']));
+            $docPageMargins->setRight((float) ($xmlSheet->pageMargins['right']));
+            $docPageMargins->setTop((float) ($xmlSheet->pageMargins['top']));
+            $docPageMargins->setBottom((float) ($xmlSheet->pageMargins['bottom']));
+            $docPageMargins->setHeader((float) ($xmlSheet->pageMargins['header']));
+            $docPageMargins->setFooter((float) ($xmlSheet->pageMargins['footer']));
+        }
+    }
+
+    private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, array $unparsedLoadedData): array
+    {
+        if ($xmlSheet->pageSetup) {
+            $docPageSetup = $worksheet->getPageSetup();
+
+            if (isset($xmlSheet->pageSetup['orientation'])) {
+                $docPageSetup->setOrientation((string) $xmlSheet->pageSetup['orientation']);
+            }
+            if (isset($xmlSheet->pageSetup['paperSize'])) {
+                $docPageSetup->setPaperSize((int) ($xmlSheet->pageSetup['paperSize']));
+            }
+            if (isset($xmlSheet->pageSetup['scale'])) {
+                $docPageSetup->setScale((int) ($xmlSheet->pageSetup['scale']), false);
+            }
+            if (isset($xmlSheet->pageSetup['fitToHeight']) && (int) ($xmlSheet->pageSetup['fitToHeight']) >= 0) {
+                $docPageSetup->setFitToHeight((int) ($xmlSheet->pageSetup['fitToHeight']), false);
+            }
+            if (isset($xmlSheet->pageSetup['fitToWidth']) && (int) ($xmlSheet->pageSetup['fitToWidth']) >= 0) {
+                $docPageSetup->setFitToWidth((int) ($xmlSheet->pageSetup['fitToWidth']), false);
+            }
+            if (
+                isset($xmlSheet->pageSetup['firstPageNumber'], $xmlSheet->pageSetup['useFirstPageNumber'])
+                && self::boolean((string) $xmlSheet->pageSetup['useFirstPageNumber'])
+            ) {
+                $docPageSetup->setFirstPageNumber((int) ($xmlSheet->pageSetup['firstPageNumber']));
+            }
+            if (isset($xmlSheet->pageSetup['pageOrder'])) {
+                $docPageSetup->setPageOrder((string) $xmlSheet->pageSetup['pageOrder']);
+            }
+
+            $relAttributes = $xmlSheet->pageSetup->attributes(Namespaces::SCHEMA_OFFICE_DOCUMENT);
+            if (isset($relAttributes['id'])) {
+                $relid = (string) $relAttributes['id'];
+                if (!str_ends_with($relid, 'ps')) {
+                    $relid .= 'ps';
+                }
+                $unparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId'] = $relid;
+            }
+        }
+
+        return $unparsedLoadedData;
+    }
+
+    private function headerFooter(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
+    {
+        if ($xmlSheet->headerFooter) {
+            $docHeaderFooter = $worksheet->getHeaderFooter();
+
+            if (
+                isset($xmlSheet->headerFooter['differentOddEven'])
+                && self::boolean((string) $xmlSheet->headerFooter['differentOddEven'])
+            ) {
+                $docHeaderFooter->setDifferentOddEven(true);
+            } else {
+                $docHeaderFooter->setDifferentOddEven(false);
+            }
+            if (
+                isset($xmlSheet->headerFooter['differentFirst'])
+                && self::boolean((string) $xmlSheet->headerFooter['differentFirst'])
+            ) {
+                $docHeaderFooter->setDifferentFirst(true);
+            } else {
+                $docHeaderFooter->setDifferentFirst(false);
+            }
+            if (
+                isset($xmlSheet->headerFooter['scaleWithDoc'])
+                && !self::boolean((string) $xmlSheet->headerFooter['scaleWithDoc'])
+            ) {
+                $docHeaderFooter->setScaleWithDocument(false);
+            } else {
+                $docHeaderFooter->setScaleWithDocument(true);
+            }
+            if (
+                isset($xmlSheet->headerFooter['alignWithMargins'])
+                && !self::boolean((string) $xmlSheet->headerFooter['alignWithMargins'])
+            ) {
+                $docHeaderFooter->setAlignWithMargins(false);
+            } else {
+                $docHeaderFooter->setAlignWithMargins(true);
+            }
+
+            $docHeaderFooter->setOddHeader((string) $xmlSheet->headerFooter->oddHeader);
+            $docHeaderFooter->setOddFooter((string) $xmlSheet->headerFooter->oddFooter);
+            $docHeaderFooter->setEvenHeader((string) $xmlSheet->headerFooter->evenHeader);
+            $docHeaderFooter->setEvenFooter((string) $xmlSheet->headerFooter->evenFooter);
+            $docHeaderFooter->setFirstHeader((string) $xmlSheet->headerFooter->firstHeader);
+            $docHeaderFooter->setFirstFooter((string) $xmlSheet->headerFooter->firstFooter);
+        }
+    }
+
+    private function pageBreaks(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
+    {
+        if ($xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk) {
+            $this->rowBreaks($xmlSheet, $worksheet);
+        }
+        if ($xmlSheet->colBreaks && $xmlSheet->colBreaks->brk) {
+            $this->columnBreaks($xmlSheet, $worksheet);
+        }
+    }
+
+    private function rowBreaks(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
+    {
+        foreach ($xmlSheet->rowBreaks->brk as $brk) {
+            $rowBreakMax = isset($brk['max']) ? ((int) $brk['max']) : -1;
+            if ($brk['man']) {
+                $worksheet->setBreak("A{$brk['id']}", Worksheet::BREAK_ROW, $rowBreakMax);
+            }
+        }
+    }
+
+    private function columnBreaks(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
+    {
+        foreach ($xmlSheet->colBreaks->brk as $brk) {
+            if ($brk['man']) {
+                $worksheet->setBreak(
+                    Coordinate::stringFromColumnIndex(((int) $brk['id']) + 1) . '1',
+                    Worksheet::BREAK_COLUMN
+                );
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php
new file mode 100644
index 00000000..fb501e84
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Document\Properties as DocumentProperties;
+use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\Settings;
+use SimpleXMLElement;
+
+class Properties
+{
+    private XmlScanner $securityScanner;
+
+    private DocumentProperties $docProps;
+
+    public function __construct(XmlScanner $securityScanner, DocumentProperties $docProps)
+    {
+        $this->securityScanner = $securityScanner;
+        $this->docProps = $docProps;
+    }
+
+    private function extractPropertyData(string $propertyData): ?SimpleXMLElement
+    {
+        // okay to omit namespace because everything will be processed by xpath
+        $obj = simplexml_load_string(
+            $this->securityScanner->scan($propertyData),
+            'SimpleXMLElement',
+            Settings::getLibXmlLoaderOptions()
+        );
+
+        return $obj === false ? null : $obj;
+    }
+
+    public function readCoreProperties(string $propertyData): void
+    {
+        $xmlCore = $this->extractPropertyData($propertyData);
+
+        if (is_object($xmlCore)) {
+            $xmlCore->registerXPathNamespace('dc', Namespaces::DC_ELEMENTS);
+            $xmlCore->registerXPathNamespace('dcterms', Namespaces::DC_TERMS);
+            $xmlCore->registerXPathNamespace('cp', Namespaces::CORE_PROPERTIES2);
+
+            $this->docProps->setCreator($this->getArrayItem($xmlCore->xpath('dc:creator')));
+            $this->docProps->setLastModifiedBy($this->getArrayItem($xmlCore->xpath('cp:lastModifiedBy')));
+            $this->docProps->setCreated($this->getArrayItem($xmlCore->xpath('dcterms:created'))); //! respect xsi:type
+            $this->docProps->setModified($this->getArrayItem($xmlCore->xpath('dcterms:modified'))); //! respect xsi:type
+            $this->docProps->setTitle($this->getArrayItem($xmlCore->xpath('dc:title')));
+            $this->docProps->setDescription($this->getArrayItem($xmlCore->xpath('dc:description')));
+            $this->docProps->setSubject($this->getArrayItem($xmlCore->xpath('dc:subject')));
+            $this->docProps->setKeywords($this->getArrayItem($xmlCore->xpath('cp:keywords')));
+            $this->docProps->setCategory($this->getArrayItem($xmlCore->xpath('cp:category')));
+        }
+    }
+
+    public function readExtendedProperties(string $propertyData): void
+    {
+        $xmlCore = $this->extractPropertyData($propertyData);
+
+        if (is_object($xmlCore)) {
+            if (isset($xmlCore->Company)) {
+                $this->docProps->setCompany((string) $xmlCore->Company);
+            }
+            if (isset($xmlCore->Manager)) {
+                $this->docProps->setManager((string) $xmlCore->Manager);
+            }
+            if (isset($xmlCore->HyperlinkBase)) {
+                $this->docProps->setHyperlinkBase((string) $xmlCore->HyperlinkBase);
+            }
+        }
+    }
+
+    public function readCustomProperties(string $propertyData): void
+    {
+        $xmlCore = $this->extractPropertyData($propertyData);
+
+        if (is_object($xmlCore)) {
+            foreach ($xmlCore as $xmlProperty) {
+                /** @var SimpleXMLElement $xmlProperty */
+                $cellDataOfficeAttributes = $xmlProperty->attributes();
+                if (isset($cellDataOfficeAttributes['name'])) {
+                    $propertyName = (string) $cellDataOfficeAttributes['name'];
+                    $cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
+
+                    $attributeType = $cellDataOfficeChildren->getName();
+                    $attributeValue = (string) $cellDataOfficeChildren->{$attributeType};
+                    $attributeValue = DocumentProperties::convertProperty($attributeValue, $attributeType);
+                    $attributeType = DocumentProperties::convertPropertyType($attributeType);
+                    $this->docProps->setCustomProperty($propertyName, $attributeValue, $attributeType);
+                }
+            }
+        }
+    }
+
+    private function getArrayItem(null|array|false $array): string
+    {
+        return is_array($array) ? (string) ($array[0] ?? '') : '';
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php
new file mode 100644
index 00000000..fb7a3932
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+class SharedFormula
+{
+    private string $master;
+
+    private string $formula;
+
+    public function __construct(string $master, string $formula)
+    {
+        $this->master = $master;
+        $this->formula = $formula;
+    }
+
+    public function master(): string
+    {
+        return $this->master;
+    }
+
+    public function formula(): string
+    {
+        return $this->formula;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
new file mode 100644
index 00000000..9d71443f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class SheetViewOptions extends BaseParserClass
+{
+    private Worksheet $worksheet;
+
+    private ?SimpleXMLElement $worksheetXml;
+
+    public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
+    {
+        $this->worksheet = $workSheet;
+        $this->worksheetXml = $worksheetXml;
+    }
+
+    public function load(bool $readDataOnly, Styles $styleReader): void
+    {
+        if ($this->worksheetXml === null) {
+            return;
+        }
+
+        if (isset($this->worksheetXml->sheetPr)) {
+            $sheetPr = $this->worksheetXml->sheetPr;
+            $this->tabColor($sheetPr, $styleReader);
+            $this->codeName($sheetPr);
+            $this->outlines($sheetPr);
+            $this->pageSetup($sheetPr);
+        }
+
+        if (isset($this->worksheetXml->sheetFormatPr)) {
+            $this->sheetFormat($this->worksheetXml->sheetFormatPr);
+        }
+
+        if (!$readDataOnly && isset($this->worksheetXml->printOptions)) {
+            $this->printOptions($this->worksheetXml->printOptions);
+        }
+    }
+
+    private function tabColor(SimpleXMLElement $sheetPr, Styles $styleReader): void
+    {
+        if (isset($sheetPr->tabColor)) {
+            $this->worksheet->getTabColor()->setARGB($styleReader->readColor($sheetPr->tabColor));
+        }
+    }
+
+    private function codeName(SimpleXMLElement $sheetPrx): void
+    {
+        $sheetPr = $sheetPrx->attributes() ?? [];
+        if (isset($sheetPr['codeName'])) {
+            $this->worksheet->setCodeName((string) $sheetPr['codeName'], false);
+        }
+    }
+
+    private function outlines(SimpleXMLElement $sheetPr): void
+    {
+        if (isset($sheetPr->outlinePr)) {
+            $attr = $sheetPr->outlinePr->attributes() ?? [];
+            if (
+                isset($attr['summaryRight'])
+                && !self::boolean((string) $attr['summaryRight'])
+            ) {
+                $this->worksheet->setShowSummaryRight(false);
+            } else {
+                $this->worksheet->setShowSummaryRight(true);
+            }
+
+            if (
+                isset($attr['summaryBelow'])
+                && !self::boolean((string) $attr['summaryBelow'])
+            ) {
+                $this->worksheet->setShowSummaryBelow(false);
+            } else {
+                $this->worksheet->setShowSummaryBelow(true);
+            }
+        }
+    }
+
+    private function pageSetup(SimpleXMLElement $sheetPr): void
+    {
+        if (isset($sheetPr->pageSetUpPr)) {
+            $attr = $sheetPr->pageSetUpPr->attributes() ?? [];
+            if (
+                isset($attr['fitToPage'])
+                && !self::boolean((string) $attr['fitToPage'])
+            ) {
+                $this->worksheet->getPageSetup()->setFitToPage(false);
+            } else {
+                $this->worksheet->getPageSetup()->setFitToPage(true);
+            }
+        }
+    }
+
+    private function sheetFormat(SimpleXMLElement $sheetFormatPrx): void
+    {
+        $sheetFormatPr = $sheetFormatPrx->attributes() ?? [];
+        if (
+            isset($sheetFormatPr['customHeight'])
+            && self::boolean((string) $sheetFormatPr['customHeight'])
+            && isset($sheetFormatPr['defaultRowHeight'])
+        ) {
+            $this->worksheet->getDefaultRowDimension()
+                ->setRowHeight((float) $sheetFormatPr['defaultRowHeight']);
+        }
+
+        if (isset($sheetFormatPr['defaultColWidth'])) {
+            $this->worksheet->getDefaultColumnDimension()
+                ->setWidth((float) $sheetFormatPr['defaultColWidth']);
+        }
+
+        if (
+            isset($sheetFormatPr['zeroHeight'])
+            && ((string) $sheetFormatPr['zeroHeight'] === '1')
+        ) {
+            $this->worksheet->getDefaultRowDimension()->setZeroHeight(true);
+        }
+    }
+
+    private function printOptions(SimpleXMLElement $printOptionsx): void
+    {
+        $printOptions = $printOptionsx->attributes() ?? [];
+        // Spec is weird. gridLines (default false)
+        // and gridLinesSet (default true) must both be true.
+        if (isset($printOptions['gridLines']) && self::boolean((string) $printOptions['gridLines'])) {
+            if (!isset($printOptions['gridLinesSet']) || self::boolean((string) $printOptions['gridLinesSet'])) {
+                $this->worksheet->setPrintGridlines(true);
+            }
+        }
+        if (isset($printOptions['horizontalCentered']) && self::boolean((string) $printOptions['horizontalCentered'])) {
+            $this->worksheet->getPageSetup()->setHorizontalCentered(true);
+        }
+        if (isset($printOptions['verticalCentered']) && self::boolean((string) $printOptions['verticalCentered'])) {
+            $this->worksheet->getPageSetup()->setVerticalCentered(true);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
new file mode 100644
index 00000000..7c4b8b28
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Worksheet\Pane;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class SheetViews extends BaseParserClass
+{
+    private SimpleXMLElement $sheetViewXml;
+
+    private SimpleXMLElement $sheetViewAttributes;
+
+    private Worksheet $worksheet;
+
+    private string $activePane = '';
+
+    public function __construct(SimpleXMLElement $sheetViewXml, Worksheet $workSheet)
+    {
+        $this->sheetViewXml = $sheetViewXml;
+        $this->sheetViewAttributes = Xlsx::testSimpleXml($sheetViewXml->attributes());
+        $this->worksheet = $workSheet;
+    }
+
+    public function load(): void
+    {
+        $this->topLeft();
+        $this->zoomScale();
+        $this->view();
+        $this->gridLines();
+        $this->headers();
+        $this->direction();
+        $this->showZeros();
+
+        $usesPanes = false;
+        if (isset($this->sheetViewXml->pane)) {
+            $this->pane();
+            $usesPanes = true;
+        }
+        if (isset($this->sheetViewXml->selection)) {
+            foreach ($this->sheetViewXml->selection as $selection) {
+                $this->selection($selection, $usesPanes);
+            }
+        }
+    }
+
+    private function zoomScale(): void
+    {
+        if (isset($this->sheetViewAttributes->zoomScale)) {
+            $zoomScale = (int) ($this->sheetViewAttributes->zoomScale);
+            if ($zoomScale <= 0) {
+                // setZoomScale will throw an Exception if the scale is less than or equals 0
+                // that is OK when manually creating documents, but we should be able to read all documents
+                $zoomScale = 100;
+            }
+
+            $this->worksheet->getSheetView()->setZoomScale($zoomScale);
+        }
+
+        if (isset($this->sheetViewAttributes->zoomScaleNormal)) {
+            $zoomScaleNormal = (int) ($this->sheetViewAttributes->zoomScaleNormal);
+            if ($zoomScaleNormal <= 0) {
+                // setZoomScaleNormal will throw an Exception if the scale is less than or equals 0
+                // that is OK when manually creating documents, but we should be able to read all documents
+                $zoomScaleNormal = 100;
+            }
+
+            $this->worksheet->getSheetView()->setZoomScaleNormal($zoomScaleNormal);
+        }
+
+        if (isset($this->sheetViewAttributes->zoomScalePageLayoutView)) {
+            $zoomScaleNormal = (int) ($this->sheetViewAttributes->zoomScalePageLayoutView);
+            if ($zoomScaleNormal > 0) {
+                $this->worksheet->getSheetView()->setZoomScalePageLayoutView($zoomScaleNormal);
+            }
+        }
+
+        if (isset($this->sheetViewAttributes->zoomScaleSheetLayoutView)) {
+            $zoomScaleNormal = (int) ($this->sheetViewAttributes->zoomScaleSheetLayoutView);
+            if ($zoomScaleNormal > 0) {
+                $this->worksheet->getSheetView()->setZoomScaleSheetLayoutView($zoomScaleNormal);
+            }
+        }
+    }
+
+    private function view(): void
+    {
+        if (isset($this->sheetViewAttributes->view)) {
+            $this->worksheet->getSheetView()->setView((string) $this->sheetViewAttributes->view);
+        }
+    }
+
+    private function topLeft(): void
+    {
+        if (isset($this->sheetViewAttributes->topLeftCell)) {
+            $this->worksheet->setTopLeftCell($this->sheetViewAttributes->topLeftCell);
+        }
+    }
+
+    private function gridLines(): void
+    {
+        if (isset($this->sheetViewAttributes->showGridLines)) {
+            $this->worksheet->setShowGridLines(
+                self::boolean((string) $this->sheetViewAttributes->showGridLines)
+            );
+        }
+    }
+
+    private function headers(): void
+    {
+        if (isset($this->sheetViewAttributes->showRowColHeaders)) {
+            $this->worksheet->setShowRowColHeaders(
+                self::boolean((string) $this->sheetViewAttributes->showRowColHeaders)
+            );
+        }
+    }
+
+    private function direction(): void
+    {
+        if (isset($this->sheetViewAttributes->rightToLeft)) {
+            $this->worksheet->setRightToLeft(
+                self::boolean((string) $this->sheetViewAttributes->rightToLeft)
+            );
+        }
+    }
+
+    private function showZeros(): void
+    {
+        if (isset($this->sheetViewAttributes->showZeros)) {
+            $this->worksheet->getSheetView()->setShowZeros(
+                self::boolean((string) $this->sheetViewAttributes->showZeros)
+            );
+        }
+    }
+
+    private function pane(): void
+    {
+        $xSplit = 0;
+        $ySplit = 0;
+        $topLeftCell = null;
+        $paneAttributes = $this->sheetViewXml->pane->attributes();
+
+        if (isset($paneAttributes->xSplit)) {
+            $xSplit = (int) ($paneAttributes->xSplit);
+            $this->worksheet->setXSplit($xSplit);
+        }
+
+        if (isset($paneAttributes->ySplit)) {
+            $ySplit = (int) ($paneAttributes->ySplit);
+            $this->worksheet->setYSplit($ySplit);
+        }
+        $paneState = isset($paneAttributes->state) ? ((string) $paneAttributes->state) : '';
+        $this->worksheet->setPaneState($paneState);
+        if (isset($paneAttributes->topLeftCell)) {
+            $topLeftCell = (string) $paneAttributes->topLeftCell;
+            $this->worksheet->setPaneTopLeftCell($topLeftCell);
+            if ($paneState === Worksheet::PANE_FROZEN) {
+                $this->worksheet->setTopLeftCell($topLeftCell);
+            }
+        }
+        $activePane = isset($paneAttributes->activePane) ? ((string) $paneAttributes->activePane) : 'topLeft';
+        $this->worksheet->setActivePane($activePane);
+        $this->activePane = $activePane;
+        if ($paneState === Worksheet::PANE_FROZEN || $paneState === Worksheet::PANE_FROZENSPLIT) {
+            $this->worksheet->freezePane(
+                Coordinate::stringFromColumnIndex($xSplit + 1) . ($ySplit + 1),
+                $topLeftCell,
+                $paneState === Worksheet::PANE_FROZENSPLIT
+            );
+        }
+    }
+
+    private function selection(?SimpleXMLElement $selection, bool $usesPanes): void
+    {
+        $attributes = ($selection === null) ? null : $selection->attributes();
+        if ($attributes !== null) {
+            $position = (string) $attributes->pane;
+            if ($usesPanes && $position === '') {
+                $position = 'topLeft';
+            }
+            $activeCell = (string) $attributes->activeCell;
+            $sqref = (string) $attributes->sqref;
+            $sqref = explode(' ', $sqref);
+            $sqref = $sqref[0];
+            if ($position === '') {
+                $this->worksheet->setSelectedCells($sqref);
+            } else {
+                $pane = new Pane($position, $sqref, $activeCell);
+                $this->worksheet->setPane($position, $pane);
+                if ($position === $this->activePane && $sqref !== '') {
+                    $this->worksheet->setSelectedCells($sqref);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
new file mode 100644
index 00000000..e35d6f3e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
@@ -0,0 +1,436 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use SimpleXMLElement;
+use stdClass;
+
+class Styles extends BaseParserClass
+{
+    /**
+     * Theme instance.
+     *
+     * @var ?Theme
+     */
+    private ?Theme $theme = null;
+
+    private array $workbookPalette = [];
+
+    private array $styles = [];
+
+    private array $cellStyles = [];
+
+    private SimpleXMLElement $styleXml;
+
+    private string $namespace = '';
+
+    public function setNamespace(string $namespace): void
+    {
+        $this->namespace = $namespace;
+    }
+
+    public function setWorkbookPalette(array $palette): void
+    {
+        $this->workbookPalette = $palette;
+    }
+
+    private function getStyleAttributes(SimpleXMLElement $value): SimpleXMLElement
+    {
+        $attr = $value->attributes('');
+        if ($attr === null || count($attr) === 0) {
+            $attr = $value->attributes($this->namespace);
+        }
+
+        return Xlsx::testSimpleXml($attr);
+    }
+
+    public function setStyleXml(SimpleXMLElement $styleXml): void
+    {
+        $this->styleXml = $styleXml;
+    }
+
+    public function setTheme(Theme $theme): void
+    {
+        $this->theme = $theme;
+    }
+
+    public function setStyleBaseData(?Theme $theme = null, array $styles = [], array $cellStyles = []): void
+    {
+        $this->theme = $theme;
+        $this->styles = $styles;
+        $this->cellStyles = $cellStyles;
+    }
+
+    public function readFontStyle(Font $fontStyle, SimpleXMLElement $fontStyleXml): void
+    {
+        if (isset($fontStyleXml->name)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->name);
+            if (isset($attr['val'])) {
+                $fontStyle->setName((string) $attr['val']);
+            }
+        }
+        if (isset($fontStyleXml->sz)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->sz);
+            if (isset($attr['val'])) {
+                $fontStyle->setSize((float) $attr['val']);
+            }
+        }
+        if (isset($fontStyleXml->b)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->b);
+            $fontStyle->setBold(!isset($attr['val']) || self::boolean((string) $attr['val']));
+        }
+        if (isset($fontStyleXml->i)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->i);
+            $fontStyle->setItalic(!isset($attr['val']) || self::boolean((string) $attr['val']));
+        }
+        if (isset($fontStyleXml->strike)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->strike);
+            $fontStyle->setStrikethrough(!isset($attr['val']) || self::boolean((string) $attr['val']));
+        }
+        $fontStyle->getColor()->setARGB($this->readColor($fontStyleXml->color));
+
+        if (isset($fontStyleXml->u)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->u);
+            if (!isset($attr['val'])) {
+                $fontStyle->setUnderline(Font::UNDERLINE_SINGLE);
+            } else {
+                $fontStyle->setUnderline((string) $attr['val']);
+            }
+        }
+        if (isset($fontStyleXml->vertAlign)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->vertAlign);
+            if (isset($attr['val'])) {
+                $verticalAlign = strtolower((string) $attr['val']);
+                if ($verticalAlign === 'superscript') {
+                    $fontStyle->setSuperscript(true);
+                } elseif ($verticalAlign === 'subscript') {
+                    $fontStyle->setSubscript(true);
+                }
+            }
+        }
+        if (isset($fontStyleXml->scheme)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->scheme);
+            $fontStyle->setScheme((string) $attr['val']);
+        }
+    }
+
+    private function readNumberFormat(NumberFormat $numfmtStyle, SimpleXMLElement $numfmtStyleXml): void
+    {
+        if ((string) $numfmtStyleXml['formatCode'] !== '') {
+            $numfmtStyle->setFormatCode(self::formatGeneral((string) $numfmtStyleXml['formatCode']));
+
+            return;
+        }
+        $numfmt = $this->getStyleAttributes($numfmtStyleXml);
+        if (isset($numfmt['formatCode'])) {
+            $numfmtStyle->setFormatCode(self::formatGeneral((string) $numfmt['formatCode']));
+        }
+    }
+
+    public function readFillStyle(Fill $fillStyle, SimpleXMLElement $fillStyleXml): void
+    {
+        if ($fillStyleXml->gradientFill) {
+            /** @var SimpleXMLElement $gradientFill */
+            $gradientFill = $fillStyleXml->gradientFill[0];
+            $attr = $this->getStyleAttributes($gradientFill);
+            if (!empty($attr['type'])) {
+                $fillStyle->setFillType((string) $attr['type']);
+            }
+            $fillStyle->setRotation((float) ($attr['degree']));
+            $gradientFill->registerXPathNamespace('sml', Namespaces::MAIN);
+            $fillStyle->getStartColor()->setARGB($this->readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=0]'))->color)); //* @phpstan-ignore-line
+            $fillStyle->getEndColor()->setARGB($this->readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=1]'))->color)); //* @phpstan-ignore-line
+        } elseif ($fillStyleXml->patternFill) {
+            $defaultFillStyle = Fill::FILL_NONE;
+            if ($fillStyleXml->patternFill->fgColor) {
+                $fillStyle->getStartColor()->setARGB($this->readColor($fillStyleXml->patternFill->fgColor, true));
+                $defaultFillStyle = Fill::FILL_SOLID;
+            }
+            if ($fillStyleXml->patternFill->bgColor) {
+                $fillStyle->getEndColor()->setARGB($this->readColor($fillStyleXml->patternFill->bgColor, true));
+                $defaultFillStyle = Fill::FILL_SOLID;
+            }
+
+            $type = '';
+            if ((string) $fillStyleXml->patternFill['patternType'] !== '') {
+                $type = (string) $fillStyleXml->patternFill['patternType'];
+            } else {
+                $attr = $this->getStyleAttributes($fillStyleXml->patternFill);
+                $type = (string) $attr['patternType'];
+            }
+            $patternType = ($type === '') ? $defaultFillStyle : $type;
+
+            $fillStyle->setFillType($patternType);
+        }
+    }
+
+    public function readBorderStyle(Borders $borderStyle, SimpleXMLElement $borderStyleXml): void
+    {
+        $diagonalUp = $this->getAttribute($borderStyleXml, 'diagonalUp');
+        $diagonalUp = self::boolean($diagonalUp);
+        $diagonalDown = $this->getAttribute($borderStyleXml, 'diagonalDown');
+        $diagonalDown = self::boolean($diagonalDown);
+        if ($diagonalUp === false) {
+            if ($diagonalDown === false) {
+                $borderStyle->setDiagonalDirection(Borders::DIAGONAL_NONE);
+            } else {
+                $borderStyle->setDiagonalDirection(Borders::DIAGONAL_DOWN);
+            }
+        } elseif ($diagonalDown === false) {
+            $borderStyle->setDiagonalDirection(Borders::DIAGONAL_UP);
+        } else {
+            $borderStyle->setDiagonalDirection(Borders::DIAGONAL_BOTH);
+        }
+
+        if (isset($borderStyleXml->left)) {
+            $this->readBorder($borderStyle->getLeft(), $borderStyleXml->left);
+        }
+        if (isset($borderStyleXml->right)) {
+            $this->readBorder($borderStyle->getRight(), $borderStyleXml->right);
+        }
+        if (isset($borderStyleXml->top)) {
+            $this->readBorder($borderStyle->getTop(), $borderStyleXml->top);
+        }
+        if (isset($borderStyleXml->bottom)) {
+            $this->readBorder($borderStyle->getBottom(), $borderStyleXml->bottom);
+        }
+        if (isset($borderStyleXml->diagonal)) {
+            $this->readBorder($borderStyle->getDiagonal(), $borderStyleXml->diagonal);
+        }
+    }
+
+    private function getAttribute(SimpleXMLElement $xml, string $attribute): string
+    {
+        $style = '';
+        if ((string) $xml[$attribute] !== '') {
+            $style = (string) $xml[$attribute];
+        } else {
+            $attr = $this->getStyleAttributes($xml);
+            if (isset($attr[$attribute])) {
+                $style = (string) $attr[$attribute];
+            }
+        }
+
+        return $style;
+    }
+
+    private function readBorder(Border $border, SimpleXMLElement $borderXml): void
+    {
+        $style = $this->getAttribute($borderXml, 'style');
+        if ($style !== '') {
+            $border->setBorderStyle((string) $style);
+        } else {
+            $border->setBorderStyle(Border::BORDER_NONE);
+        }
+        if (isset($borderXml->color)) {
+            $border->getColor()->setARGB($this->readColor($borderXml->color));
+        }
+    }
+
+    public function readAlignmentStyle(Alignment $alignment, SimpleXMLElement $alignmentXml): void
+    {
+        $horizontal = (string) $this->getAttribute($alignmentXml, 'horizontal');
+        if ($horizontal !== '') {
+            $alignment->setHorizontal($horizontal);
+        }
+        $vertical = (string) $this->getAttribute($alignmentXml, 'vertical');
+        if ($vertical !== '') {
+            $alignment->setVertical($vertical);
+        }
+
+        $textRotation = (int) $this->getAttribute($alignmentXml, 'textRotation');
+        if ($textRotation > 90) {
+            $textRotation = 90 - $textRotation;
+        }
+        $alignment->setTextRotation($textRotation);
+
+        $wrapText = $this->getAttribute($alignmentXml, 'wrapText');
+        $alignment->setWrapText(self::boolean((string) $wrapText));
+        $shrinkToFit = $this->getAttribute($alignmentXml, 'shrinkToFit');
+        $alignment->setShrinkToFit(self::boolean((string) $shrinkToFit));
+        $indent = (int) $this->getAttribute($alignmentXml, 'indent');
+        $alignment->setIndent(max($indent, 0));
+        $readingOrder = (int) $this->getAttribute($alignmentXml, 'readingOrder');
+        $alignment->setReadOrder(max($readingOrder, 0));
+    }
+
+    private static function formatGeneral(string $formatString): string
+    {
+        if ($formatString === 'GENERAL') {
+            $formatString = NumberFormat::FORMAT_GENERAL;
+        }
+
+        return $formatString;
+    }
+
+    /**
+     * Read style.
+     */
+    public function readStyle(Style $docStyle, SimpleXMLElement|stdClass $style): void
+    {
+        if ($style instanceof SimpleXMLElement) {
+            $this->readNumberFormat($docStyle->getNumberFormat(), $style->numFmt);
+        } else {
+            $docStyle->getNumberFormat()->setFormatCode(self::formatGeneral((string) $style->numFmt));
+        }
+
+        if (isset($style->font)) {
+            $this->readFontStyle($docStyle->getFont(), $style->font);
+        }
+
+        if (isset($style->fill)) {
+            $this->readFillStyle($docStyle->getFill(), $style->fill);
+        }
+
+        if (isset($style->border)) {
+            $this->readBorderStyle($docStyle->getBorders(), $style->border);
+        }
+
+        if (isset($style->alignment)) {
+            $this->readAlignmentStyle($docStyle->getAlignment(), $style->alignment);
+        }
+
+        // protection
+        if (isset($style->protection)) {
+            $this->readProtectionLocked($docStyle, $style->protection);
+            $this->readProtectionHidden($docStyle, $style->protection);
+        }
+
+        // top-level style settings
+        if (isset($style->quotePrefix)) {
+            $docStyle->setQuotePrefix((bool) $style->quotePrefix);
+        }
+    }
+
+    /**
+     * Read protection locked attribute.
+     */
+    public function readProtectionLocked(Style $docStyle, SimpleXMLElement $style): void
+    {
+        $locked = '';
+        if ((string) $style['locked'] !== '') {
+            $locked = (string) $style['locked'];
+        } else {
+            $attr = $this->getStyleAttributes($style);
+            if (isset($attr['locked'])) {
+                $locked = (string) $attr['locked'];
+            }
+        }
+        if ($locked !== '') {
+            if (self::boolean($locked)) {
+                $docStyle->getProtection()->setLocked(Protection::PROTECTION_PROTECTED);
+            } else {
+                $docStyle->getProtection()->setLocked(Protection::PROTECTION_UNPROTECTED);
+            }
+        }
+    }
+
+    /**
+     * Read protection hidden attribute.
+     */
+    public function readProtectionHidden(Style $docStyle, SimpleXMLElement $style): void
+    {
+        $hidden = '';
+        if ((string) $style['hidden'] !== '') {
+            $hidden = (string) $style['hidden'];
+        } else {
+            $attr = $this->getStyleAttributes($style);
+            if (isset($attr['hidden'])) {
+                $hidden = (string) $attr['hidden'];
+            }
+        }
+        if ($hidden !== '') {
+            if (self::boolean((string) $hidden)) {
+                $docStyle->getProtection()->setHidden(Protection::PROTECTION_PROTECTED);
+            } else {
+                $docStyle->getProtection()->setHidden(Protection::PROTECTION_UNPROTECTED);
+            }
+        }
+    }
+
+    public function readColor(SimpleXMLElement $color, bool $background = false): string
+    {
+        $attr = $this->getStyleAttributes($color);
+        if (isset($attr['rgb'])) {
+            return (string) $attr['rgb'];
+        }
+        if (isset($attr['indexed'])) {
+            $indexedColor = (int) $attr['indexed'];
+            if ($indexedColor >= count($this->workbookPalette)) {
+                return Color::indexedColor($indexedColor - 7, $background)->getARGB() ?? '';
+            }
+
+            return Color::indexedColor($indexedColor, $background, $this->workbookPalette)->getARGB() ?? '';
+        }
+        if (isset($attr['theme'])) {
+            if ($this->theme !== null) {
+                $returnColour = $this->theme->getColourByIndex((int) $attr['theme']);
+                if (isset($attr['tint'])) {
+                    $tintAdjust = (float) $attr['tint'];
+                    $returnColour = Color::changeBrightness($returnColour ?? '', $tintAdjust);
+                }
+
+                return 'FF' . $returnColour;
+            }
+        }
+
+        return ($background) ? 'FFFFFFFF' : 'FF000000';
+    }
+
+    public function dxfs(bool $readDataOnly = false): array
+    {
+        $dxfs = [];
+        if (!$readDataOnly && $this->styleXml) {
+            //    Conditional Styles
+            if ($this->styleXml->dxfs) {
+                foreach ($this->styleXml->dxfs->dxf as $dxf) {
+                    $style = new Style(false, true);
+                    $this->readStyle($style, $dxf);
+                    $dxfs[] = $style;
+                }
+            }
+            //    Cell Styles
+            if ($this->styleXml->cellStyles) {
+                foreach ($this->styleXml->cellStyles->cellStyle as $cellStylex) {
+                    $cellStyle = Xlsx::getAttributes($cellStylex);
+                    if ((int) ($cellStyle['builtinId']) == 0) {
+                        if (isset($this->cellStyles[(int) ($cellStyle['xfId'])])) {
+                            // Set default style
+                            $style = new Style();
+                            $this->readStyle($style, $this->cellStyles[(int) ($cellStyle['xfId'])]);
+
+                            // normal style, currently not using it for anything
+                        }
+                    }
+                }
+            }
+        }
+
+        return $dxfs;
+    }
+
+    public function styles(): array
+    {
+        return $this->styles;
+    }
+
+    /**
+     * Get array item.
+     *
+     * @param mixed $array (usually array, in theory can be false)
+     */
+    private static function getArrayItem(mixed $array): ?SimpleXMLElement
+    {
+        return is_array($array) ? ($array[0] ?? null) : null;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php
new file mode 100644
index 00000000..a63c817d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class TableReader
+{
+    private Worksheet $worksheet;
+
+    private SimpleXMLElement $tableXml;
+
+    /** @var array|SimpleXMLElement */
+    private $tableAttributes;
+
+    public function __construct(Worksheet $workSheet, SimpleXMLElement $tableXml)
+    {
+        $this->worksheet = $workSheet;
+        $this->tableXml = $tableXml;
+    }
+
+    /**
+     * Loads Table into the Worksheet.
+     */
+    public function load(): void
+    {
+        $this->tableAttributes = $this->tableXml->attributes() ?? [];
+        // Remove all "$" in the table range
+        $tableRange = (string) preg_replace('/\$/', '', $this->tableAttributes['ref'] ?? '');
+        if (str_contains($tableRange, ':')) {
+            $this->readTable($tableRange);
+        }
+    }
+
+    /**
+     * Read Table from xml.
+     */
+    private function readTable(string $tableRange): void
+    {
+        $table = new Table($tableRange);
+        $table->setName((string) ($this->tableAttributes['displayName'] ?? ''));
+        $table->setShowHeaderRow(((string) ($this->tableAttributes['headerRowCount'] ?? '')) !== '0');
+        $table->setShowTotalsRow(((string) ($this->tableAttributes['totalsRowCount'] ?? '')) === '1');
+
+        $this->readTableAutoFilter($table, $this->tableXml->autoFilter);
+        $this->readTableColumns($table, $this->tableXml->tableColumns);
+        $this->readTableStyle($table, $this->tableXml->tableStyleInfo);
+
+        (new AutoFilter($table, $this->tableXml))->load();
+        $this->worksheet->addTable($table);
+    }
+
+    /**
+     * Reads TableAutoFilter from xml.
+     */
+    private function readTableAutoFilter(Table $table, SimpleXMLElement $autoFilterXml): void
+    {
+        if ($autoFilterXml->filterColumn === null) {
+            $table->setAllowFilter(false);
+
+            return;
+        }
+
+        foreach ($autoFilterXml->filterColumn as $filterColumn) {
+            $attributes = $filterColumn->attributes() ?? ['colId' => 0, 'hiddenButton' => 0];
+            $column = $table->getColumnByOffset((int) $attributes['colId']);
+            $column->setShowFilterButton(((string) $attributes['hiddenButton']) !== '1');
+        }
+    }
+
+    /**
+     * Reads TableColumns from xml.
+     */
+    private function readTableColumns(Table $table, SimpleXMLElement $tableColumnsXml): void
+    {
+        $offset = 0;
+        foreach ($tableColumnsXml->tableColumn as $tableColumn) {
+            $attributes = $tableColumn->attributes() ?? ['totalsRowLabel' => 0, 'totalsRowFunction' => 0];
+            $column = $table->getColumnByOffset($offset++);
+
+            if ($table->getShowTotalsRow()) {
+                if ($attributes['totalsRowLabel']) {
+                    $column->setTotalsRowLabel((string) $attributes['totalsRowLabel']);
+                }
+
+                if ($attributes['totalsRowFunction']) {
+                    $column->setTotalsRowFunction((string) $attributes['totalsRowFunction']);
+                }
+            }
+
+            if ($tableColumn->calculatedColumnFormula) {
+                $column->setColumnFormula((string) $tableColumn->calculatedColumnFormula);
+            }
+        }
+    }
+
+    /**
+     * Reads TableStyle from xml.
+     */
+    private function readTableStyle(Table $table, SimpleXMLElement $tableStyleInfoXml): void
+    {
+        $tableStyle = new TableStyle();
+        $attributes = $tableStyleInfoXml->attributes();
+        if ($attributes !== null) {
+            $tableStyle->setTheme((string) $attributes['name']);
+            $tableStyle->setShowRowStripes((string) $attributes['showRowStripes'] === '1');
+            $tableStyle->setShowColumnStripes((string) $attributes['showColumnStripes'] === '1');
+            $tableStyle->setShowFirstColumn((string) $attributes['showFirstColumn'] === '1');
+            $tableStyle->setShowLastColumn((string) $attributes['showLastColumn'] === '1');
+        }
+        $table->setStyle($tableStyle);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php
new file mode 100644
index 00000000..4a31c3e1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+class Theme
+{
+    /**
+     * Theme Name.
+     */
+    private string $themeName;
+
+    /**
+     * Colour Scheme Name.
+     */
+    private string $colourSchemeName;
+
+    /**
+     * Colour Map.
+     *
+     * @var string[]
+     */
+    private array $colourMap;
+
+    /**
+     * Create a new Theme.
+     *
+     * @param string[] $colourMap
+     */
+    public function __construct(string $themeName, string $colourSchemeName, array $colourMap)
+    {
+        // Initialise values
+        $this->themeName = $themeName;
+        $this->colourSchemeName = $colourSchemeName;
+        $this->colourMap = $colourMap;
+    }
+
+    /**
+     * Not called by Reader, never accessible any other time.
+     *
+     * @codeCoverageIgnore
+     */
+    public function getThemeName(): string
+    {
+        return $this->themeName;
+    }
+
+    /**
+     * Not called by Reader, never accessible any other time.
+     *
+     * @codeCoverageIgnore
+     */
+    public function getColourSchemeName(): string
+    {
+        return $this->colourSchemeName;
+    }
+
+    /**
+     * Get colour Map Value by Position.
+     */
+    public function getColourByIndex(int $index): ?string
+    {
+        return $this->colourMap[$index] ?? null;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
new file mode 100644
index 00000000..70146ed4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class WorkbookView
+{
+    private Spreadsheet $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function viewSettings(SimpleXMLElement $xmlWorkbook, string $mainNS, array $mapSheetId, bool $readDataOnly): void
+    {
+        // Default active sheet index to the first loaded worksheet from the file
+        $this->spreadsheet->setActiveSheetIndex(0);
+
+        $workbookView = $xmlWorkbook->children($mainNS)->bookViews->workbookView;
+        if ($readDataOnly !== true && !empty($workbookView)) {
+            $workbookViewAttributes = self::testSimpleXml(self::getAttributes($workbookView));
+            // active sheet index
+            $activeTab = (int) $workbookViewAttributes->activeTab; // refers to old sheet index
+            // keep active sheet index if sheet is still loaded, else first sheet is set as the active worksheet
+            if (isset($mapSheetId[$activeTab]) && $mapSheetId[$activeTab] !== null) {
+                $this->spreadsheet->setActiveSheetIndex($mapSheetId[$activeTab]);
+            }
+
+            $this->horizontalScroll($workbookViewAttributes);
+            $this->verticalScroll($workbookViewAttributes);
+            $this->sheetTabs($workbookViewAttributes);
+            $this->minimized($workbookViewAttributes);
+            $this->autoFilterDateGrouping($workbookViewAttributes);
+            $this->firstSheet($workbookViewAttributes);
+            $this->visibility($workbookViewAttributes);
+            $this->tabRatio($workbookViewAttributes);
+        }
+    }
+
+    public static function testSimpleXml(mixed $value): SimpleXMLElement
+    {
+        return ($value instanceof SimpleXMLElement)
+            ? $value
+            : new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><root></root>');
+    }
+
+    public static function getAttributes(?SimpleXMLElement $value, string $ns = ''): SimpleXMLElement
+    {
+        return self::testSimpleXml($value === null ? $value : $value->attributes($ns));
+    }
+
+    /**
+     * Convert an 'xsd:boolean' XML value to a PHP boolean value.
+     * A valid 'xsd:boolean' XML value can be one of the following
+     * four values: 'true', 'false', '1', '0'.  It is case sensitive.
+     *
+     * Note that just doing '(bool) $xsdBoolean' is not safe,
+     * since '(bool) "false"' returns true.
+     *
+     * @see https://www.w3.org/TR/xmlschema11-2/#boolean
+     *
+     * @param string $xsdBoolean An XML string value of type 'xsd:boolean'
+     *
+     * @return bool  Boolean value
+     */
+    private function castXsdBooleanToBool(string $xsdBoolean): bool
+    {
+        if ($xsdBoolean === 'false') {
+            return false;
+        }
+
+        return (bool) $xsdBoolean;
+    }
+
+    private function horizontalScroll(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->showHorizontalScroll)) {
+            $showHorizontalScroll = (string) $workbookViewAttributes->showHorizontalScroll;
+            $this->spreadsheet->setShowHorizontalScroll($this->castXsdBooleanToBool($showHorizontalScroll));
+        }
+    }
+
+    private function verticalScroll(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->showVerticalScroll)) {
+            $showVerticalScroll = (string) $workbookViewAttributes->showVerticalScroll;
+            $this->spreadsheet->setShowVerticalScroll($this->castXsdBooleanToBool($showVerticalScroll));
+        }
+    }
+
+    private function sheetTabs(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->showSheetTabs)) {
+            $showSheetTabs = (string) $workbookViewAttributes->showSheetTabs;
+            $this->spreadsheet->setShowSheetTabs($this->castXsdBooleanToBool($showSheetTabs));
+        }
+    }
+
+    private function minimized(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->minimized)) {
+            $minimized = (string) $workbookViewAttributes->minimized;
+            $this->spreadsheet->setMinimized($this->castXsdBooleanToBool($minimized));
+        }
+    }
+
+    private function autoFilterDateGrouping(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->autoFilterDateGrouping)) {
+            $autoFilterDateGrouping = (string) $workbookViewAttributes->autoFilterDateGrouping;
+            $this->spreadsheet->setAutoFilterDateGrouping($this->castXsdBooleanToBool($autoFilterDateGrouping));
+        }
+    }
+
+    private function firstSheet(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->firstSheet)) {
+            $firstSheet = (string) $workbookViewAttributes->firstSheet;
+            $this->spreadsheet->setFirstSheetIndex((int) $firstSheet);
+        }
+    }
+
+    private function visibility(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->visibility)) {
+            $visibility = (string) $workbookViewAttributes->visibility;
+            $this->spreadsheet->setVisibility($visibility);
+        }
+    }
+
+    private function tabRatio(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->tabRatio)) {
+            $tabRatio = (string) $workbookViewAttributes->tabRatio;
+            $this->spreadsheet->setTabRatio((int) $tabRatio);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
new file mode 100644
index 00000000..979e74c5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
@@ -0,0 +1,728 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader;
+
+use DateTime;
+use DateTimeZone;
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Helper\Html as HelperHtml;
+use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Reader\Xml\PageSettings;
+use PhpOffice\PhpSpreadsheet\Reader\Xml\Properties;
+use PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+use Throwable;
+
+/**
+ * Reader for SpreadsheetML, the XML schema for Microsoft Office Excel 2003.
+ */
+class Xml extends BaseReader
+{
+    public const NAMESPACES_SS = 'urn:schemas-microsoft-com:office:spreadsheet';
+
+    /**
+     * Formats.
+     */
+    protected array $styles = [];
+
+    /**
+     * Create a new Excel2003XML Reader instance.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->securityScanner = XmlScanner::getInstance($this);
+    }
+
+    private string $fileContents = '';
+
+    private string $xmlFailMessage = '';
+
+    public static function xmlMappings(): array
+    {
+        return array_merge(
+            Style\Fill::FILL_MAPPINGS,
+            Style\Border::BORDER_MAPPINGS
+        );
+    }
+
+    /**
+     * Can the current IReader read the file?
+     */
+    public function canRead(string $filename): bool
+    {
+        //    Office                    xmlns:o="urn:schemas-microsoft-com:office:office"
+        //    Excel                    xmlns:x="urn:schemas-microsoft-com:office:excel"
+        //    XML Spreadsheet            xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+        //    Spreadsheet component    xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet"
+        //    XML schema                 xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882"
+        //    XML data type            xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
+        //    MS-persist recordset    xmlns:rs="urn:schemas-microsoft-com:rowset"
+        //    Rowset                    xmlns:z="#RowsetSchema"
+        //
+
+        $signature = [
+            '<?xml version="1.0"',
+            'xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet',
+        ];
+
+        // Open file
+        $data = file_get_contents($filename) ?: '';
+
+        // Why?
+        //$data = str_replace("'", '"', $data); // fix headers with single quote
+
+        $valid = true;
+        foreach ($signature as $match) {
+            // every part of the signature must be present
+            if (!str_contains($data, $match)) {
+                $valid = false;
+
+                break;
+            }
+        }
+
+        //    Retrieve charset encoding
+        if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $data, $matches)) {
+            $charSet = strtoupper($matches[1]);
+            if (preg_match('/^ISO-8859-\d[\dL]?$/i', $charSet) === 1) {
+                $data = StringHelper::convertEncoding($data, 'UTF-8', $charSet);
+                $data = (string) preg_replace('/(<?xml.*encoding=[\'"]).*?([\'"].*?>)/um', '$1' . 'UTF-8' . '$2', $data, 1);
+            }
+        }
+        $this->fileContents = $data;
+
+        return $valid;
+    }
+
+    /**
+     * Check if the file is a valid SimpleXML.
+     *
+     * @return false|SimpleXMLElement
+     *
+     * @deprecated 2.0.1 Should never have had public visibility
+     *
+     * @codeCoverageIgnore
+     */
+    public function trySimpleXMLLoadString(string $filename, string $fileOrString = 'file'): SimpleXMLElement|bool
+    {
+        return $this->trySimpleXMLLoadStringPrivate($filename, $fileOrString);
+    }
+
+    /** @return false|SimpleXMLElement */
+    private function trySimpleXMLLoadStringPrivate(string $filename, string $fileOrString = 'file'): SimpleXMLElement|bool
+    {
+        $this->xmlFailMessage = "Cannot load invalid XML $fileOrString: " . $filename;
+        $xml = false;
+
+        try {
+            $data = $this->fileContents;
+            $continue = true;
+            if ($data === '' && $fileOrString === 'file') {
+                if ($filename === '') {
+                    $this->xmlFailMessage = 'Cannot load empty path';
+                    $continue = false;
+                } else {
+                    $datax = @file_get_contents($filename);
+                    $data = $datax ?: '';
+                    $continue = $datax !== false;
+                }
+            }
+            if ($continue) {
+                $xml = @simplexml_load_string(
+                    $this->getSecurityScannerOrThrow()->scan($data),
+                    'SimpleXMLElement',
+                    Settings::getLibXmlLoaderOptions()
+                );
+            }
+        } catch (Throwable $e) {
+            throw new Exception($this->xmlFailMessage, 0, $e);
+        }
+        $this->fileContents = '';
+
+        return $xml;
+    }
+
+    /**
+     * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
+     */
+    public function listWorksheetNames(string $filename): array
+    {
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+        }
+
+        $worksheetNames = [];
+
+        $xml = $this->trySimpleXMLLoadStringPrivate($filename);
+        if ($xml === false) {
+            throw new Exception("Problem reading {$filename}");
+        }
+
+        $xml_ss = $xml->children(self::NAMESPACES_SS);
+        foreach ($xml_ss->Worksheet as $worksheet) {
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
+            $worksheetNames[] = (string) $worksheet_ss['Name'];
+        }
+
+        return $worksheetNames;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+        }
+
+        $worksheetInfo = [];
+
+        $xml = $this->trySimpleXMLLoadStringPrivate($filename);
+        if ($xml === false) {
+            throw new Exception("Problem reading {$filename}");
+        }
+
+        $worksheetID = 1;
+        $xml_ss = $xml->children(self::NAMESPACES_SS);
+        foreach ($xml_ss->Worksheet as $worksheet) {
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
+
+            $tmpInfo = [];
+            $tmpInfo['worksheetName'] = '';
+            $tmpInfo['lastColumnLetter'] = 'A';
+            $tmpInfo['lastColumnIndex'] = 0;
+            $tmpInfo['totalRows'] = 0;
+            $tmpInfo['totalColumns'] = 0;
+
+            $tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
+            if (isset($worksheet_ss['Name'])) {
+                $tmpInfo['worksheetName'] = (string) $worksheet_ss['Name'];
+            }
+
+            if (isset($worksheet->Table->Row)) {
+                $rowIndex = 0;
+
+                foreach ($worksheet->Table->Row as $rowData) {
+                    $columnIndex = 0;
+                    $rowHasData = false;
+
+                    foreach ($rowData->Cell as $cell) {
+                        if (isset($cell->Data)) {
+                            $tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+                            $rowHasData = true;
+                        }
+
+                        ++$columnIndex;
+                    }
+
+                    ++$rowIndex;
+
+                    if ($rowHasData) {
+                        $tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+                    }
+                }
+            }
+
+            $tmpInfo['lastColumnLetter'] = Coordinate::stringFromColumnIndex($tmpInfo['lastColumnIndex'] + 1);
+            $tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+            $worksheetInfo[] = $tmpInfo;
+            ++$worksheetID;
+        }
+
+        return $worksheetInfo;
+    }
+
+    /**
+     * Loads Spreadsheet from string.
+     */
+    public function loadSpreadsheetFromString(string $contents): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
+
+        // Load into this instance
+        return $this->loadIntoExisting($contents, $spreadsheet, true);
+    }
+
+    /**
+     * Loads Spreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
+
+        // Load into this instance
+        return $this->loadIntoExisting($filename, $spreadsheet);
+    }
+
+    /**
+     * Loads from file or contents into Spreadsheet instance.
+     *
+     * @param string $filename file name if useContents is false else file contents
+     */
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet, bool $useContents = false): Spreadsheet
+    {
+        if ($useContents) {
+            $this->fileContents = $filename;
+            $fileOrString = 'string';
+        } else {
+            File::assertFile($filename);
+            if (!$this->canRead($filename)) {
+                throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+            }
+            $fileOrString = 'file';
+        }
+
+        $xml = $this->trySimpleXMLLoadStringPrivate($filename, $fileOrString);
+        if ($xml === false) {
+            throw new Exception($this->xmlFailMessage);
+        }
+
+        $namespaces = $xml->getNamespaces(true);
+
+        (new Properties($spreadsheet))->readProperties($xml, $namespaces);
+
+        $this->styles = (new Style())->parseStyles($xml, $namespaces);
+        if (isset($this->styles['Default'])) {
+            $spreadsheet->getCellXfCollection()[0]->applyFromArray($this->styles['Default']);
+        }
+
+        $worksheetID = 0;
+        $xml_ss = $xml->children(self::NAMESPACES_SS);
+
+        /** @var null|SimpleXMLElement $worksheetx */
+        foreach ($xml_ss->Worksheet as $worksheetx) {
+            $worksheet = $worksheetx ?? new SimpleXMLElement('<xml></xml>');
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
+
+            if (
+                isset($this->loadSheetsOnly, $worksheet_ss['Name'])
+                && (!in_array($worksheet_ss['Name'], $this->loadSheetsOnly))
+            ) {
+                continue;
+            }
+
+            // Create new Worksheet
+            $spreadsheet->createSheet();
+            $spreadsheet->setActiveSheetIndex($worksheetID);
+            $worksheetName = '';
+            if (isset($worksheet_ss['Name'])) {
+                $worksheetName = (string) $worksheet_ss['Name'];
+                //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
+                //        formula cells... during the load, all formulae should be correct, and we're simply bringing
+                //        the worksheet name in line with the formula, not the reverse
+                $spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
+            }
+            if (isset($worksheet_ss['Protected'])) {
+                $protection = (string) $worksheet_ss['Protected'] === '1';
+                $spreadsheet->getActiveSheet()->getProtection()->setSheet($protection);
+            }
+
+            // locally scoped defined names
+            if (isset($worksheet->Names[0])) {
+                foreach ($worksheet->Names[0] as $definedName) {
+                    $definedName_ss = self::getAttributes($definedName, self::NAMESPACES_SS);
+                    $name = (string) $definedName_ss['Name'];
+                    $definedValue = (string) $definedName_ss['RefersTo'];
+                    $convertedValue = AddressHelper::convertFormulaToA1($definedValue);
+                    if ($convertedValue[0] === '=') {
+                        $convertedValue = substr($convertedValue, 1);
+                    }
+                    $spreadsheet->addDefinedName(DefinedName::createInstance($name, $spreadsheet->getActiveSheet(), $convertedValue, true));
+                }
+            }
+
+            $columnID = 'A';
+            if (isset($worksheet->Table->Column)) {
+                foreach ($worksheet->Table->Column as $columnData) {
+                    $columnData_ss = self::getAttributes($columnData, self::NAMESPACES_SS);
+                    $colspan = 0;
+                    if (isset($columnData_ss['Span'])) {
+                        $spanAttr = (string) $columnData_ss['Span'];
+                        if (is_numeric($spanAttr)) {
+                            $colspan = max(0, (int) $spanAttr);
+                        }
+                    }
+                    if (isset($columnData_ss['Index'])) {
+                        $columnID = Coordinate::stringFromColumnIndex((int) $columnData_ss['Index']);
+                    }
+                    $columnWidth = null;
+                    if (isset($columnData_ss['Width'])) {
+                        $columnWidth = $columnData_ss['Width'];
+                    }
+                    $columnVisible = null;
+                    if (isset($columnData_ss['Hidden'])) {
+                        $columnVisible = ((string) $columnData_ss['Hidden']) !== '1';
+                    }
+                    while ($colspan >= 0) {
+                        if (isset($columnWidth)) {
+                            $spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
+                        }
+                        if (isset($columnVisible)) {
+                            $spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setVisible($columnVisible);
+                        }
+                        ++$columnID;
+                        --$colspan;
+                    }
+                }
+            }
+
+            $rowID = 1;
+            if (isset($worksheet->Table->Row)) {
+                $additionalMergedCells = 0;
+                foreach ($worksheet->Table->Row as $rowData) {
+                    $rowHasData = false;
+                    $row_ss = self::getAttributes($rowData, self::NAMESPACES_SS);
+                    if (isset($row_ss['Index'])) {
+                        $rowID = (int) $row_ss['Index'];
+                    }
+                    if (isset($row_ss['Hidden'])) {
+                        $rowVisible = ((string) $row_ss['Hidden']) !== '1';
+                        $spreadsheet->getActiveSheet()->getRowDimension($rowID)->setVisible($rowVisible);
+                    }
+
+                    $columnID = 'A';
+                    foreach ($rowData->Cell as $cell) {
+                        $cell_ss = self::getAttributes($cell, self::NAMESPACES_SS);
+                        if (isset($cell_ss['Index'])) {
+                            $columnID = Coordinate::stringFromColumnIndex((int) $cell_ss['Index']);
+                        }
+                        $cellRange = $columnID . $rowID;
+
+                        if ($this->getReadFilter() !== null) {
+                            if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+                                ++$columnID;
+
+                                continue;
+                            }
+                        }
+
+                        if (isset($cell_ss['HRef'])) {
+                            $spreadsheet->getActiveSheet()->getCell($cellRange)->getHyperlink()->setUrl((string) $cell_ss['HRef']);
+                        }
+
+                        if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
+                            $columnTo = $columnID;
+                            if (isset($cell_ss['MergeAcross'])) {
+                                $additionalMergedCells += (int) $cell_ss['MergeAcross'];
+                                $columnTo = Coordinate::stringFromColumnIndex((int) (Coordinate::columnIndexFromString($columnID) + $cell_ss['MergeAcross']));
+                            }
+                            $rowTo = $rowID;
+                            if (isset($cell_ss['MergeDown'])) {
+                                $rowTo = $rowTo + $cell_ss['MergeDown'];
+                            }
+                            $cellRange .= ':' . $columnTo . $rowTo;
+                            $spreadsheet->getActiveSheet()->mergeCells($cellRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
+                        }
+
+                        $hasCalculatedValue = false;
+                        $cellDataFormula = '';
+                        if (isset($cell_ss['Formula'])) {
+                            $cellDataFormula = $cell_ss['Formula'];
+                            $hasCalculatedValue = true;
+                        }
+                        if (isset($cell->Data)) {
+                            $cellData = $cell->Data;
+                            $cellValue = (string) $cellData;
+                            $type = DataType::TYPE_NULL;
+                            $cellData_ss = self::getAttributes($cellData, self::NAMESPACES_SS);
+                            if (isset($cellData_ss['Type'])) {
+                                $cellDataType = $cellData_ss['Type'];
+                                switch ($cellDataType) {
+                                    /*
+                                    const TYPE_STRING        = 's';
+                                    const TYPE_FORMULA        = 'f';
+                                    const TYPE_NUMERIC        = 'n';
+                                    const TYPE_BOOL            = 'b';
+                                    const TYPE_NULL            = 'null';
+                                    const TYPE_INLINE        = 'inlineStr';
+                                    const TYPE_ERROR        = 'e';
+                                    */
+                                    case 'String':
+                                        $type = DataType::TYPE_STRING;
+                                        $rich = $cellData->children('http://www.w3.org/TR/REC-html40');
+                                        if ($rich) {
+                                            // in case of HTML content we extract the payload
+                                            // and convert it into a rich text object
+                                            $content = $cellData->asXML() ?: '';
+                                            $html = new HelperHtml();
+                                            $cellValue = $html->toRichTextObject($content, true);
+                                        }
+
+                                        break;
+                                    case 'Number':
+                                        $type = DataType::TYPE_NUMERIC;
+                                        $cellValue = (float) $cellValue;
+                                        if (floor($cellValue) == $cellValue) {
+                                            $cellValue = (int) $cellValue;
+                                        }
+
+                                        break;
+                                    case 'Boolean':
+                                        $type = DataType::TYPE_BOOL;
+                                        $cellValue = ($cellValue != 0);
+
+                                        break;
+                                    case 'DateTime':
+                                        $type = DataType::TYPE_NUMERIC;
+                                        $dateTime = new DateTime($cellValue, new DateTimeZone('UTC'));
+                                        $cellValue = Date::PHPToExcel($dateTime);
+
+                                        break;
+                                    case 'Error':
+                                        $type = DataType::TYPE_ERROR;
+                                        $hasCalculatedValue = false;
+
+                                        break;
+                                }
+                            }
+
+                            $originalType = $type;
+                            if ($hasCalculatedValue) {
+                                $type = DataType::TYPE_FORMULA;
+                                $columnNumber = Coordinate::columnIndexFromString($columnID);
+                                $cellDataFormula = AddressHelper::convertFormulaToA1($cellDataFormula, $rowID, $columnNumber);
+                            }
+
+                            $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
+                            if ($hasCalculatedValue) {
+                                $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setCalculatedValue($cellValue, $originalType === DataType::TYPE_NUMERIC);
+                            }
+                            $rowHasData = true;
+                        }
+
+                        if (isset($cell->Comment)) {
+                            $this->parseCellComment($cell->Comment, $spreadsheet, $columnID, $rowID);
+                        }
+
+                        if (isset($cell_ss['StyleID'])) {
+                            $style = (string) $cell_ss['StyleID'];
+                            if ((isset($this->styles[$style])) && (!empty($this->styles[$style]))) {
+                                //if (!$spreadsheet->getActiveSheet()->cellExists($columnID . $rowID)) {
+                                //    $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValue(null);
+                                //}
+                                $spreadsheet->getActiveSheet()->getStyle($cellRange)
+                                    ->applyFromArray($this->styles[$style]);
+                            }
+                        }
+                        ++$columnID;
+                        while ($additionalMergedCells > 0) {
+                            ++$columnID;
+                            --$additionalMergedCells;
+                        }
+                    }
+
+                    if ($rowHasData) {
+                        if (isset($row_ss['Height'])) {
+                            $rowHeight = $row_ss['Height'];
+                            $spreadsheet->getActiveSheet()->getRowDimension($rowID)->setRowHeight((float) $rowHeight);
+                        }
+                    }
+
+                    ++$rowID;
+                }
+            }
+
+            $dataValidations = new Xml\DataValidations();
+            $dataValidations->loadDataValidations($worksheet, $spreadsheet);
+            $xmlX = $worksheet->children(Namespaces::URN_EXCEL);
+            if (isset($xmlX->WorksheetOptions)) {
+                if (isset($xmlX->WorksheetOptions->ShowPageBreakZoom)) {
+                    $spreadsheet->getActiveSheet()->getSheetView()->setView(SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW);
+                }
+                if (isset($xmlX->WorksheetOptions->Zoom)) {
+                    $zoomScaleNormal = (int) $xmlX->WorksheetOptions->Zoom;
+                    if ($zoomScaleNormal > 0) {
+                        $spreadsheet->getActiveSheet()->getSheetView()->setZoomScaleNormal($zoomScaleNormal);
+                        $spreadsheet->getActiveSheet()->getSheetView()->setZoomScale($zoomScaleNormal);
+                    }
+                }
+                if (isset($xmlX->WorksheetOptions->PageBreakZoom)) {
+                    $zoomScaleNormal = (int) $xmlX->WorksheetOptions->PageBreakZoom;
+                    if ($zoomScaleNormal > 0) {
+                        $spreadsheet->getActiveSheet()->getSheetView()->setZoomScaleSheetLayoutView($zoomScaleNormal);
+                    }
+                }
+                if (isset($xmlX->WorksheetOptions->ShowPageBreakZoom)) {
+                    $spreadsheet->getActiveSheet()->getSheetView()->setView(SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW);
+                }
+                if (isset($xmlX->WorksheetOptions->FreezePanes)) {
+                    $freezeRow = $freezeColumn = 1;
+                    if (isset($xmlX->WorksheetOptions->SplitHorizontal)) {
+                        $freezeRow = (int) $xmlX->WorksheetOptions->SplitHorizontal + 1;
+                    }
+                    if (isset($xmlX->WorksheetOptions->SplitVertical)) {
+                        $freezeColumn = (int) $xmlX->WorksheetOptions->SplitVertical + 1;
+                    }
+                    $leftTopRow = (string) $xmlX->WorksheetOptions->TopRowBottomPane;
+                    $leftTopColumn = (string) $xmlX->WorksheetOptions->LeftColumnRightPane;
+                    if (is_numeric($leftTopRow) && is_numeric($leftTopColumn)) {
+                        $leftTopCoordinate = Coordinate::stringFromColumnIndex((int) $leftTopColumn + 1) . (string) ($leftTopRow + 1);
+                        $spreadsheet->getActiveSheet()->freezePane(Coordinate::stringFromColumnIndex($freezeColumn) . (string) $freezeRow, $leftTopCoordinate, !isset($xmlX->WorksheetOptions->FrozenNoSplit));
+                    } else {
+                        $spreadsheet->getActiveSheet()->freezePane(Coordinate::stringFromColumnIndex($freezeColumn) . (string) $freezeRow, null, !isset($xmlX->WorksheetOptions->FrozenNoSplit));
+                    }
+                } elseif (isset($xmlX->WorksheetOptions->SplitVertical) || isset($xmlX->WorksheetOptions->SplitHorizontal)) {
+                    if (isset($xmlX->WorksheetOptions->SplitHorizontal)) {
+                        $ySplit = (int) $xmlX->WorksheetOptions->SplitHorizontal;
+                        $spreadsheet->getActiveSheet()->setYSplit($ySplit);
+                    }
+                    if (isset($xmlX->WorksheetOptions->SplitVertical)) {
+                        $xSplit = (int) $xmlX->WorksheetOptions->SplitVertical;
+                        $spreadsheet->getActiveSheet()->setXSplit($xSplit);
+                    }
+                    if (isset($xmlX->WorksheetOptions->LeftColumnVisible) || isset($xmlX->WorksheetOptions->TopRowVisible)) {
+                        $leftTopColumn = $leftTopRow = 1;
+                        if (isset($xmlX->WorksheetOptions->LeftColumnVisible)) {
+                            $leftTopColumn = 1 + (int) $xmlX->WorksheetOptions->LeftColumnVisible;
+                        }
+                        if (isset($xmlX->WorksheetOptions->TopRowVisible)) {
+                            $leftTopRow = 1 + (int) $xmlX->WorksheetOptions->TopRowVisible;
+                        }
+                        $leftTopCoordinate = Coordinate::stringFromColumnIndex($leftTopColumn) . "$leftTopRow";
+                        $spreadsheet->getActiveSheet()->setTopLeftCell($leftTopCoordinate);
+                    }
+
+                    $leftTopColumn = $leftTopRow = 1;
+                    if (isset($xmlX->WorksheetOptions->LeftColumnRightPane)) {
+                        $leftTopColumn = 1 + (int) $xmlX->WorksheetOptions->LeftColumnRightPane;
+                    }
+                    if (isset($xmlX->WorksheetOptions->TopRowBottomPane)) {
+                        $leftTopRow = 1 + (int) $xmlX->WorksheetOptions->TopRowBottomPane;
+                    }
+                    $leftTopCoordinate = Coordinate::stringFromColumnIndex($leftTopColumn) . "$leftTopRow";
+                    $spreadsheet->getActiveSheet()->setPaneTopLeftCell($leftTopCoordinate);
+                }
+                (new PageSettings($xmlX))->loadPageSettings($spreadsheet);
+                if (isset($xmlX->WorksheetOptions->TopRowVisible, $xmlX->WorksheetOptions->LeftColumnVisible)) {
+                    $leftTopRow = (string) $xmlX->WorksheetOptions->TopRowVisible;
+                    $leftTopColumn = (string) $xmlX->WorksheetOptions->LeftColumnVisible;
+                    if (is_numeric($leftTopRow) && is_numeric($leftTopColumn)) {
+                        $leftTopCoordinate = Coordinate::stringFromColumnIndex((int) $leftTopColumn + 1) . (string) ($leftTopRow + 1);
+                        $spreadsheet->getActiveSheet()->setTopLeftCell($leftTopCoordinate);
+                    }
+                }
+                $rangeCalculated = false;
+                if (isset($xmlX->WorksheetOptions->Panes->Pane->RangeSelection)) {
+                    if (1 === preg_match('/^R(\d+)C(\d+):R(\d+)C(\d+)$/', (string) $xmlX->WorksheetOptions->Panes->Pane->RangeSelection, $selectionMatches)) {
+                        $selectedCell = Coordinate::stringFromColumnIndex((int) $selectionMatches[2])
+                            . $selectionMatches[1]
+                            . ':'
+                            . Coordinate::stringFromColumnIndex((int) $selectionMatches[4])
+                            . $selectionMatches[3];
+                        $spreadsheet->getActiveSheet()->setSelectedCells($selectedCell);
+                        $rangeCalculated = true;
+                    }
+                }
+                if (!$rangeCalculated) {
+                    if (isset($xmlX->WorksheetOptions->Panes->Pane->ActiveRow)) {
+                        $activeRow = (string) $xmlX->WorksheetOptions->Panes->Pane->ActiveRow;
+                    } else {
+                        $activeRow = 0;
+                    }
+                    if (isset($xmlX->WorksheetOptions->Panes->Pane->ActiveCol)) {
+                        $activeColumn = (string) $xmlX->WorksheetOptions->Panes->Pane->ActiveCol;
+                    } else {
+                        $activeColumn = 0;
+                    }
+                    if (is_numeric($activeRow) && is_numeric($activeColumn)) {
+                        $selectedCell = Coordinate::stringFromColumnIndex((int) $activeColumn + 1) . (string) ($activeRow + 1);
+                        $spreadsheet->getActiveSheet()->setSelectedCells($selectedCell);
+                    }
+                }
+            }
+            if (isset($xmlX->PageBreaks)) {
+                if (isset($xmlX->PageBreaks->ColBreaks)) {
+                    foreach ($xmlX->PageBreaks->ColBreaks->ColBreak as $colBreak) {
+                        $colBreak = (string) $colBreak->Column;
+                        $spreadsheet->getActiveSheet()->setBreak([1 + (int) $colBreak, 1], Worksheet::BREAK_COLUMN);
+                    }
+                }
+                if (isset($xmlX->PageBreaks->RowBreaks)) {
+                    foreach ($xmlX->PageBreaks->RowBreaks->RowBreak as $rowBreak) {
+                        $rowBreak = (string) $rowBreak->Row;
+                        $spreadsheet->getActiveSheet()->setBreak([1, (int) $rowBreak], Worksheet::BREAK_ROW);
+                    }
+                }
+            }
+            ++$worksheetID;
+        }
+
+        // Globally scoped defined names
+        $activeSheetIndex = 0;
+        if (isset($xml->ExcelWorkbook->ActiveSheet)) {
+            $activeSheetIndex = (int) (string) $xml->ExcelWorkbook->ActiveSheet;
+        }
+        $activeWorksheet = $spreadsheet->setActiveSheetIndex($activeSheetIndex);
+        if (isset($xml->Names[0])) {
+            foreach ($xml->Names[0] as $definedName) {
+                $definedName_ss = self::getAttributes($definedName, self::NAMESPACES_SS);
+                $name = (string) $definedName_ss['Name'];
+                $definedValue = (string) $definedName_ss['RefersTo'];
+                $convertedValue = AddressHelper::convertFormulaToA1($definedValue);
+                if ($convertedValue[0] === '=') {
+                    $convertedValue = substr($convertedValue, 1);
+                }
+                $spreadsheet->addDefinedName(DefinedName::createInstance($name, $activeWorksheet, $convertedValue));
+            }
+        }
+
+        // Return
+        return $spreadsheet;
+    }
+
+    protected function parseCellComment(
+        SimpleXMLElement $comment,
+        Spreadsheet $spreadsheet,
+        string $columnID,
+        int $rowID
+    ): void {
+        $commentAttributes = $comment->attributes(self::NAMESPACES_SS);
+        $author = 'unknown';
+        if (isset($commentAttributes->Author)) {
+            $author = (string) $commentAttributes->Author;
+        }
+
+        $node = $comment->Data->asXML();
+        $annotation = strip_tags((string) $node);
+        $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)
+            ->setAuthor($author)
+            ->setText($this->parseRichText($annotation));
+    }
+
+    protected function parseRichText(string $annotation): RichText
+    {
+        $value = new RichText();
+
+        $value->createText($annotation);
+
+        return $value;
+    }
+
+    private static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
+    {
+        return ($simple === null)
+            ? new SimpleXMLElement('<xml></xml>')
+            : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php
new file mode 100644
index 00000000..531f8c35
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class DataValidations
+{
+    private const OPERATOR_MAPPINGS = [
+        'between' => DataValidation::OPERATOR_BETWEEN,
+        'equal' => DataValidation::OPERATOR_EQUAL,
+        'greater' => DataValidation::OPERATOR_GREATERTHAN,
+        'greaterorequal' => DataValidation::OPERATOR_GREATERTHANOREQUAL,
+        'less' => DataValidation::OPERATOR_LESSTHAN,
+        'lessorequal' => DataValidation::OPERATOR_LESSTHANOREQUAL,
+        'notbetween' => DataValidation::OPERATOR_NOTBETWEEN,
+        'notequal' => DataValidation::OPERATOR_NOTEQUAL,
+    ];
+
+    private const TYPE_MAPPINGS = [
+        'textlength' => DataValidation::TYPE_TEXTLENGTH,
+    ];
+
+    private int $thisRow = 0;
+
+    private int $thisColumn = 0;
+
+    private function replaceR1C1(array $matches): string
+    {
+        return AddressHelper::convertToA1($matches[0], $this->thisRow, $this->thisColumn, false);
+    }
+
+    public function loadDataValidations(SimpleXMLElement $worksheet, Spreadsheet $spreadsheet): void
+    {
+        $xmlX = $worksheet->children(Namespaces::URN_EXCEL);
+        $sheet = $spreadsheet->getActiveSheet();
+        /** @var callable $pregCallback */
+        $pregCallback = [$this, 'replaceR1C1'];
+        foreach ($xmlX->DataValidation as $dataValidation) {
+            $cells = [];
+            $validation = new DataValidation();
+
+            // set defaults
+            $validation->setShowDropDown(true);
+            $validation->setShowInputMessage(true);
+            $validation->setShowErrorMessage(true);
+            $validation->setShowDropDown(true);
+            $this->thisRow = 1;
+            $this->thisColumn = 1;
+
+            foreach ($dataValidation as $tagName => $tagValue) {
+                $tagValue = (string) $tagValue;
+                $tagValueLower = strtolower($tagValue);
+                switch ($tagName) {
+                    case 'Range':
+                        foreach (explode(',', $tagValue) as $range) {
+                            $cell = '';
+                            if (preg_match('/^R(\d+)C(\d+):R(\d+)C(\d+)$/', (string) $range, $selectionMatches) === 1) {
+                                // range
+                                $firstCell = Coordinate::stringFromColumnIndex((int) $selectionMatches[2])
+                                    . $selectionMatches[1];
+                                $cell = $firstCell
+                                    . ':'
+                                    . Coordinate::stringFromColumnIndex((int) $selectionMatches[4])
+                                    . $selectionMatches[3];
+                                $this->thisRow = (int) $selectionMatches[1];
+                                $this->thisColumn = (int) $selectionMatches[2];
+                                $sheet->getCell($firstCell);
+                            } elseif (preg_match('/^R(\d+)C(\d+)$/', (string) $range, $selectionMatches) === 1) {
+                                // cell
+                                $cell = Coordinate::stringFromColumnIndex((int) $selectionMatches[2])
+                                    . $selectionMatches[1];
+                                $sheet->getCell($cell);
+                                $this->thisRow = (int) $selectionMatches[1];
+                                $this->thisColumn = (int) $selectionMatches[2];
+                            } elseif (preg_match('/^C(\d+)$/', (string) $range, $selectionMatches) === 1) {
+                                // column
+                                $firstCell = Coordinate::stringFromColumnIndex((int) $selectionMatches[1])
+                                    . '1';
+                                $cell = $firstCell
+                                    . ':'
+                                    . Coordinate::stringFromColumnIndex((int) $selectionMatches[1])
+                                    . ((string) AddressRange::MAX_ROW);
+                                $this->thisColumn = (int) $selectionMatches[1];
+                                $sheet->getCell($firstCell);
+                            } elseif (preg_match('/^R(\d+)$/', (string) $range, $selectionMatches)) {
+                                // row
+                                $firstCell = 'A'
+                                    . $selectionMatches[1];
+                                $cell = $firstCell
+                                    . ':'
+                                    . AddressRange::MAX_COLUMN
+                                    . $selectionMatches[1];
+                                $this->thisRow = (int) $selectionMatches[1];
+                                $sheet->getCell($firstCell);
+                            }
+
+                            $validation->setSqref($cell);
+                            $stRange = $sheet->shrinkRangeToFit($cell);
+                            $cells = array_merge($cells, Coordinate::extractAllCellReferencesInRange($stRange));
+                        }
+
+                        break;
+                    case 'Type':
+                        $validation->setType(self::TYPE_MAPPINGS[$tagValueLower] ?? $tagValueLower);
+
+                        break;
+                    case 'Qualifier':
+                        $validation->setOperator(self::OPERATOR_MAPPINGS[$tagValueLower] ?? $tagValueLower);
+
+                        break;
+                    case 'InputTitle':
+                        $validation->setPromptTitle($tagValue);
+
+                        break;
+                    case 'InputMessage':
+                        $validation->setPrompt($tagValue);
+
+                        break;
+                    case 'InputHide':
+                        $validation->setShowInputMessage(false);
+
+                        break;
+                    case 'ErrorStyle':
+                        $validation->setErrorStyle($tagValueLower);
+
+                        break;
+                    case 'ErrorTitle':
+                        $validation->setErrorTitle($tagValue);
+
+                        break;
+                    case 'ErrorMessage':
+                        $validation->setError($tagValue);
+
+                        break;
+                    case 'ErrorHide':
+                        $validation->setShowErrorMessage(false);
+
+                        break;
+                    case 'ComboHide':
+                        $validation->setShowDropDown(false);
+
+                        break;
+                    case 'UseBlank':
+                        $validation->setAllowBlank(true);
+
+                        break;
+                    case 'CellRangeList':
+                        // FIXME missing FIXME
+
+                        break;
+                    case 'Min':
+                    case 'Value':
+                        $tagValue = (string) preg_replace_callback(AddressHelper::R1C1_COORDINATE_REGEX, $pregCallback, $tagValue);
+                        $validation->setFormula1($tagValue);
+
+                        break;
+                    case 'Max':
+                        $tagValue = (string) preg_replace_callback(AddressHelper::R1C1_COORDINATE_REGEX, $pregCallback, $tagValue);
+                        $validation->setFormula2($tagValue);
+
+                        break;
+                }
+            }
+
+            foreach ($cells as $cell) {
+                $sheet->getCell($cell)->setDataValidation(clone $validation);
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
new file mode 100644
index 00000000..8f9d4645
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use SimpleXMLElement;
+use stdClass;
+
+class PageSettings
+{
+    private stdClass $printSettings;
+
+    public function __construct(SimpleXMLElement $xmlX)
+    {
+        $printSettings = $this->pageSetup($xmlX, $this->getPrintDefaults());
+        $this->printSettings = $this->printSetup($xmlX, $printSettings);
+    }
+
+    public function loadPageSettings(Spreadsheet $spreadsheet): void
+    {
+        $spreadsheet->getActiveSheet()->getPageSetup()
+            ->setPaperSize($this->printSettings->paperSize)
+            ->setOrientation($this->printSettings->orientation)
+            ->setScale($this->printSettings->scale)
+            ->setVerticalCentered($this->printSettings->verticalCentered)
+            ->setHorizontalCentered($this->printSettings->horizontalCentered)
+            ->setPageOrder($this->printSettings->printOrder);
+        $spreadsheet->getActiveSheet()->getPageMargins()
+            ->setTop($this->printSettings->topMargin)
+            ->setHeader($this->printSettings->headerMargin)
+            ->setLeft($this->printSettings->leftMargin)
+            ->setRight($this->printSettings->rightMargin)
+            ->setBottom($this->printSettings->bottomMargin)
+            ->setFooter($this->printSettings->footerMargin);
+    }
+
+    private function getPrintDefaults(): stdClass
+    {
+        return (object) [
+            'paperSize' => 9,
+            'orientation' => PageSetup::ORIENTATION_DEFAULT,
+            'scale' => 100,
+            'horizontalCentered' => false,
+            'verticalCentered' => false,
+            'printOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            'topMargin' => 0.75,
+            'headerMargin' => 0.3,
+            'leftMargin' => 0.7,
+            'rightMargin' => 0.7,
+            'bottomMargin' => 0.75,
+            'footerMargin' => 0.3,
+        ];
+    }
+
+    private function pageSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): stdClass
+    {
+        if (isset($xmlX->WorksheetOptions->PageSetup)) {
+            foreach ($xmlX->WorksheetOptions->PageSetup as $pageSetupData) {
+                foreach ($pageSetupData as $pageSetupKey => $pageSetupValue) {
+                    $pageSetupAttributes = $pageSetupValue->attributes(Namespaces::URN_EXCEL);
+                    if ($pageSetupAttributes !== null) {
+                        switch ($pageSetupKey) {
+                            case 'Layout':
+                                $this->setLayout($printDefaults, $pageSetupAttributes);
+
+                                break;
+                            case 'Header':
+                                $printDefaults->headerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
+
+                                break;
+                            case 'Footer':
+                                $printDefaults->footerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
+
+                                break;
+                            case 'PageMargins':
+                                $this->setMargins($printDefaults, $pageSetupAttributes);
+
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $printDefaults;
+    }
+
+    private function printSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): stdClass
+    {
+        if (isset($xmlX->WorksheetOptions->Print)) {
+            foreach ($xmlX->WorksheetOptions->Print as $printData) {
+                foreach ($printData as $printKey => $printValue) {
+                    switch ($printKey) {
+                        case 'LeftToRight':
+                            $printDefaults->printOrder = PageSetup::PAGEORDER_OVER_THEN_DOWN;
+
+                            break;
+                        case 'PaperSizeIndex':
+                            $printDefaults->paperSize = (int) $printValue ?: 9;
+
+                            break;
+                        case 'Scale':
+                            $printDefaults->scale = (int) $printValue ?: 100;
+
+                            break;
+                    }
+                }
+            }
+        }
+
+        return $printDefaults;
+    }
+
+    private function setLayout(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
+    {
+        $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation ?? '') ?: PageSetup::ORIENTATION_PORTRAIT;
+        $printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
+        $printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
+    }
+
+    private function setMargins(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
+    {
+        $printDefaults->leftMargin = (float) $pageSetupAttributes->Left ?: 1.0;
+        $printDefaults->rightMargin = (float) $pageSetupAttributes->Right ?: 1.0;
+        $printDefaults->topMargin = (float) $pageSetupAttributes->Top ?: 1.0;
+        $printDefaults->bottomMargin = (float) $pageSetupAttributes->Bottom ?: 1.0;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php
new file mode 100644
index 00000000..17e11213
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Document\Properties as DocumentProperties;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class Properties
+{
+    protected Spreadsheet $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function readProperties(SimpleXMLElement $xml, array $namespaces): void
+    {
+        $this->readStandardProperties($xml);
+        $this->readCustomProperties($xml, $namespaces);
+    }
+
+    protected function readStandardProperties(SimpleXMLElement $xml): void
+    {
+        if (isset($xml->DocumentProperties[0])) {
+            $docProps = $this->spreadsheet->getProperties();
+
+            foreach ($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
+                $propertyValue = (string) $propertyValue;
+
+                $this->processStandardProperty($docProps, $propertyName, $propertyValue);
+            }
+        }
+    }
+
+    protected function readCustomProperties(SimpleXMLElement $xml, array $namespaces): void
+    {
+        if (isset($xml->CustomDocumentProperties) && is_iterable($xml->CustomDocumentProperties[0])) {
+            $docProps = $this->spreadsheet->getProperties();
+
+            foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
+                $propertyAttributes = self::getAttributes($propertyValue, $namespaces['dt']);
+                $propertyName = (string) preg_replace_callback('/_x([0-9a-f]{4})_/i', [$this, 'hex2str'], $propertyName);
+
+                $this->processCustomProperty($docProps, $propertyName, $propertyValue, $propertyAttributes);
+            }
+        }
+    }
+
+    protected function processStandardProperty(
+        DocumentProperties $docProps,
+        string $propertyName,
+        string $stringValue
+    ): void {
+        switch ($propertyName) {
+            case 'Title':
+                $docProps->setTitle($stringValue);
+
+                break;
+            case 'Subject':
+                $docProps->setSubject($stringValue);
+
+                break;
+            case 'Author':
+                $docProps->setCreator($stringValue);
+
+                break;
+            case 'Created':
+                $docProps->setCreated($stringValue);
+
+                break;
+            case 'LastAuthor':
+                $docProps->setLastModifiedBy($stringValue);
+
+                break;
+            case 'LastSaved':
+                $docProps->setModified($stringValue);
+
+                break;
+            case 'Company':
+                $docProps->setCompany($stringValue);
+
+                break;
+            case 'Category':
+                $docProps->setCategory($stringValue);
+
+                break;
+            case 'Manager':
+                $docProps->setManager($stringValue);
+
+                break;
+            case 'HyperlinkBase':
+                $docProps->setHyperlinkBase($stringValue);
+
+                break;
+            case 'Keywords':
+                $docProps->setKeywords($stringValue);
+
+                break;
+            case 'Description':
+                $docProps->setDescription($stringValue);
+
+                break;
+        }
+    }
+
+    protected function processCustomProperty(
+        DocumentProperties $docProps,
+        string $propertyName,
+        ?SimpleXMLElement $propertyValue,
+        SimpleXMLElement $propertyAttributes
+    ): void {
+        switch ((string) $propertyAttributes) {
+            case 'boolean':
+                $propertyType = DocumentProperties::PROPERTY_TYPE_BOOLEAN;
+                $propertyValue = (bool) (string) $propertyValue;
+
+                break;
+            case 'integer':
+                $propertyType = DocumentProperties::PROPERTY_TYPE_INTEGER;
+                $propertyValue = (int) $propertyValue;
+
+                break;
+            case 'float':
+                $propertyType = DocumentProperties::PROPERTY_TYPE_FLOAT;
+                $propertyValue = (float) $propertyValue;
+
+                break;
+            case 'dateTime.tz':
+            case 'dateTime.iso8601tz':
+                $propertyType = DocumentProperties::PROPERTY_TYPE_DATE;
+                $propertyValue = trim((string) $propertyValue);
+
+                break;
+            default:
+                $propertyType = DocumentProperties::PROPERTY_TYPE_STRING;
+                $propertyValue = trim((string) $propertyValue);
+
+                break;
+        }
+
+        $docProps->setCustomProperty($propertyName, $propertyValue, $propertyType);
+    }
+
+    protected function hex2str(array $hex): string
+    {
+        return mb_chr((int) hexdec($hex[1]), 'UTF-8');
+    }
+
+    private static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
+    {
+        return ($simple === null) ? new SimpleXMLElement('<xml></xml>') : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php
new file mode 100644
index 00000000..c6b51494
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+use SimpleXMLElement;
+
+class Style
+{
+    /**
+     * Formats.
+     */
+    protected array $styles = [];
+
+    public function parseStyles(SimpleXMLElement $xml, array $namespaces): array
+    {
+        $children = $xml->children('urn:schemas-microsoft-com:office:spreadsheet');
+        $stylesXml = $children->Styles[0];
+        if (!isset($stylesXml) || !is_iterable($stylesXml)) {
+            return [];
+        }
+
+        $alignmentStyleParser = new Style\Alignment();
+        $borderStyleParser = new Style\Border();
+        $fontStyleParser = new Style\Font();
+        $fillStyleParser = new Style\Fill();
+        $numberFormatStyleParser = new Style\NumberFormat();
+
+        foreach ($stylesXml as $style) {
+            $style_ss = self::getAttributes($style, $namespaces['ss']);
+            $styleID = (string) $style_ss['ID'];
+            $this->styles[$styleID] = $this->styles['Default'] ?? [];
+
+            $alignment = $border = $font = $fill = $numberFormat = $protection = [];
+
+            foreach ($style as $styleType => $styleDatax) {
+                $styleData = self::getSxml($styleDatax);
+                $styleAttributes = $styleData->attributes($namespaces['ss']);
+
+                switch ($styleType) {
+                    case 'Alignment':
+                        if ($styleAttributes) {
+                            $alignment = $alignmentStyleParser->parseStyle($styleAttributes);
+                        }
+
+                        break;
+                    case 'Borders':
+                        $border = $borderStyleParser->parseStyle($styleData, $namespaces);
+
+                        break;
+                    case 'Font':
+                        if ($styleAttributes) {
+                            $font = $fontStyleParser->parseStyle($styleAttributes);
+                        }
+
+                        break;
+                    case 'Interior':
+                        if ($styleAttributes) {
+                            $fill = $fillStyleParser->parseStyle($styleAttributes);
+                        }
+
+                        break;
+                    case 'NumberFormat':
+                        if ($styleAttributes) {
+                            $numberFormat = $numberFormatStyleParser->parseStyle($styleAttributes);
+                        }
+
+                        break;
+                    case 'Protection':
+                        $locked = $hidden = null;
+                        $styleAttributesP = $styleData->attributes($namespaces['x']);
+                        if (isset($styleAttributes['Protected'])) {
+                            $locked = ((bool) (string) $styleAttributes['Protected']) ? Protection::PROTECTION_PROTECTED : Protection::PROTECTION_UNPROTECTED;
+                        }
+                        if (isset($styleAttributesP['HideFormula'])) {
+                            $hidden = ((bool) (string) $styleAttributesP['HideFormula']) ? Protection::PROTECTION_PROTECTED : Protection::PROTECTION_UNPROTECTED;
+                        }
+                        if ($locked !== null || $hidden !== null) {
+                            $protection['protection'] = [];
+                            if ($locked !== null) {
+                                $protection['protection']['locked'] = $locked;
+                            }
+                            if ($hidden !== null) {
+                                $protection['protection']['hidden'] = $hidden;
+                            }
+                        }
+
+                        break;
+                }
+            }
+
+            $this->styles[$styleID] = array_merge($alignment, $border, $font, $fill, $numberFormat, $protection);
+        }
+
+        return $this->styles;
+    }
+
+    private static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
+    {
+        return ($simple === null) ? new SimpleXMLElement('<xml></xml>') : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+    }
+
+    private static function getSxml(?SimpleXMLElement $simple): SimpleXMLElement
+    {
+        return ($simple !== null) ? $simple : new SimpleXMLElement('<xml></xml>');
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Alignment.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Alignment.php
new file mode 100644
index 00000000..d1363548
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Alignment.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Alignment as AlignmentStyles;
+use SimpleXMLElement;
+
+class Alignment extends StyleBase
+{
+    protected const VERTICAL_ALIGNMENT_STYLES = [
+        AlignmentStyles::VERTICAL_BOTTOM,
+        AlignmentStyles::VERTICAL_TOP,
+        AlignmentStyles::VERTICAL_CENTER,
+        AlignmentStyles::VERTICAL_JUSTIFY,
+    ];
+
+    protected const HORIZONTAL_ALIGNMENT_STYLES = [
+        AlignmentStyles::HORIZONTAL_GENERAL,
+        AlignmentStyles::HORIZONTAL_LEFT,
+        AlignmentStyles::HORIZONTAL_RIGHT,
+        AlignmentStyles::HORIZONTAL_CENTER,
+        AlignmentStyles::HORIZONTAL_CENTER_CONTINUOUS,
+        AlignmentStyles::HORIZONTAL_JUSTIFY,
+    ];
+
+    public function parseStyle(SimpleXMLElement $styleAttributes): array
+    {
+        $style = [];
+
+        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+            $styleAttributeValue = (string) $styleAttributeValue;
+            switch ($styleAttributeKey) {
+                case 'Vertical':
+                    if (self::identifyFixedStyleValue(self::VERTICAL_ALIGNMENT_STYLES, $styleAttributeValue)) {
+                        $style['alignment']['vertical'] = $styleAttributeValue;
+                    }
+
+                    break;
+                case 'Horizontal':
+                    if (self::identifyFixedStyleValue(self::HORIZONTAL_ALIGNMENT_STYLES, $styleAttributeValue)) {
+                        $style['alignment']['horizontal'] = $styleAttributeValue;
+                    }
+
+                    break;
+                case 'WrapText':
+                    $style['alignment']['wrapText'] = true;
+
+                    break;
+                case 'Rotate':
+                    $style['alignment']['textRotation'] = $styleAttributeValue;
+
+                    break;
+            }
+        }
+
+        return $style;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php
new file mode 100644
index 00000000..dfde17ae
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Border as BorderStyle;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use SimpleXMLElement;
+
+class Border extends StyleBase
+{
+    protected const BORDER_POSITIONS = [
+        'top',
+        'left',
+        'bottom',
+        'right',
+    ];
+
+    /**
+     * @var array
+     */
+    public const BORDER_MAPPINGS = [
+        'borderStyle' => [
+            'continuous' => BorderStyle::BORDER_HAIR,
+            'dash' => BorderStyle::BORDER_DASHED,
+            'dashdot' => BorderStyle::BORDER_DASHDOT,
+            'dashdotdot' => BorderStyle::BORDER_DASHDOTDOT,
+            'dot' => BorderStyle::BORDER_DOTTED,
+            'double' => BorderStyle::BORDER_DOUBLE,
+            '0continuous' => BorderStyle::BORDER_HAIR,
+            '0dash' => BorderStyle::BORDER_DASHED,
+            '0dashdot' => BorderStyle::BORDER_DASHDOT,
+            '0dashdotdot' => BorderStyle::BORDER_DASHDOTDOT,
+            '0dot' => BorderStyle::BORDER_DOTTED,
+            '0double' => BorderStyle::BORDER_DOUBLE,
+            '1continuous' => BorderStyle::BORDER_THIN,
+            '1dash' => BorderStyle::BORDER_DASHED,
+            '1dashdot' => BorderStyle::BORDER_DASHDOT,
+            '1dashdotdot' => BorderStyle::BORDER_DASHDOTDOT,
+            '1dot' => BorderStyle::BORDER_DOTTED,
+            '1double' => BorderStyle::BORDER_DOUBLE,
+            '2continuous' => BorderStyle::BORDER_MEDIUM,
+            '2dash' => BorderStyle::BORDER_MEDIUMDASHED,
+            '2dashdot' => BorderStyle::BORDER_MEDIUMDASHDOT,
+            '2dashdotdot' => BorderStyle::BORDER_MEDIUMDASHDOTDOT,
+            '2dot' => BorderStyle::BORDER_DOTTED,
+            '2double' => BorderStyle::BORDER_DOUBLE,
+            '3continuous' => BorderStyle::BORDER_THICK,
+            '3dash' => BorderStyle::BORDER_MEDIUMDASHED,
+            '3dashdot' => BorderStyle::BORDER_MEDIUMDASHDOT,
+            '3dashdotdot' => BorderStyle::BORDER_MEDIUMDASHDOTDOT,
+            '3dot' => BorderStyle::BORDER_DOTTED,
+            '3double' => BorderStyle::BORDER_DOUBLE,
+        ],
+    ];
+
+    public function parseStyle(SimpleXMLElement $styleData, array $namespaces): array
+    {
+        $style = [];
+
+        $diagonalDirection = '';
+        $borderPosition = '';
+        foreach ($styleData->Border as $borderStyle) {
+            $borderAttributes = self::getAttributes($borderStyle, $namespaces['ss']);
+            $thisBorder = [];
+            $styleType = (string) $borderAttributes->Weight;
+            $styleType .= strtolower((string) $borderAttributes->LineStyle);
+            $thisBorder['borderStyle'] = self::BORDER_MAPPINGS['borderStyle'][$styleType] ?? BorderStyle::BORDER_NONE;
+
+            foreach ($borderAttributes as $borderStyleKey => $borderStyleValuex) {
+                $borderStyleValue = (string) $borderStyleValuex;
+                switch ($borderStyleKey) {
+                    case 'Position':
+                        [$borderPosition, $diagonalDirection]
+                            = $this->parsePosition($borderStyleValue, $diagonalDirection);
+
+                        break;
+                    case 'Color':
+                        $borderColour = substr($borderStyleValue, 1);
+                        $thisBorder['color']['rgb'] = $borderColour;
+
+                        break;
+                }
+            }
+
+            if ($borderPosition) {
+                $style['borders'][$borderPosition] = $thisBorder;
+            } elseif ($diagonalDirection) {
+                $style['borders']['diagonalDirection'] = $diagonalDirection;
+                $style['borders']['diagonal'] = $thisBorder;
+            }
+        }
+
+        return $style;
+    }
+
+    protected function parsePosition(string $borderStyleValue, string $diagonalDirection): array
+    {
+        $borderStyleValue = strtolower($borderStyleValue);
+
+        if (in_array($borderStyleValue, self::BORDER_POSITIONS)) {
+            $borderPosition = $borderStyleValue;
+        } elseif ($borderStyleValue === 'diagonalleft') {
+            $diagonalDirection = $diagonalDirection ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_DOWN;
+        } elseif ($borderStyleValue === 'diagonalright') {
+            $diagonalDirection = $diagonalDirection ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_UP;
+        }
+
+        return [$borderPosition ?? null, $diagonalDirection];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Fill.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Fill.php
new file mode 100644
index 00000000..9a612152
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Fill.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Fill as FillStyles;
+use SimpleXMLElement;
+
+class Fill extends StyleBase
+{
+    /**
+     * @var array
+     */
+    public const FILL_MAPPINGS = [
+        'fillType' => [
+            'solid' => FillStyles::FILL_SOLID,
+            'gray75' => FillStyles::FILL_PATTERN_DARKGRAY,
+            'gray50' => FillStyles::FILL_PATTERN_MEDIUMGRAY,
+            'gray25' => FillStyles::FILL_PATTERN_LIGHTGRAY,
+            'gray125' => FillStyles::FILL_PATTERN_GRAY125,
+            'gray0625' => FillStyles::FILL_PATTERN_GRAY0625,
+            'horzstripe' => FillStyles::FILL_PATTERN_DARKHORIZONTAL, // horizontal stripe
+            'vertstripe' => FillStyles::FILL_PATTERN_DARKVERTICAL, // vertical stripe
+            'reversediagstripe' => FillStyles::FILL_PATTERN_DARKUP, // reverse diagonal stripe
+            'diagstripe' => FillStyles::FILL_PATTERN_DARKDOWN, // diagonal stripe
+            'diagcross' => FillStyles::FILL_PATTERN_DARKGRID, // diagoanl crosshatch
+            'thickdiagcross' => FillStyles::FILL_PATTERN_DARKTRELLIS, // thick diagonal crosshatch
+            'thinhorzstripe' => FillStyles::FILL_PATTERN_LIGHTHORIZONTAL,
+            'thinvertstripe' => FillStyles::FILL_PATTERN_LIGHTVERTICAL,
+            'thinreversediagstripe' => FillStyles::FILL_PATTERN_LIGHTUP,
+            'thindiagstripe' => FillStyles::FILL_PATTERN_LIGHTDOWN,
+            'thinhorzcross' => FillStyles::FILL_PATTERN_LIGHTGRID, // thin horizontal crosshatch
+            'thindiagcross' => FillStyles::FILL_PATTERN_LIGHTTRELLIS, // thin diagonal crosshatch
+        ],
+    ];
+
+    public function parseStyle(SimpleXMLElement $styleAttributes): array
+    {
+        $style = [];
+
+        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValuex) {
+            $styleAttributeValue = (string) $styleAttributeValuex;
+            switch ($styleAttributeKey) {
+                case 'Color':
+                    $style['fill']['endColor']['rgb'] = substr($styleAttributeValue, 1);
+                    $style['fill']['startColor']['rgb'] = substr($styleAttributeValue, 1);
+
+                    break;
+                case 'PatternColor':
+                    $style['fill']['startColor']['rgb'] = substr($styleAttributeValue, 1);
+
+                    break;
+                case 'Pattern':
+                    $lcStyleAttributeValue = strtolower((string) $styleAttributeValue);
+                    $style['fill']['fillType']
+                        = self::FILL_MAPPINGS['fillType'][$lcStyleAttributeValue] ?? FillStyles::FILL_NONE;
+
+                    break;
+            }
+        }
+
+        return $style;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php
new file mode 100644
index 00000000..5f824889
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Font as FontUnderline;
+use SimpleXMLElement;
+
+class Font extends StyleBase
+{
+    protected const UNDERLINE_STYLES = [
+        FontUnderline::UNDERLINE_NONE,
+        FontUnderline::UNDERLINE_DOUBLE,
+        FontUnderline::UNDERLINE_DOUBLEACCOUNTING,
+        FontUnderline::UNDERLINE_SINGLE,
+        FontUnderline::UNDERLINE_SINGLEACCOUNTING,
+    ];
+
+    protected function parseUnderline(array $style, string $styleAttributeValue): array
+    {
+        if (self::identifyFixedStyleValue(self::UNDERLINE_STYLES, $styleAttributeValue)) {
+            $style['font']['underline'] = $styleAttributeValue;
+        }
+
+        return $style;
+    }
+
+    protected function parseVerticalAlign(array $style, string $styleAttributeValue): array
+    {
+        if ($styleAttributeValue == 'Superscript') {
+            $style['font']['superscript'] = true;
+        }
+        if ($styleAttributeValue == 'Subscript') {
+            $style['font']['subscript'] = true;
+        }
+
+        return $style;
+    }
+
+    public function parseStyle(SimpleXMLElement $styleAttributes): array
+    {
+        $style = [];
+
+        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+            $styleAttributeValue = (string) $styleAttributeValue;
+            switch ($styleAttributeKey) {
+                case 'FontName':
+                    $style['font']['name'] = $styleAttributeValue;
+
+                    break;
+                case 'Size':
+                    $style['font']['size'] = $styleAttributeValue;
+
+                    break;
+                case 'Color':
+                    $style['font']['color']['rgb'] = substr($styleAttributeValue, 1);
+
+                    break;
+                case 'Bold':
+                    $style['font']['bold'] = $styleAttributeValue === '1';
+
+                    break;
+                case 'Italic':
+                    $style['font']['italic'] = $styleAttributeValue === '1';
+
+                    break;
+                case 'Underline':
+                    $style = $this->parseUnderline($style, $styleAttributeValue);
+
+                    break;
+                case 'VerticalAlign':
+                    $style = $this->parseVerticalAlign($style, $styleAttributeValue);
+
+                    break;
+            }
+        }
+
+        return $style;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/NumberFormat.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/NumberFormat.php
new file mode 100644
index 00000000..a31aa9eb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/NumberFormat.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use SimpleXMLElement;
+
+class NumberFormat extends StyleBase
+{
+    public function parseStyle(SimpleXMLElement $styleAttributes): array
+    {
+        $style = [];
+
+        $fromFormats = ['\-', '\ '];
+        $toFormats = ['-', ' '];
+
+        foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+            $styleAttributeValue = str_replace($fromFormats, $toFormats, $styleAttributeValue);
+
+            switch ($styleAttributeValue) {
+                case 'Short Date':
+                    $styleAttributeValue = 'dd/mm/yyyy';
+
+                    break;
+            }
+
+            if ($styleAttributeValue > '') {
+                $style['numberFormat']['formatCode'] = $styleAttributeValue;
+            }
+        }
+
+        return $style;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php
new file mode 100644
index 00000000..8103a71c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
+
+use SimpleXMLElement;
+
+abstract class StyleBase
+{
+    protected static function identifyFixedStyleValue(array $styleList, string &$styleAttributeValue): bool
+    {
+        $returnValue = false;
+
+        $styleAttributeValue = strtolower($styleAttributeValue);
+        foreach ($styleList as $style) {
+            if ($styleAttributeValue == strtolower($style)) {
+                $styleAttributeValue = $style;
+                $returnValue = true;
+
+                break;
+            }
+        }
+
+        return $returnValue;
+    }
+
+    protected static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
+    {
+        return ($simple === null) ? new SimpleXMLElement('<xml></xml>') : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
new file mode 100644
index 00000000..c8acfd8c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
@@ -0,0 +1,1235 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class ReferenceHelper
+{
+    /**    Constants                */
+    /**    Regular Expressions      */
+    private const SHEETNAME_PART = '((\w*|\'[^!]*\')!)';
+    private const SHEETNAME_PART_WITH_SLASHES = '/' . self::SHEETNAME_PART . '/';
+    const REFHELPER_REGEXP_CELLREF = self::SHEETNAME_PART . '?(?<![:a-z1-9_\.\$])(\$?[a-z]{1,3}\$?\d+)(?=[^:!\d\'])';
+    const REFHELPER_REGEXP_CELLRANGE = self::SHEETNAME_PART . '?(\$?[a-z]{1,3}\$?\d+):(\$?[a-z]{1,3}\$?\d+)';
+    const REFHELPER_REGEXP_ROWRANGE = self::SHEETNAME_PART . '?(\$?\d+):(\$?\d+)';
+    const REFHELPER_REGEXP_COLRANGE = self::SHEETNAME_PART . '?(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
+
+    /**
+     * Instance of this class.
+     *
+     * @var ?ReferenceHelper
+     */
+    private static ?ReferenceHelper $instance = null;
+
+    private ?CellReferenceHelper $cellReferenceHelper = null;
+
+    /**
+     * Get an instance of this class.
+     */
+    public static function getInstance(): self
+    {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Create a new ReferenceHelper.
+     */
+    protected function __construct()
+    {
+    }
+
+    /**
+     * Compare two column addresses
+     * Intended for use as a Callback function for sorting column addresses by column.
+     *
+     * @param string $a First column to test (e.g. 'AA')
+     * @param string $b Second column to test (e.g. 'Z')
+     */
+    public static function columnSort(string $a, string $b): int
+    {
+        return strcasecmp(strlen($a) . $a, strlen($b) . $b);
+    }
+
+    /**
+     * Compare two column addresses
+     * Intended for use as a Callback function for reverse sorting column addresses by column.
+     *
+     * @param string $a First column to test (e.g. 'AA')
+     * @param string $b Second column to test (e.g. 'Z')
+     */
+    public static function columnReverseSort(string $a, string $b): int
+    {
+        return -strcasecmp(strlen($a) . $a, strlen($b) . $b);
+    }
+
+    /**
+     * Compare two cell addresses
+     * Intended for use as a Callback function for sorting cell addresses by column and row.
+     *
+     * @param string $a First cell to test (e.g. 'AA1')
+     * @param string $b Second cell to test (e.g. 'Z1')
+     */
+    public static function cellSort(string $a, string $b): int
+    {
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        /** @var int $ar */
+        /** @var string $ac */
+        sscanf($b, '%[A-Z]%d', $bc, $br);
+        /** @var int $br */
+        /** @var string $bc */
+        if ($ar === $br) {
+            return strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
+        }
+
+        return ($ar < $br) ? -1 : 1;
+    }
+
+    /**
+     * Compare two cell addresses
+     * Intended for use as a Callback function for sorting cell addresses by column and row.
+     *
+     * @param string $a First cell to test (e.g. 'AA1')
+     * @param string $b Second cell to test (e.g. 'Z1')
+     */
+    public static function cellReverseSort(string $a, string $b): int
+    {
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        /** @var int $ar */
+        /** @var string $ac */
+        sscanf($b, '%[A-Z]%d', $bc, $br);
+        /** @var int $br */
+        /** @var string $bc */
+        if ($ar === $br) {
+            return -strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
+        }
+
+        return ($ar < $br) ? 1 : -1;
+    }
+
+    /**
+     * Update page breaks when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustPageBreaks(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
+    {
+        $aBreaks = $worksheet->getBreaks();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aBreaks, [self::class, 'cellReverseSort'])
+            : uksort($aBreaks, [self::class, 'cellSort']);
+
+        foreach ($aBreaks as $cellAddress => $value) {
+            /** @var CellReferenceHelper */
+            $cellReferenceHelper = $this->cellReferenceHelper;
+            if ($cellReferenceHelper->cellAddressInDeleteRange($cellAddress) === true) {
+                //    If we're deleting, then clear any defined breaks that are within the range
+                //        of rows/columns that we're deleting
+                $worksheet->setBreak($cellAddress, Worksheet::BREAK_NONE);
+            } else {
+                //    Otherwise update any affected breaks by inserting a new break at the appropriate point
+                //        and removing the old affected break
+                $newReference = $this->updateCellReference($cellAddress);
+                if ($cellAddress !== $newReference) {
+                    $worksheet->setBreak($newReference, $value)
+                        ->setBreak($cellAddress, Worksheet::BREAK_NONE);
+                }
+            }
+        }
+    }
+
+    /**
+     * Update cell comments when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     */
+    protected function adjustComments(Worksheet $worksheet): void
+    {
+        $aComments = $worksheet->getComments();
+        $aNewComments = []; // the new array of all comments
+
+        foreach ($aComments as $cellAddress => &$value) {
+            // Any comments inside a deleted range will be ignored
+            /** @var CellReferenceHelper */
+            $cellReferenceHelper = $this->cellReferenceHelper;
+            if ($cellReferenceHelper->cellAddressInDeleteRange($cellAddress) === false) {
+                // Otherwise build a new array of comments indexed by the adjusted cell reference
+                $newReference = $this->updateCellReference($cellAddress);
+                $aNewComments[$newReference] = $value;
+            }
+        }
+        //    Replace the comments array with the new set of comments
+        $worksheet->setComments($aNewComments);
+    }
+
+    /**
+     * Update hyperlinks when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustHyperlinks(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
+    {
+        $aHyperlinkCollection = $worksheet->getHyperlinkCollection();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aHyperlinkCollection, [self::class, 'cellReverseSort'])
+            : uksort($aHyperlinkCollection, [self::class, 'cellSort']);
+
+        foreach ($aHyperlinkCollection as $cellAddress => $value) {
+            $newReference = $this->updateCellReference($cellAddress);
+            /** @var CellReferenceHelper */
+            $cellReferenceHelper = $this->cellReferenceHelper;
+            if ($cellReferenceHelper->cellAddressInDeleteRange($cellAddress) === true) {
+                $worksheet->setHyperlink($cellAddress, null);
+            } elseif ($cellAddress !== $newReference) {
+                $worksheet->setHyperlink($newReference, $value);
+                $worksheet->setHyperlink($cellAddress, null);
+            }
+        }
+    }
+
+    /**
+     * Update conditional formatting styles when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustConditionalFormatting(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
+    {
+        $aStyles = $worksheet->getConditionalStylesCollection();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aStyles, [self::class, 'cellReverseSort'])
+            : uksort($aStyles, [self::class, 'cellSort']);
+
+        foreach ($aStyles as $cellAddress => $cfRules) {
+            $worksheet->removeConditionalStyles($cellAddress);
+            $newReference = $this->updateCellReference($cellAddress);
+
+            foreach ($cfRules as &$cfRule) {
+                /** @var Conditional $cfRule */
+                $conditions = $cfRule->getConditions();
+                foreach ($conditions as &$condition) {
+                    if (is_string($condition)) {
+                        /** @var CellReferenceHelper */
+                        $cellReferenceHelper = $this->cellReferenceHelper;
+                        $condition = $this->updateFormulaReferences(
+                            $condition,
+                            $cellReferenceHelper->beforeCellAddress(),
+                            $numberOfColumns,
+                            $numberOfRows,
+                            $worksheet->getTitle(),
+                            true
+                        );
+                    }
+                }
+                $cfRule->setConditions($conditions);
+            }
+            $worksheet->setConditionalStyles($newReference, $cfRules);
+        }
+    }
+
+    /**
+     * Update data validations when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustDataValidations(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
+    {
+        $aDataValidationCollection = $worksheet->getDataValidationCollection();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aDataValidationCollection, [self::class, 'cellReverseSort'])
+            : uksort($aDataValidationCollection, [self::class, 'cellSort']);
+
+        foreach ($aDataValidationCollection as $cellAddress => $dataValidation) {
+            $newReference = $this->updateCellReference($cellAddress);
+            if ($cellAddress !== $newReference) {
+                $dataValidation->setSqref($newReference);
+                $worksheet->setDataValidation($newReference, $dataValidation);
+                $worksheet->setDataValidation($cellAddress, null);
+            }
+        }
+    }
+
+    /**
+     * Update merged cells when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     */
+    protected function adjustMergeCells(Worksheet $worksheet): void
+    {
+        $aMergeCells = $worksheet->getMergeCells();
+        $aNewMergeCells = []; // the new array of all merge cells
+        foreach ($aMergeCells as $cellAddress => &$value) {
+            $newReference = $this->updateCellReference($cellAddress);
+            $aNewMergeCells[$newReference] = $newReference;
+        }
+        $worksheet->setMergeCells($aNewMergeCells); // replace the merge cells array
+    }
+
+    /**
+     * Update protected cells when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustProtectedCells(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
+    {
+        $aProtectedCells = $worksheet->getProtectedCells();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aProtectedCells, [self::class, 'cellReverseSort'])
+            : uksort($aProtectedCells, [self::class, 'cellSort']);
+        foreach ($aProtectedCells as $cellAddress => $value) {
+            $newReference = $this->updateCellReference($cellAddress);
+            if ($cellAddress !== $newReference) {
+                $worksheet->protectCells($newReference, $value, true);
+                $worksheet->unprotectCells($cellAddress);
+            }
+        }
+    }
+
+    /**
+     * Update column dimensions when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     */
+    protected function adjustColumnDimensions(Worksheet $worksheet): void
+    {
+        $aColumnDimensions = array_reverse($worksheet->getColumnDimensions(), true);
+        if (!empty($aColumnDimensions)) {
+            foreach ($aColumnDimensions as $objColumnDimension) {
+                $newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1');
+                [$newReference] = Coordinate::coordinateFromString($newReference);
+                if ($objColumnDimension->getColumnIndex() !== $newReference) {
+                    $objColumnDimension->setColumnIndex($newReference);
+                }
+            }
+
+            $worksheet->refreshColumnDimensions();
+        }
+    }
+
+    /**
+     * Update row dimensions when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $beforeRow Number of the row we're inserting/deleting before
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustRowDimensions(Worksheet $worksheet, int $beforeRow, int $numberOfRows): void
+    {
+        $aRowDimensions = array_reverse($worksheet->getRowDimensions(), true);
+        if (!empty($aRowDimensions)) {
+            foreach ($aRowDimensions as $objRowDimension) {
+                $newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex());
+                [, $newReference] = Coordinate::coordinateFromString($newReference);
+                $newRoweference = (int) $newReference;
+                if ($objRowDimension->getRowIndex() !== $newRoweference) {
+                    $objRowDimension->setRowIndex($newRoweference);
+                }
+            }
+
+            $worksheet->refreshRowDimensions();
+
+            $copyDimension = $worksheet->getRowDimension($beforeRow - 1);
+            for ($i = $beforeRow; $i <= $beforeRow - 1 + $numberOfRows; ++$i) {
+                $newDimension = $worksheet->getRowDimension($i);
+                $newDimension->setRowHeight($copyDimension->getRowHeight());
+                $newDimension->setVisible($copyDimension->getVisible());
+                $newDimension->setOutlineLevel($copyDimension->getOutlineLevel());
+                $newDimension->setCollapsed($copyDimension->getCollapsed());
+            }
+        }
+    }
+
+    /**
+     * Insert a new column or row, updating all possible related data.
+     *
+     * @param string $beforeCellAddress Insert before this cell address (e.g. 'A1')
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
+     */
+    public function insertNewBefore(
+        string $beforeCellAddress,
+        int $numberOfColumns,
+        int $numberOfRows,
+        Worksheet $worksheet
+    ): void {
+        $remove = ($numberOfColumns < 0 || $numberOfRows < 0);
+
+        if (
+            $this->cellReferenceHelper === null
+            || $this->cellReferenceHelper->refreshRequired($beforeCellAddress, $numberOfColumns, $numberOfRows)
+        ) {
+            $this->cellReferenceHelper = new CellReferenceHelper($beforeCellAddress, $numberOfColumns, $numberOfRows);
+        }
+
+        // Get coordinate of $beforeCellAddress
+        [$beforeColumn, $beforeRow, $beforeColumnString] = Coordinate::indexesFromString($beforeCellAddress);
+
+        // Clear cells if we are removing columns or rows
+        $highestColumn = $worksheet->getHighestColumn();
+        $highestDataColumn = $worksheet->getHighestDataColumn();
+        $highestRow = $worksheet->getHighestRow();
+        $highestDataRow = $worksheet->getHighestDataRow();
+
+        // 1. Clear column strips if we are removing columns
+        if ($numberOfColumns < 0 && $beforeColumn - 2 + $numberOfColumns > 0) {
+            $this->clearColumnStrips($highestRow, $beforeColumn, $numberOfColumns, $worksheet);
+        }
+
+        // 2. Clear row strips if we are removing rows
+        if ($numberOfRows < 0 && $beforeRow - 1 + $numberOfRows > 0) {
+            $this->clearRowStrips($highestColumn, $beforeColumn, $beforeRow, $numberOfRows, $worksheet);
+        }
+
+        // Find missing coordinates. This is important when inserting or deleting column before the last column
+        $startRow = $startCol = 1;
+        $startColString = 'A';
+        if ($numberOfRows === 0) {
+            $startCol = $beforeColumn;
+            $startColString = $beforeColumnString;
+        } elseif ($numberOfColumns === 0) {
+            $startRow = $beforeRow;
+        }
+        $highColumn = Coordinate::columnIndexFromString($highestDataColumn);
+        for ($row = $startRow; $row <= $highestDataRow; ++$row) {
+            for ($col = $startCol, $colString = $startColString; $col <= $highColumn; ++$col, ++$colString) {
+                $worksheet->getCell("$colString$row"); // create cell if it doesn't exist
+            }
+        }
+
+        $allCoordinates = $worksheet->getCoordinates();
+        if ($remove) {
+            // It's faster to reverse and pop than to use unshift, especially with large cell collections
+            $allCoordinates = array_reverse($allCoordinates);
+        }
+
+        // Loop through cells, bottom-up, and change cell coordinate
+        while ($coordinate = array_pop($allCoordinates)) {
+            $cell = $worksheet->getCell($coordinate);
+            $cellIndex = Coordinate::columnIndexFromString($cell->getColumn());
+
+            if ($cellIndex - 1 + $numberOfColumns < 0) {
+                continue;
+            }
+
+            // New coordinate
+            $newCoordinate = Coordinate::stringFromColumnIndex($cellIndex + $numberOfColumns) . ($cell->getRow() + $numberOfRows);
+
+            // Should the cell be updated? Move value and cellXf index from one cell to another.
+            if (($cellIndex >= $beforeColumn) && ($cell->getRow() >= $beforeRow)) {
+                // Update cell styles
+                $worksheet->getCell($newCoordinate)->setXfIndex($cell->getXfIndex());
+
+                // Insert this cell at its new location
+                if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                    // Formula should be adjusted
+                    $worksheet->getCell($newCoordinate)
+                        ->setValue($this->updateFormulaReferences($cell->getValueString(), $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true));
+                } else {
+                    // Cell value should not be adjusted
+                    $worksheet->getCell($newCoordinate)->setValueExplicit($cell->getValue(), $cell->getDataType());
+                }
+
+                // Clear the original cell
+                $worksheet->getCellCollection()->delete($coordinate);
+            } else {
+                /*    We don't need to update styles for rows/columns before our insertion position,
+                        but we do still need to adjust any formulae in those cells                    */
+                if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                    // Formula should be adjusted
+                    $cell->setValue($this->updateFormulaReferences($cell->getValueString(), $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true));
+                }
+            }
+        }
+
+        // Duplicate styles for the newly inserted cells
+        $highestColumn = $worksheet->getHighestColumn();
+        $highestRow = $worksheet->getHighestRow();
+
+        if ($numberOfColumns > 0 && $beforeColumn - 2 > 0) {
+            $this->duplicateStylesByColumn($worksheet, $beforeColumn, $beforeRow, $highestRow, $numberOfColumns);
+        }
+
+        if ($numberOfRows > 0 && $beforeRow - 1 > 0) {
+            $this->duplicateStylesByRow($worksheet, $beforeColumn, $beforeRow, $highestColumn, $numberOfRows);
+        }
+
+        // Update worksheet: column dimensions
+        $this->adjustColumnDimensions($worksheet);
+
+        // Update worksheet: row dimensions
+        $this->adjustRowDimensions($worksheet, $beforeRow, $numberOfRows);
+
+        //    Update worksheet: page breaks
+        $this->adjustPageBreaks($worksheet, $numberOfColumns, $numberOfRows);
+
+        //    Update worksheet: comments
+        $this->adjustComments($worksheet);
+
+        // Update worksheet: hyperlinks
+        $this->adjustHyperlinks($worksheet, $numberOfColumns, $numberOfRows);
+
+        // Update worksheet: conditional formatting styles
+        $this->adjustConditionalFormatting($worksheet, $numberOfColumns, $numberOfRows);
+
+        // Update worksheet: data validations
+        $this->adjustDataValidations($worksheet, $numberOfColumns, $numberOfRows);
+
+        // Update worksheet: merge cells
+        $this->adjustMergeCells($worksheet);
+
+        // Update worksheet: protected cells
+        $this->adjustProtectedCells($worksheet, $numberOfColumns, $numberOfRows);
+
+        // Update worksheet: autofilter
+        $this->adjustAutoFilter($worksheet, $beforeCellAddress, $numberOfColumns);
+
+        // Update worksheet: table
+        $this->adjustTable($worksheet, $beforeCellAddress, $numberOfColumns);
+
+        // Update worksheet: freeze pane
+        if ($worksheet->getFreezePane()) {
+            $splitCell = $worksheet->getFreezePane();
+            $topLeftCell = $worksheet->getTopLeftCell() ?? '';
+
+            $splitCell = $this->updateCellReference($splitCell);
+            $topLeftCell = $this->updateCellReference($topLeftCell);
+
+            $worksheet->freezePane($splitCell, $topLeftCell);
+        }
+
+        // Page setup
+        if ($worksheet->getPageSetup()->isPrintAreaSet()) {
+            $worksheet->getPageSetup()->setPrintArea(
+                $this->updateCellReference($worksheet->getPageSetup()->getPrintArea())
+            );
+        }
+
+        // Update worksheet: drawings
+        $aDrawings = $worksheet->getDrawingCollection();
+        foreach ($aDrawings as $objDrawing) {
+            $newReference = $this->updateCellReference($objDrawing->getCoordinates());
+            if ($objDrawing->getCoordinates() != $newReference) {
+                $objDrawing->setCoordinates($newReference);
+            }
+            if ($objDrawing->getCoordinates2() !== '') {
+                $newReference = $this->updateCellReference($objDrawing->getCoordinates2());
+                if ($objDrawing->getCoordinates2() != $newReference) {
+                    $objDrawing->setCoordinates2($newReference);
+                }
+            }
+        }
+
+        // Update workbook: define names
+        if (count($worksheet->getParentOrThrow()->getDefinedNames()) > 0) {
+            $this->updateDefinedNames($worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
+        }
+
+        // Garbage collect
+        $worksheet->garbageCollect();
+    }
+
+    private static function matchSheetName(?string $match, string $worksheetName): bool
+    {
+        return $match === null || $match === '' || $match === "'\u{fffc}'" || $match === "'\u{fffb}'" || strcasecmp(trim($match, "'"), $worksheetName) === 0;
+    }
+
+    private static function sheetnameBeforeCells(string $match, string $worksheetName, string $cells): string
+    {
+        $toString = ($match > '') ? "$match!" : '';
+
+        return str_replace(["\u{fffc}", "'\u{fffb}'"], $worksheetName, $toString) . $cells;
+    }
+
+    /**
+     * Update references within formulas.
+     *
+     * @param string $formula Formula to update
+     * @param string $beforeCellAddress Insert before this one
+     * @param int $numberOfColumns Number of columns to insert
+     * @param int $numberOfRows Number of rows to insert
+     * @param string $worksheetName Worksheet name/title
+     *
+     * @return string Updated formula
+     */
+    public function updateFormulaReferences(
+        string $formula = '',
+        string $beforeCellAddress = 'A1',
+        int $numberOfColumns = 0,
+        int $numberOfRows = 0,
+        string $worksheetName = '',
+        bool $includeAbsoluteReferences = false,
+        bool $onlyAbsoluteReferences = false
+    ): string {
+        $callback = fn (array $matches): string => (strcasecmp(trim($matches[2], "'"), $worksheetName) === 0) ? (($matches[2][0] === "'") ? "'\u{fffc}'!" : "'\u{fffb}'!") : "'\u{fffd}'!";
+        if (
+            $this->cellReferenceHelper === null
+            || $this->cellReferenceHelper->refreshRequired($beforeCellAddress, $numberOfColumns, $numberOfRows)
+        ) {
+            $this->cellReferenceHelper = new CellReferenceHelper($beforeCellAddress, $numberOfColumns, $numberOfRows);
+        }
+
+        //    Update cell references in the formula
+        $formulaBlocks = explode('"', $formula);
+        $i = false;
+        foreach ($formulaBlocks as &$formulaBlock) {
+            //    Ignore blocks that were enclosed in quotes (alternating entries in the $formulaBlocks array after the explode)
+            $i = $i === false;
+            if ($i) {
+                $adjustCount = 0;
+                $newCellTokens = $cellTokens = [];
+                //    Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5)
+                $formulaBlockx = ' ' . (preg_replace_callback(self::SHEETNAME_PART_WITH_SLASHES, $callback, $formulaBlock) ?? $formulaBlock) . ' ';
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_ROWRANGE . '/mui', $formulaBlockx, $matches, PREG_SET_ORDER);
+                if ($matchCount > 0) {
+                    foreach ($matches as $match) {
+                        $fromString = self::sheetnameBeforeCells($match[2], $worksheetName, "{$match[3]}:{$match[4]}");
+                        $modified3 = substr($this->updateCellReference('$A' . $match[3], $includeAbsoluteReferences, $onlyAbsoluteReferences), 2);
+                        $modified4 = substr($this->updateCellReference('$A' . $match[4], $includeAbsoluteReferences, $onlyAbsoluteReferences), 2);
+
+                        if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
+                            if (self::matchSheetName($match[2], $worksheetName)) {
+                                $toString = self::sheetnameBeforeCells($match[2], $worksheetName, "$modified3:$modified4");
+                                //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
+                                $column = 100000;
+                                $row = 10000000 + (int) trim($match[3], '$');
+                                $cellIndex = "{$column}{$row}";
+
+                                $newCellTokens[$cellIndex] = preg_quote($toString, '/');
+                                $cellTokens[$cellIndex] = '/(?<!\d\$\!)' . preg_quote($fromString, '/') . '(?!\d)/i';
+                                ++$adjustCount;
+                            }
+                        }
+                    }
+                }
+                //    Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E)
+                $formulaBlockx = ' ' . (preg_replace_callback(self::SHEETNAME_PART_WITH_SLASHES, $callback, $formulaBlock) ?? $formulaBlock) . ' ';
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_COLRANGE . '/mui', $formulaBlockx, $matches, PREG_SET_ORDER);
+                if ($matchCount > 0) {
+                    foreach ($matches as $match) {
+                        $fromString = self::sheetnameBeforeCells($match[2], $worksheetName, "{$match[3]}:{$match[4]}");
+                        $modified3 = substr($this->updateCellReference($match[3] . '$1', $includeAbsoluteReferences, $onlyAbsoluteReferences), 0, -2);
+                        $modified4 = substr($this->updateCellReference($match[4] . '$1', $includeAbsoluteReferences, $onlyAbsoluteReferences), 0, -2);
+
+                        if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
+                            if (self::matchSheetName($match[2], $worksheetName)) {
+                                $toString = self::sheetnameBeforeCells($match[2], $worksheetName, "$modified3:$modified4");
+                                //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
+                                $column = Coordinate::columnIndexFromString(trim($match[3], '$')) + 100000;
+                                $row = 10000000;
+                                $cellIndex = "{$column}{$row}";
+
+                                $newCellTokens[$cellIndex] = preg_quote($toString, '/');
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString, '/') . '(?![A-Z])/i';
+                                ++$adjustCount;
+                            }
+                        }
+                    }
+                }
+                //    Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5)
+                $formulaBlockx = ' ' . (preg_replace_callback(self::SHEETNAME_PART_WITH_SLASHES, $callback, "$formulaBlock") ?? "$formulaBlock") . ' ';
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLRANGE . '/mui', $formulaBlockx, $matches, PREG_SET_ORDER);
+                if ($matchCount > 0) {
+                    foreach ($matches as $match) {
+                        $fromString = self::sheetnameBeforeCells($match[2], $worksheetName, "{$match[3]}:{$match[4]}");
+                        $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences, $onlyAbsoluteReferences);
+                        $modified4 = $this->updateCellReference($match[4], $includeAbsoluteReferences, $onlyAbsoluteReferences);
+
+                        if ($match[3] . $match[4] !== $modified3 . $modified4) {
+                            if (self::matchSheetName($match[2], $worksheetName)) {
+                                $toString = self::sheetnameBeforeCells($match[2], $worksheetName, "$modified3:$modified4");
+                                [$column, $row] = Coordinate::coordinateFromString($match[3]);
+                                //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
+                                $column = Coordinate::columnIndexFromString(trim($column, '$')) + 100000;
+                                $row = (int) trim($row, '$') + 10000000;
+                                $cellIndex = "{$column}{$row}";
+
+                                $newCellTokens[$cellIndex] = preg_quote($toString, '/');
+                                $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)' . preg_quote($fromString, '/') . '(?!\d)/i';
+                                ++$adjustCount;
+                            }
+                        }
+                    }
+                }
+                //    Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5)
+
+                $formulaBlockx = ' ' . (preg_replace_callback(self::SHEETNAME_PART_WITH_SLASHES, $callback, $formulaBlock) ?? $formulaBlock) . ' ';
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLREF . '/mui', $formulaBlockx, $matches, PREG_SET_ORDER);
+
+                if ($matchCount > 0) {
+                    foreach ($matches as $match) {
+                        $fromString = self::sheetnameBeforeCells($match[2], $worksheetName, "{$match[3]}");
+
+                        $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences, $onlyAbsoluteReferences);
+                        if ($match[3] !== $modified3) {
+                            if (self::matchSheetName($match[2], $worksheetName)) {
+                                $toString = self::sheetnameBeforeCells($match[2], $worksheetName, "$modified3");
+                                [$column, $row] = Coordinate::coordinateFromString($match[3]);
+                                $columnAdditionalIndex = $column[0] === '$' ? 1 : 0;
+                                $rowAdditionalIndex = $row[0] === '$' ? 1 : 0;
+                                //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
+                                $column = Coordinate::columnIndexFromString(trim($column, '$')) + 100000;
+                                $row = (int) trim($row, '$') + 10000000;
+                                $cellIndex = $row . $rowAdditionalIndex . $column . $columnAdditionalIndex;
+
+                                $newCellTokens[$cellIndex] = preg_quote($toString, '/');
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString, '/') . '(?!\d)/i';
+                                ++$adjustCount;
+                            }
+                        }
+                    }
+                }
+                if ($adjustCount > 0) {
+                    if ($numberOfColumns > 0 || $numberOfRows > 0) {
+                        krsort($cellTokens);
+                        krsort($newCellTokens);
+                    } else {
+                        ksort($cellTokens);
+                        ksort($newCellTokens);
+                    }   //  Update cell references in the formula
+                    $formulaBlock = str_replace('\\', '', (string) preg_replace($cellTokens, $newCellTokens, $formulaBlock));
+                }
+            }
+        }
+        unset($formulaBlock);
+
+        //    Then rebuild the formula string
+        return implode('"', $formulaBlocks);
+    }
+
+    /**
+     * Update all cell references within a formula, irrespective of worksheet.
+     */
+    public function updateFormulaReferencesAnyWorksheet(string $formula = '', int $numberOfColumns = 0, int $numberOfRows = 0): string
+    {
+        $formula = $this->updateCellReferencesAllWorksheets($formula, $numberOfColumns, $numberOfRows);
+
+        if ($numberOfColumns !== 0) {
+            $formula = $this->updateColumnRangesAllWorksheets($formula, $numberOfColumns);
+        }
+
+        if ($numberOfRows !== 0) {
+            $formula = $this->updateRowRangesAllWorksheets($formula, $numberOfRows);
+        }
+
+        return $formula;
+    }
+
+    private function updateCellReferencesAllWorksheets(string $formula, int $numberOfColumns, int $numberOfRows): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $columnLengths = array_map('strlen', array_column($splitRanges[6], 0));
+        $rowLengths = array_map('strlen', array_column($splitRanges[7], 0));
+        $columnOffsets = array_column($splitRanges[6], 1);
+        $rowOffsets = array_column($splitRanges[7], 1);
+
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $columnLength = $columnLengths[$splitCount];
+            $rowLength = $rowLengths[$splitCount];
+            $columnOffset = $columnOffsets[$splitCount];
+            $rowOffset = $rowOffsets[$splitCount];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            if (!empty($column) && $column[0] !== '$') {
+                $column = ((Coordinate::columnIndexFromString($column) + $numberOfColumns) % AddressRange::MAX_COLUMN_INT) ?: AddressRange::MAX_COLUMN_INT;
+                $column = Coordinate::stringFromColumnIndex($column);
+                $rowOffset -= ($columnLength - strlen($column));
+                $formula = substr($formula, 0, $columnOffset) . $column . substr($formula, $columnOffset + $columnLength);
+            }
+            if (!empty($row) && $row[0] !== '$') {
+                $row = (((int) $row + $numberOfRows) % AddressRange::MAX_ROW) ?: AddressRange::MAX_ROW;
+                $formula = substr($formula, 0, $rowOffset) . $row . substr($formula, $rowOffset + $rowLength);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function updateColumnRangesAllWorksheets(string $formula, int $numberOfColumns): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_COLUMNRANGE_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $fromColumnLengths = array_map('strlen', array_column($splitRanges[1], 0));
+        $fromColumnOffsets = array_column($splitRanges[1], 1);
+        $toColumnLengths = array_map('strlen', array_column($splitRanges[2], 0));
+        $toColumnOffsets = array_column($splitRanges[2], 1);
+
+        $fromColumns = $splitRanges[1];
+        $toColumns = $splitRanges[2];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $fromColumnLength = $fromColumnLengths[$splitCount];
+            $toColumnLength = $toColumnLengths[$splitCount];
+            $fromColumnOffset = $fromColumnOffsets[$splitCount];
+            $toColumnOffset = $toColumnOffsets[$splitCount];
+            $fromColumn = $fromColumns[$splitCount][0];
+            $toColumn = $toColumns[$splitCount][0];
+
+            if (!empty($fromColumn) && $fromColumn[0] !== '$') {
+                $fromColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($fromColumn) + $numberOfColumns);
+                $formula = substr($formula, 0, $fromColumnOffset) . $fromColumn . substr($formula, $fromColumnOffset + $fromColumnLength);
+            }
+            if (!empty($toColumn) && $toColumn[0] !== '$') {
+                $toColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($toColumn) + $numberOfColumns);
+                $formula = substr($formula, 0, $toColumnOffset) . $toColumn . substr($formula, $toColumnOffset + $toColumnLength);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function updateRowRangesAllWorksheets(string $formula, int $numberOfRows): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_ROWRANGE_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $fromRowLengths = array_map('strlen', array_column($splitRanges[1], 0));
+        $fromRowOffsets = array_column($splitRanges[1], 1);
+        $toRowLengths = array_map('strlen', array_column($splitRanges[2], 0));
+        $toRowOffsets = array_column($splitRanges[2], 1);
+
+        $fromRows = $splitRanges[1];
+        $toRows = $splitRanges[2];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $fromRowLength = $fromRowLengths[$splitCount];
+            $toRowLength = $toRowLengths[$splitCount];
+            $fromRowOffset = $fromRowOffsets[$splitCount];
+            $toRowOffset = $toRowOffsets[$splitCount];
+            $fromRow = $fromRows[$splitCount][0];
+            $toRow = $toRows[$splitCount][0];
+
+            if (!empty($fromRow) && $fromRow[0] !== '$') {
+                $fromRow = (int) $fromRow + $numberOfRows;
+                $formula = substr($formula, 0, $fromRowOffset) . $fromRow . substr($formula, $fromRowOffset + $fromRowLength);
+            }
+            if (!empty($toRow) && $toRow[0] !== '$') {
+                $toRow = (int) $toRow + $numberOfRows;
+                $formula = substr($formula, 0, $toRowOffset) . $toRow . substr($formula, $toRowOffset + $toRowLength);
+            }
+        }
+
+        return $formula;
+    }
+
+    /**
+     * Update cell reference.
+     *
+     * @param string $cellReference Cell address or range of addresses
+     *
+     * @return string Updated cell range
+     */
+    private function updateCellReference(string $cellReference = 'A1', bool $includeAbsoluteReferences = false, bool $onlyAbsoluteReferences = false): string
+    {
+        // Is it in another worksheet? Will not have to update anything.
+        if (str_contains($cellReference, '!')) {
+            return $cellReference;
+        }
+        // Is it a range or a single cell?
+        if (!Coordinate::coordinateIsRange($cellReference)) {
+            // Single cell
+            /** @var CellReferenceHelper */
+            $cellReferenceHelper = $this->cellReferenceHelper;
+
+            return $cellReferenceHelper->updateCellReference($cellReference, $includeAbsoluteReferences, $onlyAbsoluteReferences);
+        }
+
+        // Range
+        return $this->updateCellRange($cellReference, $includeAbsoluteReferences, $onlyAbsoluteReferences);
+    }
+
+    /**
+     * Update named formulae (i.e. containing worksheet references / named ranges).
+     *
+     * @param Spreadsheet $spreadsheet Object to update
+     * @param string $oldName Old name (name to replace)
+     * @param string $newName New name
+     */
+    public function updateNamedFormulae(Spreadsheet $spreadsheet, string $oldName = '', string $newName = ''): void
+    {
+        if ($oldName == '') {
+            return;
+        }
+
+        foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+            foreach ($sheet->getCoordinates(false) as $coordinate) {
+                $cell = $sheet->getCell($coordinate);
+                if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                    $formula = $cell->getValueString();
+                    if (str_contains($formula, $oldName)) {
+                        $formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
+                        $formula = str_replace($oldName . '!', $newName . '!', $formula);
+                        $cell->setValueExplicit($formula, DataType::TYPE_FORMULA);
+                    }
+                }
+            }
+        }
+    }
+
+    private function updateDefinedNames(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+    {
+        foreach ($worksheet->getParentOrThrow()->getDefinedNames() as $definedName) {
+            if ($definedName->isFormula() === false) {
+                $this->updateNamedRange($definedName, $worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
+            } else {
+                $this->updateNamedFormula($definedName, $worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
+            }
+        }
+    }
+
+    private function updateNamedRange(DefinedName $definedName, Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+    {
+        $cellAddress = $definedName->getValue();
+        $asFormula = ($cellAddress[0] === '=');
+        if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
+            /**
+             * If we delete the entire range that is referenced by a Named Range, MS Excel sets the value to #REF!
+             * PhpSpreadsheet still only does a basic adjustment, so the Named Range will still reference Cells.
+             * Note that this applies only when deleting columns/rows; subsequent insertion won't fix the #REF!
+             * TODO Can we work out a method to identify Named Ranges that cease to be valid, so that we can replace
+             *      them with a #REF!
+             */
+            if ($asFormula === true) {
+                $formula = $this->updateFormulaReferences($cellAddress, $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true, true);
+                $definedName->setValue($formula);
+            } else {
+                $definedName->setValue($this->updateCellReference(ltrim($cellAddress, '='), true));
+            }
+        }
+    }
+
+    private function updateNamedFormula(DefinedName $definedName, Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+    {
+        if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
+            /**
+             * If we delete the entire range that is referenced by a Named Formula, MS Excel sets the value to #REF!
+             * PhpSpreadsheet still only does a basic adjustment, so the Named Formula will still reference Cells.
+             * Note that this applies only when deleting columns/rows; subsequent insertion won't fix the #REF!
+             * TODO Can we work out a method to identify Named Ranges that cease to be valid, so that we can replace
+             *      them with a #REF!
+             */
+            $formula = $definedName->getValue();
+            $formula = $this->updateFormulaReferences($formula, $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true);
+            $definedName->setValue($formula);
+        }
+    }
+
+    /**
+     * Update cell range.
+     *
+     * @param string $cellRange Cell range    (e.g. 'B2:D4', 'B:C' or '2:3')
+     *
+     * @return string Updated cell range
+     */
+    private function updateCellRange(string $cellRange = 'A1:A1', bool $includeAbsoluteReferences = false, bool $onlyAbsoluteReferences = false): string
+    {
+        if (!Coordinate::coordinateIsRange($cellRange)) {
+            throw new Exception('Only cell ranges may be passed to this method.');
+        }
+
+        // Update range
+        $range = Coordinate::splitRange($cellRange);
+        $ic = count($range);
+        for ($i = 0; $i < $ic; ++$i) {
+            $jc = count($range[$i]);
+            for ($j = 0; $j < $jc; ++$j) {
+                /** @var CellReferenceHelper */
+                $cellReferenceHelper = $this->cellReferenceHelper;
+                if (ctype_alpha($range[$i][$j])) {
+                    $range[$i][$j] = Coordinate::coordinateFromString(
+                        $cellReferenceHelper->updateCellReference($range[$i][$j] . '1', $includeAbsoluteReferences, $onlyAbsoluteReferences)
+                    )[0];
+                } elseif (ctype_digit($range[$i][$j])) {
+                    $range[$i][$j] = Coordinate::coordinateFromString(
+                        $cellReferenceHelper->updateCellReference('A' . $range[$i][$j], $includeAbsoluteReferences, $onlyAbsoluteReferences)
+                    )[1];
+                } else {
+                    $range[$i][$j] = $cellReferenceHelper->updateCellReference($range[$i][$j], $includeAbsoluteReferences, $onlyAbsoluteReferences);
+                }
+            }
+        }
+
+        // Recreate range string
+        return Coordinate::buildRange($range);
+    }
+
+    private function clearColumnStrips(int $highestRow, int $beforeColumn, int $numberOfColumns, Worksheet $worksheet): void
+    {
+        $startColumnId = Coordinate::stringFromColumnIndex($beforeColumn + $numberOfColumns);
+        $endColumnId = Coordinate::stringFromColumnIndex($beforeColumn);
+
+        for ($row = 1; $row <= $highestRow - 1; ++$row) {
+            for ($column = $startColumnId; $column !== $endColumnId; ++$column) {
+                $coordinate = $column . $row;
+                $this->clearStripCell($worksheet, $coordinate);
+            }
+        }
+    }
+
+    private function clearRowStrips(string $highestColumn, int $beforeColumn, int $beforeRow, int $numberOfRows, Worksheet $worksheet): void
+    {
+        $startColumnId = Coordinate::stringFromColumnIndex($beforeColumn);
+        ++$highestColumn;
+
+        for ($column = $startColumnId; $column !== $highestColumn; ++$column) {
+            for ($row = $beforeRow + $numberOfRows; $row <= $beforeRow - 1; ++$row) {
+                $coordinate = $column . $row;
+                $this->clearStripCell($worksheet, $coordinate);
+            }
+        }
+    }
+
+    private function clearStripCell(Worksheet $worksheet, string $coordinate): void
+    {
+        $worksheet->removeConditionalStyles($coordinate);
+        $worksheet->setHyperlink($coordinate);
+        $worksheet->setDataValidation($coordinate);
+        $worksheet->removeComment($coordinate);
+
+        if ($worksheet->cellExists($coordinate)) {
+            $worksheet->getCell($coordinate)->setValueExplicit(null, DataType::TYPE_NULL);
+            $worksheet->getCell($coordinate)->setXfIndex(0);
+        }
+    }
+
+    private function adjustAutoFilter(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns): void
+    {
+        $autoFilter = $worksheet->getAutoFilter();
+        $autoFilterRange = $autoFilter->getRange();
+        if (!empty($autoFilterRange)) {
+            if ($numberOfColumns !== 0) {
+                $autoFilterColumns = $autoFilter->getColumns();
+                if (count($autoFilterColumns) > 0) {
+                    $column = '';
+                    $row = 0;
+                    sscanf($beforeCellAddress, '%[A-Z]%d', $column, $row);
+                    $columnIndex = Coordinate::columnIndexFromString((string) $column);
+                    [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($autoFilterRange);
+                    if ($columnIndex <= $rangeEnd[0]) {
+                        if ($numberOfColumns < 0) {
+                            $this->adjustAutoFilterDeleteRules($columnIndex, $numberOfColumns, $autoFilterColumns, $autoFilter);
+                        }
+                        $startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
+
+                        //    Shuffle columns in autofilter range
+                        if ($numberOfColumns > 0) {
+                            $this->adjustAutoFilterInsert($startCol, $numberOfColumns, $rangeEnd[0], $autoFilter);
+                        } else {
+                            $this->adjustAutoFilterDelete($startCol, $numberOfColumns, $rangeEnd[0], $autoFilter);
+                        }
+                    }
+                }
+            }
+
+            $worksheet->setAutoFilter(
+                $this->updateCellReference($autoFilterRange)
+            );
+        }
+    }
+
+    private function adjustAutoFilterDeleteRules(int $columnIndex, int $numberOfColumns, array $autoFilterColumns, AutoFilter $autoFilter): void
+    {
+        // If we're actually deleting any columns that fall within the autofilter range,
+        //    then we delete any rules for those columns
+        $deleteColumn = $columnIndex + $numberOfColumns - 1;
+        $deleteCount = abs($numberOfColumns);
+
+        for ($i = 1; $i <= $deleteCount; ++$i) {
+            $columnName = Coordinate::stringFromColumnIndex($deleteColumn + 1);
+            if (isset($autoFilterColumns[$columnName])) {
+                $autoFilter->clearColumn($columnName);
+            }
+            ++$deleteColumn;
+        }
+    }
+
+    private function adjustAutoFilterInsert(int $startCol, int $numberOfColumns, int $rangeEnd, AutoFilter $autoFilter): void
+    {
+        $startColRef = $startCol;
+        $endColRef = $rangeEnd;
+        $toColRef = $rangeEnd + $numberOfColumns;
+
+        do {
+            $autoFilter->shiftColumn(Coordinate::stringFromColumnIndex($endColRef), Coordinate::stringFromColumnIndex($toColRef));
+            --$endColRef;
+            --$toColRef;
+        } while ($startColRef <= $endColRef);
+    }
+
+    private function adjustAutoFilterDelete(int $startCol, int $numberOfColumns, int $rangeEnd, AutoFilter $autoFilter): void
+    {
+        // For delete, we shuffle from beginning to end to avoid overwriting
+        $startColID = Coordinate::stringFromColumnIndex($startCol);
+        $toColID = Coordinate::stringFromColumnIndex($startCol + $numberOfColumns);
+        $endColID = Coordinate::stringFromColumnIndex($rangeEnd + 1);
+
+        do {
+            $autoFilter->shiftColumn($startColID, $toColID);
+            ++$startColID;
+            ++$toColID;
+        } while ($startColID !== $endColID);
+    }
+
+    private function adjustTable(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns): void
+    {
+        $tableCollection = $worksheet->getTableCollection();
+
+        foreach ($tableCollection as $table) {
+            $tableRange = $table->getRange();
+            if (!empty($tableRange)) {
+                if ($numberOfColumns !== 0) {
+                    $tableColumns = $table->getColumns();
+                    if (count($tableColumns) > 0) {
+                        $column = '';
+                        $row = 0;
+                        sscanf($beforeCellAddress, '%[A-Z]%d', $column, $row);
+                        $columnIndex = Coordinate::columnIndexFromString((string) $column);
+                        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($tableRange);
+                        if ($columnIndex <= $rangeEnd[0]) {
+                            if ($numberOfColumns < 0) {
+                                $this->adjustTableDeleteRules($columnIndex, $numberOfColumns, $tableColumns, $table);
+                            }
+                            $startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
+
+                            //    Shuffle columns in table range
+                            if ($numberOfColumns > 0) {
+                                $this->adjustTableInsert($startCol, $numberOfColumns, $rangeEnd[0], $table);
+                            } else {
+                                $this->adjustTableDelete($startCol, $numberOfColumns, $rangeEnd[0], $table);
+                            }
+                        }
+                    }
+                }
+
+                $table->setRange($this->updateCellReference($tableRange));
+            }
+        }
+    }
+
+    private function adjustTableDeleteRules(int $columnIndex, int $numberOfColumns, array $tableColumns, Table $table): void
+    {
+        // If we're actually deleting any columns that fall within the table range,
+        //    then we delete any rules for those columns
+        $deleteColumn = $columnIndex + $numberOfColumns - 1;
+        $deleteCount = abs($numberOfColumns);
+
+        for ($i = 1; $i <= $deleteCount; ++$i) {
+            $columnName = Coordinate::stringFromColumnIndex($deleteColumn + 1);
+            if (isset($tableColumns[$columnName])) {
+                $table->clearColumn($columnName);
+            }
+            ++$deleteColumn;
+        }
+    }
+
+    private function adjustTableInsert(int $startCol, int $numberOfColumns, int $rangeEnd, Table $table): void
+    {
+        $startColRef = $startCol;
+        $endColRef = $rangeEnd;
+        $toColRef = $rangeEnd + $numberOfColumns;
+
+        do {
+            $table->shiftColumn(Coordinate::stringFromColumnIndex($endColRef), Coordinate::stringFromColumnIndex($toColRef));
+            --$endColRef;
+            --$toColRef;
+        } while ($startColRef <= $endColRef);
+    }
+
+    private function adjustTableDelete(int $startCol, int $numberOfColumns, int $rangeEnd, Table $table): void
+    {
+        // For delete, we shuffle from beginning to end to avoid overwriting
+        $startColID = Coordinate::stringFromColumnIndex($startCol);
+        $toColID = Coordinate::stringFromColumnIndex($startCol + $numberOfColumns);
+        $endColID = Coordinate::stringFromColumnIndex($rangeEnd + 1);
+
+        do {
+            $table->shiftColumn($startColID, $toColID);
+            ++$startColID;
+            ++$toColID;
+        } while ($startColID !== $endColID);
+    }
+
+    private function duplicateStylesByColumn(Worksheet $worksheet, int $beforeColumn, int $beforeRow, int $highestRow, int $numberOfColumns): void
+    {
+        $beforeColumnName = Coordinate::stringFromColumnIndex($beforeColumn - 1);
+        for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
+            // Style
+            $coordinate = $beforeColumnName . $i;
+            if ($worksheet->cellExists($coordinate)) {
+                $xfIndex = $worksheet->getCell($coordinate)->getXfIndex();
+                for ($j = $beforeColumn; $j <= $beforeColumn - 1 + $numberOfColumns; ++$j) {
+                    if (!empty($xfIndex) || $worksheet->cellExists([$j, $i])) {
+                        $worksheet->getCell([$j, $i])->setXfIndex($xfIndex);
+                    }
+                }
+            }
+        }
+    }
+
+    private function duplicateStylesByRow(Worksheet $worksheet, int $beforeColumn, int $beforeRow, string $highestColumn, int $numberOfRows): void
+    {
+        $highestColumnIndex = Coordinate::columnIndexFromString($highestColumn);
+        for ($i = $beforeColumn; $i <= $highestColumnIndex; ++$i) {
+            // Style
+            $coordinate = Coordinate::stringFromColumnIndex($i) . ($beforeRow - 1);
+            if ($worksheet->cellExists($coordinate)) {
+                $xfIndex = $worksheet->getCell($coordinate)->getXfIndex();
+                for ($j = $beforeRow; $j <= $beforeRow - 1 + $numberOfRows; ++$j) {
+                    if (!empty($xfIndex) || $worksheet->cellExists([$j, $i])) {
+                        $worksheet->getCell(Coordinate::stringFromColumnIndex($i) . $j)->setXfIndex($xfIndex);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * __clone implementation. Cloning should not be allowed in a Singleton!
+     */
+    final public function __clone()
+    {
+        throw new Exception('Cloning a Singleton is not allowed!');
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php
new file mode 100644
index 00000000..548e68ba
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\RichText;
+
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+interface ITextElement
+{
+    /**
+     * Get text.
+     */
+    public function getText(): string;
+
+    /**
+     * Set text.
+     *
+     * @param string $text Text
+     *
+     * @return $this
+     */
+    public function setText(string $text): self;
+
+    /**
+     * Get font.
+     */
+    public function getFont(): ?Font;
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php
new file mode 100644
index 00000000..1dc391a6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\RichText;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\IComparable;
+use Stringable;
+
+class RichText implements IComparable, Stringable
+{
+    /**
+     * Rich text elements.
+     *
+     * @var ITextElement[]
+     */
+    private array $richTextElements;
+
+    /**
+     * Create a new RichText instance.
+     */
+    public function __construct(?Cell $cell = null)
+    {
+        // Initialise variables
+        $this->richTextElements = [];
+
+        // Rich-Text string attached to cell?
+        if ($cell !== null) {
+            // Add cell text and style
+            if ($cell->getValueString() !== '') {
+                $objRun = new Run($cell->getValueString());
+                $objRun->setFont(clone $cell->getWorksheet()->getStyle($cell->getCoordinate())->getFont());
+                $this->addText($objRun);
+            }
+
+            // Set parent value
+            $cell->setValueExplicit($this, DataType::TYPE_STRING);
+        }
+    }
+
+    /**
+     * Add text.
+     *
+     * @param ITextElement $text Rich text element
+     *
+     * @return $this
+     */
+    public function addText(ITextElement $text): static
+    {
+        $this->richTextElements[] = $text;
+
+        return $this;
+    }
+
+    /**
+     * Create text.
+     *
+     * @param string $text Text
+     */
+    public function createText(string $text): TextElement
+    {
+        $objText = new TextElement($text);
+        $this->addText($objText);
+
+        return $objText;
+    }
+
+    /**
+     * Create text run.
+     *
+     * @param string $text Text
+     */
+    public function createTextRun(string $text): Run
+    {
+        $objText = new Run($text);
+        $this->addText($objText);
+
+        return $objText;
+    }
+
+    /**
+     * Get plain text.
+     */
+    public function getPlainText(): string
+    {
+        // Return value
+        $returnValue = '';
+
+        // Loop through all ITextElements
+        foreach ($this->richTextElements as $text) {
+            $returnValue .= $text->getText();
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Convert to string.
+     */
+    public function __toString(): string
+    {
+        return $this->getPlainText();
+    }
+
+    /**
+     * Get Rich Text elements.
+     *
+     * @return ITextElement[]
+     */
+    public function getRichTextElements(): array
+    {
+        return $this->richTextElements;
+    }
+
+    /**
+     * Set Rich Text elements.
+     *
+     * @param ITextElement[] $textElements Array of elements
+     *
+     * @return $this
+     */
+    public function setRichTextElements(array $textElements): static
+    {
+        $this->richTextElements = $textElements;
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        $hashElements = '';
+        foreach ($this->richTextElements as $element) {
+            $hashElements .= $element->getHashCode();
+        }
+
+        return md5(
+            $hashElements
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            $newValue = is_object($value) ? (clone $value) : $value;
+            if (is_array($value)) {
+                $newValue = [];
+                foreach ($value as $key2 => $value2) {
+                    $newValue[$key2] = is_object($value2) ? (clone $value2) : $value2;
+                }
+            }
+            $this->$key = $newValue;
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php
new file mode 100644
index 00000000..3bc980c7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\RichText;
+
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class Run extends TextElement implements ITextElement
+{
+    /**
+     * Font.
+     *
+     * @var ?Font
+     */
+    private ?Font $font;
+
+    /**
+     * Create a new Run instance.
+     *
+     * @param string $text Text
+     */
+    public function __construct(string $text = '')
+    {
+        parent::__construct($text);
+        // Initialise variables
+        $this->font = new Font();
+    }
+
+    /**
+     * Get font.
+     */
+    public function getFont(): ?Font
+    {
+        return $this->font;
+    }
+
+    public function getFontOrThrow(): Font
+    {
+        if ($this->font === null) {
+            throw new SpreadsheetException('unexpected null font');
+        }
+
+        return $this->font;
+    }
+
+    /**
+     * Set font.
+     *
+     * @param ?Font $font Font
+     *
+     * @return $this
+     */
+    public function setFont(?Font $font = null): static
+    {
+        $this->font = $font;
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->getText()
+            . (($this->font === null) ? '' : $this->font->getHashCode())
+            . __CLASS__
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php
new file mode 100644
index 00000000..e509d272
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\RichText;
+
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class TextElement implements ITextElement
+{
+    /**
+     * Text.
+     */
+    private string $text;
+
+    /**
+     * Create a new TextElement instance.
+     *
+     * @param string $text Text
+     */
+    public function __construct(string $text = '')
+    {
+        // Initialise variables
+        $this->text = $text;
+    }
+
+    /**
+     * Get text.
+     *
+     * @return string Text
+     */
+    public function getText(): string
+    {
+        return $this->text;
+    }
+
+    /**
+     * Set text.
+     *
+     * @param string $text Text
+     *
+     * @return $this
+     */
+    public function setText(string $text): self
+    {
+        $this->text = $text;
+
+        return $this;
+    }
+
+    /**
+     * Get font. For this class, the return value is always null.
+     */
+    public function getFont(): ?Font
+    {
+        return null;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->text
+            . __CLASS__
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
new file mode 100644
index 00000000..58d75164
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
@@ -0,0 +1,191 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Chart\Renderer\IRenderer;
+use PhpOffice\PhpSpreadsheet\Collection\Memory;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\SimpleCache\CacheInterface;
+use ReflectionClass;
+
+class Settings
+{
+    /**
+     * Class name of the chart renderer used for rendering charts
+     * eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph.
+     *
+     * @var null|class-string<IRenderer>
+     */
+    private static ?string $chartRenderer = null;
+
+    /**
+     * Default options for libxml loader.
+     */
+    private static ?int $libXmlLoaderOptions = null;
+
+    /**
+     * The cache implementation to be used for cell collection.
+     *
+     * @var ?CacheInterface
+     */
+    private static ?CacheInterface $cache = null;
+
+    /**
+     * The HTTP client implementation to be used for network request.
+     */
+    private static ?ClientInterface $httpClient = null;
+
+    private static ?RequestFactoryInterface $requestFactory = null;
+
+    /**
+     * Set the locale code to use for formula translations and any special formatting.
+     *
+     * @param string $locale The locale code to use (e.g. "fr" or "pt_br" or "en_uk")
+     *
+     * @return bool Success or failure
+     */
+    public static function setLocale(string $locale): bool
+    {
+        return Calculation::getInstance()->setLocale($locale);
+    }
+
+    public static function getLocale(): string
+    {
+        return Calculation::getInstance()->getLocale();
+    }
+
+    /**
+     * Identify to PhpSpreadsheet the external library to use for rendering charts.
+     *
+     * @param class-string<IRenderer> $rendererClassName Class name of the chart renderer
+     *    eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph
+     */
+    public static function setChartRenderer(string $rendererClassName): void
+    {
+        if (!is_a($rendererClassName, IRenderer::class, true)) {
+            throw new Exception('Chart renderer must implement ' . IRenderer::class);
+        }
+
+        self::$chartRenderer = $rendererClassName;
+    }
+
+    public static function unsetChartRenderer(): void
+    {
+        self::$chartRenderer = null;
+    }
+
+    /**
+     * Return the Chart Rendering Library that PhpSpreadsheet is currently configured to use.
+     *
+     * @return null|class-string<IRenderer> Class name of the chart renderer
+     *    eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph
+     */
+    public static function getChartRenderer(): ?string
+    {
+        return self::$chartRenderer;
+    }
+
+    public static function htmlEntityFlags(): int
+    {
+        return ENT_COMPAT;
+    }
+
+    /**
+     * Set default options for libxml loader.
+     *
+     * @param ?int $options Default options for libxml loader
+     */
+    public static function setLibXmlLoaderOptions(?int $options): int
+    {
+        if ($options === null) {
+            $options = defined('LIBXML_DTDLOAD') ? (LIBXML_DTDLOAD | LIBXML_DTDATTR) : 0;
+        }
+        self::$libXmlLoaderOptions = $options;
+
+        return $options;
+    }
+
+    /**
+     * Get default options for libxml loader.
+     * Defaults to LIBXML_DTDLOAD | LIBXML_DTDATTR when not set explicitly.
+     *
+     * @return int Default options for libxml loader
+     */
+    public static function getLibXmlLoaderOptions(): int
+    {
+        if (self::$libXmlLoaderOptions === null) {
+            return self::setLibXmlLoaderOptions(null);
+        }
+
+        return self::$libXmlLoaderOptions;
+    }
+
+    /**
+     * Sets the implementation of cache that should be used for cell collection.
+     */
+    public static function setCache(?CacheInterface $cache): void
+    {
+        self::$cache = $cache;
+    }
+
+    /**
+     * Gets the implementation of cache that is being used for cell collection.
+     */
+    public static function getCache(): CacheInterface
+    {
+        if (!self::$cache) {
+            self::$cache = self::useSimpleCacheVersion3() ? new Memory\SimpleCache3() : new Memory\SimpleCache1();
+        }
+
+        return self::$cache;
+    }
+
+    public static function useSimpleCacheVersion3(): bool
+    {
+        return (new ReflectionClass(CacheInterface::class))->getMethod('get')->getReturnType() !== null;
+    }
+
+    /**
+     * Set the HTTP client implementation to be used for network request.
+     */
+    public static function setHttpClient(ClientInterface $httpClient, RequestFactoryInterface $requestFactory): void
+    {
+        self::$httpClient = $httpClient;
+        self::$requestFactory = $requestFactory;
+    }
+
+    /**
+     * Unset the HTTP client configuration.
+     */
+    public static function unsetHttpClient(): void
+    {
+        self::$httpClient = null;
+        self::$requestFactory = null;
+    }
+
+    /**
+     * Get the HTTP client implementation to be used for network request.
+     */
+    public static function getHttpClient(): ClientInterface
+    {
+        if (!self::$httpClient || !self::$requestFactory) {
+            throw new Exception('HTTP client must be configured via Settings::setHttpClient() to be able to use WEBSERVICE function.');
+        }
+
+        return self::$httpClient;
+    }
+
+    /**
+     * Get the HTTP request factory.
+     */
+    public static function getRequestFactory(): RequestFactoryInterface
+    {
+        if (!self::$httpClient || !self::$requestFactory) {
+            throw new Exception('HTTP client must be configured via Settings::setHttpClient() to be able to use WEBSERVICE function.');
+        }
+
+        return self::$requestFactory;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php
new file mode 100644
index 00000000..307f8d93
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class CodePage
+{
+    public const DEFAULT_CODE_PAGE = 'CP1252';
+
+    private static array $pageArray = [
+        0 => 'CP1252', //    CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
+        367 => 'ASCII', //    ASCII
+        437 => 'CP437', //    OEM US
+        //720 => 'notsupported', //    OEM Arabic
+        737 => 'CP737', //    OEM Greek
+        775 => 'CP775', //    OEM Baltic
+        850 => 'CP850', //    OEM Latin I
+        852 => 'CP852', //    OEM Latin II (Central European)
+        855 => 'CP855', //    OEM Cyrillic
+        857 => 'CP857', //    OEM Turkish
+        858 => 'CP858', //    OEM Multilingual Latin I with Euro
+        860 => 'CP860', //    OEM Portugese
+        861 => 'CP861', //    OEM Icelandic
+        862 => 'CP862', //    OEM Hebrew
+        863 => 'CP863', //    OEM Canadian (French)
+        864 => 'CP864', //    OEM Arabic
+        865 => 'CP865', //    OEM Nordic
+        866 => 'CP866', //    OEM Cyrillic (Russian)
+        869 => 'CP869', //    OEM Greek (Modern)
+        874 => 'CP874', //    ANSI Thai
+        932 => 'CP932', //    ANSI Japanese Shift-JIS
+        936 => 'CP936', //    ANSI Chinese Simplified GBK
+        949 => 'CP949', //    ANSI Korean (Wansung)
+        950 => 'CP950', //    ANSI Chinese Traditional BIG5
+        1200 => 'UTF-16LE', //    UTF-16 (BIFF8)
+        1250 => 'CP1250', //    ANSI Latin II (Central European)
+        1251 => 'CP1251', //    ANSI Cyrillic
+        1252 => 'CP1252', //    ANSI Latin I (BIFF4-BIFF7)
+        1253 => 'CP1253', //    ANSI Greek
+        1254 => 'CP1254', //    ANSI Turkish
+        1255 => 'CP1255', //    ANSI Hebrew
+        1256 => 'CP1256', //    ANSI Arabic
+        1257 => 'CP1257', //    ANSI Baltic
+        1258 => 'CP1258', //    ANSI Vietnamese
+        1361 => 'CP1361', //    ANSI Korean (Johab)
+        10000 => 'MAC', //    Apple Roman
+        10001 => 'CP932', //    Macintosh Japanese
+        10002 => 'CP950', //    Macintosh Chinese Traditional
+        10003 => 'CP1361', //    Macintosh Korean
+        10004 => 'MACARABIC', //    Apple Arabic
+        10005 => 'MACHEBREW', //    Apple Hebrew
+        10006 => 'MACGREEK', //    Macintosh Greek
+        10007 => 'MACCYRILLIC', //    Macintosh Cyrillic
+        10008 => 'CP936', //    Macintosh - Simplified Chinese (GB 2312)
+        10010 => 'MACROMANIA', //    Macintosh Romania
+        10017 => 'MACUKRAINE', //    Macintosh Ukraine
+        10021 => 'MACTHAI', //    Macintosh Thai
+        10029 => ['MACCENTRALEUROPE', 'MAC-CENTRALEUROPE'], //    Macintosh Central Europe
+        10079 => 'MACICELAND', //    Macintosh Icelandic
+        10081 => 'MACTURKISH', //    Macintosh Turkish
+        10082 => 'MACCROATIAN', //    Macintosh Croatian
+        21010 => 'UTF-16LE', //    UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
+        32768 => 'MAC', //    Apple Roman
+        //32769 => 'unsupported', //    ANSI Latin I (BIFF2-BIFF3)
+        65000 => 'UTF-7', //    Unicode (UTF-7)
+        65001 => 'UTF-8', //    Unicode (UTF-8)
+        99999 => ['unsupported'], //    Unicode (UTF-8)
+    ];
+
+    public static function validate(string $codePage): bool
+    {
+        return in_array($codePage, self::$pageArray, true);
+    }
+
+    /**
+     * Convert Microsoft Code Page Identifier to Code Page Name which iconv
+     * and mbstring understands.
+     *
+     * @param int $codePage Microsoft Code Page Indentifier
+     *
+     * @return string Code Page Name
+     */
+    public static function numberToName(int $codePage): string
+    {
+        if (array_key_exists($codePage, self::$pageArray)) {
+            $value = self::$pageArray[$codePage];
+            if (is_array($value)) {
+                foreach ($value as $encoding) {
+                    if (@iconv('UTF-8', $encoding, ' ') !== false) {
+                        self::$pageArray[$codePage] = $encoding;
+
+                        return $encoding;
+                    }
+                }
+
+                throw new PhpSpreadsheetException("Code page $codePage not implemented on this system.");
+            } else {
+                return $value;
+            }
+        }
+        if ($codePage == 720 || $codePage == 32769) {
+            throw new PhpSpreadsheetException("Code page $codePage not supported."); //    OEM Arabic
+        }
+
+        throw new PhpSpreadsheetException('Unknown codepage: ' . $codePage);
+    }
+
+    public static function getEncodings(): array
+    {
+        return self::$pageArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php
new file mode 100644
index 00000000..b8feeb9c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php
@@ -0,0 +1,547 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use DateTime;
+use DateTimeInterface;
+use DateTimeZone;
+use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class Date
+{
+    /** constants */
+    const CALENDAR_WINDOWS_1900 = 1900; //    Base date of 1st Jan 1900 = 1.0
+    const CALENDAR_MAC_1904 = 1904; //    Base date of 2nd Jan 1904 = 1.0
+
+    /**
+     * Names of the months of the year, indexed by shortname
+     * Planned usage for locale settings.
+     *
+     * @var string[]
+     */
+    public static array $monthNames = [
+        'Jan' => 'January',
+        'Feb' => 'February',
+        'Mar' => 'March',
+        'Apr' => 'April',
+        'May' => 'May',
+        'Jun' => 'June',
+        'Jul' => 'July',
+        'Aug' => 'August',
+        'Sep' => 'September',
+        'Oct' => 'October',
+        'Nov' => 'November',
+        'Dec' => 'December',
+    ];
+
+    /**
+     * @var string[]
+     */
+    public static array $numberSuffixes = [
+        'st',
+        'nd',
+        'rd',
+        'th',
+    ];
+
+    /**
+     * Base calendar year to use for calculations
+     * Value is either CALENDAR_WINDOWS_1900 (1900) or CALENDAR_MAC_1904 (1904).
+     */
+    protected static int $excelCalendar = self::CALENDAR_WINDOWS_1900;
+
+    /**
+     * Default timezone to use for DateTime objects.
+     */
+    protected static ?DateTimeZone $defaultTimeZone = null;
+
+    /**
+     * Set the Excel calendar (Windows 1900 or Mac 1904).
+     *
+     * @param ?int $baseYear Excel base date (1900 or 1904)
+     *
+     * @return bool Success or failure
+     */
+    public static function setExcelCalendar(?int $baseYear): bool
+    {
+        if (
+            ($baseYear === self::CALENDAR_WINDOWS_1900)
+            || ($baseYear === self::CALENDAR_MAC_1904)
+        ) {
+            self::$excelCalendar = $baseYear;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the Excel calendar (Windows 1900 or Mac 1904).
+     *
+     * @return int Excel base date (1900 or 1904)
+     */
+    public static function getExcelCalendar(): int
+    {
+        return self::$excelCalendar;
+    }
+
+    /**
+     * Set the Default timezone to use for dates.
+     *
+     * @param null|DateTimeZone|string $timeZone The timezone to set for all Excel datetimestamp to PHP DateTime Object conversions
+     *
+     * @return bool Success or failure
+     */
+    public static function setDefaultTimezone($timeZone): bool
+    {
+        try {
+            $timeZone = self::validateTimeZone($timeZone);
+            self::$defaultTimeZone = $timeZone;
+            $retval = true;
+        } catch (PhpSpreadsheetException) {
+            $retval = false;
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Return the Default timezone, or UTC if default not set.
+     */
+    public static function getDefaultTimezone(): DateTimeZone
+    {
+        return self::$defaultTimeZone ?? new DateTimeZone('UTC');
+    }
+
+    /**
+     * Return the Default timezone, or local timezone if default is not set.
+     */
+    public static function getDefaultOrLocalTimezone(): DateTimeZone
+    {
+        return self::$defaultTimeZone ?? new DateTimeZone(date_default_timezone_get());
+    }
+
+    /**
+     * Return the Default timezone even if null.
+     */
+    public static function getDefaultTimezoneOrNull(): ?DateTimeZone
+    {
+        return self::$defaultTimeZone;
+    }
+
+    /**
+     * Validate a timezone.
+     *
+     * @param null|DateTimeZone|string $timeZone The timezone to validate, either as a timezone string or object
+     *
+     * @return ?DateTimeZone The timezone as a timezone object
+     */
+    private static function validateTimeZone($timeZone): ?DateTimeZone
+    {
+        if ($timeZone instanceof DateTimeZone || $timeZone === null) {
+            return $timeZone;
+        }
+        if (in_array($timeZone, DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC))) {
+            return new DateTimeZone($timeZone);
+        }
+
+        throw new PhpSpreadsheetException('Invalid timezone');
+    }
+
+    /**
+     * @param mixed $value Converts a date/time in ISO-8601 standard format date string to an Excel
+     *                         serialized timestamp.
+     *                     See https://en.wikipedia.org/wiki/ISO_8601 for details of the ISO-8601 standard format.
+     */
+    public static function convertIsoDate(mixed $value): float|int
+    {
+        if (!is_string($value)) {
+            throw new Exception('Non-string value supplied for Iso Date conversion');
+        }
+
+        $date = new DateTime($value);
+        $dateErrors = DateTime::getLastErrors();
+
+        if (is_array($dateErrors) && ($dateErrors['warning_count'] > 0 || $dateErrors['error_count'] > 0)) {
+            throw new Exception("Invalid string $value supplied for datatype Date");
+        }
+
+        $newValue = self::PHPToExcel($date);
+        if ($newValue === false) {
+            throw new Exception("Invalid string $value supplied for datatype Date");
+        }
+
+        if (preg_match('/^\\s*\\d?\\d:\\d\\d(:\\d\\d([.]\\d+)?)?\\s*(am|pm)?\\s*$/i', $value) == 1) {
+            $newValue = fmod($newValue, 1.0);
+        }
+
+        return $newValue;
+    }
+
+    /**
+     * Convert a MS serialized datetime value from Excel to a PHP Date/Time object.
+     *
+     * @param float|int $excelTimestamp MS Excel serialized date/time value
+     * @param null|DateTimeZone|string $timeZone The timezone to assume for the Excel timestamp,
+     *                                           if you don't want to treat it as a UTC value
+     *                                           Use the default (UTC) unless you absolutely need a conversion
+     *
+     * @return DateTime PHP date/time object
+     */
+    public static function excelToDateTimeObject(float|int $excelTimestamp, null|DateTimeZone|string $timeZone = null): DateTime
+    {
+        $timeZone = ($timeZone === null) ? self::getDefaultTimezone() : self::validateTimeZone($timeZone);
+        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
+            if ($excelTimestamp < 1 && self::$excelCalendar === self::CALENDAR_WINDOWS_1900) {
+                // Unix timestamp base date
+                $baseDate = new DateTime('1970-01-01', $timeZone);
+            } else {
+                // MS Excel calendar base dates
+                if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) {
+                    // Allow adjustment for 1900 Leap Year in MS Excel
+                    $baseDate = ($excelTimestamp < 60) ? new DateTime('1899-12-31', $timeZone) : new DateTime('1899-12-30', $timeZone);
+                } else {
+                    $baseDate = new DateTime('1904-01-01', $timeZone);
+                }
+            }
+        } else {
+            $baseDate = new DateTime('1899-12-30', $timeZone);
+        }
+
+        $days = floor($excelTimestamp);
+        $partDay = $excelTimestamp - $days;
+        $hms = 86400 * $partDay;
+        $microseconds = (int) round(fmod($hms, 1) * 1000000);
+        $hms = (int) floor($hms);
+        $hours = intdiv($hms, 3600);
+        $hms -= $hours * 3600;
+        $minutes = intdiv($hms, 60);
+        $seconds = $hms % 60;
+
+        if ($days >= 0) {
+            $days = '+' . $days;
+        }
+        $interval = $days . ' days';
+
+        return $baseDate->modify($interval)
+            ->setTime($hours, $minutes, $seconds, $microseconds);
+    }
+
+    /**
+     * Convert a MS serialized datetime value from Excel to a unix timestamp.
+     * The use of Unix timestamps, and therefore this function, is discouraged.
+     * They are not Y2038-safe on a 32-bit system, and have no timezone info.
+     *
+     * @param float|int $excelTimestamp MS Excel serialized date/time value
+     * @param null|DateTimeZone|string $timeZone The timezone to assume for the Excel timestamp,
+     *                                               if you don't want to treat it as a UTC value
+     *                                               Use the default (UTC) unless you absolutely need a conversion
+     *
+     * @return int Unix timetamp for this date/time
+     */
+    public static function excelToTimestamp($excelTimestamp, $timeZone = null): int
+    {
+        $dto = self::excelToDateTimeObject($excelTimestamp, $timeZone);
+        self::roundMicroseconds($dto);
+
+        return (int) $dto->format('U');
+    }
+
+    /**
+     * Convert a date from PHP to an MS Excel serialized date/time value.
+     *
+     * @param mixed $dateValue PHP DateTime object or a string - Unix timestamp is also permitted, but discouraged;
+     *    not Y2038-safe on a 32-bit system, and no timezone info
+     *
+     * @return false|float Excel date/time value
+     *                                  or boolean FALSE on failure
+     */
+    public static function PHPToExcel(mixed $dateValue)
+    {
+        if ((is_object($dateValue)) && ($dateValue instanceof DateTimeInterface)) {
+            return self::dateTimeToExcel($dateValue);
+        } elseif (is_numeric($dateValue)) {
+            return self::timestampToExcel($dateValue);
+        } elseif (is_string($dateValue)) {
+            return self::stringToExcel($dateValue);
+        }
+
+        return false;
+    }
+
+    /**
+     * Convert a PHP DateTime object to an MS Excel serialized date/time value.
+     *
+     * @param DateTimeInterface $dateValue PHP DateTime object
+     *
+     * @return float MS Excel serialized date/time value
+     */
+    public static function dateTimeToExcel(DateTimeInterface $dateValue): float
+    {
+        $seconds = (float) sprintf('%d.%06d', $dateValue->format('s'), $dateValue->format('u'));
+
+        return self::formattedPHPToExcel(
+            (int) $dateValue->format('Y'),
+            (int) $dateValue->format('m'),
+            (int) $dateValue->format('d'),
+            (int) $dateValue->format('H'),
+            (int) $dateValue->format('i'),
+            $seconds
+        );
+    }
+
+    /**
+     * Convert a Unix timestamp to an MS Excel serialized date/time value.
+     * The use of Unix timestamps, and therefore this function, is discouraged.
+     * They are not Y2038-safe on a 32-bit system, and have no timezone info.
+     *
+     * @param float|int|string $unixTimestamp Unix Timestamp
+     *
+     * @return false|float MS Excel serialized date/time value
+     */
+    public static function timestampToExcel($unixTimestamp): bool|float
+    {
+        if (!is_numeric($unixTimestamp)) {
+            return false;
+        }
+
+        return self::dateTimeToExcel(new DateTime('@' . $unixTimestamp));
+    }
+
+    /**
+     * formattedPHPToExcel.
+     *
+     * @return float Excel date/time value
+     */
+    public static function formattedPHPToExcel(int $year, int $month, int $day, int $hours = 0, int $minutes = 0, float|int $seconds = 0): float
+    {
+        if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) {
+            //
+            //    Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
+            //    This affects every date following 28th February 1900
+            //
+            $excel1900isLeapYear = true;
+            if (($year == 1900) && ($month <= 2)) {
+                $excel1900isLeapYear = false;
+            }
+            $myexcelBaseDate = 2415020;
+        } else {
+            $myexcelBaseDate = 2416481;
+            $excel1900isLeapYear = false;
+        }
+
+        //    Julian base date Adjustment
+        if ($month > 2) {
+            $month -= 3;
+        } else {
+            $month += 9;
+            --$year;
+        }
+
+        //    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
+        $century = (int) substr((string) $year, 0, 2);
+        $decade = (int) substr((string) $year, 2, 2);
+        $excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myexcelBaseDate + $excel1900isLeapYear;
+
+        $excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
+
+        return (float) $excelDate + $excelTime;
+    }
+
+    /**
+     * Is a given cell a date/time?
+     */
+    public static function isDateTime(Cell $cell, mixed $value = null, bool $dateWithoutTimeOkay = true): bool
+    {
+        $result = false;
+        $worksheet = $cell->getWorksheetOrNull();
+        $spreadsheet = ($worksheet === null) ? null : $worksheet->getParent();
+        if ($worksheet !== null && $spreadsheet !== null) {
+            $index = $spreadsheet->getActiveSheetIndex();
+            $selected = $worksheet->getSelectedCells();
+
+            try {
+                $result = is_numeric($value ?? $cell->getCalculatedValue())
+                    && self::isDateTimeFormat(
+                        $worksheet->getStyle(
+                            $cell->getCoordinate()
+                        )->getNumberFormat(),
+                        $dateWithoutTimeOkay
+                    );
+            } catch (Exception) {
+                // Result is already false, so no need to actually do anything here
+            }
+            $worksheet->setSelectedCells($selected);
+            $spreadsheet->setActiveSheetIndex($index);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Is a given NumberFormat code a date/time format code?
+     */
+    public static function isDateTimeFormat(NumberFormat $excelFormatCode, bool $dateWithoutTimeOkay = true): bool
+    {
+        return self::isDateTimeFormatCode((string) $excelFormatCode->getFormatCode(), $dateWithoutTimeOkay);
+    }
+
+    private const POSSIBLE_DATETIME_FORMAT_CHARACTERS = 'eymdHs';
+    private const POSSIBLE_TIME_FORMAT_CHARACTERS = 'Hs'; // note - no 'm' due to ambiguity
+
+    /**
+     * Is a given number format code a date/time?
+     */
+    public static function isDateTimeFormatCode(string $excelFormatCode, bool $dateWithoutTimeOkay = true): bool
+    {
+        if (strtolower($excelFormatCode) === strtolower(NumberFormat::FORMAT_GENERAL)) {
+            //    "General" contains an epoch letter 'e', so we trap for it explicitly here (case-insensitive check)
+            return false;
+        }
+        if (preg_match('/[0#]E[+-]0/i', $excelFormatCode)) {
+            //    Scientific format
+            return false;
+        }
+
+        // Switch on formatcode
+        $excelFormatCode = (string) NumberFormat::convertSystemFormats($excelFormatCode);
+        if (in_array($excelFormatCode, NumberFormat::DATE_TIME_OR_DATETIME_ARRAY, true)) {
+            return $dateWithoutTimeOkay || in_array($excelFormatCode, NumberFormat::TIME_OR_DATETIME_ARRAY);
+        }
+
+        //    Typically number, currency or accounting (or occasionally fraction) formats
+        if ((str_starts_with($excelFormatCode, '_')) || (str_starts_with($excelFormatCode, '0 '))) {
+            return false;
+        }
+        // Some "special formats" provided in German Excel versions were detected as date time value,
+        // so filter them out here - "\C\H\-00000" (Switzerland) and "\D-00000" (Germany).
+        if (str_contains($excelFormatCode, '-00000')) {
+            return false;
+        }
+        $possibleFormatCharacters = $dateWithoutTimeOkay ? self::POSSIBLE_DATETIME_FORMAT_CHARACTERS : self::POSSIBLE_TIME_FORMAT_CHARACTERS;
+        // Try checking for any of the date formatting characters that don't appear within square braces
+        if (preg_match('/(^|\])[^\[]*[' . $possibleFormatCharacters . ']/i', $excelFormatCode)) {
+            //    We might also have a format mask containing quoted strings...
+            //        we don't want to test for any of our characters within the quoted blocks
+            if (str_contains($excelFormatCode, '"')) {
+                $segMatcher = false;
+                foreach (explode('"', $excelFormatCode) as $subVal) {
+                    //    Only test in alternate array entries (the non-quoted blocks)
+                    $segMatcher = $segMatcher === false;
+                    if (
+                        $segMatcher
+                        && (preg_match('/(^|\])[^\[]*[' . $possibleFormatCharacters . ']/i', $subVal))
+                    ) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
+        // No date...
+        return false;
+    }
+
+    /**
+     * Convert a date/time string to Excel time.
+     *
+     * @param string $dateValue Examples: '2009-12-31', '2009-12-31 15:59', '2009-12-31 15:59:10'
+     *
+     * @return false|float Excel date/time serial value
+     */
+    public static function stringToExcel(string $dateValue): bool|float
+    {
+        if (strlen($dateValue) < 2) {
+            return false;
+        }
+        if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue)) {
+            return false;
+        }
+
+        $dateValueNew = DateTimeExcel\DateValue::fromString($dateValue);
+
+        if (!is_float($dateValueNew)) {
+            return false;
+        }
+
+        if (str_contains($dateValue, ':')) {
+            $timeValue = DateTimeExcel\TimeValue::fromString($dateValue);
+            if (!is_float($timeValue)) {
+                return false;
+            }
+            $dateValueNew += $timeValue;
+        }
+
+        return $dateValueNew;
+    }
+
+    /**
+     * Converts a month name (either a long or a short name) to a month number.
+     *
+     * @param string $monthName Month name or abbreviation
+     *
+     * @return int|string Month number (1 - 12), or the original string argument if it isn't a valid month name
+     */
+    public static function monthStringToNumber(string $monthName)
+    {
+        $monthIndex = 1;
+        foreach (self::$monthNames as $shortMonthName => $longMonthName) {
+            if (($monthName === $longMonthName) || ($monthName === $shortMonthName)) {
+                return $monthIndex;
+            }
+            ++$monthIndex;
+        }
+
+        return $monthName;
+    }
+
+    /**
+     * Strips an ordinal from a numeric value.
+     *
+     * @param string $day Day number with an ordinal
+     *
+     * @return int|string The integer value with any ordinal stripped, or the original string argument if it isn't a valid numeric
+     */
+    public static function dayStringToNumber(string $day)
+    {
+        $strippedDayValue = (str_replace(self::$numberSuffixes, '', $day));
+        if (is_numeric($strippedDayValue)) {
+            return (int) $strippedDayValue;
+        }
+
+        return $day;
+    }
+
+    public static function dateTimeFromTimestamp(string $date, ?DateTimeZone $timeZone = null): DateTime
+    {
+        $dtobj = DateTime::createFromFormat('U', $date) ?: new DateTime();
+        $dtobj->setTimeZone($timeZone ?? self::getDefaultOrLocalTimezone());
+
+        return $dtobj;
+    }
+
+    public static function formattedDateTimeFromTimestamp(string $date, string $format, ?DateTimeZone $timeZone = null): string
+    {
+        $dtobj = self::dateTimeFromTimestamp($date, $timeZone);
+
+        return $dtobj->format($format);
+    }
+
+    public static function roundMicroseconds(DateTime $dti): void
+    {
+        $microseconds = (int) $dti->format('u');
+        if ($microseconds >= 500000) {
+            $dti->modify('+1 second');
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php
new file mode 100644
index 00000000..4eef7911
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use SimpleXMLElement;
+
+class Drawing
+{
+    /**
+     * Convert pixels to EMU.
+     *
+     * @param int $pixelValue Value in pixels
+     *
+     * @return float|int Value in EMU
+     */
+    public static function pixelsToEMU(int $pixelValue): int|float
+    {
+        return $pixelValue * 9525;
+    }
+
+    /**
+     * Convert EMU to pixels.
+     *
+     * @param int|SimpleXMLElement $emuValue Value in EMU
+     *
+     * @return int Value in pixels
+     */
+    public static function EMUToPixels($emuValue): int
+    {
+        $emuValue = (int) $emuValue;
+        if ($emuValue != 0) {
+            return (int) round($emuValue / 9525);
+        }
+
+        return 0;
+    }
+
+    /**
+     * Convert pixels to column width. Exact algorithm not known.
+     * By inspection of a real Excel file using Calibri 11, one finds 1000px ~ 142.85546875
+     * This gives a conversion factor of 7. Also, we assume that pixels and font size are proportional.
+     *
+     * @param int $pixelValue Value in pixels
+     *
+     * @return float|int Value in cell dimension
+     */
+    public static function pixelsToCellDimension(int $pixelValue, \PhpOffice\PhpSpreadsheet\Style\Font $defaultFont): int|float
+    {
+        // Font name and size
+        $name = $defaultFont->getName();
+        $size = $defaultFont->getSize();
+
+        if (isset(Font::DEFAULT_COLUMN_WIDTHS[$name][$size])) {
+            // Exact width can be determined
+            return $pixelValue * Font::DEFAULT_COLUMN_WIDTHS[$name][$size]['width']
+                / Font::DEFAULT_COLUMN_WIDTHS[$name][$size]['px'];
+        }
+
+        // We don't have data for this particular font and size, use approximation by
+        // extrapolating from Calibri 11
+        return $pixelValue * 11 * Font::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['width']
+            / Font::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['px'] / $size;
+    }
+
+    /**
+     * Convert column width from (intrinsic) Excel units to pixels.
+     *
+     * @param float $cellWidth Value in cell dimension
+     * @param \PhpOffice\PhpSpreadsheet\Style\Font $defaultFont Default font of the workbook
+     *
+     * @return int Value in pixels
+     */
+    public static function cellDimensionToPixels(float $cellWidth, \PhpOffice\PhpSpreadsheet\Style\Font $defaultFont): int
+    {
+        // Font name and size
+        $name = $defaultFont->getName();
+        $size = $defaultFont->getSize();
+
+        if (isset(Font::DEFAULT_COLUMN_WIDTHS[$name][$size])) {
+            // Exact width can be determined
+            $colWidth = $cellWidth * Font::DEFAULT_COLUMN_WIDTHS[$name][$size]['px']
+                / Font::DEFAULT_COLUMN_WIDTHS[$name][$size]['width'];
+        } else {
+            // We don't have data for this particular font and size, use approximation by
+            // extrapolating from Calibri 11
+            $colWidth = $cellWidth * $size * Font::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['px']
+                / Font::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['width'] / 11;
+        }
+
+        // Round pixels to closest integer
+        $colWidth = (int) round($colWidth);
+
+        return $colWidth;
+    }
+
+    /**
+     * Convert pixels to points.
+     *
+     * @param int $pixelValue Value in pixels
+     *
+     * @return float Value in points
+     */
+    public static function pixelsToPoints(int $pixelValue): float
+    {
+        return $pixelValue * 0.75;
+    }
+
+    /**
+     * Convert points to pixels.
+     *
+     * @param float|int $pointValue Value in points
+     *
+     * @return int Value in pixels
+     */
+    public static function pointsToPixels($pointValue): int
+    {
+        if ($pointValue != 0) {
+            return (int) ceil($pointValue / 0.75);
+        }
+
+        return 0;
+    }
+
+    /**
+     * Convert degrees to angle.
+     *
+     * @param int $degrees Degrees
+     *
+     * @return int Angle
+     */
+    public static function degreesToAngle(int $degrees): int
+    {
+        return (int) round($degrees * 60000);
+    }
+
+    /**
+     * Convert angle to degrees.
+     *
+     * @param int|SimpleXMLElement $angle Angle
+     *
+     * @return int Degrees
+     */
+    public static function angleToDegrees($angle): int
+    {
+        $angle = (int) $angle;
+        if ($angle != 0) {
+            return (int) round($angle / 60000);
+        }
+
+        return 0;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php
new file mode 100644
index 00000000..8b9b3df1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+class Escher
+{
+    /**
+     * Drawing Group Container.
+     *
+     * @var ?Escher\DggContainer
+     */
+    private ?Escher\DggContainer $dggContainer = null;
+
+    /**
+     * Drawing Container.
+     *
+     * @var ?Escher\DgContainer
+     */
+    private ?Escher\DgContainer $dgContainer = null;
+
+    /**
+     * Get Drawing Group Container.
+     */
+    public function getDggContainer(): ?Escher\DggContainer
+    {
+        return $this->dggContainer;
+    }
+
+    /**
+     * Set Drawing Group Container.
+     */
+    public function setDggContainer(Escher\DggContainer $dggContainer): Escher\DggContainer
+    {
+        return $this->dggContainer = $dggContainer;
+    }
+
+    /**
+     * Get Drawing Container.
+     */
+    public function getDgContainer(): ?Escher\DgContainer
+    {
+        return $this->dgContainer;
+    }
+
+    /**
+     * Set Drawing Container.
+     */
+    public function setDgContainer(Escher\DgContainer $dgContainer): Escher\DgContainer
+    {
+        return $this->dgContainer = $dgContainer;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
new file mode 100644
index 00000000..0f4b7a86
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Escher;
+
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
+
+class DgContainer
+{
+    /**
+     * Drawing index, 1-based.
+     */
+    private ?int $dgId = null;
+
+    /**
+     * Last shape index in this drawing.
+     */
+    private ?int $lastSpId = null;
+
+    private ?SpgrContainer $spgrContainer = null;
+
+    public function getDgId(): ?int
+    {
+        return $this->dgId;
+    }
+
+    public function setDgId(int $value): void
+    {
+        $this->dgId = $value;
+    }
+
+    public function getLastSpId(): ?int
+    {
+        return $this->lastSpId;
+    }
+
+    public function setLastSpId(int $value): void
+    {
+        $this->lastSpId = $value;
+    }
+
+    public function getSpgrContainer(): ?SpgrContainer
+    {
+        return $this->spgrContainer;
+    }
+
+    public function getSpgrContainerOrThrow(): SpgrContainer
+    {
+        if ($this->spgrContainer !== null) {
+            return $this->spgrContainer;
+        }
+
+        throw new SpreadsheetException('spgrContainer is unexpectedly null');
+    }
+
+    public function setSpgrContainer(SpgrContainer $spgrContainer): SpgrContainer
+    {
+        return $this->spgrContainer = $spgrContainer;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
new file mode 100644
index 00000000..84363ab2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer;
+
+class SpgrContainer
+{
+    /**
+     * Parent Shape Group Container.
+     */
+    private ?self $parent = null;
+
+    /**
+     * Shape Container collection.
+     */
+    private array $children = [];
+
+    /**
+     * Set parent Shape Group Container.
+     */
+    public function setParent(?self $parent): void
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Get the parent Shape Group Container if any.
+     */
+    public function getParent(): ?self
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Add a child. This will be either spgrContainer or spContainer.
+     *
+     * @param SpgrContainer|SpgrContainer\SpContainer $child child to be added
+     */
+    public function addChild(mixed $child): void
+    {
+        $this->children[] = $child;
+        $child->setParent($this);
+    }
+
+    /**
+     * Get collection of Shape Containers.
+     */
+    public function getChildren(): array
+    {
+        return $this->children;
+    }
+
+    /**
+     * Recursively get all spContainers within this spgrContainer.
+     *
+     * @return SpgrContainer\SpContainer[]
+     */
+    public function getAllSpContainers(): array
+    {
+        $allSpContainers = [];
+
+        foreach ($this->children as $child) {
+            if ($child instanceof self) {
+                $allSpContainers = array_merge($allSpContainers, $child->getAllSpContainers());
+            } else {
+                $allSpContainers[] = $child;
+            }
+        }
+
+        return $allSpContainers;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
new file mode 100644
index 00000000..c462d454
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
@@ -0,0 +1,300 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
+
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
+
+class SpContainer
+{
+    /**
+     * Parent Shape Group Container.
+     */
+    private SpgrContainer $parent;
+
+    /**
+     * Is this a group shape?
+     */
+    private bool $spgr = false;
+
+    /**
+     * Shape type.
+     */
+    private int $spType;
+
+    /**
+     * Shape flag.
+     */
+    private int $spFlag;
+
+    /**
+     * Shape index (usually group shape has index 0, and the rest: 1,2,3...).
+     */
+    private int $spId;
+
+    /**
+     * Array of options.
+     */
+    private array $OPT = [];
+
+    /**
+     * Cell coordinates of upper-left corner of shape, e.g. 'A1'.
+     */
+    private string $startCoordinates = '';
+
+    /**
+     * Horizontal offset of upper-left corner of shape measured in 1/1024 of column width.
+     */
+    private int|float $startOffsetX;
+
+    /**
+     * Vertical offset of upper-left corner of shape measured in 1/256 of row height.
+     */
+    private int|float $startOffsetY;
+
+    /**
+     * Cell coordinates of bottom-right corner of shape, e.g. 'B2'.
+     */
+    private string $endCoordinates;
+
+    /**
+     * Horizontal offset of bottom-right corner of shape measured in 1/1024 of column width.
+     */
+    private int|float $endOffsetX;
+
+    /**
+     * Vertical offset of bottom-right corner of shape measured in 1/256 of row height.
+     */
+    private int|float $endOffsetY;
+
+    /**
+     * Set parent Shape Group Container.
+     */
+    public function setParent(SpgrContainer $parent): void
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Get the parent Shape Group Container.
+     */
+    public function getParent(): SpgrContainer
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Set whether this is a group shape.
+     */
+    public function setSpgr(bool $value): void
+    {
+        $this->spgr = $value;
+    }
+
+    /**
+     * Get whether this is a group shape.
+     */
+    public function getSpgr(): bool
+    {
+        return $this->spgr;
+    }
+
+    /**
+     * Set the shape type.
+     */
+    public function setSpType(int $value): void
+    {
+        $this->spType = $value;
+    }
+
+    /**
+     * Get the shape type.
+     */
+    public function getSpType(): int
+    {
+        return $this->spType;
+    }
+
+    /**
+     * Set the shape flag.
+     */
+    public function setSpFlag(int $value): void
+    {
+        $this->spFlag = $value;
+    }
+
+    /**
+     * Get the shape flag.
+     */
+    public function getSpFlag(): int
+    {
+        return $this->spFlag;
+    }
+
+    /**
+     * Set the shape index.
+     */
+    public function setSpId(int $value): void
+    {
+        $this->spId = $value;
+    }
+
+    /**
+     * Get the shape index.
+     */
+    public function getSpId(): int
+    {
+        return $this->spId;
+    }
+
+    /**
+     * Set an option for the Shape Group Container.
+     *
+     * @param int $property The number specifies the option
+     */
+    public function setOPT(int $property, mixed $value): void
+    {
+        $this->OPT[$property] = $value;
+    }
+
+    /**
+     * Get an option for the Shape Group Container.
+     *
+     * @param int $property The number specifies the option
+     */
+    public function getOPT(int $property): mixed
+    {
+        if (isset($this->OPT[$property])) {
+            return $this->OPT[$property];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the collection of options.
+     */
+    public function getOPTCollection(): array
+    {
+        return $this->OPT;
+    }
+
+    /**
+     * Set cell coordinates of upper-left corner of shape.
+     *
+     * @param string $value eg: 'A1'
+     */
+    public function setStartCoordinates(string $value): void
+    {
+        $this->startCoordinates = $value;
+    }
+
+    /**
+     * Get cell coordinates of upper-left corner of shape.
+     */
+    public function getStartCoordinates(): string
+    {
+        return $this->startCoordinates;
+    }
+
+    /**
+     * Set offset in x-direction of upper-left corner of shape measured in 1/1024 of column width.
+     */
+    public function setStartOffsetX(int|float $startOffsetX): void
+    {
+        $this->startOffsetX = $startOffsetX;
+    }
+
+    /**
+     * Get offset in x-direction of upper-left corner of shape measured in 1/1024 of column width.
+     */
+    public function getStartOffsetX(): int|float
+    {
+        return $this->startOffsetX;
+    }
+
+    /**
+     * Set offset in y-direction of upper-left corner of shape measured in 1/256 of row height.
+     */
+    public function setStartOffsetY(int|float $startOffsetY): void
+    {
+        $this->startOffsetY = $startOffsetY;
+    }
+
+    /**
+     * Get offset in y-direction of upper-left corner of shape measured in 1/256 of row height.
+     */
+    public function getStartOffsetY(): int|float
+    {
+        return $this->startOffsetY;
+    }
+
+    /**
+     * Set cell coordinates of bottom-right corner of shape.
+     *
+     * @param string $value eg: 'A1'
+     */
+    public function setEndCoordinates(string $value): void
+    {
+        $this->endCoordinates = $value;
+    }
+
+    /**
+     * Get cell coordinates of bottom-right corner of shape.
+     */
+    public function getEndCoordinates(): string
+    {
+        return $this->endCoordinates;
+    }
+
+    /**
+     * Set offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width.
+     */
+    public function setEndOffsetX(int|float $endOffsetX): void
+    {
+        $this->endOffsetX = $endOffsetX;
+    }
+
+    /**
+     * Get offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width.
+     */
+    public function getEndOffsetX(): int|float
+    {
+        return $this->endOffsetX;
+    }
+
+    /**
+     * Set offset in y-direction of bottom-right corner of shape measured in 1/256 of row height.
+     */
+    public function setEndOffsetY(int|float $endOffsetY): void
+    {
+        $this->endOffsetY = $endOffsetY;
+    }
+
+    /**
+     * Get offset in y-direction of bottom-right corner of shape measured in 1/256 of row height.
+     */
+    public function getEndOffsetY(): int|float
+    {
+        return $this->endOffsetY;
+    }
+
+    /**
+     * Get the nesting level of this spContainer. This is the number of spgrContainers between this spContainer and
+     * the dgContainer. A value of 1 = immediately within first spgrContainer
+     * Higher nesting level occurs if and only if spContainer is part of a shape group.
+     *
+     * @return int Nesting level
+     */
+    public function getNestingLevel(): int
+    {
+        $nestingLevel = 0;
+
+        $parent = $this->getParent();
+        while ($parent instanceof SpgrContainer) {
+            ++$nestingLevel;
+            $parent = $parent->getParent();
+        }
+
+        return $nestingLevel;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
new file mode 100644
index 00000000..9b0c9bb2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Escher;
+
+class DggContainer
+{
+    /**
+     * Maximum shape index of all shapes in all drawings increased by one.
+     */
+    private int $spIdMax;
+
+    /**
+     * Total number of drawings saved.
+     */
+    private int $cDgSaved;
+
+    /**
+     * Total number of shapes saved (including group shapes).
+     */
+    private int $cSpSaved;
+
+    /**
+     * BLIP Store Container.
+     *
+     * @var ?DggContainer\BstoreContainer
+     */
+    private ?DggContainer\BstoreContainer $bstoreContainer = null;
+
+    /**
+     * Array of options for the drawing group.
+     */
+    private array $OPT = [];
+
+    /**
+     * Array of identifier clusters containg information about the maximum shape identifiers.
+     */
+    private array $IDCLs = [];
+
+    /**
+     * Get maximum shape index of all shapes in all drawings (plus one).
+     */
+    public function getSpIdMax(): int
+    {
+        return $this->spIdMax;
+    }
+
+    /**
+     * Set maximum shape index of all shapes in all drawings (plus one).
+     */
+    public function setSpIdMax(int $value): void
+    {
+        $this->spIdMax = $value;
+    }
+
+    /**
+     * Get total number of drawings saved.
+     */
+    public function getCDgSaved(): int
+    {
+        return $this->cDgSaved;
+    }
+
+    /**
+     * Set total number of drawings saved.
+     */
+    public function setCDgSaved(int $value): void
+    {
+        $this->cDgSaved = $value;
+    }
+
+    /**
+     * Get total number of shapes saved (including group shapes).
+     */
+    public function getCSpSaved(): int
+    {
+        return $this->cSpSaved;
+    }
+
+    /**
+     * Set total number of shapes saved (including group shapes).
+     */
+    public function setCSpSaved(int $value): void
+    {
+        $this->cSpSaved = $value;
+    }
+
+    /**
+     * Get BLIP Store Container.
+     */
+    public function getBstoreContainer(): ?DggContainer\BstoreContainer
+    {
+        return $this->bstoreContainer;
+    }
+
+    /**
+     * Set BLIP Store Container.
+     */
+    public function setBstoreContainer(DggContainer\BstoreContainer $bstoreContainer): void
+    {
+        $this->bstoreContainer = $bstoreContainer;
+    }
+
+    /**
+     * Set an option for the drawing group.
+     *
+     * @param int $property The number specifies the option
+     */
+    public function setOPT(int $property, mixed $value): void
+    {
+        $this->OPT[$property] = $value;
+    }
+
+    /**
+     * Get an option for the drawing group.
+     *
+     * @param int $property The number specifies the option
+     */
+    public function getOPT(int $property): mixed
+    {
+        if (isset($this->OPT[$property])) {
+            return $this->OPT[$property];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get identifier clusters.
+     */
+    public function getIDCLs(): array
+    {
+        return $this->IDCLs;
+    }
+
+    /**
+     * Set identifier clusters. [<drawingId> => <max shape id>, ...].
+     */
+    public function setIDCLs(array $IDCLs): void
+    {
+        $this->IDCLs = $IDCLs;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php
new file mode 100644
index 00000000..2d13b42d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer;
+
+class BstoreContainer
+{
+    /**
+     * BLIP Store Entries. Each of them holds one BLIP (Big Large Image or Picture).
+     *
+     * @var BstoreContainer\BSE[]
+     */
+    private array $BSECollection = [];
+
+    /**
+     * Add a BLIP Store Entry.
+     */
+    public function addBSE(BstoreContainer\BSE $BSE): void
+    {
+        $this->BSECollection[] = $BSE;
+        $BSE->setParent($this);
+    }
+
+    /**
+     * Get the collection of BLIP Store Entries.
+     *
+     * @return BstoreContainer\BSE[]
+     */
+    public function getBSECollection(): array
+    {
+        return $this->BSECollection;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
new file mode 100644
index 00000000..0f5bf31d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer;
+
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer;
+
+class BSE
+{
+    const BLIPTYPE_ERROR = 0x00;
+    const BLIPTYPE_UNKNOWN = 0x01;
+    const BLIPTYPE_EMF = 0x02;
+    const BLIPTYPE_WMF = 0x03;
+    const BLIPTYPE_PICT = 0x04;
+    const BLIPTYPE_JPEG = 0x05;
+    const BLIPTYPE_PNG = 0x06;
+    const BLIPTYPE_DIB = 0x07;
+    const BLIPTYPE_TIFF = 0x11;
+    const BLIPTYPE_CMYKJPEG = 0x12;
+
+    /**
+     * The parent BLIP Store Entry Container.
+     * Property is currently unused.
+     */
+    private BstoreContainer $parent;
+
+    /**
+     * The BLIP (Big Large Image or Picture).
+     *
+     * @var ?BSE\Blip
+     */
+    private ?BSE\Blip $blip = null;
+
+    /**
+     * The BLIP type.
+     */
+    private int $blipType;
+
+    /**
+     * Set parent BLIP Store Entry Container.
+     */
+    public function setParent(BstoreContainer $parent): void
+    {
+        $this->parent = $parent;
+    }
+
+    public function getParent(): BstoreContainer
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Get the BLIP.
+     */
+    public function getBlip(): ?BSE\Blip
+    {
+        return $this->blip;
+    }
+
+    /**
+     * Set the BLIP.
+     */
+    public function setBlip(BSE\Blip $blip): void
+    {
+        $this->blip = $blip;
+        $blip->setParent($this);
+    }
+
+    /**
+     * Get the BLIP type.
+     */
+    public function getBlipType(): int
+    {
+        return $this->blipType;
+    }
+
+    /**
+     * Set the BLIP type.
+     */
+    public function setBlipType(int $blipType): void
+    {
+        $this->blipType = $blipType;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
new file mode 100644
index 00000000..763bfe57
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
+
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
+
+class Blip
+{
+    /**
+     * The parent BSE.
+     */
+    private BSE $parent;
+
+    /**
+     * Raw image data.
+     */
+    private string $data;
+
+    /**
+     * Get the raw image data.
+     */
+    public function getData(): string
+    {
+        return $this->data;
+    }
+
+    /**
+     * Set the raw image data.
+     */
+    public function setData(string $data): void
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Set parent BSE.
+     */
+    public function setParent(BSE $parent): void
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * Get parent BSE.
+     */
+    public function getParent(): BSE
+    {
+        return $this->parent;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
new file mode 100644
index 00000000..022c1bb0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
@@ -0,0 +1,195 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use ZipArchive;
+
+class File
+{
+    /**
+     * Use Temp or File Upload Temp for temporary files.
+     */
+    protected static bool $useUploadTempDirectory = false;
+
+    /**
+     * Set the flag indicating whether the File Upload Temp directory should be used for temporary files.
+     */
+    public static function setUseUploadTempDirectory(bool $useUploadTempDir): void
+    {
+        self::$useUploadTempDirectory = (bool) $useUploadTempDir;
+    }
+
+    /**
+     * Get the flag indicating whether the File Upload Temp directory should be used for temporary files.
+     */
+    public static function getUseUploadTempDirectory(): bool
+    {
+        return self::$useUploadTempDirectory;
+    }
+
+    // https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
+    // Section 4.3.7
+    // Looks like there might be endian-ness considerations
+    private const ZIP_FIRST_4 = [
+        "\x50\x4b\x03\x04", // what it looks like on my system
+        "\x04\x03\x4b\x50", // what it says in documentation
+    ];
+
+    private static function validateZipFirst4(string $zipFile): bool
+    {
+        $contents = @file_get_contents($zipFile, false, null, 0, 4);
+
+        return in_array($contents, self::ZIP_FIRST_4, true);
+    }
+
+    /**
+     * Verify if a file exists.
+     */
+    public static function fileExists(string $filename): bool
+    {
+        // Sick construction, but it seems that
+        // file_exists returns strange values when
+        // doing the original file_exists on ZIP archives...
+        if (strtolower(substr($filename, 0, 6)) == 'zip://') {
+            // Open ZIP file and verify if the file exists
+            $zipFile = substr($filename, 6, strrpos($filename, '#') - 6);
+            $archiveFile = substr($filename, strrpos($filename, '#') + 1);
+
+            if (self::validateZipFirst4($zipFile)) {
+                $zip = new ZipArchive();
+                $res = $zip->open($zipFile);
+                if ($res === true) {
+                    $returnValue = ($zip->getFromName($archiveFile) !== false);
+                    $zip->close();
+
+                    return $returnValue;
+                }
+            }
+
+            return false;
+        }
+
+        return file_exists($filename);
+    }
+
+    /**
+     * Returns canonicalized absolute pathname, also for ZIP archives.
+     */
+    public static function realpath(string $filename): string
+    {
+        // Returnvalue
+        $returnValue = '';
+
+        // Try using realpath()
+        if (file_exists($filename)) {
+            $returnValue = realpath($filename) ?: '';
+        }
+
+        // Found something?
+        if ($returnValue === '') {
+            $pathArray = explode('/', $filename);
+            while (in_array('..', $pathArray) && $pathArray[0] != '..') {
+                $iMax = count($pathArray);
+                for ($i = 1; $i < $iMax; ++$i) {
+                    if ($pathArray[$i] == '..') {
+                        array_splice($pathArray, $i - 1, 2);
+
+                        break;
+                    }
+                }
+            }
+            $returnValue = implode('/', $pathArray);
+        }
+
+        // Return
+        return $returnValue;
+    }
+
+    /**
+     * Get the systems temporary directory.
+     */
+    public static function sysGetTempDir(): string
+    {
+        $path = sys_get_temp_dir();
+        if (self::$useUploadTempDirectory) {
+            //  use upload-directory when defined to allow running on environments having very restricted
+            //      open_basedir configs
+            if (ini_get('upload_tmp_dir') !== false) {
+                if ($temp = ini_get('upload_tmp_dir')) {
+                    if (file_exists($temp)) {
+                        $path = $temp;
+                    }
+                }
+            }
+        }
+
+        return realpath($path) ?: '';
+    }
+
+    public static function temporaryFilename(): string
+    {
+        $filename = tempnam(self::sysGetTempDir(), 'phpspreadsheet');
+        if ($filename === false) {
+            throw new Exception('Could not create temporary file');
+        }
+
+        return $filename;
+    }
+
+    /**
+     * Assert that given path is an existing file and is readable, otherwise throw exception.
+     */
+    public static function assertFile(string $filename, string $zipMember = ''): void
+    {
+        if (!is_file($filename)) {
+            throw new ReaderException('File "' . $filename . '" does not exist.');
+        }
+
+        if (!is_readable($filename)) {
+            throw new ReaderException('Could not open "' . $filename . '" for reading.');
+        }
+
+        if ($zipMember !== '') {
+            $zipfile = "zip://$filename#$zipMember";
+            if (!self::fileExists($zipfile)) {
+                // Has the file been saved with Windoze directory separators rather than unix?
+                $zipfile = "zip://$filename#" . str_replace('/', '\\', $zipMember);
+                if (!self::fileExists($zipfile)) {
+                    throw new ReaderException("Could not find zip member $zipfile");
+                }
+            }
+        }
+    }
+
+    /**
+     * Same as assertFile, except return true/false and don't throw Exception.
+     */
+    public static function testFileNoThrow(string $filename, ?string $zipMember = null): bool
+    {
+        if (!is_file($filename)) {
+            return false;
+        }
+        if (!is_readable($filename)) {
+            return false;
+        }
+        if ($zipMember === null) {
+            return true;
+        }
+        // validate zip, but don't check specific member
+        if ($zipMember === '') {
+            return self::validateZipFirst4($filename);
+        }
+
+        $zipfile = "zip://$filename#$zipMember";
+        if (self::fileExists($zipfile)) {
+            return true;
+        }
+
+        // Has the file been saved with Windoze directory separators rather than unix?
+        $zipfile = "zip://$filename#" . str_replace('/', '\\', $zipMember);
+
+        return self::fileExists($zipfile);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
new file mode 100644
index 00000000..8a1225b1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
@@ -0,0 +1,718 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Font as FontStyle;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+class Font
+{
+    // Methods for resolving autosize value
+    const AUTOSIZE_METHOD_APPROX = 'approx';
+    const AUTOSIZE_METHOD_EXACT = 'exact';
+
+    private const AUTOSIZE_METHODS = [
+        self::AUTOSIZE_METHOD_APPROX,
+        self::AUTOSIZE_METHOD_EXACT,
+    ];
+
+    /** Character set codes used by BIFF5-8 in Font records */
+    const CHARSET_ANSI_LATIN = 0x00;
+    const CHARSET_SYSTEM_DEFAULT = 0x01;
+    const CHARSET_SYMBOL = 0x02;
+    const CHARSET_APPLE_ROMAN = 0x4D;
+    const CHARSET_ANSI_JAPANESE_SHIFTJIS = 0x80;
+    const CHARSET_ANSI_KOREAN_HANGUL = 0x81;
+    const CHARSET_ANSI_KOREAN_JOHAB = 0x82;
+    const CHARSET_ANSI_CHINESE_SIMIPLIFIED = 0x86; //    gb2312
+    const CHARSET_ANSI_CHINESE_TRADITIONAL = 0x88; //    big5
+    const CHARSET_ANSI_GREEK = 0xA1;
+    const CHARSET_ANSI_TURKISH = 0xA2;
+    const CHARSET_ANSI_VIETNAMESE = 0xA3;
+    const CHARSET_ANSI_HEBREW = 0xB1;
+    const CHARSET_ANSI_ARABIC = 0xB2;
+    const CHARSET_ANSI_BALTIC = 0xBA;
+    const CHARSET_ANSI_CYRILLIC = 0xCC;
+    const CHARSET_ANSI_THAI = 0xDD;
+    const CHARSET_ANSI_LATIN_II = 0xEE;
+    const CHARSET_OEM_LATIN_I = 0xFF;
+
+    //  XXX: Constants created!
+    /** Font filenames */
+    const ARIAL = 'arial.ttf';
+    const ARIAL_BOLD = 'arialbd.ttf';
+    const ARIAL_ITALIC = 'ariali.ttf';
+    const ARIAL_BOLD_ITALIC = 'arialbi.ttf';
+
+    const CALIBRI = 'calibri.ttf';
+    const CALIBRI_BOLD = 'calibrib.ttf';
+    const CALIBRI_ITALIC = 'calibrii.ttf';
+    const CALIBRI_BOLD_ITALIC = 'calibriz.ttf';
+
+    const COMIC_SANS_MS = 'comic.ttf';
+    const COMIC_SANS_MS_BOLD = 'comicbd.ttf';
+
+    const COURIER_NEW = 'cour.ttf';
+    const COURIER_NEW_BOLD = 'courbd.ttf';
+    const COURIER_NEW_ITALIC = 'couri.ttf';
+    const COURIER_NEW_BOLD_ITALIC = 'courbi.ttf';
+
+    const GEORGIA = 'georgia.ttf';
+    const GEORGIA_BOLD = 'georgiab.ttf';
+    const GEORGIA_ITALIC = 'georgiai.ttf';
+    const GEORGIA_BOLD_ITALIC = 'georgiaz.ttf';
+
+    const IMPACT = 'impact.ttf';
+
+    const LIBERATION_SANS = 'LiberationSans-Regular.ttf';
+    const LIBERATION_SANS_BOLD = 'LiberationSans-Bold.ttf';
+    const LIBERATION_SANS_ITALIC = 'LiberationSans-Italic.ttf';
+    const LIBERATION_SANS_BOLD_ITALIC = 'LiberationSans-BoldItalic.ttf';
+
+    const LUCIDA_CONSOLE = 'lucon.ttf';
+    const LUCIDA_SANS_UNICODE = 'l_10646.ttf';
+
+    const MICROSOFT_SANS_SERIF = 'micross.ttf';
+
+    const PALATINO_LINOTYPE = 'pala.ttf';
+    const PALATINO_LINOTYPE_BOLD = 'palab.ttf';
+    const PALATINO_LINOTYPE_ITALIC = 'palai.ttf';
+    const PALATINO_LINOTYPE_BOLD_ITALIC = 'palabi.ttf';
+
+    const SYMBOL = 'symbol.ttf';
+
+    const TAHOMA = 'tahoma.ttf';
+    const TAHOMA_BOLD = 'tahomabd.ttf';
+
+    const TIMES_NEW_ROMAN = 'times.ttf';
+    const TIMES_NEW_ROMAN_BOLD = 'timesbd.ttf';
+    const TIMES_NEW_ROMAN_ITALIC = 'timesi.ttf';
+    const TIMES_NEW_ROMAN_BOLD_ITALIC = 'timesbi.ttf';
+
+    const TREBUCHET_MS = 'trebuc.ttf';
+    const TREBUCHET_MS_BOLD = 'trebucbd.ttf';
+    const TREBUCHET_MS_ITALIC = 'trebucit.ttf';
+    const TREBUCHET_MS_BOLD_ITALIC = 'trebucbi.ttf';
+
+    const VERDANA = 'verdana.ttf';
+    const VERDANA_BOLD = 'verdanab.ttf';
+    const VERDANA_ITALIC = 'verdanai.ttf';
+    const VERDANA_BOLD_ITALIC = 'verdanaz.ttf';
+
+    const FONT_FILE_NAMES = [
+        'Arial' => [
+            'x' => self::ARIAL,
+            'xb' => self::ARIAL_BOLD,
+            'xi' => self::ARIAL_ITALIC,
+            'xbi' => self::ARIAL_BOLD_ITALIC,
+        ],
+        'Calibri' => [
+            'x' => self::CALIBRI,
+            'xb' => self::CALIBRI_BOLD,
+            'xi' => self::CALIBRI_ITALIC,
+            'xbi' => self::CALIBRI_BOLD_ITALIC,
+        ],
+        'Comic Sans MS' => [
+            'x' => self::COMIC_SANS_MS,
+            'xb' => self::COMIC_SANS_MS_BOLD,
+            'xi' => self::COMIC_SANS_MS,
+            'xbi' => self::COMIC_SANS_MS_BOLD,
+        ],
+        'Courier New' => [
+            'x' => self::COURIER_NEW,
+            'xb' => self::COURIER_NEW_BOLD,
+            'xi' => self::COURIER_NEW_ITALIC,
+            'xbi' => self::COURIER_NEW_BOLD_ITALIC,
+        ],
+        'Georgia' => [
+            'x' => self::GEORGIA,
+            'xb' => self::GEORGIA_BOLD,
+            'xi' => self::GEORGIA_ITALIC,
+            'xbi' => self::GEORGIA_BOLD_ITALIC,
+        ],
+        'Impact' => [
+            'x' => self::IMPACT,
+            'xb' => self::IMPACT,
+            'xi' => self::IMPACT,
+            'xbi' => self::IMPACT,
+        ],
+        'Liberation Sans' => [
+            'x' => self::LIBERATION_SANS,
+            'xb' => self::LIBERATION_SANS_BOLD,
+            'xi' => self::LIBERATION_SANS_ITALIC,
+            'xbi' => self::LIBERATION_SANS_BOLD_ITALIC,
+        ],
+        'Lucida Console' => [
+            'x' => self::LUCIDA_CONSOLE,
+            'xb' => self::LUCIDA_CONSOLE,
+            'xi' => self::LUCIDA_CONSOLE,
+            'xbi' => self::LUCIDA_CONSOLE,
+        ],
+        'Lucida Sans Unicode' => [
+            'x' => self::LUCIDA_SANS_UNICODE,
+            'xb' => self::LUCIDA_SANS_UNICODE,
+            'xi' => self::LUCIDA_SANS_UNICODE,
+            'xbi' => self::LUCIDA_SANS_UNICODE,
+        ],
+        'Microsoft Sans Serif' => [
+            'x' => self::MICROSOFT_SANS_SERIF,
+            'xb' => self::MICROSOFT_SANS_SERIF,
+            'xi' => self::MICROSOFT_SANS_SERIF,
+            'xbi' => self::MICROSOFT_SANS_SERIF,
+        ],
+        'Palatino Linotype' => [
+            'x' => self::PALATINO_LINOTYPE,
+            'xb' => self::PALATINO_LINOTYPE_BOLD,
+            'xi' => self::PALATINO_LINOTYPE_ITALIC,
+            'xbi' => self::PALATINO_LINOTYPE_BOLD_ITALIC,
+        ],
+        'Symbol' => [
+            'x' => self::SYMBOL,
+            'xb' => self::SYMBOL,
+            'xi' => self::SYMBOL,
+            'xbi' => self::SYMBOL,
+        ],
+        'Tahoma' => [
+            'x' => self::TAHOMA,
+            'xb' => self::TAHOMA_BOLD,
+            'xi' => self::TAHOMA,
+            'xbi' => self::TAHOMA_BOLD,
+        ],
+        'Times New Roman' => [
+            'x' => self::TIMES_NEW_ROMAN,
+            'xb' => self::TIMES_NEW_ROMAN_BOLD,
+            'xi' => self::TIMES_NEW_ROMAN_ITALIC,
+            'xbi' => self::TIMES_NEW_ROMAN_BOLD_ITALIC,
+        ],
+        'Trebuchet MS' => [
+            'x' => self::TREBUCHET_MS,
+            'xb' => self::TREBUCHET_MS_BOLD,
+            'xi' => self::TREBUCHET_MS_ITALIC,
+            'xbi' => self::TREBUCHET_MS_BOLD_ITALIC,
+        ],
+        'Verdana' => [
+            'x' => self::VERDANA,
+            'xb' => self::VERDANA_BOLD,
+            'xi' => self::VERDANA_ITALIC,
+            'xbi' => self::VERDANA_BOLD_ITALIC,
+        ],
+    ];
+
+    /**
+     * Array that can be used to supplement FONT_FILE_NAMES for calculating exact width.
+     *
+     * @var array<string, array<string, string>>
+     */
+    private static array $extraFontArray = [];
+
+    /** @param array<string, array<string, string>> $extraFontArray */
+    public static function setExtraFontArray(array $extraFontArray): void
+    {
+        self::$extraFontArray = $extraFontArray;
+    }
+
+    /** @return array<string, array<string, string>> */
+    public static function getExtraFontArray(): array
+    {
+        return self::$extraFontArray;
+    }
+
+    /**
+     * AutoSize method.
+     */
+    private static string $autoSizeMethod = self::AUTOSIZE_METHOD_APPROX;
+
+    /**
+     * Path to folder containing TrueType font .ttf files.
+     */
+    private static string $trueTypeFontPath = '';
+
+    /**
+     * How wide is a default column for a given default font and size?
+     * Empirical data found by inspecting real Excel files and reading off the pixel width
+     * in Microsoft Office Excel 2007.
+     * Added height in points.
+     */
+    public const DEFAULT_COLUMN_WIDTHS = [
+        'Arial' => [
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.0],
+
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 56, 'width' => 9.33203125, 'height' => 11.25],
+            9 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.0],
+            10 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.75],
+        ],
+        'Calibri' => [
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.00],
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 56, 'width' => 9.33203125, 'height' => 11.25],
+            9 => ['px' => 56, 'width' => 9.33203125, 'height' => 12.0],
+            10 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.75],
+            11 => ['px' => 64, 'width' => 9.14062500, 'height' => 15.0],
+        ],
+        'Verdana' => [
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.0],
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 64, 'width' => 9.14062500, 'height' => 10.5],
+            9 => ['px' => 72, 'width' => 9.00000000, 'height' => 11.25],
+            10 => ['px' => 72, 'width' => 9.00000000, 'height' => 12.75],
+        ],
+    ];
+
+    /**
+     * Set autoSize method.
+     *
+     * @param string $method see self::AUTOSIZE_METHOD_*
+     *
+     * @return bool Success or failure
+     */
+    public static function setAutoSizeMethod(string $method): bool
+    {
+        if (!in_array($method, self::AUTOSIZE_METHODS)) {
+            return false;
+        }
+        self::$autoSizeMethod = $method;
+
+        return true;
+    }
+
+    /**
+     * Get autoSize method.
+     */
+    public static function getAutoSizeMethod(): string
+    {
+        return self::$autoSizeMethod;
+    }
+
+    /**
+     * Set the path to the folder containing .ttf files. There should be a trailing slash.
+     * Path will be recursively searched for font file.
+     * Typical locations on various platforms:
+     *    <ul>
+     *        <li>C:/Windows/Fonts/</li>
+     *        <li>/usr/share/fonts/truetype/</li>
+     *        <li>~/.fonts/</li>
+     * </ul>.
+     */
+    public static function setTrueTypeFontPath(string $folderPath): void
+    {
+        self::$trueTypeFontPath = $folderPath;
+    }
+
+    /**
+     * Get the path to the folder containing .ttf files.
+     */
+    public static function getTrueTypeFontPath(): string
+    {
+        return self::$trueTypeFontPath;
+    }
+
+    /**
+     * Pad amount for exact in pixels; use best guess if null.
+     */
+    private static null|float|int $paddingAmountExact = null;
+
+    /**
+     * Set pad amount for exact in pixels; use best guess if null.
+     */
+    public static function setPaddingAmountExact(null|float|int $paddingAmountExact): void
+    {
+        self::$paddingAmountExact = $paddingAmountExact;
+    }
+
+    /**
+     * Get pad amount for exact in pixels; or null if using best guess.
+     */
+    public static function getPaddingAmountExact(): null|float|int
+    {
+        return self::$paddingAmountExact;
+    }
+
+    /**
+     * Calculate an (approximate) OpenXML column width, based on font size and text contained.
+     *
+     * @param FontStyle $font Font object
+     * @param null|RichText|string $cellText Text to calculate width
+     * @param int $rotation Rotation angle
+     * @param null|FontStyle $defaultFont Font object
+     * @param bool $filterAdjustment Add space for Autofilter or Table dropdown
+     */
+    public static function calculateColumnWidth(
+        FontStyle $font,
+        $cellText = '',
+        int $rotation = 0,
+        ?FontStyle $defaultFont = null,
+        bool $filterAdjustment = false,
+        int $indentAdjustment = 0
+    ): float {
+        // If it is rich text, use plain text
+        if ($cellText instanceof RichText) {
+            $cellText = $cellText->getPlainText();
+        }
+
+        // Special case if there are one or more newline characters ("\n")
+        $cellText = (string) $cellText;
+        if (str_contains($cellText, "\n")) {
+            $lineTexts = explode("\n", $cellText);
+            $lineWidths = [];
+            foreach ($lineTexts as $lineText) {
+                $lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont, $filterAdjustment);
+            }
+
+            return max($lineWidths); // width of longest line in cell
+        }
+
+        // Try to get the exact text width in pixels
+        $approximate = self::$autoSizeMethod === self::AUTOSIZE_METHOD_APPROX;
+        $columnWidth = 0;
+        if (!$approximate) {
+            try {
+                $columnWidthAdjust = ceil(
+                    self::getTextWidthPixelsExact(
+                        str_repeat('n', 1 * (($filterAdjustment ? 3 : 1) + ($indentAdjustment * 2))),
+                        $font,
+                        0
+                    ) * 1.07
+                );
+
+                // Width of text in pixels excl. padding
+                // and addition because Excel adds some padding, just use approx width of 'n' glyph
+                $columnWidth = self::getTextWidthPixelsExact($cellText, $font, $rotation) + (self::$paddingAmountExact ?? $columnWidthAdjust);
+            } catch (PhpSpreadsheetException) {
+                $approximate = true;
+            }
+        }
+
+        if ($approximate) {
+            $columnWidthAdjust = self::getTextWidthPixelsApprox(
+                str_repeat('n', 1 * (($filterAdjustment ? 3 : 1) + ($indentAdjustment * 2))),
+                $font,
+                0
+            );
+            // Width of text in pixels excl. padding, approximation
+            // and addition because Excel adds some padding, just use approx width of 'n' glyph
+            $columnWidth = self::getTextWidthPixelsApprox($cellText, $font, $rotation) + $columnWidthAdjust;
+        }
+
+        // Convert from pixel width to column width
+        $columnWidth = Drawing::pixelsToCellDimension((int) $columnWidth, $defaultFont ?? new FontStyle());
+
+        // Return
+        return round($columnWidth, 4);
+    }
+
+    /**
+     * Get GD text width in pixels for a string of text in a certain font at a certain rotation angle.
+     */
+    public static function getTextWidthPixelsExact(string $text, FontStyle $font, int $rotation = 0): float
+    {
+        // font size should really be supplied in pixels in GD2,
+        // but since GD2 seems to assume 72dpi, pixels and points are the same
+        $fontFile = self::getTrueTypeFontFileFromFont($font);
+        $textBox = imagettfbbox($font->getSize() ?? 10.0, $rotation, $fontFile, $text);
+        if ($textBox === false) {
+            // @codeCoverageIgnoreStart
+            throw new PhpSpreadsheetException('imagettfbbox failed');
+            // @codeCoverageIgnoreEnd
+        }
+
+        // Get corners positions
+        $lowerLeftCornerX = $textBox[0];
+        $lowerRightCornerX = $textBox[2];
+        $upperRightCornerX = $textBox[4];
+        $upperLeftCornerX = $textBox[6];
+
+        // Consider the rotation when calculating the width
+        return round(max($lowerRightCornerX - $upperLeftCornerX, $upperRightCornerX - $lowerLeftCornerX), 4);
+    }
+
+    /**
+     * Get approximate width in pixels for a string of text in a certain font at a certain rotation angle.
+     *
+     * @return int Text width in pixels (no padding added)
+     */
+    public static function getTextWidthPixelsApprox(string $columnText, FontStyle $font, int $rotation = 0): int
+    {
+        $fontName = $font->getName();
+        $fontSize = $font->getSize();
+
+        // Calculate column width in pixels.
+        // We assume fixed glyph width, but count double for "fullwidth" characters.
+        // Result varies with font name and size.
+        switch ($fontName) {
+            case 'Arial':
+                // value 8 was set because of experience in different exports at Arial 10 font.
+                $columnWidth = (int) (8 * StringHelper::countCharactersDbcs($columnText));
+                $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
+
+                break;
+            case 'Verdana':
+                // value 8 was found via interpolation by inspecting real Excel files with Verdana 10 font.
+                $columnWidth = (int) (8 * StringHelper::countCharactersDbcs($columnText));
+                $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
+
+                break;
+            default:
+                // just assume Calibri
+                // value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font.
+                $columnWidth = (int) (8.26 * StringHelper::countCharactersDbcs($columnText));
+                $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
+
+                break;
+        }
+
+        // Calculate approximate rotated column width
+        if ($rotation !== 0) {
+            if ($rotation == Alignment::TEXTROTATION_STACK_PHPSPREADSHEET) {
+                // stacked text
+                $columnWidth = 4; // approximation
+            } else {
+                // rotated text
+                $columnWidth = $columnWidth * cos(deg2rad($rotation))
+                                + $fontSize * abs(sin(deg2rad($rotation))) / 5; // approximation
+            }
+        }
+
+        // pixel width is an integer
+        return (int) $columnWidth;
+    }
+
+    /**
+     * Calculate an (approximate) pixel size, based on a font points size.
+     *
+     * @param float|int $fontSizeInPoints Font size (in points)
+     *
+     * @return int Font size (in pixels)
+     */
+    public static function fontSizeToPixels(float|int $fontSizeInPoints): int
+    {
+        return (int) ((4 / 3) * $fontSizeInPoints);
+    }
+
+    /**
+     * Calculate an (approximate) pixel size, based on inch size.
+     *
+     * @param float|int $sizeInInch Font size (in inch)
+     *
+     * @return float|int Size (in pixels)
+     */
+    public static function inchSizeToPixels(int|float $sizeInInch): int|float
+    {
+        return $sizeInInch * 96;
+    }
+
+    /**
+     * Calculate an (approximate) pixel size, based on centimeter size.
+     *
+     * @param float|int $sizeInCm Font size (in centimeters)
+     *
+     * @return float Size (in pixels)
+     */
+    public static function centimeterSizeToPixels(int|float $sizeInCm): float
+    {
+        return $sizeInCm * 37.795275591;
+    }
+
+    /**
+     * Returns the font path given the font.
+     *
+     * @return string Path to TrueType font file
+     */
+    public static function getTrueTypeFontFileFromFont(FontStyle $font, bool $checkPath = true): string
+    {
+        if ($checkPath && (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath))) {
+            throw new PhpSpreadsheetException('Valid directory to TrueType Font files not specified');
+        }
+
+        $name = $font->getName();
+        $fontArray = array_merge(self::FONT_FILE_NAMES, self::$extraFontArray);
+        if (!isset($fontArray[$name])) {
+            throw new PhpSpreadsheetException('Unknown font name "' . $name . '". Cannot map to TrueType font file');
+        }
+        $bold = $font->getBold();
+        $italic = $font->getItalic();
+        $index = 'x';
+        if ($bold) {
+            $index .= 'b';
+        }
+        if ($italic) {
+            $index .= 'i';
+        }
+        $fontFile = $fontArray[$name][$index];
+
+        $separator = '';
+        if (mb_strlen(self::$trueTypeFontPath) > 1 && mb_substr(self::$trueTypeFontPath, -1) !== '/' && mb_substr(self::$trueTypeFontPath, -1) !== '\\') {
+            $separator = DIRECTORY_SEPARATOR;
+        }
+        $fontFileAbsolute = preg_match('~^([A-Za-z]:)?[/\\\\]~', $fontFile) === 1;
+        if (!$fontFileAbsolute) {
+            $fontFile = self::findFontFile(self::$trueTypeFontPath, $fontFile) ?? self::$trueTypeFontPath . $separator . $fontFile;
+        }
+
+        // Check if file actually exists
+        if ($checkPath && !file_exists($fontFile) && !$fontFileAbsolute) {
+            $alternateName = $name;
+            if ($index !== 'x' && $fontArray[$name][$index] !== $fontArray[$name]['x']) {
+                // Bold but no italic:
+                //   Comic Sans
+                //   Tahoma
+                // Neither bold nor italic:
+                //   Impact
+                //   Lucida Console
+                //   Lucida Sans Unicode
+                //   Microsoft Sans Serif
+                //   Symbol
+                if ($index === 'xb') {
+                    $alternateName .= ' Bold';
+                } elseif ($index === 'xi') {
+                    $alternateName .= ' Italic';
+                } elseif ($fontArray[$name]['xb'] === $fontArray[$name]['xbi']) {
+                    $alternateName .= ' Bold';
+                } else {
+                    $alternateName .= ' Bold Italic';
+                }
+            }
+            $fontFile = self::$trueTypeFontPath . $separator . $alternateName . '.ttf';
+            if (!file_exists($fontFile)) {
+                throw new PhpSpreadsheetException('TrueType Font file not found');
+            }
+        }
+
+        return $fontFile;
+    }
+
+    public const CHARSET_FROM_FONT_NAME = [
+        'EucrosiaUPC' => self::CHARSET_ANSI_THAI,
+        'Wingdings' => self::CHARSET_SYMBOL,
+        'Wingdings 2' => self::CHARSET_SYMBOL,
+        'Wingdings 3' => self::CHARSET_SYMBOL,
+    ];
+
+    /**
+     * Returns the associated charset for the font name.
+     *
+     * @param string $fontName Font name
+     *
+     * @return int Character set code
+     */
+    public static function getCharsetFromFontName(string $fontName): int
+    {
+        return self::CHARSET_FROM_FONT_NAME[$fontName] ?? self::CHARSET_ANSI_LATIN;
+    }
+
+    /**
+     * Get the effective column width for columns without a column dimension or column with width -1
+     * For example, for Calibri 11 this is 9.140625 (64 px).
+     *
+     * @param FontStyle $font The workbooks default font
+     * @param bool $returnAsPixels true = return column width in pixels, false = return in OOXML units
+     *
+     * @return ($returnAsPixels is true ? int : float) Column width
+     */
+    public static function getDefaultColumnWidthByFont(FontStyle $font, bool $returnAsPixels = false): float|int
+    {
+        if (isset(self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()])) {
+            // Exact width can be determined
+            $columnWidth = $returnAsPixels
+                ? self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()]['px']
+                    : self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()]['width'];
+        } else {
+            // We don't have data for this particular font and size, use approximation by
+            // extrapolating from Calibri 11
+            $columnWidth = $returnAsPixels
+                ? self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['px']
+                    : self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['width'];
+            $columnWidth = $columnWidth * $font->getSize() / 11;
+
+            // Round pixels to closest integer
+            if ($returnAsPixels) {
+                $columnWidth = (int) round($columnWidth);
+            }
+        }
+
+        return $columnWidth;
+    }
+
+    /**
+     * Get the effective row height for rows without a row dimension or rows with height -1
+     * For example, for Calibri 11 this is 15 points.
+     *
+     * @param FontStyle $font The workbooks default font
+     *
+     * @return float Row height in points
+     */
+    public static function getDefaultRowHeightByFont(FontStyle $font): float
+    {
+        $name = $font->getName();
+        $size = $font->getSize();
+        if (isset(self::DEFAULT_COLUMN_WIDTHS[$name][$size])) {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS[$name][$size]['height'];
+        } elseif ($name === 'Arial' || $name === 'Verdana') {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS[$name][10]['height'] * $size / 10.0;
+        } else {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['height'] * $size / 11.0;
+        }
+
+        return $rowHeight;
+    }
+
+    private static function findFontFile(string $startDirectory, string $desiredFont): ?string
+    {
+        $fontPath = null;
+        if ($startDirectory === '') {
+            return null;
+        }
+        if (file_exists("$startDirectory/$desiredFont")) {
+            $fontPath = "$startDirectory/$desiredFont";
+        } else {
+            $iterations = 0;
+            $it = new RecursiveDirectoryIterator(
+                $startDirectory,
+                RecursiveDirectoryIterator::SKIP_DOTS
+                | RecursiveDirectoryIterator::FOLLOW_SYMLINKS
+            );
+            foreach (
+                new RecursiveIteratorIterator(
+                    $it,
+                    RecursiveIteratorIterator::LEAVES_ONLY,
+                    RecursiveIteratorIterator::CATCH_GET_CHILD
+                ) as $filex
+            ) {
+                /** @var string */
+                $file = $filex;
+                if (basename($file) === $desiredFont) {
+                    $fontPath = $file;
+
+                    break;
+                }
+                ++$iterations;
+                if ($iterations > 5000) {
+                    // @codeCoverageIgnoreStart
+                    break;
+                    // @codeCoverageIgnoreEnd
+                }
+            }
+        }
+
+        return $fontPath;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php
new file mode 100644
index 00000000..2e20c9c3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+class IntOrFloat
+{
+    /**
+     * Help some functions with large results operate correctly on 32-bit,
+     * by returning result as int when possible, float otherwise.
+     */
+    public static function evaluate(float|int $value): float|int
+    {
+        $iValue = (int) $value;
+
+        return ($value == $iValue) ? $iValue : $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php
new file mode 100644
index 00000000..dbf6df80
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php
@@ -0,0 +1,552 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+// vim: set expandtab tabstop=4 shiftwidth=4:
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Xavier Noguer <xnoguer@php.net>                              |
+// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
+// +----------------------------------------------------------------------+
+//
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\Shared\OLE\ChainedBlockStream;
+use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS\Root;
+
+/*
+ * Array for storing OLE instances that are accessed from
+ * OLE_ChainedBlockStream::stream_open().
+ *
+ * @var array
+ */
+$GLOBALS['_OLE_INSTANCES'] = [];
+
+/**
+ * OLE package base class.
+ *
+ * @author   Xavier Noguer <xnoguer@php.net>
+ * @author   Christian Schmidt <schmidt@php.net>
+ */
+class OLE
+{
+    const OLE_PPS_TYPE_ROOT = 5;
+    const OLE_PPS_TYPE_DIR = 1;
+    const OLE_PPS_TYPE_FILE = 2;
+    const OLE_DATA_SIZE_SMALL = 0x1000;
+    const OLE_LONG_INT_SIZE = 4;
+    const OLE_PPS_SIZE = 0x80;
+
+    /**
+     * The file handle for reading an OLE container.
+     *
+     * @var resource
+     */
+    public $_file_handle;
+
+    /**
+     * Array of PPS's found on the OLE container.
+     */
+    public array $_list = [];
+
+    /**
+     * Root directory of OLE container.
+     */
+    public Root $root;
+
+    /**
+     * Big Block Allocation Table.
+     *
+     * @var array (blockId => nextBlockId)
+     */
+    public array $bbat;
+
+    /**
+     * Short Block Allocation Table.
+     *
+     * @var array (blockId => nextBlockId)
+     */
+    public array $sbat;
+
+    /**
+     * Size of big blocks. This is usually 512.
+     *
+     * @var int number of octets per block
+     */
+    public int $bigBlockSize;
+
+    /**
+     * Size of small blocks. This is usually 64.
+     *
+     * @var int number of octets per block
+     */
+    public int $smallBlockSize;
+
+    /**
+     * Threshold for big blocks.
+     */
+    public int $bigBlockThreshold;
+
+    /**
+     * Reads an OLE container from the contents of the file given.
+     *
+     * @acces public
+     *
+     * @return bool true on success, PEAR_Error on failure
+     */
+    public function read(string $filename): bool
+    {
+        $fh = @fopen($filename, 'rb');
+        if ($fh === false) {
+            throw new ReaderException("Can't open file $filename");
+        }
+        $this->_file_handle = $fh;
+
+        $signature = fread($fh, 8);
+        if ("\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1" != $signature) {
+            throw new ReaderException("File doesn't seem to be an OLE container.");
+        }
+        fseek($fh, 28);
+        if (fread($fh, 2) != "\xFE\xFF") {
+            // This shouldn't be a problem in practice
+            throw new ReaderException('Only Little-Endian encoding is supported.');
+        }
+        // Size of blocks and short blocks in bytes
+        $this->bigBlockSize = 2 ** self::readInt2($fh);
+        $this->smallBlockSize = 2 ** self::readInt2($fh);
+
+        // Skip UID, revision number and version number
+        fseek($fh, 44);
+        // Number of blocks in Big Block Allocation Table
+        $bbatBlockCount = self::readInt4($fh);
+
+        // Root chain 1st block
+        $directoryFirstBlockId = self::readInt4($fh);
+
+        // Skip unused bytes
+        fseek($fh, 56);
+        // Streams shorter than this are stored using small blocks
+        $this->bigBlockThreshold = self::readInt4($fh);
+        // Block id of first sector in Short Block Allocation Table
+        $sbatFirstBlockId = self::readInt4($fh);
+        // Number of blocks in Short Block Allocation Table
+        $sbbatBlockCount = self::readInt4($fh);
+        // Block id of first sector in Master Block Allocation Table
+        $mbatFirstBlockId = self::readInt4($fh);
+        // Number of blocks in Master Block Allocation Table
+        $mbbatBlockCount = self::readInt4($fh);
+        $this->bbat = [];
+
+        // Remaining 4 * 109 bytes of current block is beginning of Master
+        // Block Allocation Table
+        $mbatBlocks = [];
+        for ($i = 0; $i < 109; ++$i) {
+            $mbatBlocks[] = self::readInt4($fh);
+        }
+
+        // Read rest of Master Block Allocation Table (if any is left)
+        $pos = $this->getBlockOffset($mbatFirstBlockId);
+        for ($i = 0; $i < $mbbatBlockCount; ++$i) {
+            fseek($fh, $pos);
+            for ($j = 0; $j < $this->bigBlockSize / 4 - 1; ++$j) {
+                $mbatBlocks[] = self::readInt4($fh);
+            }
+            // Last block id in each block points to next block
+            $pos = $this->getBlockOffset(self::readInt4($fh));
+        }
+
+        // Read Big Block Allocation Table according to chain specified by $mbatBlocks
+        for ($i = 0; $i < $bbatBlockCount; ++$i) {
+            $pos = $this->getBlockOffset($mbatBlocks[$i]);
+            fseek($fh, $pos);
+            for ($j = 0; $j < $this->bigBlockSize / 4; ++$j) {
+                $this->bbat[] = self::readInt4($fh);
+            }
+        }
+
+        // Read short block allocation table (SBAT)
+        $this->sbat = [];
+        $shortBlockCount = $sbbatBlockCount * $this->bigBlockSize / 4;
+        $sbatFh = $this->getStream($sbatFirstBlockId);
+        for ($blockId = 0; $blockId < $shortBlockCount; ++$blockId) {
+            $this->sbat[$blockId] = self::readInt4($sbatFh);
+        }
+        fclose($sbatFh);
+
+        $this->readPpsWks($directoryFirstBlockId);
+
+        return true;
+    }
+
+    /**
+     * @param int $blockId byte offset from beginning of file
+     */
+    public function getBlockOffset(int $blockId): int
+    {
+        return 512 + $blockId * $this->bigBlockSize;
+    }
+
+    /**
+     * Returns a stream for use with fread() etc. External callers should
+     * use \PhpOffice\PhpSpreadsheet\Shared\OLE\PPS\File::getStream().
+     *
+     * @param int|OLE\PPS $blockIdOrPps block id or PPS
+     *
+     * @return resource read-only stream
+     */
+    public function getStream($blockIdOrPps)
+    {
+        static $isRegistered = false;
+        if (!$isRegistered) {
+            stream_wrapper_register('ole-chainedblockstream', ChainedBlockStream::class);
+            $isRegistered = true;
+        }
+
+        // Store current instance in global array, so that it can be accessed
+        // in OLE_ChainedBlockStream::stream_open().
+        // Object is removed from self::$instances in OLE_Stream::close().
+        $GLOBALS['_OLE_INSTANCES'][] = $this;
+        $keys = array_keys($GLOBALS['_OLE_INSTANCES']);
+        $instanceId = end($keys);
+
+        $path = 'ole-chainedblockstream://oleInstanceId=' . $instanceId;
+        if ($blockIdOrPps instanceof OLE\PPS) {
+            $path .= '&blockId=' . $blockIdOrPps->startBlock;
+            $path .= '&size=' . $blockIdOrPps->Size;
+        } else {
+            $path .= '&blockId=' . $blockIdOrPps;
+        }
+
+        $resource = fopen($path, 'rb');
+        if ($resource === false) {
+            throw new Exception("Unable to open stream $path");
+        }
+
+        return $resource;
+    }
+
+    /**
+     * Reads a signed char.
+     *
+     * @param resource $fileHandle file handle
+     */
+    private static function readInt1($fileHandle): int
+    {
+        [, $tmp] = unpack('c', fread($fileHandle, 1) ?: '') ?: [0, 0];
+
+        return $tmp;
+    }
+
+    /**
+     * Reads an unsigned short (2 octets).
+     *
+     * @param resource $fileHandle file handle
+     */
+    private static function readInt2($fileHandle): int
+    {
+        [, $tmp] = unpack('v', fread($fileHandle, 2) ?: '') ?: [0, 0];
+
+        return $tmp;
+    }
+
+    private const SIGNED_4OCTET_LIMIT = 2147483648;
+
+    private const SIGNED_4OCTET_SUBTRACT = 2 * self::SIGNED_4OCTET_LIMIT;
+
+    /**
+     * Reads long (4 octets), interpreted as if signed on 32-bit system.
+     *
+     * @param resource $fileHandle file handle
+     */
+    private static function readInt4($fileHandle): int
+    {
+        [, $tmp] = unpack('V', fread($fileHandle, 4) ?: '') ?: [0, 0];
+        if ($tmp >= self::SIGNED_4OCTET_LIMIT) {
+            $tmp -= self::SIGNED_4OCTET_SUBTRACT;
+        }
+
+        return $tmp;
+    }
+
+    /**
+     * Gets information about all PPS's on the OLE container from the PPS WK's
+     * creates an OLE_PPS object for each one.
+     *
+     * @param int $blockId the block id of the first block
+     *
+     * @return bool true on success, PEAR_Error on failure
+     */
+    public function readPpsWks(int $blockId): bool
+    {
+        $fh = $this->getStream($blockId);
+        for ($pos = 0; true; $pos += 128) {
+            fseek($fh, $pos, SEEK_SET);
+            $nameUtf16 = (string) fread($fh, 64);
+            $nameLength = self::readInt2($fh);
+            $nameUtf16 = substr($nameUtf16, 0, $nameLength - 2);
+            // Simple conversion from UTF-16LE to ISO-8859-1
+            $name = str_replace("\x00", '', $nameUtf16);
+            $type = self::readInt1($fh);
+            switch ($type) {
+                case self::OLE_PPS_TYPE_ROOT:
+                    $pps = new Root(null, null, []);
+                    $this->root = $pps;
+
+                    break;
+                case self::OLE_PPS_TYPE_DIR:
+                    $pps = new OLE\PPS(null, null, null, null, null, null, null, null, null, []);
+
+                    break;
+                case self::OLE_PPS_TYPE_FILE:
+                    $pps = new OLE\PPS\File($name);
+
+                    break;
+                default:
+                    throw new Exception('Unsupported PPS type');
+            }
+            fseek($fh, 1, SEEK_CUR);
+            $pps->Type = $type;
+            $pps->Name = $name;
+            $pps->PrevPps = self::readInt4($fh);
+            $pps->NextPps = self::readInt4($fh);
+            $pps->DirPps = self::readInt4($fh);
+            fseek($fh, 20, SEEK_CUR);
+            $pps->Time1st = self::OLE2LocalDate((string) fread($fh, 8));
+            $pps->Time2nd = self::OLE2LocalDate((string) fread($fh, 8));
+            $pps->startBlock = self::readInt4($fh);
+            $pps->Size = self::readInt4($fh);
+            $pps->No = count($this->_list);
+            $this->_list[] = $pps;
+
+            // check if the PPS tree (starting from root) is complete
+            if (isset($this->root) && $this->ppsTreeComplete($this->root->No)) {
+                break;
+            }
+        }
+        fclose($fh);
+
+        // Initialize $pps->children on directories
+        foreach ($this->_list as $pps) {
+            if ($pps->Type == self::OLE_PPS_TYPE_DIR || $pps->Type == self::OLE_PPS_TYPE_ROOT) {
+                $nos = [$pps->DirPps];
+                $pps->children = [];
+                while (!empty($nos)) {
+                    $no = array_pop($nos);
+                    if ($no != -1) {
+                        $childPps = $this->_list[$no];
+                        $nos[] = $childPps->PrevPps;
+                        $nos[] = $childPps->NextPps;
+                        $pps->children[] = $childPps;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * It checks whether the PPS tree is complete (all PPS's read)
+     * starting with the given PPS (not necessarily root).
+     *
+     * @param int $index The index of the PPS from which we are checking
+     *
+     * @return bool Whether the PPS tree for the given PPS is complete
+     */
+    private function ppsTreeComplete(int $index): bool
+    {
+        return isset($this->_list[$index])
+            && ($pps = $this->_list[$index])
+            && ($pps->PrevPps == -1
+                || $this->ppsTreeComplete($pps->PrevPps))
+            && ($pps->NextPps == -1
+                || $this->ppsTreeComplete($pps->NextPps))
+            && ($pps->DirPps == -1
+                || $this->ppsTreeComplete($pps->DirPps));
+    }
+
+    /**
+     * Checks whether a PPS is a File PPS or not.
+     * If there is no PPS for the index given, it will return false.
+     *
+     * @param int $index The index for the PPS
+     *
+     * @return bool true if it's a File PPS, false otherwise
+     */
+    public function isFile(int $index): bool
+    {
+        if (isset($this->_list[$index])) {
+            return $this->_list[$index]->Type == self::OLE_PPS_TYPE_FILE;
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether a PPS is a Root PPS or not.
+     * If there is no PPS for the index given, it will return false.
+     *
+     * @param int $index the index for the PPS
+     *
+     * @return bool true if it's a Root PPS, false otherwise
+     */
+    public function isRoot(int $index): bool
+    {
+        if (isset($this->_list[$index])) {
+            return $this->_list[$index]->Type == self::OLE_PPS_TYPE_ROOT;
+        }
+
+        return false;
+    }
+
+    /**
+     * Gives the total number of PPS's found in the OLE container.
+     *
+     * @return int The total number of PPS's found in the OLE container
+     */
+    public function ppsTotal(): int
+    {
+        return count($this->_list);
+    }
+
+    /**
+     * Gets data from a PPS
+     * If there is no PPS for the index given, it will return an empty string.
+     *
+     * @param int $index The index for the PPS
+     * @param int $position The position from which to start reading
+     *                          (relative to the PPS)
+     * @param int $length The amount of bytes to read (at most)
+     *
+     * @return string The binary string containing the data requested
+     *
+     * @see OLE_PPS_File::getStream()
+     */
+    public function getData(int $index, int $position, int $length): string
+    {
+        // if position is not valid return empty string
+        if (!isset($this->_list[$index]) || ($position >= $this->_list[$index]->Size) || ($position < 0)) {
+            return '';
+        }
+        $fh = $this->getStream($this->_list[$index]);
+        $data = (string) stream_get_contents($fh, $length, $position);
+        fclose($fh);
+
+        return $data;
+    }
+
+    /**
+     * Gets the data length from a PPS
+     * If there is no PPS for the index given, it will return 0.
+     *
+     * @param int $index The index for the PPS
+     *
+     * @return int The amount of bytes in data the PPS has
+     */
+    public function getDataLength(int $index): int
+    {
+        if (isset($this->_list[$index])) {
+            return $this->_list[$index]->Size;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Utility function to transform ASCII text to Unicode.
+     *
+     * @param string $ascii The ASCII string to transform
+     *
+     * @return string The string in Unicode
+     */
+    public static function ascToUcs(string $ascii): string
+    {
+        $rawname = '';
+        $iMax = strlen($ascii);
+        for ($i = 0; $i < $iMax; ++$i) {
+            $rawname .= $ascii[$i]
+                . "\x00";
+        }
+
+        return $rawname;
+    }
+
+    /**
+     * Utility function
+     * Returns a string for the OLE container with the date given.
+     *
+     * @param float|int $date A timestamp
+     *
+     * @return string The string for the OLE container
+     */
+    public static function localDateToOLE($date): string
+    {
+        if (!$date) {
+            return "\x00\x00\x00\x00\x00\x00\x00\x00";
+        }
+        $dateTime = Date::dateTimeFromTimestamp("$date");
+
+        // days from 1-1-1601 until the beggining of UNIX era
+        $days = 134774;
+        // calculate seconds
+        $big_date = $days * 24 * 3600 + (float) $dateTime->format('U');
+        // multiply just to make MS happy
+        $big_date *= 10000000;
+
+        // Make HEX string
+        $res = '';
+
+        $factor = 2 ** 56;
+        while ($factor >= 1) {
+            $hex = (int) floor($big_date / $factor);
+            $res = pack('c', $hex) . $res;
+            $big_date = fmod($big_date, $factor);
+            $factor /= 256;
+        }
+
+        return $res;
+    }
+
+    /**
+     * Returns a timestamp from an OLE container's date.
+     *
+     * @param string $oleTimestamp A binary string with the encoded date
+     *
+     * @return float|int The Unix timestamp corresponding to the string
+     */
+    public static function OLE2LocalDate(string $oleTimestamp)
+    {
+        if (strlen($oleTimestamp) != 8) {
+            throw new ReaderException('Expecting 8 byte string');
+        }
+
+        // convert to units of 100 ns since 1601:
+        $unpackedTimestamp = unpack('v4', $oleTimestamp) ?: [];
+        $timestampHigh = (float) $unpackedTimestamp[4] * 65536 + (float) $unpackedTimestamp[3];
+        $timestampLow = (float) $unpackedTimestamp[2] * 65536 + (float) $unpackedTimestamp[1];
+
+        // translate to seconds since 1601:
+        $timestampHigh /= 10000000;
+        $timestampLow /= 10000000;
+
+        // days from 1601 to 1970:
+        $days = 134774;
+
+        // translate to seconds since 1970:
+        $unixTimestamp = floor(65536.0 * 65536.0 * $timestampHigh + $timestampLow - $days * 24 * 3600 + 0.5);
+
+        return IntOrFloat::evaluate($unixTimestamp);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
new file mode 100644
index 00000000..61bd6acb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
@@ -0,0 +1,187 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\OLE;
+
+use PhpOffice\PhpSpreadsheet\Shared\OLE;
+
+class ChainedBlockStream
+{
+    /** @var mixed */
+    public $context;
+
+    /**
+     * The OLE container of the file that is being read.
+     */
+    public ?OLE $ole = null;
+
+    /**
+     * Parameters specified by fopen().
+     */
+    public array $params = [];
+
+    /**
+     * The binary data of the file.
+     */
+    public string $data;
+
+    /**
+     * The file pointer.
+     *
+     * @var int byte offset
+     */
+    public int $pos = 0;
+
+    /**
+     * Implements support for fopen().
+     * For creating streams using this wrapper, use OLE_PPS_File::getStream().
+     *
+     * @param string $path resource name including scheme, e.g.
+     *                                    ole-chainedblockstream://oleInstanceId=1
+     * @param string $mode only "r" is supported
+     * @param int $options mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
+     * @param ?string $openedPath absolute path of the opened stream (out parameter)
+     *
+     * @return bool true on success
+     */
+    public function stream_open(string $path, string $mode, int $options, ?string &$openedPath): bool // @codingStandardsIgnoreLine
+    {
+        if ($mode[0] !== 'r') {
+            if ($options & STREAM_REPORT_ERRORS) {
+                trigger_error('Only reading is supported', E_USER_WARNING);
+            }
+
+            return false;
+        }
+
+        // 25 is length of "ole-chainedblockstream://"
+        parse_str(substr($path, 25), $this->params);
+        if (!isset($this->params['oleInstanceId'], $this->params['blockId'], $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']])) {
+            if ($options & STREAM_REPORT_ERRORS) {
+                trigger_error('OLE stream not found', E_USER_WARNING);
+            }
+
+            return false;
+        }
+        $this->ole = $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']];
+
+        $blockId = $this->params['blockId'];
+        $this->data = '';
+        if (isset($this->params['size']) && $this->params['size'] < $this->ole->bigBlockThreshold && $blockId != $this->ole->root->startBlock) {
+            // Block id refers to small blocks
+            $rootPos = $this->ole->getBlockOffset($this->ole->root->startBlock);
+            while ($blockId != -2) {
+                $pos = $rootPos + $blockId * $this->ole->bigBlockSize;
+                $blockId = $this->ole->sbat[$blockId];
+                fseek($this->ole->_file_handle, $pos);
+                $this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
+            }
+        } else {
+            // Block id refers to big blocks
+            while ($blockId != -2) {
+                $pos = $this->ole->getBlockOffset($blockId);
+                fseek($this->ole->_file_handle, $pos);
+                $this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
+                $blockId = $this->ole->bbat[$blockId];
+            }
+        }
+        if (isset($this->params['size'])) {
+            $this->data = substr($this->data, 0, $this->params['size']);
+        }
+
+        if ($options & STREAM_USE_PATH) {
+            $openedPath = $path;
+        }
+
+        return true;
+    }
+
+    /**
+     * Implements support for fclose().
+     */
+    public function stream_close(): void // @codingStandardsIgnoreLine
+    {
+        $this->ole = null;
+        unset($GLOBALS['_OLE_INSTANCES']);
+    }
+
+    /**
+     * Implements support for fread(), fgets() etc.
+     *
+     * @param int $count maximum number of bytes to read
+     *
+     * @return false|string
+     */
+    public function stream_read(int $count): bool|string // @codingStandardsIgnoreLine
+    {
+        if ($this->stream_eof()) {
+            return false;
+        }
+        $s = substr($this->data, (int) $this->pos, $count);
+        $this->pos += $count;
+
+        return $s;
+    }
+
+    /**
+     * Implements support for feof().
+     *
+     * @return bool TRUE if the file pointer is at EOF; otherwise FALSE
+     */
+    public function stream_eof(): bool // @codingStandardsIgnoreLine
+    {
+        return $this->pos >= strlen($this->data);
+    }
+
+    /**
+     * Returns the position of the file pointer, i.e. its offset into the file
+     * stream. Implements support for ftell().
+     */
+    public function stream_tell(): int // @codingStandardsIgnoreLine
+    {
+        return $this->pos;
+    }
+
+    /**
+     * Implements support for fseek().
+     *
+     * @param int $offset byte offset
+     * @param int $whence SEEK_SET, SEEK_CUR or SEEK_END
+     */
+    public function stream_seek(int $offset, int $whence): bool // @codingStandardsIgnoreLine
+    {
+        if ($whence == SEEK_SET && $offset >= 0) {
+            $this->pos = $offset;
+        } elseif ($whence == SEEK_CUR && -$offset <= $this->pos) {
+            $this->pos += $offset;
+        } elseif ($whence == SEEK_END && -$offset <= count($this->data)) { // @phpstan-ignore-line
+            $this->pos = strlen($this->data) + $offset;
+        } else {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Implements support for fstat(). Currently the only supported field is
+     * "size".
+     */
+    public function stream_stat(): array // @codingStandardsIgnoreLine
+    {
+        return [
+            'size' => strlen($this->data),
+        ];
+    }
+
+    // Methods used by stream_wrapper_register() that are not implemented:
+    // bool stream_flush ( void )
+    // int stream_write ( string data )
+    // bool rename ( string path_from, string path_to )
+    // bool mkdir ( string path, int mode, int options )
+    // bool rmdir ( string path, int options )
+    // bool dir_opendir ( string path, int options )
+    // array url_stat ( string path, int flags )
+    // string dir_readdir ( void )
+    // bool dir_rewinddir ( void )
+    // bool dir_closedir ( void )
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php
new file mode 100644
index 00000000..3a77c78c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php
@@ -0,0 +1,207 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\OLE;
+
+// vim: set expandtab tabstop=4 shiftwidth=4:
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Xavier Noguer <xnoguer@php.net>                              |
+// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
+// +----------------------------------------------------------------------+
+//
+use PhpOffice\PhpSpreadsheet\Shared\OLE;
+
+/**
+ * Class for creating PPS's for OLE containers.
+ *
+ * @author   Xavier Noguer <xnoguer@php.net>
+ */
+class PPS
+{
+    private const ALL_ONE_BITS = (PHP_INT_SIZE > 4) ? 0xFFFFFFFF : -1;
+
+    /**
+     * The PPS index.
+     */
+    public int $No;
+
+    /**
+     * The PPS name (in Unicode).
+     */
+    public string $Name;
+
+    /**
+     * The PPS type. Dir, Root or File.
+     */
+    public int $Type;
+
+    /**
+     * The index of the previous PPS.
+     */
+    public int $PrevPps;
+
+    /**
+     * The index of the next PPS.
+     */
+    public int $NextPps;
+
+    /**
+     * The index of it's first child if this is a Dir or Root PPS.
+     */
+    public int $DirPps;
+
+    /**
+     * A timestamp.
+     */
+    public float|int $Time1st;
+
+    /**
+     * A timestamp.
+     */
+    public float|int $Time2nd;
+
+    /**
+     * Starting block (small or big) for this PPS's data  inside the container.
+     */
+    public ?int $startBlock = null;
+
+    /**
+     * The size of the PPS's data (in bytes).
+     */
+    public int $Size;
+
+    /**
+     * The PPS's data (only used if it's not using a temporary file).
+     */
+    public string $_data = '';
+
+    /**
+     * Array of child PPS's (only used by Root and Dir PPS's).
+     */
+    public array $children = [];
+
+    /**
+     * Pointer to OLE container.
+     */
+    public OLE $ole;
+
+    /**
+     * The constructor.
+     *
+     * @param ?int $No The PPS index
+     * @param ?string $name The PPS name
+     * @param ?int $type The PPS type. Dir, Root or File
+     * @param ?int $prev The index of the previous PPS
+     * @param ?int $next The index of the next PPS
+     * @param ?int $dir The index of it's first child if this is a Dir or Root PPS
+     * @param null|float|int $time_1st A timestamp
+     * @param null|float|int $time_2nd A timestamp
+     * @param ?string $data The (usually binary) source data of the PPS
+     * @param array $children Array containing children PPS for this PPS
+     */
+    public function __construct(?int $No, ?string $name, ?int $type, ?int $prev, ?int $next, ?int $dir, $time_1st, $time_2nd, ?string $data, array $children)
+    {
+        $this->No = (int) $No;
+        $this->Name = (string) $name;
+        $this->Type = (int) $type;
+        $this->PrevPps = (int) $prev;
+        $this->NextPps = (int) $next;
+        $this->DirPps = (int) $dir;
+        $this->Time1st = $time_1st ?? 0;
+        $this->Time2nd = $time_2nd ?? 0;
+        $this->_data = (string) $data;
+        $this->children = $children;
+        $this->Size = strlen((string) $data);
+    }
+
+    /**
+     * Returns the amount of data saved for this PPS.
+     *
+     * @return int The amount of data (in bytes)
+     */
+    public function getDataLen(): int
+    {
+        //if (!isset($this->_data)) {
+        //    return 0;
+        //}
+
+        return strlen($this->_data);
+    }
+
+    /**
+     * Returns a string with the PPS's WK (What is a WK?).
+     *
+     * @return string The binary string
+     */
+    public function getPpsWk(): string
+    {
+        $ret = str_pad($this->Name, 64, "\x00");
+
+        $ret .= pack('v', strlen($this->Name) + 2)  // 66
+            . pack('c', $this->Type)              // 67
+            . pack('c', 0x00) //UK                // 68
+            . pack('V', $this->PrevPps) //Prev    // 72
+            . pack('V', $this->NextPps) //Next    // 76
+            . pack('V', $this->DirPps)  //Dir     // 80
+            . "\x00\x09\x02\x00"                  // 84
+            . "\x00\x00\x00\x00"                  // 88
+            . "\xc0\x00\x00\x00"                  // 92
+            . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
+            . "\x00\x00\x00\x00"                  // 100
+            . OLE::localDateToOLE($this->Time1st)          // 108
+            . OLE::localDateToOLE($this->Time2nd)          // 116
+            . pack('V', $this->startBlock ?? 0)  // 120
+            . pack('V', $this->Size)               // 124
+            . pack('V', 0); // 128
+
+        return $ret;
+    }
+
+    /**
+     * Updates index and pointers to previous, next and children PPS's for this
+     * PPS. I don't think it'll work with Dir PPS's.
+     *
+     * @param array $raList Reference to the array of PPS's for the whole OLE
+     *                          container
+     *
+     * @return int The index for this PPS
+     */
+    public static function savePpsSetPnt(array &$raList, mixed $to_save, int $depth = 0): int
+    {
+        if (!is_array($to_save) || (empty($to_save))) {
+            return self::ALL_ONE_BITS;
+        } elseif (count($to_save) == 1) {
+            $cnt = count($raList);
+            // If the first entry, it's the root... Don't clone it!
+            $raList[$cnt] = ($depth == 0) ? $to_save[0] : clone $to_save[0];
+            $raList[$cnt]->No = $cnt;
+            $raList[$cnt]->PrevPps = self::ALL_ONE_BITS;
+            $raList[$cnt]->NextPps = self::ALL_ONE_BITS;
+            $raList[$cnt]->DirPps = self::savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+        } else {
+            $iPos = (int) floor(count($to_save) / 2);
+            $aPrev = array_slice($to_save, 0, $iPos);
+            $aNext = array_slice($to_save, $iPos + 1);
+            $cnt = count($raList);
+            // If the first entry, it's the root... Don't clone it!
+            $raList[$cnt] = ($depth == 0) ? $to_save[$iPos] : clone $to_save[$iPos];
+            $raList[$cnt]->No = $cnt;
+            $raList[$cnt]->PrevPps = self::savePpsSetPnt($raList, $aPrev, $depth++);
+            $raList[$cnt]->NextPps = self::savePpsSetPnt($raList, $aNext, $depth++);
+            $raList[$cnt]->DirPps = self::savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+        }
+
+        return $cnt;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php
new file mode 100644
index 00000000..0798e3b5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
+
+// vim: set expandtab tabstop=4 shiftwidth=4:
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Xavier Noguer <xnoguer@php.net>                              |
+// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
+// +----------------------------------------------------------------------+
+//
+use PhpOffice\PhpSpreadsheet\Shared\OLE;
+use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
+
+/**
+ * Class for creating File PPS's for OLE containers.
+ *
+ * @author   Xavier Noguer <xnoguer@php.net>
+ */
+class File extends PPS
+{
+    /**
+     * The constructor.
+     *
+     * @param string $name The name of the file (in Unicode)
+     *
+     * @see OLE::ascToUcs()
+     */
+    public function __construct(string $name)
+    {
+        parent::__construct(null, $name, OLE::OLE_PPS_TYPE_FILE, null, null, null, null, null, '', []);
+    }
+
+    /**
+     * Initialization method. Has to be called right after OLE_PPS_File().
+     */
+    public function init(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Append data to PPS.
+     *
+     * @param string $data The data to append
+     */
+    public function append(string $data): void
+    {
+        $this->_data .= $data;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
new file mode 100644
index 00000000..64de77f4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
@@ -0,0 +1,406 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
+
+// vim: set expandtab tabstop=4 shiftwidth=4:
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Xavier Noguer <xnoguer@php.net>                              |
+// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
+// +----------------------------------------------------------------------+
+//
+use PhpOffice\PhpSpreadsheet\Shared\OLE;
+use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
+
+/**
+ * Class for creating Root PPS's for OLE containers.
+ *
+ * @author   Xavier Noguer <xnoguer@php.net>
+ */
+class Root extends PPS
+{
+    /**
+     * @var resource
+     */
+    private $fileHandle;
+
+    private ?int $smallBlockSize = null;
+
+    private ?int $bigBlockSize = null;
+
+    /**
+     * @param null|float|int $time_1st A timestamp
+     * @param null|float|int $time_2nd A timestamp
+     * @param File[] $raChild
+     */
+    public function __construct($time_1st, $time_2nd, array $raChild)
+    {
+        parent::__construct(null, OLE::ascToUcs('Root Entry'), OLE::OLE_PPS_TYPE_ROOT, null, null, null, $time_1st, $time_2nd, null, $raChild);
+    }
+
+    /**
+     * Method for saving the whole OLE container (including files).
+     * In fact, if called with an empty argument (or '-'), it saves to a
+     * temporary file and then outputs it's contents to stdout.
+     * If a resource pointer to a stream created by fopen() is passed
+     * it will be used, but you have to close such stream by yourself.
+     *
+     * @param resource $fileHandle the name of the file or stream where to save the OLE container
+     *
+     * @return bool true on success
+     */
+    public function save($fileHandle): bool
+    {
+        $this->fileHandle = $fileHandle;
+
+        // Initial Setting for saving
+        $this->bigBlockSize = (int) (2 ** (
+            (isset($this->bigBlockSize)) ? self::adjust2($this->bigBlockSize) : 9
+        ));
+        $this->smallBlockSize = (int) (2 ** (
+            (isset($this->smallBlockSize)) ? self::adjust2($this->smallBlockSize) : 6
+        ));
+
+        // Make an array of PPS's (for Save)
+        $aList = [];
+        PPS::savePpsSetPnt($aList, [$this]);
+        // calculate values for header
+        [$iSBDcnt, $iBBcnt, $iPPScnt] = $this->calcSize($aList); //, $rhInfo);
+        // Save Header
+        $this->saveHeader((int) $iSBDcnt, (int) $iBBcnt, (int) $iPPScnt);
+
+        // Make Small Data string (write SBD)
+        $this->_data = $this->makeSmallData($aList);
+
+        // Write BB
+        $this->saveBigData((int) $iSBDcnt, $aList);
+        // Write PPS
+        $this->savePps($aList);
+        // Write Big Block Depot and BDList and Adding Header informations
+        $this->saveBbd((int) $iSBDcnt, (int) $iBBcnt, (int) $iPPScnt);
+
+        return true;
+    }
+
+    /**
+     * Calculate some numbers.
+     *
+     * @param array $raList Reference to an array of PPS's
+     *
+     * @return float[] The array of numbers
+     */
+    private function calcSize(array &$raList): array
+    {
+        // Calculate Basic Setting
+        [$iSBDcnt, $iBBcnt, $iPPScnt] = [0, 0, 0];
+        $iSBcnt = 0;
+        $iCount = count($raList);
+        for ($i = 0; $i < $iCount; ++$i) {
+            if ($raList[$i]->Type == OLE::OLE_PPS_TYPE_FILE) {
+                $raList[$i]->Size = $raList[$i]->getDataLen();
+                if ($raList[$i]->Size < OLE::OLE_DATA_SIZE_SMALL) {
+                    $iSBcnt += floor($raList[$i]->Size / $this->smallBlockSize)
+                        + (($raList[$i]->Size % $this->smallBlockSize) ? 1 : 0);
+                } else {
+                    $iBBcnt += (floor($raList[$i]->Size / $this->bigBlockSize)
+                        + (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
+                }
+            }
+        }
+        $iSmallLen = $iSBcnt * $this->smallBlockSize;
+        $iSlCnt = floor($this->bigBlockSize / OLE::OLE_LONG_INT_SIZE);
+        $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt) ? 1 : 0);
+        $iBBcnt += (floor($iSmallLen / $this->bigBlockSize)
+            + (($iSmallLen % $this->bigBlockSize) ? 1 : 0));
+        $iCnt = count($raList);
+        $iBdCnt = $this->bigBlockSize / OLE::OLE_PPS_SIZE;
+        $iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt) ? 1 : 0));
+
+        return [$iSBDcnt, $iBBcnt, $iPPScnt];
+    }
+
+    /**
+     * Helper function for caculating a magic value for block sizes.
+     *
+     * @param int $i2 The argument
+     *
+     * @see save()
+     */
+    private static function adjust2(int $i2): float
+    {
+        $iWk = log($i2) / log(2);
+
+        return ($iWk > floor($iWk)) ? floor($iWk) + 1 : $iWk;
+    }
+
+    /**
+     * Save OLE header.
+     */
+    private function saveHeader(int $iSBDcnt, int $iBBcnt, int $iPPScnt): void
+    {
+        $FILE = $this->fileHandle;
+
+        // Calculate Basic Setting
+        $iBlCnt = $this->bigBlockSize / OLE::OLE_LONG_INT_SIZE;
+        $i1stBdL = ($this->bigBlockSize - 0x4C) / OLE::OLE_LONG_INT_SIZE;
+
+        $iBdExL = 0;
+        $iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
+        $iAllW = $iAll;
+        $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
+
+        // Calculate BD count
+        if ($iBdCnt > $i1stBdL) {
+            while (1) {
+                ++$iBdExL;
+                ++$iAllW;
+                $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
+                if ($iBdCnt <= ($iBdExL * $iBlCnt + $i1stBdL)) {
+                    break;
+                }
+            }
+        }
+
+        // Save Header
+        fwrite(
+            $FILE,
+            "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
+            . "\x00\x00\x00\x00"
+            . "\x00\x00\x00\x00"
+            . "\x00\x00\x00\x00"
+            . "\x00\x00\x00\x00"
+            . pack('v', 0x3B)
+            . pack('v', 0x03)
+            . pack('v', -2)
+            . pack('v', 9)
+            . pack('v', 6)
+            . pack('v', 0)
+            . "\x00\x00\x00\x00"
+            . "\x00\x00\x00\x00"
+            . pack('V', $iBdCnt)
+            . pack('V', $iBBcnt + $iSBDcnt) //ROOT START
+            . pack('V', 0)
+            . pack('V', 0x1000)
+            . pack('V', $iSBDcnt ? 0 : -2) //Small Block Depot
+            . pack('V', $iSBDcnt)
+        );
+        // Extra BDList Start, Count
+        if ($iBdCnt < $i1stBdL) {
+            fwrite(
+                $FILE,
+                pack('V', -2) // Extra BDList Start
+                . pack('V', 0)// Extra BDList Count
+            );
+        } else {
+            fwrite($FILE, pack('V', $iAll + $iBdCnt) . pack('V', $iBdExL));
+        }
+
+        // BDList
+        for ($i = 0; $i < $i1stBdL && $i < $iBdCnt; ++$i) {
+            fwrite($FILE, pack('V', $iAll + $i));
+        }
+        if ($i < $i1stBdL) {
+            $jB = $i1stBdL - $i;
+            for ($j = 0; $j < $jB; ++$j) {
+                fwrite($FILE, (pack('V', -1)));
+            }
+        }
+    }
+
+    /**
+     * Saving big data (PPS's with data bigger than \PhpOffice\PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL).
+     *
+     * @param array $raList Reference to array of PPS's
+     */
+    private function saveBigData(int $iStBlk, array &$raList): void
+    {
+        $FILE = $this->fileHandle;
+
+        // cycle through PPS's
+        $iCount = count($raList);
+        for ($i = 0; $i < $iCount; ++$i) {
+            if ($raList[$i]->Type != OLE::OLE_PPS_TYPE_DIR) {
+                $raList[$i]->Size = $raList[$i]->getDataLen();
+                if (($raList[$i]->Size >= OLE::OLE_DATA_SIZE_SMALL) || (($raList[$i]->Type == OLE::OLE_PPS_TYPE_ROOT) && isset($raList[$i]->_data))) {
+                    fwrite($FILE, $raList[$i]->_data);
+
+                    if ($raList[$i]->Size % $this->bigBlockSize) {
+                        fwrite($FILE, str_repeat("\x00", $this->bigBlockSize - ($raList[$i]->Size % $this->bigBlockSize)));
+                    }
+                    // Set For PPS
+                    $raList[$i]->startBlock = $iStBlk;
+                    $iStBlk
+                        += (floor($raList[$i]->Size / $this->bigBlockSize)
+                            + (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
+                }
+            }
+        }
+    }
+
+    /**
+     * get small data (PPS's with data smaller than \PhpOffice\PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL).
+     *
+     * @param array $raList Reference to array of PPS's
+     */
+    private function makeSmallData(array &$raList): string
+    {
+        $sRes = '';
+        $FILE = $this->fileHandle;
+        $iSmBlk = 0;
+
+        $iCount = count($raList);
+        for ($i = 0; $i < $iCount; ++$i) {
+            // Make SBD, small data string
+            if ($raList[$i]->Type == OLE::OLE_PPS_TYPE_FILE) {
+                if ($raList[$i]->Size <= 0) {
+                    continue;
+                }
+                if ($raList[$i]->Size < OLE::OLE_DATA_SIZE_SMALL) {
+                    $iSmbCnt = floor($raList[$i]->Size / $this->smallBlockSize)
+                        + (($raList[$i]->Size % $this->smallBlockSize) ? 1 : 0);
+                    // Add to SBD
+                    $jB = $iSmbCnt - 1;
+                    for ($j = 0; $j < $jB; ++$j) {
+                        fwrite($FILE, pack('V', $j + $iSmBlk + 1));
+                    }
+                    fwrite($FILE, pack('V', -2));
+
+                    // Add to Data String(this will be written for RootEntry)
+                    $sRes .= $raList[$i]->_data;
+                    if ($raList[$i]->Size % $this->smallBlockSize) {
+                        $sRes .= str_repeat("\x00", $this->smallBlockSize - ($raList[$i]->Size % $this->smallBlockSize));
+                    }
+                    // Set for PPS
+                    $raList[$i]->startBlock = $iSmBlk;
+                    $iSmBlk += $iSmbCnt;
+                }
+            }
+        }
+        $iSbCnt = floor($this->bigBlockSize / OLE::OLE_LONG_INT_SIZE);
+        if ($iSmBlk % $iSbCnt) {
+            $iB = $iSbCnt - ($iSmBlk % $iSbCnt);
+            for ($i = 0; $i < $iB; ++$i) {
+                fwrite($FILE, pack('V', -1));
+            }
+        }
+
+        return $sRes;
+    }
+
+    /**
+     * Saves all the PPS's WKs.
+     *
+     * @param array $raList Reference to an array with all PPS's
+     */
+    private function savePps(array &$raList): void
+    {
+        // Save each PPS WK
+        $iC = count($raList);
+        for ($i = 0; $i < $iC; ++$i) {
+            fwrite($this->fileHandle, $raList[$i]->getPpsWk());
+        }
+        // Adjust for Block
+        $iCnt = count($raList);
+        $iBCnt = $this->bigBlockSize / OLE::OLE_PPS_SIZE;
+        if ($iCnt % $iBCnt) {
+            fwrite($this->fileHandle, str_repeat("\x00", ($iBCnt - ($iCnt % $iBCnt)) * OLE::OLE_PPS_SIZE));
+        }
+    }
+
+    /**
+     * Saving Big Block Depot.
+     */
+    private function saveBbd(int $iSbdSize, int $iBsize, int $iPpsCnt): void
+    {
+        $FILE = $this->fileHandle;
+        // Calculate Basic Setting
+        $iBbCnt = $this->bigBlockSize / OLE::OLE_LONG_INT_SIZE;
+        $i1stBdL = ($this->bigBlockSize - 0x4C) / OLE::OLE_LONG_INT_SIZE;
+
+        $iBdExL = 0;
+        $iAll = $iBsize + $iPpsCnt + $iSbdSize;
+        $iAllW = $iAll;
+        $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
+        // Calculate BD count
+        if ($iBdCnt > $i1stBdL) {
+            while (1) {
+                ++$iBdExL;
+                ++$iAllW;
+                $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
+                if ($iBdCnt <= ($iBdExL * $iBbCnt + $i1stBdL)) {
+                    break;
+                }
+            }
+        }
+
+        // Making BD
+        // Set for SBD
+        if ($iSbdSize > 0) {
+            for ($i = 0; $i < ($iSbdSize - 1); ++$i) {
+                fwrite($FILE, pack('V', $i + 1));
+            }
+            fwrite($FILE, pack('V', -2));
+        }
+        // Set for B
+        for ($i = 0; $i < ($iBsize - 1); ++$i) {
+            fwrite($FILE, pack('V', $i + $iSbdSize + 1));
+        }
+        fwrite($FILE, pack('V', -2));
+
+        // Set for PPS
+        for ($i = 0; $i < ($iPpsCnt - 1); ++$i) {
+            fwrite($FILE, pack('V', $i + $iSbdSize + $iBsize + 1));
+        }
+        fwrite($FILE, pack('V', -2));
+        // Set for BBD itself ( 0xFFFFFFFD : BBD)
+        for ($i = 0; $i < $iBdCnt; ++$i) {
+            fwrite($FILE, pack('V', 0xFFFFFFFD));
+        }
+        // Set for ExtraBDList
+        for ($i = 0; $i < $iBdExL; ++$i) {
+            fwrite($FILE, pack('V', 0xFFFFFFFC));
+        }
+        // Adjust for Block
+        if (($iAllW + $iBdCnt) % $iBbCnt) {
+            $iBlock = ($iBbCnt - (($iAllW + $iBdCnt) % $iBbCnt));
+            for ($i = 0; $i < $iBlock; ++$i) {
+                fwrite($FILE, pack('V', -1));
+            }
+        }
+        // Extra BDList
+        if ($iBdCnt > $i1stBdL) {
+            $iN = 0;
+            $iNb = 0;
+            for ($i = $i1stBdL; $i < $iBdCnt; $i++, ++$iN) {
+                if ($iN >= ($iBbCnt - 1)) {
+                    $iN = 0;
+                    ++$iNb;
+                    fwrite($FILE, pack('V', $iAll + $iBdCnt + $iNb));
+                }
+                fwrite($FILE, pack('V', $iBsize + $iSbdSize + $iPpsCnt + $i));
+            }
+            if (($iBdCnt - $i1stBdL) % ($iBbCnt - 1)) {
+                $iB = ($iBbCnt - 1) - (($iBdCnt - $i1stBdL) % ($iBbCnt - 1));
+                for ($i = 0; $i < $iB; ++$i) {
+                    fwrite($FILE, pack('V', -1));
+                }
+            }
+            fwrite($FILE, pack('V', -2));
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php
new file mode 100644
index 00000000..645dbf77
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php
@@ -0,0 +1,307 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+
+class OLERead
+{
+    private string $data = '';
+
+    // Size of a sector = 512 bytes
+    const BIG_BLOCK_SIZE = 0x200;
+
+    // Size of a short sector = 64 bytes
+    const SMALL_BLOCK_SIZE = 0x40;
+
+    // Size of a directory entry always = 128 bytes
+    const PROPERTY_STORAGE_BLOCK_SIZE = 0x80;
+
+    // Minimum size of a standard stream = 4096 bytes, streams smaller than this are stored as short streams
+    const SMALL_BLOCK_THRESHOLD = 0x1000;
+
+    // header offsets
+    const NUM_BIG_BLOCK_DEPOT_BLOCKS_POS = 0x2C;
+    const ROOT_START_BLOCK_POS = 0x30;
+    const SMALL_BLOCK_DEPOT_BLOCK_POS = 0x3C;
+    const EXTENSION_BLOCK_POS = 0x44;
+    const NUM_EXTENSION_BLOCK_POS = 0x48;
+    const BIG_BLOCK_DEPOT_BLOCKS_POS = 0x4C;
+
+    // property storage offsets (directory offsets)
+    const SIZE_OF_NAME_POS = 0x40;
+    const TYPE_POS = 0x42;
+    const START_BLOCK_POS = 0x74;
+    const SIZE_POS = 0x78;
+
+    public ?int $wrkbook = null;
+
+    public ?int $summaryInformation = null;
+
+    public ?int $documentSummaryInformation = null;
+
+    private int $numBigBlockDepotBlocks;
+
+    private int $rootStartBlock;
+
+    private int $sbdStartBlock;
+
+    private int $extensionBlock;
+
+    private int $numExtensionBlocks;
+
+    private string $bigBlockChain;
+
+    private string $smallBlockChain;
+
+    private string $entry;
+
+    private int $rootentry;
+
+    private array $props = [];
+
+    /**
+     * Read the file.
+     */
+    public function read(string $filename): void
+    {
+        File::assertFile($filename);
+
+        // Get the file identifier
+        // Don't bother reading the whole file until we know it's a valid OLE file
+        $this->data = (string) file_get_contents($filename, false, null, 0, 8);
+
+        // Check OLE identifier
+        $identifierOle = pack('CCCCCCCC', 0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1);
+        if ($this->data != $identifierOle) {
+            throw new ReaderException('The filename ' . $filename . ' is not recognised as an OLE file');
+        }
+
+        // Get the file data
+        $this->data = (string) file_get_contents($filename);
+
+        // Total number of sectors used for the SAT
+        $this->numBigBlockDepotBlocks = self::getInt4d($this->data, self::NUM_BIG_BLOCK_DEPOT_BLOCKS_POS);
+
+        // SecID of the first sector of the directory stream
+        $this->rootStartBlock = self::getInt4d($this->data, self::ROOT_START_BLOCK_POS);
+
+        // SecID of the first sector of the SSAT (or -2 if not extant)
+        $this->sbdStartBlock = self::getInt4d($this->data, self::SMALL_BLOCK_DEPOT_BLOCK_POS);
+
+        // SecID of the first sector of the MSAT (or -2 if no additional sectors are used)
+        $this->extensionBlock = self::getInt4d($this->data, self::EXTENSION_BLOCK_POS);
+
+        // Total number of sectors used by MSAT
+        $this->numExtensionBlocks = self::getInt4d($this->data, self::NUM_EXTENSION_BLOCK_POS);
+
+        $bigBlockDepotBlocks = [];
+        $pos = self::BIG_BLOCK_DEPOT_BLOCKS_POS;
+
+        $bbdBlocks = $this->numBigBlockDepotBlocks;
+
+        if ($this->numExtensionBlocks !== 0) {
+            $bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS) / 4;
+        }
+
+        for ($i = 0; $i < $bbdBlocks; ++$i) {
+            $bigBlockDepotBlocks[$i] = self::getInt4d($this->data, $pos);
+            $pos += 4;
+        }
+
+        for ($j = 0; $j < $this->numExtensionBlocks; ++$j) {
+            $pos = ($this->extensionBlock + 1) * self::BIG_BLOCK_SIZE;
+            $blocksToRead = min($this->numBigBlockDepotBlocks - $bbdBlocks, self::BIG_BLOCK_SIZE / 4 - 1);
+
+            for ($i = $bbdBlocks; $i < $bbdBlocks + $blocksToRead; ++$i) {
+                $bigBlockDepotBlocks[$i] = self::getInt4d($this->data, $pos);
+                $pos += 4;
+            }
+
+            $bbdBlocks += $blocksToRead;
+            if ($bbdBlocks < $this->numBigBlockDepotBlocks) {
+                $this->extensionBlock = self::getInt4d($this->data, $pos);
+            }
+        }
+
+        $pos = 0;
+        $this->bigBlockChain = '';
+        $bbs = self::BIG_BLOCK_SIZE / 4;
+        for ($i = 0; $i < $this->numBigBlockDepotBlocks; ++$i) {
+            $pos = ($bigBlockDepotBlocks[$i] + 1) * self::BIG_BLOCK_SIZE;
+
+            $this->bigBlockChain .= substr($this->data, $pos, 4 * $bbs);
+            $pos += 4 * $bbs;
+        }
+
+        $sbdBlock = $this->sbdStartBlock;
+        $this->smallBlockChain = '';
+        while ($sbdBlock != -2) {
+            $pos = ($sbdBlock + 1) * self::BIG_BLOCK_SIZE;
+
+            $this->smallBlockChain .= substr($this->data, $pos, 4 * $bbs);
+            $pos += 4 * $bbs;
+
+            $sbdBlock = self::getInt4d($this->bigBlockChain, $sbdBlock * 4);
+        }
+
+        // read the directory stream
+        $block = $this->rootStartBlock;
+        $this->entry = $this->readData($block);
+
+        $this->readPropertySets();
+    }
+
+    /**
+     * Extract binary stream data.
+     */
+    public function getStream(?int $stream): ?string
+    {
+        if ($stream === null) {
+            return null;
+        }
+
+        $streamData = '';
+
+        if ($this->props[$stream]['size'] < self::SMALL_BLOCK_THRESHOLD) {
+            $rootdata = $this->readData($this->props[$this->rootentry]['startBlock']);
+
+            $block = $this->props[$stream]['startBlock'];
+
+            while ($block != -2) {
+                $pos = $block * self::SMALL_BLOCK_SIZE;
+                $streamData .= substr($rootdata, $pos, self::SMALL_BLOCK_SIZE);
+
+                $block = self::getInt4d($this->smallBlockChain, $block * 4);
+            }
+
+            return $streamData;
+        }
+        $numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
+        if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
+            ++$numBlocks;
+        }
+
+        if ($numBlocks == 0) {
+            return '';
+        }
+
+        $block = $this->props[$stream]['startBlock'];
+
+        while ($block != -2) {
+            $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
+            $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
+            $block = self::getInt4d($this->bigBlockChain, $block * 4);
+        }
+
+        return $streamData;
+    }
+
+    /**
+     * Read a standard stream (by joining sectors using information from SAT).
+     *
+     * @param int $block Sector ID where the stream starts
+     *
+     * @return string Data for standard stream
+     */
+    private function readData(int $block): string
+    {
+        $data = '';
+
+        while ($block != -2) {
+            $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
+            $data .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
+            $block = self::getInt4d($this->bigBlockChain, $block * 4);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Read entries in the directory stream.
+     */
+    private function readPropertySets(): void
+    {
+        $offset = 0;
+
+        // loop through entires, each entry is 128 bytes
+        $entryLen = strlen($this->entry);
+        while ($offset < $entryLen) {
+            // entry data (128 bytes)
+            $d = substr($this->entry, $offset, self::PROPERTY_STORAGE_BLOCK_SIZE);
+
+            // size in bytes of name
+            $nameSize = ord($d[self::SIZE_OF_NAME_POS]) | (ord($d[self::SIZE_OF_NAME_POS + 1]) << 8);
+
+            // type of entry
+            $type = ord($d[self::TYPE_POS]);
+
+            // sectorID of first sector or short sector, if this entry refers to a stream (the case with workbook)
+            // sectorID of first sector of the short-stream container stream, if this entry is root entry
+            $startBlock = self::getInt4d($d, self::START_BLOCK_POS);
+
+            $size = self::getInt4d($d, self::SIZE_POS);
+
+            $name = str_replace("\x00", '', substr($d, 0, $nameSize));
+
+            $this->props[] = [
+                'name' => $name,
+                'type' => $type,
+                'startBlock' => $startBlock,
+                'size' => $size,
+            ];
+
+            // tmp helper to simplify checks
+            $upName = strtoupper($name);
+
+            // Workbook directory entry (BIFF5 uses Book, BIFF8 uses Workbook)
+            if (($upName === 'WORKBOOK') || ($upName === 'BOOK')) {
+                $this->wrkbook = count($this->props) - 1;
+            } elseif ($upName === 'ROOT ENTRY' || $upName === 'R') {
+                // Root entry
+                $this->rootentry = count($this->props) - 1;
+            }
+
+            // Summary information
+            if ($name == chr(5) . 'SummaryInformation') {
+                $this->summaryInformation = count($this->props) - 1;
+            }
+
+            // Additional Document Summary information
+            if ($name == chr(5) . 'DocumentSummaryInformation') {
+                $this->documentSummaryInformation = count($this->props) - 1;
+            }
+
+            $offset += self::PROPERTY_STORAGE_BLOCK_SIZE;
+        }
+    }
+
+    /**
+     * Read 4 bytes of data at specified position.
+     */
+    private static function getInt4d(string $data, int $pos): int
+    {
+        if ($pos < 0) {
+            // Invalid position
+            throw new ReaderException('Parameter pos=' . $pos . ' is invalid.');
+        }
+
+        $len = strlen($data);
+        if ($len < $pos + 4) {
+            $data .= str_repeat("\0", $pos + 4 - $len);
+        }
+
+        // FIX: represent numbers correctly on 64-bit system
+        // http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
+        // Changed by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
+        $_or_24 = ord($data[$pos + 3]);
+        if ($_or_24 >= 128) {
+            // negative number
+            $_ord_24 = -abs((256 - $_or_24) << 24);
+        } else {
+            $_ord_24 = ($_or_24 & 127) << 24;
+        }
+
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php
new file mode 100644
index 00000000..fcdbc982
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use PhpOffice\PhpSpreadsheet\Exception as SpException;
+use PhpOffice\PhpSpreadsheet\Worksheet\Protection;
+
+class PasswordHasher
+{
+    const MAX_PASSWORD_LENGTH = 255;
+
+    /**
+     * Get algorithm name for PHP.
+     */
+    private static function getAlgorithm(string $algorithmName): string
+    {
+        if (!$algorithmName) {
+            return '';
+        }
+
+        // Mapping between algorithm name in Excel and algorithm name in PHP
+        $mapping = [
+            Protection::ALGORITHM_MD2 => 'md2',
+            Protection::ALGORITHM_MD4 => 'md4',
+            Protection::ALGORITHM_MD5 => 'md5',
+            Protection::ALGORITHM_SHA_1 => 'sha1',
+            Protection::ALGORITHM_SHA_256 => 'sha256',
+            Protection::ALGORITHM_SHA_384 => 'sha384',
+            Protection::ALGORITHM_SHA_512 => 'sha512',
+            Protection::ALGORITHM_RIPEMD_128 => 'ripemd128',
+            Protection::ALGORITHM_RIPEMD_160 => 'ripemd160',
+            Protection::ALGORITHM_WHIRLPOOL => 'whirlpool',
+        ];
+
+        if (array_key_exists($algorithmName, $mapping)) {
+            return $mapping[$algorithmName];
+        }
+
+        throw new SpException('Unsupported password algorithm: ' . $algorithmName);
+    }
+
+    /**
+     * Create a password hash from a given string.
+     *
+     * This method is based on the spec at:
+     * https://interoperability.blob.core.windows.net/files/MS-OFFCRYPTO/[MS-OFFCRYPTO].pdf
+     * 2.3.7.1 Binary Document Password Verifier Derivation Method 1
+     *
+     * It replaces a method based on the algorithm provided by
+     * Daniel Rentz of OpenOffice and the PEAR package
+     * Spreadsheet_Excel_Writer by Xavier Noguer <xnoguer@rezebra.com>.
+     *
+     * @param string $password Password to hash
+     */
+    private static function defaultHashPassword(string $password): string
+    {
+        $verifier = 0;
+        $pwlen = strlen($password);
+        $passwordArray = pack('c', $pwlen) . $password;
+        for ($i = $pwlen; $i >= 0; --$i) {
+            $intermediate1 = (($verifier & 0x4000) === 0) ? 0 : 1;
+            $intermediate2 = 2 * $verifier;
+            $intermediate2 = $intermediate2 & 0x7FFF;
+            $intermediate3 = $intermediate1 | $intermediate2;
+            $verifier = $intermediate3 ^ ord($passwordArray[$i]);
+        }
+        $verifier ^= 0xCE4B;
+
+        return strtoupper(dechex($verifier));
+    }
+
+    /**
+     * Create a password hash from a given string by a specific algorithm.
+     *
+     * 2.4.2.4 ISO Write Protection Method
+     *
+     * @see https://docs.microsoft.com/en-us/openspecs/office_file_formats/ms-offcrypto/1357ea58-646e-4483-92ef-95d718079d6f
+     *
+     * @param string $password Password to hash
+     * @param string $algorithm Hash algorithm used to compute the password hash value
+     * @param string $salt Pseudorandom string
+     * @param int $spinCount Number of times to iterate on a hash of a password
+     *
+     * @return string Hashed password
+     */
+    public static function hashPassword(string $password, string $algorithm = '', string $salt = '', int $spinCount = 10000): string
+    {
+        if (strlen($password) > self::MAX_PASSWORD_LENGTH) {
+            throw new SpException('Password exceeds ' . self::MAX_PASSWORD_LENGTH . ' characters');
+        }
+        $phpAlgorithm = self::getAlgorithm($algorithm);
+        if (!$phpAlgorithm) {
+            return self::defaultHashPassword($password);
+        }
+
+        $saltValue = base64_decode($salt);
+        $encodedPassword = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
+
+        $hashValue = hash($phpAlgorithm, $saltValue . $encodedPassword, true);
+        for ($i = 0; $i < $spinCount; ++$i) {
+            $hashValue = hash($phpAlgorithm, $hashValue . pack('L', $i), true);
+        }
+
+        return base64_encode($hashValue);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
new file mode 100644
index 00000000..aac3836c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
@@ -0,0 +1,650 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+class StringHelper
+{
+    /**
+     * Control characters array.
+     *
+     * @var string[]
+     */
+    private static array $controlCharacters = [];
+
+    /**
+     * SYLK Characters array.
+     */
+    private static array $SYLKCharacters = [];
+
+    /**
+     * Decimal separator.
+     */
+    private static ?string $decimalSeparator;
+
+    /**
+     * Thousands separator.
+     */
+    private static ?string $thousandsSeparator;
+
+    /**
+     * Currency code.
+     */
+    private static ?string $currencyCode;
+
+    /**
+     * Is iconv extension avalable?
+     */
+    private static ?bool $isIconvEnabled;
+
+    /**
+     * iconv options.
+     */
+    private static string $iconvOptions = '//IGNORE//TRANSLIT';
+
+    /**
+     * Build control characters array.
+     */
+    private static function buildControlCharacters(): void
+    {
+        for ($i = 0; $i <= 31; ++$i) {
+            if ($i != 9 && $i != 10 && $i != 13) {
+                $find = '_x' . sprintf('%04s', strtoupper(dechex($i))) . '_';
+                $replace = chr($i);
+                self::$controlCharacters[$find] = $replace;
+            }
+        }
+    }
+
+    /**
+     * Build SYLK characters array.
+     */
+    private static function buildSYLKCharacters(): void
+    {
+        self::$SYLKCharacters = [
+            "\x1B 0" => chr(0),
+            "\x1B 1" => chr(1),
+            "\x1B 2" => chr(2),
+            "\x1B 3" => chr(3),
+            "\x1B 4" => chr(4),
+            "\x1B 5" => chr(5),
+            "\x1B 6" => chr(6),
+            "\x1B 7" => chr(7),
+            "\x1B 8" => chr(8),
+            "\x1B 9" => chr(9),
+            "\x1B :" => chr(10),
+            "\x1B ;" => chr(11),
+            "\x1B <" => chr(12),
+            "\x1B =" => chr(13),
+            "\x1B >" => chr(14),
+            "\x1B ?" => chr(15),
+            "\x1B!0" => chr(16),
+            "\x1B!1" => chr(17),
+            "\x1B!2" => chr(18),
+            "\x1B!3" => chr(19),
+            "\x1B!4" => chr(20),
+            "\x1B!5" => chr(21),
+            "\x1B!6" => chr(22),
+            "\x1B!7" => chr(23),
+            "\x1B!8" => chr(24),
+            "\x1B!9" => chr(25),
+            "\x1B!:" => chr(26),
+            "\x1B!;" => chr(27),
+            "\x1B!<" => chr(28),
+            "\x1B!=" => chr(29),
+            "\x1B!>" => chr(30),
+            "\x1B!?" => chr(31),
+            "\x1B'?" => chr(127),
+            "\x1B(0" => '€', // 128 in CP1252
+            "\x1B(2" => '‚', // 130 in CP1252
+            "\x1B(3" => 'ƒ', // 131 in CP1252
+            "\x1B(4" => '„', // 132 in CP1252
+            "\x1B(5" => '…', // 133 in CP1252
+            "\x1B(6" => '†', // 134 in CP1252
+            "\x1B(7" => '‡', // 135 in CP1252
+            "\x1B(8" => 'ˆ', // 136 in CP1252
+            "\x1B(9" => '‰', // 137 in CP1252
+            "\x1B(:" => 'Š', // 138 in CP1252
+            "\x1B(;" => '‹', // 139 in CP1252
+            "\x1BNj" => 'Œ', // 140 in CP1252
+            "\x1B(>" => 'Ž', // 142 in CP1252
+            "\x1B)1" => '‘', // 145 in CP1252
+            "\x1B)2" => '’', // 146 in CP1252
+            "\x1B)3" => '“', // 147 in CP1252
+            "\x1B)4" => '”', // 148 in CP1252
+            "\x1B)5" => '•', // 149 in CP1252
+            "\x1B)6" => '–', // 150 in CP1252
+            "\x1B)7" => '—', // 151 in CP1252
+            "\x1B)8" => '˜', // 152 in CP1252
+            "\x1B)9" => '™', // 153 in CP1252
+            "\x1B):" => 'š', // 154 in CP1252
+            "\x1B);" => '›', // 155 in CP1252
+            "\x1BNz" => 'œ', // 156 in CP1252
+            "\x1B)>" => 'ž', // 158 in CP1252
+            "\x1B)?" => 'Ÿ', // 159 in CP1252
+            "\x1B*0" => ' ', // 160 in CP1252
+            "\x1BN!" => '¡', // 161 in CP1252
+            "\x1BN\"" => '¢', // 162 in CP1252
+            "\x1BN#" => '£', // 163 in CP1252
+            "\x1BN(" => '¤', // 164 in CP1252
+            "\x1BN%" => '¥', // 165 in CP1252
+            "\x1B*6" => '¦', // 166 in CP1252
+            "\x1BN'" => '§', // 167 in CP1252
+            "\x1BNH " => '¨', // 168 in CP1252
+            "\x1BNS" => '©', // 169 in CP1252
+            "\x1BNc" => 'ª', // 170 in CP1252
+            "\x1BN+" => '«', // 171 in CP1252
+            "\x1B*<" => '¬', // 172 in CP1252
+            "\x1B*=" => '­', // 173 in CP1252
+            "\x1BNR" => '®', // 174 in CP1252
+            "\x1B*?" => '¯', // 175 in CP1252
+            "\x1BN0" => '°', // 176 in CP1252
+            "\x1BN1" => '±', // 177 in CP1252
+            "\x1BN2" => '²', // 178 in CP1252
+            "\x1BN3" => '³', // 179 in CP1252
+            "\x1BNB " => '´', // 180 in CP1252
+            "\x1BN5" => 'µ', // 181 in CP1252
+            "\x1BN6" => '¶', // 182 in CP1252
+            "\x1BN7" => '·', // 183 in CP1252
+            "\x1B+8" => '¸', // 184 in CP1252
+            "\x1BNQ" => '¹', // 185 in CP1252
+            "\x1BNk" => 'º', // 186 in CP1252
+            "\x1BN;" => '»', // 187 in CP1252
+            "\x1BN<" => '¼', // 188 in CP1252
+            "\x1BN=" => '½', // 189 in CP1252
+            "\x1BN>" => '¾', // 190 in CP1252
+            "\x1BN?" => '¿', // 191 in CP1252
+            "\x1BNAA" => 'À', // 192 in CP1252
+            "\x1BNBA" => 'Á', // 193 in CP1252
+            "\x1BNCA" => 'Â', // 194 in CP1252
+            "\x1BNDA" => 'Ã', // 195 in CP1252
+            "\x1BNHA" => 'Ä', // 196 in CP1252
+            "\x1BNJA" => 'Å', // 197 in CP1252
+            "\x1BNa" => 'Æ', // 198 in CP1252
+            "\x1BNKC" => 'Ç', // 199 in CP1252
+            "\x1BNAE" => 'È', // 200 in CP1252
+            "\x1BNBE" => 'É', // 201 in CP1252
+            "\x1BNCE" => 'Ê', // 202 in CP1252
+            "\x1BNHE" => 'Ë', // 203 in CP1252
+            "\x1BNAI" => 'Ì', // 204 in CP1252
+            "\x1BNBI" => 'Í', // 205 in CP1252
+            "\x1BNCI" => 'Î', // 206 in CP1252
+            "\x1BNHI" => 'Ï', // 207 in CP1252
+            "\x1BNb" => 'Ð', // 208 in CP1252
+            "\x1BNDN" => 'Ñ', // 209 in CP1252
+            "\x1BNAO" => 'Ò', // 210 in CP1252
+            "\x1BNBO" => 'Ó', // 211 in CP1252
+            "\x1BNCO" => 'Ô', // 212 in CP1252
+            "\x1BNDO" => 'Õ', // 213 in CP1252
+            "\x1BNHO" => 'Ö', // 214 in CP1252
+            "\x1B-7" => '×', // 215 in CP1252
+            "\x1BNi" => 'Ø', // 216 in CP1252
+            "\x1BNAU" => 'Ù', // 217 in CP1252
+            "\x1BNBU" => 'Ú', // 218 in CP1252
+            "\x1BNCU" => 'Û', // 219 in CP1252
+            "\x1BNHU" => 'Ü', // 220 in CP1252
+            "\x1B-=" => 'Ý', // 221 in CP1252
+            "\x1BNl" => 'Þ', // 222 in CP1252
+            "\x1BN{" => 'ß', // 223 in CP1252
+            "\x1BNAa" => 'à', // 224 in CP1252
+            "\x1BNBa" => 'á', // 225 in CP1252
+            "\x1BNCa" => 'â', // 226 in CP1252
+            "\x1BNDa" => 'ã', // 227 in CP1252
+            "\x1BNHa" => 'ä', // 228 in CP1252
+            "\x1BNJa" => 'å', // 229 in CP1252
+            "\x1BNq" => 'æ', // 230 in CP1252
+            "\x1BNKc" => 'ç', // 231 in CP1252
+            "\x1BNAe" => 'è', // 232 in CP1252
+            "\x1BNBe" => 'é', // 233 in CP1252
+            "\x1BNCe" => 'ê', // 234 in CP1252
+            "\x1BNHe" => 'ë', // 235 in CP1252
+            "\x1BNAi" => 'ì', // 236 in CP1252
+            "\x1BNBi" => 'í', // 237 in CP1252
+            "\x1BNCi" => 'î', // 238 in CP1252
+            "\x1BNHi" => 'ï', // 239 in CP1252
+            "\x1BNs" => 'ð', // 240 in CP1252
+            "\x1BNDn" => 'ñ', // 241 in CP1252
+            "\x1BNAo" => 'ò', // 242 in CP1252
+            "\x1BNBo" => 'ó', // 243 in CP1252
+            "\x1BNCo" => 'ô', // 244 in CP1252
+            "\x1BNDo" => 'õ', // 245 in CP1252
+            "\x1BNHo" => 'ö', // 246 in CP1252
+            "\x1B/7" => '÷', // 247 in CP1252
+            "\x1BNy" => 'ø', // 248 in CP1252
+            "\x1BNAu" => 'ù', // 249 in CP1252
+            "\x1BNBu" => 'ú', // 250 in CP1252
+            "\x1BNCu" => 'û', // 251 in CP1252
+            "\x1BNHu" => 'ü', // 252 in CP1252
+            "\x1B/=" => 'ý', // 253 in CP1252
+            "\x1BN|" => 'þ', // 254 in CP1252
+            "\x1BNHy" => 'ÿ', // 255 in CP1252
+        ];
+    }
+
+    /**
+     * Get whether iconv extension is available.
+     */
+    public static function getIsIconvEnabled(): bool
+    {
+        if (isset(self::$isIconvEnabled)) {
+            return self::$isIconvEnabled;
+        }
+
+        // Assume no problems with iconv
+        self::$isIconvEnabled = true;
+
+        // Fail if iconv doesn't exist
+        if (!function_exists('iconv')) {
+            self::$isIconvEnabled = false;
+        } elseif (!@iconv('UTF-8', 'UTF-16LE', 'x')) {
+            // Sometimes iconv is not working, and e.g. iconv('UTF-8', 'UTF-16LE', 'x') just returns false,
+            self::$isIconvEnabled = false;
+        } elseif (defined('PHP_OS') && @stristr(PHP_OS, 'AIX') && defined('ICONV_IMPL') && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && defined('ICONV_VERSION') && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
+            // CUSTOM: IBM AIX iconv() does not work
+            self::$isIconvEnabled = false;
+        }
+
+        // Deactivate iconv default options if they fail (as seen on IMB i)
+        if (self::$isIconvEnabled && !@iconv('UTF-8', 'UTF-16LE' . self::$iconvOptions, 'x')) {
+            self::$iconvOptions = '';
+        }
+
+        return self::$isIconvEnabled;
+    }
+
+    private static function buildCharacterSets(): void
+    {
+        if (empty(self::$controlCharacters)) {
+            self::buildControlCharacters();
+        }
+
+        if (empty(self::$SYLKCharacters)) {
+            self::buildSYLKCharacters();
+        }
+    }
+
+    /**
+     * Convert from OpenXML escaped control character to PHP control character.
+     *
+     * Excel 2007 team:
+     * ----------------
+     * That's correct, control characters are stored directly in the shared-strings table.
+     * We do encode characters that cannot be represented in XML using the following escape sequence:
+     * _xHHHH_ where H represents a hexadecimal character in the character's value...
+     * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
+     * element or in the shared string <t> element.
+     *
+     * @param string $textValue Value to unescape
+     */
+    public static function controlCharacterOOXML2PHP(string $textValue): string
+    {
+        self::buildCharacterSets();
+
+        return str_replace(array_keys(self::$controlCharacters), array_values(self::$controlCharacters), $textValue);
+    }
+
+    /**
+     * Convert from PHP control character to OpenXML escaped control character.
+     *
+     * Excel 2007 team:
+     * ----------------
+     * That's correct, control characters are stored directly in the shared-strings table.
+     * We do encode characters that cannot be represented in XML using the following escape sequence:
+     * _xHHHH_ where H represents a hexadecimal character in the character's value...
+     * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
+     * element or in the shared string <t> element.
+     *
+     * @param string $textValue Value to escape
+     */
+    public static function controlCharacterPHP2OOXML(string $textValue): string
+    {
+        self::buildCharacterSets();
+
+        return str_replace(array_values(self::$controlCharacters), array_keys(self::$controlCharacters), $textValue);
+    }
+
+    /**
+     * Try to sanitize UTF8, replacing invalid sequences with Unicode substitution characters.
+     */
+    public static function sanitizeUTF8(string $textValue): string
+    {
+        $textValue = str_replace(["\xef\xbf\xbe", "\xef\xbf\xbf"], "\xef\xbf\xbd", $textValue);
+        $subst = mb_substitute_character(); // default is question mark
+        mb_substitute_character(65533); // Unicode substitution character
+        // Phpstan does not think this can return false.
+        $returnValue = mb_convert_encoding($textValue, 'UTF-8', 'UTF-8');
+        mb_substitute_character($subst);
+
+        return $returnValue;
+    }
+
+    /**
+     * Check if a string contains UTF8 data.
+     */
+    public static function isUTF8(string $textValue): bool
+    {
+        return $textValue === self::sanitizeUTF8($textValue);
+    }
+
+    /**
+     * Formats a numeric value as a string for output in various output writers forcing
+     * point as decimal separator in case locale is other than English.
+     */
+    public static function formatNumber(float|int|string|null $numericValue): string
+    {
+        if (is_float($numericValue)) {
+            return str_replace(',', '.', (string) $numericValue);
+        }
+
+        return (string) $numericValue;
+    }
+
+    /**
+     * Converts a UTF-8 string into BIFF8 Unicode string data (8-bit string length)
+     * Writes the string using uncompressed notation, no rich text, no Asian phonetics
+     * If mbstring extension is not available, ASCII is assumed, and compressed notation is used
+     * although this will give wrong results for non-ASCII strings
+     * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3.
+     *
+     * @param string $textValue UTF-8 encoded string
+     * @param array<int, array{strlen: int, fontidx: int}> $arrcRuns Details of rich text runs in $value
+     */
+    public static function UTF8toBIFF8UnicodeShort(string $textValue, array $arrcRuns = []): string
+    {
+        // character count
+        $ln = self::countCharacters($textValue, 'UTF-8');
+        // option flags
+        if (empty($arrcRuns)) {
+            $data = pack('CC', $ln, 0x0001);
+            // characters
+            $data .= self::convertEncoding($textValue, 'UTF-16LE', 'UTF-8');
+        } else {
+            $data = pack('vC', $ln, 0x09);
+            $data .= pack('v', count($arrcRuns));
+            // characters
+            $data .= self::convertEncoding($textValue, 'UTF-16LE', 'UTF-8');
+            foreach ($arrcRuns as $cRun) {
+                $data .= pack('v', $cRun['strlen']);
+                $data .= pack('v', $cRun['fontidx']);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Converts a UTF-8 string into BIFF8 Unicode string data (16-bit string length)
+     * Writes the string using uncompressed notation, no rich text, no Asian phonetics
+     * If mbstring extension is not available, ASCII is assumed, and compressed notation is used
+     * although this will give wrong results for non-ASCII strings
+     * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3.
+     *
+     * @param string $textValue UTF-8 encoded string
+     */
+    public static function UTF8toBIFF8UnicodeLong(string $textValue): string
+    {
+        // characters
+        $chars = self::convertEncoding($textValue, 'UTF-16LE', 'UTF-8');
+        $ln = (int) (strlen($chars) / 2);  // N.B. - strlen, not mb_strlen issue #642
+
+        return pack('vC', $ln, 0x0001) . $chars;
+    }
+
+    /**
+     * Convert string from one encoding to another.
+     *
+     * @param string $to Encoding to convert to, e.g. 'UTF-8'
+     * @param string $from Encoding to convert from, e.g. 'UTF-16LE'
+     */
+    public static function convertEncoding(string $textValue, string $to, string $from): string
+    {
+        if (self::getIsIconvEnabled()) {
+            $result = iconv($from, $to . self::$iconvOptions, $textValue);
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        return mb_convert_encoding($textValue, $to, $from);
+    }
+
+    /**
+     * Get character count.
+     *
+     * @param string $encoding Encoding
+     *
+     * @return int Character count
+     */
+    public static function countCharacters(string $textValue, string $encoding = 'UTF-8'): int
+    {
+        return mb_strlen($textValue, $encoding);
+    }
+
+    /**
+     * Get character count using mb_strwidth rather than mb_strlen.
+     *
+     * @param string $encoding Encoding
+     *
+     * @return int Character count
+     */
+    public static function countCharactersDbcs(string $textValue, string $encoding = 'UTF-8'): int
+    {
+        return mb_strwidth($textValue, $encoding);
+    }
+
+    /**
+     * Get a substring of a UTF-8 encoded string.
+     *
+     * @param string $textValue UTF-8 encoded string
+     * @param int $offset Start offset
+     * @param ?int $length Maximum number of characters in substring
+     */
+    public static function substring(string $textValue, int $offset, ?int $length = 0): string
+    {
+        return mb_substr($textValue, $offset, $length, 'UTF-8');
+    }
+
+    /**
+     * Convert a UTF-8 encoded string to upper case.
+     *
+     * @param string $textValue UTF-8 encoded string
+     */
+    public static function strToUpper(string $textValue): string
+    {
+        return mb_convert_case($textValue, MB_CASE_UPPER, 'UTF-8');
+    }
+
+    /**
+     * Convert a UTF-8 encoded string to lower case.
+     *
+     * @param string $textValue UTF-8 encoded string
+     */
+    public static function strToLower(string $textValue): string
+    {
+        return mb_convert_case($textValue, MB_CASE_LOWER, 'UTF-8');
+    }
+
+    /**
+     * Convert a UTF-8 encoded string to title/proper case
+     * (uppercase every first character in each word, lower case all other characters).
+     *
+     * @param string $textValue UTF-8 encoded string
+     */
+    public static function strToTitle(string $textValue): string
+    {
+        return mb_convert_case($textValue, MB_CASE_TITLE, 'UTF-8');
+    }
+
+    public static function mbIsUpper(string $character): bool
+    {
+        return mb_strtolower($character, 'UTF-8') !== $character;
+    }
+
+    /**
+     * Splits a UTF-8 string into an array of individual characters.
+     */
+    public static function mbStrSplit(string $string): array
+    {
+        // Split at all position not after the start: ^
+        // and not before the end: $
+        $split = preg_split('/(?<!^)(?!$)/u', $string);
+
+        return ($split === false) ? [] : $split;
+    }
+
+    /**
+     * Reverse the case of a string, so that all uppercase characters become lowercase
+     * and all lowercase characters become uppercase.
+     *
+     * @param string $textValue UTF-8 encoded string
+     */
+    public static function strCaseReverse(string $textValue): string
+    {
+        $characters = self::mbStrSplit($textValue);
+        foreach ($characters as &$character) {
+            if (self::mbIsUpper($character)) {
+                $character = mb_strtolower($character, 'UTF-8');
+            } else {
+                $character = mb_strtoupper($character, 'UTF-8');
+            }
+        }
+
+        return implode('', $characters);
+    }
+
+    /**
+     * Get the decimal separator. If it has not yet been set explicitly, try to obtain number
+     * formatting information from locale.
+     */
+    public static function getDecimalSeparator(): string
+    {
+        if (!isset(self::$decimalSeparator)) {
+            $localeconv = localeconv();
+            self::$decimalSeparator = ($localeconv['decimal_point'] != '')
+                ? $localeconv['decimal_point'] : $localeconv['mon_decimal_point'];
+
+            if (self::$decimalSeparator == '') {
+                // Default to .
+                self::$decimalSeparator = '.';
+            }
+        }
+
+        return self::$decimalSeparator;
+    }
+
+    /**
+     * Set the decimal separator. Only used by NumberFormat::toFormattedString()
+     * to format output by \PhpOffice\PhpSpreadsheet\Writer\Html and \PhpOffice\PhpSpreadsheet\Writer\Pdf.
+     *
+     * @param ?string $separator Character for decimal separator
+     */
+    public static function setDecimalSeparator(?string $separator): void
+    {
+        self::$decimalSeparator = $separator;
+    }
+
+    /**
+     * Get the thousands separator. If it has not yet been set explicitly, try to obtain number
+     * formatting information from locale.
+     */
+    public static function getThousandsSeparator(): string
+    {
+        if (!isset(self::$thousandsSeparator)) {
+            $localeconv = localeconv();
+            self::$thousandsSeparator = ($localeconv['thousands_sep'] != '')
+                ? $localeconv['thousands_sep'] : $localeconv['mon_thousands_sep'];
+
+            if (self::$thousandsSeparator == '') {
+                // Default to .
+                self::$thousandsSeparator = ',';
+            }
+        }
+
+        return self::$thousandsSeparator;
+    }
+
+    /**
+     * Set the thousands separator. Only used by NumberFormat::toFormattedString()
+     * to format output by \PhpOffice\PhpSpreadsheet\Writer\Html and \PhpOffice\PhpSpreadsheet\Writer\Pdf.
+     *
+     * @param ?string $separator Character for thousands separator
+     */
+    public static function setThousandsSeparator(?string $separator): void
+    {
+        self::$thousandsSeparator = $separator;
+    }
+
+    /**
+     *    Get the currency code. If it has not yet been set explicitly, try to obtain the
+     *        symbol information from locale.
+     */
+    public static function getCurrencyCode(): string
+    {
+        if (!empty(self::$currencyCode)) {
+            return self::$currencyCode;
+        }
+        self::$currencyCode = '$';
+        $localeconv = localeconv();
+        if (!empty($localeconv['currency_symbol'])) {
+            self::$currencyCode = $localeconv['currency_symbol'];
+
+            return self::$currencyCode;
+        }
+        if (!empty($localeconv['int_curr_symbol'])) {
+            self::$currencyCode = $localeconv['int_curr_symbol'];
+
+            return self::$currencyCode;
+        }
+
+        return self::$currencyCode;
+    }
+
+    /**
+     * Set the currency code. Only used by NumberFormat::toFormattedString()
+     *        to format output by \PhpOffice\PhpSpreadsheet\Writer\Html and \PhpOffice\PhpSpreadsheet\Writer\Pdf.
+     *
+     * @param ?string $currencyCode Character for currency code
+     */
+    public static function setCurrencyCode(?string $currencyCode): void
+    {
+        self::$currencyCode = $currencyCode;
+    }
+
+    /**
+     * Convert SYLK encoded string to UTF-8.
+     *
+     * @param string $textValue SYLK encoded string
+     *
+     * @return string UTF-8 encoded string
+     */
+    public static function SYLKtoUTF8(string $textValue): string
+    {
+        self::buildCharacterSets();
+
+        // If there is no escape character in the string there is nothing to do
+        if (!str_contains($textValue, '')) {
+            return $textValue;
+        }
+
+        foreach (self::$SYLKCharacters as $k => $v) {
+            $textValue = str_replace($k, $v, $textValue);
+        }
+
+        return $textValue;
+    }
+
+    /**
+     * Retrieve any leading numeric part of a string, or return the full string if no leading numeric
+     * (handles basic integer or float, but not exponent or non decimal).
+     *
+     * @return float|string string or only the leading numeric part of the string
+     */
+    public static function testStringAsNumeric(string $textValue): float|string
+    {
+        if (is_numeric($textValue)) {
+            return $textValue;
+        }
+        $v = (float) $textValue;
+
+        return (is_numeric(substr($textValue, 0, strlen((string) $v)))) ? $v : $textValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php
new file mode 100644
index 00000000..f6e8500b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use DateTimeZone;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class TimeZone
+{
+    /**
+     * Default Timezone used for date/time conversions.
+     */
+    protected static string $timezone = 'UTC';
+
+    /**
+     * Validate a Timezone name.
+     *
+     * @param string $timezoneName Time zone (e.g. 'Europe/London')
+     *
+     * @return bool Success or failure
+     */
+    private static function validateTimeZone(string $timezoneName): bool
+    {
+        return in_array($timezoneName, DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC), true);
+    }
+
+    /**
+     * Set the Default Timezone used for date/time conversions.
+     *
+     * @param string $timezoneName Time zone (e.g. 'Europe/London')
+     *
+     * @return bool Success or failure
+     */
+    public static function setTimeZone(string $timezoneName): bool
+    {
+        if (self::validateTimeZone($timezoneName)) {
+            self::$timezone = $timezoneName;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the Default Timezone used for date/time conversions.
+     *
+     * @return string Timezone (e.g. 'Europe/London')
+     */
+    public static function getTimeZone(): string
+    {
+        return self::$timezone;
+    }
+
+    /**
+     *    Return the Timezone offset used for date/time conversions to/from UST
+     * This requires both the timezone and the calculated date/time to allow for local DST.
+     *
+     * @param ?string $timezoneName The timezone for finding the adjustment to UST
+     * @param float|int $timestamp PHP date/time value
+     *
+     * @return int Number of seconds for timezone adjustment
+     */
+    public static function getTimeZoneAdjustment(?string $timezoneName, $timestamp): int
+    {
+        $timezoneName = $timezoneName ?? self::$timezone;
+        $dtobj = Date::dateTimeFromTimestamp("$timestamp");
+        if (!self::validateTimeZone($timezoneName)) {
+            throw new PhpSpreadsheetException("Invalid timezone $timezoneName");
+        }
+        $dtobj->setTimeZone(new DateTimeZone($timezoneName));
+
+        return $dtobj->getOffset();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php
new file mode 100644
index 00000000..f9dacfb8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php
@@ -0,0 +1,425 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
+
+abstract class BestFit
+{
+    /**
+     * Indicator flag for a calculation error.
+     */
+    protected bool $error = false;
+
+    /**
+     * Algorithm type to use for best-fit.
+     */
+    protected string $bestFitType = 'undetermined';
+
+    /**
+     * Number of entries in the sets of x- and y-value arrays.
+     */
+    protected int $valueCount;
+
+    /**
+     * X-value dataseries of values.
+     *
+     * @var float[]
+     */
+    protected array $xValues = [];
+
+    /**
+     * Y-value dataseries of values.
+     *
+     * @var float[]
+     */
+    protected array $yValues = [];
+
+    /**
+     * Flag indicating whether values should be adjusted to Y=0.
+     */
+    protected bool $adjustToZero = false;
+
+    /**
+     * Y-value series of best-fit values.
+     *
+     * @var float[]
+     */
+    protected array $yBestFitValues = [];
+
+    protected float $goodnessOfFit = 1;
+
+    protected float $stdevOfResiduals = 0;
+
+    protected float $covariance = 0;
+
+    protected float $correlation = 0;
+
+    protected float $SSRegression = 0;
+
+    protected float $SSResiduals = 0;
+
+    protected float $DFResiduals = 0;
+
+    protected float $f = 0;
+
+    protected float $slope = 0;
+
+    protected float $slopeSE = 0;
+
+    protected float $intersect = 0;
+
+    protected float $intersectSE = 0;
+
+    protected float $xOffset = 0;
+
+    protected float $yOffset = 0;
+
+    public function getError(): bool
+    {
+        return $this->error;
+    }
+
+    public function getBestFitType(): string
+    {
+        return $this->bestFitType;
+    }
+
+    /**
+     * Return the Y-Value for a specified value of X.
+     *
+     * @param float $xValue X-Value
+     *
+     * @return float Y-Value
+     */
+    abstract public function getValueOfYForX(float $xValue): float;
+
+    /**
+     * Return the X-Value for a specified value of Y.
+     *
+     * @param float $yValue Y-Value
+     *
+     * @return float X-Value
+     */
+    abstract public function getValueOfXForY(float $yValue): float;
+
+    /**
+     * Return the original set of X-Values.
+     *
+     * @return float[] X-Values
+     */
+    public function getXValues(): array
+    {
+        return $this->xValues;
+    }
+
+    /**
+     * Return the Equation of the best-fit line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    abstract public function getEquation(int $dp = 0): string;
+
+    /**
+     * Return the Slope of the line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getSlope(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->slope, $dp);
+        }
+
+        return $this->slope;
+    }
+
+    /**
+     * Return the standard error of the Slope.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getSlopeSE(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->slopeSE, $dp);
+        }
+
+        return $this->slopeSE;
+    }
+
+    /**
+     * Return the Value of X where it intersects Y = 0.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getIntersect(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->intersect, $dp);
+        }
+
+        return $this->intersect;
+    }
+
+    /**
+     * Return the standard error of the Intersect.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getIntersectSE(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->intersectSE, $dp);
+        }
+
+        return $this->intersectSE;
+    }
+
+    /**
+     * Return the goodness of fit for this regression.
+     *
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getGoodnessOfFit(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->goodnessOfFit, $dp);
+        }
+
+        return $this->goodnessOfFit;
+    }
+
+    /**
+     * Return the goodness of fit for this regression.
+     *
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getGoodnessOfFitPercent(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->goodnessOfFit * 100, $dp);
+        }
+
+        return $this->goodnessOfFit * 100;
+    }
+
+    /**
+     * Return the standard deviation of the residuals for this regression.
+     *
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getStdevOfResiduals(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->stdevOfResiduals, $dp);
+        }
+
+        return $this->stdevOfResiduals;
+    }
+
+    /**
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getSSRegression(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->SSRegression, $dp);
+        }
+
+        return $this->SSRegression;
+    }
+
+    /**
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getSSResiduals(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->SSResiduals, $dp);
+        }
+
+        return $this->SSResiduals;
+    }
+
+    /**
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getDFResiduals(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->DFResiduals, $dp);
+        }
+
+        return $this->DFResiduals;
+    }
+
+    /**
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getF(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->f, $dp);
+        }
+
+        return $this->f;
+    }
+
+    /**
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getCovariance(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->covariance, $dp);
+        }
+
+        return $this->covariance;
+    }
+
+    /**
+     * @param int $dp Number of places of decimal precision to return
+     */
+    public function getCorrelation(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round($this->correlation, $dp);
+        }
+
+        return $this->correlation;
+    }
+
+    /**
+     * @return float[]
+     */
+    public function getYBestFitValues(): array
+    {
+        return $this->yBestFitValues;
+    }
+
+    protected function calculateGoodnessOfFit(float $sumX, float $sumY, float $sumX2, float $sumY2, float $sumXY, float $meanX, float $meanY, bool|int $const): void
+    {
+        $SSres = $SScov = $SStot = $SSsex = 0.0;
+        foreach ($this->xValues as $xKey => $xValue) {
+            $bestFitY = $this->yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
+
+            $SSres += ($this->yValues[$xKey] - $bestFitY) * ($this->yValues[$xKey] - $bestFitY);
+            if ($const === true) {
+                $SStot += ($this->yValues[$xKey] - $meanY) * ($this->yValues[$xKey] - $meanY);
+            } else {
+                $SStot += $this->yValues[$xKey] * $this->yValues[$xKey];
+            }
+            $SScov += ($this->xValues[$xKey] - $meanX) * ($this->yValues[$xKey] - $meanY);
+            if ($const === true) {
+                $SSsex += ($this->xValues[$xKey] - $meanX) * ($this->xValues[$xKey] - $meanX);
+            } else {
+                $SSsex += $this->xValues[$xKey] * $this->xValues[$xKey];
+            }
+        }
+
+        $this->SSResiduals = $SSres;
+        $this->DFResiduals = $this->valueCount - 1 - ($const === true ? 1 : 0);
+
+        if ($this->DFResiduals == 0.0) {
+            $this->stdevOfResiduals = 0.0;
+        } else {
+            $this->stdevOfResiduals = sqrt($SSres / $this->DFResiduals);
+        }
+
+        if ($SStot == 0.0 || $SSres == $SStot) {
+            $this->goodnessOfFit = 1;
+        } else {
+            $this->goodnessOfFit = 1 - ($SSres / $SStot);
+        }
+
+        $this->SSRegression = $this->goodnessOfFit * $SStot;
+        $this->covariance = $SScov / $this->valueCount;
+        $this->correlation = ($this->valueCount * $sumXY - $sumX * $sumY) / sqrt(($this->valueCount * $sumX2 - $sumX ** 2) * ($this->valueCount * $sumY2 - $sumY ** 2));
+        $this->slopeSE = $this->stdevOfResiduals / sqrt($SSsex);
+        $this->intersectSE = $this->stdevOfResiduals * sqrt(1 / ($this->valueCount - ($sumX * $sumX) / $sumX2));
+        if ($this->SSResiduals != 0.0) {
+            if ($this->DFResiduals == 0.0) {
+                $this->f = 0.0;
+            } else {
+                $this->f = $this->SSRegression / ($this->SSResiduals / $this->DFResiduals);
+            }
+        } else {
+            if ($this->DFResiduals == 0.0) {
+                $this->f = 0.0;
+            } else {
+                $this->f = $this->SSRegression / $this->DFResiduals;
+            }
+        }
+    }
+
+    /** @return float|int */
+    private function sumSquares(array $values)
+    {
+        return array_sum(
+            array_map(
+                fn ($value): float|int => $value ** 2,
+                $values
+            )
+        );
+    }
+
+    /**
+     * @param float[] $yValues
+     * @param float[] $xValues
+     */
+    protected function leastSquareFit(array $yValues, array $xValues, bool $const): void
+    {
+        // calculate sums
+        $sumValuesX = array_sum($xValues);
+        $sumValuesY = array_sum($yValues);
+        $meanValueX = $sumValuesX / $this->valueCount;
+        $meanValueY = $sumValuesY / $this->valueCount;
+        $sumSquaresX = $this->sumSquares($xValues);
+        $sumSquaresY = $this->sumSquares($yValues);
+        $mBase = $mDivisor = 0.0;
+        $xy_sum = 0.0;
+        for ($i = 0; $i < $this->valueCount; ++$i) {
+            $xy_sum += $xValues[$i] * $yValues[$i];
+
+            if ($const === true) {
+                $mBase += ($xValues[$i] - $meanValueX) * ($yValues[$i] - $meanValueY);
+                $mDivisor += ($xValues[$i] - $meanValueX) * ($xValues[$i] - $meanValueX);
+            } else {
+                $mBase += $xValues[$i] * $yValues[$i];
+                $mDivisor += $xValues[$i] * $xValues[$i];
+            }
+        }
+
+        // calculate slope
+        $this->slope = $mBase / $mDivisor;
+
+        // calculate intersect
+        $this->intersect = ($const === true) ? $meanValueY - ($this->slope * $meanValueX) : 0.0;
+
+        $this->calculateGoodnessOfFit($sumValuesX, $sumValuesY, $sumSquaresX, $sumSquaresY, $xy_sum, $meanValueX, $meanValueY, $const);
+    }
+
+    /**
+     * Define the regression.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    public function __construct(array $yValues, array $xValues = [])
+    {
+        //    Calculate number of points
+        $yValueCount = count($yValues);
+        $xValueCount = count($xValues);
+
+        //    Define X Values if necessary
+        if ($xValueCount === 0) {
+            $xValues = range(1, $yValueCount);
+        } elseif ($yValueCount !== $xValueCount) {
+            //    Ensure both arrays of points are the same size
+            $this->error = true;
+        }
+
+        $this->valueCount = $yValueCount;
+        $this->xValues = $xValues;
+        $this->yValues = $yValues;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php
new file mode 100644
index 00000000..ed2d8896
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
+
+class ExponentialBestFit extends BestFit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this Trend class).
+     */
+    protected string $bestFitType = 'exponential';
+
+    /**
+     * Return the Y-Value for a specified value of X.
+     *
+     * @param float $xValue X-Value
+     *
+     * @return float Y-Value
+     */
+    public function getValueOfYForX(float $xValue): float
+    {
+        return $this->getIntersect() * $this->getSlope() ** ($xValue - $this->xOffset);
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y.
+     *
+     * @param float $yValue Y-Value
+     *
+     * @return float X-Value
+     */
+    public function getValueOfXForY(float $yValue): float
+    {
+        return log(($yValue + $this->yOffset) / $this->getIntersect()) / log($this->getSlope());
+    }
+
+    /**
+     * Return the Equation of the best-fit line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getEquation(int $dp = 0): string
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        return 'Y = ' . $intersect . ' * ' . $slope . '^X';
+    }
+
+    /**
+     * Return the Slope of the line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getSlope(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round(exp($this->slope), $dp);
+        }
+
+        return exp($this->slope);
+    }
+
+    /**
+     * Return the Value of X where it intersects Y = 0.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getIntersect(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round(exp($this->intersect), $dp);
+        }
+
+        return exp($this->intersect);
+    }
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    private function exponentialRegression(array $yValues, array $xValues, bool $const): void
+    {
+        $adjustedYValues = array_map(
+            fn ($value): float => ($value < 0.0) ? 0 - log(abs($value)) : log($value),
+            $yValues
+        );
+
+        $this->leastSquareFit($adjustedYValues, $xValues, $const);
+    }
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    public function __construct(array $yValues, array $xValues = [], bool $const = true)
+    {
+        parent::__construct($yValues, $xValues);
+
+        if (!$this->error) {
+            $this->exponentialRegression($yValues, $xValues, (bool) $const);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php
new file mode 100644
index 00000000..8a540800
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
+
+class LinearBestFit extends BestFit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this Trend class).
+     */
+    protected string $bestFitType = 'linear';
+
+    /**
+     * Return the Y-Value for a specified value of X.
+     *
+     * @param float $xValue X-Value
+     *
+     * @return float Y-Value
+     */
+    public function getValueOfYForX(float $xValue): float
+    {
+        return $this->getIntersect() + $this->getSlope() * $xValue;
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y.
+     *
+     * @param float $yValue Y-Value
+     *
+     * @return float X-Value
+     */
+    public function getValueOfXForY(float $yValue): float
+    {
+        return ($yValue - $this->getIntersect()) / $this->getSlope();
+    }
+
+    /**
+     * Return the Equation of the best-fit line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getEquation(int $dp = 0): string
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        return 'Y = ' . $intersect . ' + ' . $slope . ' * X';
+    }
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    private function linearRegression(array $yValues, array $xValues, bool $const): void
+    {
+        $this->leastSquareFit($yValues, $xValues, $const);
+    }
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    public function __construct(array $yValues, array $xValues = [], bool $const = true)
+    {
+        parent::__construct($yValues, $xValues);
+
+        if (!$this->error) {
+            $this->linearRegression($yValues, $xValues, (bool) $const);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php
new file mode 100644
index 00000000..3dec61b2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
+
+class LogarithmicBestFit extends BestFit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this Trend class).
+     */
+    protected string $bestFitType = 'logarithmic';
+
+    /**
+     * Return the Y-Value for a specified value of X.
+     *
+     * @param float $xValue X-Value
+     *
+     * @return float Y-Value
+     */
+    public function getValueOfYForX(float $xValue): float
+    {
+        return $this->getIntersect() + $this->getSlope() * log($xValue - $this->xOffset);
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y.
+     *
+     * @param float $yValue Y-Value
+     *
+     * @return float X-Value
+     */
+    public function getValueOfXForY(float $yValue): float
+    {
+        return exp(($yValue - $this->getIntersect()) / $this->getSlope());
+    }
+
+    /**
+     * Return the Equation of the best-fit line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getEquation(int $dp = 0): string
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        return 'Y = ' . $slope . ' * log(' . $intersect . ' * X)';
+    }
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    private function logarithmicRegression(array $yValues, array $xValues, bool $const): void
+    {
+        $adjustedYValues = array_map(
+            fn ($value): float => ($value < 0.0) ? 0 - log(abs($value)) : log($value),
+            $yValues
+        );
+
+        $this->leastSquareFit($adjustedYValues, $xValues, $const);
+    }
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    public function __construct(array $yValues, array $xValues = [], bool $const = true)
+    {
+        parent::__construct($yValues, $xValues);
+
+        if (!$this->error) {
+            $this->logarithmicRegression($yValues, $xValues, (bool) $const);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
new file mode 100644
index 00000000..911a9c34
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
@@ -0,0 +1,205 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
+
+use Matrix\Matrix;
+
+// Phpstan and Scrutinizer seem to have legitimate complaints.
+// $this->slope is specified where an array is expected in several places.
+// But it seems that it should always be float.
+// This code is probably not exercised at all in unit tests.
+class PolynomialBestFit extends BestFit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this Trend class).
+     */
+    protected string $bestFitType = 'polynomial';
+
+    /**
+     * Polynomial order.
+     */
+    protected int $order = 0;
+
+    /**
+     * Return the order of this polynomial.
+     */
+    public function getOrder(): int
+    {
+        return $this->order;
+    }
+
+    /**
+     * Return the Y-Value for a specified value of X.
+     *
+     * @param float $xValue X-Value
+     *
+     * @return float Y-Value
+     */
+    public function getValueOfYForX(float $xValue): float
+    {
+        $retVal = $this->getIntersect();
+        $slope = $this->getSlope();
+        // Phpstan and Scrutinizer are both correct - getSlope returns float, not array.
+        // @phpstan-ignore-next-line
+        foreach ($slope as $key => $value) {
+            if ($value != 0.0) {
+                $retVal += $value * $xValue ** ($key + 1);
+            }
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y.
+     *
+     * @param float $yValue Y-Value
+     *
+     * @return float X-Value
+     */
+    public function getValueOfXForY(float $yValue): float
+    {
+        return ($yValue - $this->getIntersect()) / $this->getSlope();
+    }
+
+    /**
+     * Return the Equation of the best-fit line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getEquation(int $dp = 0): string
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        $equation = 'Y = ' . $intersect;
+        // Phpstan and Scrutinizer are both correct - getSlope returns float, not array.
+        // @phpstan-ignore-next-line
+        foreach ($slope as $key => $value) {
+            if ($value != 0.0) {
+                $equation .= ' + ' . $value . ' * X';
+                if ($key > 0) {
+                    $equation .= '^' . ($key + 1);
+                }
+            }
+        }
+
+        return $equation;
+    }
+
+    /**
+     * Return the Slope of the line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getSlope(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            $coefficients = [];
+            //* @phpstan-ignore-next-line
+            foreach ($this->slope as $coefficient) {
+                $coefficients[] = round($coefficient, $dp);
+            }
+
+            // @phpstan-ignore-next-line
+            return $coefficients;
+        }
+
+        return $this->slope;
+    }
+
+    public function getCoefficients(int $dp = 0): array
+    {
+        // Phpstan and Scrutinizer are both correct - getSlope returns float, not array.
+        // @phpstan-ignore-next-line
+        return array_merge([$this->getIntersect($dp)], $this->getSlope($dp));
+    }
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param int $order Order of Polynomial for this regression
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    private function polynomialRegression(int $order, array $yValues, array $xValues): void
+    {
+        // calculate sums
+        $x_sum = array_sum($xValues);
+        $y_sum = array_sum($yValues);
+        $xx_sum = $xy_sum = $yy_sum = 0;
+        for ($i = 0; $i < $this->valueCount; ++$i) {
+            $xy_sum += $xValues[$i] * $yValues[$i];
+            $xx_sum += $xValues[$i] * $xValues[$i];
+            $yy_sum += $yValues[$i] * $yValues[$i];
+        }
+        /*
+         *    This routine uses logic from the PHP port of polyfit version 0.1
+         *    written by Michael Bommarito and Paul Meagher
+         *
+         *    The function fits a polynomial function of order $order through
+         *    a series of x-y data points using least squares.
+         *
+         */
+        $A = [];
+        $B = [];
+        for ($i = 0; $i < $this->valueCount; ++$i) {
+            for ($j = 0; $j <= $order; ++$j) {
+                $A[$i][$j] = $xValues[$i] ** $j;
+            }
+        }
+        for ($i = 0; $i < $this->valueCount; ++$i) {
+            $B[$i] = [$yValues[$i]];
+        }
+        $matrixA = new Matrix($A);
+        $matrixB = new Matrix($B);
+        $C = $matrixA->solve($matrixB);
+
+        $coefficients = [];
+        for ($i = 0; $i < $C->rows; ++$i) {
+            $r = $C->getValue($i + 1, 1); // row and column are origin-1
+            if (!is_numeric($r) || abs($r) <= 10 ** (-9)) {
+                $r = 0;
+            } else {
+                $r += 0;
+            }
+            $coefficients[] = $r;
+        }
+
+        $this->intersect = (float) array_shift($coefficients);
+        // Phpstan is correct
+        //* @phpstan-ignore-next-line
+        $this->slope = $coefficients;
+
+        $this->calculateGoodnessOfFit($x_sum, $y_sum, $xx_sum, $yy_sum, $xy_sum, 0, 0, 0);
+        foreach ($this->xValues as $xKey => $xValue) {
+            $this->yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
+        }
+    }
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param int $order Order of Polynomial for this regression
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    public function __construct(int $order, array $yValues, array $xValues = [])
+    {
+        parent::__construct($yValues, $xValues);
+
+        if (!$this->error) {
+            if ($order < $this->valueCount) {
+                $this->bestFitType .= '_' . $order;
+                $this->order = $order;
+                $this->polynomialRegression($order, $yValues, $xValues);
+                if (($this->getGoodnessOfFit() < 0.0) || ($this->getGoodnessOfFit() > 1.0)) {
+                    $this->error = true;
+                }
+            } else {
+                $this->error = true;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php
new file mode 100644
index 00000000..56b5a12b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
+
+class PowerBestFit extends BestFit
+{
+    /**
+     * Algorithm type to use for best-fit
+     * (Name of this Trend class).
+     */
+    protected string $bestFitType = 'power';
+
+    /**
+     * Return the Y-Value for a specified value of X.
+     *
+     * @param float $xValue X-Value
+     *
+     * @return float Y-Value
+     */
+    public function getValueOfYForX(float $xValue): float
+    {
+        return $this->getIntersect() * ($xValue - $this->xOffset) ** $this->getSlope();
+    }
+
+    /**
+     * Return the X-Value for a specified value of Y.
+     *
+     * @param float $yValue Y-Value
+     *
+     * @return float X-Value
+     */
+    public function getValueOfXForY(float $yValue): float
+    {
+        return (($yValue + $this->yOffset) / $this->getIntersect()) ** (1 / $this->getSlope());
+    }
+
+    /**
+     * Return the Equation of the best-fit line.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getEquation(int $dp = 0): string
+    {
+        $slope = $this->getSlope($dp);
+        $intersect = $this->getIntersect($dp);
+
+        return 'Y = ' . $intersect . ' * X^' . $slope;
+    }
+
+    /**
+     * Return the Value of X where it intersects Y = 0.
+     *
+     * @param int $dp Number of places of decimal precision to display
+     */
+    public function getIntersect(int $dp = 0): float
+    {
+        if ($dp != 0) {
+            return round(exp($this->intersect), $dp);
+        }
+
+        return exp($this->intersect);
+    }
+
+    /**
+     * Execute the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    private function powerRegression(array $yValues, array $xValues, bool $const): void
+    {
+        $adjustedYValues = array_map(
+            fn ($value): float => ($value < 0.0) ? 0 - log(abs($value)) : log($value),
+            $yValues
+        );
+        $adjustedXValues = array_map(
+            fn ($value): float => ($value < 0.0) ? 0 - log(abs($value)) : log($value),
+            $xValues
+        );
+
+        $this->leastSquareFit($adjustedYValues, $adjustedXValues, $const);
+    }
+
+    /**
+     * Define the regression and calculate the goodness of fit for a set of X and Y data values.
+     *
+     * @param float[] $yValues The set of Y-values for this regression
+     * @param float[] $xValues The set of X-values for this regression
+     */
+    public function __construct(array $yValues, array $xValues = [], bool $const = true)
+    {
+        parent::__construct($yValues, $xValues);
+
+        if (!$this->error) {
+            $this->powerRegression($yValues, $xValues, (bool) $const);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php
new file mode 100644
index 00000000..dc879430
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
+
+class Trend
+{
+    const TREND_LINEAR = 'Linear';
+    const TREND_LOGARITHMIC = 'Logarithmic';
+    const TREND_EXPONENTIAL = 'Exponential';
+    const TREND_POWER = 'Power';
+    const TREND_POLYNOMIAL_2 = 'Polynomial_2';
+    const TREND_POLYNOMIAL_3 = 'Polynomial_3';
+    const TREND_POLYNOMIAL_4 = 'Polynomial_4';
+    const TREND_POLYNOMIAL_5 = 'Polynomial_5';
+    const TREND_POLYNOMIAL_6 = 'Polynomial_6';
+    const TREND_BEST_FIT = 'Bestfit';
+    const TREND_BEST_FIT_NO_POLY = 'Bestfit_no_Polynomials';
+
+    /**
+     * Names of the best-fit Trend analysis methods.
+     *
+     * @var string[]
+     */
+    private static array $trendTypes = [
+        self::TREND_LINEAR,
+        self::TREND_LOGARITHMIC,
+        self::TREND_EXPONENTIAL,
+        self::TREND_POWER,
+    ];
+
+    /**
+     * Names of the best-fit Trend polynomial orders.
+     *
+     * @var string[]
+     */
+    private static array $trendTypePolynomialOrders = [
+        self::TREND_POLYNOMIAL_2,
+        self::TREND_POLYNOMIAL_3,
+        self::TREND_POLYNOMIAL_4,
+        self::TREND_POLYNOMIAL_5,
+        self::TREND_POLYNOMIAL_6,
+    ];
+
+    /**
+     * Cached results for each method when trying to identify which provides the best fit.
+     *
+     * @var BestFit[]
+     */
+    private static array $trendCache = [];
+
+    public static function calculate(string $trendType = self::TREND_BEST_FIT, array $yValues = [], array $xValues = [], bool $const = true): mixed
+    {
+        //    Calculate number of points in each dataset
+        $nY = count($yValues);
+        $nX = count($xValues);
+
+        //    Define X Values if necessary
+        if ($nX === 0) {
+            $xValues = range(1, $nY);
+        } elseif ($nY !== $nX) {
+            //    Ensure both arrays of points are the same size
+            trigger_error('Trend(): Number of elements in coordinate arrays do not match.', E_USER_ERROR);
+        }
+
+        $key = md5($trendType . $const . serialize($yValues) . serialize($xValues));
+        //    Determine which Trend method has been requested
+        switch ($trendType) {
+            //    Instantiate and return the class for the requested Trend method
+            case self::TREND_LINEAR:
+            case self::TREND_LOGARITHMIC:
+            case self::TREND_EXPONENTIAL:
+            case self::TREND_POWER:
+                if (!isset(self::$trendCache[$key])) {
+                    $className = '\PhpOffice\PhpSpreadsheet\Shared\Trend\\' . $trendType . 'BestFit';
+                    self::$trendCache[$key] = new $className($yValues, $xValues, $const);
+                }
+
+                return self::$trendCache[$key];
+            case self::TREND_POLYNOMIAL_2:
+            case self::TREND_POLYNOMIAL_3:
+            case self::TREND_POLYNOMIAL_4:
+            case self::TREND_POLYNOMIAL_5:
+            case self::TREND_POLYNOMIAL_6:
+                if (!isset(self::$trendCache[$key])) {
+                    $order = (int) substr($trendType, -1);
+                    self::$trendCache[$key] = new PolynomialBestFit($order, $yValues, $xValues);
+                }
+
+                return self::$trendCache[$key];
+            case self::TREND_BEST_FIT:
+            case self::TREND_BEST_FIT_NO_POLY:
+                //    If the request is to determine the best fit regression, then we test each Trend line in turn
+                //    Start by generating an instance of each available Trend method
+                $bestFit = [];
+                $bestFitValue = [];
+                foreach (self::$trendTypes as $trendMethod) {
+                    $className = '\PhpOffice\PhpSpreadsheet\Shared\Trend\\' . $trendType . 'BestFit';
+                    //* @phpstan-ignore-next-line
+                    $bestFit[$trendMethod] = new $className($yValues, $xValues, $const);
+                    $bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
+                }
+                if ($trendType != self::TREND_BEST_FIT_NO_POLY) {
+                    foreach (self::$trendTypePolynomialOrders as $trendMethod) {
+                        $order = (int) substr($trendMethod, -1);
+                        $bestFit[$trendMethod] = new PolynomialBestFit($order, $yValues, $xValues);
+                        if ($bestFit[$trendMethod]->getError()) {
+                            unset($bestFit[$trendMethod]);
+                        } else {
+                            $bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
+                        }
+                    }
+                }
+                //    Determine which of our Trend lines is the best fit, and then we return the instance of that Trend class
+                arsort($bestFitValue);
+                $bestFitType = key($bestFitValue);
+
+                return $bestFit[$bestFitType];
+            default:
+                return false;
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php
new file mode 100644
index 00000000..2703e98e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+
+class XMLWriter extends \XMLWriter
+{
+    public static bool $debugEnabled = false;
+
+    /** Temporary storage method */
+    const STORAGE_MEMORY = 1;
+    const STORAGE_DISK = 2;
+
+    /**
+     * Temporary filename.
+     */
+    private string $tempFileName = '';
+
+    /**
+     * Create a new XMLWriter instance.
+     *
+     * @param int $temporaryStorage Temporary storage location
+     * @param ?string $temporaryStorageFolder Temporary storage folder
+     */
+    public function __construct(int $temporaryStorage = self::STORAGE_MEMORY, ?string $temporaryStorageFolder = null)
+    {
+        // Open temporary storage
+        if ($temporaryStorage == self::STORAGE_MEMORY) {
+            $this->openMemory();
+        } else {
+            // Create temporary filename
+            if ($temporaryStorageFolder === null) {
+                $temporaryStorageFolder = File::sysGetTempDir();
+            }
+            $this->tempFileName = (string) @tempnam($temporaryStorageFolder, 'xml');
+
+            // Open storage
+            if (empty($this->tempFileName) || $this->openUri($this->tempFileName) === false) {
+                // Fallback to memory...
+                $this->openMemory();
+            }
+        }
+
+        // Set default values
+        if (self::$debugEnabled) {
+            $this->setIndent(true);
+        }
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        // Unlink temporary files
+        // There is nothing reasonable to do if unlink fails.
+        if ($this->tempFileName != '') {
+            @unlink($this->tempFileName);
+        }
+    }
+
+    public function __wakeup(): void
+    {
+        $this->tempFileName = '';
+
+        throw new SpreadsheetException('Unserialize not permitted');
+    }
+
+    /**
+     * Get written data.
+     */
+    public function getData(): string
+    {
+        if ($this->tempFileName == '') {
+            return $this->outputMemory(true);
+        }
+        $this->flush();
+
+        return file_get_contents($this->tempFileName) ?: '';
+    }
+
+    /**
+     * Wrapper method for writeRaw.
+     *
+     * @param null|string|string[] $rawTextData
+     */
+    public function writeRawData($rawTextData): bool
+    {
+        if (is_array($rawTextData)) {
+            $rawTextData = implode("\n", $rawTextData);
+        }
+
+        return $this->writeRaw(htmlspecialchars($rawTextData ?? ''));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php
new file mode 100644
index 00000000..cdb1bf24
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php
@@ -0,0 +1,273 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Shared;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Xls
+{
+    /**
+     * Get the width of a column in pixels. We use the relationship y = ceil(7x) where
+     * x is the width in intrinsic Excel units (measuring width in number of normal characters)
+     * This holds for Arial 10.
+     *
+     * @param Worksheet $worksheet The sheet
+     * @param string $col The column
+     *
+     * @return int The width in pixels
+     */
+    public static function sizeCol(Worksheet $worksheet, string $col = 'A'): int
+    {
+        // default font of the workbook
+        $font = $worksheet->getParentOrThrow()->getDefaultStyle()->getFont();
+
+        $columnDimensions = $worksheet->getColumnDimensions();
+
+        // first find the true column width in pixels (uncollapsed and unhidden)
+        if (isset($columnDimensions[$col]) && $columnDimensions[$col]->getWidth() != -1) {
+            // then we have column dimension with explicit width
+            $columnDimension = $columnDimensions[$col];
+            $width = $columnDimension->getWidth();
+            $pixelWidth = Drawing::cellDimensionToPixels($width, $font);
+        } elseif ($worksheet->getDefaultColumnDimension()->getWidth() != -1) {
+            // then we have default column dimension with explicit width
+            $defaultColumnDimension = $worksheet->getDefaultColumnDimension();
+            $width = $defaultColumnDimension->getWidth();
+            $pixelWidth = Drawing::cellDimensionToPixels($width, $font);
+        } else {
+            // we don't even have any default column dimension. Width depends on default font
+            $pixelWidth = Font::getDefaultColumnWidthByFont($font, true);
+        }
+
+        // now find the effective column width in pixels
+        if (isset($columnDimensions[$col]) && !$columnDimensions[$col]->getVisible()) {
+            $effectivePixelWidth = 0;
+        } else {
+            $effectivePixelWidth = $pixelWidth;
+        }
+
+        return $effectivePixelWidth;
+    }
+
+    /**
+     * Convert the height of a cell from user's units to pixels. By interpolation
+     * the relationship is: y = 4/3x. If the height hasn't been set by the user we
+     * use the default value. If the row is hidden we use a value of zero.
+     *
+     * @param Worksheet $worksheet The sheet
+     * @param int $row The row index (1-based)
+     *
+     * @return int The width in pixels
+     */
+    public static function sizeRow(Worksheet $worksheet, int $row = 1): int
+    {
+        // default font of the workbook
+        $font = $worksheet->getParentOrThrow()->getDefaultStyle()->getFont();
+
+        $rowDimensions = $worksheet->getRowDimensions();
+
+        // first find the true row height in pixels (uncollapsed and unhidden)
+        if (isset($rowDimensions[$row]) && $rowDimensions[$row]->getRowHeight() != -1) {
+            // then we have a row dimension
+            $rowDimension = $rowDimensions[$row];
+            $rowHeight = $rowDimension->getRowHeight();
+            $pixelRowHeight = (int) ceil(4 * $rowHeight / 3); // here we assume Arial 10
+        } elseif ($worksheet->getDefaultRowDimension()->getRowHeight() != -1) {
+            // then we have a default row dimension with explicit height
+            $defaultRowDimension = $worksheet->getDefaultRowDimension();
+            $pixelRowHeight = $defaultRowDimension->getRowHeight(Dimension::UOM_PIXELS);
+        } else {
+            // we don't even have any default row dimension. Height depends on default font
+            $pointRowHeight = Font::getDefaultRowHeightByFont($font);
+            $pixelRowHeight = Font::fontSizeToPixels((int) $pointRowHeight);
+        }
+
+        // now find the effective row height in pixels
+        if (isset($rowDimensions[$row]) && !$rowDimensions[$row]->getVisible()) {
+            $effectivePixelRowHeight = 0;
+        } else {
+            $effectivePixelRowHeight = $pixelRowHeight;
+        }
+
+        return (int) $effectivePixelRowHeight;
+    }
+
+    /**
+     * Get the horizontal distance in pixels between two anchors
+     * The distanceX is found as sum of all the spanning columns widths minus correction for the two offsets.
+     *
+     * @param float|int $startOffsetX Offset within start cell measured in 1/1024 of the cell width
+     * @param float|int $endOffsetX Offset within end cell measured in 1/1024 of the cell width
+     *
+     * @return int Horizontal measured in pixels
+     */
+    public static function getDistanceX(Worksheet $worksheet, string $startColumn = 'A', float|int $startOffsetX = 0, string $endColumn = 'A', float|int $endOffsetX = 0): int
+    {
+        $distanceX = 0;
+
+        // add the widths of the spanning columns
+        $startColumnIndex = Coordinate::columnIndexFromString($startColumn);
+        $endColumnIndex = Coordinate::columnIndexFromString($endColumn);
+        for ($i = $startColumnIndex; $i <= $endColumnIndex; ++$i) {
+            $distanceX += self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($i));
+        }
+
+        // correct for offsetX in startcell
+        $distanceX -= (int) floor(self::sizeCol($worksheet, $startColumn) * $startOffsetX / 1024);
+
+        // correct for offsetX in endcell
+        $distanceX -= (int) floor(self::sizeCol($worksheet, $endColumn) * (1 - $endOffsetX / 1024));
+
+        return $distanceX;
+    }
+
+    /**
+     * Get the vertical distance in pixels between two anchors
+     * The distanceY is found as sum of all the spanning rows minus two offsets.
+     *
+     * @param int $startRow (1-based)
+     * @param float|int $startOffsetY Offset within start cell measured in 1/256 of the cell height
+     * @param int $endRow (1-based)
+     * @param float|int $endOffsetY Offset within end cell measured in 1/256 of the cell height
+     *
+     * @return int Vertical distance measured in pixels
+     */
+    public static function getDistanceY(Worksheet $worksheet, int $startRow = 1, float|int $startOffsetY = 0, int $endRow = 1, float|int $endOffsetY = 0): int
+    {
+        $distanceY = 0;
+
+        // add the widths of the spanning rows
+        for ($row = $startRow; $row <= $endRow; ++$row) {
+            $distanceY += self::sizeRow($worksheet, $row);
+        }
+
+        // correct for offsetX in startcell
+        $distanceY -= (int) floor(self::sizeRow($worksheet, $startRow) * $startOffsetY / 256);
+
+        // correct for offsetX in endcell
+        $distanceY -= (int) floor(self::sizeRow($worksheet, $endRow) * (1 - $endOffsetY / 256));
+
+        return $distanceY;
+    }
+
+    /**
+     * Convert 1-cell anchor coordinates to 2-cell anchor coordinates
+     * This function is ported from PEAR Spreadsheet_Writer_Excel with small modifications.
+     *
+     * Calculate the vertices that define the position of the image as required by
+     * the OBJ record.
+     *
+     *         +------------+------------+
+     *         |     A      |      B     |
+     *   +-----+------------+------------+
+     *   |     |(x1,y1)     |            |
+     *   |  1  |(A1)._______|______      |
+     *   |     |    |              |     |
+     *   |     |    |              |     |
+     *   +-----+----|    BITMAP    |-----+
+     *   |     |    |              |     |
+     *   |  2  |    |______________.     |
+     *   |     |            |        (B2)|
+     *   |     |            |     (x2,y2)|
+     *   +---- +------------+------------+
+     *
+     * Example of a bitmap that covers some of the area from cell A1 to cell B2.
+     *
+     * Based on the width and height of the bitmap we need to calculate 8 vars:
+     *     $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
+     * The width and height of the cells are also variable and have to be taken into
+     * account.
+     * The values of $col_start and $row_start are passed in from the calling
+     * function. The values of $col_end and $row_end are calculated by subtracting
+     * the width and height of the bitmap from the width and height of the
+     * underlying cells.
+     * The vertices are expressed as a percentage of the underlying cell width as
+     * follows (rhs values are in pixels):
+     *
+     *       x1 = X / W *1024
+     *       y1 = Y / H *256
+     *       x2 = (X-1) / W *1024
+     *       y2 = (Y-1) / H *256
+     *
+     *       Where:  X is distance from the left side of the underlying cell
+     *               Y is distance from the top of the underlying cell
+     *               W is the width of the cell
+     *               H is the height of the cell
+     *
+     * @param string $coordinates E.g. 'A1'
+     * @param int $offsetX Horizontal offset in pixels
+     * @param int $offsetY Vertical offset in pixels
+     * @param int $width Width in pixels
+     * @param int $height Height in pixels
+     */
+    public static function oneAnchor2twoAnchor(Worksheet $worksheet, string $coordinates, int $offsetX, int $offsetY, int $width, int $height): ?array
+    {
+        [$col_start, $row] = Coordinate::indexesFromString($coordinates);
+        $row_start = $row - 1;
+
+        $x1 = $offsetX;
+        $y1 = $offsetY;
+
+        // Initialise end cell to the same as the start cell
+        $col_end = $col_start; // Col containing lower right corner of object
+        $row_end = $row_start; // Row containing bottom right corner of object
+
+        // Zero the specified offset if greater than the cell dimensions
+        if ($x1 >= self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_start))) {
+            $x1 = 0;
+        }
+        if ($y1 >= self::sizeRow($worksheet, $row_start + 1)) {
+            $y1 = 0;
+        }
+
+        $width = $width + $x1 - 1;
+        $height = $height + $y1 - 1;
+
+        // Subtract the underlying cell widths to find the end cell of the image
+        while ($width >= self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end))) {
+            $width -= self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end));
+            ++$col_end;
+        }
+
+        // Subtract the underlying cell heights to find the end cell of the image
+        while ($height >= self::sizeRow($worksheet, $row_end + 1)) {
+            $height -= self::sizeRow($worksheet, $row_end + 1);
+            ++$row_end;
+        }
+
+        // Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
+        // with zero height or width.
+        if (self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_start)) == 0) {
+            return null;
+        }
+        if (self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end)) == 0) {
+            return null;
+        }
+        if (self::sizeRow($worksheet, $row_start + 1) == 0) {
+            return null;
+        }
+        if (self::sizeRow($worksheet, $row_end + 1) == 0) {
+            return null;
+        }
+
+        // Convert the pixel values to the percentage value expected by Excel
+        $x1 = $x1 / self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_start)) * 1024;
+        $y1 = $y1 / self::sizeRow($worksheet, $row_start + 1) * 256;
+        $x2 = ($width + 1) / self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
+        $y2 = ($height + 1) / self::sizeRow($worksheet, $row_end + 1) * 256; // Distance to bottom of object
+
+        $startCoordinates = Coordinate::stringFromColumnIndex($col_start) . ($row_start + 1);
+        $endCoordinates = Coordinate::stringFromColumnIndex($col_end) . ($row_end + 1);
+
+        return [
+            'startCoordinates' => $startCoordinates,
+            'startOffsetX' => $x1,
+            'startOffsetY' => $y1,
+            'endCoordinates' => $endCoordinates,
+            'endOffsetX' => $x2,
+            'endOffsetY' => $y2,
+        ];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
new file mode 100644
index 00000000..bcea8e6a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
@@ -0,0 +1,1584 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use JsonSerializable;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Document\Security;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
+
+class Spreadsheet implements JsonSerializable
+{
+    // Allowable values for workbook window visilbity
+    const VISIBILITY_VISIBLE = 'visible';
+    const VISIBILITY_HIDDEN = 'hidden';
+    const VISIBILITY_VERY_HIDDEN = 'veryHidden';
+
+    private const DEFINED_NAME_IS_RANGE = false;
+    private const DEFINED_NAME_IS_FORMULA = true;
+
+    private const WORKBOOK_VIEW_VISIBILITY_VALUES = [
+        self::VISIBILITY_VISIBLE,
+        self::VISIBILITY_HIDDEN,
+        self::VISIBILITY_VERY_HIDDEN,
+    ];
+
+    protected int $excelCalendar = Date::CALENDAR_WINDOWS_1900;
+
+    /**
+     * Unique ID.
+     */
+    private string $uniqueID;
+
+    /**
+     * Document properties.
+     */
+    private Properties $properties;
+
+    /**
+     * Document security.
+     */
+    private Security $security;
+
+    /**
+     * Collection of Worksheet objects.
+     *
+     * @var Worksheet[]
+     */
+    private array $workSheetCollection;
+
+    /**
+     * Calculation Engine.
+     */
+    private ?Calculation $calculationEngine;
+
+    /**
+     * Active sheet index.
+     */
+    private int $activeSheetIndex;
+
+    /**
+     * Named ranges.
+     *
+     * @var DefinedName[]
+     */
+    private array $definedNames;
+
+    /**
+     * CellXf supervisor.
+     */
+    private Style $cellXfSupervisor;
+
+    /**
+     * CellXf collection.
+     *
+     * @var Style[]
+     */
+    private array $cellXfCollection = [];
+
+    /**
+     * CellStyleXf collection.
+     *
+     * @var Style[]
+     */
+    private array $cellStyleXfCollection = [];
+
+    /**
+     * hasMacros : this workbook have macros ?
+     */
+    private bool $hasMacros = false;
+
+    /**
+     * macrosCode : all macros code as binary data (the vbaProject.bin file, this include form, code,  etc.), null if no macro.
+     */
+    private ?string $macrosCode = null;
+
+    /**
+     * macrosCertificate : if macros are signed, contains binary data vbaProjectSignature.bin file, null if not signed.
+     */
+    private ?string $macrosCertificate = null;
+
+    /**
+     * ribbonXMLData : null if workbook is'nt Excel 2007 or not contain a customized UI.
+     *
+     * @var null|array{target: string, data: string}
+     */
+    private ?array $ribbonXMLData = null;
+
+    /**
+     * ribbonBinObjects : null if workbook is'nt Excel 2007 or not contain embedded objects (picture(s)) for Ribbon Elements
+     * ignored if $ribbonXMLData is null.
+     */
+    private ?array $ribbonBinObjects = null;
+
+    /**
+     * List of unparsed loaded data for export to same format with better compatibility.
+     * It has to be minimized when the library start to support currently unparsed data.
+     */
+    private array $unparsedLoadedData = [];
+
+    /**
+     * Controls visibility of the horizonal scroll bar in the application.
+     */
+    private bool $showHorizontalScroll = true;
+
+    /**
+     * Controls visibility of the horizonal scroll bar in the application.
+     */
+    private bool $showVerticalScroll = true;
+
+    /**
+     * Controls visibility of the sheet tabs in the application.
+     */
+    private bool $showSheetTabs = true;
+
+    /**
+     * Specifies a boolean value that indicates whether the workbook window
+     * is minimized.
+     */
+    private bool $minimized = false;
+
+    /**
+     * Specifies a boolean value that indicates whether to group dates
+     * when presenting the user with filtering optiomd in the user
+     * interface.
+     */
+    private bool $autoFilterDateGrouping = true;
+
+    /**
+     * Specifies the index to the first sheet in the book view.
+     */
+    private int $firstSheetIndex = 0;
+
+    /**
+     * Specifies the visible status of the workbook.
+     */
+    private string $visibility = self::VISIBILITY_VISIBLE;
+
+    /**
+     * Specifies the ratio between the workbook tabs bar and the horizontal
+     * scroll bar.  TabRatio is assumed to be out of 1000 of the horizontal
+     * window width.
+     */
+    private int $tabRatio = 600;
+
+    private Theme $theme;
+
+    public function getTheme(): Theme
+    {
+        return $this->theme;
+    }
+
+    /**
+     * The workbook has macros ?
+     */
+    public function hasMacros(): bool
+    {
+        return $this->hasMacros;
+    }
+
+    /**
+     * Define if a workbook has macros.
+     *
+     * @param bool $hasMacros true|false
+     */
+    public function setHasMacros(bool $hasMacros): void
+    {
+        $this->hasMacros = (bool) $hasMacros;
+    }
+
+    /**
+     * Set the macros code.
+     *
+     * @param string $macroCode string|null
+     */
+    public function setMacrosCode(string $macroCode): void
+    {
+        $this->macrosCode = $macroCode;
+        $this->setHasMacros($macroCode !== null);
+    }
+
+    /**
+     * Return the macros code.
+     */
+    public function getMacrosCode(): ?string
+    {
+        return $this->macrosCode;
+    }
+
+    /**
+     * Set the macros certificate.
+     */
+    public function setMacrosCertificate(?string $certificate): void
+    {
+        $this->macrosCertificate = $certificate;
+    }
+
+    /**
+     * Is the project signed ?
+     *
+     * @return bool true|false
+     */
+    public function hasMacrosCertificate(): bool
+    {
+        return $this->macrosCertificate !== null;
+    }
+
+    /**
+     * Return the macros certificate.
+     */
+    public function getMacrosCertificate(): ?string
+    {
+        return $this->macrosCertificate;
+    }
+
+    /**
+     * Remove all macros, certificate from spreadsheet.
+     */
+    public function discardMacros(): void
+    {
+        $this->hasMacros = false;
+        $this->macrosCode = null;
+        $this->macrosCertificate = null;
+    }
+
+    /**
+     * set ribbon XML data.
+     */
+    public function setRibbonXMLData(mixed $target, mixed $xmlData): void
+    {
+        if (is_string($target) && is_string($xmlData)) {
+            $this->ribbonXMLData = ['target' => $target, 'data' => $xmlData];
+        } else {
+            $this->ribbonXMLData = null;
+        }
+    }
+
+    /**
+     * retrieve ribbon XML Data.
+     */
+    public function getRibbonXMLData(string $what = 'all'): null|array|string //we need some constants here...
+    {
+        $returnData = null;
+        $what = strtolower($what);
+        switch ($what) {
+            case 'all':
+                $returnData = $this->ribbonXMLData;
+
+                break;
+            case 'target':
+            case 'data':
+                if (is_array($this->ribbonXMLData)) {
+                    $returnData = $this->ribbonXMLData[$what];
+                }
+
+                break;
+        }
+
+        return $returnData;
+    }
+
+    /**
+     * store binaries ribbon objects (pictures).
+     */
+    public function setRibbonBinObjects(mixed $binObjectsNames, mixed $binObjectsData): void
+    {
+        if ($binObjectsNames !== null && $binObjectsData !== null) {
+            $this->ribbonBinObjects = ['names' => $binObjectsNames, 'data' => $binObjectsData];
+        } else {
+            $this->ribbonBinObjects = null;
+        }
+    }
+
+    /**
+     * List of unparsed loaded data for export to same format with better compatibility.
+     * It has to be minimized when the library start to support currently unparsed data.
+     *
+     * @internal
+     */
+    public function getUnparsedLoadedData(): array
+    {
+        return $this->unparsedLoadedData;
+    }
+
+    /**
+     * List of unparsed loaded data for export to same format with better compatibility.
+     * It has to be minimized when the library start to support currently unparsed data.
+     *
+     * @internal
+     */
+    public function setUnparsedLoadedData(array $unparsedLoadedData): void
+    {
+        $this->unparsedLoadedData = $unparsedLoadedData;
+    }
+
+    /**
+     * retrieve Binaries Ribbon Objects.
+     */
+    public function getRibbonBinObjects(string $what = 'all'): ?array
+    {
+        $ReturnData = null;
+        $what = strtolower($what);
+        switch ($what) {
+            case 'all':
+                return $this->ribbonBinObjects;
+            case 'names':
+            case 'data':
+                if (is_array($this->ribbonBinObjects) && isset($this->ribbonBinObjects[$what])) {
+                    $ReturnData = $this->ribbonBinObjects[$what];
+                }
+
+                break;
+            case 'types':
+                if (
+                    is_array($this->ribbonBinObjects)
+                    && isset($this->ribbonBinObjects['data']) && is_array($this->ribbonBinObjects['data'])
+                ) {
+                    $tmpTypes = array_keys($this->ribbonBinObjects['data']);
+                    $ReturnData = array_unique(array_map(fn (string $path): string => pathinfo($path, PATHINFO_EXTENSION), $tmpTypes));
+                } else {
+                    $ReturnData = []; // the caller want an array... not null if empty
+                }
+
+                break;
+        }
+
+        return $ReturnData;
+    }
+
+    /**
+     * This workbook have a custom UI ?
+     */
+    public function hasRibbon(): bool
+    {
+        return $this->ribbonXMLData !== null;
+    }
+
+    /**
+     * This workbook have additionnal object for the ribbon ?
+     */
+    public function hasRibbonBinObjects(): bool
+    {
+        return $this->ribbonBinObjects !== null;
+    }
+
+    /**
+     * Check if a sheet with a specified code name already exists.
+     *
+     * @param string $codeName Name of the worksheet to check
+     */
+    public function sheetCodeNameExists(string $codeName): bool
+    {
+        return $this->getSheetByCodeName($codeName) !== null;
+    }
+
+    /**
+     * Get sheet by code name. Warning : sheet don't have always a code name !
+     *
+     * @param string $codeName Sheet name
+     */
+    public function getSheetByCodeName(string $codeName): ?Worksheet
+    {
+        $worksheetCount = count($this->workSheetCollection);
+        for ($i = 0; $i < $worksheetCount; ++$i) {
+            if ($this->workSheetCollection[$i]->getCodeName() == $codeName) {
+                return $this->workSheetCollection[$i];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Create a new PhpSpreadsheet with one Worksheet.
+     */
+    public function __construct()
+    {
+        $this->uniqueID = uniqid('', true);
+        $this->calculationEngine = new Calculation($this);
+        $this->theme = new Theme();
+
+        // Initialise worksheet collection and add one worksheet
+        $this->workSheetCollection = [];
+        $this->workSheetCollection[] = new Worksheet($this);
+        $this->activeSheetIndex = 0;
+
+        // Create document properties
+        $this->properties = new Properties();
+
+        // Create document security
+        $this->security = new Security();
+
+        // Set defined names
+        $this->definedNames = [];
+
+        // Create the cellXf supervisor
+        $this->cellXfSupervisor = new Style(true);
+        $this->cellXfSupervisor->bindParent($this);
+
+        // Create the default style
+        $this->addCellXf(new Style());
+        $this->addCellStyleXf(new Style());
+    }
+
+    /**
+     * Code to execute when this worksheet is unset().
+     */
+    public function __destruct()
+    {
+        $this->disconnectWorksheets();
+        $this->calculationEngine = null;
+        $this->cellXfCollection = [];
+        $this->cellStyleXfCollection = [];
+        $this->definedNames = [];
+    }
+
+    /**
+     * Disconnect all worksheets from this PhpSpreadsheet workbook object,
+     * typically so that the PhpSpreadsheet object can be unset.
+     */
+    public function disconnectWorksheets(): void
+    {
+        foreach ($this->workSheetCollection as $worksheet) {
+            $worksheet->disconnectCells();
+            unset($worksheet);
+        }
+        $this->workSheetCollection = [];
+    }
+
+    /**
+     * Return the calculation engine for this worksheet.
+     */
+    public function getCalculationEngine(): ?Calculation
+    {
+        return $this->calculationEngine;
+    }
+
+    /**
+     * Get properties.
+     */
+    public function getProperties(): Properties
+    {
+        return $this->properties;
+    }
+
+    /**
+     * Set properties.
+     */
+    public function setProperties(Properties $documentProperties): void
+    {
+        $this->properties = $documentProperties;
+    }
+
+    /**
+     * Get security.
+     */
+    public function getSecurity(): Security
+    {
+        return $this->security;
+    }
+
+    /**
+     * Set security.
+     */
+    public function setSecurity(Security $documentSecurity): void
+    {
+        $this->security = $documentSecurity;
+    }
+
+    /**
+     * Get active sheet.
+     */
+    public function getActiveSheet(): Worksheet
+    {
+        return $this->getSheet($this->activeSheetIndex);
+    }
+
+    /**
+     * Create sheet and add it to this workbook.
+     *
+     * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
+     */
+    public function createSheet(?int $sheetIndex = null): Worksheet
+    {
+        $newSheet = new Worksheet($this);
+        $this->addSheet($newSheet, $sheetIndex);
+
+        return $newSheet;
+    }
+
+    /**
+     * Check if a sheet with a specified name already exists.
+     *
+     * @param string $worksheetName Name of the worksheet to check
+     */
+    public function sheetNameExists(string $worksheetName): bool
+    {
+        return $this->getSheetByName($worksheetName) !== null;
+    }
+
+    /**
+     * Add sheet.
+     *
+     * @param Worksheet $worksheet The worksheet to add
+     * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
+     */
+    public function addSheet(Worksheet $worksheet, ?int $sheetIndex = null): Worksheet
+    {
+        if ($this->sheetNameExists($worksheet->getTitle())) {
+            throw new Exception(
+                "Workbook already contains a worksheet named '{$worksheet->getTitle()}'. Rename this worksheet first."
+            );
+        }
+
+        if ($sheetIndex === null) {
+            if ($this->activeSheetIndex < 0) {
+                $this->activeSheetIndex = 0;
+            }
+            $this->workSheetCollection[] = $worksheet;
+        } else {
+            // Insert the sheet at the requested index
+            array_splice(
+                $this->workSheetCollection,
+                $sheetIndex,
+                0,
+                [$worksheet]
+            );
+
+            // Adjust active sheet index if necessary
+            if ($this->activeSheetIndex >= $sheetIndex) {
+                ++$this->activeSheetIndex;
+            }
+            if ($this->activeSheetIndex < 0) {
+                $this->activeSheetIndex = 0;
+            }
+        }
+
+        if ($worksheet->getParent() === null) {
+            $worksheet->rebindParent($this);
+        }
+
+        return $worksheet;
+    }
+
+    /**
+     * Remove sheet by index.
+     *
+     * @param int $sheetIndex Index position of the worksheet to remove
+     */
+    public function removeSheetByIndex(int $sheetIndex): void
+    {
+        $numSheets = count($this->workSheetCollection);
+        if ($sheetIndex > $numSheets - 1) {
+            throw new Exception(
+                "You tried to remove a sheet by the out of bounds index: {$sheetIndex}. The actual number of sheets is {$numSheets}."
+            );
+        }
+        array_splice($this->workSheetCollection, $sheetIndex, 1);
+
+        // Adjust active sheet index if necessary
+        if (
+            ($this->activeSheetIndex >= $sheetIndex)
+            && ($this->activeSheetIndex > 0 || $numSheets <= 1)
+        ) {
+            --$this->activeSheetIndex;
+        }
+    }
+
+    /**
+     * Get sheet by index.
+     *
+     * @param int $sheetIndex Sheet index
+     */
+    public function getSheet(int $sheetIndex): Worksheet
+    {
+        if (!isset($this->workSheetCollection[$sheetIndex])) {
+            $numSheets = $this->getSheetCount();
+
+            throw new Exception(
+                "Your requested sheet index: {$sheetIndex} is out of bounds. The actual number of sheets is {$numSheets}."
+            );
+        }
+
+        return $this->workSheetCollection[$sheetIndex];
+    }
+
+    /**
+     * Get all sheets.
+     *
+     * @return Worksheet[]
+     */
+    public function getAllSheets(): array
+    {
+        return $this->workSheetCollection;
+    }
+
+    /**
+     * Get sheet by name.
+     *
+     * @param string $worksheetName Sheet name
+     */
+    public function getSheetByName(string $worksheetName): ?Worksheet
+    {
+        $worksheetCount = count($this->workSheetCollection);
+        for ($i = 0; $i < $worksheetCount; ++$i) {
+            if (strcasecmp($this->workSheetCollection[$i]->getTitle(), trim($worksheetName, "'")) === 0) {
+                return $this->workSheetCollection[$i];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get sheet by name, throwing exception if not found.
+     */
+    public function getSheetByNameOrThrow(string $worksheetName): Worksheet
+    {
+        $worksheet = $this->getSheetByName($worksheetName);
+        if ($worksheet === null) {
+            throw new Exception("Sheet $worksheetName does not exist.");
+        }
+
+        return $worksheet;
+    }
+
+    /**
+     * Get index for sheet.
+     *
+     * @return int index
+     */
+    public function getIndex(Worksheet $worksheet): int
+    {
+        foreach ($this->workSheetCollection as $key => $value) {
+            if ($value->getHashCode() === $worksheet->getHashCode()) {
+                return $key;
+            }
+        }
+
+        throw new Exception('Sheet does not exist.');
+    }
+
+    /**
+     * Set index for sheet by sheet name.
+     *
+     * @param string $worksheetName Sheet name to modify index for
+     * @param int $newIndexPosition New index for the sheet
+     *
+     * @return int New sheet index
+     */
+    public function setIndexByName(string $worksheetName, int $newIndexPosition): int
+    {
+        $oldIndex = $this->getIndex($this->getSheetByNameOrThrow($worksheetName));
+        $worksheet = array_splice(
+            $this->workSheetCollection,
+            $oldIndex,
+            1
+        );
+        array_splice(
+            $this->workSheetCollection,
+            $newIndexPosition,
+            0,
+            $worksheet
+        );
+
+        return $newIndexPosition;
+    }
+
+    /**
+     * Get sheet count.
+     */
+    public function getSheetCount(): int
+    {
+        return count($this->workSheetCollection);
+    }
+
+    /**
+     * Get active sheet index.
+     *
+     * @return int Active sheet index
+     */
+    public function getActiveSheetIndex(): int
+    {
+        return $this->activeSheetIndex;
+    }
+
+    /**
+     * Set active sheet index.
+     *
+     * @param int $worksheetIndex Active sheet index
+     */
+    public function setActiveSheetIndex(int $worksheetIndex): Worksheet
+    {
+        $numSheets = count($this->workSheetCollection);
+
+        if ($worksheetIndex > $numSheets - 1) {
+            throw new Exception(
+                "You tried to set a sheet active by the out of bounds index: {$worksheetIndex}. The actual number of sheets is {$numSheets}."
+            );
+        }
+        $this->activeSheetIndex = $worksheetIndex;
+
+        return $this->getActiveSheet();
+    }
+
+    /**
+     * Set active sheet index by name.
+     *
+     * @param string $worksheetName Sheet title
+     */
+    public function setActiveSheetIndexByName(string $worksheetName): Worksheet
+    {
+        if (($worksheet = $this->getSheetByName($worksheetName)) instanceof Worksheet) {
+            $this->setActiveSheetIndex($this->getIndex($worksheet));
+
+            return $worksheet;
+        }
+
+        throw new Exception('Workbook does not contain sheet:' . $worksheetName);
+    }
+
+    /**
+     * Get sheet names.
+     *
+     * @return string[]
+     */
+    public function getSheetNames(): array
+    {
+        $returnValue = [];
+        $worksheetCount = $this->getSheetCount();
+        for ($i = 0; $i < $worksheetCount; ++$i) {
+            $returnValue[] = $this->getSheet($i)->getTitle();
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Add external sheet.
+     *
+     * @param Worksheet $worksheet External sheet to add
+     * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
+     */
+    public function addExternalSheet(Worksheet $worksheet, ?int $sheetIndex = null): Worksheet
+    {
+        if ($this->sheetNameExists($worksheet->getTitle())) {
+            throw new Exception("Workbook already contains a worksheet named '{$worksheet->getTitle()}'. Rename the external sheet first.");
+        }
+
+        // count how many cellXfs there are in this workbook currently, we will need this below
+        $countCellXfs = count($this->cellXfCollection);
+
+        // copy all the shared cellXfs from the external workbook and append them to the current
+        foreach ($worksheet->getParentOrThrow()->getCellXfCollection() as $cellXf) {
+            $this->addCellXf(clone $cellXf);
+        }
+
+        // move sheet to this workbook
+        $worksheet->rebindParent($this);
+
+        // update the cellXfs
+        foreach ($worksheet->getCoordinates(false) as $coordinate) {
+            $cell = $worksheet->getCell($coordinate);
+            $cell->setXfIndex($cell->getXfIndex() + $countCellXfs);
+        }
+
+        // update the column dimensions Xfs
+        foreach ($worksheet->getColumnDimensions() as $columnDimension) {
+            $columnDimension->setXfIndex($columnDimension->getXfIndex() + $countCellXfs);
+        }
+
+        // update the row dimensions Xfs
+        foreach ($worksheet->getRowDimensions() as $rowDimension) {
+            $xfIndex = $rowDimension->getXfIndex();
+            if ($xfIndex !== null) {
+                $rowDimension->setXfIndex($xfIndex + $countCellXfs);
+            }
+        }
+
+        return $this->addSheet($worksheet, $sheetIndex);
+    }
+
+    /**
+     * Get an array of all Named Ranges.
+     *
+     * @return DefinedName[]
+     */
+    public function getNamedRanges(): array
+    {
+        return array_filter(
+            $this->definedNames,
+            fn (DefinedName $definedName): bool => $definedName->isFormula() === self::DEFINED_NAME_IS_RANGE
+        );
+    }
+
+    /**
+     * Get an array of all Named Formulae.
+     *
+     * @return DefinedName[]
+     */
+    public function getNamedFormulae(): array
+    {
+        return array_filter(
+            $this->definedNames,
+            fn (DefinedName $definedName): bool => $definedName->isFormula() === self::DEFINED_NAME_IS_FORMULA
+        );
+    }
+
+    /**
+     * Get an array of all Defined Names (both named ranges and named formulae).
+     *
+     * @return DefinedName[]
+     */
+    public function getDefinedNames(): array
+    {
+        return $this->definedNames;
+    }
+
+    /**
+     * Add a named range.
+     * If a named range with this name already exists, then this will replace the existing value.
+     */
+    public function addNamedRange(NamedRange $namedRange): void
+    {
+        $this->addDefinedName($namedRange);
+    }
+
+    /**
+     * Add a named formula.
+     * If a named formula with this name already exists, then this will replace the existing value.
+     */
+    public function addNamedFormula(NamedFormula $namedFormula): void
+    {
+        $this->addDefinedName($namedFormula);
+    }
+
+    /**
+     * Add a defined name (either a named range or a named formula).
+     * If a defined named with this name already exists, then this will replace the existing value.
+     */
+    public function addDefinedName(DefinedName $definedName): void
+    {
+        $upperCaseName = StringHelper::strToUpper($definedName->getName());
+        if ($definedName->getScope() == null) {
+            // global scope
+            $this->definedNames[$upperCaseName] = $definedName;
+        } else {
+            // local scope
+            $this->definedNames[$definedName->getScope()->getTitle() . '!' . $upperCaseName] = $definedName;
+        }
+    }
+
+    /**
+     * Get named range.
+     *
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
+     */
+    public function getNamedRange(string $namedRange, ?Worksheet $worksheet = null): ?NamedRange
+    {
+        $returnValue = null;
+
+        if ($namedRange !== '') {
+            $namedRange = StringHelper::strToUpper($namedRange);
+            // first look for global named range
+            $returnValue = $this->getGlobalDefinedNameByType($namedRange, self::DEFINED_NAME_IS_RANGE);
+            // then look for local named range (has priority over global named range if both names exist)
+            $returnValue = $this->getLocalDefinedNameByType($namedRange, self::DEFINED_NAME_IS_RANGE, $worksheet) ?: $returnValue;
+        }
+
+        return $returnValue instanceof NamedRange ? $returnValue : null;
+    }
+
+    /**
+     * Get named formula.
+     *
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
+     */
+    public function getNamedFormula(string $namedFormula, ?Worksheet $worksheet = null): ?NamedFormula
+    {
+        $returnValue = null;
+
+        if ($namedFormula !== '') {
+            $namedFormula = StringHelper::strToUpper($namedFormula);
+            // first look for global named formula
+            $returnValue = $this->getGlobalDefinedNameByType($namedFormula, self::DEFINED_NAME_IS_FORMULA);
+            // then look for local named formula (has priority over global named formula if both names exist)
+            $returnValue = $this->getLocalDefinedNameByType($namedFormula, self::DEFINED_NAME_IS_FORMULA, $worksheet) ?: $returnValue;
+        }
+
+        return $returnValue instanceof NamedFormula ? $returnValue : null;
+    }
+
+    private function getGlobalDefinedNameByType(string $name, bool $type): ?DefinedName
+    {
+        if (isset($this->definedNames[$name]) && $this->definedNames[$name]->isFormula() === $type) {
+            return $this->definedNames[$name];
+        }
+
+        return null;
+    }
+
+    private function getLocalDefinedNameByType(string $name, bool $type, ?Worksheet $worksheet = null): ?DefinedName
+    {
+        if (
+            ($worksheet !== null) && isset($this->definedNames[$worksheet->getTitle() . '!' . $name])
+            && $this->definedNames[$worksheet->getTitle() . '!' . $name]->isFormula() === $type
+        ) {
+            return $this->definedNames[$worksheet->getTitle() . '!' . $name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get named range.
+     *
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
+     */
+    public function getDefinedName(string $definedName, ?Worksheet $worksheet = null): ?DefinedName
+    {
+        $returnValue = null;
+
+        if ($definedName !== '') {
+            $definedName = StringHelper::strToUpper($definedName);
+            // first look for global defined name
+            if (isset($this->definedNames[$definedName])) {
+                $returnValue = $this->definedNames[$definedName];
+            }
+
+            // then look for local defined name (has priority over global defined name if both names exist)
+            if (($worksheet !== null) && isset($this->definedNames[$worksheet->getTitle() . '!' . $definedName])) {
+                $returnValue = $this->definedNames[$worksheet->getTitle() . '!' . $definedName];
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Remove named range.
+     *
+     * @param null|Worksheet $worksheet scope: use null for global scope
+     *
+     * @return $this
+     */
+    public function removeNamedRange(string $namedRange, ?Worksheet $worksheet = null): self
+    {
+        if ($this->getNamedRange($namedRange, $worksheet) === null) {
+            return $this;
+        }
+
+        return $this->removeDefinedName($namedRange, $worksheet);
+    }
+
+    /**
+     * Remove named formula.
+     *
+     * @param null|Worksheet $worksheet scope: use null for global scope
+     *
+     * @return $this
+     */
+    public function removeNamedFormula(string $namedFormula, ?Worksheet $worksheet = null): self
+    {
+        if ($this->getNamedFormula($namedFormula, $worksheet) === null) {
+            return $this;
+        }
+
+        return $this->removeDefinedName($namedFormula, $worksheet);
+    }
+
+    /**
+     * Remove defined name.
+     *
+     * @param null|Worksheet $worksheet scope: use null for global scope
+     *
+     * @return $this
+     */
+    public function removeDefinedName(string $definedName, ?Worksheet $worksheet = null): self
+    {
+        $definedName = StringHelper::strToUpper($definedName);
+
+        if ($worksheet === null) {
+            if (isset($this->definedNames[$definedName])) {
+                unset($this->definedNames[$definedName]);
+            }
+        } else {
+            if (isset($this->definedNames[$worksheet->getTitle() . '!' . $definedName])) {
+                unset($this->definedNames[$worksheet->getTitle() . '!' . $definedName]);
+            } elseif (isset($this->definedNames[$definedName])) {
+                unset($this->definedNames[$definedName]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get worksheet iterator.
+     */
+    public function getWorksheetIterator(): Iterator
+    {
+        return new Iterator($this);
+    }
+
+    /**
+     * Copy workbook (!= clone!).
+     */
+    public function copy(): self
+    {
+        $filename = File::temporaryFilename();
+        $writer = new XlsxWriter($this);
+        $writer->setIncludeCharts(true);
+        $writer->save($filename);
+
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $reloadedSpreadsheet = $reader->load($filename);
+        unlink($filename);
+
+        return $reloadedSpreadsheet;
+    }
+
+    public function __clone()
+    {
+        throw new Exception(
+            'Do not use clone on spreadsheet. Use spreadsheet->copy() instead.'
+        );
+    }
+
+    /**
+     * Get the workbook collection of cellXfs.
+     *
+     * @return Style[]
+     */
+    public function getCellXfCollection(): array
+    {
+        return $this->cellXfCollection;
+    }
+
+    /**
+     * Get cellXf by index.
+     */
+    public function getCellXfByIndex(int $cellStyleIndex): Style
+    {
+        return $this->cellXfCollection[$cellStyleIndex];
+    }
+
+    /**
+     * Get cellXf by hash code.
+     *
+     * @return false|Style
+     */
+    public function getCellXfByHashCode(string $hashcode): bool|Style
+    {
+        foreach ($this->cellXfCollection as $cellXf) {
+            if ($cellXf->getHashCode() === $hashcode) {
+                return $cellXf;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if style exists in style collection.
+     */
+    public function cellXfExists(Style $cellStyleIndex): bool
+    {
+        return in_array($cellStyleIndex, $this->cellXfCollection, true);
+    }
+
+    /**
+     * Get default style.
+     */
+    public function getDefaultStyle(): Style
+    {
+        if (isset($this->cellXfCollection[0])) {
+            return $this->cellXfCollection[0];
+        }
+
+        throw new Exception('No default style found for this workbook');
+    }
+
+    /**
+     * Add a cellXf to the workbook.
+     */
+    public function addCellXf(Style $style): void
+    {
+        $this->cellXfCollection[] = $style;
+        $style->setIndex(count($this->cellXfCollection) - 1);
+    }
+
+    /**
+     * Remove cellXf by index. It is ensured that all cells get their xf index updated.
+     *
+     * @param int $cellStyleIndex Index to cellXf
+     */
+    public function removeCellXfByIndex(int $cellStyleIndex): void
+    {
+        if ($cellStyleIndex > count($this->cellXfCollection) - 1) {
+            throw new Exception('CellXf index is out of bounds.');
+        }
+
+        // first remove the cellXf
+        array_splice($this->cellXfCollection, $cellStyleIndex, 1);
+
+        // then update cellXf indexes for cells
+        foreach ($this->workSheetCollection as $worksheet) {
+            foreach ($worksheet->getCoordinates(false) as $coordinate) {
+                $cell = $worksheet->getCell($coordinate);
+                $xfIndex = $cell->getXfIndex();
+                if ($xfIndex > $cellStyleIndex) {
+                    // decrease xf index by 1
+                    $cell->setXfIndex($xfIndex - 1);
+                } elseif ($xfIndex == $cellStyleIndex) {
+                    // set to default xf index 0
+                    $cell->setXfIndex(0);
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the cellXf supervisor.
+     */
+    public function getCellXfSupervisor(): Style
+    {
+        return $this->cellXfSupervisor;
+    }
+
+    /**
+     * Get the workbook collection of cellStyleXfs.
+     *
+     * @return Style[]
+     */
+    public function getCellStyleXfCollection(): array
+    {
+        return $this->cellStyleXfCollection;
+    }
+
+    /**
+     * Get cellStyleXf by index.
+     *
+     * @param int $cellStyleIndex Index to cellXf
+     */
+    public function getCellStyleXfByIndex(int $cellStyleIndex): Style
+    {
+        return $this->cellStyleXfCollection[$cellStyleIndex];
+    }
+
+    /**
+     * Get cellStyleXf by hash code.
+     *
+     * @return false|Style
+     */
+    public function getCellStyleXfByHashCode(string $hashcode): bool|Style
+    {
+        foreach ($this->cellStyleXfCollection as $cellStyleXf) {
+            if ($cellStyleXf->getHashCode() === $hashcode) {
+                return $cellStyleXf;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Add a cellStyleXf to the workbook.
+     */
+    public function addCellStyleXf(Style $style): void
+    {
+        $this->cellStyleXfCollection[] = $style;
+        $style->setIndex(count($this->cellStyleXfCollection) - 1);
+    }
+
+    /**
+     * Remove cellStyleXf by index.
+     *
+     * @param int $cellStyleIndex Index to cellXf
+     */
+    public function removeCellStyleXfByIndex(int $cellStyleIndex): void
+    {
+        if ($cellStyleIndex > count($this->cellStyleXfCollection) - 1) {
+            throw new Exception('CellStyleXf index is out of bounds.');
+        }
+        array_splice($this->cellStyleXfCollection, $cellStyleIndex, 1);
+    }
+
+    /**
+     * Eliminate all unneeded cellXf and afterwards update the xfIndex for all cells
+     * and columns in the workbook.
+     */
+    public function garbageCollect(): void
+    {
+        // how many references are there to each cellXf ?
+        $countReferencesCellXf = [];
+        foreach ($this->cellXfCollection as $index => $cellXf) {
+            $countReferencesCellXf[$index] = 0;
+        }
+
+        foreach ($this->getWorksheetIterator() as $sheet) {
+            // from cells
+            foreach ($sheet->getCoordinates(false) as $coordinate) {
+                $cell = $sheet->getCell($coordinate);
+                ++$countReferencesCellXf[$cell->getXfIndex()];
+            }
+
+            // from row dimensions
+            foreach ($sheet->getRowDimensions() as $rowDimension) {
+                if ($rowDimension->getXfIndex() !== null) {
+                    ++$countReferencesCellXf[$rowDimension->getXfIndex()];
+                }
+            }
+
+            // from column dimensions
+            foreach ($sheet->getColumnDimensions() as $columnDimension) {
+                ++$countReferencesCellXf[$columnDimension->getXfIndex()];
+            }
+        }
+
+        // remove cellXfs without references and create mapping so we can update xfIndex
+        // for all cells and columns
+        $countNeededCellXfs = 0;
+        $map = [];
+        foreach ($this->cellXfCollection as $index => $cellXf) {
+            if ($countReferencesCellXf[$index] > 0 || $index == 0) { // we must never remove the first cellXf
+                ++$countNeededCellXfs;
+            } else {
+                unset($this->cellXfCollection[$index]);
+            }
+            $map[$index] = $countNeededCellXfs - 1;
+        }
+        $this->cellXfCollection = array_values($this->cellXfCollection);
+
+        // update the index for all cellXfs
+        foreach ($this->cellXfCollection as $i => $cellXf) {
+            $cellXf->setIndex($i);
+        }
+
+        // make sure there is always at least one cellXf (there should be)
+        if (empty($this->cellXfCollection)) {
+            $this->cellXfCollection[] = new Style();
+        }
+
+        // update the xfIndex for all cells, row dimensions, column dimensions
+        foreach ($this->getWorksheetIterator() as $sheet) {
+            // for all cells
+            foreach ($sheet->getCoordinates(false) as $coordinate) {
+                $cell = $sheet->getCell($coordinate);
+                $cell->setXfIndex($map[$cell->getXfIndex()]);
+            }
+
+            // for all row dimensions
+            foreach ($sheet->getRowDimensions() as $rowDimension) {
+                if ($rowDimension->getXfIndex() !== null) {
+                    $rowDimension->setXfIndex($map[$rowDimension->getXfIndex()]);
+                }
+            }
+
+            // for all column dimensions
+            foreach ($sheet->getColumnDimensions() as $columnDimension) {
+                $columnDimension->setXfIndex($map[$columnDimension->getXfIndex()]);
+            }
+
+            // also do garbage collection for all the sheets
+            $sheet->garbageCollect();
+        }
+    }
+
+    /**
+     * Return the unique ID value assigned to this spreadsheet workbook.
+     */
+    public function getID(): string
+    {
+        return $this->uniqueID;
+    }
+
+    /**
+     * Get the visibility of the horizonal scroll bar in the application.
+     *
+     * @return bool True if horizonal scroll bar is visible
+     */
+    public function getShowHorizontalScroll(): bool
+    {
+        return $this->showHorizontalScroll;
+    }
+
+    /**
+     * Set the visibility of the horizonal scroll bar in the application.
+     *
+     * @param bool $showHorizontalScroll True if horizonal scroll bar is visible
+     */
+    public function setShowHorizontalScroll(bool $showHorizontalScroll): void
+    {
+        $this->showHorizontalScroll = (bool) $showHorizontalScroll;
+    }
+
+    /**
+     * Get the visibility of the vertical scroll bar in the application.
+     *
+     * @return bool True if vertical scroll bar is visible
+     */
+    public function getShowVerticalScroll(): bool
+    {
+        return $this->showVerticalScroll;
+    }
+
+    /**
+     * Set the visibility of the vertical scroll bar in the application.
+     *
+     * @param bool $showVerticalScroll True if vertical scroll bar is visible
+     */
+    public function setShowVerticalScroll(bool $showVerticalScroll): void
+    {
+        $this->showVerticalScroll = (bool) $showVerticalScroll;
+    }
+
+    /**
+     * Get the visibility of the sheet tabs in the application.
+     *
+     * @return bool True if the sheet tabs are visible
+     */
+    public function getShowSheetTabs(): bool
+    {
+        return $this->showSheetTabs;
+    }
+
+    /**
+     * Set the visibility of the sheet tabs  in the application.
+     *
+     * @param bool $showSheetTabs True if sheet tabs are visible
+     */
+    public function setShowSheetTabs(bool $showSheetTabs): void
+    {
+        $this->showSheetTabs = (bool) $showSheetTabs;
+    }
+
+    /**
+     * Return whether the workbook window is minimized.
+     *
+     * @return bool true if workbook window is minimized
+     */
+    public function getMinimized(): bool
+    {
+        return $this->minimized;
+    }
+
+    /**
+     * Set whether the workbook window is minimized.
+     *
+     * @param bool $minimized true if workbook window is minimized
+     */
+    public function setMinimized(bool $minimized): void
+    {
+        $this->minimized = (bool) $minimized;
+    }
+
+    /**
+     * Return whether to group dates when presenting the user with
+     * filtering optiomd in the user interface.
+     *
+     * @return bool true if workbook window is minimized
+     */
+    public function getAutoFilterDateGrouping(): bool
+    {
+        return $this->autoFilterDateGrouping;
+    }
+
+    /**
+     * Set whether to group dates when presenting the user with
+     * filtering optiomd in the user interface.
+     *
+     * @param bool $autoFilterDateGrouping true if workbook window is minimized
+     */
+    public function setAutoFilterDateGrouping(bool $autoFilterDateGrouping): void
+    {
+        $this->autoFilterDateGrouping = (bool) $autoFilterDateGrouping;
+    }
+
+    /**
+     * Return the first sheet in the book view.
+     *
+     * @return int First sheet in book view
+     */
+    public function getFirstSheetIndex(): int
+    {
+        return $this->firstSheetIndex;
+    }
+
+    /**
+     * Set the first sheet in the book view.
+     *
+     * @param int $firstSheetIndex First sheet in book view
+     */
+    public function setFirstSheetIndex(int $firstSheetIndex): void
+    {
+        if ($firstSheetIndex >= 0) {
+            $this->firstSheetIndex = (int) $firstSheetIndex;
+        } else {
+            throw new Exception('First sheet index must be a positive integer.');
+        }
+    }
+
+    /**
+     * Return the visibility status of the workbook.
+     *
+     * This may be one of the following three values:
+     * - visibile
+     *
+     * @return string Visible status
+     */
+    public function getVisibility(): string
+    {
+        return $this->visibility;
+    }
+
+    /**
+     * Set the visibility status of the workbook.
+     *
+     * Valid values are:
+     *  - 'visible' (self::VISIBILITY_VISIBLE):
+     *       Workbook window is visible
+     *  - 'hidden' (self::VISIBILITY_HIDDEN):
+     *       Workbook window is hidden, but can be shown by the user
+     *       via the user interface
+     *  - 'veryHidden' (self::VISIBILITY_VERY_HIDDEN):
+     *       Workbook window is hidden and cannot be shown in the
+     *       user interface.
+     *
+     * @param null|string $visibility visibility status of the workbook
+     */
+    public function setVisibility(?string $visibility): void
+    {
+        if ($visibility === null) {
+            $visibility = self::VISIBILITY_VISIBLE;
+        }
+
+        if (in_array($visibility, self::WORKBOOK_VIEW_VISIBILITY_VALUES)) {
+            $this->visibility = $visibility;
+        } else {
+            throw new Exception('Invalid visibility value.');
+        }
+    }
+
+    /**
+     * Get the ratio between the workbook tabs bar and the horizontal scroll bar.
+     * TabRatio is assumed to be out of 1000 of the horizontal window width.
+     *
+     * @return int Ratio between the workbook tabs bar and the horizontal scroll bar
+     */
+    public function getTabRatio(): int
+    {
+        return $this->tabRatio;
+    }
+
+    /**
+     * Set the ratio between the workbook tabs bar and the horizontal scroll bar
+     * TabRatio is assumed to be out of 1000 of the horizontal window width.
+     *
+     * @param int $tabRatio Ratio between the tabs bar and the horizontal scroll bar
+     */
+    public function setTabRatio(int $tabRatio): void
+    {
+        if ($tabRatio >= 0 && $tabRatio <= 1000) {
+            $this->tabRatio = (int) $tabRatio;
+        } else {
+            throw new Exception('Tab ratio must be between 0 and 1000.');
+        }
+    }
+
+    public function reevaluateAutoFilters(bool $resetToMax): void
+    {
+        foreach ($this->workSheetCollection as $sheet) {
+            $filter = $sheet->getAutoFilter();
+            if (!empty($filter->getRange())) {
+                if ($resetToMax) {
+                    $filter->setRangeToMaxRow();
+                }
+                $filter->showHideRows();
+            }
+        }
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function __serialize(): array
+    {
+        throw new Exception('Spreadsheet objects cannot be serialized');
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function jsonSerialize(): mixed
+    {
+        throw new Exception('Spreadsheet objects cannot be json encoded');
+    }
+
+    public function resetThemeFonts(): void
+    {
+        $majorFontLatin = $this->theme->getMajorFontLatin();
+        $minorFontLatin = $this->theme->getMinorFontLatin();
+        foreach ($this->cellXfCollection as $cellStyleXf) {
+            $scheme = $cellStyleXf->getFont()->getScheme();
+            if ($scheme === 'major') {
+                $cellStyleXf->getFont()->setName($majorFontLatin)->setScheme($scheme);
+            } elseif ($scheme === 'minor') {
+                $cellStyleXf->getFont()->setName($minorFontLatin)->setScheme($scheme);
+            }
+        }
+        foreach ($this->cellStyleXfCollection as $cellStyleXf) {
+            $scheme = $cellStyleXf->getFont()->getScheme();
+            if ($scheme === 'major') {
+                $cellStyleXf->getFont()->setName($majorFontLatin)->setScheme($scheme);
+            } elseif ($scheme === 'minor') {
+                $cellStyleXf->getFont()->setName($minorFontLatin)->setScheme($scheme);
+            }
+        }
+    }
+
+    public function getTableByName(string $tableName): ?Table
+    {
+        $table = null;
+        foreach ($this->workSheetCollection as $sheet) {
+            $table = $sheet->getTableByName($tableName);
+            if ($table !== null) {
+                break;
+            }
+        }
+
+        return $table;
+    }
+
+    /**
+     * @return bool Success or failure
+     */
+    public function setExcelCalendar(int $baseYear): bool
+    {
+        if (($baseYear === Date::CALENDAR_WINDOWS_1900) || ($baseYear === Date::CALENDAR_MAC_1904)) {
+            $this->excelCalendar = $baseYear;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return int Excel base date (1900 or 1904)
+     */
+    public function getExcelCalendar(): int
+    {
+        return $this->excelCalendar;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
new file mode 100644
index 00000000..3aed77c6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
@@ -0,0 +1,501 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class Alignment extends Supervisor
+{
+    // Horizontal alignment styles
+    const HORIZONTAL_GENERAL = 'general';
+    const HORIZONTAL_LEFT = 'left';
+    const HORIZONTAL_RIGHT = 'right';
+    const HORIZONTAL_CENTER = 'center';
+    const HORIZONTAL_CENTER_CONTINUOUS = 'centerContinuous';
+    const HORIZONTAL_JUSTIFY = 'justify';
+    const HORIZONTAL_FILL = 'fill';
+    const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only
+    private const HORIZONTAL_CENTER_CONTINUOUS_LC = 'centercontinuous';
+    // Mapping for horizontal alignment
+    const HORIZONTAL_ALIGNMENT_FOR_XLSX = [
+        self::HORIZONTAL_LEFT => self::HORIZONTAL_LEFT,
+        self::HORIZONTAL_RIGHT => self::HORIZONTAL_RIGHT,
+        self::HORIZONTAL_CENTER => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_CENTER_CONTINUOUS => self::HORIZONTAL_CENTER_CONTINUOUS,
+        self::HORIZONTAL_JUSTIFY => self::HORIZONTAL_JUSTIFY,
+        self::HORIZONTAL_FILL => self::HORIZONTAL_FILL,
+        self::HORIZONTAL_DISTRIBUTED => self::HORIZONTAL_DISTRIBUTED,
+    ];
+    // Mapping for horizontal alignment CSS
+    const HORIZONTAL_ALIGNMENT_FOR_HTML = [
+        self::HORIZONTAL_LEFT => self::HORIZONTAL_LEFT,
+        self::HORIZONTAL_RIGHT => self::HORIZONTAL_RIGHT,
+        self::HORIZONTAL_CENTER => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_CENTER_CONTINUOUS => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_JUSTIFY => self::HORIZONTAL_JUSTIFY,
+        //self::HORIZONTAL_FILL => self::HORIZONTAL_FILL, // no reasonable equivalent for fill
+        self::HORIZONTAL_DISTRIBUTED => self::HORIZONTAL_JUSTIFY,
+    ];
+
+    // Vertical alignment styles
+    const VERTICAL_BOTTOM = 'bottom';
+    const VERTICAL_TOP = 'top';
+    const VERTICAL_CENTER = 'center';
+    const VERTICAL_JUSTIFY = 'justify';
+    const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only
+    // Vertical alignment CSS
+    private const VERTICAL_BASELINE = 'baseline';
+    private const VERTICAL_MIDDLE = 'middle';
+    private const VERTICAL_SUB = 'sub';
+    private const VERTICAL_SUPER = 'super';
+    private const VERTICAL_TEXT_BOTTOM = 'text-bottom';
+    private const VERTICAL_TEXT_TOP = 'text-top';
+
+    // Mapping for vertical alignment
+    const VERTICAL_ALIGNMENT_FOR_XLSX = [
+        self::VERTICAL_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TOP => self::VERTICAL_TOP,
+        self::VERTICAL_CENTER => self::VERTICAL_CENTER,
+        self::VERTICAL_JUSTIFY => self::VERTICAL_JUSTIFY,
+        self::VERTICAL_DISTRIBUTED => self::VERTICAL_DISTRIBUTED,
+        // css settings that arent't in sync with Excel
+        self::VERTICAL_BASELINE => self::VERTICAL_BOTTOM,
+        self::VERTICAL_MIDDLE => self::VERTICAL_CENTER,
+        self::VERTICAL_SUB => self::VERTICAL_BOTTOM,
+        self::VERTICAL_SUPER => self::VERTICAL_TOP,
+        self::VERTICAL_TEXT_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TEXT_TOP => self::VERTICAL_TOP,
+    ];
+
+    // Mapping for vertical alignment for Html
+    const VERTICAL_ALIGNMENT_FOR_HTML = [
+        self::VERTICAL_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TOP => self::VERTICAL_TOP,
+        self::VERTICAL_CENTER => self::VERTICAL_MIDDLE,
+        self::VERTICAL_JUSTIFY => self::VERTICAL_MIDDLE,
+        self::VERTICAL_DISTRIBUTED => self::VERTICAL_MIDDLE,
+        // css settings that arent't in sync with Excel
+        self::VERTICAL_BASELINE => self::VERTICAL_BASELINE,
+        self::VERTICAL_MIDDLE => self::VERTICAL_MIDDLE,
+        self::VERTICAL_SUB => self::VERTICAL_SUB,
+        self::VERTICAL_SUPER => self::VERTICAL_SUPER,
+        self::VERTICAL_TEXT_BOTTOM => self::VERTICAL_TEXT_BOTTOM,
+        self::VERTICAL_TEXT_TOP => self::VERTICAL_TEXT_TOP,
+    ];
+
+    // Read order
+    const READORDER_CONTEXT = 0;
+    const READORDER_LTR = 1;
+    const READORDER_RTL = 2;
+
+    // Special value for Text Rotation
+    const TEXTROTATION_STACK_EXCEL = 255;
+    const TEXTROTATION_STACK_PHPSPREADSHEET = -165; // 90 - 255
+
+    /**
+     * Horizontal alignment.
+     */
+    protected ?string $horizontal = self::HORIZONTAL_GENERAL;
+
+    /**
+     * Vertical alignment.
+     */
+    protected ?string $vertical = self::VERTICAL_BOTTOM;
+
+    /**
+     * Text rotation.
+     */
+    protected ?int $textRotation = 0;
+
+    /**
+     * Wrap text.
+     */
+    protected bool $wrapText = false;
+
+    /**
+     * Shrink to fit.
+     */
+    protected bool $shrinkToFit = false;
+
+    /**
+     * Indent - only possible with horizontal alignment left and right.
+     */
+    protected int $indent = 0;
+
+    /**
+     * Read order.
+     */
+    protected int $readOrder = 0;
+
+    /**
+     * Create a new Alignment.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                       Leave this value at default unless you understand exactly what
+     *                                          its ramifications are
+     * @param bool $isConditional Flag indicating if this is a conditional style or not
+     *                                       Leave this value at default unless you understand exactly what
+     *                                          its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        if ($isConditional) {
+            $this->horizontal = null;
+            $this->vertical = null;
+            $this->textRotation = null;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getAlignment();
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        return ['alignment' => $array];
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getAlignment()->applyFromArray(
+     *        [
+     *            'horizontal'   => \PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER,
+     *            'vertical'     => \PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER,
+     *            'textRotation' => 0,
+     *            'wrapText'     => TRUE
+     *        ]
+     * );
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray): static
+    {
+        if ($this->isSupervisor) {
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())
+                ->applyFromArray($this->getStyleArray($styleArray));
+        } else {
+            if (isset($styleArray['horizontal'])) {
+                $this->setHorizontal($styleArray['horizontal']);
+            }
+            if (isset($styleArray['vertical'])) {
+                $this->setVertical($styleArray['vertical']);
+            }
+            if (isset($styleArray['textRotation'])) {
+                $this->setTextRotation($styleArray['textRotation']);
+            }
+            if (isset($styleArray['wrapText'])) {
+                $this->setWrapText($styleArray['wrapText']);
+            }
+            if (isset($styleArray['shrinkToFit'])) {
+                $this->setShrinkToFit($styleArray['shrinkToFit']);
+            }
+            if (isset($styleArray['indent'])) {
+                $this->setIndent($styleArray['indent']);
+            }
+            if (isset($styleArray['readOrder'])) {
+                $this->setReadOrder($styleArray['readOrder']);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Horizontal.
+     */
+    public function getHorizontal(): null|string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHorizontal();
+        }
+
+        return $this->horizontal;
+    }
+
+    /**
+     * Set Horizontal.
+     *
+     * @param string $horizontalAlignment see self::HORIZONTAL_*
+     *
+     * @return $this
+     */
+    public function setHorizontal(string $horizontalAlignment): static
+    {
+        $horizontalAlignment = strtolower($horizontalAlignment);
+        if ($horizontalAlignment === self::HORIZONTAL_CENTER_CONTINUOUS_LC) {
+            $horizontalAlignment = self::HORIZONTAL_CENTER_CONTINUOUS;
+        }
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['horizontal' => $horizontalAlignment]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->horizontal = $horizontalAlignment;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Vertical.
+     */
+    public function getVertical(): null|string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getVertical();
+        }
+
+        return $this->vertical;
+    }
+
+    /**
+     * Set Vertical.
+     *
+     * @param string $verticalAlignment see self::VERTICAL_*
+     *
+     * @return $this
+     */
+    public function setVertical(string $verticalAlignment): static
+    {
+        $verticalAlignment = strtolower($verticalAlignment);
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['vertical' => $verticalAlignment]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->vertical = $verticalAlignment;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get TextRotation.
+     */
+    public function getTextRotation(): null|int
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getTextRotation();
+        }
+
+        return $this->textRotation;
+    }
+
+    /**
+     * Set TextRotation.
+     *
+     * @return $this
+     */
+    public function setTextRotation(int $angleInDegrees): static
+    {
+        // Excel2007 value 255 => PhpSpreadsheet value -165
+        if ($angleInDegrees == self::TEXTROTATION_STACK_EXCEL) {
+            $angleInDegrees = self::TEXTROTATION_STACK_PHPSPREADSHEET;
+        }
+
+        // Set rotation
+        if (($angleInDegrees >= -90 && $angleInDegrees <= 90) || $angleInDegrees == self::TEXTROTATION_STACK_PHPSPREADSHEET) {
+            if ($this->isSupervisor) {
+                $styleArray = $this->getStyleArray(['textRotation' => $angleInDegrees]);
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            } else {
+                $this->textRotation = $angleInDegrees;
+            }
+        } else {
+            throw new PhpSpreadsheetException('Text rotation should be a value between -90 and 90.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Wrap Text.
+     */
+    public function getWrapText(): bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getWrapText();
+        }
+
+        return $this->wrapText;
+    }
+
+    /**
+     * Set Wrap Text.
+     *
+     * @return $this
+     */
+    public function setWrapText(bool $wrapped): static
+    {
+        if ($wrapped == '') {
+            $wrapped = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['wrapText' => $wrapped]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->wrapText = $wrapped;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Shrink to fit.
+     */
+    public function getShrinkToFit(): bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getShrinkToFit();
+        }
+
+        return $this->shrinkToFit;
+    }
+
+    /**
+     * Set Shrink to fit.
+     *
+     * @return $this
+     */
+    public function setShrinkToFit(bool $shrink): static
+    {
+        if ($shrink == '') {
+            $shrink = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['shrinkToFit' => $shrink]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->shrinkToFit = $shrink;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get indent.
+     */
+    public function getIndent(): int
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getIndent();
+        }
+
+        return $this->indent;
+    }
+
+    /**
+     * Set indent.
+     *
+     * @return $this
+     */
+    public function setIndent(int $indent): static
+    {
+        if ($indent > 0) {
+            if (
+                $this->getHorizontal() != self::HORIZONTAL_GENERAL
+                && $this->getHorizontal() != self::HORIZONTAL_LEFT
+                && $this->getHorizontal() != self::HORIZONTAL_RIGHT
+                && $this->getHorizontal() != self::HORIZONTAL_DISTRIBUTED
+            ) {
+                $indent = 0; // indent not supported
+            }
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['indent' => $indent]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->indent = $indent;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get read order.
+     */
+    public function getReadOrder(): int
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getReadOrder();
+        }
+
+        return $this->readOrder;
+    }
+
+    /**
+     * Set read order.
+     *
+     * @return $this
+     */
+    public function setReadOrder(int $readOrder): static
+    {
+        if ($readOrder < 0 || $readOrder > 2) {
+            $readOrder = 0;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['readOrder' => $readOrder]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->readOrder = $readOrder;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+
+        return md5(
+            $this->horizontal
+            . $this->vertical
+            . $this->textRotation
+            . ($this->wrapText ? 't' : 'f')
+            . ($this->shrinkToFit ? 't' : 'f')
+            . $this->indent
+            . $this->readOrder
+            . __CLASS__
+        );
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'horizontal', $this->getHorizontal());
+        $this->exportArray2($exportedArray, 'indent', $this->getIndent());
+        $this->exportArray2($exportedArray, 'readOrder', $this->getReadOrder());
+        $this->exportArray2($exportedArray, 'shrinkToFit', $this->getShrinkToFit());
+        $this->exportArray2($exportedArray, 'textRotation', $this->getTextRotation());
+        $this->exportArray2($exportedArray, 'vertical', $this->getVertical());
+        $this->exportArray2($exportedArray, 'wrapText', $this->getWrapText());
+
+        return $exportedArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php
new file mode 100644
index 00000000..07162566
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php
@@ -0,0 +1,221 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class Border extends Supervisor
+{
+    // Border style
+    const BORDER_NONE = 'none';
+    const BORDER_DASHDOT = 'dashDot';
+    const BORDER_DASHDOTDOT = 'dashDotDot';
+    const BORDER_DASHED = 'dashed';
+    const BORDER_DOTTED = 'dotted';
+    const BORDER_DOUBLE = 'double';
+    const BORDER_HAIR = 'hair';
+    const BORDER_MEDIUM = 'medium';
+    const BORDER_MEDIUMDASHDOT = 'mediumDashDot';
+    const BORDER_MEDIUMDASHDOTDOT = 'mediumDashDotDot';
+    const BORDER_MEDIUMDASHED = 'mediumDashed';
+    const BORDER_SLANTDASHDOT = 'slantDashDot';
+    const BORDER_THICK = 'thick';
+    const BORDER_THIN = 'thin';
+    const BORDER_OMIT = 'omit'; // should be used only for Conditional
+
+    /**
+     * Border style.
+     */
+    protected string $borderStyle = self::BORDER_NONE;
+
+    /**
+     * Border color.
+     */
+    protected Color $color;
+
+    public ?int $colorIndex = null;
+
+    /**
+     * Create a new Border.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        $this->color = new Color(Color::COLOR_BLACK, $isSupervisor);
+
+        // bind parent if we are a supervisor
+        if ($isSupervisor) {
+            $this->color->bindParent($this, 'color');
+        }
+        if ($isConditional) {
+            $this->borderStyle = self::BORDER_OMIT;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        /** @var Borders $sharedComponent */
+        $sharedComponent = $parent->getSharedComponent();
+
+        return match ($this->parentPropertyName) {
+            'bottom' => $sharedComponent->getBottom(),
+            'diagonal' => $sharedComponent->getDiagonal(),
+            'left' => $sharedComponent->getLeft(),
+            'right' => $sharedComponent->getRight(),
+            'top' => $sharedComponent->getTop(),
+            default => throw new PhpSpreadsheetException('Cannot get shared component for a pseudo-border.'),
+        };
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getStyleArray([$this->parentPropertyName => $array]);
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getBorders()->getTop()->applyFromArray(
+     *        [
+     *            'borderStyle' => Border::BORDER_DASHDOT,
+     *            'color' => [
+     *                'rgb' => '808080'
+     *            ]
+     *        ]
+     * );
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray): static
+    {
+        if ($this->isSupervisor) {
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
+        } else {
+            if (isset($styleArray['borderStyle'])) {
+                $this->setBorderStyle($styleArray['borderStyle']);
+            }
+            if (isset($styleArray['color'])) {
+                $this->getColor()->applyFromArray($styleArray['color']);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Border style.
+     */
+    public function getBorderStyle(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getBorderStyle();
+        }
+
+        return $this->borderStyle;
+    }
+
+    /**
+     * Set Border style.
+     *
+     * @param bool|string $style When passing a boolean, FALSE equates Border::BORDER_NONE
+     *                                and TRUE to Border::BORDER_MEDIUM
+     *
+     * @return $this
+     */
+    public function setBorderStyle(bool|string $style): static
+    {
+        if (empty($style)) {
+            $style = self::BORDER_NONE;
+        } elseif (is_bool($style)) {
+            $style = self::BORDER_MEDIUM;
+        }
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['borderStyle' => $style]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->borderStyle = $style;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Border Color.
+     */
+    public function getColor(): Color
+    {
+        return $this->color;
+    }
+
+    /**
+     * Set Border Color.
+     *
+     * @return $this
+     */
+    public function setColor(Color $color): static
+    {
+        // make sure parameter is a real color and not a supervisor
+        $color = $color->getIsSupervisor() ? $color->getSharedComponent() : $color;
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getColor()->getStyleArray(['argb' => $color->getARGB()]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->color = $color;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+
+        return md5(
+            $this->borderStyle
+            . $this->color->getHashCode()
+            . __CLASS__
+        );
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'borderStyle', $this->getBorderStyle());
+        $this->exportArray2($exportedArray, 'color', $this->getColor());
+
+        return $exportedArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php
new file mode 100644
index 00000000..93a95e67
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php
@@ -0,0 +1,374 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class Borders extends Supervisor
+{
+    // Diagonal directions
+    const DIAGONAL_NONE = 0;
+    const DIAGONAL_UP = 1;
+    const DIAGONAL_DOWN = 2;
+    const DIAGONAL_BOTH = 3;
+
+    /**
+     * Left.
+     */
+    protected Border $left;
+
+    /**
+     * Right.
+     */
+    protected Border $right;
+
+    /**
+     * Top.
+     */
+    protected Border $top;
+
+    /**
+     * Bottom.
+     */
+    protected Border $bottom;
+
+    /**
+     * Diagonal.
+     */
+    protected Border $diagonal;
+
+    /**
+     * DiagonalDirection.
+     */
+    protected int $diagonalDirection;
+
+    /**
+     * All borders pseudo-border. Only applies to supervisor.
+     */
+    protected Border $allBorders;
+
+    /**
+     * Outline pseudo-border. Only applies to supervisor.
+     */
+    protected Border $outline;
+
+    /**
+     * Inside pseudo-border. Only applies to supervisor.
+     */
+    protected Border $inside;
+
+    /**
+     * Vertical pseudo-border. Only applies to supervisor.
+     */
+    protected Border $vertical;
+
+    /**
+     * Horizontal pseudo-border. Only applies to supervisor.
+     */
+    protected Border $horizontal;
+
+    /**
+     * Create a new Borders.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        $this->left = new Border($isSupervisor, $isConditional);
+        $this->right = new Border($isSupervisor, $isConditional);
+        $this->top = new Border($isSupervisor, $isConditional);
+        $this->bottom = new Border($isSupervisor, $isConditional);
+        $this->diagonal = new Border($isSupervisor, $isConditional);
+        $this->diagonalDirection = self::DIAGONAL_NONE;
+
+        // Specially for supervisor
+        if ($isSupervisor) {
+            // Initialize pseudo-borders
+            $this->allBorders = new Border(true, $isConditional);
+            $this->outline = new Border(true, $isConditional);
+            $this->inside = new Border(true, $isConditional);
+            $this->vertical = new Border(true, $isConditional);
+            $this->horizontal = new Border(true, $isConditional);
+
+            // bind parent if we are a supervisor
+            $this->left->bindParent($this, 'left');
+            $this->right->bindParent($this, 'right');
+            $this->top->bindParent($this, 'top');
+            $this->bottom->bindParent($this, 'bottom');
+            $this->diagonal->bindParent($this, 'diagonal');
+            $this->allBorders->bindParent($this, 'allBorders');
+            $this->outline->bindParent($this, 'outline');
+            $this->inside->bindParent($this, 'inside');
+            $this->vertical->bindParent($this, 'vertical');
+            $this->horizontal->bindParent($this, 'horizontal');
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getBorders();
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        return ['borders' => $array];
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
+     *         [
+     *             'bottom' => [
+     *                 'borderStyle' => Border::BORDER_DASHDOT,
+     *                 'color' => [
+     *                     'rgb' => '808080'
+     *                 ]
+     *             ],
+     *             'top' => [
+     *                 'borderStyle' => Border::BORDER_DASHDOT,
+     *                 'color' => [
+     *                     'rgb' => '808080'
+     *                 ]
+     *             ]
+     *         ]
+     * );
+     * </code>
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
+     *         [
+     *             'allBorders' => [
+     *                 'borderStyle' => Border::BORDER_DASHDOT,
+     *                 'color' => [
+     *                     'rgb' => '808080'
+     *                 ]
+     *             ]
+     *         ]
+     * );
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray): static
+    {
+        if ($this->isSupervisor) {
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
+        } else {
+            if (isset($styleArray['left'])) {
+                $this->getLeft()->applyFromArray($styleArray['left']);
+            }
+            if (isset($styleArray['right'])) {
+                $this->getRight()->applyFromArray($styleArray['right']);
+            }
+            if (isset($styleArray['top'])) {
+                $this->getTop()->applyFromArray($styleArray['top']);
+            }
+            if (isset($styleArray['bottom'])) {
+                $this->getBottom()->applyFromArray($styleArray['bottom']);
+            }
+            if (isset($styleArray['diagonal'])) {
+                $this->getDiagonal()->applyFromArray($styleArray['diagonal']);
+            }
+            if (isset($styleArray['diagonalDirection'])) {
+                $this->setDiagonalDirection($styleArray['diagonalDirection']);
+            }
+            if (isset($styleArray['allBorders'])) {
+                $this->getLeft()->applyFromArray($styleArray['allBorders']);
+                $this->getRight()->applyFromArray($styleArray['allBorders']);
+                $this->getTop()->applyFromArray($styleArray['allBorders']);
+                $this->getBottom()->applyFromArray($styleArray['allBorders']);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Left.
+     */
+    public function getLeft(): Border
+    {
+        return $this->left;
+    }
+
+    /**
+     * Get Right.
+     */
+    public function getRight(): Border
+    {
+        return $this->right;
+    }
+
+    /**
+     * Get Top.
+     */
+    public function getTop(): Border
+    {
+        return $this->top;
+    }
+
+    /**
+     * Get Bottom.
+     */
+    public function getBottom(): Border
+    {
+        return $this->bottom;
+    }
+
+    /**
+     * Get Diagonal.
+     */
+    public function getDiagonal(): Border
+    {
+        return $this->diagonal;
+    }
+
+    /**
+     * Get AllBorders (pseudo-border). Only applies to supervisor.
+     */
+    public function getAllBorders(): Border
+    {
+        if (!$this->isSupervisor) {
+            throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
+        }
+
+        return $this->allBorders;
+    }
+
+    /**
+     * Get Outline (pseudo-border). Only applies to supervisor.
+     */
+    public function getOutline(): Border
+    {
+        if (!$this->isSupervisor) {
+            throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
+        }
+
+        return $this->outline;
+    }
+
+    /**
+     * Get Inside (pseudo-border). Only applies to supervisor.
+     */
+    public function getInside(): Border
+    {
+        if (!$this->isSupervisor) {
+            throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
+        }
+
+        return $this->inside;
+    }
+
+    /**
+     * Get Vertical (pseudo-border). Only applies to supervisor.
+     */
+    public function getVertical(): Border
+    {
+        if (!$this->isSupervisor) {
+            throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
+        }
+
+        return $this->vertical;
+    }
+
+    /**
+     * Get Horizontal (pseudo-border). Only applies to supervisor.
+     */
+    public function getHorizontal(): Border
+    {
+        if (!$this->isSupervisor) {
+            throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
+        }
+
+        return $this->horizontal;
+    }
+
+    /**
+     * Get DiagonalDirection.
+     */
+    public function getDiagonalDirection(): int
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getDiagonalDirection();
+        }
+
+        return $this->diagonalDirection;
+    }
+
+    /**
+     * Set DiagonalDirection.
+     *
+     * @param int $direction see self::DIAGONAL_*
+     *
+     * @return $this
+     */
+    public function setDiagonalDirection(int $direction): static
+    {
+        if ($direction == '') {
+            $direction = self::DIAGONAL_NONE;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['diagonalDirection' => $direction]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->diagonalDirection = $direction;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashcode();
+        }
+
+        return md5(
+            $this->getLeft()->getHashCode()
+            . $this->getRight()->getHashCode()
+            . $this->getTop()->getHashCode()
+            . $this->getBottom()->getHashCode()
+            . $this->getDiagonal()->getHashCode()
+            . $this->getDiagonalDirection()
+            . __CLASS__
+        );
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'bottom', $this->getBottom());
+        $this->exportArray2($exportedArray, 'diagonal', $this->getDiagonal());
+        $this->exportArray2($exportedArray, 'diagonalDirection', $this->getDiagonalDirection());
+        $this->exportArray2($exportedArray, 'left', $this->getLeft());
+        $this->exportArray2($exportedArray, 'right', $this->getRight());
+        $this->exportArray2($exportedArray, 'top', $this->getTop());
+
+        return $exportedArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
new file mode 100644
index 00000000..6f9db8a2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
@@ -0,0 +1,418 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+class Color extends Supervisor
+{
+    const NAMED_COLORS = [
+        'Black',
+        'White',
+        'Red',
+        'Green',
+        'Blue',
+        'Yellow',
+        'Magenta',
+        'Cyan',
+    ];
+
+    // Colors
+    const COLOR_BLACK = 'FF000000';
+    const COLOR_WHITE = 'FFFFFFFF';
+    const COLOR_RED = 'FFFF0000';
+    const COLOR_DARKRED = 'FF800000';
+    const COLOR_BLUE = 'FF0000FF';
+    const COLOR_DARKBLUE = 'FF000080';
+    const COLOR_GREEN = 'FF00FF00';
+    const COLOR_DARKGREEN = 'FF008000';
+    const COLOR_YELLOW = 'FFFFFF00';
+    const COLOR_DARKYELLOW = 'FF808000';
+    const COLOR_MAGENTA = 'FFFF00FF';
+    const COLOR_CYAN = 'FF00FFFF';
+
+    const NAMED_COLOR_TRANSLATIONS = [
+        'Black' => self::COLOR_BLACK,
+        'White' => self::COLOR_WHITE,
+        'Red' => self::COLOR_RED,
+        'Green' => self::COLOR_GREEN,
+        'Blue' => self::COLOR_BLUE,
+        'Yellow' => self::COLOR_YELLOW,
+        'Magenta' => self::COLOR_MAGENTA,
+        'Cyan' => self::COLOR_CYAN,
+    ];
+
+    const VALIDATE_ARGB_SIZE = 8;
+    const VALIDATE_RGB_SIZE = 6;
+    const VALIDATE_COLOR_6 = '/^[A-F0-9]{6}$/i';
+    const VALIDATE_COLOR_8 = '/^[A-F0-9]{8}$/i';
+
+    private const INDEXED_COLORS = [
+        1 => 'FF000000', //  System Colour #1 - Black
+        2 => 'FFFFFFFF', //  System Colour #2 - White
+        3 => 'FFFF0000', //  System Colour #3 - Red
+        4 => 'FF00FF00', //  System Colour #4 - Green
+        5 => 'FF0000FF', //  System Colour #5 - Blue
+        6 => 'FFFFFF00', //  System Colour #6 - Yellow
+        7 => 'FFFF00FF', //  System Colour #7- Magenta
+        8 => 'FF00FFFF', //  System Colour #8- Cyan
+        9 => 'FF800000', //  Standard Colour #9
+        10 => 'FF008000', //  Standard Colour #10
+        11 => 'FF000080', //  Standard Colour #11
+        12 => 'FF808000', //  Standard Colour #12
+        13 => 'FF800080', //  Standard Colour #13
+        14 => 'FF008080', //  Standard Colour #14
+        15 => 'FFC0C0C0', //  Standard Colour #15
+        16 => 'FF808080', //  Standard Colour #16
+        17 => 'FF9999FF', //  Chart Fill Colour #17
+        18 => 'FF993366', //  Chart Fill Colour #18
+        19 => 'FFFFFFCC', //  Chart Fill Colour #19
+        20 => 'FFCCFFFF', //  Chart Fill Colour #20
+        21 => 'FF660066', //  Chart Fill Colour #21
+        22 => 'FFFF8080', //  Chart Fill Colour #22
+        23 => 'FF0066CC', //  Chart Fill Colour #23
+        24 => 'FFCCCCFF', //  Chart Fill Colour #24
+        25 => 'FF000080', //  Chart Line Colour #25
+        26 => 'FFFF00FF', //  Chart Line Colour #26
+        27 => 'FFFFFF00', //  Chart Line Colour #27
+        28 => 'FF00FFFF', //  Chart Line Colour #28
+        29 => 'FF800080', //  Chart Line Colour #29
+        30 => 'FF800000', //  Chart Line Colour #30
+        31 => 'FF008080', //  Chart Line Colour #31
+        32 => 'FF0000FF', //  Chart Line Colour #32
+        33 => 'FF00CCFF', //  Standard Colour #33
+        34 => 'FFCCFFFF', //  Standard Colour #34
+        35 => 'FFCCFFCC', //  Standard Colour #35
+        36 => 'FFFFFF99', //  Standard Colour #36
+        37 => 'FF99CCFF', //  Standard Colour #37
+        38 => 'FFFF99CC', //  Standard Colour #38
+        39 => 'FFCC99FF', //  Standard Colour #39
+        40 => 'FFFFCC99', //  Standard Colour #40
+        41 => 'FF3366FF', //  Standard Colour #41
+        42 => 'FF33CCCC', //  Standard Colour #42
+        43 => 'FF99CC00', //  Standard Colour #43
+        44 => 'FFFFCC00', //  Standard Colour #44
+        45 => 'FFFF9900', //  Standard Colour #45
+        46 => 'FFFF6600', //  Standard Colour #46
+        47 => 'FF666699', //  Standard Colour #47
+        48 => 'FF969696', //  Standard Colour #48
+        49 => 'FF003366', //  Standard Colour #49
+        50 => 'FF339966', //  Standard Colour #50
+        51 => 'FF003300', //  Standard Colour #51
+        52 => 'FF333300', //  Standard Colour #52
+        53 => 'FF993300', //  Standard Colour #53
+        54 => 'FF993366', //  Standard Colour #54
+        55 => 'FF333399', //  Standard Colour #55
+        56 => 'FF333333', //  Standard Colour #56
+    ];
+
+    /**
+     * ARGB - Alpha RGB.
+     */
+    protected ?string $argb = null;
+
+    private bool $hasChanged = false;
+
+    /**
+     * Create a new Color.
+     *
+     * @param string $colorValue ARGB value for the colour, or named colour
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param bool $isConditional Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct(string $colorValue = self::COLOR_BLACK, bool $isSupervisor = false, bool $isConditional = false)
+    {
+        //    Supervisor?
+        parent::__construct($isSupervisor);
+
+        //    Initialise values
+        if (!$isConditional) {
+            $this->argb = $this->validateColor($colorValue) ?: self::COLOR_BLACK;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+        /** @var Border|Fill $sharedComponent */
+        $sharedComponent = $parent->getSharedComponent();
+        if ($sharedComponent instanceof Fill) {
+            if ($this->parentPropertyName === 'endColor') {
+                return $sharedComponent->getEndColor();
+            }
+
+            return $sharedComponent->getStartColor();
+        }
+
+        return $sharedComponent->getColor();
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getStyleArray([$this->parentPropertyName => $array]);
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray(['rgb' => '808080']);
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray): static
+    {
+        if ($this->isSupervisor) {
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
+        } else {
+            if (isset($styleArray['rgb'])) {
+                $this->setRGB($styleArray['rgb']);
+            }
+            if (isset($styleArray['argb'])) {
+                $this->setARGB($styleArray['argb']);
+            }
+        }
+
+        return $this;
+    }
+
+    private function validateColor(?string $colorValue): string
+    {
+        if ($colorValue === null || $colorValue === '') {
+            return self::COLOR_BLACK;
+        }
+        $named = ucfirst(strtolower($colorValue));
+        if (array_key_exists($named, self::NAMED_COLOR_TRANSLATIONS)) {
+            return self::NAMED_COLOR_TRANSLATIONS[$named];
+        }
+        if (preg_match(self::VALIDATE_COLOR_8, $colorValue) === 1) {
+            return $colorValue;
+        }
+        if (preg_match(self::VALIDATE_COLOR_6, $colorValue) === 1) {
+            return 'FF' . $colorValue;
+        }
+
+        return '';
+    }
+
+    /**
+     * Get ARGB.
+     */
+    public function getARGB(): ?string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getARGB();
+        }
+
+        return $this->argb;
+    }
+
+    /**
+     * Set ARGB.
+     *
+     * @param ?string $colorValue  ARGB value, or a named color
+     *
+     * @return $this
+     */
+    public function setARGB(?string $colorValue = self::COLOR_BLACK): static
+    {
+        $this->hasChanged = true;
+        $colorValue = $this->validateColor($colorValue);
+        if ($colorValue === '') {
+            return $this;
+        }
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['argb' => $colorValue]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->argb = $colorValue;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get RGB.
+     */
+    public function getRGB(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getRGB();
+        }
+
+        return substr($this->argb ?? '', 2);
+    }
+
+    /**
+     * Set RGB.
+     *
+     * @param ?string $colorValue RGB value, or a named color
+     *
+     * @return $this
+     */
+    public function setRGB(?string $colorValue = self::COLOR_BLACK): static
+    {
+        return $this->setARGB($colorValue);
+    }
+
+    /**
+     * Get a specified colour component of an RGB value.
+     *
+     * @param string $rgbValue The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param int $offset Position within the RGB value to extract
+     * @param bool $hex Flag indicating whether the component should be returned as a hex or a
+     *                                    decimal value
+     *
+     * @return int|string The extracted colour component
+     */
+    private static function getColourComponent(string $rgbValue, int $offset, bool $hex = true): string|int
+    {
+        $colour = substr($rgbValue, $offset, 2) ?: '';
+        if (preg_match('/^[0-9a-f]{2}$/i', $colour) !== 1) {
+            $colour = '00';
+        }
+
+        return ($hex) ? $colour : (int) hexdec($colour);
+    }
+
+    /**
+     * Get the red colour component of an RGB value.
+     *
+     * @param string $rgbValue The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param bool $hex Flag indicating whether the component should be returned as a hex or a
+     *                                    decimal value
+     *
+     * @return int|string The red colour component
+     */
+    public static function getRed(string $rgbValue, bool $hex = true)
+    {
+        return self::getColourComponent($rgbValue, strlen($rgbValue) - 6, $hex);
+    }
+
+    /**
+     * Get the green colour component of an RGB value.
+     *
+     * @param string $rgbValue The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param bool $hex Flag indicating whether the component should be returned as a hex or a
+     *                                    decimal value
+     *
+     * @return int|string The green colour component
+     */
+    public static function getGreen(string $rgbValue, bool $hex = true)
+    {
+        return self::getColourComponent($rgbValue, strlen($rgbValue) - 4, $hex);
+    }
+
+    /**
+     * Get the blue colour component of an RGB value.
+     *
+     * @param string $rgbValue The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param bool $hex Flag indicating whether the component should be returned as a hex or a
+     *                                    decimal value
+     *
+     * @return int|string The blue colour component
+     */
+    public static function getBlue(string $rgbValue, bool $hex = true)
+    {
+        return self::getColourComponent($rgbValue, strlen($rgbValue) - 2, $hex);
+    }
+
+    /**
+     * Adjust the brightness of a color.
+     *
+     * @param string $hexColourValue The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
+     * @param float $adjustPercentage The percentage by which to adjust the colour as a float from -1 to 1
+     *
+     * @return string The adjusted colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
+     */
+    public static function changeBrightness(string $hexColourValue, float $adjustPercentage): string
+    {
+        $rgba = (strlen($hexColourValue) === 8);
+        $adjustPercentage = max(-1.0, min(1.0, $adjustPercentage));
+
+        /** @var int $red */
+        $red = self::getRed($hexColourValue, false);
+        /** @var int $green */
+        $green = self::getGreen($hexColourValue, false);
+        /** @var int $blue */
+        $blue = self::getBlue($hexColourValue, false);
+
+        return (($rgba) ? 'FF' : '') . RgbTint::rgbAndTintToRgb($red, $green, $blue, $adjustPercentage);
+    }
+
+    /**
+     * Get indexed color.
+     *
+     * @param int $colorIndex Index entry point into the colour array
+     * @param bool $background Flag to indicate whether default background or foreground colour
+     *                                            should be returned if the indexed colour doesn't exist
+     */
+    public static function indexedColor(int $colorIndex, bool $background = false, ?array $palette = null): self
+    {
+        // Clean parameter
+        $colorIndex = (int) $colorIndex;
+
+        if (empty($palette)) {
+            if (isset(self::INDEXED_COLORS[$colorIndex])) {
+                return new self(self::INDEXED_COLORS[$colorIndex]);
+            }
+        } else {
+            if (isset($palette[$colorIndex])) {
+                return new self($palette[$colorIndex]);
+            }
+        }
+
+        return ($background) ? new self(self::COLOR_WHITE) : new self(self::COLOR_BLACK);
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+
+        return md5(
+            $this->argb
+            . __CLASS__
+        );
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'argb', $this->getARGB());
+
+        return $exportedArray;
+    }
+
+    public function getHasChanged(): bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->hasChanged;
+        }
+
+        return $this->hasChanged;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php
new file mode 100644
index 00000000..01a4d8a9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php
@@ -0,0 +1,337 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+use PhpOffice\PhpSpreadsheet\IComparable;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalColorScale;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalDataBar;
+
+class Conditional implements IComparable
+{
+    // Condition types
+    const CONDITION_NONE = 'none';
+    const CONDITION_BEGINSWITH = 'beginsWith';
+    const CONDITION_CELLIS = 'cellIs';
+    const CONDITION_COLORSCALE = 'colorScale';
+    const CONDITION_CONTAINSBLANKS = 'containsBlanks';
+    const CONDITION_CONTAINSERRORS = 'containsErrors';
+    const CONDITION_CONTAINSTEXT = 'containsText';
+    const CONDITION_DATABAR = 'dataBar';
+    const CONDITION_ENDSWITH = 'endsWith';
+    const CONDITION_EXPRESSION = 'expression';
+    const CONDITION_NOTCONTAINSBLANKS = 'notContainsBlanks';
+    const CONDITION_NOTCONTAINSERRORS = 'notContainsErrors';
+    const CONDITION_NOTCONTAINSTEXT = 'notContainsText';
+    const CONDITION_TIMEPERIOD = 'timePeriod';
+    const CONDITION_DUPLICATES = 'duplicateValues';
+    const CONDITION_UNIQUE = 'uniqueValues';
+
+    private const CONDITION_TYPES = [
+        self::CONDITION_BEGINSWITH,
+        self::CONDITION_CELLIS,
+        self::CONDITION_COLORSCALE,
+        self::CONDITION_CONTAINSBLANKS,
+        self::CONDITION_CONTAINSERRORS,
+        self::CONDITION_CONTAINSTEXT,
+        self::CONDITION_DATABAR,
+        self::CONDITION_DUPLICATES,
+        self::CONDITION_ENDSWITH,
+        self::CONDITION_EXPRESSION,
+        self::CONDITION_NONE,
+        self::CONDITION_NOTCONTAINSBLANKS,
+        self::CONDITION_NOTCONTAINSERRORS,
+        self::CONDITION_NOTCONTAINSTEXT,
+        self::CONDITION_TIMEPERIOD,
+        self::CONDITION_UNIQUE,
+    ];
+
+    // Operator types
+    const OPERATOR_NONE = '';
+    const OPERATOR_BEGINSWITH = 'beginsWith';
+    const OPERATOR_ENDSWITH = 'endsWith';
+    const OPERATOR_EQUAL = 'equal';
+    const OPERATOR_GREATERTHAN = 'greaterThan';
+    const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual';
+    const OPERATOR_LESSTHAN = 'lessThan';
+    const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual';
+    const OPERATOR_NOTEQUAL = 'notEqual';
+    const OPERATOR_CONTAINSTEXT = 'containsText';
+    const OPERATOR_NOTCONTAINS = 'notContains';
+    const OPERATOR_BETWEEN = 'between';
+    const OPERATOR_NOTBETWEEN = 'notBetween';
+
+    const TIMEPERIOD_TODAY = 'today';
+    const TIMEPERIOD_YESTERDAY = 'yesterday';
+    const TIMEPERIOD_TOMORROW = 'tomorrow';
+    const TIMEPERIOD_LAST_7_DAYS = 'last7Days';
+    const TIMEPERIOD_LAST_WEEK = 'lastWeek';
+    const TIMEPERIOD_THIS_WEEK = 'thisWeek';
+    const TIMEPERIOD_NEXT_WEEK = 'nextWeek';
+    const TIMEPERIOD_LAST_MONTH = 'lastMonth';
+    const TIMEPERIOD_THIS_MONTH = 'thisMonth';
+    const TIMEPERIOD_NEXT_MONTH = 'nextMonth';
+
+    /**
+     * Condition type.
+     */
+    private string $conditionType = self::CONDITION_NONE;
+
+    /**
+     * Operator type.
+     */
+    private string $operatorType = self::OPERATOR_NONE;
+
+    /**
+     * Text.
+     */
+    private string $text = '';
+
+    /**
+     * Stop on this condition, if it matches.
+     */
+    private bool $stopIfTrue = false;
+
+    /**
+     * Condition.
+     *
+     * @var (bool|float|int|string)[]
+     */
+    private array $condition = [];
+
+    private ?ConditionalDataBar $dataBar = null;
+
+    private ?ConditionalColorScale $colorScale = null;
+
+    private Style $style;
+
+    private bool $noFormatSet = false;
+
+    /**
+     * Create a new Conditional.
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->style = new Style(false, true);
+    }
+
+    public function getNoFormatSet(): bool
+    {
+        return $this->noFormatSet;
+    }
+
+    public function setNoFormatSet(bool $noFormatSet): self
+    {
+        $this->noFormatSet = $noFormatSet;
+
+        return $this;
+    }
+
+    /**
+     * Get Condition type.
+     */
+    public function getConditionType(): string
+    {
+        return $this->conditionType;
+    }
+
+    /**
+     * Set Condition type.
+     *
+     * @param string $type Condition type, see self::CONDITION_*
+     *
+     * @return $this
+     */
+    public function setConditionType(string $type): static
+    {
+        $this->conditionType = $type;
+
+        return $this;
+    }
+
+    /**
+     * Get Operator type.
+     */
+    public function getOperatorType(): string
+    {
+        return $this->operatorType;
+    }
+
+    /**
+     * Set Operator type.
+     *
+     * @param string $type Conditional operator type, see self::OPERATOR_*
+     *
+     * @return $this
+     */
+    public function setOperatorType(string $type): static
+    {
+        $this->operatorType = $type;
+
+        return $this;
+    }
+
+    /**
+     * Get text.
+     */
+    public function getText(): string
+    {
+        return $this->text;
+    }
+
+    /**
+     * Set text.
+     *
+     * @return $this
+     */
+    public function setText(string $text): static
+    {
+        $this->text = $text;
+
+        return $this;
+    }
+
+    /**
+     * Get StopIfTrue.
+     */
+    public function getStopIfTrue(): bool
+    {
+        return $this->stopIfTrue;
+    }
+
+    /**
+     * Set StopIfTrue.
+     *
+     * @return $this
+     */
+    public function setStopIfTrue(bool $stopIfTrue): static
+    {
+        $this->stopIfTrue = $stopIfTrue;
+
+        return $this;
+    }
+
+    /**
+     * Get Conditions.
+     *
+     * @return (bool|float|int|string)[]
+     */
+    public function getConditions(): array
+    {
+        return $this->condition;
+    }
+
+    /**
+     * Set Conditions.
+     *
+     * @param bool|(bool|float|int|string)[]|float|int|string $conditions Condition
+     *
+     * @return $this
+     */
+    public function setConditions($conditions): static
+    {
+        if (!is_array($conditions)) {
+            $conditions = [$conditions];
+        }
+        $this->condition = $conditions;
+
+        return $this;
+    }
+
+    /**
+     * Add Condition.
+     *
+     * @param bool|float|int|string $condition Condition
+     *
+     * @return $this
+     */
+    public function addCondition($condition): static
+    {
+        $this->condition[] = $condition;
+
+        return $this;
+    }
+
+    /**
+     * Get Style.
+     */
+    public function getStyle(): Style
+    {
+        return $this->style;
+    }
+
+    /**
+     * Set Style.
+     *
+     * @return $this
+     */
+    public function setStyle(Style $style): static
+    {
+        $this->style = $style;
+
+        return $this;
+    }
+
+    public function getDataBar(): ?ConditionalDataBar
+    {
+        return $this->dataBar;
+    }
+
+    public function setDataBar(ConditionalDataBar $dataBar): static
+    {
+        $this->dataBar = $dataBar;
+
+        return $this;
+    }
+
+    public function getColorScale(): ?ConditionalColorScale
+    {
+        return $this->colorScale;
+    }
+
+    public function setColorScale(ConditionalColorScale $colorScale): static
+    {
+        $this->colorScale = $colorScale;
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->conditionType
+            . $this->operatorType
+            . implode(';', $this->condition)
+            . $this->style->getHashCode()
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+
+    /**
+     * Verify if param is valid condition type.
+     */
+    public static function isValidConditionType(string $type): bool
+    {
+        return in_array($type, self::CONDITION_TYPES);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php
new file mode 100644
index 00000000..2a279075
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php
@@ -0,0 +1,271 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class CellMatcher
+{
+    public const COMPARISON_OPERATORS = [
+        Conditional::OPERATOR_EQUAL => '=',
+        Conditional::OPERATOR_GREATERTHAN => '>',
+        Conditional::OPERATOR_GREATERTHANOREQUAL => '>=',
+        Conditional::OPERATOR_LESSTHAN => '<',
+        Conditional::OPERATOR_LESSTHANOREQUAL => '<=',
+        Conditional::OPERATOR_NOTEQUAL => '<>',
+    ];
+
+    public const COMPARISON_RANGE_OPERATORS = [
+        Conditional::OPERATOR_BETWEEN => 'IF(AND(A1>=%s,A1<=%s),TRUE,FALSE)',
+        Conditional::OPERATOR_NOTBETWEEN => 'IF(AND(A1>=%s,A1<=%s),FALSE,TRUE)',
+    ];
+
+    public const COMPARISON_DUPLICATES_OPERATORS = [
+        Conditional::CONDITION_DUPLICATES => "COUNTIF('%s'!%s,%s)>1",
+        Conditional::CONDITION_UNIQUE => "COUNTIF('%s'!%s,%s)=1",
+    ];
+
+    protected Cell $cell;
+
+    protected int $cellRow;
+
+    protected Worksheet $worksheet;
+
+    protected int $cellColumn;
+
+    protected string $conditionalRange;
+
+    protected string $referenceCell;
+
+    protected int $referenceRow;
+
+    protected int $referenceColumn;
+
+    protected Calculation $engine;
+
+    public function __construct(Cell $cell, string $conditionalRange)
+    {
+        $this->cell = $cell;
+        $this->worksheet = $cell->getWorksheet();
+        [$this->cellColumn, $this->cellRow] = Coordinate::indexesFromString($this->cell->getCoordinate());
+        $this->setReferenceCellForExpressions($conditionalRange);
+
+        $this->engine = Calculation::getInstance($this->worksheet->getParent());
+    }
+
+    protected function setReferenceCellForExpressions(string $conditionalRange): void
+    {
+        $conditionalRange = Coordinate::splitRange(str_replace('$', '', strtoupper($conditionalRange)));
+        [$this->referenceCell] = $conditionalRange[0];
+
+        [$this->referenceColumn, $this->referenceRow] = Coordinate::indexesFromString($this->referenceCell);
+
+        // Convert our conditional range to an absolute conditional range, so it can be used  "pinned" in formulae
+        $rangeSets = [];
+        foreach ($conditionalRange as $rangeSet) {
+            $absoluteRangeSet = array_map(
+                [Coordinate::class, 'absoluteCoordinate'],
+                $rangeSet
+            );
+            $rangeSets[] = implode(':', $absoluteRangeSet);
+        }
+        $this->conditionalRange = implode(',', $rangeSets);
+    }
+
+    public function evaluateConditional(Conditional $conditional): bool
+    {
+        // Some calculations may modify the stored cell; so reset it before every evaluation.
+        $cellColumn = Coordinate::stringFromColumnIndex($this->cellColumn);
+        $cellAddress = "{$cellColumn}{$this->cellRow}";
+        $this->cell = $this->worksheet->getCell($cellAddress);
+
+        return match ($conditional->getConditionType()) {
+            Conditional::CONDITION_CELLIS => $this->processOperatorComparison($conditional),
+            Conditional::CONDITION_DUPLICATES, Conditional::CONDITION_UNIQUE => $this->processDuplicatesComparison($conditional),
+            // Expression is NOT(ISERROR(SEARCH("<TEXT>",<Cell Reference>)))
+            Conditional::CONDITION_CONTAINSTEXT,
+            // Expression is ISERROR(SEARCH("<TEXT>",<Cell Reference>))
+            Conditional::CONDITION_NOTCONTAINSTEXT,
+            // Expression is LEFT(<Cell Reference>,LEN("<TEXT>"))="<TEXT>"
+            Conditional::CONDITION_BEGINSWITH,
+            // Expression is RIGHT(<Cell Reference>,LEN("<TEXT>"))="<TEXT>"
+            Conditional::CONDITION_ENDSWITH,
+            // Expression is LEN(TRIM(<Cell Reference>))=0
+            Conditional::CONDITION_CONTAINSBLANKS,
+            // Expression is LEN(TRIM(<Cell Reference>))>0
+            Conditional::CONDITION_NOTCONTAINSBLANKS,
+            // Expression is ISERROR(<Cell Reference>)
+            Conditional::CONDITION_CONTAINSERRORS,
+            // Expression is NOT(ISERROR(<Cell Reference>))
+            Conditional::CONDITION_NOTCONTAINSERRORS,
+            // Expression varies, depending on specified timePeriod value, e.g.
+            // Yesterday FLOOR(<Cell Reference>,1)=TODAY()-1
+            // Today FLOOR(<Cell Reference>,1)=TODAY()
+            // Tomorrow FLOOR(<Cell Reference>,1)=TODAY()+1
+            // Last 7 Days AND(TODAY()-FLOOR(<Cell Reference>,1)<=6,FLOOR(<Cell Reference>,1)<=TODAY())
+            Conditional::CONDITION_TIMEPERIOD,
+            Conditional::CONDITION_EXPRESSION => $this->processExpression($conditional),
+            default => false,
+        };
+    }
+
+    protected function wrapValue(mixed $value): float|int|string
+    {
+        if (!is_numeric($value)) {
+            if (is_bool($value)) {
+                return $value ? 'TRUE' : 'FALSE';
+            } elseif ($value === null) {
+                return 'NULL';
+            }
+
+            return '"' . $value . '"';
+        }
+
+        return $value;
+    }
+
+    protected function wrapCellValue(): float|int|string
+    {
+        return $this->wrapValue($this->cell->getCalculatedValue());
+    }
+
+    protected function conditionCellAdjustment(array $matches): float|int|string
+    {
+        $column = $matches[6];
+        $row = $matches[7];
+
+        if (!str_contains($column, '$')) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column += $this->cellColumn - $this->referenceColumn;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (!str_contains($row, '$')) {
+            $row += $this->cellRow - $this->referenceRow;
+        }
+
+        if (!empty($matches[4])) {
+            $worksheet = $this->worksheet->getParentOrThrow()->getSheetByName(trim($matches[4], "'"));
+            if ($worksheet === null) {
+                return $this->wrapValue(null);
+            }
+
+            return $this->wrapValue(
+                $worksheet
+                    ->getCell(str_replace('$', '', "{$column}{$row}"))
+                    ->getCalculatedValue()
+            );
+        }
+
+        return $this->wrapValue(
+            $this->worksheet
+                ->getCell(str_replace('$', '', "{$column}{$row}"))
+                ->getCalculatedValue()
+        );
+    }
+
+    protected function cellConditionCheck(string $condition): string
+    {
+        $splitCondition = explode(Calculation::FORMULA_STRING_QUOTE, $condition);
+        $i = false;
+        foreach ($splitCondition as &$value) {
+            //    Only count/replace in alternating array entries (ie. not in quoted strings)
+            $i = $i === false;
+            if ($i) {
+                $value = (string) preg_replace_callback(
+                    '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i',
+                    [$this, 'conditionCellAdjustment'],
+                    $value
+                );
+            }
+        }
+        unset($value);
+
+        //    Then rebuild the condition string to return it
+        return implode(Calculation::FORMULA_STRING_QUOTE, $splitCondition);
+    }
+
+    protected function adjustConditionsForCellReferences(array $conditions): array
+    {
+        return array_map(
+            [$this, 'cellConditionCheck'],
+            $conditions
+        );
+    }
+
+    protected function processOperatorComparison(Conditional $conditional): bool
+    {
+        if (array_key_exists($conditional->getOperatorType(), self::COMPARISON_RANGE_OPERATORS)) {
+            return $this->processRangeOperator($conditional);
+        }
+
+        $operator = self::COMPARISON_OPERATORS[$conditional->getOperatorType()];
+        $conditions = $this->adjustConditionsForCellReferences($conditional->getConditions());
+        $expression = sprintf('%s%s%s', (string) $this->wrapCellValue(), $operator, (string) array_pop($conditions));
+
+        return $this->evaluateExpression($expression);
+    }
+
+    protected function processRangeOperator(Conditional $conditional): bool
+    {
+        $conditions = $this->adjustConditionsForCellReferences($conditional->getConditions());
+        sort($conditions);
+        $expression = sprintf(
+            (string) preg_replace(
+                '/\bA1\b/i',
+                (string) $this->wrapCellValue(),
+                self::COMPARISON_RANGE_OPERATORS[$conditional->getOperatorType()]
+            ),
+            ...$conditions
+        );
+
+        return $this->evaluateExpression($expression);
+    }
+
+    protected function processDuplicatesComparison(Conditional $conditional): bool
+    {
+        $worksheetName = $this->cell->getWorksheet()->getTitle();
+
+        $expression = sprintf(
+            self::COMPARISON_DUPLICATES_OPERATORS[$conditional->getConditionType()],
+            $worksheetName,
+            $this->conditionalRange,
+            $this->cellConditionCheck($this->cell->getCalculatedValueString())
+        );
+
+        return $this->evaluateExpression($expression);
+    }
+
+    protected function processExpression(Conditional $conditional): bool
+    {
+        $conditions = $this->adjustConditionsForCellReferences($conditional->getConditions());
+        $expression = array_pop($conditions);
+
+        $expression = (string) preg_replace(
+            '/\b' . $this->referenceCell . '\b/i',
+            (string) $this->wrapCellValue(),
+            $expression
+        );
+
+        return $this->evaluateExpression($expression);
+    }
+
+    protected function evaluateExpression(string $expression): bool
+    {
+        $expression = "={$expression}";
+
+        try {
+            $this->engine->flushInstance();
+            $result = (bool) $this->engine->calculateFormula($expression);
+        } catch (Exception) {
+            return false;
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php
new file mode 100644
index 00000000..bcf59dee
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+class CellStyleAssessor
+{
+    protected CellMatcher $cellMatcher;
+
+    protected StyleMerger $styleMerger;
+
+    public function __construct(Cell $cell, string $conditionalRange)
+    {
+        $this->cellMatcher = new CellMatcher($cell, $conditionalRange);
+        $this->styleMerger = new StyleMerger($cell->getStyle());
+    }
+
+    /**
+     * @param Conditional[] $conditionalStyles
+     */
+    public function matchConditions(array $conditionalStyles = []): Style
+    {
+        foreach ($conditionalStyles as $conditional) {
+            if ($this->cellMatcher->evaluateConditional($conditional) === true) {
+                // Merging the conditional style into the base style goes in here
+                $this->styleMerger->mergeStyle($conditional->getStyle());
+                if ($conditional->getStopIfTrue() === true) {
+                    break;
+                }
+            }
+        }
+
+        return $this->styleMerger->getStyle();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalColorScale.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalColorScale.php
new file mode 100644
index 00000000..7fcc0803
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalColorScale.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Style\Color;
+
+class ConditionalColorScale
+{
+    private ?ConditionalFormatValueObject $minimumConditionalFormatValueObject = null;
+
+    private ?ConditionalFormatValueObject $midpointConditionalFormatValueObject = null;
+
+    private ?ConditionalFormatValueObject $maximumConditionalFormatValueObject = null;
+
+    private ?Color $minimumColor = null;
+
+    private ?Color $midpointColor = null;
+
+    private ?Color $maximumColor = null;
+
+    public function getMinimumConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->minimumConditionalFormatValueObject;
+    }
+
+    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject): self
+    {
+        $this->minimumConditionalFormatValueObject = $minimumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMidpointConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->midpointConditionalFormatValueObject;
+    }
+
+    public function setMidpointConditionalFormatValueObject(ConditionalFormatValueObject $midpointConditionalFormatValueObject): self
+    {
+        $this->midpointConditionalFormatValueObject = $midpointConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMaximumConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->maximumConditionalFormatValueObject;
+    }
+
+    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject): self
+    {
+        $this->maximumConditionalFormatValueObject = $maximumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMinimumColor(): ?Color
+    {
+        return $this->minimumColor;
+    }
+
+    public function setMinimumColor(Color $minimumColor): self
+    {
+        $this->minimumColor = $minimumColor;
+
+        return $this;
+    }
+
+    public function getMidpointColor(): ?Color
+    {
+        return $this->midpointColor;
+    }
+
+    public function setMidpointColor(Color $midpointColor): self
+    {
+        $this->midpointColor = $midpointColor;
+
+        return $this;
+    }
+
+    public function getMaximumColor(): ?Color
+    {
+        return $this->maximumColor;
+    }
+
+    public function setMaximumColor(Color $maximumColor): self
+    {
+        $this->maximumColor = $maximumColor;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
new file mode 100644
index 00000000..370f1025
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+class ConditionalDataBar
+{
+    private ?bool $showValue = null;
+
+    private ?ConditionalFormatValueObject $minimumConditionalFormatValueObject = null;
+
+    private ?ConditionalFormatValueObject $maximumConditionalFormatValueObject = null;
+
+    private string $color = '';
+
+    private ?ConditionalFormattingRuleExtension $conditionalFormattingRuleExt = null;
+
+    public function getShowValue(): ?bool
+    {
+        return $this->showValue;
+    }
+
+    public function setShowValue(bool $showValue): self
+    {
+        $this->showValue = $showValue;
+
+        return $this;
+    }
+
+    public function getMinimumConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->minimumConditionalFormatValueObject;
+    }
+
+    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject): self
+    {
+        $this->minimumConditionalFormatValueObject = $minimumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMaximumConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->maximumConditionalFormatValueObject;
+    }
+
+    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject): self
+    {
+        $this->maximumConditionalFormatValueObject = $maximumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getColor(): string
+    {
+        return $this->color;
+    }
+
+    public function setColor(string $color): self
+    {
+        $this->color = $color;
+
+        return $this;
+    }
+
+    public function getConditionalFormattingRuleExt(): ?ConditionalFormattingRuleExtension
+    {
+        return $this->conditionalFormattingRuleExt;
+    }
+
+    public function setConditionalFormattingRuleExt(ConditionalFormattingRuleExtension $conditionalFormattingRuleExt): self
+    {
+        $this->conditionalFormattingRuleExt = $conditionalFormattingRuleExt;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
new file mode 100644
index 00000000..28cd94bb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
@@ -0,0 +1,235 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+class ConditionalDataBarExtension
+{
+    /** <dataBar> attributes */
+    private int $minLength;
+
+    private int $maxLength;
+
+    private ?bool $border = null;
+
+    private ?bool $gradient = null;
+
+    private ?string $direction = null;
+
+    private ?bool $negativeBarBorderColorSameAsPositive = null;
+
+    private ?string $axisPosition = null;
+
+    // <dataBar> children
+
+    private ConditionalFormatValueObject $maximumConditionalFormatValueObject;
+
+    private ConditionalFormatValueObject $minimumConditionalFormatValueObject;
+
+    private ?string $borderColor = null;
+
+    private ?string $negativeFillColor = null;
+
+    private ?string $negativeBorderColor = null;
+
+    private array $axisColor = [
+        'rgb' => null,
+        'theme' => null,
+        'tint' => null,
+    ];
+
+    public function getXmlAttributes(): array
+    {
+        $ret = [];
+        foreach (['minLength', 'maxLength', 'direction', 'axisPosition'] as $attrKey) {
+            if (null !== $this->{$attrKey}) {
+                $ret[$attrKey] = $this->{$attrKey};
+            }
+        }
+        foreach (['border', 'gradient', 'negativeBarBorderColorSameAsPositive'] as $attrKey) {
+            if (null !== $this->{$attrKey}) {
+                $ret[$attrKey] = $this->{$attrKey} ? '1' : '0';
+            }
+        }
+
+        return $ret;
+    }
+
+    public function getXmlElements(): array
+    {
+        $ret = [];
+        $elms = ['borderColor', 'negativeFillColor', 'negativeBorderColor'];
+        foreach ($elms as $elmKey) {
+            if (null !== $this->{$elmKey}) {
+                $ret[$elmKey] = ['rgb' => $this->{$elmKey}];
+            }
+        }
+        foreach (array_filter($this->axisColor) as $attrKey => $axisColorAttr) {
+            if (!isset($ret['axisColor'])) {
+                $ret['axisColor'] = [];
+            }
+            $ret['axisColor'][$attrKey] = $axisColorAttr;
+        }
+
+        return $ret;
+    }
+
+    public function getMinLength(): int
+    {
+        return $this->minLength;
+    }
+
+    public function setMinLength(int $minLength): self
+    {
+        $this->minLength = $minLength;
+
+        return $this;
+    }
+
+    public function getMaxLength(): int
+    {
+        return $this->maxLength;
+    }
+
+    public function setMaxLength(int $maxLength): self
+    {
+        $this->maxLength = $maxLength;
+
+        return $this;
+    }
+
+    public function getBorder(): ?bool
+    {
+        return $this->border;
+    }
+
+    public function setBorder(bool $border): self
+    {
+        $this->border = $border;
+
+        return $this;
+    }
+
+    public function getGradient(): ?bool
+    {
+        return $this->gradient;
+    }
+
+    public function setGradient(bool $gradient): self
+    {
+        $this->gradient = $gradient;
+
+        return $this;
+    }
+
+    public function getDirection(): ?string
+    {
+        return $this->direction;
+    }
+
+    public function setDirection(string $direction): self
+    {
+        $this->direction = $direction;
+
+        return $this;
+    }
+
+    public function getNegativeBarBorderColorSameAsPositive(): ?bool
+    {
+        return $this->negativeBarBorderColorSameAsPositive;
+    }
+
+    public function setNegativeBarBorderColorSameAsPositive(bool $negativeBarBorderColorSameAsPositive): self
+    {
+        $this->negativeBarBorderColorSameAsPositive = $negativeBarBorderColorSameAsPositive;
+
+        return $this;
+    }
+
+    public function getAxisPosition(): ?string
+    {
+        return $this->axisPosition;
+    }
+
+    public function setAxisPosition(string $axisPosition): self
+    {
+        $this->axisPosition = $axisPosition;
+
+        return $this;
+    }
+
+    public function getMaximumConditionalFormatValueObject(): ConditionalFormatValueObject
+    {
+        return $this->maximumConditionalFormatValueObject;
+    }
+
+    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject): self
+    {
+        $this->maximumConditionalFormatValueObject = $maximumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMinimumConditionalFormatValueObject(): ConditionalFormatValueObject
+    {
+        return $this->minimumConditionalFormatValueObject;
+    }
+
+    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject): self
+    {
+        $this->minimumConditionalFormatValueObject = $minimumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getBorderColor(): ?string
+    {
+        return $this->borderColor;
+    }
+
+    public function setBorderColor(string $borderColor): self
+    {
+        $this->borderColor = $borderColor;
+
+        return $this;
+    }
+
+    public function getNegativeFillColor(): ?string
+    {
+        return $this->negativeFillColor;
+    }
+
+    public function setNegativeFillColor(string $negativeFillColor): self
+    {
+        $this->negativeFillColor = $negativeFillColor;
+
+        return $this;
+    }
+
+    public function getNegativeBorderColor(): ?string
+    {
+        return $this->negativeBorderColor;
+    }
+
+    public function setNegativeBorderColor(string $negativeBorderColor): self
+    {
+        $this->negativeBorderColor = $negativeBorderColor;
+
+        return $this;
+    }
+
+    public function getAxisColor(): array
+    {
+        return $this->axisColor;
+    }
+
+    public function setAxisColor(mixed $rgb, mixed $theme = null, mixed $tint = null): self
+    {
+        $this->axisColor = [
+            'rgb' => $rgb,
+            'theme' => $theme,
+            'tint' => $tint,
+        ];
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
new file mode 100644
index 00000000..e6d1035f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+class ConditionalFormatValueObject
+{
+    private string $type;
+
+    private null|float|int|string $value;
+
+    private ?string $cellFormula;
+
+    public function __construct(string $type, null|float|int|string $value = null, ?string $cellFormula = null)
+    {
+        $this->type = $type;
+        $this->value = $value;
+        $this->cellFormula = $cellFormula;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function setType(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function getValue(): null|float|int|string
+    {
+        return $this->value;
+    }
+
+    public function setValue(null|float|int|string $value): self
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    public function getCellFormula(): ?string
+    {
+        return $this->cellFormula;
+    }
+
+    public function setCellFormula(?string $cellFormula): self
+    {
+        $this->cellFormula = $cellFormula;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
new file mode 100644
index 00000000..c6c648ba
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use SimpleXMLElement;
+
+class ConditionalFormattingRuleExtension
+{
+    const CONDITION_EXTENSION_DATABAR = 'dataBar';
+
+    private string $id;
+
+    /** @var string Conditional Formatting Rule */
+    private string $cfRule;
+
+    private ConditionalDataBarExtension $dataBar;
+
+    /** @var string Sequence of References */
+    private string $sqref = '';
+
+    /**
+     * ConditionalFormattingRuleExtension constructor.
+     */
+    public function __construct(?string $id = null, string $cfRule = self::CONDITION_EXTENSION_DATABAR)
+    {
+        if (null === $id) {
+            $this->id = '{' . $this->generateUuid() . '}';
+        } else {
+            $this->id = $id;
+        }
+        $this->cfRule = $cfRule;
+    }
+
+    private function generateUuid(): string
+    {
+        $chars = str_split('xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx');
+
+        foreach ($chars as $i => $char) {
+            if ($char === 'x') {
+                $chars[$i] = dechex(random_int(0, 15));
+            } elseif ($char === 'y') {
+                $chars[$i] = dechex(random_int(8, 11));
+            }
+        }
+
+        return implode('', $chars);
+    }
+
+    public static function parseExtLstXml(?SimpleXMLElement $extLstXml): array
+    {
+        $conditionalFormattingRuleExtensions = [];
+        $conditionalFormattingRuleExtensionXml = null;
+        if ($extLstXml instanceof SimpleXMLElement) {
+            foreach ((count($extLstXml) > 0 ? $extLstXml : [$extLstXml]) as $extLst) {
+                //this uri is conditionalFormattings
+                //https://docs.microsoft.com/en-us/openspecs/office_standards/ms-xlsx/07d607af-5618-4ca2-b683-6a78dc0d9627
+                if (isset($extLst->ext['uri']) && (string) $extLst->ext['uri'] === '{78C0D931-6437-407d-A8EE-F0AAD7539E65}') {
+                    $conditionalFormattingRuleExtensionXml = $extLst->ext;
+                }
+            }
+
+            if ($conditionalFormattingRuleExtensionXml) {
+                $ns = $conditionalFormattingRuleExtensionXml->getNamespaces(true);
+                $extFormattingsXml = $conditionalFormattingRuleExtensionXml->children($ns['x14']);
+
+                foreach ($extFormattingsXml->children($ns['x14']) as $extFormattingXml) {
+                    $extCfRuleXml = $extFormattingXml->cfRule;
+                    $attributes = $extCfRuleXml->attributes();
+                    if (!$attributes || ((string) $attributes->type) !== Conditional::CONDITION_DATABAR) {
+                        continue;
+                    }
+
+                    $extFormattingRuleObj = new self((string) $attributes->id);
+                    $extFormattingRuleObj->setSqref((string) $extFormattingXml->children($ns['xm'])->sqref);
+                    $conditionalFormattingRuleExtensions[$extFormattingRuleObj->getId()] = $extFormattingRuleObj;
+
+                    $extDataBarObj = new ConditionalDataBarExtension();
+                    $extFormattingRuleObj->setDataBarExt($extDataBarObj);
+                    $dataBarXml = $extCfRuleXml->dataBar;
+                    self::parseExtDataBarAttributesFromXml($extDataBarObj, $dataBarXml);
+                    self::parseExtDataBarElementChildrenFromXml($extDataBarObj, $dataBarXml, $ns);
+                }
+            }
+        }
+
+        return $conditionalFormattingRuleExtensions;
+    }
+
+    private static function parseExtDataBarAttributesFromXml(
+        ConditionalDataBarExtension $extDataBarObj,
+        SimpleXMLElement $dataBarXml
+    ): void {
+        $dataBarAttribute = $dataBarXml->attributes();
+        if ($dataBarAttribute === null) {
+            return;
+        }
+        if ($dataBarAttribute->minLength) {
+            $extDataBarObj->setMinLength((int) $dataBarAttribute->minLength);
+        }
+        if ($dataBarAttribute->maxLength) {
+            $extDataBarObj->setMaxLength((int) $dataBarAttribute->maxLength);
+        }
+        if ($dataBarAttribute->border) {
+            $extDataBarObj->setBorder((bool) (string) $dataBarAttribute->border);
+        }
+        if ($dataBarAttribute->gradient) {
+            $extDataBarObj->setGradient((bool) (string) $dataBarAttribute->gradient);
+        }
+        if ($dataBarAttribute->direction) {
+            $extDataBarObj->setDirection((string) $dataBarAttribute->direction);
+        }
+        if ($dataBarAttribute->negativeBarBorderColorSameAsPositive) {
+            $extDataBarObj->setNegativeBarBorderColorSameAsPositive((bool) (string) $dataBarAttribute->negativeBarBorderColorSameAsPositive);
+        }
+        if ($dataBarAttribute->axisPosition) {
+            $extDataBarObj->setAxisPosition((string) $dataBarAttribute->axisPosition);
+        }
+    }
+
+    private static function parseExtDataBarElementChildrenFromXml(ConditionalDataBarExtension $extDataBarObj, SimpleXMLElement $dataBarXml, array $ns): void
+    {
+        if ($dataBarXml->borderColor) {
+            $attributes = $dataBarXml->borderColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setBorderColor((string) $attributes['rgb']);
+            }
+        }
+        if ($dataBarXml->negativeFillColor) {
+            $attributes = $dataBarXml->negativeFillColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setNegativeFillColor((string) $attributes['rgb']);
+            }
+        }
+        if ($dataBarXml->negativeBorderColor) {
+            $attributes = $dataBarXml->negativeBorderColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setNegativeBorderColor((string) $attributes['rgb']);
+            }
+        }
+        if ($dataBarXml->axisColor) {
+            $axisColorAttr = $dataBarXml->axisColor->attributes();
+            if ($axisColorAttr !== null) {
+                $extDataBarObj->setAxisColor((string) $axisColorAttr['rgb'], (string) $axisColorAttr['theme'], (string) $axisColorAttr['tint']);
+            }
+        }
+        $cfvoIndex = 0;
+        foreach ($dataBarXml->cfvo as $cfvo) {
+            $f = (string) $cfvo->children($ns['xm'])->f;
+            $attributes = $cfvo->attributes();
+            if (!($attributes)) {
+                continue;
+            }
+
+            if ($cfvoIndex === 0) {
+                $extDataBarObj->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $attributes['type'], null, (empty($f) ? null : $f)));
+            }
+            if ($cfvoIndex === 1) {
+                $extDataBarObj->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $attributes['type'], null, (empty($f) ? null : $f)));
+            }
+            ++$cfvoIndex;
+        }
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function setId(string $id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    public function getCfRule(): string
+    {
+        return $this->cfRule;
+    }
+
+    public function setCfRule(string $cfRule): self
+    {
+        $this->cfRule = $cfRule;
+
+        return $this;
+    }
+
+    public function getDataBarExt(): ConditionalDataBarExtension
+    {
+        return $this->dataBar;
+    }
+
+    public function setDataBarExt(ConditionalDataBarExtension $dataBar): self
+    {
+        $this->dataBar = $dataBar;
+
+        return $this;
+    }
+
+    public function getSqref(): string
+    {
+        return $this->sqref;
+    }
+
+    public function setSqref(string $sqref): self
+    {
+        $this->sqref = $sqref;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
new file mode 100644
index 00000000..9388848e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+class StyleMerger
+{
+    protected Style $baseStyle;
+
+    public function __construct(Style $baseStyle)
+    {
+        $this->baseStyle = $baseStyle;
+    }
+
+    public function getStyle(): Style
+    {
+        return $this->baseStyle;
+    }
+
+    public function mergeStyle(Style $style): void
+    {
+        if ($style->getNumberFormat() !== null && $style->getNumberFormat()->getFormatCode() !== null) {
+            $this->baseStyle->getNumberFormat()->setFormatCode($style->getNumberFormat()->getFormatCode());
+        }
+
+        if ($style->getFont() !== null) {
+            $this->mergeFontStyle($this->baseStyle->getFont(), $style->getFont());
+        }
+
+        if ($style->getFill() !== null) {
+            $this->mergeFillStyle($this->baseStyle->getFill(), $style->getFill());
+        }
+
+        if ($style->getBorders() !== null) {
+            $this->mergeBordersStyle($this->baseStyle->getBorders(), $style->getBorders());
+        }
+    }
+
+    protected function mergeFontStyle(Font $baseFontStyle, Font $fontStyle): void
+    {
+        if ($fontStyle->getBold() !== null) {
+            $baseFontStyle->setBold($fontStyle->getBold());
+        }
+
+        if ($fontStyle->getItalic() !== null) {
+            $baseFontStyle->setItalic($fontStyle->getItalic());
+        }
+
+        if ($fontStyle->getStrikethrough() !== null) {
+            $baseFontStyle->setStrikethrough($fontStyle->getStrikethrough());
+        }
+
+        if ($fontStyle->getUnderline() !== null) {
+            $baseFontStyle->setUnderline($fontStyle->getUnderline());
+        }
+
+        if ($fontStyle->getColor() !== null && $fontStyle->getColor()->getARGB() !== null) {
+            $baseFontStyle->setColor($fontStyle->getColor());
+        }
+    }
+
+    protected function mergeFillStyle(Fill $baseFillStyle, Fill $fillStyle): void
+    {
+        if ($fillStyle->getFillType() !== null) {
+            $baseFillStyle->setFillType($fillStyle->getFillType());
+        }
+
+        //if ($fillStyle->getRotation() !== null) {
+        $baseFillStyle->setRotation($fillStyle->getRotation());
+        //}
+
+        if ($fillStyle->getStartColor() !== null && $fillStyle->getStartColor()->getARGB() !== null) {
+            $baseFillStyle->setStartColor($fillStyle->getStartColor());
+        }
+
+        if ($fillStyle->getEndColor() !== null && $fillStyle->getEndColor()->getARGB() !== null) {
+            $baseFillStyle->setEndColor($fillStyle->getEndColor());
+        }
+    }
+
+    protected function mergeBordersStyle(Borders $baseBordersStyle, Borders $bordersStyle): void
+    {
+        if ($bordersStyle->getTop() !== null) {
+            $this->mergeBorderStyle($baseBordersStyle->getTop(), $bordersStyle->getTop());
+        }
+
+        if ($bordersStyle->getBottom() !== null) {
+            $this->mergeBorderStyle($baseBordersStyle->getBottom(), $bordersStyle->getBottom());
+        }
+
+        if ($bordersStyle->getLeft() !== null) {
+            $this->mergeBorderStyle($baseBordersStyle->getLeft(), $bordersStyle->getLeft());
+        }
+
+        if ($bordersStyle->getRight() !== null) {
+            $this->mergeBorderStyle($baseBordersStyle->getRight(), $bordersStyle->getRight());
+        }
+    }
+
+    protected function mergeBorderStyle(Border $baseBorderStyle, Border $borderStyle): void
+    {
+        //if ($borderStyle->getBorderStyle() !== null) {
+        $baseBorderStyle->setBorderStyle($borderStyle->getBorderStyle());
+        //}
+
+        if ($borderStyle->getColor() !== null && $borderStyle->getColor()->getARGB() !== null) {
+            $baseBorderStyle->setColor($borderStyle->getColor());
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php
new file mode 100644
index 00000000..2791a2b9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard\WizardInterface;
+
+class Wizard
+{
+    public const CELL_VALUE = 'cellValue';
+    public const TEXT_VALUE = 'textValue';
+    public const BLANKS = Conditional::CONDITION_CONTAINSBLANKS;
+    public const NOT_BLANKS = Conditional::CONDITION_NOTCONTAINSBLANKS;
+    public const ERRORS = Conditional::CONDITION_CONTAINSERRORS;
+    public const NOT_ERRORS = Conditional::CONDITION_NOTCONTAINSERRORS;
+    public const EXPRESSION = Conditional::CONDITION_EXPRESSION;
+    public const FORMULA = Conditional::CONDITION_EXPRESSION;
+    public const DATES_OCCURRING = 'DateValue';
+    public const DUPLICATES = Conditional::CONDITION_DUPLICATES;
+    public const UNIQUE = Conditional::CONDITION_UNIQUE;
+
+    public const VALUE_TYPE_LITERAL = 'value';
+    public const VALUE_TYPE_CELL = 'cell';
+    public const VALUE_TYPE_FORMULA = 'formula';
+
+    protected string $cellRange;
+
+    public function __construct(string $cellRange)
+    {
+        $this->cellRange = $cellRange;
+    }
+
+    public function newRule(string $ruleType): WizardInterface
+    {
+        return match ($ruleType) {
+            self::CELL_VALUE => new Wizard\CellValue($this->cellRange),
+            self::TEXT_VALUE => new Wizard\TextValue($this->cellRange),
+            self::BLANKS => new Wizard\Blanks($this->cellRange, true),
+            self::NOT_BLANKS => new Wizard\Blanks($this->cellRange, false),
+            self::ERRORS => new Wizard\Errors($this->cellRange, true),
+            self::NOT_ERRORS => new Wizard\Errors($this->cellRange, false),
+            self::EXPRESSION, self::FORMULA => new Wizard\Expression($this->cellRange),
+            self::DATES_OCCURRING => new Wizard\DateValue($this->cellRange),
+            self::DUPLICATES => new Wizard\Duplicates($this->cellRange, false),
+            self::UNIQUE => new Wizard\Duplicates($this->cellRange, true),
+            default => throw new Exception('No wizard exists for this CF rule type'),
+        };
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        $conditionalType = $conditional->getConditionType();
+
+        return match ($conditionalType) {
+            Conditional::CONDITION_CELLIS => Wizard\CellValue::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_CONTAINSTEXT, Conditional::CONDITION_NOTCONTAINSTEXT, Conditional::CONDITION_BEGINSWITH, Conditional::CONDITION_ENDSWITH => Wizard\TextValue::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_CONTAINSBLANKS, Conditional::CONDITION_NOTCONTAINSBLANKS => Wizard\Blanks::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_CONTAINSERRORS, Conditional::CONDITION_NOTCONTAINSERRORS => Wizard\Errors::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_TIMEPERIOD => Wizard\DateValue::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_EXPRESSION => Wizard\Expression::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_DUPLICATES, Conditional::CONDITION_UNIQUE => Wizard\Duplicates::fromConditional($conditional, $cellRange),
+            default => throw new Exception('No wizard exists for this CF rule type'),
+        };
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php
new file mode 100644
index 00000000..5a8fe9b9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method Blanks notBlank()
+ * @method Blanks notEmpty()
+ * @method Blanks isBlank()
+ * @method Blanks isEmpty()
+ */
+class Blanks extends WizardAbstract implements WizardInterface
+{
+    protected const OPERATORS = [
+        'notBlank' => false,
+        'isBlank' => true,
+        'notEmpty' => false,
+        'empty' => true,
+    ];
+
+    protected const EXPRESSIONS = [
+        Wizard::NOT_BLANKS => 'LEN(TRIM(%s))>0',
+        Wizard::BLANKS => 'LEN(TRIM(%s))=0',
+    ];
+
+    protected bool $inverse;
+
+    public function __construct(string $cellRange, bool $inverse = false)
+    {
+        parent::__construct($cellRange);
+        $this->inverse = $inverse;
+    }
+
+    protected function inverse(bool $inverse): void
+    {
+        $this->inverse = $inverse;
+    }
+
+    protected function getExpression(): void
+    {
+        $this->expression = sprintf(
+            self::EXPRESSIONS[$this->inverse ? Wizard::BLANKS : Wizard::NOT_BLANKS],
+            $this->referenceCell
+        );
+    }
+
+    public function getConditional(): Conditional
+    {
+        $this->getExpression();
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(
+            $this->inverse ? Conditional::CONDITION_CONTAINSBLANKS : Conditional::CONDITION_NOTCONTAINSBLANKS
+        );
+        $conditional->setConditions([$this->expression]);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if (
+            $conditional->getConditionType() !== Conditional::CONDITION_CONTAINSBLANKS
+            && $conditional->getConditionType() !== Conditional::CONDITION_NOTCONTAINSBLANKS
+        ) {
+            throw new Exception('Conditional is not a Blanks CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->inverse = $conditional->getConditionType() === Conditional::CONDITION_CONTAINSBLANKS;
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!array_key_exists($methodName, self::OPERATORS)) {
+            throw new Exception('Invalid Operation for Blanks CF Rule Wizard');
+        }
+
+        $this->inverse(self::OPERATORS[$methodName]);
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php
new file mode 100644
index 00000000..63f360b4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\CellMatcher;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method CellValue equals($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue notEquals($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue greaterThan($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue greaterThanOrEqual($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue lessThan($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue lessThanOrEqual($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue between($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue notBetween($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue and($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ */
+class CellValue extends WizardAbstract implements WizardInterface
+{
+    protected const MAGIC_OPERATIONS = [
+        'equals' => Conditional::OPERATOR_EQUAL,
+        'notEquals' => Conditional::OPERATOR_NOTEQUAL,
+        'greaterThan' => Conditional::OPERATOR_GREATERTHAN,
+        'greaterThanOrEqual' => Conditional::OPERATOR_GREATERTHANOREQUAL,
+        'lessThan' => Conditional::OPERATOR_LESSTHAN,
+        'lessThanOrEqual' => Conditional::OPERATOR_LESSTHANOREQUAL,
+        'between' => Conditional::OPERATOR_BETWEEN,
+        'notBetween' => Conditional::OPERATOR_NOTBETWEEN,
+    ];
+
+    protected const SINGLE_OPERATORS = CellMatcher::COMPARISON_OPERATORS;
+
+    protected const RANGE_OPERATORS = CellMatcher::COMPARISON_RANGE_OPERATORS;
+
+    protected string $operator = Conditional::OPERATOR_EQUAL;
+
+    protected array $operand = [0];
+
+    /**
+     * @var string[]
+     */
+    protected array $operandValueType = [];
+
+    public function __construct(string $cellRange)
+    {
+        parent::__construct($cellRange);
+    }
+
+    protected function operator(string $operator): void
+    {
+        if ((!isset(self::SINGLE_OPERATORS[$operator])) && (!isset(self::RANGE_OPERATORS[$operator]))) {
+            throw new Exception('Invalid Operator for Cell Value CF Rule Wizard');
+        }
+
+        $this->operator = $operator;
+    }
+
+    protected function operand(int $index, mixed $operand, string $operandValueType = Wizard::VALUE_TYPE_LITERAL): void
+    {
+        if (is_string($operand)) {
+            $operand = $this->validateOperand($operand, $operandValueType);
+        }
+
+        $this->operand[$index] = $operand;
+        $this->operandValueType[$index] = $operandValueType;
+    }
+
+    /** @param null|bool|float|int|string $value value to be wrapped */
+    protected function wrapValue(mixed $value, string $operandValueType): float|int|string
+    {
+        if (!is_numeric($value) && !is_bool($value) && null !== $value) {
+            if ($operandValueType === Wizard::VALUE_TYPE_LITERAL) {
+                return '"' . str_replace('"', '""', $value) . '"';
+            }
+
+            return $this->cellConditionCheck($value);
+        }
+
+        if (null === $value) {
+            $value = 'NULL';
+        } elseif (is_bool($value)) {
+            $value = $value ? 'TRUE' : 'FALSE';
+        }
+
+        return $value;
+    }
+
+    public function getConditional(): Conditional
+    {
+        if (!isset(self::RANGE_OPERATORS[$this->operator])) {
+            unset($this->operand[1], $this->operandValueType[1]);
+        }
+        $values = array_map([$this, 'wrapValue'], $this->operand, $this->operandValueType);
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(Conditional::CONDITION_CELLIS);
+        $conditional->setOperatorType($this->operator);
+        $conditional->setConditions($values);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    protected static function unwrapString(string $condition): string
+    {
+        if ((str_starts_with($condition, '"')) && (str_starts_with(strrev($condition), '"'))) {
+            $condition = substr($condition, 1, -1);
+        }
+
+        return str_replace('""', '"', $condition);
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if ($conditional->getConditionType() !== Conditional::CONDITION_CELLIS) {
+            throw new Exception('Conditional is not a Cell Value CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+
+        $wizard->operator = $conditional->getOperatorType();
+        $conditions = $conditional->getConditions();
+        foreach ($conditions as $index => $condition) {
+            // Best-guess to try and identify if the text is a string literal, a cell reference or a formula?
+            $operandValueType = Wizard::VALUE_TYPE_LITERAL;
+            if (is_string($condition)) {
+                if (Calculation::keyInExcelConstants($condition)) {
+                    $condition = Calculation::getExcelConstants($condition);
+                } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '$/i', $condition)) {
+                    $operandValueType = Wizard::VALUE_TYPE_CELL;
+                    $condition = self::reverseAdjustCellRef($condition, $cellRange);
+                } elseif (
+                    preg_match('/\(\)/', $condition)
+                    || preg_match('/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i', $condition)
+                ) {
+                    $operandValueType = Wizard::VALUE_TYPE_FORMULA;
+                    $condition = self::reverseAdjustCellRef($condition, $cellRange);
+                } else {
+                    $condition = self::unwrapString($condition);
+                }
+            }
+            $wizard->operand($index, $condition, $operandValueType);
+        }
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!isset(self::MAGIC_OPERATIONS[$methodName]) && $methodName !== 'and') {
+            throw new Exception('Invalid Operator for Cell Value CF Rule Wizard');
+        }
+
+        if ($methodName === 'and') {
+            if (!isset(self::RANGE_OPERATORS[$this->operator])) {
+                throw new Exception('AND Value is only appropriate for range operators');
+            }
+
+            $this->operand(1, ...$arguments);
+
+            return $this;
+        }
+
+        $this->operator(self::MAGIC_OPERATIONS[$methodName]);
+        //$this->operand(0, ...$arguments);
+        if (count($arguments) < 2) {
+            $this->operand(0, $arguments[0]);
+        } else {
+            /** @var string */
+            $arg1 = $arguments[1];
+            $this->operand(0, $arguments[0], $arg1);
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php
new file mode 100644
index 00000000..23477e9c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+
+/**
+ * @method DateValue yesterday()
+ * @method DateValue today()
+ * @method DateValue tomorrow()
+ * @method DateValue lastSevenDays()
+ * @method DateValue lastWeek()
+ * @method DateValue thisWeek()
+ * @method DateValue nextWeek()
+ * @method DateValue lastMonth()
+ * @method DateValue thisMonth()
+ * @method DateValue nextMonth()
+ */
+class DateValue extends WizardAbstract implements WizardInterface
+{
+    protected const MAGIC_OPERATIONS = [
+        'yesterday' => Conditional::TIMEPERIOD_YESTERDAY,
+        'today' => Conditional::TIMEPERIOD_TODAY,
+        'tomorrow' => Conditional::TIMEPERIOD_TOMORROW,
+        'lastSevenDays' => Conditional::TIMEPERIOD_LAST_7_DAYS,
+        'last7Days' => Conditional::TIMEPERIOD_LAST_7_DAYS,
+        'lastWeek' => Conditional::TIMEPERIOD_LAST_WEEK,
+        'thisWeek' => Conditional::TIMEPERIOD_THIS_WEEK,
+        'nextWeek' => Conditional::TIMEPERIOD_NEXT_WEEK,
+        'lastMonth' => Conditional::TIMEPERIOD_LAST_MONTH,
+        'thisMonth' => Conditional::TIMEPERIOD_THIS_MONTH,
+        'nextMonth' => Conditional::TIMEPERIOD_NEXT_MONTH,
+    ];
+
+    protected const EXPRESSIONS = [
+        Conditional::TIMEPERIOD_YESTERDAY => 'FLOOR(%s,1)=TODAY()-1',
+        Conditional::TIMEPERIOD_TODAY => 'FLOOR(%s,1)=TODAY()',
+        Conditional::TIMEPERIOD_TOMORROW => 'FLOOR(%s,1)=TODAY()+1',
+        Conditional::TIMEPERIOD_LAST_7_DAYS => 'AND(TODAY()-FLOOR(%s,1)<=6,FLOOR(%s,1)<=TODAY())',
+        Conditional::TIMEPERIOD_LAST_WEEK => 'AND(TODAY()-ROUNDDOWN(%s,0)>=(WEEKDAY(TODAY())),TODAY()-ROUNDDOWN(%s,0)<(WEEKDAY(TODAY())+7))',
+        Conditional::TIMEPERIOD_THIS_WEEK => 'AND(TODAY()-ROUNDDOWN(%s,0)<=WEEKDAY(TODAY())-1,ROUNDDOWN(%s,0)-TODAY()<=7-WEEKDAY(TODAY()))',
+        Conditional::TIMEPERIOD_NEXT_WEEK => 'AND(ROUNDDOWN(%s,0)-TODAY()>(7-WEEKDAY(TODAY())),ROUNDDOWN(%s,0)-TODAY()<(15-WEEKDAY(TODAY())))',
+        Conditional::TIMEPERIOD_LAST_MONTH => 'AND(MONTH(%s)=MONTH(EDATE(TODAY(),0-1)),YEAR(%s)=YEAR(EDATE(TODAY(),0-1)))',
+        Conditional::TIMEPERIOD_THIS_MONTH => 'AND(MONTH(%s)=MONTH(TODAY()),YEAR(%s)=YEAR(TODAY()))',
+        Conditional::TIMEPERIOD_NEXT_MONTH => 'AND(MONTH(%s)=MONTH(EDATE(TODAY(),0+1)),YEAR(%s)=YEAR(EDATE(TODAY(),0+1)))',
+    ];
+
+    protected string $operator;
+
+    public function __construct(string $cellRange)
+    {
+        parent::__construct($cellRange);
+    }
+
+    protected function operator(string $operator): void
+    {
+        $this->operator = $operator;
+    }
+
+    protected function setExpression(): void
+    {
+        $referenceCount = substr_count(self::EXPRESSIONS[$this->operator], '%s');
+        $references = array_fill(0, $referenceCount, $this->referenceCell);
+        $this->expression = sprintf(self::EXPRESSIONS[$this->operator], ...$references);
+    }
+
+    public function getConditional(): Conditional
+    {
+        $this->setExpression();
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(Conditional::CONDITION_TIMEPERIOD);
+        $conditional->setText($this->operator);
+        $conditional->setConditions([$this->expression]);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if ($conditional->getConditionType() !== Conditional::CONDITION_TIMEPERIOD) {
+            throw new Exception('Conditional is not a Date Value CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->operator = $conditional->getText();
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!isset(self::MAGIC_OPERATIONS[$methodName])) {
+            throw new Exception('Invalid Operation for Date Value CF Rule Wizard');
+        }
+
+        $this->operator(self::MAGIC_OPERATIONS[$methodName]);
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php
new file mode 100644
index 00000000..0fbeddbb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+
+/**
+ * @method Errors duplicates()
+ * @method Errors unique()
+ */
+class Duplicates extends WizardAbstract implements WizardInterface
+{
+    protected const OPERATORS = [
+        'duplicates' => false,
+        'unique' => true,
+    ];
+
+    protected bool $inverse;
+
+    public function __construct(string $cellRange, bool $inverse = false)
+    {
+        parent::__construct($cellRange);
+        $this->inverse = $inverse;
+    }
+
+    protected function inverse(bool $inverse): void
+    {
+        $this->inverse = $inverse;
+    }
+
+    public function getConditional(): Conditional
+    {
+        $conditional = new Conditional();
+        $conditional->setConditionType(
+            $this->inverse ? Conditional::CONDITION_UNIQUE : Conditional::CONDITION_DUPLICATES
+        );
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if (
+            $conditional->getConditionType() !== Conditional::CONDITION_DUPLICATES
+            && $conditional->getConditionType() !== Conditional::CONDITION_UNIQUE
+        ) {
+            throw new Exception('Conditional is not a Duplicates CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->inverse = $conditional->getConditionType() === Conditional::CONDITION_UNIQUE;
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!array_key_exists($methodName, self::OPERATORS)) {
+            throw new Exception('Invalid Operation for Errors CF Rule Wizard');
+        }
+
+        $this->inverse(self::OPERATORS[$methodName]);
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.php
new file mode 100644
index 00000000..03a2381d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method Errors notError()
+ * @method Errors isError()
+ */
+class Errors extends WizardAbstract implements WizardInterface
+{
+    protected const OPERATORS = [
+        'notError' => false,
+        'isError' => true,
+    ];
+
+    protected const EXPRESSIONS = [
+        Wizard::NOT_ERRORS => 'NOT(ISERROR(%s))',
+        Wizard::ERRORS => 'ISERROR(%s)',
+    ];
+
+    protected bool $inverse;
+
+    public function __construct(string $cellRange, bool $inverse = false)
+    {
+        parent::__construct($cellRange);
+        $this->inverse = $inverse;
+    }
+
+    protected function inverse(bool $inverse): void
+    {
+        $this->inverse = $inverse;
+    }
+
+    protected function getExpression(): void
+    {
+        $this->expression = sprintf(
+            self::EXPRESSIONS[$this->inverse ? Wizard::ERRORS : Wizard::NOT_ERRORS],
+            $this->referenceCell
+        );
+    }
+
+    public function getConditional(): Conditional
+    {
+        $this->getExpression();
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(
+            $this->inverse ? Conditional::CONDITION_CONTAINSERRORS : Conditional::CONDITION_NOTCONTAINSERRORS
+        );
+        $conditional->setConditions([$this->expression]);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if (
+            $conditional->getConditionType() !== Conditional::CONDITION_CONTAINSERRORS
+            && $conditional->getConditionType() !== Conditional::CONDITION_NOTCONTAINSERRORS
+        ) {
+            throw new Exception('Conditional is not an Errors CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->inverse = $conditional->getConditionType() === Conditional::CONDITION_CONTAINSERRORS;
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!array_key_exists($methodName, self::OPERATORS)) {
+            throw new Exception('Invalid Operation for Errors CF Rule Wizard');
+        }
+
+        $this->inverse(self::OPERATORS[$methodName]);
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php
new file mode 100644
index 00000000..3f954411
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method Expression formula(string $expression)
+ */
+class Expression extends WizardAbstract implements WizardInterface
+{
+    protected string $expression;
+
+    public function __construct(string $cellRange)
+    {
+        parent::__construct($cellRange);
+    }
+
+    public function expression(string $expression): self
+    {
+        $expression = $this->validateOperand($expression, Wizard::VALUE_TYPE_FORMULA);
+        $this->expression = $expression;
+
+        return $this;
+    }
+
+    public function getConditional(): Conditional
+    {
+        $expression = $this->adjustConditionsForCellReferences([$this->expression]);
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(Conditional::CONDITION_EXPRESSION);
+        $conditional->setConditions($expression);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if ($conditional->getConditionType() !== Conditional::CONDITION_EXPRESSION) {
+            throw new Exception('Conditional is not an Expression CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->expression = self::reverseAdjustCellRef((string) ($conditional->getConditions()[0]), $cellRange);
+
+        return $wizard;
+    }
+
+    /**
+     * @param string[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if ($methodName !== 'formula') {
+            throw new Exception('Invalid Operation for Expression CF Rule Wizard');
+        }
+
+        $this->expression(...$arguments);
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php
new file mode 100644
index 00000000..b25c4f42
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method TextValue contains(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue doesNotContain(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue doesntContain(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue beginsWith(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue startsWith(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue endsWith(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ */
+class TextValue extends WizardAbstract implements WizardInterface
+{
+    protected const MAGIC_OPERATIONS = [
+        'contains' => Conditional::OPERATOR_CONTAINSTEXT,
+        'doesntContain' => Conditional::OPERATOR_NOTCONTAINS,
+        'doesNotContain' => Conditional::OPERATOR_NOTCONTAINS,
+        'beginsWith' => Conditional::OPERATOR_BEGINSWITH,
+        'startsWith' => Conditional::OPERATOR_BEGINSWITH,
+        'endsWith' => Conditional::OPERATOR_ENDSWITH,
+    ];
+
+    protected const OPERATORS = [
+        Conditional::OPERATOR_CONTAINSTEXT => Conditional::CONDITION_CONTAINSTEXT,
+        Conditional::OPERATOR_NOTCONTAINS => Conditional::CONDITION_NOTCONTAINSTEXT,
+        Conditional::OPERATOR_BEGINSWITH => Conditional::CONDITION_BEGINSWITH,
+        Conditional::OPERATOR_ENDSWITH => Conditional::CONDITION_ENDSWITH,
+    ];
+
+    protected const EXPRESSIONS = [
+        Conditional::OPERATOR_CONTAINSTEXT => 'NOT(ISERROR(SEARCH(%s,%s)))',
+        Conditional::OPERATOR_NOTCONTAINS => 'ISERROR(SEARCH(%s,%s))',
+        Conditional::OPERATOR_BEGINSWITH => 'LEFT(%s,LEN(%s))=%s',
+        Conditional::OPERATOR_ENDSWITH => 'RIGHT(%s,LEN(%s))=%s',
+    ];
+
+    protected string $operator;
+
+    protected string $operand;
+
+    protected string $operandValueType;
+
+    public function __construct(string $cellRange)
+    {
+        parent::__construct($cellRange);
+    }
+
+    protected function operator(string $operator): void
+    {
+        if (!isset(self::OPERATORS[$operator])) {
+            throw new Exception('Invalid Operator for Text Value CF Rule Wizard');
+        }
+
+        $this->operator = $operator;
+    }
+
+    protected function operand(string $operand, string $operandValueType = Wizard::VALUE_TYPE_LITERAL): void
+    {
+        $operand = $this->validateOperand($operand, $operandValueType);
+
+        $this->operand = $operand;
+        $this->operandValueType = $operandValueType;
+    }
+
+    protected function wrapValue(string $value): string
+    {
+        return '"' . $value . '"';
+    }
+
+    protected function setExpression(): void
+    {
+        $operand = $this->operandValueType === Wizard::VALUE_TYPE_LITERAL
+            ? $this->wrapValue(str_replace('"', '""', $this->operand))
+            : $this->cellConditionCheck($this->operand);
+
+        if (
+            $this->operator === Conditional::OPERATOR_CONTAINSTEXT
+            || $this->operator === Conditional::OPERATOR_NOTCONTAINS
+        ) {
+            $this->expression = sprintf(self::EXPRESSIONS[$this->operator], $operand, $this->referenceCell);
+        } else {
+            $this->expression = sprintf(self::EXPRESSIONS[$this->operator], $this->referenceCell, $operand, $operand);
+        }
+    }
+
+    public function getConditional(): Conditional
+    {
+        $this->setExpression();
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(self::OPERATORS[$this->operator]);
+        $conditional->setOperatorType($this->operator);
+        $conditional->setText(
+            $this->operandValueType !== Wizard::VALUE_TYPE_LITERAL
+                ? $this->cellConditionCheck($this->operand)
+                : $this->operand
+        );
+        $conditional->setConditions([$this->expression]);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if (!in_array($conditional->getConditionType(), self::OPERATORS, true)) {
+            throw new Exception('Conditional is not a Text Value CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->operator = (string) array_search($conditional->getConditionType(), self::OPERATORS, true);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+
+        // Best-guess to try and identify if the text is a string literal, a cell reference or a formula?
+        $wizard->operandValueType = Wizard::VALUE_TYPE_LITERAL;
+        $condition = $conditional->getText();
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '$/i', $condition)) {
+            $wizard->operandValueType = Wizard::VALUE_TYPE_CELL;
+            $condition = self::reverseAdjustCellRef($condition, $cellRange);
+        } elseif (
+            preg_match('/\(\)/', $condition)
+            || preg_match('/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i', $condition)
+        ) {
+            $wizard->operandValueType = Wizard::VALUE_TYPE_FORMULA;
+        }
+        $wizard->operand = $condition;
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!isset(self::MAGIC_OPERATIONS[$methodName])) {
+            throw new Exception('Invalid Operation for Text Value CF Rule Wizard');
+        }
+
+        $this->operator(self::MAGIC_OPERATIONS[$methodName]);
+        //$this->operand(...$arguments);
+        if (count($arguments) < 2) {
+            /** @var string */
+            $arg0 = $arguments[0];
+            $this->operand($arg0);
+        } else {
+            /** @var string */
+            $arg0 = $arguments[0];
+            /** @var string */
+            $arg1 = $arguments[1];
+            $this->operand($arg0, $arg1);
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
new file mode 100644
index 00000000..02d06809
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+abstract class WizardAbstract
+{
+    /**
+     * @var ?Style
+     */
+    protected ?Style $style = null;
+
+    protected string $expression;
+
+    protected string $cellRange;
+
+    protected string $referenceCell;
+
+    protected int $referenceRow;
+
+    protected bool $stopIfTrue = false;
+
+    protected int $referenceColumn;
+
+    public function __construct(string $cellRange)
+    {
+        $this->setCellRange($cellRange);
+    }
+
+    public function getCellRange(): string
+    {
+        return $this->cellRange;
+    }
+
+    public function setCellRange(string $cellRange): void
+    {
+        $this->cellRange = $cellRange;
+        $this->setReferenceCellForExpressions($cellRange);
+    }
+
+    protected function setReferenceCellForExpressions(string $conditionalRange): void
+    {
+        $conditionalRange = Coordinate::splitRange(str_replace('$', '', strtoupper($conditionalRange)));
+        [$this->referenceCell] = $conditionalRange[0];
+
+        [$this->referenceColumn, $this->referenceRow] = Coordinate::indexesFromString($this->referenceCell);
+    }
+
+    public function getStopIfTrue(): bool
+    {
+        return $this->stopIfTrue;
+    }
+
+    public function setStopIfTrue(bool $stopIfTrue): void
+    {
+        $this->stopIfTrue = $stopIfTrue;
+    }
+
+    public function getStyle(): Style
+    {
+        return $this->style ?? new Style(false, true);
+    }
+
+    public function setStyle(Style $style): void
+    {
+        $this->style = $style;
+    }
+
+    protected function validateOperand(string $operand, string $operandValueType = Wizard::VALUE_TYPE_LITERAL): string
+    {
+        if (
+            $operandValueType === Wizard::VALUE_TYPE_LITERAL
+            && str_starts_with($operand, '"')
+            && str_ends_with($operand, '"')
+        ) {
+            $operand = str_replace('""', '"', substr($operand, 1, -1));
+        } elseif ($operandValueType === Wizard::VALUE_TYPE_FORMULA && str_starts_with($operand, '=')) {
+            $operand = substr($operand, 1);
+        }
+
+        return $operand;
+    }
+
+    protected static function reverseCellAdjustment(array $matches, int $referenceColumn, int $referenceRow): string
+    {
+        $worksheet = $matches[1];
+        $column = $matches[6];
+        $row = $matches[7];
+
+        if (!str_contains($column, '$')) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column -= $referenceColumn - 1;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (!str_contains($row, '$')) {
+            $row -= $referenceRow - 1;
+        }
+
+        return "{$worksheet}{$column}{$row}";
+    }
+
+    public static function reverseAdjustCellRef(string $condition, string $cellRange): string
+    {
+        $conditionalRange = Coordinate::splitRange(str_replace('$', '', strtoupper($cellRange)));
+        [$referenceCell] = $conditionalRange[0];
+        [$referenceColumnIndex, $referenceRow] = Coordinate::indexesFromString($referenceCell);
+
+        $splitCondition = explode(Calculation::FORMULA_STRING_QUOTE, $condition);
+        $i = false;
+        foreach ($splitCondition as &$value) {
+            //    Only count/replace in alternating array entries (ie. not in quoted strings)
+            $i = $i === false;
+            if ($i) {
+                $value = (string) preg_replace_callback(
+                    '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i',
+                    fn ($matches): string => self::reverseCellAdjustment($matches, $referenceColumnIndex, $referenceRow),
+                    $value
+                );
+            }
+        }
+        unset($value);
+
+        //    Then rebuild the condition string to return it
+        return implode(Calculation::FORMULA_STRING_QUOTE, $splitCondition);
+    }
+
+    protected function conditionCellAdjustment(array $matches): string
+    {
+        $worksheet = $matches[1];
+        $column = $matches[6];
+        $row = $matches[7];
+
+        if (!str_contains($column, '$')) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column += $this->referenceColumn - 1;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (!str_contains($row, '$')) {
+            $row += $this->referenceRow - 1;
+        }
+
+        return "{$worksheet}{$column}{$row}";
+    }
+
+    protected function cellConditionCheck(string $condition): string
+    {
+        $splitCondition = explode(Calculation::FORMULA_STRING_QUOTE, $condition);
+        $i = false;
+        foreach ($splitCondition as &$value) {
+            //    Only count/replace in alternating array entries (ie. not in quoted strings)
+            $i = $i === false;
+            if ($i) {
+                $value = (string) preg_replace_callback(
+                    '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i',
+                    [$this, 'conditionCellAdjustment'],
+                    $value
+                );
+            }
+        }
+        unset($value);
+
+        //    Then rebuild the condition string to return it
+        return implode(Calculation::FORMULA_STRING_QUOTE, $splitCondition);
+    }
+
+    protected function adjustConditionsForCellReferences(array $conditions): array
+    {
+        return array_map(
+            [$this, 'cellConditionCheck'],
+            $conditions
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardInterface.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardInterface.php
new file mode 100644
index 00000000..10ad57b2
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+interface WizardInterface
+{
+    public function getCellRange(): string;
+
+    public function setCellRange(string $cellRange): void;
+
+    public function getStyle(): Style;
+
+    public function setStyle(Style $style): void;
+
+    public function getStopIfTrue(): bool;
+
+    public function setStopIfTrue(bool $stopIfTrue): void;
+
+    public function getConditional(): Conditional;
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): self;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php
new file mode 100644
index 00000000..9ec5d733
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php
@@ -0,0 +1,317 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+class Fill extends Supervisor
+{
+    // Fill types
+    const FILL_NONE = 'none';
+    const FILL_SOLID = 'solid';
+    const FILL_GRADIENT_LINEAR = 'linear';
+    const FILL_GRADIENT_PATH = 'path';
+    const FILL_PATTERN_DARKDOWN = 'darkDown';
+    const FILL_PATTERN_DARKGRAY = 'darkGray';
+    const FILL_PATTERN_DARKGRID = 'darkGrid';
+    const FILL_PATTERN_DARKHORIZONTAL = 'darkHorizontal';
+    const FILL_PATTERN_DARKTRELLIS = 'darkTrellis';
+    const FILL_PATTERN_DARKUP = 'darkUp';
+    const FILL_PATTERN_DARKVERTICAL = 'darkVertical';
+    const FILL_PATTERN_GRAY0625 = 'gray0625';
+    const FILL_PATTERN_GRAY125 = 'gray125';
+    const FILL_PATTERN_LIGHTDOWN = 'lightDown';
+    const FILL_PATTERN_LIGHTGRAY = 'lightGray';
+    const FILL_PATTERN_LIGHTGRID = 'lightGrid';
+    const FILL_PATTERN_LIGHTHORIZONTAL = 'lightHorizontal';
+    const FILL_PATTERN_LIGHTTRELLIS = 'lightTrellis';
+    const FILL_PATTERN_LIGHTUP = 'lightUp';
+    const FILL_PATTERN_LIGHTVERTICAL = 'lightVertical';
+    const FILL_PATTERN_MEDIUMGRAY = 'mediumGray';
+
+    public ?int $startcolorIndex = null;
+
+    public ?int $endcolorIndex = null;
+
+    /**
+     * Fill type.
+     */
+    protected ?string $fillType = self::FILL_NONE;
+
+    /**
+     * Rotation.
+     */
+    protected float $rotation = 0.0;
+
+    /**
+     * Start color.
+     */
+    protected Color $startColor;
+
+    /**
+     * End color.
+     */
+    protected Color $endColor;
+
+    private bool $colorChanged = false;
+
+    /**
+     * Create a new Fill.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param bool $isConditional Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        if ($isConditional) {
+            $this->fillType = null;
+        }
+        $this->startColor = new Color(Color::COLOR_WHITE, $isSupervisor, $isConditional);
+        $this->endColor = new Color(Color::COLOR_BLACK, $isSupervisor, $isConditional);
+
+        // bind parent if we are a supervisor
+        if ($isSupervisor) {
+            $this->startColor->bindParent($this, 'startColor');
+            $this->endColor->bindParent($this, 'endColor');
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getFill();
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        return ['fill' => $array];
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray(
+     *     [
+     *         'fillType' => Fill::FILL_GRADIENT_LINEAR,
+     *         'rotation' => 0.0,
+     *         'startColor' => [
+     *             'rgb' => '000000'
+     *         ],
+     *         'endColor' => [
+     *             'argb' => 'FFFFFFFF'
+     *         ]
+     *     ]
+     * );
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray): static
+    {
+        if ($this->isSupervisor) {
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
+        } else {
+            if (isset($styleArray['fillType'])) {
+                $this->setFillType($styleArray['fillType']);
+            }
+            if (isset($styleArray['rotation'])) {
+                $this->setRotation($styleArray['rotation']);
+            }
+            if (isset($styleArray['startColor'])) {
+                $this->getStartColor()->applyFromArray($styleArray['startColor']);
+            }
+            if (isset($styleArray['endColor'])) {
+                $this->getEndColor()->applyFromArray($styleArray['endColor']);
+            }
+            if (isset($styleArray['color'])) {
+                $this->getStartColor()->applyFromArray($styleArray['color']);
+                $this->getEndColor()->applyFromArray($styleArray['color']);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Fill Type.
+     */
+    public function getFillType(): ?string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getFillType();
+        }
+
+        return $this->fillType;
+    }
+
+    /**
+     * Set Fill Type.
+     *
+     * @param string $fillType Fill type, see self::FILL_*
+     *
+     * @return $this
+     */
+    public function setFillType(string $fillType): static
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['fillType' => $fillType]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->fillType = $fillType;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Rotation.
+     */
+    public function getRotation(): float
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getRotation();
+        }
+
+        return $this->rotation;
+    }
+
+    /**
+     * Set Rotation.
+     *
+     * @return $this
+     */
+    public function setRotation(float $angleInDegrees): static
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['rotation' => $angleInDegrees]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->rotation = $angleInDegrees;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Start Color.
+     */
+    public function getStartColor(): Color
+    {
+        return $this->startColor;
+    }
+
+    /**
+     * Set Start Color.
+     *
+     * @return $this
+     */
+    public function setStartColor(Color $color): static
+    {
+        $this->colorChanged = true;
+        // make sure parameter is a real color and not a supervisor
+        $color = $color->getIsSupervisor() ? $color->getSharedComponent() : $color;
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStartColor()->getStyleArray(['argb' => $color->getARGB()]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->startColor = $color;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get End Color.
+     */
+    public function getEndColor(): Color
+    {
+        return $this->endColor;
+    }
+
+    /**
+     * Set End Color.
+     *
+     * @return $this
+     */
+    public function setEndColor(Color $color): static
+    {
+        $this->colorChanged = true;
+        // make sure parameter is a real color and not a supervisor
+        $color = $color->getIsSupervisor() ? $color->getSharedComponent() : $color;
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getEndColor()->getStyleArray(['argb' => $color->getARGB()]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->endColor = $color;
+        }
+
+        return $this;
+    }
+
+    public function getColorsChanged(): bool
+    {
+        if ($this->isSupervisor) {
+            $changed = $this->getSharedComponent()->colorChanged;
+        } else {
+            $changed = $this->colorChanged;
+        }
+
+        return $changed || $this->startColor->getHasChanged() || $this->endColor->getHasChanged();
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+
+        // Note that we don't care about colours for fill type NONE, but could have duplicate NONEs with
+        //  different hashes if we don't explicitly prevent this
+        return md5(
+            $this->getFillType()
+            . $this->getRotation()
+            . ($this->getFillType() !== self::FILL_NONE ? $this->getStartColor()->getHashCode() : '')
+            . ($this->getFillType() !== self::FILL_NONE ? $this->getEndColor()->getHashCode() : '')
+            . ((string) $this->getColorsChanged())
+            . __CLASS__
+        );
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'fillType', $this->getFillType());
+        $this->exportArray2($exportedArray, 'rotation', $this->getRotation());
+        if ($this->getColorsChanged()) {
+            $this->exportArray2($exportedArray, 'endColor', $this->getEndColor());
+            $this->exportArray2($exportedArray, 'startColor', $this->getStartColor());
+        }
+
+        return $exportedArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php
new file mode 100644
index 00000000..232959de
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php
@@ -0,0 +1,835 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+
+class Font extends Supervisor
+{
+    // Underline types
+    const UNDERLINE_NONE = 'none';
+    const UNDERLINE_DOUBLE = 'double';
+    const UNDERLINE_DOUBLEACCOUNTING = 'doubleAccounting';
+    const UNDERLINE_SINGLE = 'single';
+    const UNDERLINE_SINGLEACCOUNTING = 'singleAccounting';
+
+    const CAP_ALL = 'all';
+    const CAP_SMALL = 'small';
+    const CAP_NONE = 'none';
+    private const VALID_CAPS = [self::CAP_ALL, self::CAP_SMALL, self::CAP_NONE];
+
+    protected ?string $cap = null;
+
+    /**
+     * Font Name.
+     */
+    protected ?string $name = 'Calibri';
+
+    /**
+     * The following 7 are used only for chart titles, I think.
+     */
+    private string $latin = '';
+
+    private string $eastAsian = '';
+
+    private string $complexScript = '';
+
+    private int $baseLine = 0;
+
+    private string $strikeType = '';
+
+    /** @var ?ChartColor */
+    private ?ChartColor $underlineColor = null;
+
+    /** @var ?ChartColor */
+    private ?ChartColor $chartColor = null;
+    // end of chart title items
+
+    /**
+     * Font Size.
+     */
+    protected ?float $size = 11;
+
+    /**
+     * Bold.
+     */
+    protected ?bool $bold = false;
+
+    /**
+     * Italic.
+     */
+    protected ?bool $italic = false;
+
+    /**
+     * Superscript.
+     */
+    protected ?bool $superscript = false;
+
+    /**
+     * Subscript.
+     */
+    protected ?bool $subscript = false;
+
+    /**
+     * Underline.
+     */
+    protected ?string $underline = self::UNDERLINE_NONE;
+
+    /**
+     * Strikethrough.
+     */
+    protected ?bool $strikethrough = false;
+
+    /**
+     * Foreground color.
+     */
+    protected Color $color;
+
+    public ?int $colorIndex = null;
+
+    protected string $scheme = '';
+
+    /**
+     * Create a new Font.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param bool $isConditional Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        if ($isConditional) {
+            $this->name = null;
+            $this->size = null;
+            $this->bold = null;
+            $this->italic = null;
+            $this->superscript = null;
+            $this->subscript = null;
+            $this->underline = null;
+            $this->strikethrough = null;
+            $this->color = new Color(Color::COLOR_BLACK, $isSupervisor, $isConditional);
+        } else {
+            $this->color = new Color(Color::COLOR_BLACK, $isSupervisor);
+        }
+        // bind parent if we are a supervisor
+        if ($isSupervisor) {
+            $this->color->bindParent($this, 'color');
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getFont();
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        return ['font' => $array];
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getFont()->applyFromArray(
+     *     [
+     *         'name' => 'Arial',
+     *         'bold' => TRUE,
+     *         'italic' => FALSE,
+     *         'underline' => \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLE,
+     *         'strikethrough' => FALSE,
+     *         'color' => [
+     *             'rgb' => '808080'
+     *         ]
+     *     ]
+     * );
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray): static
+    {
+        if ($this->isSupervisor) {
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
+        } else {
+            if (isset($styleArray['name'])) {
+                $this->setName($styleArray['name']);
+            }
+            if (isset($styleArray['latin'])) {
+                $this->setLatin($styleArray['latin']);
+            }
+            if (isset($styleArray['eastAsian'])) {
+                $this->setEastAsian($styleArray['eastAsian']);
+            }
+            if (isset($styleArray['complexScript'])) {
+                $this->setComplexScript($styleArray['complexScript']);
+            }
+            if (isset($styleArray['bold'])) {
+                $this->setBold($styleArray['bold']);
+            }
+            if (isset($styleArray['italic'])) {
+                $this->setItalic($styleArray['italic']);
+            }
+            if (isset($styleArray['superscript'])) {
+                $this->setSuperscript($styleArray['superscript']);
+            }
+            if (isset($styleArray['subscript'])) {
+                $this->setSubscript($styleArray['subscript']);
+            }
+            if (isset($styleArray['underline'])) {
+                $this->setUnderline($styleArray['underline']);
+            }
+            if (isset($styleArray['strikethrough'])) {
+                $this->setStrikethrough($styleArray['strikethrough']);
+            }
+            if (isset($styleArray['color'])) {
+                $this->getColor()->applyFromArray($styleArray['color']);
+            }
+            if (isset($styleArray['size'])) {
+                $this->setSize($styleArray['size']);
+            }
+            if (isset($styleArray['chartColor'])) {
+                $this->chartColor = $styleArray['chartColor'];
+            }
+            if (isset($styleArray['scheme'])) {
+                $this->setScheme($styleArray['scheme']);
+            }
+            if (isset($styleArray['cap'])) {
+                $this->setCap($styleArray['cap']);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Name.
+     */
+    public function getName(): ?string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getName();
+        }
+
+        return $this->name;
+    }
+
+    public function getLatin(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getLatin();
+        }
+
+        return $this->latin;
+    }
+
+    public function getEastAsian(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getEastAsian();
+        }
+
+        return $this->eastAsian;
+    }
+
+    public function getComplexScript(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getComplexScript();
+        }
+
+        return $this->complexScript;
+    }
+
+    /**
+     * Set Name and turn off Scheme.
+     */
+    public function setName(string $fontname): self
+    {
+        if ($fontname == '') {
+            $fontname = 'Calibri';
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['name' => $fontname]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->name = $fontname;
+        }
+
+        return $this->setScheme('');
+    }
+
+    public function setLatin(string $fontname): self
+    {
+        if ($fontname == '') {
+            $fontname = 'Calibri';
+        }
+        if (!$this->isSupervisor) {
+            $this->latin = $fontname;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['latin' => $fontname]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function setEastAsian(string $fontname): self
+    {
+        if ($fontname == '') {
+            $fontname = 'Calibri';
+        }
+        if (!$this->isSupervisor) {
+            $this->eastAsian = $fontname;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['eastAsian' => $fontname]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function setComplexScript(string $fontname): self
+    {
+        if ($fontname == '') {
+            $fontname = 'Calibri';
+        }
+        if (!$this->isSupervisor) {
+            $this->complexScript = $fontname;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['complexScript' => $fontname]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Size.
+     */
+    public function getSize(): ?float
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getSize();
+        }
+
+        return $this->size;
+    }
+
+    /**
+     * Set Size.
+     *
+     * @param mixed $sizeInPoints A float representing the value of a positive measurement in points (1/72 of an inch)
+     *
+     * @return $this
+     */
+    public function setSize(mixed $sizeInPoints, bool $nullOk = false): static
+    {
+        if (is_string($sizeInPoints) || is_int($sizeInPoints)) {
+            $sizeInPoints = (float) $sizeInPoints; // $pValue = 0 if given string is not numeric
+        }
+
+        // Size must be a positive floating point number
+        // ECMA-376-1:2016, part 1, chapter 18.4.11 sz (Font Size), p. 1536
+        if (!is_float($sizeInPoints) || !($sizeInPoints > 0)) {
+            if (!$nullOk || $sizeInPoints !== null) {
+                $sizeInPoints = 10.0;
+            }
+        }
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['size' => $sizeInPoints]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->size = $sizeInPoints;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Bold.
+     */
+    public function getBold(): ?bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getBold();
+        }
+
+        return $this->bold;
+    }
+
+    /**
+     * Set Bold.
+     *
+     * @return $this
+     */
+    public function setBold(bool $bold): static
+    {
+        if ($bold == '') {
+            $bold = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['bold' => $bold]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->bold = $bold;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Italic.
+     */
+    public function getItalic(): ?bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getItalic();
+        }
+
+        return $this->italic;
+    }
+
+    /**
+     * Set Italic.
+     *
+     * @return $this
+     */
+    public function setItalic(bool $italic): static
+    {
+        if ($italic == '') {
+            $italic = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['italic' => $italic]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->italic = $italic;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Superscript.
+     */
+    public function getSuperscript(): ?bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getSuperscript();
+        }
+
+        return $this->superscript;
+    }
+
+    /**
+     * Set Superscript.
+     *
+     * @return $this
+     */
+    public function setSuperscript(bool $superscript): static
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['superscript' => $superscript]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->superscript = $superscript;
+            if ($this->superscript) {
+                $this->subscript = false;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Subscript.
+     */
+    public function getSubscript(): ?bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getSubscript();
+        }
+
+        return $this->subscript;
+    }
+
+    /**
+     * Set Subscript.
+     *
+     * @return $this
+     */
+    public function setSubscript(bool $subscript): static
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['subscript' => $subscript]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->subscript = $subscript;
+            if ($this->subscript) {
+                $this->superscript = false;
+            }
+        }
+
+        return $this;
+    }
+
+    public function getBaseLine(): int
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getBaseLine();
+        }
+
+        return $this->baseLine;
+    }
+
+    public function setBaseLine(int $baseLine): self
+    {
+        if (!$this->isSupervisor) {
+            $this->baseLine = $baseLine;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['baseLine' => $baseLine]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function getStrikeType(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getStrikeType();
+        }
+
+        return $this->strikeType;
+    }
+
+    public function setStrikeType(string $strikeType): self
+    {
+        if (!$this->isSupervisor) {
+            $this->strikeType = $strikeType;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['strikeType' => $strikeType]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function getUnderlineColor(): ?ChartColor
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getUnderlineColor();
+        }
+
+        return $this->underlineColor;
+    }
+
+    public function setUnderlineColor(array $colorArray): self
+    {
+        if (!$this->isSupervisor) {
+            $this->underlineColor = new ChartColor($colorArray);
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['underlineColor' => $colorArray]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function getChartColor(): ?ChartColor
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getChartColor();
+        }
+
+        return $this->chartColor;
+    }
+
+    public function setChartColor(array $colorArray): self
+    {
+        if (!$this->isSupervisor) {
+            $this->chartColor = new ChartColor($colorArray);
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['chartColor' => $colorArray]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function setChartColorFromObject(?ChartColor $chartColor): self
+    {
+        $this->chartColor = $chartColor;
+
+        return $this;
+    }
+
+    /**
+     * Get Underline.
+     */
+    public function getUnderline(): ?string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getUnderline();
+        }
+
+        return $this->underline;
+    }
+
+    /**
+     * Set Underline.
+     *
+     * @param bool|string $underlineStyle \PhpOffice\PhpSpreadsheet\Style\Font underline type
+     *                                    If a boolean is passed, then TRUE equates to UNDERLINE_SINGLE,
+     *                                        false equates to UNDERLINE_NONE
+     *
+     * @return $this
+     */
+    public function setUnderline($underlineStyle): static
+    {
+        if (is_bool($underlineStyle)) {
+            $underlineStyle = ($underlineStyle) ? self::UNDERLINE_SINGLE : self::UNDERLINE_NONE;
+        } elseif ($underlineStyle == '') {
+            $underlineStyle = self::UNDERLINE_NONE;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['underline' => $underlineStyle]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->underline = $underlineStyle;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Strikethrough.
+     */
+    public function getStrikethrough(): ?bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getStrikethrough();
+        }
+
+        return $this->strikethrough;
+    }
+
+    /**
+     * Set Strikethrough.
+     *
+     * @return $this
+     */
+    public function setStrikethrough(bool $strikethru): static
+    {
+        if ($strikethru == '') {
+            $strikethru = false;
+        }
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['strikethrough' => $strikethru]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->strikethrough = $strikethru;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Color.
+     */
+    public function getColor(): Color
+    {
+        return $this->color;
+    }
+
+    /**
+     * Set Color.
+     *
+     * @return $this
+     */
+    public function setColor(Color $color): static
+    {
+        // make sure parameter is a real color and not a supervisor
+        $color = $color->getIsSupervisor() ? $color->getSharedComponent() : $color;
+
+        if ($this->isSupervisor) {
+            $styleArray = $this->getColor()->getStyleArray(['argb' => $color->getARGB()]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->color = $color;
+        }
+
+        return $this;
+    }
+
+    private function hashChartColor(?ChartColor $underlineColor): string
+    {
+        if ($underlineColor === null) {
+            return '';
+        }
+
+        return
+            $underlineColor->getValue()
+            . $underlineColor->getType()
+            . (string) $underlineColor->getAlpha();
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+
+        return md5(
+            $this->name
+            . $this->size
+            . ($this->bold ? 't' : 'f')
+            . ($this->italic ? 't' : 'f')
+            . ($this->superscript ? 't' : 'f')
+            . ($this->subscript ? 't' : 'f')
+            . $this->underline
+            . ($this->strikethrough ? 't' : 'f')
+            . $this->color->getHashCode()
+            . $this->scheme
+            . implode(
+                '*',
+                [
+                    $this->latin,
+                    $this->eastAsian,
+                    $this->complexScript,
+                    $this->strikeType,
+                    $this->hashChartColor($this->chartColor),
+                    $this->hashChartColor($this->underlineColor),
+                    (string) $this->baseLine,
+                    (string) $this->cap,
+                ]
+            )
+            . __CLASS__
+        );
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'baseLine', $this->getBaseLine());
+        $this->exportArray2($exportedArray, 'bold', $this->getBold());
+        $this->exportArray2($exportedArray, 'cap', $this->getCap());
+        $this->exportArray2($exportedArray, 'chartColor', $this->getChartColor());
+        $this->exportArray2($exportedArray, 'color', $this->getColor());
+        $this->exportArray2($exportedArray, 'complexScript', $this->getComplexScript());
+        $this->exportArray2($exportedArray, 'eastAsian', $this->getEastAsian());
+        $this->exportArray2($exportedArray, 'italic', $this->getItalic());
+        $this->exportArray2($exportedArray, 'latin', $this->getLatin());
+        $this->exportArray2($exportedArray, 'name', $this->getName());
+        $this->exportArray2($exportedArray, 'scheme', $this->getScheme());
+        $this->exportArray2($exportedArray, 'size', $this->getSize());
+        $this->exportArray2($exportedArray, 'strikethrough', $this->getStrikethrough());
+        $this->exportArray2($exportedArray, 'strikeType', $this->getStrikeType());
+        $this->exportArray2($exportedArray, 'subscript', $this->getSubscript());
+        $this->exportArray2($exportedArray, 'superscript', $this->getSuperscript());
+        $this->exportArray2($exportedArray, 'underline', $this->getUnderline());
+        $this->exportArray2($exportedArray, 'underlineColor', $this->getUnderlineColor());
+
+        return $exportedArray;
+    }
+
+    public function getScheme(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getScheme();
+        }
+
+        return $this->scheme;
+    }
+
+    public function setScheme(string $scheme): self
+    {
+        if ($scheme === '' || $scheme === 'major' || $scheme === 'minor') {
+            if ($this->isSupervisor) {
+                $styleArray = $this->getStyleArray(['scheme' => $scheme]);
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            } else {
+                $this->scheme = $scheme;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set capitalization attribute. If not one of the permitted
+     * values (all, small, or none), set it to null.
+     * This will be honored only for the font for chart titles.
+     * None is distinguished from null because null will inherit
+     * the current value, whereas 'none' will override it.
+     */
+    public function setCap(string $cap): self
+    {
+        $this->cap = in_array($cap, self::VALID_CAPS, true) ? $cap : null;
+
+        return $this;
+    }
+
+    public function getCap(): ?string
+    {
+        return $this->cap;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->color = clone $this->color;
+        $this->chartColor = ($this->chartColor === null) ? null : clone $this->chartColor;
+        $this->underlineColor = ($this->underlineColor === null) ? null : clone $this->underlineColor;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php
new file mode 100644
index 00000000..9c9a5456
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php
@@ -0,0 +1,517 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+
+class NumberFormat extends Supervisor
+{
+    // Pre-defined formats
+    const FORMAT_GENERAL = 'General';
+
+    const FORMAT_TEXT = '@';
+
+    const FORMAT_NUMBER = '0';
+    const FORMAT_NUMBER_0 = '0.0';
+    const FORMAT_NUMBER_00 = '0.00';
+    const FORMAT_NUMBER_COMMA_SEPARATED1 = '#,##0.00';
+    const FORMAT_NUMBER_COMMA_SEPARATED2 = '#,##0.00_-';
+
+    const FORMAT_PERCENTAGE = '0%';
+    const FORMAT_PERCENTAGE_0 = '0.0%';
+    const FORMAT_PERCENTAGE_00 = '0.00%';
+
+    const FORMAT_DATE_YYYYMMDD = 'yyyy-mm-dd';
+    const FORMAT_DATE_DDMMYYYY = 'dd/mm/yyyy';
+    const FORMAT_DATE_DMYSLASH = 'd/m/yy';
+    const FORMAT_DATE_DMYMINUS = 'd-m-yy';
+    const FORMAT_DATE_DMMINUS = 'd-m';
+    const FORMAT_DATE_MYMINUS = 'm-yy';
+    const FORMAT_DATE_XLSX14 = 'mm-dd-yy';
+    const FORMAT_DATE_XLSX14_ACTUAL = 'm/d/yyyy';
+    const FORMAT_DATE_XLSX15 = 'd-mmm-yy';
+    const FORMAT_DATE_XLSX16 = 'd-mmm';
+    const FORMAT_DATE_XLSX17 = 'mmm-yy';
+    const FORMAT_DATE_XLSX22 = 'm/d/yy h:mm';
+    const FORMAT_DATE_XLSX22_ACTUAL = 'm/d/yyyy h:mm';
+    const FORMAT_DATE_DATETIME = 'd/m/yy h:mm';
+    const FORMAT_DATE_TIME1 = 'h:mm AM/PM';
+    const FORMAT_DATE_TIME2 = 'h:mm:ss AM/PM';
+    const FORMAT_DATE_TIME3 = 'h:mm';
+    const FORMAT_DATE_TIME4 = 'h:mm:ss';
+    const FORMAT_DATE_TIME5 = 'mm:ss';
+    const FORMAT_DATE_TIME6 = 'h:mm:ss';
+    const FORMAT_DATE_TIME7 = 'i:s.S';
+    const FORMAT_DATE_TIME8 = 'h:mm:ss;@';
+    const FORMAT_DATE_YYYYMMDDSLASH = 'yyyy/mm/dd;@';
+    const FORMAT_DATE_LONG_DATE = 'dddd, mmmm d, yyyy';
+
+    const DATE_TIME_OR_DATETIME_ARRAY = [
+        self::FORMAT_DATE_YYYYMMDD,
+        self::FORMAT_DATE_DDMMYYYY,
+        self::FORMAT_DATE_DMYSLASH,
+        self::FORMAT_DATE_DMYMINUS,
+        self::FORMAT_DATE_DMMINUS,
+        self::FORMAT_DATE_MYMINUS,
+        self::FORMAT_DATE_XLSX14,
+        self::FORMAT_DATE_XLSX14_ACTUAL,
+        self::FORMAT_DATE_XLSX15,
+        self::FORMAT_DATE_XLSX16,
+        self::FORMAT_DATE_XLSX17,
+        self::FORMAT_DATE_XLSX22,
+        self::FORMAT_DATE_XLSX22_ACTUAL,
+        self::FORMAT_DATE_DATETIME,
+        self::FORMAT_DATE_TIME1,
+        self::FORMAT_DATE_TIME2,
+        self::FORMAT_DATE_TIME3,
+        self::FORMAT_DATE_TIME4,
+        self::FORMAT_DATE_TIME5,
+        self::FORMAT_DATE_TIME6,
+        self::FORMAT_DATE_TIME7,
+        self::FORMAT_DATE_TIME8,
+        self::FORMAT_DATE_YYYYMMDDSLASH,
+        self::FORMAT_DATE_LONG_DATE,
+    ];
+    const TIME_OR_DATETIME_ARRAY = [
+        self::FORMAT_DATE_XLSX22,
+        self::FORMAT_DATE_DATETIME,
+        self::FORMAT_DATE_TIME1,
+        self::FORMAT_DATE_TIME2,
+        self::FORMAT_DATE_TIME3,
+        self::FORMAT_DATE_TIME4,
+        self::FORMAT_DATE_TIME5,
+        self::FORMAT_DATE_TIME6,
+        self::FORMAT_DATE_TIME7,
+        self::FORMAT_DATE_TIME8,
+    ];
+
+    const FORMAT_CURRENCY_USD_INTEGER = '$#,##0_-';
+    const FORMAT_CURRENCY_USD = '$#,##0.00_-';
+    const FORMAT_CURRENCY_EUR_INTEGER = '#,##0_-[$€]';
+    const FORMAT_CURRENCY_EUR = '#,##0.00_-[$€]';
+    const FORMAT_ACCOUNTING_USD = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)';
+    const FORMAT_ACCOUNTING_EUR = '_("€"* #,##0.00_);_("€"* \(#,##0.00\);_("€"* "-"??_);_(@_)';
+
+    const SHORT_DATE_INDEX = 14;
+    const DATE_TIME_INDEX = 22;
+    const FORMAT_SYSDATE_X = '[$-x-sysdate]';
+    const FORMAT_SYSDATE_F800 = '[$-F800]';
+    const FORMAT_SYSTIME_X = '[$-x-systime]';
+    const FORMAT_SYSTIME_F400 = '[$-F400]';
+
+    protected static string $shortDateFormat = self::FORMAT_DATE_XLSX14_ACTUAL;
+
+    protected static string $longDateFormat = self::FORMAT_DATE_LONG_DATE;
+
+    protected static string $dateTimeFormat = self::FORMAT_DATE_XLSX22_ACTUAL;
+
+    protected static string $timeFormat = self::FORMAT_DATE_TIME2;
+
+    /**
+     * Excel built-in number formats.
+     */
+    protected static array $builtInFormats;
+
+    /**
+     * Excel built-in number formats (flipped, for faster lookups).
+     */
+    protected static array $flippedBuiltInFormats;
+
+    /**
+     * Format Code.
+     */
+    protected ?string $formatCode = self::FORMAT_GENERAL;
+
+    /**
+     * Built-in format Code.
+     *
+     * @var false|int
+     */
+    protected $builtInFormatCode = 0;
+
+    /**
+     * Create a new NumberFormat.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param bool $isConditional Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        if ($isConditional) {
+            $this->formatCode = null;
+            $this->builtInFormatCode = false;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getNumberFormat();
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        return ['numberFormat' => $array];
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getNumberFormat()->applyFromArray(
+     *     [
+     *         'formatCode' => NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE
+     *     ]
+     * );
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray): static
+    {
+        if ($this->isSupervisor) {
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
+        } else {
+            if (isset($styleArray['formatCode'])) {
+                $this->setFormatCode($styleArray['formatCode']);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Format Code.
+     */
+    public function getFormatCode(bool $extended = false): ?string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getFormatCode($extended);
+        }
+        $builtin = $this->getBuiltInFormatCode();
+        if (is_int($builtin)) {
+            if ($extended) {
+                if ($builtin === self::SHORT_DATE_INDEX) {
+                    return self::$shortDateFormat;
+                }
+                if ($builtin === self::DATE_TIME_INDEX) {
+                    return self::$dateTimeFormat;
+                }
+            }
+
+            return self::builtInFormatCode($builtin);
+        }
+
+        return $extended ? self::convertSystemFormats($this->formatCode) : $this->formatCode;
+    }
+
+    public static function convertSystemFormats(?string $formatCode): ?string
+    {
+        if (is_string($formatCode)) {
+            if (stripos($formatCode, self::FORMAT_SYSDATE_F800) !== false || stripos($formatCode, self::FORMAT_SYSDATE_X) !== false) {
+                return self::$longDateFormat;
+            }
+            if (stripos($formatCode, self::FORMAT_SYSTIME_F400) !== false || stripos($formatCode, self::FORMAT_SYSTIME_X) !== false) {
+                return self::$timeFormat;
+            }
+        }
+
+        return $formatCode;
+    }
+
+    /**
+     * Set Format Code.
+     *
+     * @param string $formatCode see self::FORMAT_*
+     *
+     * @return $this
+     */
+    public function setFormatCode(string $formatCode): static
+    {
+        if ($formatCode == '') {
+            $formatCode = self::FORMAT_GENERAL;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['formatCode' => $formatCode]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->formatCode = $formatCode;
+            $this->builtInFormatCode = self::builtInFormatCodeIndex($formatCode);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Built-In Format Code.
+     *
+     * @return false|int
+     */
+    public function getBuiltInFormatCode()
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getBuiltInFormatCode();
+        }
+
+        return $this->builtInFormatCode;
+    }
+
+    /**
+     * Set Built-In Format Code.
+     *
+     * @param int $formatCodeIndex Id of the built-in format code to use
+     *
+     * @return $this
+     */
+    public function setBuiltInFormatCode(int $formatCodeIndex): static
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['formatCode' => self::builtInFormatCode($formatCodeIndex)]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->builtInFormatCode = $formatCodeIndex;
+            $this->formatCode = self::builtInFormatCode($formatCodeIndex);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Fill built-in format codes.
+     */
+    private static function fillBuiltInFormatCodes(): void
+    {
+        //  [MS-OI29500: Microsoft Office Implementation Information for ISO/IEC-29500 Standard Compliance]
+        //  18.8.30. numFmt (Number Format)
+        //
+        //  The ECMA standard defines built-in format IDs
+        //      14: "mm-dd-yy"
+        //      22: "m/d/yy h:mm"
+        //      37: "#,##0 ;(#,##0)"
+        //      38: "#,##0 ;[Red](#,##0)"
+        //      39: "#,##0.00;(#,##0.00)"
+        //      40: "#,##0.00;[Red](#,##0.00)"
+        //      47: "mmss.0"
+        //      KOR fmt 55: "yyyy-mm-dd"
+        //  Excel defines built-in format IDs
+        //      14: "m/d/yyyy"
+        //      22: "m/d/yyyy h:mm"
+        //      37: "#,##0_);(#,##0)"
+        //      38: "#,##0_);[Red](#,##0)"
+        //      39: "#,##0.00_);(#,##0.00)"
+        //      40: "#,##0.00_);[Red](#,##0.00)"
+        //      47: "mm:ss.0"
+        //      KOR fmt 55: "yyyy/mm/dd"
+
+        // Built-in format codes
+        if (empty(self::$builtInFormats)) {
+            self::$builtInFormats = [];
+
+            // General
+            self::$builtInFormats[0] = self::FORMAT_GENERAL;
+            self::$builtInFormats[1] = '0';
+            self::$builtInFormats[2] = '0.00';
+            self::$builtInFormats[3] = '#,##0';
+            self::$builtInFormats[4] = '#,##0.00';
+
+            self::$builtInFormats[9] = '0%';
+            self::$builtInFormats[10] = '0.00%';
+            self::$builtInFormats[11] = '0.00E+00';
+            self::$builtInFormats[12] = '# ?/?';
+            self::$builtInFormats[13] = '# ??/??';
+            self::$builtInFormats[14] = self::FORMAT_DATE_XLSX14_ACTUAL; // Despite ECMA 'mm-dd-yy';
+            self::$builtInFormats[15] = self::FORMAT_DATE_XLSX15;
+            self::$builtInFormats[16] = 'd-mmm';
+            self::$builtInFormats[17] = 'mmm-yy';
+            self::$builtInFormats[18] = 'h:mm AM/PM';
+            self::$builtInFormats[19] = 'h:mm:ss AM/PM';
+            self::$builtInFormats[20] = 'h:mm';
+            self::$builtInFormats[21] = 'h:mm:ss';
+            self::$builtInFormats[22] = self::FORMAT_DATE_XLSX22_ACTUAL; // Despite ECMA 'm/d/yy h:mm';
+
+            self::$builtInFormats[37] = '#,##0_);(#,##0)'; //  Despite ECMA '#,##0 ;(#,##0)';
+            self::$builtInFormats[38] = '#,##0_);[Red](#,##0)'; //  Despite ECMA '#,##0 ;[Red](#,##0)';
+            self::$builtInFormats[39] = '#,##0.00_);(#,##0.00)'; //  Despite ECMA '#,##0.00;(#,##0.00)';
+            self::$builtInFormats[40] = '#,##0.00_);[Red](#,##0.00)'; //  Despite ECMA '#,##0.00;[Red](#,##0.00)';
+
+            self::$builtInFormats[44] = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)';
+            self::$builtInFormats[45] = 'mm:ss';
+            self::$builtInFormats[46] = '[h]:mm:ss';
+            self::$builtInFormats[47] = 'mm:ss.0'; //  Despite ECMA 'mmss.0';
+            self::$builtInFormats[48] = '##0.0E+0';
+            self::$builtInFormats[49] = '@';
+
+            // CHT
+            self::$builtInFormats[27] = '[$-404]e/m/d';
+            self::$builtInFormats[30] = 'm/d/yy';
+            self::$builtInFormats[36] = '[$-404]e/m/d';
+            self::$builtInFormats[50] = '[$-404]e/m/d';
+            self::$builtInFormats[57] = '[$-404]e/m/d';
+
+            // THA
+            self::$builtInFormats[59] = 't0';
+            self::$builtInFormats[60] = 't0.00';
+            self::$builtInFormats[61] = 't#,##0';
+            self::$builtInFormats[62] = 't#,##0.00';
+            self::$builtInFormats[67] = 't0%';
+            self::$builtInFormats[68] = 't0.00%';
+            self::$builtInFormats[69] = 't# ?/?';
+            self::$builtInFormats[70] = 't# ??/??';
+
+            // JPN
+            self::$builtInFormats[28] = '[$-411]ggge"年"m"月"d"日"';
+            self::$builtInFormats[29] = '[$-411]ggge"年"m"月"d"日"';
+            self::$builtInFormats[31] = 'yyyy"年"m"月"d"日"';
+            self::$builtInFormats[32] = 'h"時"mm"分"';
+            self::$builtInFormats[33] = 'h"時"mm"分"ss"秒"';
+            self::$builtInFormats[34] = 'yyyy"年"m"月"';
+            self::$builtInFormats[35] = 'm"月"d"日"';
+            self::$builtInFormats[51] = '[$-411]ggge"年"m"月"d"日"';
+            self::$builtInFormats[52] = 'yyyy"年"m"月"';
+            self::$builtInFormats[53] = 'm"月"d"日"';
+            self::$builtInFormats[54] = '[$-411]ggge"年"m"月"d"日"';
+            self::$builtInFormats[55] = 'yyyy"年"m"月"';
+            self::$builtInFormats[56] = 'm"月"d"日"';
+            self::$builtInFormats[58] = '[$-411]ggge"年"m"月"d"日"';
+
+            // Flip array (for faster lookups)
+            self::$flippedBuiltInFormats = array_flip(self::$builtInFormats);
+        }
+    }
+
+    /**
+     * Get built-in format code.
+     */
+    public static function builtInFormatCode(int $index): string
+    {
+        // Clean parameter
+        $index = (int) $index;
+
+        // Ensure built-in format codes are available
+        self::fillBuiltInFormatCodes();
+
+        // Lookup format code
+        if (isset(self::$builtInFormats[$index])) {
+            return self::$builtInFormats[$index];
+        }
+
+        return '';
+    }
+
+    /**
+     * Get built-in format code index.
+     *
+     * @return false|int
+     */
+    public static function builtInFormatCodeIndex(string $formatCodeIndex)
+    {
+        // Ensure built-in format codes are available
+        self::fillBuiltInFormatCodes();
+
+        // Lookup format code
+        if (array_key_exists($formatCodeIndex, self::$flippedBuiltInFormats)) {
+            return self::$flippedBuiltInFormats[$formatCodeIndex];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+
+        return md5(
+            $this->formatCode
+            . $this->builtInFormatCode
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Convert a value in a pre-defined format to a PHP string.
+     *
+     * @param null|bool|float|int|RichText|string $value Value to format
+     * @param string $format Format code: see = self::FORMAT_* for predefined values;
+     *                          or can be any valid MS Excel custom format string
+     * @param ?array $callBack Callback function for additional formatting of string
+     *
+     * @return string Formatted string
+     */
+    public static function toFormattedString(mixed $value, string $format, ?array $callBack = null): string
+    {
+        return NumberFormat\Formatter::toFormattedString($value, $format, $callBack);
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'formatCode', $this->getFormatCode());
+
+        return $exportedArray;
+    }
+
+    public static function getShortDateFormat(): string
+    {
+        return self::$shortDateFormat;
+    }
+
+    public static function setShortDateFormat(string $shortDateFormat): void
+    {
+        self::$shortDateFormat = $shortDateFormat;
+    }
+
+    public static function getLongDateFormat(): string
+    {
+        return self::$longDateFormat;
+    }
+
+    public static function setLongDateFormat(string $longDateFormat): void
+    {
+        self::$longDateFormat = $longDateFormat;
+    }
+
+    public static function getDateTimeFormat(): string
+    {
+        return self::$dateTimeFormat;
+    }
+
+    public static function setDateTimeFormat(string $dateTimeFormat): void
+    {
+        self::$dateTimeFormat = $dateTimeFormat;
+    }
+
+    public static function getTimeFormat(): string
+    {
+        return self::$timeFormat;
+    }
+
+    public static function setTimeFormat(string $timeFormat): void
+    {
+        self::$timeFormat = $timeFormat;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php
new file mode 100644
index 00000000..165779ba
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+abstract class BaseFormatter
+{
+    protected static function stripQuotes(string $format): string
+    {
+        // Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
+        return str_replace(['"', '*'], '', $format);
+    }
+
+    protected static function adjustSeparators(string $value): string
+    {
+        $thousandsSeparator = StringHelper::getThousandsSeparator();
+        $decimalSeparator = StringHelper::getDecimalSeparator();
+        if ($thousandsSeparator !== ',' || $decimalSeparator !== '.') {
+            $value = str_replace(['.', ',', "\u{fffd}"], ["\u{fffd}", $thousandsSeparator, $decimalSeparator], $value);
+        }
+
+        return $value;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
new file mode 100644
index 00000000..2aabd7f5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+
+class DateFormatter
+{
+    /**
+     * Search/replace values to convert Excel date/time format masks to PHP format masks.
+     */
+    private const DATE_FORMAT_REPLACEMENTS = [
+        // first remove escapes related to non-format characters
+        '\\' => '',
+        //    12-hour suffix
+        'am/pm' => 'A',
+        //    4-digit year
+        'e' => 'Y',
+        'yyyy' => 'Y',
+        //    2-digit year
+        'yy' => 'y',
+        //    first letter of month - no php equivalent
+        'mmmmm' => 'M',
+        //    full month name
+        'mmmm' => 'F',
+        //    short month name
+        'mmm' => 'M',
+        //    mm is minutes if time, but can also be month w/leading zero
+        //    so we try to identify times be the inclusion of a : separator in the mask
+        //    It isn't perfect, but the best way I know how
+        ':mm' => ':i',
+        'mm:' => 'i:',
+        //    full day of week name
+        'dddd' => 'l',
+        //    short day of week name
+        'ddd' => 'D',
+        //    days leading zero
+        'dd' => 'd',
+        //    days no leading zero
+        'd' => 'j',
+        //    fractional seconds - no php equivalent
+        '.s' => '',
+    ];
+
+    /**
+     * Search/replace values to convert Excel date/time format masks hours to PHP format masks (24 hr clock).
+     */
+    private const DATE_FORMAT_REPLACEMENTS24 = [
+        'hh' => 'H',
+        'h' => 'G',
+        //    month leading zero
+        'mm' => 'm',
+        //    month no leading zero
+        'm' => 'n',
+        //    seconds
+        'ss' => 's',
+    ];
+
+    /**
+     * Search/replace values to convert Excel date/time format masks hours to PHP format masks (12 hr clock).
+     */
+    private const DATE_FORMAT_REPLACEMENTS12 = [
+        'hh' => 'h',
+        'h' => 'g',
+        //    month leading zero
+        'mm' => 'm',
+        //    month no leading zero
+        'm' => 'n',
+        //    seconds
+        'ss' => 's',
+    ];
+
+    private const HOURS_IN_DAY = 24;
+    private const MINUTES_IN_DAY = 60 * self::HOURS_IN_DAY;
+    private const SECONDS_IN_DAY = 60 * self::MINUTES_IN_DAY;
+    private const INTERVAL_PRECISION = 10;
+    private const INTERVAL_LEADING_ZERO = [
+        '[hh]',
+        '[mm]',
+        '[ss]',
+    ];
+    private const INTERVAL_ROUND_PRECISION = [
+        // hours and minutes truncate
+        '[h]' => self::INTERVAL_PRECISION,
+        '[hh]' => self::INTERVAL_PRECISION,
+        '[m]' => self::INTERVAL_PRECISION,
+        '[mm]' => self::INTERVAL_PRECISION,
+        // seconds round
+        '[s]' => 0,
+        '[ss]' => 0,
+    ];
+    private const INTERVAL_MULTIPLIER = [
+        '[h]' => self::HOURS_IN_DAY,
+        '[hh]' => self::HOURS_IN_DAY,
+        '[m]' => self::MINUTES_IN_DAY,
+        '[mm]' => self::MINUTES_IN_DAY,
+        '[s]' => self::SECONDS_IN_DAY,
+        '[ss]' => self::SECONDS_IN_DAY,
+    ];
+
+    private static function tryInterval(bool &$seekingBracket, string &$block, mixed $value, string $format): void
+    {
+        if ($seekingBracket) {
+            if (str_contains($block, $format)) {
+                $hours = (string) (int) round(
+                    self::INTERVAL_MULTIPLIER[$format] * $value,
+                    self::INTERVAL_ROUND_PRECISION[$format]
+                );
+                if (strlen($hours) === 1 && in_array($format, self::INTERVAL_LEADING_ZERO, true)) {
+                    $hours = "0$hours";
+                }
+                $block = str_replace($format, $hours, $block);
+                $seekingBracket = false;
+            }
+        }
+    }
+
+    /** @param float|int $value value to be formatted */
+    public static function format(mixed $value, string $format): string
+    {
+        // strip off first part containing e.g. [$-F800] or [$USD-409]
+        // general syntax: [$<Currency string>-<language info>]
+        // language info is in hexadecimal
+        // strip off chinese part like [DBNum1][$-804]
+        $format = (string) preg_replace('/^(\[DBNum\d\])*(\[\$[^\]]*\])/i', '', $format);
+
+        // OpenOffice.org uses upper-case number formats, e.g. 'YYYY', convert to lower-case;
+        //    but we don't want to change any quoted strings
+        /** @var callable $callable */
+        $callable = [self::class, 'setLowercaseCallback'];
+        $format = (string) preg_replace_callback('/(?:^|")([^"]*)(?:$|")/', $callable, $format);
+
+        // Only process the non-quoted blocks for date format characters
+
+        $blocks = explode('"', $format);
+        foreach ($blocks as $key => &$block) {
+            if ($key % 2 == 0) {
+                $block = strtr($block, self::DATE_FORMAT_REPLACEMENTS);
+                if (!strpos($block, 'A')) {
+                    // 24-hour time format
+                    // when [h]:mm format, the [h] should replace to the hours of the value * 24
+                    $seekingBracket = true;
+                    self::tryInterval($seekingBracket, $block, $value, '[h]');
+                    self::tryInterval($seekingBracket, $block, $value, '[hh]');
+                    self::tryInterval($seekingBracket, $block, $value, '[mm]');
+                    self::tryInterval($seekingBracket, $block, $value, '[m]');
+                    self::tryInterval($seekingBracket, $block, $value, '[s]');
+                    self::tryInterval($seekingBracket, $block, $value, '[ss]');
+                    $block = strtr($block, self::DATE_FORMAT_REPLACEMENTS24);
+                } else {
+                    // 12-hour time format
+                    $block = strtr($block, self::DATE_FORMAT_REPLACEMENTS12);
+                }
+            }
+        }
+        $format = implode('"', $blocks);
+
+        // escape any quoted characters so that DateTime format() will render them correctly
+        /** @var callable $callback */
+        $callback = [self::class, 'escapeQuotesCallback'];
+        $format = (string) preg_replace_callback('/"(.*)"/U', $callback, $format);
+
+        $dateObj = Date::excelToDateTimeObject($value);
+        // If the colon preceding minute had been quoted, as happens in
+        // Excel 2003 XML formats, m will not have been changed to i above.
+        // Change it now.
+        $format = (string) \preg_replace('/\\\\:m/', ':i', $format);
+        $microseconds = (int) $dateObj->format('u');
+        if (str_contains($format, ':s.000')) {
+            $milliseconds = (int) round($microseconds / 1000.0);
+            if ($milliseconds === 1000) {
+                $milliseconds = 0;
+                $dateObj->modify('+1 second');
+            }
+            $dateObj->modify("-$microseconds microseconds");
+            $format = str_replace(':s.000', ':s.' . sprintf('%03d', $milliseconds), $format);
+        } elseif (str_contains($format, ':s.00')) {
+            $centiseconds = (int) round($microseconds / 10000.0);
+            if ($centiseconds === 100) {
+                $centiseconds = 0;
+                $dateObj->modify('+1 second');
+            }
+            $dateObj->modify("-$microseconds microseconds");
+            $format = str_replace(':s.00', ':s.' . sprintf('%02d', $centiseconds), $format);
+        } elseif (str_contains($format, ':s.0')) {
+            $deciseconds = (int) round($microseconds / 100000.0);
+            if ($deciseconds === 10) {
+                $deciseconds = 0;
+                $dateObj->modify('+1 second');
+            }
+            $dateObj->modify("-$microseconds microseconds");
+            $format = str_replace(':s.0', ':s.' . sprintf('%1d', $deciseconds), $format);
+        } else { // no fractional second
+            if ($microseconds >= 500000) {
+                $dateObj->modify('+1 second');
+            }
+            $dateObj->modify("-$microseconds microseconds");
+        }
+
+        return $dateObj->format($format);
+    }
+
+    private static function setLowercaseCallback(array $matches): string
+    {
+        return mb_strtolower($matches[0]);
+    }
+
+    private static function escapeQuotesCallback(array $matches): string
+    {
+        return '\\' . implode('\\', str_split($matches[1]));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
new file mode 100644
index 00000000..f2d492e5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
@@ -0,0 +1,189 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Reader\Xls\Color\BIFF8;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class Formatter extends BaseFormatter
+{
+    /**
+     * Matches any @ symbol that isn't enclosed in quotes.
+     */
+    private const SYMBOL_AT = '/@(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu';
+
+    /**
+     * Matches any ; symbol that isn't enclosed in quotes, for a "section" split.
+     */
+    private const SECTION_SPLIT = '/;(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu';
+
+    private static function splitFormatComparison(
+        mixed $value,
+        ?string $condition,
+        mixed $comparisonValue,
+        string $defaultCondition,
+        mixed $defaultComparisonValue
+    ): bool {
+        if (!$condition) {
+            $condition = $defaultCondition;
+            $comparisonValue = $defaultComparisonValue;
+        }
+
+        return match ($condition) {
+            '>' => $value > $comparisonValue,
+            '<' => $value < $comparisonValue,
+            '<=' => $value <= $comparisonValue,
+            '<>' => $value != $comparisonValue,
+            '=' => $value == $comparisonValue,
+            default => $value >= $comparisonValue,
+        };
+    }
+
+    /** @param float|int|string $value value to be formatted */
+    private static function splitFormatForSectionSelection(array $sections, mixed $value): array
+    {
+        // Extract the relevant section depending on whether number is positive, negative, or zero?
+        // Text not supported yet.
+        // Here is how the sections apply to various values in Excel:
+        //   1 section:   [POSITIVE/NEGATIVE/ZERO/TEXT]
+        //   2 sections:  [POSITIVE/ZERO/TEXT] [NEGATIVE]
+        //   3 sections:  [POSITIVE/TEXT] [NEGATIVE] [ZERO]
+        //   4 sections:  [POSITIVE] [NEGATIVE] [ZERO] [TEXT]
+        $sectionCount = count($sections);
+        // Colour could be a named colour, or a numeric index entry in the colour-palette
+        $color_regex = '/\\[(' . implode('|', Color::NAMED_COLORS) . '|color\\s*(\\d+))\\]/mui';
+        $cond_regex = '/\\[(>|>=|<|<=|=|<>)([+-]?\\d+([.]\\d+)?)\\]/';
+        $colors = ['', '', '', '', ''];
+        $conditionOperations = ['', '', '', '', ''];
+        $conditionComparisonValues = [0, 0, 0, 0, 0];
+        for ($idx = 0; $idx < $sectionCount; ++$idx) {
+            if (preg_match($color_regex, $sections[$idx], $matches)) {
+                if (isset($matches[2])) {
+                    $colors[$idx] = '#' . BIFF8::lookup((int) $matches[2] + 7)['rgb'];
+                } else {
+                    $colors[$idx] = $matches[0];
+                }
+                $sections[$idx] = (string) preg_replace($color_regex, '', $sections[$idx]);
+            }
+            if (preg_match($cond_regex, $sections[$idx], $matches)) {
+                $conditionOperations[$idx] = $matches[1];
+                $conditionComparisonValues[$idx] = $matches[2];
+                $sections[$idx] = (string) preg_replace($cond_regex, '', $sections[$idx]);
+            }
+        }
+        $color = $colors[0];
+        $format = $sections[0];
+        $absval = $value;
+        switch ($sectionCount) {
+            case 2:
+                $absval = abs($value);
+                if (!self::splitFormatComparison($value, $conditionOperations[0], $conditionComparisonValues[0], '>=', 0)) {
+                    $color = $colors[1];
+                    $format = $sections[1];
+                }
+
+                break;
+            case 3:
+            case 4:
+                $absval = abs($value);
+                if (!self::splitFormatComparison($value, $conditionOperations[0], $conditionComparisonValues[0], '>', 0)) {
+                    if (self::splitFormatComparison($value, $conditionOperations[1], $conditionComparisonValues[1], '<', 0)) {
+                        $color = $colors[1];
+                        $format = $sections[1];
+                    } else {
+                        $color = $colors[2];
+                        $format = $sections[2];
+                    }
+                }
+
+                break;
+        }
+
+        return [$color, $format, $absval];
+    }
+
+    /**
+     * Convert a value in a pre-defined format to a PHP string.
+     *
+     * @param null|bool|float|int|RichText|string $value Value to format
+     * @param string $format Format code: see = self::FORMAT_* for predefined values;
+     *                          or can be any valid MS Excel custom format string
+     * @param ?array $callBack Callback function for additional formatting of string
+     *
+     * @return string Formatted string
+     */
+    public static function toFormattedString($value, string $format, ?array $callBack = null): string
+    {
+        if (is_bool($value)) {
+            return $value ? Calculation::getTRUE() : Calculation::getFALSE();
+        }
+        // For now we do not treat strings in sections, although section 4 of a format code affects strings
+        // Process a single block format code containing @ for text substitution
+        if (preg_match(self::SECTION_SPLIT, $format) === 0 && preg_match(self::SYMBOL_AT, $format) === 1) {
+            return str_replace('"', '', preg_replace(self::SYMBOL_AT, (string) $value, $format) ?? '');
+        }
+
+        // If we have a text value, return it "as is"
+        if (!is_numeric($value)) {
+            return (string) $value;
+        }
+
+        // For 'General' format code, we just pass the value although this is not entirely the way Excel does it,
+        // it seems to round numbers to a total of 10 digits.
+        if (($format === NumberFormat::FORMAT_GENERAL) || ($format === NumberFormat::FORMAT_TEXT)) {
+            return self::adjustSeparators((string) $value);
+        }
+
+        // Ignore square-$-brackets prefix in format string, like "[$-411]ge.m.d", "[$-010419]0%", etc
+        $format = (string) preg_replace('/^\[\$-[^\]]*\]/', '', $format);
+
+        $format = (string) preg_replace_callback(
+            '/(["])(?:(?=(\\\\?))\\2.)*?\\1/u',
+            fn (array $matches): string => str_replace('.', chr(0x00), $matches[0]),
+            $format
+        );
+
+        // Convert any other escaped characters to quoted strings, e.g. (\T to "T")
+        $format = (string) preg_replace('/(\\\(((.)(?!((AM\/PM)|(A\/P))))|([^ ])))(?=(?:[^"]|"[^"]*")*$)/ui', '"${2}"', $format);
+
+        // Get the sections, there can be up to four sections, separated with a semi-colon (but only if not a quoted literal)
+        $sections = preg_split(self::SECTION_SPLIT, $format) ?: [];
+
+        [$colors, $format, $value] = self::splitFormatForSectionSelection($sections, $value);
+
+        // In Excel formats, "_" is used to add spacing,
+        //    The following character indicates the size of the spacing, which we can't do in HTML, so we just use a standard space
+        $format = (string) preg_replace('/_.?/ui', ' ', $format);
+
+        // Let's begin inspecting the format and converting the value to a formatted string
+        if (
+            //  Check for date/time characters (not inside quotes)
+            (preg_match('/(\[\$[A-Z]*-[0-9A-F]*\])*[hmsdy](?=(?:[^"]|"[^"]*")*$)/miu', $format))
+            // A date/time with a decimal time shouldn't have a digit placeholder before the decimal point
+            && (preg_match('/[0\?#]\.(?![^\[]*\])/miu', $format) === 0)
+        ) {
+            // datetime format
+            $value = DateFormatter::format($value, $format);
+        } else {
+            if (str_starts_with($format, '"') && str_ends_with($format, '"') && substr_count($format, '"') === 2) {
+                $value = substr($format, 1, -1);
+            } elseif (preg_match('/[0#, ]%/', $format)) {
+                // % number format - avoid weird '-0' problem
+                $value = PercentageFormatter::format(0 + (float) $value, $format);
+            } else {
+                $value = NumberFormatter::format($value, $format);
+            }
+        }
+
+        // Additional formatting provided by callback function
+        if ($callBack !== null) {
+            [$writerInstance, $function] = $callBack;
+            $value = $writerInstance->$function($value, $colors);
+        }
+
+        return str_replace(chr(0x00), '.', $value);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
new file mode 100644
index 00000000..ff80aa2f
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+
+class FractionFormatter extends BaseFormatter
+{
+    /** @param null|bool|float|int|string $value  value to be formatted */
+    public static function format(mixed $value, string $format): string
+    {
+        $format = self::stripQuotes($format);
+        $value = (float) $value;
+        $absValue = abs($value);
+
+        $sign = ($value < 0.0) ? '-' : '';
+
+        $integerPart = floor($absValue);
+
+        $decimalPart = self::getDecimal((string) $absValue);
+        if ($decimalPart === '0') {
+            return "{$sign}{$integerPart}";
+        }
+        $decimalLength = strlen($decimalPart);
+        $decimalDivisor = 10 ** $decimalLength;
+
+        preg_match('/(#?.*\?)\/(\?+|\d+)/', $format, $matches);
+        $formatIntegerPart = $matches[1];
+
+        if (is_numeric($matches[2])) {
+            $fractionDivisor = 100 / (int) $matches[2];
+        } else {
+            /** @var float $fractionDivisor */
+            $fractionDivisor = MathTrig\Gcd::evaluate((int) $decimalPart, $decimalDivisor);
+        }
+
+        $adjustedDecimalPart = (int) round((int) $decimalPart / $fractionDivisor, 0);
+        $adjustedDecimalDivisor = $decimalDivisor / $fractionDivisor;
+
+        if ((str_contains($formatIntegerPart, '0'))) {
+            return "{$sign}{$integerPart} {$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+        } elseif ((str_contains($formatIntegerPart, '#'))) {
+            if ($integerPart == 0) {
+                return "{$sign}{$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+            }
+
+            return "{$sign}{$integerPart} {$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+        } elseif ((str_starts_with($formatIntegerPart, '? ?'))) {
+            if ($integerPart == 0) {
+                $integerPart = '';
+            }
+
+            return "{$sign}{$integerPart} {$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+        }
+
+        $adjustedDecimalPart += $integerPart * $adjustedDecimalDivisor;
+
+        return "{$sign}{$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
+    }
+
+    private static function getDecimal(string $value): string
+    {
+        $decimalPart = '0';
+        if (preg_match('/^\\d*[.](\\d*[1-9])0*$/', $value, $matches) === 1) {
+            $decimalPart = $matches[1];
+        }
+
+        return $decimalPart;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
new file mode 100644
index 00000000..80f70dc6
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
@@ -0,0 +1,316 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class NumberFormatter extends BaseFormatter
+{
+    private const NUMBER_REGEX = '/(0+)(\\.?)(0*)/';
+
+    private static function mergeComplexNumberFormatMasks(array $numbers, array $masks): array
+    {
+        $decimalCount = strlen($numbers[1]);
+        $postDecimalMasks = [];
+
+        do {
+            $tempMask = array_pop($masks);
+            if ($tempMask !== null) {
+                $postDecimalMasks[] = $tempMask;
+                $decimalCount -= strlen($tempMask);
+            }
+        } while ($tempMask !== null && $decimalCount > 0);
+
+        return [
+            implode('.', $masks),
+            implode('.', array_reverse($postDecimalMasks)),
+        ];
+    }
+
+    private static function processComplexNumberFormatMask(mixed $number, string $mask): string
+    {
+        /** @var string $result */
+        $result = $number;
+        $maskingBlockCount = preg_match_all('/0+/', $mask, $maskingBlocks, PREG_OFFSET_CAPTURE);
+
+        if ($maskingBlockCount > 1) {
+            $maskingBlocks = array_reverse($maskingBlocks[0]);
+
+            $offset = 0;
+            foreach ($maskingBlocks as $block) {
+                $size = strlen($block[0]);
+                $divisor = 10 ** $size;
+                $offset = $block[1];
+
+                /** @var float $numberFloat */
+                $numberFloat = $number;
+                $blockValue = sprintf("%0{$size}d", fmod($numberFloat, $divisor));
+                $number = floor($numberFloat / $divisor);
+                $mask = substr_replace($mask, $blockValue, $offset, $size);
+            }
+            /** @var string $numberString */
+            $numberString = $number;
+            if ($number > 0) {
+                $mask = substr_replace($mask, $numberString, $offset, 0);
+            }
+            $result = $mask;
+        }
+
+        return self::makeString($result);
+    }
+
+    private static function complexNumberFormatMask(mixed $number, string $mask, bool $splitOnPoint = true): string
+    {
+        /** @var float $numberFloat */
+        $numberFloat = $number;
+        if ($splitOnPoint) {
+            $masks = explode('.', $mask);
+            if (count($masks) <= 2) {
+                $decmask = $masks[1] ?? '';
+                $decpos = substr_count($decmask, '0');
+                $numberFloat = round($numberFloat, $decpos);
+            }
+        }
+        $sign = ($numberFloat < 0.0) ? '-' : '';
+        $number = self::f2s(abs($numberFloat));
+
+        if ($splitOnPoint && str_contains($mask, '.') && str_contains($number, '.')) {
+            $numbers = explode('.', $number);
+            $masks = explode('.', $mask);
+            if (count($masks) > 2) {
+                $masks = self::mergeComplexNumberFormatMasks($numbers, $masks);
+            }
+            $integerPart = self::complexNumberFormatMask($numbers[0], $masks[0], false);
+            $numlen = strlen($numbers[1]);
+            $msklen = strlen($masks[1]);
+            if ($numlen < $msklen) {
+                $numbers[1] .= str_repeat('0', $msklen - $numlen);
+            }
+            $decimalPart = strrev(self::complexNumberFormatMask(strrev($numbers[1]), strrev($masks[1]), false));
+            $decimalPart = substr($decimalPart, 0, $msklen);
+
+            return "{$sign}{$integerPart}.{$decimalPart}";
+        }
+
+        if (strlen($number) < strlen($mask)) {
+            $number = str_repeat('0', strlen($mask) - strlen($number)) . $number;
+        }
+        $result = self::processComplexNumberFormatMask($number, $mask);
+
+        return "{$sign}{$result}";
+    }
+
+    public static function f2s(float $f): string
+    {
+        return self::floatStringConvertScientific((string) $f);
+    }
+
+    public static function floatStringConvertScientific(string $s): string
+    {
+        // convert only normalized form of scientific notation:
+        //  optional sign, single digit 1-9,
+        //    decimal point and digits (allowed to be omitted),
+        //    E (e permitted), optional sign, one or more digits
+        if (preg_match('/^([+-])?([1-9])([.]([0-9]+))?[eE]([+-]?[0-9]+)$/', $s, $matches) === 1) {
+            $exponent = (int) $matches[5];
+            $sign = ($matches[1] === '-') ? '-' : '';
+            if ($exponent >= 0) {
+                $exponentPlus1 = $exponent + 1;
+                $out = $matches[2] . $matches[4];
+                $len = strlen($out);
+                if ($len < $exponentPlus1) {
+                    $out .= str_repeat('0', $exponentPlus1 - $len);
+                }
+                $out = substr($out, 0, $exponentPlus1) . ((strlen($out) === $exponentPlus1) ? '' : ('.' . substr($out, $exponentPlus1)));
+                $s = "$sign$out";
+            } else {
+                $s = $sign . '0.' . str_repeat('0', -$exponent - 1) . $matches[2] . $matches[4];
+            }
+        }
+
+        return $s;
+    }
+
+    private static function formatStraightNumericValue(mixed $value, string $format, array $matches, bool $useThousands): string
+    {
+        /** @var float $valueFloat */
+        $valueFloat = $value;
+        $left = $matches[1];
+        $dec = $matches[2];
+        $right = $matches[3];
+
+        // minimun width of formatted number (including dot)
+        $minWidth = strlen($left) + strlen($dec) + strlen($right);
+        if ($useThousands) {
+            $value = number_format(
+                $valueFloat,
+                strlen($right),
+                StringHelper::getDecimalSeparator(),
+                StringHelper::getThousandsSeparator()
+            );
+
+            return self::pregReplace(self::NUMBER_REGEX, $value, $format);
+        }
+
+        if (preg_match('/[0#]E[+-]0/i', $format)) {
+            //    Scientific format
+            $decimals = strlen($right);
+            $size = $decimals + 3;
+
+            return sprintf("%{$size}.{$decimals}E", $valueFloat);
+        } elseif (preg_match('/0([^\d\.]+)0/', $format) || substr_count($format, '.') > 1) {
+            if ($valueFloat == floor($valueFloat) && substr_count($format, '.') === 1) {
+                $value *= 10 ** strlen(explode('.', $format)[1]);
+            }
+
+            $result = self::complexNumberFormatMask($value, $format);
+            if (str_contains($result, 'E')) {
+                // This is a hack and doesn't match Excel.
+                // It will, at least, be an accurate representation,
+                //  even if formatted incorrectly.
+                // This is needed for absolute values >=1E18.
+                $result = self::f2s($valueFloat);
+            }
+
+            return $result;
+        }
+
+        $sprintf_pattern = "%0$minWidth." . strlen($right) . 'F';
+
+        /** @var float $valueFloat */
+        $valueFloat = $value;
+        $value = self::adjustSeparators(sprintf($sprintf_pattern, round($valueFloat, strlen($right))));
+
+        return self::pregReplace(self::NUMBER_REGEX, $value, $format);
+    }
+
+    /** @param float|int|numeric-string $value value to be formatted */
+    public static function format(mixed $value, string $format): string
+    {
+        // The "_" in this string has already been stripped out,
+        // so this test is never true. Furthermore, testing
+        // on Excel shows this format uses Euro symbol, not "EUR".
+        // if ($format === NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE) {
+        //     return 'EUR ' . sprintf('%1.2f', $value);
+        // }
+
+        $baseFormat = $format;
+
+        $useThousands = self::areThousandsRequired($format);
+        $scale = self::scaleThousandsMillions($format);
+
+        if (preg_match('/[#\?0]?.*[#\?0]\/(\?+|\d+|#)/', $format)) {
+            // It's a dirty hack; but replace # and 0 digit placeholders with ?
+            $format = (string) preg_replace('/[#0]+\//', '?/', $format);
+            $format = (string) preg_replace('/\/[#0]+/', '/?', $format);
+            $value = FractionFormatter::format($value, $format);
+        } else {
+            // Handle the number itself
+            // scale number
+            $value = $value / $scale;
+            $paddingPlaceholder = (str_contains($format, '?'));
+
+            // Replace # or ? with 0
+            $format = self::pregReplace('/[\\#\?](?=(?:[^"]*"[^"]*")*[^"]*\Z)/', '0', $format);
+            // Remove locale code [$-###] for an LCID
+            $format = self::pregReplace('/\[\$\-.*\]/', '', $format);
+
+            $n = '/\\[[^\\]]+\\]/';
+            $m = self::pregReplace($n, '', $format);
+
+            // Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
+            $format = self::makeString(str_replace(['"', '*'], '', $format));
+            if (preg_match(self::NUMBER_REGEX, $m, $matches)) {
+                // There are placeholders for digits, so inject digits from the value into the mask
+                $value = self::formatStraightNumericValue($value, $format, $matches, $useThousands);
+                if ($paddingPlaceholder === true) {
+                    $value = self::padValue($value, $baseFormat);
+                }
+            } elseif ($format !== NumberFormat::FORMAT_GENERAL) {
+                // Yes, I know that this is basically just a hack;
+                //      if there's no placeholders for digits, just return the format mask "as is"
+                $value = self::makeString(str_replace('?', '', $format));
+            }
+        }
+
+        if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
+            //  Currency or Accounting
+            $currencyCode = $m[1];
+            [$currencyCode] = explode('-', $currencyCode);
+            if ($currencyCode == '') {
+                $currencyCode = StringHelper::getCurrencyCode();
+            }
+            $value = self::pregReplace('/\[\$([^\]]*)\]/u', $currencyCode, (string) $value);
+        }
+
+        if (
+            (str_contains((string) $value, '0.'))
+            && ((str_contains($baseFormat, '#.')) || (str_contains($baseFormat, '?.')))
+        ) {
+            $value = preg_replace('/(\b)0\.|([^\d])0\./', '${2}.', (string) $value);
+        }
+
+        return (string) $value;
+    }
+
+    private static function makeString(array|string $value): string
+    {
+        return is_array($value) ? '' : "$value";
+    }
+
+    private static function pregReplace(string $pattern, string $replacement, string $subject): string
+    {
+        return self::makeString(preg_replace($pattern, $replacement, $subject) ?? '');
+    }
+
+    public static function padValue(string $value, string $baseFormat): string
+    {
+        $preDecimal = $postDecimal = '';
+        $pregArray = preg_split('/\.(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu', $baseFormat . '.?');
+        if (is_array($pregArray)) {
+            $preDecimal = $pregArray[0] ?? '';
+            $postDecimal = $pregArray[1] ?? '';
+        }
+
+        $length = strlen($value);
+        if (str_contains($postDecimal, '?')) {
+            $value = str_pad(rtrim($value, '0. '), $length, ' ', STR_PAD_RIGHT);
+        }
+        if (str_contains($preDecimal, '?')) {
+            $value = str_pad(ltrim($value, '0, '), $length, ' ', STR_PAD_LEFT);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Find out if we need thousands separator
+     * This is indicated by a comma enclosed by a digit placeholders: #, 0 or ?
+     */
+    public static function areThousandsRequired(string &$format): bool
+    {
+        $useThousands = (bool) preg_match('/([#\?0]),([#\?0])/', $format);
+        if ($useThousands) {
+            $format = self::pregReplace('/([#\?0]),([#\?0])/', '${1}${2}', $format);
+        }
+
+        return $useThousands;
+    }
+
+    /**
+     * Scale thousands, millions,...
+     * This is indicated by a number of commas after a digit placeholder: #, or 0.0,, or ?,.
+     */
+    public static function scaleThousandsMillions(string &$format): int
+    {
+        $scale = 1; // same as no scale
+        if (preg_match('/(#|0|\?)(,+)/', $format, $matches)) {
+            $scale = 1000 ** strlen($matches[2]);
+            // strip the commas
+            $format = self::pregReplace('/([#\?0]),+/', '${1}', $format);
+        }
+
+        return $scale;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
new file mode 100644
index 00000000..bb5b3554
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class PercentageFormatter extends BaseFormatter
+{
+    /** @param float|int $value */
+    public static function format($value, string $format): string
+    {
+        if ($format === NumberFormat::FORMAT_PERCENTAGE) {
+            return round((100 * $value), 0) . '%';
+        }
+
+        $value *= 100;
+        $format = self::stripQuotes($format);
+
+        [, $vDecimals] = explode('.', ((string) $value) . '.');
+        $vDecimalCount = strlen(rtrim($vDecimals, '0'));
+
+        $format = str_replace('%', '%%', $format);
+        $wholePartSize = strlen((string) floor(abs($value)));
+        $decimalPartSize = 0;
+        $placeHolders = '';
+        // Number of decimals
+        if (preg_match('/\.([?0]+)/u', $format, $matches)) {
+            $decimalPartSize = strlen($matches[1]);
+            $vMinDecimalCount = strlen(rtrim($matches[1], '?'));
+            $decimalPartSize = min(max($vMinDecimalCount, $vDecimalCount), $decimalPartSize);
+            $placeHolders = str_repeat(' ', strlen($matches[1]) - $decimalPartSize);
+        }
+        // Number of digits to display before the decimal
+        if (preg_match('/([#0,]+)\.?/u', $format, $matches)) {
+            $firstZero = preg_replace('/^[#,]*/', '', $matches[1]) ?? '';
+            $wholePartSize = max($wholePartSize, strlen($firstZero));
+        }
+
+        $wholePartSize += $decimalPartSize + (int) ($decimalPartSize > 0);
+        $replacement = "0{$wholePartSize}.{$decimalPartSize}";
+        $mask = (string) preg_replace('/[#0,]+\.?[?#0,]*/ui', "%{$replacement}F{$placeHolders}", $format);
+
+        /** @var float $valueFloat */
+        $valueFloat = $value;
+
+        return self::adjustSeparators(sprintf($mask, round($valueFloat, $decimalPartSize)));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php
new file mode 100644
index 00000000..43fd8cac
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Accounting extends Currency
+{
+    /**
+     * @param string $currencyCode the currency symbol or code to display for this mask
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param bool $thousandsSeparator indicator whether the thousands separator should be used, or not
+     * @param bool $currencySymbolPosition indicates whether the currency symbol comes before or after the value
+     *              Possible values are Currency::LEADING_SYMBOL and Currency::TRAILING_SYMBOL
+     * @param bool $currencySymbolSpacing indicates whether there is spacing between the currency symbol and the value
+     *              Possible values are Currency::SYMBOL_WITH_SPACING and Currency::SYMBOL_WITHOUT_SPACING
+     * @param ?string $locale Set the locale for the currency format; or leave as the default null.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *          Note that setting a locale will override any other settings defined in this class
+     *          other than the currency code; or decimals (unless the decimals value is set to 0).
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(
+        string $currencyCode = '$',
+        int $decimals = 2,
+        bool $thousandsSeparator = true,
+        bool $currencySymbolPosition = self::LEADING_SYMBOL,
+        bool $currencySymbolSpacing = self::SYMBOL_WITHOUT_SPACING,
+        ?string $locale = null,
+        bool $stripLeadingRLM = self::DEFAULT_STRIP_LEADING_RLM
+    ) {
+        $this->setCurrencyCode($currencyCode);
+        $this->setThousandsSeparator($thousandsSeparator);
+        $this->setDecimals($decimals);
+        $this->setCurrencySymbolPosition($currencySymbolPosition);
+        $this->setCurrencySymbolSpacing($currencySymbolSpacing);
+        $this->setLocale($locale);
+        $this->stripLeadingRLM = $stripLeadingRLM;
+    }
+
+    /**
+     * @throws Exception if the Intl extension and ICU version don't support Accounting formats
+     */
+    protected function getLocaleFormat(): string
+    {
+        if (self::icuVersion() < 53.0) {
+            // @codeCoverageIgnoreStart
+            throw new Exception('The Intl extension does not support Accounting Formats without ICU 53');
+            // @codeCoverageIgnoreEnd
+        }
+
+        // Scrutinizer does not recognize CURRENCY_ACCOUNTING
+        $formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY_ACCOUNTING);
+        $mask = $formatter->format($this->stripLeadingRLM);
+        if ($this->decimals === 0) {
+            $mask = (string) preg_replace('/\.0+/miu', '', $mask);
+        }
+
+        return str_replace('¤', $this->formatCurrencyCode(), $mask);
+    }
+
+    public static function icuVersion(): float
+    {
+        [$major, $minor] = explode('.', INTL_ICU_VERSION);
+
+        return (float) "{$major}.{$minor}";
+    }
+
+    private function formatCurrencyCode(): string
+    {
+        if ($this->locale === null) {
+            return $this->currencyCode . '*';
+        }
+
+        return "[\${$this->currencyCode}-{$this->locale}]";
+    }
+
+    public function format(): string
+    {
+        if ($this->localeFormat !== null) {
+            return $this->localeFormat;
+        }
+
+        return sprintf(
+            '_-%s%s%s0%s%s%s_-',
+            $this->currencySymbolPosition === self::LEADING_SYMBOL ? $this->formatCurrencyCode() : null,
+            (
+                $this->currencySymbolPosition === self::LEADING_SYMBOL
+                && $this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING
+            ) ? "\u{a0}" : '',
+            $this->thousandsSeparator ? '#,##' : null,
+            $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null,
+            (
+                $this->currencySymbolPosition === self::TRAILING_SYMBOL
+                && $this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING
+            ) ? "\u{a0}" : '',
+            $this->currencySymbolPosition === self::TRAILING_SYMBOL ? $this->formatCurrencyCode() : null
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php
new file mode 100644
index 00000000..bba4d250
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Currency extends Number
+{
+    public const LEADING_SYMBOL = true;
+
+    public const TRAILING_SYMBOL = false;
+
+    public const SYMBOL_WITH_SPACING = true;
+
+    public const SYMBOL_WITHOUT_SPACING = false;
+
+    protected string $currencyCode = '$';
+
+    protected bool $currencySymbolPosition = self::LEADING_SYMBOL;
+
+    protected bool $currencySymbolSpacing = self::SYMBOL_WITHOUT_SPACING;
+
+    protected const DEFAULT_STRIP_LEADING_RLM = false;
+
+    protected bool $stripLeadingRLM = self::DEFAULT_STRIP_LEADING_RLM;
+
+    /**
+     * @param string $currencyCode the currency symbol or code to display for this mask
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param bool $thousandsSeparator indicator whether the thousands separator should be used, or not
+     * @param bool $currencySymbolPosition indicates whether the currency symbol comes before or after the value
+     *              Possible values are Currency::LEADING_SYMBOL and Currency::TRAILING_SYMBOL
+     * @param bool $currencySymbolSpacing indicates whether there is spacing between the currency symbol and the value
+     *              Possible values are Currency::SYMBOL_WITH_SPACING and Currency::SYMBOL_WITHOUT_SPACING
+     * @param ?string $locale Set the locale for the currency format; or leave as the default null.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *          Note that setting a locale will override any other settings defined in this class
+     *          other than the currency code; or decimals (unless the decimals value is set to 0).
+     * @param bool $stripLeadingRLM remove leading RLM added with
+     *          ICU 72.1+.
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(
+        string $currencyCode = '$',
+        int $decimals = 2,
+        bool $thousandsSeparator = true,
+        bool $currencySymbolPosition = self::LEADING_SYMBOL,
+        bool $currencySymbolSpacing = self::SYMBOL_WITHOUT_SPACING,
+        ?string $locale = null,
+        bool $stripLeadingRLM = self::DEFAULT_STRIP_LEADING_RLM
+    ) {
+        $this->setCurrencyCode($currencyCode);
+        $this->setThousandsSeparator($thousandsSeparator);
+        $this->setDecimals($decimals);
+        $this->setCurrencySymbolPosition($currencySymbolPosition);
+        $this->setCurrencySymbolSpacing($currencySymbolSpacing);
+        $this->setLocale($locale);
+        $this->stripLeadingRLM = $stripLeadingRLM;
+    }
+
+    public function setCurrencyCode(string $currencyCode): void
+    {
+        $this->currencyCode = $currencyCode;
+    }
+
+    public function setCurrencySymbolPosition(bool $currencySymbolPosition = self::LEADING_SYMBOL): void
+    {
+        $this->currencySymbolPosition = $currencySymbolPosition;
+    }
+
+    public function setCurrencySymbolSpacing(bool $currencySymbolSpacing = self::SYMBOL_WITHOUT_SPACING): void
+    {
+        $this->currencySymbolSpacing = $currencySymbolSpacing;
+    }
+
+    public function setStripLeadingRLM(bool $stripLeadingRLM): void
+    {
+        $this->stripLeadingRLM = $stripLeadingRLM;
+    }
+
+    protected function getLocaleFormat(): string
+    {
+        $formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY);
+        $mask = $formatter->format($this->stripLeadingRLM);
+        if ($this->decimals === 0) {
+            $mask = (string) preg_replace('/\.0+/miu', '', $mask);
+        }
+
+        return str_replace('¤', $this->formatCurrencyCode(), $mask);
+    }
+
+    private function formatCurrencyCode(): string
+    {
+        if ($this->locale === null) {
+            return $this->currencyCode;
+        }
+
+        return "[\${$this->currencyCode}-{$this->locale}]";
+    }
+
+    public function format(): string
+    {
+        if ($this->localeFormat !== null) {
+            return $this->localeFormat;
+        }
+
+        return sprintf(
+            '%s%s%s0%s%s%s',
+            $this->currencySymbolPosition === self::LEADING_SYMBOL ? $this->formatCurrencyCode() : null,
+            (
+                $this->currencySymbolPosition === self::LEADING_SYMBOL
+                && $this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING
+            ) ? "\u{a0}" : '',
+            $this->thousandsSeparator ? '#,##' : null,
+            $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null,
+            (
+                $this->currencySymbolPosition === self::TRAILING_SYMBOL
+                && $this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING
+            ) ? "\u{a0}" : '',
+            $this->currencySymbolPosition === self::TRAILING_SYMBOL ? $this->formatCurrencyCode() : null
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php
new file mode 100644
index 00000000..61ac117b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class Date extends DateTimeWizard
+{
+    /**
+     * Year (4 digits), e.g. 2023.
+     */
+    public const YEAR_FULL = 'yyyy';
+
+    /**
+     * Year (last 2 digits), e.g. 23.
+     */
+    public const YEAR_SHORT = 'yy';
+
+    public const MONTH_FIRST_LETTER = 'mmmmm';
+    /**
+     * Month name, long form, e.g. January.
+     */
+    public const MONTH_NAME_FULL = 'mmmm';
+    /**
+     * Month name, short form, e.g. Jan.
+     */
+    public const MONTH_NAME_SHORT = 'mmm';
+    /**
+     * Month number with a leading zero if required, e.g. 01.
+     */
+    public const MONTH_NUMBER_LONG = 'mm';
+
+    /**
+     * Month number without a leading zero, e.g. 1.
+     */
+    public const MONTH_NUMBER_SHORT = 'm';
+
+    /**
+     * Day of the week, full form, e.g. Tuesday.
+     */
+    public const WEEKDAY_NAME_LONG = 'dddd';
+
+    /**
+     * Day of the week, short form, e.g. Tue.
+     */
+    public const WEEKDAY_NAME_SHORT = 'ddd';
+
+    /**
+     * Day number with a leading zero, e.g. 03.
+     */
+    public const DAY_NUMBER_LONG = 'dd';
+
+    /**
+     * Day number without a leading zero, e.g. 3.
+     */
+    public const DAY_NUMBER_SHORT = 'd';
+
+    protected const DATE_BLOCKS = [
+        self::YEAR_FULL,
+        self::YEAR_SHORT,
+        self::MONTH_FIRST_LETTER,
+        self::MONTH_NAME_FULL,
+        self::MONTH_NAME_SHORT,
+        self::MONTH_NUMBER_LONG,
+        self::MONTH_NUMBER_SHORT,
+        self::WEEKDAY_NAME_LONG,
+        self::WEEKDAY_NAME_SHORT,
+        self::DAY_NUMBER_LONG,
+        self::DAY_NUMBER_SHORT,
+    ];
+
+    public const SEPARATOR_DASH = '-';
+    public const SEPARATOR_DOT = '.';
+    public const SEPARATOR_SLASH = '/';
+    public const SEPARATOR_SPACE_NONBREAKING = "\u{a0}";
+    public const SEPARATOR_SPACE = ' ';
+
+    protected const DATE_DEFAULT = [
+        self::YEAR_FULL,
+        self::MONTH_NUMBER_LONG,
+        self::DAY_NUMBER_LONG,
+    ];
+
+    /**
+     * @var string[]
+     */
+    protected array $separators;
+
+    /**
+     * @var string[]
+     */
+    protected array $formatBlocks;
+
+    /**
+     * @param null|string|string[] $separators
+     *        If you want to use the same separator for all format blocks, then it can be passed as a string literal;
+     *           if you wish to use different separators, then they should be passed as an array.
+     *        If you want to use only a single format block, then pass a null as the separator argument
+     */
+    public function __construct($separators = self::SEPARATOR_DASH, string ...$formatBlocks)
+    {
+        $separators ??= self::SEPARATOR_DASH;
+        $formatBlocks = (count($formatBlocks) === 0) ? self::DATE_DEFAULT : $formatBlocks;
+
+        $this->separators = $this->padSeparatorArray(
+            is_array($separators) ? $separators : [$separators],
+            count($formatBlocks) - 1
+        );
+        $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
+    }
+
+    private function mapFormatBlocks(string $value): string
+    {
+        // Any date masking codes are returned as lower case values
+        if (in_array(mb_strtolower($value), self::DATE_BLOCKS, true)) {
+            return mb_strtolower($value);
+        }
+
+        // Wrap any string literals in quotes, so that they're clearly defined as string literals
+        return $this->wrapLiteral($value);
+    }
+
+    public function format(): string
+    {
+        return implode('', array_map([$this, 'intersperse'], $this->formatBlocks, $this->separators));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php
new file mode 100644
index 00000000..c0fdeed4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class DateTime extends DateTimeWizard
+{
+    /**
+     * @var string[]
+     */
+    protected array $separators;
+
+    /**
+     * @var array<DateTimeWizard|string>
+     */
+    protected array $formatBlocks;
+
+    /**
+     * @param null|string|string[] $separators
+     *          If you want to use only a single format block, then pass a null as the separator argument
+     * @param DateTimeWizard|string ...$formatBlocks
+     */
+    public function __construct($separators, ...$formatBlocks)
+    {
+        $this->separators = $this->padSeparatorArray(
+            is_array($separators) ? $separators : [$separators],
+            count($formatBlocks) - 1
+        );
+        $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
+    }
+
+    private function mapFormatBlocks(DateTimeWizard|string $value): string
+    {
+        // Any date masking codes are returned as lower case values
+        if ($value instanceof DateTimeWizard) {
+            return $value->__toString();
+        }
+
+        // Wrap any string literals in quotes, so that they're clearly defined as string literals
+        return $this->wrapLiteral($value);
+    }
+
+    public function format(): string
+    {
+        return implode('', array_map([$this, 'intersperse'], $this->formatBlocks, $this->separators));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php
new file mode 100644
index 00000000..8cd7da7c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use Stringable;
+
+abstract class DateTimeWizard implements Stringable, Wizard
+{
+    protected const NO_ESCAPING_NEEDED = "$+-/():!^&'~{}<>= ";
+
+    protected function padSeparatorArray(array $separators, int $count): array
+    {
+        $lastSeparator = array_pop($separators);
+
+        return $separators + array_fill(0, $count, $lastSeparator);
+    }
+
+    protected function escapeSingleCharacter(string $value): string
+    {
+        if (str_contains(self::NO_ESCAPING_NEEDED, $value)) {
+            return $value;
+        }
+
+        return "\\{$value}";
+    }
+
+    protected function wrapLiteral(string $value): string
+    {
+        if (mb_strlen($value, 'UTF-8') === 1) {
+            return $this->escapeSingleCharacter($value);
+        }
+
+        // Wrap any other string literals in quotes, so that they're clearly defined as string literals
+        return '"' . str_replace('"', '""', $value) . '"';
+    }
+
+    protected function intersperse(string $formatBlock, ?string $separator): string
+    {
+        return "{$formatBlock}{$separator}";
+    }
+
+    public function __toString(): string
+    {
+        return $this->format();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php
new file mode 100644
index 00000000..b81f77ac
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class Duration extends DateTimeWizard
+{
+    public const DAYS_DURATION = 'd';
+
+    /**
+     * Hours as a duration (can exceed 24), e.g. 29.
+     */
+    public const HOURS_DURATION = '[h]';
+
+    /**
+     * Hours without a leading zero, e.g. 9.
+     */
+    public const HOURS_SHORT = 'h';
+
+    /**
+     * Hours with a leading zero, e.g. 09.
+     */
+    public const HOURS_LONG = 'hh';
+
+    /**
+     * Minutes as a duration (can exceed 60), e.g. 109.
+     */
+    public const MINUTES_DURATION = '[m]';
+
+    /**
+     * Minutes without a leading zero, e.g. 5.
+     */
+    public const MINUTES_SHORT = 'm';
+
+    /**
+     * Minutes with a leading zero, e.g. 05.
+     */
+    public const MINUTES_LONG = 'mm';
+
+    /**
+     * Seconds as a duration (can exceed 60), e.g. 129.
+     */
+    public const SECONDS_DURATION = '[s]';
+
+    /**
+     * Seconds without a leading zero, e.g. 2.
+     */
+    public const SECONDS_SHORT = 's';
+
+    /**
+     * Seconds with a leading zero, e.g. 02.
+     */
+    public const SECONDS_LONG = 'ss';
+
+    protected const DURATION_BLOCKS = [
+        self::DAYS_DURATION,
+        self::HOURS_DURATION,
+        self::HOURS_LONG,
+        self::HOURS_SHORT,
+        self::MINUTES_DURATION,
+        self::MINUTES_LONG,
+        self::MINUTES_SHORT,
+        self::SECONDS_DURATION,
+        self::SECONDS_LONG,
+        self::SECONDS_SHORT,
+    ];
+
+    protected const DURATION_MASKS = [
+        self::DAYS_DURATION => self::DAYS_DURATION,
+        self::HOURS_DURATION => self::HOURS_SHORT,
+        self::MINUTES_DURATION => self::MINUTES_LONG,
+        self::SECONDS_DURATION => self::SECONDS_LONG,
+    ];
+
+    protected const DURATION_DEFAULTS = [
+        self::HOURS_LONG => self::HOURS_DURATION,
+        self::HOURS_SHORT => self::HOURS_DURATION,
+        self::MINUTES_LONG => self::MINUTES_DURATION,
+        self::MINUTES_SHORT => self::MINUTES_DURATION,
+        self::SECONDS_LONG => self::SECONDS_DURATION,
+        self::SECONDS_SHORT => self::SECONDS_DURATION,
+    ];
+
+    public const SEPARATOR_COLON = ':';
+    public const SEPARATOR_SPACE_NONBREAKING = "\u{a0}";
+    public const SEPARATOR_SPACE = ' ';
+
+    public const DURATION_DEFAULT = [
+        self::HOURS_DURATION,
+        self::MINUTES_LONG,
+        self::SECONDS_LONG,
+    ];
+
+    /**
+     * @var string[]
+     */
+    protected array $separators;
+
+    /**
+     * @var string[]
+     */
+    protected array $formatBlocks;
+
+    protected bool $durationIsSet = false;
+
+    /**
+     * @param null|string|string[] $separators
+     *        If you want to use the same separator for all format blocks, then it can be passed as a string literal;
+     *           if you wish to use different separators, then they should be passed as an array.
+     *        If you want to use only a single format block, then pass a null as the separator argument
+     */
+    public function __construct($separators = self::SEPARATOR_COLON, string ...$formatBlocks)
+    {
+        $separators ??= self::SEPARATOR_COLON;
+        $formatBlocks = (count($formatBlocks) === 0) ? self::DURATION_DEFAULT : $formatBlocks;
+
+        $this->separators = $this->padSeparatorArray(
+            is_array($separators) ? $separators : [$separators],
+            count($formatBlocks) - 1
+        );
+        $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
+
+        if ($this->durationIsSet === false) {
+            // We need at least one duration mask, so if none has been set we change the first mask element
+            //    to a duration.
+            $this->formatBlocks[0] = self::DURATION_DEFAULTS[mb_strtolower($this->formatBlocks[0])];
+        }
+    }
+
+    private function mapFormatBlocks(string $value): string
+    {
+        // Any duration masking codes are returned as lower case values
+        if (in_array(mb_strtolower($value), self::DURATION_BLOCKS, true)) {
+            if (array_key_exists(mb_strtolower($value), self::DURATION_MASKS)) {
+                if ($this->durationIsSet) {
+                    // We should only have a single duration mask, the first defined in the mask set,
+                    //    so convert any additional duration masks to standard time masks.
+                    $value = self::DURATION_MASKS[mb_strtolower($value)];
+                }
+                $this->durationIsSet = true;
+            }
+
+            return mb_strtolower($value);
+        }
+
+        // Wrap any string literals in quotes, so that they're clearly defined as string literals
+        return $this->wrapLiteral($value);
+    }
+
+    public function format(): string
+    {
+        return implode('', array_map([$this, 'intersperse'], $this->formatBlocks, $this->separators));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php
new file mode 100644
index 00000000..0c02286b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+final class Locale
+{
+    /**
+     * Language code: ISO-639 2 character, alpha.
+     * Optional script code: ISO-15924 4 alpha.
+     * Optional country code: ISO-3166-1, 2 character alpha.
+     * Separated by underscores or dashes.
+     */
+    public const STRUCTURE = '/^(?P<language>[a-z]{2})([-_](?P<script>[a-z]{4}))?([-_](?P<country>[a-z]{2}))?$/i';
+
+    private NumberFormatter $formatter;
+
+    public function __construct(?string $locale, int $style)
+    {
+        if (class_exists(NumberFormatter::class) === false) {
+            throw new Exception();
+        }
+
+        $formatterLocale = str_replace('-', '_', $locale ?? '');
+        $this->formatter = new NumberFormatter($formatterLocale, $style);
+        if ($this->formatter->getLocale() !== $formatterLocale) {
+            throw new Exception("Unable to read locale data for '{$locale}'");
+        }
+    }
+
+    public function format(bool $stripRlm = true): string
+    {
+        $str = $this->formatter->getPattern();
+
+        return ($stripRlm && str_starts_with($str, "\xe2\x80\x8f")) ? substr($str, 3) : $str;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Number.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Number.php
new file mode 100644
index 00000000..d7e7cd07
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Number.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Number extends NumberBase implements Wizard
+{
+    public const WITH_THOUSANDS_SEPARATOR = true;
+
+    public const WITHOUT_THOUSANDS_SEPARATOR = false;
+
+    protected bool $thousandsSeparator = true;
+
+    /**
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param bool $thousandsSeparator indicator whether the thousands separator should be used, or not
+     * @param ?string $locale Set the locale for the number format; or leave as the default null.
+     *          Locale has no effect for Number Format values, and is retained here only for compatibility
+     *              with the other Wizards.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(
+        int $decimals = 2,
+        bool $thousandsSeparator = self::WITH_THOUSANDS_SEPARATOR,
+        ?string $locale = null
+    ) {
+        $this->setDecimals($decimals);
+        $this->setThousandsSeparator($thousandsSeparator);
+        $this->setLocale($locale);
+    }
+
+    public function setThousandsSeparator(bool $thousandsSeparator = self::WITH_THOUSANDS_SEPARATOR): void
+    {
+        $this->thousandsSeparator = $thousandsSeparator;
+    }
+
+    /**
+     * As MS Excel cannot easily handle Lakh, which is the only locale-specific Number format variant,
+     *       we don't use locale with Numbers.
+     */
+    protected function getLocaleFormat(): string
+    {
+        return $this->format();
+    }
+
+    public function format(): string
+    {
+        return sprintf(
+            '%s0%s',
+            $this->thousandsSeparator ? '#,##' : null,
+            $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php
new file mode 100644
index 00000000..53f6b3dd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use Stringable;
+
+abstract class NumberBase implements Stringable
+{
+    protected const MAX_DECIMALS = 30;
+
+    protected int $decimals = 2;
+
+    protected ?string $locale = null;
+
+    protected ?string $fullLocale = null;
+
+    protected ?string $localeFormat = null;
+
+    public function setDecimals(int $decimals = 2): void
+    {
+        $this->decimals = ($decimals > self::MAX_DECIMALS) ? self::MAX_DECIMALS : max($decimals, 0);
+    }
+
+    /**
+     * Setting a locale will override any settings defined in this class.
+     *
+     * @throws Exception If the locale code is not a valid format
+     */
+    public function setLocale(?string $locale = null): void
+    {
+        if ($locale === null) {
+            $this->localeFormat = $this->locale = $this->fullLocale = null;
+
+            return;
+        }
+
+        $this->locale = $this->validateLocale($locale);
+
+        if (class_exists(NumberFormatter::class)) {
+            $this->localeFormat = $this->getLocaleFormat();
+        }
+    }
+
+    /**
+     * Stub: should be implemented as a concrete method in concrete wizards.
+     */
+    abstract protected function getLocaleFormat(): string;
+
+    /**
+     * @throws Exception If the locale code is not a valid format
+     */
+    private function validateLocale(string $locale): string
+    {
+        if (preg_match(Locale::STRUCTURE, $locale, $matches, PREG_UNMATCHED_AS_NULL) !== 1) {
+            throw new Exception("Invalid locale code '{$locale}'");
+        }
+
+        ['language' => $language, 'script' => $script, 'country' => $country] = $matches;
+        // Set case and separator to match standardised locale case
+        $language = strtolower($language ?? '');
+        $script = ($script === null) ? null : ucfirst(strtolower($script));
+        $country = ($country === null) ? null : strtoupper($country);
+
+        $this->fullLocale = implode('-', array_filter([$language, $script, $country]));
+
+        return $country === null ? $language : "{$language}-{$country}";
+    }
+
+    public function format(): string
+    {
+        return NumberFormat::FORMAT_GENERAL;
+    }
+
+    public function __toString(): string
+    {
+        return $this->format();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php
new file mode 100644
index 00000000..003c0ddf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Percentage extends NumberBase implements Wizard
+{
+    /**
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param ?string $locale Set the locale for the percentage format; or leave as the default null.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(int $decimals = 2, ?string $locale = null)
+    {
+        $this->setDecimals($decimals);
+        $this->setLocale($locale);
+    }
+
+    protected function getLocaleFormat(): string
+    {
+        $formatter = new Locale($this->fullLocale, NumberFormatter::PERCENT);
+
+        return $this->decimals > 0
+            ? str_replace('0', '0.' . str_repeat('0', $this->decimals), $formatter->format())
+            : $formatter->format();
+    }
+
+    public function format(): string
+    {
+        if ($this->localeFormat !== null) {
+            return $this->localeFormat;
+        }
+
+        return sprintf('0%s%%', $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Scientific.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Scientific.php
new file mode 100644
index 00000000..2c25efd1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Scientific.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Scientific extends NumberBase implements Wizard
+{
+    /**
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param ?string $locale Set the locale for the scientific format; or leave as the default null.
+     *          Locale has no effect for Scientific Format values, and is retained here for compatibility
+     *              with the other Wizards.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(int $decimals = 2, ?string $locale = null)
+    {
+        $this->setDecimals($decimals);
+        $this->setLocale($locale);
+    }
+
+    protected function getLocaleFormat(): string
+    {
+        return $this->format();
+    }
+
+    public function format(): string
+    {
+        return sprintf('0%sE+00', $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php
new file mode 100644
index 00000000..64b9104a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class Time extends DateTimeWizard
+{
+    /**
+     * Hours without a leading zero, e.g. 9.
+     */
+    public const HOURS_SHORT = 'h';
+
+    /**
+     * Hours with a leading zero, e.g. 09.
+     */
+    public const HOURS_LONG = 'hh';
+
+    /**
+     * Minutes without a leading zero, e.g. 5.
+     */
+    public const MINUTES_SHORT = 'm';
+
+    /**
+     * Minutes with a leading zero, e.g. 05.
+     */
+    public const MINUTES_LONG = 'mm';
+
+    /**
+     * Seconds without a leading zero, e.g. 2.
+     */
+    public const SECONDS_SHORT = 's';
+
+    /**
+     * Seconds with a leading zero, e.g. 02.
+     */
+    public const SECONDS_LONG = 'ss';
+
+    public const MORNING_AFTERNOON = 'AM/PM';
+
+    protected const TIME_BLOCKS = [
+        self::HOURS_LONG,
+        self::HOURS_SHORT,
+        self::MINUTES_LONG,
+        self::MINUTES_SHORT,
+        self::SECONDS_LONG,
+        self::SECONDS_SHORT,
+        self::MORNING_AFTERNOON,
+    ];
+
+    public const SEPARATOR_COLON = ':';
+    public const SEPARATOR_SPACE_NONBREAKING = "\u{a0}";
+    public const SEPARATOR_SPACE = ' ';
+
+    protected const TIME_DEFAULT = [
+        self::HOURS_LONG,
+        self::MINUTES_LONG,
+        self::SECONDS_LONG,
+    ];
+
+    /**
+     * @var string[]
+     */
+    protected array $separators;
+
+    /**
+     * @var string[]
+     */
+    protected array $formatBlocks;
+
+    /**
+     * @param null|string|string[] $separators
+     *        If you want to use the same separator for all format blocks, then it can be passed as a string literal;
+     *           if you wish to use different separators, then they should be passed as an array.
+     *        If you want to use only a single format block, then pass a null as the separator argument
+     */
+    public function __construct($separators = self::SEPARATOR_COLON, string ...$formatBlocks)
+    {
+        $separators ??= self::SEPARATOR_COLON;
+        $formatBlocks = (count($formatBlocks) === 0) ? self::TIME_DEFAULT : $formatBlocks;
+
+        $this->separators = $this->padSeparatorArray(
+            is_array($separators) ? $separators : [$separators],
+            count($formatBlocks) - 1
+        );
+        $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
+    }
+
+    private function mapFormatBlocks(string $value): string
+    {
+        // Any date masking codes are returned as lower case values
+        //     except for AM/PM, which is set to uppercase
+        if (in_array(mb_strtolower($value), self::TIME_BLOCKS, true)) {
+            return mb_strtolower($value);
+        } elseif (mb_strtoupper($value) === self::MORNING_AFTERNOON) {
+            return mb_strtoupper($value);
+        }
+
+        // Wrap any string literals in quotes, so that they're clearly defined as string literals
+        return $this->wrapLiteral($value);
+    }
+
+    public function format(): string
+    {
+        return implode('', array_map([$this, 'intersperse'], $this->formatBlocks, $this->separators));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Wizard.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Wizard.php
new file mode 100644
index 00000000..de4dc4f8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Wizard.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+interface Wizard
+{
+    public function format(): string;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php
new file mode 100644
index 00000000..55a6526c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+class Protection extends Supervisor
+{
+    /** Protection styles */
+    const PROTECTION_INHERIT = 'inherit';
+    const PROTECTION_PROTECTED = 'protected';
+    const PROTECTION_UNPROTECTED = 'unprotected';
+
+    /**
+     * Locked.
+     */
+    protected ?string $locked = null;
+
+    /**
+     * Hidden.
+     */
+    protected ?string $hidden = null;
+
+    /**
+     * Create a new Protection.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     * @param bool $isConditional Flag indicating if this is a conditional style or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
+    {
+        // Supervisor?
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        if (!$isConditional) {
+            $this->locked = self::PROTECTION_INHERIT;
+            $this->hidden = self::PROTECTION_INHERIT;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getProtection();
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        return ['protection' => $array];
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->getLocked()->applyFromArray(
+     *     [
+     *         'locked' => TRUE,
+     *         'hidden' => FALSE
+     *     ]
+     * );
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray): static
+    {
+        if ($this->isSupervisor) {
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
+        } else {
+            if (isset($styleArray['locked'])) {
+                $this->setLocked($styleArray['locked']);
+            }
+            if (isset($styleArray['hidden'])) {
+                $this->setHidden($styleArray['hidden']);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get locked.
+     */
+    public function getLocked(): ?string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getLocked();
+        }
+
+        return $this->locked;
+    }
+
+    /**
+     * Set locked.
+     *
+     * @param string $lockType see self::PROTECTION_*
+     *
+     * @return $this
+     */
+    public function setLocked(string $lockType): static
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['locked' => $lockType]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->locked = $lockType;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get hidden.
+     */
+    public function getHidden(): ?string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHidden();
+        }
+
+        return $this->hidden;
+    }
+
+    /**
+     * Set hidden.
+     *
+     * @param string $hiddenType see self::PROTECTION_*
+     *
+     * @return $this
+     */
+    public function setHidden(string $hiddenType): static
+    {
+        if ($this->isSupervisor) {
+            $styleArray = $this->getStyleArray(['hidden' => $hiddenType]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->hidden = $hiddenType;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getHashCode();
+        }
+
+        return md5(
+            $this->locked
+            . $this->hidden
+            . __CLASS__
+        );
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'locked', $this->getLocked());
+        $this->exportArray2($exportedArray, 'hidden', $this->getHidden());
+
+        return $exportedArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php
new file mode 100644
index 00000000..07d0d77c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+/**
+ * Class to handle tint applied to color.
+ * Code borrows heavily from some Python projects.
+ *
+ * @see https://docs.python.org/3/library/colorsys.html
+ * @see https://gist.github.com/Mike-Honey/b36e651e9a7f1d2e1d60ce1c63b9b633
+ */
+class RgbTint
+{
+    private const ONE_THIRD = 1.0 / 3.0;
+    private const ONE_SIXTH = 1.0 / 6.0;
+    private const TWO_THIRD = 2.0 / 3.0;
+    private const RGBMAX = 255.0;
+    /**
+     * MS excel's tint function expects that HLS is base 240.
+     *
+     * @see https://social.msdn.microsoft.com/Forums/en-US/e9d8c136-6d62-4098-9b1b-dac786149f43/excel-color-tint-algorithm-incorrect?forum=os_binaryfile#d3c2ac95-52e0-476b-86f1-e2a697f24969
+     */
+    private const HLSMAX = 240.0;
+
+    /**
+     * Convert red/green/blue to hue/luminance/saturation.
+     *
+     * @param float $red 0.0 through 1.0
+     * @param float $green 0.0 through 1.0
+     * @param float $blue 0.0 through 1.0
+     *
+     * @return float[]
+     */
+    private static function rgbToHls(float $red, float $green, float $blue): array
+    {
+        $maxc = max($red, $green, $blue);
+        $minc = min($red, $green, $blue);
+        $luminance = ($minc + $maxc) / 2.0;
+        if ($minc === $maxc) {
+            return [0.0, $luminance, 0.0];
+        }
+        $maxMinusMin = $maxc - $minc;
+        if ($luminance <= 0.5) {
+            $s = $maxMinusMin / ($maxc + $minc);
+        } else {
+            $s = $maxMinusMin / (2.0 - $maxc - $minc);
+        }
+        $rc = ($maxc - $red) / $maxMinusMin;
+        $gc = ($maxc - $green) / $maxMinusMin;
+        $bc = ($maxc - $blue) / $maxMinusMin;
+        if ($red === $maxc) {
+            $h = $bc - $gc;
+        } elseif ($green === $maxc) {
+            $h = 2.0 + $rc - $bc;
+        } else {
+            $h = 4.0 + $gc - $rc;
+        }
+        $h = self::positiveDecimalPart($h / 6.0);
+
+        return [$h, $luminance, $s];
+    }
+
+    /**
+     * Convert hue/luminance/saturation to red/green/blue.
+     *
+     * @param float $hue 0.0 through 1.0
+     * @param float $luminance 0.0 through 1.0
+     * @param float $saturation 0.0 through 1.0
+     *
+     * @return float[]
+     */
+    private static function hlsToRgb(float $hue, float $luminance, float $saturation): array
+    {
+        if ($saturation === 0.0) {
+            return [$luminance, $luminance, $luminance];
+        }
+        if ($luminance <= 0.5) {
+            $m2 = $luminance * (1.0 + $saturation);
+        } else {
+            $m2 = $luminance + $saturation - ($luminance * $saturation);
+        }
+        $m1 = 2.0 * $luminance - $m2;
+
+        return [
+            self::vFunction($m1, $m2, $hue + self::ONE_THIRD),
+            self::vFunction($m1, $m2, $hue),
+            self::vFunction($m1, $m2, $hue - self::ONE_THIRD),
+        ];
+    }
+
+    private static function vFunction(float $m1, float $m2, float $hue): float
+    {
+        $hue = self::positiveDecimalPart($hue);
+        if ($hue < self::ONE_SIXTH) {
+            return $m1 + ($m2 - $m1) * $hue * 6.0;
+        }
+        if ($hue < 0.5) {
+            return $m2;
+        }
+        if ($hue < self::TWO_THIRD) {
+            return $m1 + ($m2 - $m1) * (self::TWO_THIRD - $hue) * 6.0;
+        }
+
+        return $m1;
+    }
+
+    private static function positiveDecimalPart(float $hue): float
+    {
+        $hue = fmod($hue, 1.0);
+
+        return ($hue >= 0.0) ? $hue : (1.0 + $hue);
+    }
+
+    /**
+     * Convert red/green/blue to HLSMAX-based hue/luminance/saturation.
+     *
+     * @return int[]
+     */
+    private static function rgbToMsHls(int $red, int $green, int $blue): array
+    {
+        $red01 = $red / self::RGBMAX;
+        $green01 = $green / self::RGBMAX;
+        $blue01 = $blue / self::RGBMAX;
+        [$hue, $luminance, $saturation] = self::rgbToHls($red01, $green01, $blue01);
+
+        return [
+            (int) round($hue * self::HLSMAX),
+            (int) round($luminance * self::HLSMAX),
+            (int) round($saturation * self::HLSMAX),
+        ];
+    }
+
+    /**
+     * Converts HLSMAX based HLS values to rgb values in the range (0,1).
+     *
+     * @return float[]
+     */
+    private static function msHlsToRgb(int $hue, int $lightness, int $saturation): array
+    {
+        return self::hlsToRgb($hue / self::HLSMAX, $lightness / self::HLSMAX, $saturation / self::HLSMAX);
+    }
+
+    /**
+     * Tints HLSMAX based luminance.
+     *
+     * @see http://ciintelligence.blogspot.co.uk/2012/02/converting-excel-theme-color-and-tint.html
+     */
+    private static function tintLuminance(float $tint, float $luminance): int
+    {
+        if ($tint < 0) {
+            return (int) round($luminance * (1.0 + $tint));
+        }
+
+        return (int) round($luminance * (1.0 - $tint) + (self::HLSMAX - self::HLSMAX * (1.0 - $tint)));
+    }
+
+    /**
+     * Return result of tinting supplied rgb as 6 hex digits.
+     */
+    public static function rgbAndTintToRgb(int $red, int $green, int $blue, float $tint): string
+    {
+        [$hue, $luminance, $saturation] = self::rgbToMsHls($red, $green, $blue);
+        [$red, $green, $blue] = self::msHlsToRgb($hue, self::tintLuminance($tint, $luminance), $saturation);
+
+        return sprintf(
+            '%02X%02X%02X',
+            (int) round($red * self::RGBMAX),
+            (int) round($green * self::RGBMAX),
+            (int) round($blue * self::RGBMAX)
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php
new file mode 100644
index 00000000..68ca39e0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php
@@ -0,0 +1,705 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+class Style extends Supervisor
+{
+    /**
+     * Font.
+     */
+    protected Font $font;
+
+    /**
+     * Fill.
+     */
+    protected Fill $fill;
+
+    /**
+     * Borders.
+     */
+    protected Borders $borders;
+
+    /**
+     * Alignment.
+     */
+    protected Alignment $alignment;
+
+    /**
+     * Number Format.
+     */
+    protected NumberFormat $numberFormat;
+
+    /**
+     * Protection.
+     */
+    protected Protection $protection;
+
+    /**
+     * Index of style in collection. Only used for real style.
+     */
+    protected int $index;
+
+    /**
+     * Use Quote Prefix when displaying in cell editor. Only used for real style.
+     */
+    protected bool $quotePrefix = false;
+
+    /**
+     * Internal cache for styles
+     * Used when applying style on range of cells (column or row) and cleared when
+     * all cells in range is styled.
+     *
+     * PhpSpreadsheet will always minimize the amount of styles used. So cells with
+     * same styles will reference the same Style instance. To check if two styles
+     * are similar Style::getHashCode() is used. This call is expensive. To minimize
+     * the need to call this method we can cache the internal PHP object id of the
+     * Style in the range. Style::getHashCode() will then only be called when we
+     * encounter a unique style.
+     *
+     * @see Style::applyFromArray()
+     * @see Style::getHashCode()
+     *
+     * @var null|array<string, array>
+     */
+    private static ?array $cachedStyles = null;
+
+    /**
+     * Create a new Style.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *         Leave this value at default unless you understand exactly what
+     *    its ramifications are
+     * @param bool $isConditional Flag indicating if this is a conditional style or not
+     *       Leave this value at default unless you understand exactly what
+     *    its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
+    {
+        parent::__construct($isSupervisor);
+
+        // Initialise values
+        $this->font = new Font($isSupervisor, $isConditional);
+        $this->fill = new Fill($isSupervisor, $isConditional);
+        $this->borders = new Borders($isSupervisor, $isConditional);
+        $this->alignment = new Alignment($isSupervisor, $isConditional);
+        $this->numberFormat = new NumberFormat($isSupervisor, $isConditional);
+        $this->protection = new Protection($isSupervisor, $isConditional);
+
+        // bind parent if we are a supervisor
+        if ($isSupervisor) {
+            $this->font->bindParent($this);
+            $this->fill->bindParent($this);
+            $this->borders->bindParent($this);
+            $this->alignment->bindParent($this);
+            $this->numberFormat->bindParent($this);
+            $this->protection->bindParent($this);
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    public function getSharedComponent(): self
+    {
+        $activeSheet = $this->getActiveSheet();
+        $selectedCell = Functions::trimSheetFromCellReference($this->getActiveCell()); // e.g. 'A1'
+
+        if ($activeSheet->cellExists($selectedCell)) {
+            $xfIndex = $activeSheet->getCell($selectedCell)->getXfIndex();
+        } else {
+            $xfIndex = 0;
+        }
+
+        return $activeSheet->getParentOrThrow()->getCellXfByIndex($xfIndex);
+    }
+
+    /**
+     * Get parent. Only used for style supervisor.
+     */
+    public function getParent(): Spreadsheet
+    {
+        return $this->getActiveSheet()->getParentOrThrow();
+    }
+
+    /**
+     * Build style array from subcomponents.
+     */
+    public function getStyleArray(array $array): array
+    {
+        return ['quotePrefix' => $array];
+    }
+
+    /**
+     * Apply styles from array.
+     *
+     * <code>
+     * $spreadsheet->getActiveSheet()->getStyle('B2')->applyFromArray(
+     *     [
+     *         'font' => [
+     *             'name' => 'Arial',
+     *             'bold' => true,
+     *             'italic' => false,
+     *             'underline' => Font::UNDERLINE_DOUBLE,
+     *             'strikethrough' => false,
+     *             'color' => [
+     *                 'rgb' => '808080'
+     *             ]
+     *         ],
+     *         'borders' => [
+     *             'bottom' => [
+     *                 'borderStyle' => Border::BORDER_DASHDOT,
+     *                 'color' => [
+     *                     'rgb' => '808080'
+     *                 ]
+     *             ],
+     *             'top' => [
+     *                 'borderStyle' => Border::BORDER_DASHDOT,
+     *                 'color' => [
+     *                     'rgb' => '808080'
+     *                 ]
+     *             ]
+     *         ],
+     *         'alignment' => [
+     *             'horizontal' => Alignment::HORIZONTAL_CENTER,
+     *             'vertical' => Alignment::VERTICAL_CENTER,
+     *             'wrapText' => true,
+     *         ],
+     *         'quotePrefix'    => true
+     *     ]
+     * );
+     * </code>
+     *
+     * @param array $styleArray Array containing style information
+     * @param bool $advancedBorders advanced mode for setting borders
+     *
+     * @return $this
+     */
+    public function applyFromArray(array $styleArray, bool $advancedBorders = true): static
+    {
+        if ($this->isSupervisor) {
+            $pRange = $this->getSelectedCells();
+
+            // Uppercase coordinate and strip any Worksheet reference from the selected range
+            $pRange = strtoupper($pRange);
+            if (str_contains($pRange, '!')) {
+                $pRangeWorksheet = StringHelper::strToUpper(trim(substr($pRange, 0, (int) strrpos($pRange, '!')), "'"));
+                if ($pRangeWorksheet !== '' && StringHelper::strToUpper($this->getActiveSheet()->getTitle()) !== $pRangeWorksheet) {
+                    throw new Exception('Invalid Worksheet for specified Range');
+                }
+                $pRange = strtoupper(Functions::trimSheetFromCellReference($pRange));
+            }
+
+            // Is it a cell range or a single cell?
+            if (!str_contains($pRange, ':')) {
+                $rangeA = $pRange;
+                $rangeB = $pRange;
+            } else {
+                [$rangeA, $rangeB] = explode(':', $pRange);
+            }
+
+            // Calculate range outer borders
+            $rangeStart = Coordinate::coordinateFromString($rangeA);
+            $rangeEnd = Coordinate::coordinateFromString($rangeB);
+            $rangeStartIndexes = Coordinate::indexesFromString($rangeA);
+            $rangeEndIndexes = Coordinate::indexesFromString($rangeB);
+
+            $columnStart = $rangeStart[0];
+            $columnEnd = $rangeEnd[0];
+
+            // Make sure we can loop upwards on rows and columns
+            if ($rangeStartIndexes[0] > $rangeEndIndexes[0] && $rangeStartIndexes[1] > $rangeEndIndexes[1]) {
+                $tmp = $rangeStartIndexes;
+                $rangeStartIndexes = $rangeEndIndexes;
+                $rangeEndIndexes = $tmp;
+            }
+
+            // ADVANCED MODE:
+            if ($advancedBorders && isset($styleArray['borders'])) {
+                // 'allBorders' is a shorthand property for 'outline' and 'inside' and
+                //        it applies to components that have not been set explicitly
+                if (isset($styleArray['borders']['allBorders'])) {
+                    foreach (['outline', 'inside'] as $component) {
+                        if (!isset($styleArray['borders'][$component])) {
+                            $styleArray['borders'][$component] = $styleArray['borders']['allBorders'];
+                        }
+                    }
+                    unset($styleArray['borders']['allBorders']); // not needed any more
+                }
+                // 'outline' is a shorthand property for 'top', 'right', 'bottom', 'left'
+                //        it applies to components that have not been set explicitly
+                if (isset($styleArray['borders']['outline'])) {
+                    foreach (['top', 'right', 'bottom', 'left'] as $component) {
+                        if (!isset($styleArray['borders'][$component])) {
+                            $styleArray['borders'][$component] = $styleArray['borders']['outline'];
+                        }
+                    }
+                    unset($styleArray['borders']['outline']); // not needed any more
+                }
+                // 'inside' is a shorthand property for 'vertical' and 'horizontal'
+                //        it applies to components that have not been set explicitly
+                if (isset($styleArray['borders']['inside'])) {
+                    foreach (['vertical', 'horizontal'] as $component) {
+                        if (!isset($styleArray['borders'][$component])) {
+                            $styleArray['borders'][$component] = $styleArray['borders']['inside'];
+                        }
+                    }
+                    unset($styleArray['borders']['inside']); // not needed any more
+                }
+                // width and height characteristics of selection, 1, 2, or 3 (for 3 or more)
+                $xMax = min($rangeEndIndexes[0] - $rangeStartIndexes[0] + 1, 3);
+                $yMax = min($rangeEndIndexes[1] - $rangeStartIndexes[1] + 1, 3);
+
+                // loop through up to 3 x 3 = 9 regions
+                for ($x = 1; $x <= $xMax; ++$x) {
+                    // start column index for region
+                    $colStart = ($x == 3)
+                        ? Coordinate::stringFromColumnIndex($rangeEndIndexes[0])
+                        : Coordinate::stringFromColumnIndex($rangeStartIndexes[0] + $x - 1);
+                    // end column index for region
+                    $colEnd = ($x == 1)
+                        ? Coordinate::stringFromColumnIndex($rangeStartIndexes[0])
+                        : Coordinate::stringFromColumnIndex($rangeEndIndexes[0] - $xMax + $x);
+
+                    for ($y = 1; $y <= $yMax; ++$y) {
+                        // which edges are touching the region
+                        $edges = [];
+                        if ($x == 1) {
+                            // are we at left edge
+                            $edges[] = 'left';
+                        }
+                        if ($x == $xMax) {
+                            // are we at right edge
+                            $edges[] = 'right';
+                        }
+                        if ($y == 1) {
+                            // are we at top edge?
+                            $edges[] = 'top';
+                        }
+                        if ($y == $yMax) {
+                            // are we at bottom edge?
+                            $edges[] = 'bottom';
+                        }
+
+                        // start row index for region
+                        $rowStart = ($y == 3)
+                            ? $rangeEndIndexes[1] : $rangeStartIndexes[1] + $y - 1;
+
+                        // end row index for region
+                        $rowEnd = ($y == 1)
+                            ? $rangeStartIndexes[1] : $rangeEndIndexes[1] - $yMax + $y;
+
+                        // build range for region
+                        $range = $colStart . $rowStart . ':' . $colEnd . $rowEnd;
+
+                        // retrieve relevant style array for region
+                        $regionStyles = $styleArray;
+                        unset($regionStyles['borders']['inside']);
+
+                        // what are the inner edges of the region when looking at the selection
+                        $innerEdges = array_diff(['top', 'right', 'bottom', 'left'], $edges);
+
+                        // inner edges that are not touching the region should take the 'inside' border properties if they have been set
+                        foreach ($innerEdges as $innerEdge) {
+                            switch ($innerEdge) {
+                                case 'top':
+                                case 'bottom':
+                                    // should pick up 'horizontal' border property if set
+                                    if (isset($styleArray['borders']['horizontal'])) {
+                                        $regionStyles['borders'][$innerEdge] = $styleArray['borders']['horizontal'];
+                                    } else {
+                                        unset($regionStyles['borders'][$innerEdge]);
+                                    }
+
+                                    break;
+                                case 'left':
+                                case 'right':
+                                    // should pick up 'vertical' border property if set
+                                    if (isset($styleArray['borders']['vertical'])) {
+                                        $regionStyles['borders'][$innerEdge] = $styleArray['borders']['vertical'];
+                                    } else {
+                                        unset($regionStyles['borders'][$innerEdge]);
+                                    }
+
+                                    break;
+                            }
+                        }
+
+                        // apply region style to region by calling applyFromArray() in simple mode
+                        $this->getActiveSheet()->getStyle($range)->applyFromArray($regionStyles, false);
+                    }
+                }
+
+                // restore initial cell selection range
+                $this->getActiveSheet()->getStyle($pRange);
+
+                return $this;
+            }
+
+            // SIMPLE MODE:
+            // Selection type, inspect
+            if (preg_match('/^[A-Z]+1:[A-Z]+1048576$/', $pRange)) {
+                $selectionType = 'COLUMN';
+
+                // Enable caching of styles
+                self::$cachedStyles = ['hashByObjId' => [], 'styleByHash' => []];
+            } elseif (preg_match('/^A\d+:XFD\d+$/', $pRange)) {
+                $selectionType = 'ROW';
+
+                // Enable caching of styles
+                self::$cachedStyles = ['hashByObjId' => [], 'styleByHash' => []];
+            } else {
+                $selectionType = 'CELL';
+            }
+
+            // First loop through columns, rows, or cells to find out which styles are affected by this operation
+            $oldXfIndexes = $this->getOldXfIndexes($selectionType, $rangeStartIndexes, $rangeEndIndexes, $columnStart, $columnEnd, $styleArray);
+
+            // clone each of the affected styles, apply the style array, and add the new styles to the workbook
+            $workbook = $this->getActiveSheet()->getParentOrThrow();
+            $newXfIndexes = [];
+            foreach ($oldXfIndexes as $oldXfIndex => $dummy) {
+                $style = $workbook->getCellXfByIndex($oldXfIndex);
+
+                // $cachedStyles is set when applying style for a range of cells, either column or row
+                if (self::$cachedStyles === null) {
+                    // Clone the old style and apply style-array
+                    $newStyle = clone $style;
+                    $newStyle->applyFromArray($styleArray);
+
+                    // Look for existing style we can use instead (reduce memory usage)
+                    $existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode());
+                } else {
+                    // Style cache is stored by Style::getHashCode(). But calling this method is
+                    // expensive. So we cache the php obj id -> hash.
+                    $objId = spl_object_id($style);
+
+                    // Look for the original HashCode
+                    $styleHash = self::$cachedStyles['hashByObjId'][$objId] ?? null;
+                    if ($styleHash === null) {
+                        // This object_id is not cached, store the hashcode in case encounter again
+                        $styleHash = self::$cachedStyles['hashByObjId'][$objId] = $style->getHashCode();
+                    }
+
+                    // Find existing style by hash.
+                    $existingStyle = self::$cachedStyles['styleByHash'][$styleHash] ?? null;
+
+                    if (!$existingStyle) {
+                        // The old style combined with the new style array is not cached, so we create it now
+                        $newStyle = clone $style;
+                        $newStyle->applyFromArray($styleArray);
+
+                        // Look for similar style in workbook to reduce memory usage
+                        $existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode());
+
+                        // Cache the new style by original hashcode
+                        self::$cachedStyles['styleByHash'][$styleHash] = $existingStyle instanceof self ? $existingStyle : $newStyle;
+                    }
+                }
+
+                if ($existingStyle) {
+                    // there is already such cell Xf in our collection
+                    $newXfIndexes[$oldXfIndex] = $existingStyle->getIndex();
+                } else {
+                    if (!isset($newStyle)) {
+                        // Handle bug in PHPStan, see https://github.com/phpstan/phpstan/issues/5805
+                        // $newStyle should always be defined.
+                        // This block might not be needed in the future
+                        // @codeCoverageIgnoreStart
+                        $newStyle = clone $style;
+                        $newStyle->applyFromArray($styleArray);
+                        // @codeCoverageIgnoreEnd
+                    }
+
+                    // we don't have such a cell Xf, need to add
+                    $workbook->addCellXf($newStyle);
+                    $newXfIndexes[$oldXfIndex] = $newStyle->getIndex();
+                }
+            }
+
+            // Loop through columns, rows, or cells again and update the XF index
+            switch ($selectionType) {
+                case 'COLUMN':
+                    for ($col = $rangeStartIndexes[0]; $col <= $rangeEndIndexes[0]; ++$col) {
+                        $columnDimension = $this->getActiveSheet()->getColumnDimensionByColumn($col);
+                        $oldXfIndex = $columnDimension->getXfIndex();
+                        $columnDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
+                    }
+
+                    // Disable caching of styles
+                    self::$cachedStyles = null;
+
+                    break;
+                case 'ROW':
+                    for ($row = $rangeStartIndexes[1]; $row <= $rangeEndIndexes[1]; ++$row) {
+                        $rowDimension = $this->getActiveSheet()->getRowDimension($row);
+                        // row without explicit style should be formatted based on default style
+                        $oldXfIndex = $rowDimension->getXfIndex() ?? 0;
+                        $rowDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
+                    }
+
+                    // Disable caching of styles
+                    self::$cachedStyles = null;
+
+                    break;
+                case 'CELL':
+                    for ($col = $rangeStartIndexes[0]; $col <= $rangeEndIndexes[0]; ++$col) {
+                        for ($row = $rangeStartIndexes[1]; $row <= $rangeEndIndexes[1]; ++$row) {
+                            $cell = $this->getActiveSheet()->getCell([$col, $row]);
+                            $oldXfIndex = $cell->getXfIndex();
+                            $cell->setXfIndex($newXfIndexes[$oldXfIndex]);
+                        }
+                    }
+
+                    break;
+            }
+        } else {
+            // not a supervisor, just apply the style array directly on style object
+            if (isset($styleArray['fill'])) {
+                $this->getFill()->applyFromArray($styleArray['fill']);
+            }
+            if (isset($styleArray['font'])) {
+                $this->getFont()->applyFromArray($styleArray['font']);
+            }
+            if (isset($styleArray['borders'])) {
+                $this->getBorders()->applyFromArray($styleArray['borders']);
+            }
+            if (isset($styleArray['alignment'])) {
+                $this->getAlignment()->applyFromArray($styleArray['alignment']);
+            }
+            if (isset($styleArray['numberFormat'])) {
+                $this->getNumberFormat()->applyFromArray($styleArray['numberFormat']);
+            }
+            if (isset($styleArray['protection'])) {
+                $this->getProtection()->applyFromArray($styleArray['protection']);
+            }
+            if (isset($styleArray['quotePrefix'])) {
+                $this->quotePrefix = $styleArray['quotePrefix'];
+            }
+        }
+
+        return $this;
+    }
+
+    private function getOldXfIndexes(string $selectionType, array $rangeStart, array $rangeEnd, string $columnStart, string $columnEnd, array $styleArray): array
+    {
+        $oldXfIndexes = [];
+        switch ($selectionType) {
+            case 'COLUMN':
+                for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                    $oldXfIndexes[$this->getActiveSheet()->getColumnDimensionByColumn($col)->getXfIndex()] = true;
+                }
+                foreach ($this->getActiveSheet()->getColumnIterator($columnStart, $columnEnd) as $columnIterator) {
+                    $cellIterator = $columnIterator->getCellIterator();
+                    $cellIterator->setIterateOnlyExistingCells(true);
+                    foreach ($cellIterator as $columnCell) {
+                        if ($columnCell !== null) {
+                            $columnCell->getStyle()->applyFromArray($styleArray);
+                        }
+                    }
+                }
+
+                break;
+            case 'ROW':
+                for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                    if ($this->getActiveSheet()->getRowDimension($row)->getXfIndex() === null) {
+                        $oldXfIndexes[0] = true; // row without explicit style should be formatted based on default style
+                    } else {
+                        $oldXfIndexes[$this->getActiveSheet()->getRowDimension($row)->getXfIndex()] = true;
+                    }
+                }
+                foreach ($this->getActiveSheet()->getRowIterator((int) $rangeStart[1], (int) $rangeEnd[1]) as $rowIterator) {
+                    $cellIterator = $rowIterator->getCellIterator();
+                    $cellIterator->setIterateOnlyExistingCells(true);
+                    foreach ($cellIterator as $rowCell) {
+                        if ($rowCell !== null) {
+                            $rowCell->getStyle()->applyFromArray($styleArray);
+                        }
+                    }
+                }
+
+                break;
+            case 'CELL':
+                for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+                    for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                        $oldXfIndexes[$this->getActiveSheet()->getCell([$col, $row])->getXfIndex()] = true;
+                    }
+                }
+
+                break;
+        }
+
+        return $oldXfIndexes;
+    }
+
+    /**
+     * Get Fill.
+     */
+    public function getFill(): Fill
+    {
+        return $this->fill;
+    }
+
+    /**
+     * Get Font.
+     */
+    public function getFont(): Font
+    {
+        return $this->font;
+    }
+
+    /**
+     * Set font.
+     *
+     * @return $this
+     */
+    public function setFont(Font $font): static
+    {
+        $this->font = $font;
+
+        return $this;
+    }
+
+    /**
+     * Get Borders.
+     */
+    public function getBorders(): Borders
+    {
+        return $this->borders;
+    }
+
+    /**
+     * Get Alignment.
+     */
+    public function getAlignment(): Alignment
+    {
+        return $this->alignment;
+    }
+
+    /**
+     * Get Number Format.
+     */
+    public function getNumberFormat(): NumberFormat
+    {
+        return $this->numberFormat;
+    }
+
+    /**
+     * Get Conditional Styles. Only used on supervisor.
+     *
+     * @return Conditional[]
+     */
+    public function getConditionalStyles(): array
+    {
+        return $this->getActiveSheet()->getConditionalStyles($this->getActiveCell());
+    }
+
+    /**
+     * Set Conditional Styles. Only used on supervisor.
+     *
+     * @param Conditional[] $conditionalStyleArray Array of conditional styles
+     *
+     * @return $this
+     */
+    public function setConditionalStyles(array $conditionalStyleArray): static
+    {
+        $this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $conditionalStyleArray);
+
+        return $this;
+    }
+
+    /**
+     * Get Protection.
+     */
+    public function getProtection(): Protection
+    {
+        return $this->protection;
+    }
+
+    /**
+     * Get quote prefix.
+     */
+    public function getQuotePrefix(): bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getQuotePrefix();
+        }
+
+        return $this->quotePrefix;
+    }
+
+    /**
+     * Set quote prefix.
+     *
+     * @return $this
+     */
+    public function setQuotePrefix(bool $quotePrefix): static
+    {
+        if ($quotePrefix == '') {
+            $quotePrefix = false;
+        }
+        if ($this->isSupervisor) {
+            $styleArray = ['quotePrefix' => $quotePrefix];
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+        } else {
+            $this->quotePrefix = (bool) $quotePrefix;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->fill->getHashCode()
+            . $this->font->getHashCode()
+            . $this->borders->getHashCode()
+            . $this->alignment->getHashCode()
+            . $this->numberFormat->getHashCode()
+            . $this->protection->getHashCode()
+            . ($this->quotePrefix ? 't' : 'f')
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Get own index in style collection.
+     */
+    public function getIndex(): int
+    {
+        return $this->index;
+    }
+
+    /**
+     * Set own index in style collection.
+     */
+    public function setIndex(int $index): void
+    {
+        $this->index = $index;
+    }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'alignment', $this->getAlignment());
+        $this->exportArray2($exportedArray, 'borders', $this->getBorders());
+        $this->exportArray2($exportedArray, 'fill', $this->getFill());
+        $this->exportArray2($exportedArray, 'font', $this->getFont());
+        $this->exportArray2($exportedArray, 'numberFormat', $this->getNumberFormat());
+        $this->exportArray2($exportedArray, 'protection', $this->getProtection());
+        $this->exportArray2($exportedArray, 'quotePrefx', $this->getQuotePrefix());
+
+        return $exportedArray;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php
new file mode 100644
index 00000000..8388ef6c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+use PhpOffice\PhpSpreadsheet\IComparable;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+abstract class Supervisor implements IComparable
+{
+    /**
+     * Supervisor?
+     */
+    protected bool $isSupervisor;
+
+    /**
+     * Parent. Only used for supervisor.
+     *
+     * @var Spreadsheet|Supervisor
+     */
+    protected $parent;
+
+    /**
+     * Parent property name.
+     */
+    protected ?string $parentPropertyName = null;
+
+    /**
+     * Create a new Supervisor.
+     *
+     * @param bool $isSupervisor Flag indicating if this is a supervisor or not
+     *                                    Leave this value at default unless you understand exactly what
+     *                                        its ramifications are
+     */
+    public function __construct(bool $isSupervisor = false)
+    {
+        // Supervisor?
+        $this->isSupervisor = $isSupervisor;
+    }
+
+    /**
+     * Bind parent. Only used for supervisor.
+     *
+     * @return $this
+     */
+    public function bindParent(Spreadsheet|self $parent, ?string $parentPropertyName = null)
+    {
+        $this->parent = $parent;
+        $this->parentPropertyName = $parentPropertyName;
+
+        return $this;
+    }
+
+    /**
+     * Is this a supervisor or a cell style component?
+     */
+    public function getIsSupervisor(): bool
+    {
+        return $this->isSupervisor;
+    }
+
+    /**
+     * Get the currently active sheet. Only used for supervisor.
+     */
+    public function getActiveSheet(): Worksheet
+    {
+        return $this->parent->getActiveSheet();
+    }
+
+    /**
+     * Get the currently active cell coordinate in currently active sheet.
+     * Only used for supervisor.
+     *
+     * @return string E.g. 'A1'
+     */
+    public function getSelectedCells(): string
+    {
+        return $this->getActiveSheet()->getSelectedCells();
+    }
+
+    /**
+     * Get the currently active cell coordinate in currently active sheet.
+     * Only used for supervisor.
+     *
+     * @return string E.g. 'A1'
+     */
+    public function getActiveCell(): string
+    {
+        return $this->getActiveSheet()->getActiveCell();
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if ((is_object($value)) && ($key != 'parent')) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+
+    /**
+     * Export style as array.
+     *
+     * Available to anything which extends this class:
+     * Alignment, Border, Borders, Color, Fill, Font,
+     * NumberFormat, Protection, and Style.
+     */
+    final public function exportArray(): array
+    {
+        return $this->exportArray1();
+    }
+
+    /**
+     * Abstract method to be implemented in anything which
+     * extends this class.
+     *
+     * This method invokes exportArray2 with the names and values
+     * of all properties to be included in output array,
+     * returning that array to exportArray, then to caller.
+     */
+    abstract protected function exportArray1(): array;
+
+    /**
+     * Populate array from exportArray1.
+     * This method is available to anything which extends this class.
+     * The parameter index is the key to be added to the array.
+     * The parameter objOrValue is either a primitive type,
+     * which is the value added to the array,
+     * or a Style object to be recursively added via exportArray.
+     */
+    final protected function exportArray2(array &$exportedArray, string $index, mixed $objOrValue): void
+    {
+        if ($objOrValue instanceof self) {
+            $exportedArray[$index] = $objOrValue->exportArray();
+        } else {
+            $exportedArray[$index] = $objOrValue;
+        }
+    }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    abstract public function getSharedComponent(): mixed;
+
+    /**
+     * Build style array from subcomponents.
+     */
+    abstract public function getStyleArray(array $array): array;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php
new file mode 100644
index 00000000..adeef80b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php
@@ -0,0 +1,259 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+class Theme
+{
+    private string $themeColorName = 'Office';
+
+    private string $themeFontName = 'Office';
+
+    public const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
+    public const COLOR_SCHEME_2013_PLUS = [
+        'dk1' => '000000',
+        'lt1' => 'FFFFFF',
+        'dk2' => '44546A',
+        'lt2' => 'E7E6E6',
+        'accent1' => '4472C4',
+        'accent2' => 'ED7D31',
+        'accent3' => 'A5A5A5',
+        'accent4' => 'FFC000',
+        'accent5' => '5B9BD5',
+        'accent6' => '70AD47',
+        'hlink' => '0563C1',
+        'folHlink' => '954F72',
+    ];
+
+    public const COLOR_SCHEME_2007_2010_NAME = 'Office 2007-2010';
+    public const COLOR_SCHEME_2007_2010 = [
+        'dk1' => '000000',
+        'lt1' => 'FFFFFF',
+        'dk2' => '1F497D',
+        'lt2' => 'EEECE1',
+        'accent1' => '4F81BD',
+        'accent2' => 'C0504D',
+        'accent3' => '9BBB59',
+        'accent4' => '8064A2',
+        'accent5' => '4BACC6',
+        'accent6' => 'F79646',
+        'hlink' => '0000FF',
+        'folHlink' => '800080',
+    ];
+
+    /** @var string[] */
+    private array $themeColors = self::COLOR_SCHEME_2007_2010;
+
+    private string $majorFontLatin = 'Cambria';
+
+    private string $majorFontEastAsian = '';
+
+    private string $majorFontComplexScript = '';
+
+    private string $minorFontLatin = 'Calibri';
+
+    private string $minorFontEastAsian = '';
+
+    private string $minorFontComplexScript = '';
+
+    /**
+     * Map of Major (header) fonts to write.
+     *
+     * @var string[]
+     */
+    private array $majorFontSubstitutions = self::FONTS_TIMES_SUBSTITUTIONS;
+
+    /**
+     * Map of Minor (body) fonts to write.
+     *
+     * @var string[]
+     */
+    private array $minorFontSubstitutions = self::FONTS_ARIAL_SUBSTITUTIONS;
+
+    public const FONTS_TIMES_SUBSTITUTIONS = [
+        'Jpan' => 'ＭＳ Ｐゴシック',
+        'Hang' => '맑은 고딕',
+        'Hans' => '宋体',
+        'Hant' => '新細明體',
+        'Arab' => 'Times New Roman',
+        'Hebr' => 'Times New Roman',
+        'Thai' => 'Tahoma',
+        'Ethi' => 'Nyala',
+        'Beng' => 'Vrinda',
+        'Gujr' => 'Shruti',
+        'Khmr' => 'MoolBoran',
+        'Knda' => 'Tunga',
+        'Guru' => 'Raavi',
+        'Cans' => 'Euphemia',
+        'Cher' => 'Plantagenet Cherokee',
+        'Yiii' => 'Microsoft Yi Baiti',
+        'Tibt' => 'Microsoft Himalaya',
+        'Thaa' => 'MV Boli',
+        'Deva' => 'Mangal',
+        'Telu' => 'Gautami',
+        'Taml' => 'Latha',
+        'Syrc' => 'Estrangelo Edessa',
+        'Orya' => 'Kalinga',
+        'Mlym' => 'Kartika',
+        'Laoo' => 'DokChampa',
+        'Sinh' => 'Iskoola Pota',
+        'Mong' => 'Mongolian Baiti',
+        'Viet' => 'Times New Roman',
+        'Uigh' => 'Microsoft Uighur',
+        'Geor' => 'Sylfaen',
+    ];
+
+    public const FONTS_ARIAL_SUBSTITUTIONS = [
+        'Jpan' => 'ＭＳ Ｐゴシック',
+        'Hang' => '맑은 고딕',
+        'Hans' => '宋体',
+        'Hant' => '新細明體',
+        'Arab' => 'Arial',
+        'Hebr' => 'Arial',
+        'Thai' => 'Tahoma',
+        'Ethi' => 'Nyala',
+        'Beng' => 'Vrinda',
+        'Gujr' => 'Shruti',
+        'Khmr' => 'DaunPenh',
+        'Knda' => 'Tunga',
+        'Guru' => 'Raavi',
+        'Cans' => 'Euphemia',
+        'Cher' => 'Plantagenet Cherokee',
+        'Yiii' => 'Microsoft Yi Baiti',
+        'Tibt' => 'Microsoft Himalaya',
+        'Thaa' => 'MV Boli',
+        'Deva' => 'Mangal',
+        'Telu' => 'Gautami',
+        'Taml' => 'Latha',
+        'Syrc' => 'Estrangelo Edessa',
+        'Orya' => 'Kalinga',
+        'Mlym' => 'Kartika',
+        'Laoo' => 'DokChampa',
+        'Sinh' => 'Iskoola Pota',
+        'Mong' => 'Mongolian Baiti',
+        'Viet' => 'Arial',
+        'Uigh' => 'Microsoft Uighur',
+        'Geor' => 'Sylfaen',
+    ];
+
+    public function getThemeColors(): array
+    {
+        return $this->themeColors;
+    }
+
+    public function setThemeColor(string $key, string $value): self
+    {
+        $this->themeColors[$key] = $value;
+
+        return $this;
+    }
+
+    public function getThemeColorName(): string
+    {
+        return $this->themeColorName;
+    }
+
+    public function setThemeColorName(string $name, ?array $themeColors = null): self
+    {
+        $this->themeColorName = $name;
+        if ($name === self::COLOR_SCHEME_2007_2010_NAME) {
+            $themeColors = $themeColors ?? self::COLOR_SCHEME_2007_2010;
+        } elseif ($name === self::COLOR_SCHEME_2013_PLUS_NAME) {
+            $themeColors = $themeColors ?? self::COLOR_SCHEME_2013_PLUS;
+        }
+        if ($themeColors !== null) {
+            $this->themeColors = $themeColors;
+        }
+
+        return $this;
+    }
+
+    public function getMajorFontLatin(): string
+    {
+        return $this->majorFontLatin;
+    }
+
+    public function getMajorFontEastAsian(): string
+    {
+        return $this->majorFontEastAsian;
+    }
+
+    public function getMajorFontComplexScript(): string
+    {
+        return $this->majorFontComplexScript;
+    }
+
+    public function getMajorFontSubstitutions(): array
+    {
+        return $this->majorFontSubstitutions;
+    }
+
+    public function setMajorFontValues(?string $latin, ?string $eastAsian, ?string $complexScript, ?array $substitutions): self
+    {
+        if (!empty($latin)) {
+            $this->majorFontLatin = $latin;
+        }
+        if ($eastAsian !== null) {
+            $this->majorFontEastAsian = $eastAsian;
+        }
+        if ($complexScript !== null) {
+            $this->majorFontComplexScript = $complexScript;
+        }
+        if ($substitutions !== null) {
+            $this->majorFontSubstitutions = $substitutions;
+        }
+
+        return $this;
+    }
+
+    public function getMinorFontLatin(): string
+    {
+        return $this->minorFontLatin;
+    }
+
+    public function getMinorFontEastAsian(): string
+    {
+        return $this->minorFontEastAsian;
+    }
+
+    public function getMinorFontComplexScript(): string
+    {
+        return $this->minorFontComplexScript;
+    }
+
+    public function getMinorFontSubstitutions(): array
+    {
+        return $this->minorFontSubstitutions;
+    }
+
+    public function setMinorFontValues(?string $latin, ?string $eastAsian, ?string $complexScript, ?array $substitutions): self
+    {
+        if (!empty($latin)) {
+            $this->minorFontLatin = $latin;
+        }
+        if ($eastAsian !== null) {
+            $this->minorFontEastAsian = $eastAsian;
+        }
+        if ($complexScript !== null) {
+            $this->minorFontComplexScript = $complexScript;
+        }
+        if ($substitutions !== null) {
+            $this->minorFontSubstitutions = $substitutions;
+        }
+
+        return $this;
+    }
+
+    public function getThemeFontName(): string
+    {
+        return $this->themeFontName;
+    }
+
+    public function setThemeFontName(?string $name): self
+    {
+        if (!empty($name)) {
+            $this->themeFontName = $name;
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php
new file mode 100644
index 00000000..2c4a4695
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php
@@ -0,0 +1,1092 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use DateTime;
+use DateTimeZone;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Internal\WildcardMatch;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\CellRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
+use Stringable;
+
+class AutoFilter implements Stringable
+{
+    /**
+     * Autofilter Worksheet.
+     */
+    private ?Worksheet $workSheet;
+
+    /**
+     * Autofilter Range.
+     */
+    private string $range;
+
+    /**
+     * Autofilter Column Ruleset.
+     *
+     * @var AutoFilter\Column[]
+     */
+    private array $columns = [];
+
+    private bool $evaluated = false;
+
+    public function getEvaluated(): bool
+    {
+        return $this->evaluated;
+    }
+
+    public function setEvaluated(bool $value): void
+    {
+        $this->evaluated = $value;
+    }
+
+    /**
+     * Create a new AutoFilter.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
+     *            A simple string containing a Cell range like 'A1:E10' is permitted
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange object.
+     */
+    public function __construct(AddressRange|string|array $range = '', ?Worksheet $worksheet = null)
+    {
+        if ($range !== '') {
+            [, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
+        }
+
+        $this->range = $range ?? '';
+        $this->workSheet = $worksheet;
+    }
+
+    public function __destruct()
+    {
+        $this->workSheet = null;
+    }
+
+    /**
+     * Get AutoFilter Parent Worksheet.
+     */
+    public function getParent(): null|Worksheet
+    {
+        return $this->workSheet;
+    }
+
+    /**
+     * Set AutoFilter Parent Worksheet.
+     *
+     * @return $this
+     */
+    public function setParent(?Worksheet $worksheet = null): static
+    {
+        $this->evaluated = false;
+        $this->workSheet = $worksheet;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Range.
+     */
+    public function getRange(): string
+    {
+        return $this->range;
+    }
+
+    /**
+     * Set AutoFilter Cell Range.
+     *
+     * @param AddressRange<CellRange>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
+     *            A simple string containing a Cell range like 'A1:E10' or a Cell address like 'A1' is permitted
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange object.
+     */
+    public function setRange(AddressRange|string|array $range = ''): self
+    {
+        $this->evaluated = false;
+        // extract coordinate
+        if ($range !== '') {
+            [, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
+        }
+
+        if (empty($range)) {
+            //    Discard all column rules
+            $this->columns = [];
+            $this->range = '';
+
+            return $this;
+        }
+
+        if (ctype_digit($range) || ctype_alpha($range)) {
+            throw new Exception("{$range} is an invalid range for AutoFilter");
+        }
+
+        $this->range = $range;
+        //    Discard any column rules that are no longer valid within this range
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        foreach ($this->columns as $key => $value) {
+            $colIndex = Coordinate::columnIndexFromString($key);
+            if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
+                unset($this->columns[$key]);
+            }
+        }
+
+        return $this;
+    }
+
+    public function setRangeToMaxRow(): self
+    {
+        $this->evaluated = false;
+        if ($this->workSheet !== null) {
+            $thisrange = $this->range;
+            $range = (string) preg_replace('/\\d+$/', (string) $this->workSheet->getHighestRow(), $thisrange);
+            if ($range !== $thisrange) {
+                $this->setRange($range);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get all AutoFilter Columns.
+     *
+     * @return AutoFilter\Column[]
+     */
+    public function getColumns(): array
+    {
+        return $this->columns;
+    }
+
+    /**
+     * Validate that the specified column is in the AutoFilter range.
+     *
+     * @param string $column Column name (e.g. A)
+     *
+     * @return int The column offset within the autofilter range
+     */
+    public function testColumnInRange(string $column): int
+    {
+        if (empty($this->range)) {
+            throw new Exception('No autofilter range is defined.');
+        }
+
+        $columnIndex = Coordinate::columnIndexFromString($column);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
+            throw new Exception('Column is outside of current autofilter range.');
+        }
+
+        return $columnIndex - $rangeStart[0];
+    }
+
+    /**
+     * Get a specified AutoFilter Column Offset within the defined AutoFilter range.
+     *
+     * @param string $column Column name (e.g. A)
+     *
+     * @return int The offset of the specified column within the autofilter range
+     */
+    public function getColumnOffset(string $column): int
+    {
+        return $this->testColumnInRange($column);
+    }
+
+    /**
+     * Get a specified AutoFilter Column.
+     *
+     * @param string $column Column name (e.g. A)
+     */
+    public function getColumn(string $column): AutoFilter\Column
+    {
+        $this->testColumnInRange($column);
+
+        if (!isset($this->columns[$column])) {
+            $this->columns[$column] = new AutoFilter\Column($column, $this);
+        }
+
+        return $this->columns[$column];
+    }
+
+    /**
+     * Get a specified AutoFilter Column by it's offset.
+     *
+     * @param int $columnOffset Column offset within range (starting from 0)
+     */
+    public function getColumnByOffset(int $columnOffset): AutoFilter\Column
+    {
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        $pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $columnOffset);
+
+        return $this->getColumn($pColumn);
+    }
+
+    /**
+     * Set AutoFilter.
+     *
+     * @param AutoFilter\Column|string $columnObjectOrString
+     *            A simple string containing a Column ID like 'A' is permitted
+     *
+     * @return $this
+     */
+    public function setColumn(AutoFilter\Column|string $columnObjectOrString): static
+    {
+        $this->evaluated = false;
+        if ((is_string($columnObjectOrString)) && (!empty($columnObjectOrString))) {
+            $column = $columnObjectOrString;
+        } elseif ($columnObjectOrString instanceof AutoFilter\Column) {
+            $column = $columnObjectOrString->getColumnIndex();
+        } else {
+            throw new Exception('Column is not within the autofilter range.');
+        }
+        $this->testColumnInRange($column);
+
+        if (is_string($columnObjectOrString)) {
+            $this->columns[$columnObjectOrString] = new AutoFilter\Column($columnObjectOrString, $this);
+        } else {
+            $columnObjectOrString->setParent($this);
+            $this->columns[$column] = $columnObjectOrString;
+        }
+        ksort($this->columns);
+
+        return $this;
+    }
+
+    /**
+     * Clear a specified AutoFilter Column.
+     *
+     * @param string $column Column name (e.g. A)
+     *
+     * @return $this
+     */
+    public function clearColumn(string $column): static
+    {
+        $this->evaluated = false;
+        $this->testColumnInRange($column);
+
+        if (isset($this->columns[$column])) {
+            unset($this->columns[$column]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Shift an AutoFilter Column Rule to a different column.
+     *
+     * Note: This method bypasses validation of the destination column to ensure it is within this AutoFilter range.
+     *        Nor does it verify whether any column rule already exists at $toColumn, but will simply override any existing value.
+     *        Use with caution.
+     *
+     * @param string $fromColumn Column name (e.g. A)
+     * @param string $toColumn Column name (e.g. B)
+     *
+     * @return $this
+     */
+    public function shiftColumn(string $fromColumn, string $toColumn): static
+    {
+        $this->evaluated = false;
+        $fromColumn = strtoupper($fromColumn);
+        $toColumn = strtoupper($toColumn);
+
+        if (($fromColumn !== null) && (isset($this->columns[$fromColumn])) && ($toColumn !== null)) {
+            $this->columns[$fromColumn]->setParent();
+            $this->columns[$fromColumn]->setColumnIndex($toColumn);
+            $this->columns[$toColumn] = $this->columns[$fromColumn];
+            $this->columns[$toColumn]->setParent($this);
+            unset($this->columns[$fromColumn]);
+
+            ksort($this->columns);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Test if cell value is in the defined set of values.
+     *
+     * @param array{blanks: bool, filterValues: array<string,array<string,string>>} $dataSet
+     */
+    protected static function filterTestInSimpleDataSet(mixed $cellValue, array $dataSet): bool
+    {
+        $dataSetValues = $dataSet['filterValues'];
+        $blanks = $dataSet['blanks'];
+        if (($cellValue == '') || ($cellValue === null)) {
+            return $blanks;
+        }
+
+        return in_array($cellValue, $dataSetValues);
+    }
+
+    /**
+     * Test if cell value is in the defined set of Excel date values.
+     *
+     * @param array{blanks: bool, filterValues: array<string,array<string,string>>} $dataSet
+     */
+    protected static function filterTestInDateGroupSet(mixed $cellValue, array $dataSet): bool
+    {
+        $dateSet = $dataSet['filterValues'];
+        $blanks = $dataSet['blanks'];
+        if (($cellValue == '') || ($cellValue === null)) {
+            return $blanks;
+        }
+        $timeZone = new DateTimeZone('UTC');
+
+        if (is_numeric($cellValue)) {
+            $dateTime = Date::excelToDateTimeObject((float) $cellValue, $timeZone);
+            $cellValue = (float) $cellValue;
+            if ($cellValue < 1) {
+                //    Just the time part
+                $dtVal = $dateTime->format('His');
+                $dateSet = $dateSet['time'];
+            } elseif ($cellValue == floor($cellValue)) {
+                //    Just the date part
+                $dtVal = $dateTime->format('Ymd');
+                $dateSet = $dateSet['date'];
+            } else {
+                //    date and time parts
+                $dtVal = $dateTime->format('YmdHis');
+                $dateSet = $dateSet['dateTime'];
+            }
+            foreach ($dateSet as $dateValue) {
+                //    Use of substr to extract value at the appropriate group level
+                if (str_starts_with($dtVal, $dateValue)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Test if cell value is within a set of values defined by a ruleset.
+     *
+     * @param mixed[] $ruleSet
+     */
+    protected static function filterTestInCustomDataSet(mixed $cellValue, array $ruleSet): bool
+    {
+        /** @var array[] $dataSet */
+        $dataSet = $ruleSet['filterRules'];
+        $join = $ruleSet['join'];
+        $customRuleForBlanks = $ruleSet['customRuleForBlanks'] ?? false;
+
+        if (!$customRuleForBlanks) {
+            //    Blank cells are always ignored, so return a FALSE
+            if (($cellValue == '') || ($cellValue === null)) {
+                return false;
+            }
+        }
+        $returnVal = ($join == AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND);
+        foreach ($dataSet as $rule) {
+            /** @var string $ruleValue */
+            $ruleValue = $rule['value'];
+            /** @var string $ruleOperator */
+            $ruleOperator = $rule['operator'];
+            /** @var string $cellValueString */
+            $cellValueString = $cellValue ?? '';
+            $retVal = false;
+
+            if (is_numeric($ruleValue)) {
+                //    Numeric values are tested using the appropriate operator
+                $numericTest = is_numeric($cellValue);
+                switch ($ruleOperator) {
+                    case Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
+                        $retVal = $numericTest && ($cellValue == $ruleValue);
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
+                        $retVal = !$numericTest || ($cellValue != $ruleValue);
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN:
+                        $retVal = $numericTest && ($cellValue > $ruleValue);
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL:
+                        $retVal = $numericTest && ($cellValue >= $ruleValue);
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN:
+                        $retVal = $numericTest && ($cellValue < $ruleValue);
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL:
+                        $retVal = $numericTest && ($cellValue <= $ruleValue);
+
+                        break;
+                }
+            } elseif ($ruleValue == '') {
+                $retVal = match ($ruleOperator) {
+                    Rule::AUTOFILTER_COLUMN_RULE_EQUAL => ($cellValue == '') || ($cellValue === null),
+                    Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL => ($cellValue != '') && ($cellValue !== null),
+                    default => true,
+                };
+            } else {
+                //    String values are always tested for equality, factoring in for wildcards (hence a regexp test)
+                switch ($ruleOperator) {
+                    case Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
+                        $retVal = (bool) preg_match('/^' . $ruleValue . '$/i', $cellValueString);
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
+                        $retVal = !((bool) preg_match('/^' . $ruleValue . '$/i', $cellValueString));
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) > 0;
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) >= 0;
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) < 0;
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) <= 0;
+
+                        break;
+                }
+            }
+            //    If there are multiple conditions, then we need to test both using the appropriate join operator
+            switch ($join) {
+                case AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR:
+                    $returnVal = $returnVal || $retVal;
+                    //    Break as soon as we have a TRUE match for OR joins,
+                    //        to avoid unnecessary additional code execution
+                    if ($returnVal) {
+                        return $returnVal;
+                    }
+
+                    break;
+                case AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND:
+                    $returnVal = $returnVal && $retVal;
+
+                    break;
+            }
+        }
+
+        return $returnVal;
+    }
+
+    /**
+     * Test if cell date value is matches a set of values defined by a set of months.
+     *
+     * @param mixed[] $monthSet
+     */
+    protected static function filterTestInPeriodDateSet(mixed $cellValue, array $monthSet): bool
+    {
+        //    Blank cells are always ignored, so return a FALSE
+        if (($cellValue == '') || ($cellValue === null)) {
+            return false;
+        }
+
+        if (is_numeric($cellValue)) {
+            $dateObject = Date::excelToDateTimeObject((float) $cellValue, new DateTimeZone('UTC'));
+            $dateValue = (int) $dateObject->format('m');
+            if (in_array($dateValue, $monthSet)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static function makeDateObject(int $year, int $month, int $day, int $hour = 0, int $minute = 0, int $second = 0): DateTime
+    {
+        $baseDate = new DateTime();
+        $baseDate->setDate($year, $month, $day);
+        $baseDate->setTime($hour, $minute, $second);
+
+        return $baseDate;
+    }
+
+    private const DATE_FUNCTIONS = [
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH => 'dynamicLastMonth',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER => 'dynamicLastQuarter',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK => 'dynamicLastWeek',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR => 'dynamicLastYear',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH => 'dynamicNextMonth',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER => 'dynamicNextQuarter',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK => 'dynamicNextWeek',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR => 'dynamicNextYear',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH => 'dynamicThisMonth',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER => 'dynamicThisQuarter',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK => 'dynamicThisWeek',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR => 'dynamicThisYear',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY => 'dynamicToday',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW => 'dynamicTomorrow',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE => 'dynamicYearToDate',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY => 'dynamicYesterday',
+    ];
+
+    private static function dynamicLastMonth(): array
+    {
+        $maxval = new DateTime();
+        $year = (int) $maxval->format('Y');
+        $month = (int) $maxval->format('m');
+        $maxval->setDate($year, $month, 1);
+        $maxval->setTime(0, 0, 0);
+        $val = clone $maxval;
+        $val->modify('-1 month');
+
+        return [$val, $maxval];
+    }
+
+    private static function firstDayOfQuarter(): DateTime
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $month = (int) $val->format('m');
+        $month = 3 * intdiv($month - 1, 3) + 1;
+        $val->setDate($year, $month, 1);
+        $val->setTime(0, 0, 0);
+
+        return $val;
+    }
+
+    private static function dynamicLastQuarter(): array
+    {
+        $maxval = self::firstDayOfQuarter();
+        $val = clone $maxval;
+        $val->modify('-3 months');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicLastWeek(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $dayOfWeek = (int) $val->format('w'); // Sunday is 0
+        $subtract = $dayOfWeek + 7; // revert to prior Sunday
+        $val->modify("-$subtract days");
+        $maxval = clone $val;
+        $maxval->modify('+7 days');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicLastYear(): array
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $val = self::makeDateObject($year - 1, 1, 1);
+        $maxval = self::makeDateObject($year, 1, 1);
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicNextMonth(): array
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $month = (int) $val->format('m');
+        $val->setDate($year, $month, 1);
+        $val->setTime(0, 0, 0);
+        $val->modify('+1 month');
+        $maxval = clone $val;
+        $maxval->modify('+1 month');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicNextQuarter(): array
+    {
+        $val = self::firstDayOfQuarter();
+        $val->modify('+3 months');
+        $maxval = clone $val;
+        $maxval->modify('+3 months');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicNextWeek(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $dayOfWeek = (int) $val->format('w'); // Sunday is 0
+        $add = 7 - $dayOfWeek; // move to next Sunday
+        $val->modify("+$add days");
+        $maxval = clone $val;
+        $maxval->modify('+7 days');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicNextYear(): array
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $val = self::makeDateObject($year + 1, 1, 1);
+        $maxval = self::makeDateObject($year + 2, 1, 1);
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicThisMonth(): array
+    {
+        $baseDate = new DateTime();
+        $baseDate->setTime(0, 0, 0);
+        $year = (int) $baseDate->format('Y');
+        $month = (int) $baseDate->format('m');
+        $val = self::makeDateObject($year, $month, 1);
+        $maxval = clone $val;
+        $maxval->modify('+1 month');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicThisQuarter(): array
+    {
+        $val = self::firstDayOfQuarter();
+        $maxval = clone $val;
+        $maxval->modify('+3 months');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicThisWeek(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $dayOfWeek = (int) $val->format('w'); // Sunday is 0
+        $subtract = $dayOfWeek; // revert to Sunday
+        $val->modify("-$subtract days");
+        $maxval = clone $val;
+        $maxval->modify('+7 days');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicThisYear(): array
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $val = self::makeDateObject($year, 1, 1);
+        $maxval = self::makeDateObject($year + 1, 1, 1);
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicToday(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $maxval = clone $val;
+        $maxval->modify('+1 day');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicTomorrow(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $val->modify('+1 day');
+        $maxval = clone $val;
+        $maxval->modify('+1 day');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicYearToDate(): array
+    {
+        $maxval = new DateTime();
+        $maxval->setTime(0, 0, 0);
+        $val = self::makeDateObject((int) $maxval->format('Y'), 1, 1);
+        $maxval->modify('+1 day');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicYesterday(): array
+    {
+        $maxval = new DateTime();
+        $maxval->setTime(0, 0, 0);
+        $val = clone $maxval;
+        $val->modify('-1 day');
+
+        return [$val, $maxval];
+    }
+
+    /**
+     * Convert a dynamic rule daterange to a custom filter range expression for ease of calculation.
+     *
+     * @return mixed[]
+     */
+    private function dynamicFilterDateRange(string $dynamicRuleType, AutoFilter\Column &$filterColumn): array
+    {
+        $ruleValues = [];
+        $callBack = [__CLASS__, self::DATE_FUNCTIONS[$dynamicRuleType]]; // What if not found?
+        //    Calculate start/end dates for the required date range based on current date
+        //    Val is lowest permitted value.
+        //    Maxval is greater than highest permitted value
+        $val = $maxval = 0;
+        if (is_callable($callBack)) {
+            [$val, $maxval] = $callBack();
+        }
+        $val = Date::dateTimeToExcel($val);
+        $maxval = Date::dateTimeToExcel($maxval);
+
+        //    Set the filter column rule attributes ready for writing
+        $filterColumn->setAttributes(['val' => $val, 'maxVal' => $maxval]);
+
+        //    Set the rules for identifying rows for hide/show
+        $ruleValues[] = ['operator' => Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL, 'value' => $val];
+        $ruleValues[] = ['operator' => Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN, 'value' => $maxval];
+
+        return ['method' => 'filterTestInCustomDataSet', 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND]];
+    }
+
+    /**
+     * Apply the AutoFilter rules to the AutoFilter Range.
+     */
+    private function calculateTopTenValue(string $columnID, int $startRow, int $endRow, ?string $ruleType, mixed $ruleValue): mixed
+    {
+        $range = $columnID . $startRow . ':' . $columnID . $endRow;
+        $retVal = null;
+        if ($this->workSheet !== null) {
+            $dataValues = Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false));
+            $dataValues = array_filter($dataValues);
+
+            if ($ruleType == Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
+                rsort($dataValues);
+            } else {
+                sort($dataValues);
+            }
+
+            if (is_numeric($ruleValue)) {
+                $ruleValue = (int) $ruleValue;
+            }
+            if ($ruleValue === null || is_int($ruleValue)) {
+                $slice = array_slice($dataValues, 0, $ruleValue);
+                $retVal = array_pop($slice);
+            }
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Apply the AutoFilter rules to the AutoFilter Range.
+     *
+     * @return $this
+     */
+    public function showHideRows(): static
+    {
+        if ($this->workSheet === null) {
+            return $this;
+        }
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+
+        //    The heading row should always be visible
+        $this->workSheet->getRowDimension($rangeStart[1])->setVisible(true);
+
+        $columnFilterTests = [];
+        foreach ($this->columns as $columnID => $filterColumn) {
+            $rules = $filterColumn->getRules();
+            switch ($filterColumn->getFilterType()) {
+                case AutoFilter\Column::AUTOFILTER_FILTERTYPE_FILTER:
+                    $ruleType = null;
+                    $ruleValues = [];
+                    //    Build a list of the filter value selections
+                    foreach ($rules as $rule) {
+                        $ruleType = $rule->getRuleType();
+                        $ruleValues[] = $rule->getValue();
+                    }
+                    //    Test if we want to include blanks in our filter criteria
+                    $blanks = false;
+                    $ruleDataSet = array_filter($ruleValues);
+                    if (count($ruleValues) != count($ruleDataSet)) {
+                        $blanks = true;
+                    }
+                    if ($ruleType == Rule::AUTOFILTER_RULETYPE_FILTER) {
+                        //    Filter on absolute values
+                        $columnFilterTests[$columnID] = [
+                            'method' => 'filterTestInSimpleDataSet',
+                            'arguments' => ['filterValues' => $ruleDataSet, 'blanks' => $blanks],
+                        ];
+                    } elseif ($ruleType !== null) {
+                        //    Filter on date group values
+                        $arguments = [
+                            'date' => [],
+                            'time' => [],
+                            'dateTime' => [],
+                        ];
+                        foreach ($ruleDataSet as $ruleValue) {
+                            if (!is_array($ruleValue)) {
+                                continue;
+                            }
+                            $date = $time = '';
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== '')
+                            ) {
+                                $date .= sprintf('%04d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
+                            }
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != '')
+                            ) {
+                                $date .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
+                            }
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== '')
+                            ) {
+                                $date .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
+                            }
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== '')
+                            ) {
+                                $time .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
+                            }
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== '')
+                            ) {
+                                $time .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
+                            }
+                            if (
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')
+                            ) {
+                                $time .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
+                            }
+                            $dateTime = $date . $time;
+                            $arguments['date'][] = $date;
+                            $arguments['time'][] = $time;
+                            $arguments['dateTime'][] = $dateTime;
+                        }
+                        //    Remove empty elements
+                        $arguments['date'] = array_filter($arguments['date']);
+                        $arguments['time'] = array_filter($arguments['time']);
+                        $arguments['dateTime'] = array_filter($arguments['dateTime']);
+                        $columnFilterTests[$columnID] = [
+                            'method' => 'filterTestInDateGroupSet',
+                            'arguments' => ['filterValues' => $arguments, 'blanks' => $blanks],
+                        ];
+                    }
+
+                    break;
+                case AutoFilter\Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER:
+                    $customRuleForBlanks = true;
+                    $ruleValues = [];
+                    //    Build a list of the filter value selections
+                    foreach ($rules as $rule) {
+                        $ruleValue = $rule->getValue();
+                        if (!is_array($ruleValue) && !is_numeric($ruleValue)) {
+                            //    Convert to a regexp allowing for regexp reserved characters, wildcards and escaped wildcards
+                            $ruleValue = WildcardMatch::wildcard($ruleValue);
+                            if (trim($ruleValue) == '') {
+                                $customRuleForBlanks = true;
+                                $ruleValue = trim($ruleValue);
+                            }
+                        }
+                        $ruleValues[] = ['operator' => $rule->getOperator(), 'value' => $ruleValue];
+                    }
+                    $join = $filterColumn->getJoin();
+                    $columnFilterTests[$columnID] = [
+                        'method' => 'filterTestInCustomDataSet',
+                        'arguments' => ['filterRules' => $ruleValues, 'join' => $join, 'customRuleForBlanks' => $customRuleForBlanks],
+                    ];
+
+                    break;
+                case AutoFilter\Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER:
+                    $ruleValues = [];
+                    foreach ($rules as $rule) {
+                        //    We should only ever have one Dynamic Filter Rule anyway
+                        $dynamicRuleType = $rule->getGrouping();
+                        if (
+                            ($dynamicRuleType == Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
+                            || ($dynamicRuleType == Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)
+                        ) {
+                            //    Number (Average) based
+                            //    Calculate the average
+                            $averageFormula = '=AVERAGE(' . $columnID . ($rangeStart[1] + 1) . ':' . $columnID . $rangeEnd[1] . ')';
+                            $average = Calculation::getInstance($this->workSheet->getParent())->calculateFormula($averageFormula, null, $this->workSheet->getCell('A1'));
+                            while (is_array($average)) {
+                                $average = array_pop($average);
+                            }
+                            //    Set above/below rule based on greaterThan or LessTan
+                            $operator = ($dynamicRuleType === Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
+                                ? Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
+                                : Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
+                            $ruleValues[] = [
+                                'operator' => $operator,
+                                'value' => $average,
+                            ];
+                            $columnFilterTests[$columnID] = [
+                                'method' => 'filterTestInCustomDataSet',
+                                'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR],
+                            ];
+                        } else {
+                            //    Date based
+                            if ($dynamicRuleType[0] == 'M' || $dynamicRuleType[0] == 'Q') {
+                                $periodType = '';
+                                $period = 0;
+                                //    Month or Quarter
+                                sscanf($dynamicRuleType, '%[A-Z]%d', $periodType, $period);
+                                if ($periodType == 'M') {
+                                    $ruleValues = [$period];
+                                } else {
+                                    --$period;
+                                    $periodEnd = (1 + $period) * 3;
+                                    $periodStart = 1 + $period * 3;
+                                    $ruleValues = range($periodStart, $periodEnd);
+                                }
+                                $columnFilterTests[$columnID] = [
+                                    'method' => 'filterTestInPeriodDateSet',
+                                    'arguments' => $ruleValues,
+                                ];
+                                $filterColumn->setAttributes([]);
+                            } else {
+                                //    Date Range
+                                $columnFilterTests[$columnID] = $this->dynamicFilterDateRange($dynamicRuleType, $filterColumn);
+
+                                break;
+                            }
+                        }
+                    }
+
+                    break;
+                case AutoFilter\Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER:
+                    $ruleValues = [];
+                    $dataRowCount = $rangeEnd[1] - $rangeStart[1];
+                    $toptenRuleType = null;
+                    $ruleValue = 0;
+                    $ruleOperator = null;
+                    foreach ($rules as $rule) {
+                        //    We should only ever have one Dynamic Filter Rule anyway
+                        $toptenRuleType = $rule->getGrouping();
+                        $ruleValue = $rule->getValue();
+                        $ruleOperator = $rule->getOperator();
+                    }
+                    if (is_numeric($ruleValue) && $ruleOperator === Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
+                        $ruleValue = (int) floor((float) $ruleValue * ($dataRowCount / 100));
+                    }
+                    if (!is_array($ruleValue) && $ruleValue < 1) {
+                        $ruleValue = 1;
+                    }
+                    if (!is_array($ruleValue) && $ruleValue > 500) {
+                        $ruleValue = 500;
+                    }
+
+                    /** @var float|int|string */
+                    $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1] + 1, (int) $rangeEnd[1], $toptenRuleType, $ruleValue);
+
+                    $operator = ($toptenRuleType == Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
+                        ? Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
+                        : Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
+                    $ruleValues[] = ['operator' => $operator, 'value' => $maxVal];
+                    $columnFilterTests[$columnID] = [
+                        'method' => 'filterTestInCustomDataSet',
+                        'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR],
+                    ];
+                    $filterColumn->setAttributes(['maxVal' => $maxVal]);
+
+                    break;
+            }
+        }
+
+        $rangeEnd[1] = $this->autoExtendRange($rangeStart[1], $rangeEnd[1]);
+
+        //    Execute the column tests for each row in the autoFilter range to determine show/hide,
+        for ($row = $rangeStart[1] + 1; $row <= $rangeEnd[1]; ++$row) {
+            $result = true;
+            foreach ($columnFilterTests as $columnID => $columnFilterTest) {
+                $cellValue = $this->workSheet->getCell($columnID . $row)->getCalculatedValue();
+                //    Execute the filter test
+                /** @var callable */
+                $temp = [self::class, $columnFilterTest['method']];
+                /** @var bool */
+                $result // $result && // phpstan says $result is always true here
+                    = call_user_func_array($temp, [$cellValue, $columnFilterTest['arguments']]);
+                //    If filter test has resulted in FALSE, exit the loop straightaway rather than running any more tests
+                if (!$result) {
+                    break;
+                }
+            }
+            //    Set show/hide for the row based on the result of the autoFilter result
+            //    If the RowDimension object has not been allocated yet and the row should be visible,
+            //    then we can avoid any operation since the rows are visible by default (saves a lot of memory)
+            if ($result === false || $this->workSheet->rowDimensionExists((int) $row)) {
+                $this->workSheet->getRowDimension((int) $row)->setVisible($result);
+            }
+        }
+        $this->evaluated = true;
+
+        return $this;
+    }
+
+    /**
+     * Magic Range Auto-sizing.
+     * For a single row rangeSet, we follow MS Excel rules, and search for the first empty row to determine our range.
+     */
+    public function autoExtendRange(int $startRow, int $endRow): int
+    {
+        if ($startRow === $endRow && $this->workSheet !== null) {
+            try {
+                $rowIterator = $this->workSheet->getRowIterator($startRow + 1);
+            } catch (Exception) {
+                // If there are no rows below $startRow
+                return $startRow;
+            }
+            foreach ($rowIterator as $row) {
+                if ($row->isEmpty(CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL) === true) {
+                    return $row->getRowIndex() - 1;
+                }
+            }
+        }
+
+        return $endRow;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                if ($key === 'workSheet') {
+                    //    Detach from worksheet
+                    $this->{$key} = null;
+                } else {
+                    $this->{$key} = clone $value;
+                }
+            } elseif ((is_array($value)) && ($key == 'columns')) {
+                //    The columns array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\AutoFilter objects
+                $this->{$key} = [];
+                foreach ($value as $k => $v) {
+                    $this->{$key}[$k] = clone $v;
+                    // attach the new cloned Column to this new cloned Autofilter object
+                    $this->{$key}[$k]->setParent($this);
+                }
+            } else {
+                $this->{$key} = $value;
+            }
+        }
+    }
+
+    /**
+     * toString method replicates previous behavior by returning the range if object is
+     * referenced as a property of its parent.
+     */
+    public function __toString(): string
+    {
+        return (string) $this->range;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php
new file mode 100644
index 00000000..514cf101
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php
@@ -0,0 +1,381 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
+
+class Column
+{
+    const AUTOFILTER_FILTERTYPE_FILTER = 'filters';
+    const AUTOFILTER_FILTERTYPE_CUSTOMFILTER = 'customFilters';
+    //    Supports no more than 2 rules, with an And/Or join criteria
+    //        if more than 1 rule is defined
+    const AUTOFILTER_FILTERTYPE_DYNAMICFILTER = 'dynamicFilter';
+    //    Even though the filter rule is constant, the filtered data can vary
+    //        e.g. filtered by date = TODAY
+    const AUTOFILTER_FILTERTYPE_TOPTENFILTER = 'top10';
+
+    /**
+     * Types of autofilter rules.
+     *
+     * @var string[]
+     */
+    private static array $filterTypes = [
+        //    Currently we're not handling
+        //        colorFilter
+        //        extLst
+        //        iconFilter
+        self::AUTOFILTER_FILTERTYPE_FILTER,
+        self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER,
+        self::AUTOFILTER_FILTERTYPE_DYNAMICFILTER,
+        self::AUTOFILTER_FILTERTYPE_TOPTENFILTER,
+    ];
+
+    // Multiple Rule Connections
+    const AUTOFILTER_COLUMN_JOIN_AND = 'and';
+    const AUTOFILTER_COLUMN_JOIN_OR = 'or';
+
+    /**
+     * Join options for autofilter rules.
+     *
+     * @var string[]
+     */
+    private static array $ruleJoins = [
+        self::AUTOFILTER_COLUMN_JOIN_AND,
+        self::AUTOFILTER_COLUMN_JOIN_OR,
+    ];
+
+    /**
+     * Autofilter.
+     */
+    private ?AutoFilter $parent;
+
+    /**
+     * Autofilter Column Index.
+     */
+    private string $columnIndex;
+
+    /**
+     * Autofilter Column Filter Type.
+     */
+    private string $filterType = self::AUTOFILTER_FILTERTYPE_FILTER;
+
+    /**
+     * Autofilter Multiple Rules And/Or.
+     */
+    private string $join = self::AUTOFILTER_COLUMN_JOIN_OR;
+
+    /**
+     * Autofilter Column Rules.
+     *
+     * @var Column\Rule[]
+     */
+    private array $ruleset = [];
+
+    /**
+     * Autofilter Column Dynamic Attributes.
+     *
+     * @var (float|int|string)[]
+     */
+    private array $attributes = [];
+
+    /**
+     * Create a new Column.
+     *
+     * @param string $column Column (e.g. A)
+     * @param ?AutoFilter $parent Autofilter for this column
+     */
+    public function __construct(string $column, ?AutoFilter $parent = null)
+    {
+        $this->columnIndex = $column;
+        $this->parent = $parent;
+    }
+
+    public function setEvaluatedFalse(): void
+    {
+        if ($this->parent !== null) {
+            $this->parent->setEvaluated(false);
+        }
+    }
+
+    /**
+     * Get AutoFilter column index as string eg: 'A'.
+     */
+    public function getColumnIndex(): string
+    {
+        return $this->columnIndex;
+    }
+
+    /**
+     * Set AutoFilter column index as string eg: 'A'.
+     *
+     * @param string $column Column (e.g. A)
+     *
+     * @return $this
+     */
+    public function setColumnIndex(string $column): static
+    {
+        $this->setEvaluatedFalse();
+        // Uppercase coordinate
+        $column = strtoupper($column);
+        if ($this->parent !== null) {
+            $this->parent->testColumnInRange($column);
+        }
+
+        $this->columnIndex = $column;
+
+        return $this;
+    }
+
+    /**
+     * Get this Column's AutoFilter Parent.
+     */
+    public function getParent(): ?AutoFilter
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Set this Column's AutoFilter Parent.
+     *
+     * @return $this
+     */
+    public function setParent(?AutoFilter $parent = null): static
+    {
+        $this->setEvaluatedFalse();
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Type.
+     */
+    public function getFilterType(): string
+    {
+        return $this->filterType;
+    }
+
+    /**
+     * Set AutoFilter Type.
+     *
+     * @return $this
+     */
+    public function setFilterType(string $filterType): static
+    {
+        $this->setEvaluatedFalse();
+        if (!in_array($filterType, self::$filterTypes)) {
+            throw new PhpSpreadsheetException('Invalid filter type for column AutoFilter.');
+        }
+        if ($filterType === self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER && count($this->ruleset) > 2) {
+            throw new PhpSpreadsheetException('No more than 2 rules are allowed in a Custom Filter');
+        }
+
+        $this->filterType = $filterType;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Multiple Rules And/Or Join.
+     */
+    public function getJoin(): string
+    {
+        return $this->join;
+    }
+
+    /**
+     * Set AutoFilter Multiple Rules And/Or.
+     *
+     * @param string $join And/Or
+     *
+     * @return $this
+     */
+    public function setJoin(string $join): static
+    {
+        $this->setEvaluatedFalse();
+        // Lowercase And/Or
+        $join = strtolower($join);
+        if (!in_array($join, self::$ruleJoins)) {
+            throw new PhpSpreadsheetException('Invalid rule connection for column AutoFilter.');
+        }
+
+        $this->join = $join;
+
+        return $this;
+    }
+
+    /**
+     * Set AutoFilter Attributes.
+     *
+     * @param (float|int|string)[] $attributes
+     *
+     * @return $this
+     */
+    public function setAttributes(array $attributes): static
+    {
+        $this->setEvaluatedFalse();
+        $this->attributes = $attributes;
+
+        return $this;
+    }
+
+    /**
+     * Set An AutoFilter Attribute.
+     *
+     * @param string $name Attribute Name
+     * @param float|int|string $value Attribute Value
+     *
+     * @return $this
+     */
+    public function setAttribute(string $name, $value): static
+    {
+        $this->setEvaluatedFalse();
+        $this->attributes[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Column Attributes.
+     *
+     * @return (float|int|string)[]
+     */
+    public function getAttributes(): array
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * Get specific AutoFilter Column Attribute.
+     *
+     * @param string $name Attribute Name
+     */
+    public function getAttribute(string $name): null|float|int|string
+    {
+        if (isset($this->attributes[$name])) {
+            return $this->attributes[$name];
+        }
+
+        return null;
+    }
+
+    public function ruleCount(): int
+    {
+        return count($this->ruleset);
+    }
+
+    /**
+     * Get all AutoFilter Column Rules.
+     *
+     * @return Column\Rule[]
+     */
+    public function getRules(): array
+    {
+        return $this->ruleset;
+    }
+
+    /**
+     * Get a specified AutoFilter Column Rule.
+     *
+     * @param int $index Rule index in the ruleset array
+     */
+    public function getRule(int $index): Column\Rule
+    {
+        if (!isset($this->ruleset[$index])) {
+            $this->ruleset[$index] = new Column\Rule($this);
+        }
+
+        return $this->ruleset[$index];
+    }
+
+    /**
+     * Create a new AutoFilter Column Rule in the ruleset.
+     */
+    public function createRule(): Column\Rule
+    {
+        $this->setEvaluatedFalse();
+        if ($this->filterType === self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER && count($this->ruleset) >= 2) {
+            throw new PhpSpreadsheetException('No more than 2 rules are allowed in a Custom Filter');
+        }
+        $this->ruleset[] = new Column\Rule($this);
+
+        return end($this->ruleset);
+    }
+
+    /**
+     * Add a new AutoFilter Column Rule to the ruleset.
+     *
+     * @return $this
+     */
+    public function addRule(Column\Rule $rule): static
+    {
+        $this->setEvaluatedFalse();
+        $rule->setParent($this);
+        $this->ruleset[] = $rule;
+
+        return $this;
+    }
+
+    /**
+     * Delete a specified AutoFilter Column Rule
+     * If the number of rules is reduced to 1, then we reset And/Or logic to Or.
+     *
+     * @param int $index Rule index in the ruleset array
+     *
+     * @return $this
+     */
+    public function deleteRule(int $index): static
+    {
+        $this->setEvaluatedFalse();
+        if (isset($this->ruleset[$index])) {
+            unset($this->ruleset[$index]);
+            //    If we've just deleted down to a single rule, then reset And/Or joining to Or
+            if (count($this->ruleset) <= 1) {
+                $this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Delete all AutoFilter Column Rules.
+     *
+     * @return $this
+     */
+    public function clearRules(): static
+    {
+        $this->setEvaluatedFalse();
+        $this->ruleset = [];
+        $this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        /** @var AutoFilter\Column\Rule[] $value */
+        foreach ($vars as $key => $value) {
+            if ($key === 'parent') {
+                // Detach from autofilter parent
+                $this->parent = null;
+            } elseif ($key === 'ruleset') {
+                // The columns array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\AutoFilter objects
+                $this->ruleset = [];
+                foreach ($value as $k => $v) {
+                    $cloned = clone $v;
+                    $cloned->setParent($this); // attach the new cloned Rule to this new cloned Autofilter Cloned object
+                    $this->ruleset[$k] = $cloned;
+                }
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
new file mode 100644
index 00000000..93768a1c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
@@ -0,0 +1,406 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column;
+
+class Rule
+{
+    const AUTOFILTER_RULETYPE_FILTER = 'filter';
+    const AUTOFILTER_RULETYPE_DATEGROUP = 'dateGroupItem';
+    const AUTOFILTER_RULETYPE_CUSTOMFILTER = 'customFilter';
+    const AUTOFILTER_RULETYPE_DYNAMICFILTER = 'dynamicFilter';
+    const AUTOFILTER_RULETYPE_TOPTENFILTER = 'top10Filter';
+
+    private const RULE_TYPES = [
+        //    Currently we're not handling
+        //        colorFilter
+        //        extLst
+        //        iconFilter
+        self::AUTOFILTER_RULETYPE_FILTER,
+        self::AUTOFILTER_RULETYPE_DATEGROUP,
+        self::AUTOFILTER_RULETYPE_CUSTOMFILTER,
+        self::AUTOFILTER_RULETYPE_DYNAMICFILTER,
+        self::AUTOFILTER_RULETYPE_TOPTENFILTER,
+    ];
+
+    const AUTOFILTER_RULETYPE_DATEGROUP_YEAR = 'year';
+    const AUTOFILTER_RULETYPE_DATEGROUP_MONTH = 'month';
+    const AUTOFILTER_RULETYPE_DATEGROUP_DAY = 'day';
+    const AUTOFILTER_RULETYPE_DATEGROUP_HOUR = 'hour';
+    const AUTOFILTER_RULETYPE_DATEGROUP_MINUTE = 'minute';
+    const AUTOFILTER_RULETYPE_DATEGROUP_SECOND = 'second';
+
+    private const DATE_TIME_GROUPS = [
+        self::AUTOFILTER_RULETYPE_DATEGROUP_YEAR,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_MONTH,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_DAY,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_HOUR,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE,
+        self::AUTOFILTER_RULETYPE_DATEGROUP_SECOND,
+    ];
+
+    const AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY = 'yesterday';
+    const AUTOFILTER_RULETYPE_DYNAMIC_TODAY = 'today';
+    const AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW = 'tomorrow';
+    const AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE = 'yearToDate';
+    const AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR = 'thisYear';
+    const AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER = 'thisQuarter';
+    const AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH = 'thisMonth';
+    const AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK = 'thisWeek';
+    const AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR = 'lastYear';
+    const AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER = 'lastQuarter';
+    const AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH = 'lastMonth';
+    const AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK = 'lastWeek';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR = 'nextYear';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER = 'nextQuarter';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH = 'nextMonth';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK = 'nextWeek';
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1 = 'M1';
+    const AUTOFILTER_RULETYPE_DYNAMIC_JANUARY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2 = 'M2';
+    const AUTOFILTER_RULETYPE_DYNAMIC_FEBRUARY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3 = 'M3';
+    const AUTOFILTER_RULETYPE_DYNAMIC_MARCH = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4 = 'M4';
+    const AUTOFILTER_RULETYPE_DYNAMIC_APRIL = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5 = 'M5';
+    const AUTOFILTER_RULETYPE_DYNAMIC_MAY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6 = 'M6';
+    const AUTOFILTER_RULETYPE_DYNAMIC_JUNE = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7 = 'M7';
+    const AUTOFILTER_RULETYPE_DYNAMIC_JULY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8 = 'M8';
+    const AUTOFILTER_RULETYPE_DYNAMIC_AUGUST = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9 = 'M9';
+    const AUTOFILTER_RULETYPE_DYNAMIC_SEPTEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10 = 'M10';
+    const AUTOFILTER_RULETYPE_DYNAMIC_OCTOBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11 = 'M11';
+    const AUTOFILTER_RULETYPE_DYNAMIC_NOVEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11;
+    const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12 = 'M12';
+    const AUTOFILTER_RULETYPE_DYNAMIC_DECEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12;
+    const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1 = 'Q1';
+    const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2 = 'Q2';
+    const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3 = 'Q3';
+    const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4 = 'Q4';
+    const AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE = 'aboveAverage';
+    const AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE = 'belowAverage';
+
+    private const DYNAMIC_TYPES = [
+        self::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_TODAY,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE,
+        self::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE,
+    ];
+
+    // Filter rule operators for filter and customFilter types.
+    const AUTOFILTER_COLUMN_RULE_EQUAL = 'equal';
+    const AUTOFILTER_COLUMN_RULE_NOTEQUAL = 'notEqual';
+    const AUTOFILTER_COLUMN_RULE_GREATERTHAN = 'greaterThan';
+    const AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL = 'greaterThanOrEqual';
+    const AUTOFILTER_COLUMN_RULE_LESSTHAN = 'lessThan';
+    const AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL = 'lessThanOrEqual';
+
+    private const OPERATORS = [
+        self::AUTOFILTER_COLUMN_RULE_EQUAL,
+        self::AUTOFILTER_COLUMN_RULE_NOTEQUAL,
+        self::AUTOFILTER_COLUMN_RULE_GREATERTHAN,
+        self::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
+        self::AUTOFILTER_COLUMN_RULE_LESSTHAN,
+        self::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL,
+    ];
+
+    const AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE = 'byValue';
+    const AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT = 'byPercent';
+
+    private const TOP_TEN_VALUE = [
+        self::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE,
+        self::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT,
+    ];
+
+    const AUTOFILTER_COLUMN_RULE_TOPTEN_TOP = 'top';
+    const AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM = 'bottom';
+
+    private const TOP_TEN_TYPE = [
+        self::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP,
+        self::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM,
+    ];
+
+    //  Unimplented Rule Operators (Numeric, Boolean etc)
+    //    const AUTOFILTER_COLUMN_RULE_BETWEEN = 'between';        //    greaterThanOrEqual 1 && lessThanOrEqual 2
+    // Rule Operators (Numeric Special) which are translated to standard numeric operators with calculated values
+    // Rule Operators (String) which are set as wild-carded values
+    //    const AUTOFILTER_COLUMN_RULE_BEGINSWITH            = 'beginsWith';            // A*
+    //    const AUTOFILTER_COLUMN_RULE_ENDSWITH            = 'endsWith';            // *Z
+    //    const AUTOFILTER_COLUMN_RULE_CONTAINS            = 'contains';            // *B*
+    //    const AUTOFILTER_COLUMN_RULE_DOESNTCONTAIN        = 'notEqual';            //    notEqual *B*
+    // Rule Operators (Date Special) which are translated to standard numeric operators with calculated values
+    //    const AUTOFILTER_COLUMN_RULE_BEFORE                = 'lessThan';
+    //    const AUTOFILTER_COLUMN_RULE_AFTER                = 'greaterThan';
+    /**
+     * Autofilter Column.
+     */
+    private ?Column $parent;
+
+    /**
+     * Autofilter Rule Type.
+     */
+    private string $ruleType = self::AUTOFILTER_RULETYPE_FILTER;
+
+    /**
+     * Autofilter Rule Value.
+     *
+     * @var int|int[]|string|string[]
+     */
+    private $value = '';
+
+    /**
+     * Autofilter Rule Operator.
+     */
+    private string $operator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
+
+    /**
+     * DateTimeGrouping Group Value.
+     */
+    private string $grouping = '';
+
+    /**
+     * Create a new Rule.
+     */
+    public function __construct(?Column $parent = null)
+    {
+        $this->parent = $parent;
+    }
+
+    private function setEvaluatedFalse(): void
+    {
+        if ($this->parent !== null) {
+            $this->parent->setEvaluatedFalse();
+        }
+    }
+
+    /**
+     * Get AutoFilter Rule Type.
+     */
+    public function getRuleType(): string
+    {
+        return $this->ruleType;
+    }
+
+    /**
+     * Set AutoFilter Rule Type.
+     *
+     * @param string $ruleType see self::AUTOFILTER_RULETYPE_*
+     *
+     * @return $this
+     */
+    public function setRuleType(string $ruleType): static
+    {
+        $this->setEvaluatedFalse();
+        if (!in_array($ruleType, self::RULE_TYPES)) {
+            throw new PhpSpreadsheetException('Invalid rule type for column AutoFilter Rule.');
+        }
+
+        $this->ruleType = $ruleType;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Rule Value.
+     *
+     * @return int|int[]|string|string[]
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set AutoFilter Rule Value.
+     *
+     * @param int|int[]|string|string[] $value
+     *
+     * @return $this
+     */
+    public function setValue($value): static
+    {
+        $this->setEvaluatedFalse();
+        if (is_array($value)) {
+            $grouping = -1;
+            foreach ($value as $key => $v) {
+                //    Validate array entries
+                if (!in_array($key, self::DATE_TIME_GROUPS)) {
+                    //    Remove any invalid entries from the value array
+                    unset($value[$key]);
+                } else {
+                    //    Work out what the dateTime grouping will be
+                    $grouping = max($grouping, array_search($key, self::DATE_TIME_GROUPS));
+                }
+            }
+            if (count($value) == 0) {
+                throw new PhpSpreadsheetException('Invalid rule value for column AutoFilter Rule.');
+            }
+            //    Set the dateTime grouping that we've anticipated
+            $this->setGrouping(self::DATE_TIME_GROUPS[$grouping]);
+        }
+        $this->value = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Rule Operator.
+     */
+    public function getOperator(): string
+    {
+        return $this->operator;
+    }
+
+    /**
+     * Set AutoFilter Rule Operator.
+     *
+     * @param string $operator see self::AUTOFILTER_COLUMN_RULE_*
+     *
+     * @return $this
+     */
+    public function setOperator(string $operator): static
+    {
+        $this->setEvaluatedFalse();
+        if (empty($operator)) {
+            $operator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
+        }
+        if (
+            (!in_array($operator, self::OPERATORS))
+            && (!in_array($operator, self::TOP_TEN_VALUE))
+        ) {
+            throw new PhpSpreadsheetException('Invalid operator for column AutoFilter Rule.');
+        }
+        $this->operator = $operator;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter Rule Grouping.
+     */
+    public function getGrouping(): string
+    {
+        return $this->grouping;
+    }
+
+    /**
+     * Set AutoFilter Rule Grouping.
+     *
+     * @return $this
+     */
+    public function setGrouping(string $grouping): static
+    {
+        $this->setEvaluatedFalse();
+        if (
+            ($grouping !== null)
+            && (!in_array($grouping, self::DATE_TIME_GROUPS))
+            && (!in_array($grouping, self::DYNAMIC_TYPES))
+            && (!in_array($grouping, self::TOP_TEN_TYPE))
+        ) {
+            throw new PhpSpreadsheetException('Invalid grouping for column AutoFilter Rule.');
+        }
+        $this->grouping = $grouping;
+
+        return $this;
+    }
+
+    /**
+     * Set AutoFilter Rule.
+     *
+     * @param string $operator see self::AUTOFILTER_COLUMN_RULE_*
+     * @param int|int[]|string|string[] $value
+     *
+     * @return $this
+     */
+    public function setRule(string $operator, $value, ?string $grouping = null): static
+    {
+        $this->setEvaluatedFalse();
+        $this->setOperator($operator);
+        $this->setValue($value);
+        //  Only set grouping if it's been passed in as a user-supplied argument,
+        //      otherwise we're calculating it when we setValue() and don't want to overwrite that
+        //      If the user supplies an argumnet for grouping, then on their own head be it
+        if ($grouping !== null) {
+            $this->setGrouping($grouping);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get this Rule's AutoFilter Column Parent.
+     */
+    public function getParent(): ?Column
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Set this Rule's AutoFilter Column Parent.
+     *
+     * @return $this
+     */
+    public function setParent(?Column $parent = null): static
+    {
+        $this->setEvaluatedFalse();
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                if ($key == 'parent') { // this is only object
+                    //    Detach from autofilter column parent
+                    $this->$key = null;
+                }
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFit.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFit.php
new file mode 100644
index 00000000..46a0e9c7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFit.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\CellRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class AutoFit
+{
+    protected Worksheet $worksheet;
+
+    public function __construct(Worksheet $worksheet)
+    {
+        $this->worksheet = $worksheet;
+    }
+
+    public function getAutoFilterIndentRanges(): array
+    {
+        $autoFilterIndentRanges = [];
+        $autoFilterIndentRanges[] = $this->getAutoFilterIndentRange($this->worksheet->getAutoFilter());
+
+        foreach ($this->worksheet->getTableCollection() as $table) {
+            /** @var Table $table */
+            if ($table->getShowHeaderRow() === true && $table->getAllowFilter() === true) {
+                $autoFilter = $table->getAutoFilter();
+                if ($autoFilter !== null) {
+                    $autoFilterIndentRanges[] = $this->getAutoFilterIndentRange($autoFilter);
+                }
+            }
+        }
+
+        return array_filter($autoFilterIndentRanges);
+    }
+
+    private function getAutoFilterIndentRange(AutoFilter $autoFilter): ?string
+    {
+        $autoFilterRange = $autoFilter->getRange();
+        $autoFilterIndentRange = null;
+
+        if (!empty($autoFilterRange)) {
+            $autoFilterRangeBoundaries = Coordinate::rangeBoundaries($autoFilterRange);
+            $autoFilterIndentRange = (string) new CellRange(
+                CellAddress::fromColumnAndRow($autoFilterRangeBoundaries[0][0], $autoFilterRangeBoundaries[0][1]),
+                CellAddress::fromColumnAndRow($autoFilterRangeBoundaries[1][0], $autoFilterRangeBoundaries[0][1])
+            );
+        }
+
+        return $autoFilterIndentRange;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
new file mode 100644
index 00000000..4c354382
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
@@ -0,0 +1,549 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\IComparable;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing\Shadow;
+use SimpleXMLElement;
+
+class BaseDrawing implements IComparable
+{
+    const EDIT_AS_ABSOLUTE = 'absolute';
+    const EDIT_AS_ONECELL = 'oneCell';
+    const EDIT_AS_TWOCELL = 'twoCell';
+    private const VALID_EDIT_AS = [
+        self::EDIT_AS_ABSOLUTE,
+        self::EDIT_AS_ONECELL,
+        self::EDIT_AS_TWOCELL,
+    ];
+
+    /**
+     * The editAs attribute, used only with two cell anchor.
+     */
+    protected string $editAs = '';
+
+    /**
+     * Image counter.
+     */
+    private static int $imageCounter = 0;
+
+    /**
+     * Image index.
+     */
+    private int $imageIndex;
+
+    /**
+     * Name.
+     */
+    protected string $name = '';
+
+    /**
+     * Description.
+     */
+    protected string $description = '';
+
+    /**
+     * Worksheet.
+     */
+    protected ?Worksheet $worksheet = null;
+
+    /**
+     * Coordinates.
+     */
+    protected string $coordinates = 'A1';
+
+    /**
+     * Offset X.
+     */
+    protected int $offsetX = 0;
+
+    /**
+     * Offset Y.
+     */
+    protected int $offsetY = 0;
+
+    /**
+     * Coordinates2.
+     */
+    protected string $coordinates2 = '';
+
+    /**
+     * Offset X2.
+     */
+    protected int $offsetX2 = 0;
+
+    /**
+     * Offset Y2.
+     */
+    protected int $offsetY2 = 0;
+
+    /**
+     * Width.
+     */
+    protected int $width = 0;
+
+    /**
+     * Height.
+     */
+    protected int $height = 0;
+
+    /**
+     * Pixel width of image. See $width for the size the Drawing will be in the sheet.
+     */
+    protected int $imageWidth = 0;
+
+    /**
+     * Pixel width of image. See $height for the size the Drawing will be in the sheet.
+     */
+    protected int $imageHeight = 0;
+
+    /**
+     * Proportional resize.
+     */
+    protected bool $resizeProportional = true;
+
+    /**
+     * Rotation.
+     */
+    protected int $rotation = 0;
+
+    protected bool $flipVertical = false;
+
+    protected bool $flipHorizontal = false;
+
+    /**
+     * Shadow.
+     */
+    protected Shadow $shadow;
+
+    /**
+     * Image hyperlink.
+     */
+    private ?Hyperlink $hyperlink = null;
+
+    /**
+     * Image type.
+     */
+    protected int $type = IMAGETYPE_UNKNOWN;
+
+    /** @var null|SimpleXMLElement|string[] */
+    protected $srcRect = [];
+
+    /**
+     * Create a new BaseDrawing.
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->setShadow();
+
+        // Set image index
+        ++self::$imageCounter;
+        $this->imageIndex = self::$imageCounter;
+    }
+
+    public function __destruct()
+    {
+        $this->worksheet = null;
+    }
+
+    public function getImageIndex(): int
+    {
+        return $this->imageIndex;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    public function setDescription(string $description): self
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    public function getWorksheet(): ?Worksheet
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * Set Worksheet.
+     *
+     * @param bool $overrideOld If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
+     */
+    public function setWorksheet(?Worksheet $worksheet = null, bool $overrideOld = false): self
+    {
+        if ($this->worksheet === null) {
+            // Add drawing to \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
+            if ($worksheet !== null) {
+                $this->worksheet = $worksheet;
+                $this->worksheet->getCell($this->coordinates);
+                $this->worksheet->getDrawingCollection()->append($this);
+            }
+        } else {
+            if ($overrideOld) {
+                // Remove drawing from old \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
+                $iterator = $this->worksheet->getDrawingCollection()->getIterator();
+
+                while ($iterator->valid()) {
+                    if ($iterator->current()->getHashCode() === $this->getHashCode()) {
+                        $this->worksheet->getDrawingCollection()->offsetUnset($iterator->key());
+                        $this->worksheet = null;
+
+                        break;
+                    }
+                }
+
+                // Set new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
+                $this->setWorksheet($worksheet);
+            } else {
+                throw new PhpSpreadsheetException('A Worksheet has already been assigned. Drawings can only exist on one \\PhpOffice\\PhpSpreadsheet\\Worksheet.');
+            }
+        }
+
+        return $this;
+    }
+
+    public function getCoordinates(): string
+    {
+        return $this->coordinates;
+    }
+
+    public function setCoordinates(string $coordinates): self
+    {
+        $this->coordinates = $coordinates;
+
+        return $this;
+    }
+
+    public function getOffsetX(): int
+    {
+        return $this->offsetX;
+    }
+
+    public function setOffsetX(int $offsetX): self
+    {
+        $this->offsetX = $offsetX;
+
+        return $this;
+    }
+
+    public function getOffsetY(): int
+    {
+        return $this->offsetY;
+    }
+
+    public function setOffsetY(int $offsetY): self
+    {
+        $this->offsetY = $offsetY;
+
+        return $this;
+    }
+
+    public function getCoordinates2(): string
+    {
+        return $this->coordinates2;
+    }
+
+    public function setCoordinates2(string $coordinates2): self
+    {
+        $this->coordinates2 = $coordinates2;
+
+        return $this;
+    }
+
+    public function getOffsetX2(): int
+    {
+        return $this->offsetX2;
+    }
+
+    public function setOffsetX2(int $offsetX2): self
+    {
+        $this->offsetX2 = $offsetX2;
+
+        return $this;
+    }
+
+    public function getOffsetY2(): int
+    {
+        return $this->offsetY2;
+    }
+
+    public function setOffsetY2(int $offsetY2): self
+    {
+        $this->offsetY2 = $offsetY2;
+
+        return $this;
+    }
+
+    public function getWidth(): int
+    {
+        return $this->width;
+    }
+
+    public function setWidth(int $width): self
+    {
+        // Resize proportional?
+        if ($this->resizeProportional && $width != 0) {
+            $ratio = $this->height / ($this->width != 0 ? $this->width : 1);
+            $this->height = (int) round($ratio * $width);
+        }
+
+        // Set width
+        $this->width = $width;
+
+        return $this;
+    }
+
+    public function getHeight(): int
+    {
+        return $this->height;
+    }
+
+    public function setHeight(int $height): self
+    {
+        // Resize proportional?
+        if ($this->resizeProportional && $height != 0) {
+            $ratio = $this->width / ($this->height != 0 ? $this->height : 1);
+            $this->width = (int) round($ratio * $height);
+        }
+
+        // Set height
+        $this->height = $height;
+
+        return $this;
+    }
+
+    /**
+     * Set width and height with proportional resize.
+     *
+     * Example:
+     * <code>
+     * $objDrawing->setResizeProportional(true);
+     * $objDrawing->setWidthAndHeight(160,120);
+     * </code>
+     *
+     * @author Vincent@luo MSN:kele_100@hotmail.com
+     */
+    public function setWidthAndHeight(int $width, int $height): self
+    {
+        $xratio = $width / ($this->width != 0 ? $this->width : 1);
+        $yratio = $height / ($this->height != 0 ? $this->height : 1);
+        if ($this->resizeProportional && !($width == 0 || $height == 0)) {
+            if (($xratio * $this->height) < $height) {
+                $this->height = (int) ceil($xratio * $this->height);
+                $this->width = $width;
+            } else {
+                $this->width = (int) ceil($yratio * $this->width);
+                $this->height = $height;
+            }
+        } else {
+            $this->width = $width;
+            $this->height = $height;
+        }
+
+        return $this;
+    }
+
+    public function getResizeProportional(): bool
+    {
+        return $this->resizeProportional;
+    }
+
+    public function setResizeProportional(bool $resizeProportional): self
+    {
+        $this->resizeProportional = $resizeProportional;
+
+        return $this;
+    }
+
+    public function getRotation(): int
+    {
+        return $this->rotation;
+    }
+
+    public function setRotation(int $rotation): self
+    {
+        $this->rotation = $rotation;
+
+        return $this;
+    }
+
+    public function getShadow(): Shadow
+    {
+        return $this->shadow;
+    }
+
+    public function setShadow(?Shadow $shadow = null): self
+    {
+        $this->shadow = $shadow ?? new Shadow();
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->name
+            . $this->description
+            . (($this->worksheet === null) ? '' : $this->worksheet->getHashCode())
+            . $this->coordinates
+            . $this->offsetX
+            . $this->offsetY
+            . $this->coordinates2
+            . $this->offsetX2
+            . $this->offsetY2
+            . $this->width
+            . $this->height
+            . $this->rotation
+            . $this->shadow->getHashCode()
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if ($key == 'worksheet') {
+                $this->worksheet = null;
+            } elseif (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+
+    public function setHyperlink(?Hyperlink $hyperlink = null): void
+    {
+        $this->hyperlink = $hyperlink;
+    }
+
+    public function getHyperlink(): ?Hyperlink
+    {
+        return $this->hyperlink;
+    }
+
+    /**
+     * Set Fact Sizes and Type of Image.
+     */
+    protected function setSizesAndType(string $path): void
+    {
+        if ($this->imageWidth === 0 && $this->imageHeight === 0 && $this->type === IMAGETYPE_UNKNOWN) {
+            $imageData = getimagesize($path);
+
+            if (!empty($imageData)) {
+                $this->imageWidth = $imageData[0];
+                $this->imageHeight = $imageData[1];
+                $this->type = $imageData[2];
+            }
+        }
+        if ($this->width === 0 && $this->height === 0) {
+            $this->width = $this->imageWidth;
+            $this->height = $this->imageHeight;
+        }
+    }
+
+    /**
+     * Get Image Type.
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    public function getImageWidth(): int
+    {
+        return $this->imageWidth;
+    }
+
+    public function getImageHeight(): int
+    {
+        return $this->imageHeight;
+    }
+
+    public function getEditAs(): string
+    {
+        return $this->editAs;
+    }
+
+    public function setEditAs(string $editAs): self
+    {
+        $this->editAs = $editAs;
+
+        return $this;
+    }
+
+    public function validEditAs(): bool
+    {
+        return in_array($this->editAs, self::VALID_EDIT_AS, true);
+    }
+
+    /**
+     * @return null|SimpleXMLElement|string[]
+     */
+    public function getSrcRect()
+    {
+        return $this->srcRect;
+    }
+
+    /**
+     * @param null|SimpleXMLElement|string[] $srcRect
+     */
+    public function setSrcRect($srcRect): self
+    {
+        $this->srcRect = $srcRect;
+
+        return $this;
+    }
+
+    public function setFlipHorizontal(bool $flipHorizontal): self
+    {
+        $this->flipHorizontal = $flipHorizontal;
+
+        return $this;
+    }
+
+    public function getFlipHorizontal(): bool
+    {
+        return $this->flipHorizontal;
+    }
+
+    public function setFlipVertical(bool $flipVertical): self
+    {
+        $this->flipVertical = $flipVertical;
+
+        return $this;
+    }
+
+    public function getFlipVertical(): bool
+    {
+        return $this->flipVertical;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php
new file mode 100644
index 00000000..2522c336
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use Iterator as NativeIterator;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Collection\Cells;
+
+/**
+ * @template TKey
+ *
+ * @implements NativeIterator<TKey, Cell>
+ */
+abstract class CellIterator implements NativeIterator
+{
+    public const TREAT_NULL_VALUE_AS_EMPTY_CELL = 1;
+
+    public const TREAT_EMPTY_STRING_AS_EMPTY_CELL = 2;
+
+    public const IF_NOT_EXISTS_RETURN_NULL = false;
+
+    public const IF_NOT_EXISTS_CREATE_NEW = true;
+
+    /**
+     * Worksheet to iterate.
+     */
+    protected Worksheet $worksheet;
+
+    /**
+     * Cell Collection to iterate.
+     */
+    protected Cells $cellCollection;
+
+    /**
+     * Iterate only existing cells.
+     */
+    protected bool $onlyExistingCells = false;
+
+    /**
+     * If iterating all cells, and a cell doesn't exist, identifies whether a new cell should be created,
+     *    or if the iterator should return a null value.
+     */
+    protected bool $ifNotExists = self::IF_NOT_EXISTS_CREATE_NEW;
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        unset($this->worksheet, $this->cellCollection);
+    }
+
+    public function getIfNotExists(): bool
+    {
+        return $this->ifNotExists;
+    }
+
+    public function setIfNotExists(bool $ifNotExists = self::IF_NOT_EXISTS_CREATE_NEW): void
+    {
+        $this->ifNotExists = $ifNotExists;
+    }
+
+    /**
+     * Get loop only existing cells.
+     */
+    public function getIterateOnlyExistingCells(): bool
+    {
+        return $this->onlyExistingCells;
+    }
+
+    /**
+     * Validate start/end values for 'IterateOnlyExistingCells' mode, and adjust if necessary.
+     */
+    abstract protected function adjustForExistingOnlyRange(): void;
+
+    /**
+     * Set the iterator to loop only existing cells.
+     */
+    public function setIterateOnlyExistingCells(bool $value): void
+    {
+        $this->onlyExistingCells = (bool) $value;
+
+        $this->adjustForExistingOnlyRange();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php
new file mode 100644
index 00000000..ef4ad2df
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+class Column
+{
+    private Worksheet $worksheet;
+
+    /**
+     * Column index.
+     */
+    private string $columnIndex;
+
+    /**
+     * Create a new column.
+     */
+    public function __construct(Worksheet $worksheet, string $columnIndex = 'A')
+    {
+        // Set parent and column index
+        $this->worksheet = $worksheet;
+        $this->columnIndex = $columnIndex;
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        unset($this->worksheet);
+    }
+
+    /**
+     * Get column index as string eg: 'A'.
+     */
+    public function getColumnIndex(): string
+    {
+        return $this->columnIndex;
+    }
+
+    /**
+     * Get cell iterator.
+     *
+     * @param int $startRow The row number at which to start iterating
+     * @param ?int $endRow Optionally, the row number at which to stop iterating
+     */
+    public function getCellIterator(int $startRow = 1, ?int $endRow = null, bool $iterateOnlyExistingCells = false): ColumnCellIterator
+    {
+        return new ColumnCellIterator($this->worksheet, $this->columnIndex, $startRow, $endRow, $iterateOnlyExistingCells);
+    }
+
+    /**
+     * Get row iterator. Synonym for getCellIterator().
+     *
+     * @param int $startRow The row number at which to start iterating
+     * @param ?int $endRow Optionally, the row number at which to stop iterating
+     */
+    public function getRowIterator(int $startRow = 1, ?int $endRow = null, bool $iterateOnlyExistingCells = false): ColumnCellIterator
+    {
+        return $this->getCellIterator($startRow, $endRow, $iterateOnlyExistingCells);
+    }
+
+    /**
+     * Returns a boolean true if the column contains no cells. By default, this means that no cell records exist in the
+     *         collection for this column. false will be returned otherwise.
+     *     This rule can be modified by passing a $definitionOfEmptyFlags value:
+     *          1 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL If the only cells in the collection are null value
+     *                  cells, then the column will be considered empty.
+     *          2 - CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL If the only cells in the collection are empty
+     *                  string value cells, then the column will be considered empty.
+     *          3 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     *                  If the only cells in the collection are null value or empty string value cells, then the column
+     *                  will be considered empty.
+     *
+     * @param int $definitionOfEmptyFlags
+     *              Possible Flag Values are:
+     *                  CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL
+     *                  CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     * @param int $startRow The row number at which to start checking if cells are empty
+     * @param ?int $endRow Optionally, the row number at which to stop checking if cells are empty
+     */
+    public function isEmpty(int $definitionOfEmptyFlags = 0, int $startRow = 1, ?int $endRow = null): bool
+    {
+        $nullValueCellIsEmpty = (bool) ($definitionOfEmptyFlags & CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL);
+        $emptyStringCellIsEmpty = (bool) ($definitionOfEmptyFlags & CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL);
+
+        $cellIterator = $this->getCellIterator($startRow, $endRow);
+        $cellIterator->setIterateOnlyExistingCells(true);
+        foreach ($cellIterator as $cell) {
+            $value = $cell->getValue();
+            if ($value === null && $nullValueCellIsEmpty === true) {
+                continue;
+            }
+            if ($value === '' && $emptyStringCellIsEmpty === true) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns bound worksheet.
+     */
+    public function getWorksheet(): Worksheet
+    {
+        return $this->worksheet;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
new file mode 100644
index 00000000..16a007ab
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+/**
+ * @extends CellIterator<int>
+ */
+class ColumnCellIterator extends CellIterator
+{
+    /**
+     * Current iterator position.
+     */
+    private int $currentRow;
+
+    /**
+     * Column index.
+     */
+    private int $columnIndex;
+
+    /**
+     * Start position.
+     */
+    private int $startRow = 1;
+
+    /**
+     * End position.
+     */
+    private int $endRow = 1;
+
+    /**
+     * Create a new row iterator.
+     *
+     * @param Worksheet $worksheet The worksheet to iterate over
+     * @param string $columnIndex The column that we want to iterate
+     * @param int $startRow The row number at which to start iterating
+     * @param ?int $endRow Optionally, the row number at which to stop iterating
+     */
+    public function __construct(Worksheet $worksheet, string $columnIndex = 'A', int $startRow = 1, ?int $endRow = null, bool $iterateOnlyExistingCells = false)
+    {
+        // Set subject
+        $this->worksheet = $worksheet;
+        $this->cellCollection = $worksheet->getCellCollection();
+        $this->columnIndex = Coordinate::columnIndexFromString($columnIndex);
+        $this->resetEnd($endRow);
+        $this->resetStart($startRow);
+        $this->setIterateOnlyExistingCells($iterateOnlyExistingCells);
+    }
+
+    /**
+     * (Re)Set the start row and the current row pointer.
+     *
+     * @param int $startRow The row number at which to start iterating
+     *
+     * @return $this
+     */
+    public function resetStart(int $startRow = 1): static
+    {
+        $this->startRow = $startRow;
+        $this->adjustForExistingOnlyRange();
+        $this->seek($startRow);
+
+        return $this;
+    }
+
+    /**
+     * (Re)Set the end row.
+     *
+     * @param ?int $endRow The row number at which to stop iterating
+     *
+     * @return $this
+     */
+    public function resetEnd(?int $endRow = null): static
+    {
+        $this->endRow = $endRow ?: $this->worksheet->getHighestRow();
+        $this->adjustForExistingOnlyRange();
+
+        return $this;
+    }
+
+    /**
+     * Set the row pointer to the selected row.
+     *
+     * @param int $row The row number to set the current pointer at
+     *
+     * @return $this
+     */
+    public function seek(int $row = 1): static
+    {
+        if (
+            $this->onlyExistingCells
+            && (!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->columnIndex) . $row))
+        ) {
+            throw new PhpSpreadsheetException('In "IterateOnlyExistingCells" mode and Cell does not exist');
+        }
+        if (($row < $this->startRow) || ($row > $this->endRow)) {
+            throw new PhpSpreadsheetException("Row $row is out of range ({$this->startRow} - {$this->endRow})");
+        }
+        $this->currentRow = $row;
+
+        return $this;
+    }
+
+    /**
+     * Rewind the iterator to the starting row.
+     */
+    public function rewind(): void
+    {
+        $this->currentRow = $this->startRow;
+    }
+
+    /**
+     * Return the current cell in this worksheet column.
+     */
+    public function current(): ?Cell
+    {
+        $cellAddress = Coordinate::stringFromColumnIndex($this->columnIndex) . $this->currentRow;
+
+        return $this->cellCollection->has($cellAddress)
+            ? $this->cellCollection->get($cellAddress)
+            : (
+                $this->ifNotExists === self::IF_NOT_EXISTS_CREATE_NEW
+                ? $this->worksheet->createNewCell($cellAddress)
+                : null
+            );
+    }
+
+    /**
+     * Return the current iterator key.
+     */
+    public function key(): int
+    {
+        return $this->currentRow;
+    }
+
+    /**
+     * Set the iterator to its next value.
+     */
+    public function next(): void
+    {
+        $columnAddress = Coordinate::stringFromColumnIndex($this->columnIndex);
+        do {
+            ++$this->currentRow;
+        } while (
+            ($this->onlyExistingCells)
+            && ($this->currentRow <= $this->endRow)
+            && (!$this->cellCollection->has($columnAddress . $this->currentRow))
+        );
+    }
+
+    /**
+     * Set the iterator to its previous value.
+     */
+    public function prev(): void
+    {
+        $columnAddress = Coordinate::stringFromColumnIndex($this->columnIndex);
+        do {
+            --$this->currentRow;
+        } while (
+            ($this->onlyExistingCells)
+            && ($this->currentRow >= $this->startRow)
+            && (!$this->cellCollection->has($columnAddress . $this->currentRow))
+        );
+    }
+
+    /**
+     * Indicate if more rows exist in the worksheet range of rows that we're iterating.
+     */
+    public function valid(): bool
+    {
+        return $this->currentRow <= $this->endRow && $this->currentRow >= $this->startRow;
+    }
+
+    /**
+     * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary.
+     */
+    protected function adjustForExistingOnlyRange(): void
+    {
+        if ($this->onlyExistingCells) {
+            $columnAddress = Coordinate::stringFromColumnIndex($this->columnIndex);
+            while (
+                (!$this->cellCollection->has($columnAddress . $this->startRow))
+                && ($this->startRow <= $this->endRow)
+            ) {
+                ++$this->startRow;
+            }
+            while (
+                (!$this->cellCollection->has($columnAddress . $this->endRow))
+                && ($this->endRow >= $this->startRow)
+            ) {
+                --$this->endRow;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php
new file mode 100644
index 00000000..8ac405be
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
+
+class ColumnDimension extends Dimension
+{
+    /**
+     * Column index.
+     */
+    private ?string $columnIndex;
+
+    /**
+     * Column width.
+     *
+     * When this is set to a negative value, the column width should be ignored by IWriter
+     */
+    private float $width = -1;
+
+    /**
+     * Auto size?
+     */
+    private bool $autoSize = false;
+
+    /**
+     * Create a new ColumnDimension.
+     *
+     * @param ?string $index Character column index
+     */
+    public function __construct(?string $index = 'A')
+    {
+        // Initialise values
+        $this->columnIndex = $index;
+
+        // set dimension as unformatted by default
+        parent::__construct(0);
+    }
+
+    /**
+     * Get column index as string eg: 'A'.
+     */
+    public function getColumnIndex(): ?string
+    {
+        return $this->columnIndex;
+    }
+
+    /**
+     * Set column index as string eg: 'A'.
+     */
+    public function setColumnIndex(string $index): self
+    {
+        $this->columnIndex = $index;
+
+        return $this;
+    }
+
+    /**
+     * Get column index as numeric.
+     */
+    public function getColumnNumeric(): int
+    {
+        return Coordinate::columnIndexFromString($this->columnIndex ?? '');
+    }
+
+    /**
+     * Set column index as numeric.
+     */
+    public function setColumnNumeric(int $index): self
+    {
+        $this->columnIndex = Coordinate::stringFromColumnIndex($index);
+
+        return $this;
+    }
+
+    /**
+     * Get Width.
+     *
+     * Each unit of column width is equal to the width of one character in the default font size. A value of -1
+     *      tells Excel to display this column in its default width.
+     * By default, this will be the return value; but this method also accepts an optional unit of measure argument
+     *    and will convert the returned value to the specified UoM..
+     */
+    public function getWidth(?string $unitOfMeasure = null): float
+    {
+        return ($unitOfMeasure === null || $this->width < 0)
+            ? $this->width
+            : (new CssDimension((string) $this->width))->toUnit($unitOfMeasure);
+    }
+
+    /**
+     * Set Width.
+     *
+     * Each unit of column width is equal to the width of one character in the default font size. A value of -1
+     *      tells Excel to display this column in its default width.
+     * By default, this will be the unit of measure for the passed value; but this method also accepts an
+     *    optional unit of measure argument, and will convert the value from the specified UoM using an
+     *    approximation method.
+     *
+     * @return $this
+     */
+    public function setWidth(float $width, ?string $unitOfMeasure = null): static
+    {
+        $this->width = ($unitOfMeasure === null || $width < 0)
+            ? $width
+            : (new CssDimension("{$width}{$unitOfMeasure}"))->width();
+
+        return $this;
+    }
+
+    /**
+     * Get Auto Size.
+     */
+    public function getAutoSize(): bool
+    {
+        return $this->autoSize;
+    }
+
+    /**
+     * Set Auto Size.
+     *
+     * @return $this
+     */
+    public function setAutoSize(bool $autosizeEnabled): static
+    {
+        $this->autoSize = $autosizeEnabled;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
new file mode 100644
index 00000000..69939c39
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use Iterator as NativeIterator;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+/**
+ * @implements NativeIterator<string, Column>
+ */
+class ColumnIterator implements NativeIterator
+{
+    /**
+     * Worksheet to iterate.
+     */
+    private Worksheet $worksheet;
+
+    /**
+     * Current iterator position.
+     */
+    private int $currentColumnIndex = 1;
+
+    /**
+     * Start position.
+     */
+    private int $startColumnIndex = 1;
+
+    /**
+     * End position.
+     */
+    private int $endColumnIndex = 1;
+
+    /**
+     * Create a new column iterator.
+     *
+     * @param Worksheet $worksheet The worksheet to iterate over
+     * @param string $startColumn The column address at which to start iterating
+     * @param ?string $endColumn Optionally, the column address at which to stop iterating
+     */
+    public function __construct(Worksheet $worksheet, string $startColumn = 'A', ?string $endColumn = null)
+    {
+        // Set subject
+        $this->worksheet = $worksheet;
+        $this->resetEnd($endColumn);
+        $this->resetStart($startColumn);
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        unset($this->worksheet);
+    }
+
+    /**
+     * (Re)Set the start column and the current column pointer.
+     *
+     * @param string $startColumn The column address at which to start iterating
+     *
+     * @return $this
+     */
+    public function resetStart(string $startColumn = 'A'): static
+    {
+        $startColumnIndex = Coordinate::columnIndexFromString($startColumn);
+        if ($startColumnIndex > Coordinate::columnIndexFromString($this->worksheet->getHighestColumn())) {
+            throw new Exception(
+                "Start column ({$startColumn}) is beyond highest column ({$this->worksheet->getHighestColumn()})"
+            );
+        }
+
+        $this->startColumnIndex = $startColumnIndex;
+        if ($this->endColumnIndex < $this->startColumnIndex) {
+            $this->endColumnIndex = $this->startColumnIndex;
+        }
+        $this->seek($startColumn);
+
+        return $this;
+    }
+
+    /**
+     * (Re)Set the end column.
+     *
+     * @param ?string $endColumn The column address at which to stop iterating
+     *
+     * @return $this
+     */
+    public function resetEnd(?string $endColumn = null): static
+    {
+        $endColumn = $endColumn ?: $this->worksheet->getHighestColumn();
+        $this->endColumnIndex = Coordinate::columnIndexFromString($endColumn);
+
+        return $this;
+    }
+
+    /**
+     * Set the column pointer to the selected column.
+     *
+     * @param string $column The column address to set the current pointer at
+     *
+     * @return $this
+     */
+    public function seek(string $column = 'A'): static
+    {
+        $column = Coordinate::columnIndexFromString($column);
+        if (($column < $this->startColumnIndex) || ($column > $this->endColumnIndex)) {
+            throw new PhpSpreadsheetException(
+                "Column $column is out of range ({$this->startColumnIndex} - {$this->endColumnIndex})"
+            );
+        }
+        $this->currentColumnIndex = $column;
+
+        return $this;
+    }
+
+    /**
+     * Rewind the iterator to the starting column.
+     */
+    public function rewind(): void
+    {
+        $this->currentColumnIndex = $this->startColumnIndex;
+    }
+
+    /**
+     * Return the current column in this worksheet.
+     */
+    public function current(): Column
+    {
+        return new Column($this->worksheet, Coordinate::stringFromColumnIndex($this->currentColumnIndex));
+    }
+
+    /**
+     * Return the current iterator key.
+     */
+    public function key(): string
+    {
+        return Coordinate::stringFromColumnIndex($this->currentColumnIndex);
+    }
+
+    /**
+     * Set the iterator to its next value.
+     */
+    public function next(): void
+    {
+        ++$this->currentColumnIndex;
+    }
+
+    /**
+     * Set the iterator to its previous value.
+     */
+    public function prev(): void
+    {
+        --$this->currentColumnIndex;
+    }
+
+    /**
+     * Indicate if more columns exist in the worksheet range of columns that we're iterating.
+     */
+    public function valid(): bool
+    {
+        return $this->currentColumnIndex <= $this->endColumnIndex && $this->currentColumnIndex >= $this->startColumnIndex;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php
new file mode 100644
index 00000000..7a88f8c9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+abstract class Dimension
+{
+    /**
+     * Visible?
+     */
+    private bool $visible = true;
+
+    /**
+     * Outline level.
+     */
+    private int $outlineLevel = 0;
+
+    /**
+     * Collapsed.
+     */
+    private bool $collapsed = false;
+
+    /**
+     * Index to cellXf. Null value means row has no explicit cellXf format.
+     */
+    private ?int $xfIndex;
+
+    /**
+     * Create a new Dimension.
+     *
+     * @param ?int $initialValue Numeric row index
+     */
+    public function __construct(?int $initialValue = null)
+    {
+        // set dimension as unformatted by default
+        $this->xfIndex = $initialValue;
+    }
+
+    /**
+     * Get Visible.
+     */
+    public function getVisible(): bool
+    {
+        return $this->visible;
+    }
+
+    /**
+     * Set Visible.
+     *
+     * @return $this
+     */
+    public function setVisible(bool $visible)
+    {
+        $this->visible = $visible;
+
+        return $this;
+    }
+
+    /**
+     * Get Outline Level.
+     */
+    public function getOutlineLevel(): int
+    {
+        return $this->outlineLevel;
+    }
+
+    /**
+     * Set Outline Level.
+     * Value must be between 0 and 7.
+     *
+     * @return $this
+     */
+    public function setOutlineLevel(int $level)
+    {
+        if ($level < 0 || $level > 7) {
+            throw new PhpSpreadsheetException('Outline level must range between 0 and 7.');
+        }
+
+        $this->outlineLevel = $level;
+
+        return $this;
+    }
+
+    /**
+     * Get Collapsed.
+     */
+    public function getCollapsed(): bool
+    {
+        return $this->collapsed;
+    }
+
+    /**
+     * Set Collapsed.
+     *
+     * @return $this
+     */
+    public function setCollapsed(bool $collapsed)
+    {
+        $this->collapsed = $collapsed;
+
+        return $this;
+    }
+
+    /**
+     * Get index to cellXf.
+     */
+    public function getXfIndex(): ?int
+    {
+        return $this->xfIndex;
+    }
+
+    /**
+     * Set index to cellXf.
+     *
+     * @return $this
+     */
+    public function setXfIndex(int $XfIndex)
+    {
+        $this->xfIndex = $XfIndex;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php
new file mode 100644
index 00000000..be02779d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php
@@ -0,0 +1,202 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use ZipArchive;
+
+class Drawing extends BaseDrawing
+{
+    const IMAGE_TYPES_CONVERTION_MAP = [
+        IMAGETYPE_GIF => IMAGETYPE_PNG,
+        IMAGETYPE_JPEG => IMAGETYPE_JPEG,
+        IMAGETYPE_PNG => IMAGETYPE_PNG,
+        IMAGETYPE_BMP => IMAGETYPE_PNG,
+    ];
+
+    /**
+     * Path.
+     */
+    private string $path;
+
+    /**
+     * Whether or not we are dealing with a URL.
+     */
+    private bool $isUrl;
+
+    /**
+     * Create a new Drawing.
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->path = '';
+        $this->isUrl = false;
+
+        // Initialize parent
+        parent::__construct();
+    }
+
+    /**
+     * Get Filename.
+     */
+    public function getFilename(): string
+    {
+        return basename($this->path);
+    }
+
+    /**
+     * Get indexed filename (using image index).
+     */
+    public function getIndexedFilename(): string
+    {
+        return md5($this->path) . '.' . $this->getExtension();
+    }
+
+    /**
+     * Get Extension.
+     */
+    public function getExtension(): string
+    {
+        $exploded = explode('.', basename($this->path));
+
+        return $exploded[count($exploded) - 1];
+    }
+
+    /**
+     * Get full filepath to store drawing in zip archive.
+     */
+    public function getMediaFilename(): string
+    {
+        if (!array_key_exists($this->type, self::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+
+        return sprintf('image%d%s', $this->getImageIndex(), $this->getImageFileExtensionForSave());
+    }
+
+    /**
+     * Get Path.
+     */
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * Set Path.
+     *
+     * @param string $path File path
+     * @param bool $verifyFile Verify file
+     * @param ?ZipArchive $zip Zip archive instance
+     *
+     * @return $this
+     */
+    public function setPath(string $path, bool $verifyFile = true, ?ZipArchive $zip = null): static
+    {
+        if ($verifyFile && preg_match('~^data:image/[a-z]+;base64,~', $path) !== 1) {
+            // Check if a URL has been passed. https://stackoverflow.com/a/2058596/1252979
+            if (filter_var($path, FILTER_VALIDATE_URL)) {
+                $this->path = $path;
+                // Implicit that it is a URL, rather store info than running check above on value in other places.
+                $this->isUrl = true;
+                $imageContents = file_get_contents($path);
+                $filePath = tempnam(sys_get_temp_dir(), 'Drawing');
+                if ($filePath) {
+                    file_put_contents($filePath, $imageContents);
+                    if (file_exists($filePath)) {
+                        $this->setSizesAndType($filePath);
+                        unlink($filePath);
+                    }
+                }
+            } elseif (file_exists($path)) {
+                $this->path = $path;
+                $this->setSizesAndType($path);
+            } elseif ($zip instanceof ZipArchive) {
+                $zipPath = explode('#', $path)[1];
+                if ($zip->locateName($zipPath) !== false) {
+                    $this->path = $path;
+                    $this->setSizesAndType($path);
+                }
+            } else {
+                throw new PhpSpreadsheetException("File $path not found!");
+            }
+        } else {
+            $this->path = $path;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get isURL.
+     */
+    public function getIsURL(): bool
+    {
+        return $this->isUrl;
+    }
+
+    /**
+     * Set isURL.
+     *
+     * @return $this
+     */
+    public function setIsURL(bool $isUrl): self
+    {
+        $this->isUrl = $isUrl;
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->path
+            . parent::getHashCode()
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Get Image Type for Save.
+     */
+    public function getImageTypeForSave(): int
+    {
+        if (!array_key_exists($this->type, self::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+
+        return self::IMAGE_TYPES_CONVERTION_MAP[$this->type];
+    }
+
+    /**
+     * Get Image file extention for Save.
+     */
+    public function getImageFileExtensionForSave(bool $includeDot = true): string
+    {
+        if (!array_key_exists($this->type, self::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+
+        $result = image_type_to_extension(self::IMAGE_TYPES_CONVERTION_MAP[$this->type], $includeDot);
+
+        return "$result";
+    }
+
+    /**
+     * Get Image mime type.
+     */
+    public function getImageMimeType(): string
+    {
+        if (!array_key_exists($this->type, self::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+
+        return image_type_to_mime_type(self::IMAGE_TYPES_CONVERTION_MAP[$this->type]);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
new file mode 100644
index 00000000..e002d5f5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
@@ -0,0 +1,247 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+
+use PhpOffice\PhpSpreadsheet\IComparable;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+
+class Shadow implements IComparable
+{
+    // Shadow alignment
+    const SHADOW_BOTTOM = 'b';
+    const SHADOW_BOTTOM_LEFT = 'bl';
+    const SHADOW_BOTTOM_RIGHT = 'br';
+    const SHADOW_CENTER = 'ctr';
+    const SHADOW_LEFT = 'l';
+    const SHADOW_TOP = 't';
+    const SHADOW_TOP_LEFT = 'tl';
+    const SHADOW_TOP_RIGHT = 'tr';
+
+    /**
+     * Visible.
+     */
+    private bool $visible;
+
+    /**
+     * Blur radius.
+     *
+     * Defaults to 6
+     */
+    private int $blurRadius;
+
+    /**
+     * Shadow distance.
+     *
+     * Defaults to 2
+     */
+    private int $distance;
+
+    /**
+     * Shadow direction (in degrees).
+     */
+    private int $direction;
+
+    /**
+     * Shadow alignment.
+     */
+    private string $alignment;
+
+    /**
+     * Color.
+     */
+    private Color $color;
+
+    /**
+     * Alpha.
+     */
+    private int $alpha;
+
+    /**
+     * Create a new Shadow.
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->visible = false;
+        $this->blurRadius = 6;
+        $this->distance = 2;
+        $this->direction = 0;
+        $this->alignment = self::SHADOW_BOTTOM_RIGHT;
+        $this->color = new Color(Color::COLOR_BLACK);
+        $this->alpha = 50;
+    }
+
+    /**
+     * Get Visible.
+     */
+    public function getVisible(): bool
+    {
+        return $this->visible;
+    }
+
+    /**
+     * Set Visible.
+     *
+     * @return $this
+     */
+    public function setVisible(bool $visible): static
+    {
+        $this->visible = $visible;
+
+        return $this;
+    }
+
+    /**
+     * Get Blur radius.
+     */
+    public function getBlurRadius(): int
+    {
+        return $this->blurRadius;
+    }
+
+    /**
+     * Set Blur radius.
+     *
+     * @return $this
+     */
+    public function setBlurRadius(int $blurRadius): static
+    {
+        $this->blurRadius = $blurRadius;
+
+        return $this;
+    }
+
+    /**
+     * Get Shadow distance.
+     */
+    public function getDistance(): int
+    {
+        return $this->distance;
+    }
+
+    /**
+     * Set Shadow distance.
+     *
+     * @return $this
+     */
+    public function setDistance(int $distance): static
+    {
+        $this->distance = $distance;
+
+        return $this;
+    }
+
+    /**
+     * Get Shadow direction (in degrees).
+     */
+    public function getDirection(): int
+    {
+        return $this->direction;
+    }
+
+    /**
+     * Set Shadow direction (in degrees).
+     *
+     * @return $this
+     */
+    public function setDirection(int $direction): static
+    {
+        $this->direction = $direction;
+
+        return $this;
+    }
+
+    /**
+     * Get Shadow alignment.
+     */
+    public function getAlignment(): string
+    {
+        return $this->alignment;
+    }
+
+    /**
+     * Set Shadow alignment.
+     *
+     * @return $this
+     */
+    public function setAlignment(string $alignment): static
+    {
+        $this->alignment = $alignment;
+
+        return $this;
+    }
+
+    /**
+     * Get Color.
+     */
+    public function getColor(): Color
+    {
+        return $this->color;
+    }
+
+    /**
+     * Set Color.
+     *
+     * @return $this
+     */
+    public function setColor(Color $color): static
+    {
+        $this->color = $color;
+
+        return $this;
+    }
+
+    /**
+     * Get Alpha.
+     */
+    public function getAlpha(): int
+    {
+        return $this->alpha;
+    }
+
+    /**
+     * Set Alpha.
+     *
+     * @return $this
+     */
+    public function setAlpha(int $alpha): static
+    {
+        $this->alpha = $alpha;
+
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            ($this->visible ? 't' : 'f')
+            . $this->blurRadius
+            . $this->distance
+            . $this->direction
+            . $this->alignment
+            . $this->color->getHashCode()
+            . $this->alpha
+            . __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php
new file mode 100644
index 00000000..68716c06
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php
@@ -0,0 +1,426 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+/**
+ * <code>
+ * Header/Footer Formatting Syntax taken from Office Open XML Part 4 - Markup Language Reference, page 1970:.
+ *
+ * There are a number of formatting codes that can be written inline with the actual header / footer text, which
+ * affect the formatting in the header or footer.
+ *
+ * Example: This example shows the text "Center Bold Header" on the first line (center section), and the date on
+ * the second line (center section).
+ *         &CCenter &"-,Bold"Bold&"-,Regular"Header_x000A_&D
+ *
+ * General Rules:
+ * There is no required order in which these codes must appear.
+ *
+ * The first occurrence of the following codes turns the formatting ON, the second occurrence turns it OFF again:
+ * - strikethrough
+ * - superscript
+ * - subscript
+ * Superscript and subscript cannot both be ON at same time. Whichever comes first wins and the other is ignored,
+ * while the first is ON.
+ * &L - code for "left section" (there are three header / footer locations, "left", "center", and "right"). When
+ * two or more occurrences of this section marker exist, the contents from all markers are concatenated, in the
+ * order of appearance, and placed into the left section.
+ * &P - code for "current page #"
+ * &N - code for "total pages"
+ * &font size - code for "text font size", where font size is a font size in points.
+ * &K - code for "text font color"
+ * RGB Color is specified as RRGGBB
+ * Theme Color is specifed as TTSNN where TT is the theme color Id, S is either "+" or "-" of the tint/shade
+ * value, NN is the tint/shade value.
+ * &S - code for "text strikethrough" on / off
+ * &X - code for "text super script" on / off
+ * &Y - code for "text subscript" on / off
+ * &C - code for "center section". When two or more occurrences of this section marker exist, the contents
+ * from all markers are concatenated, in the order of appearance, and placed into the center section.
+ *
+ * &D - code for "date"
+ * &T - code for "time"
+ * &G - code for "picture as background"
+ * &U - code for "text single underline"
+ * &E - code for "double underline"
+ * &R - code for "right section". When two or more occurrences of this section marker exist, the contents
+ * from all markers are concatenated, in the order of appearance, and placed into the right section.
+ * &Z - code for "this workbook's file path"
+ * &F - code for "this workbook's file name"
+ * &A - code for "sheet tab name"
+ * &+ - code for add to page #.
+ * &- - code for subtract from page #.
+ * &"font name,font type" - code for "text font name" and "text font type", where font name and font type
+ * are strings specifying the name and type of the font, separated by a comma. When a hyphen appears in font
+ * name, it means "none specified". Both of font name and font type can be localized values.
+ * &"-,Bold" - code for "bold font style"
+ * &B - also means "bold font style".
+ * &"-,Regular" - code for "regular font style"
+ * &"-,Italic" - code for "italic font style"
+ * &I - also means "italic font style"
+ * &"-,Bold Italic" code for "bold italic font style"
+ * &O - code for "outline style"
+ * &H - code for "shadow style"
+ * </code>
+ */
+class HeaderFooter
+{
+    // Header/footer image location
+    const IMAGE_HEADER_LEFT = 'LH';
+    const IMAGE_HEADER_CENTER = 'CH';
+    const IMAGE_HEADER_RIGHT = 'RH';
+    const IMAGE_FOOTER_LEFT = 'LF';
+    const IMAGE_FOOTER_CENTER = 'CF';
+    const IMAGE_FOOTER_RIGHT = 'RF';
+
+    /**
+     * OddHeader.
+     */
+    private string $oddHeader = '';
+
+    /**
+     * OddFooter.
+     */
+    private string $oddFooter = '';
+
+    /**
+     * EvenHeader.
+     */
+    private string $evenHeader = '';
+
+    /**
+     * EvenFooter.
+     */
+    private string $evenFooter = '';
+
+    /**
+     * FirstHeader.
+     */
+    private string $firstHeader = '';
+
+    /**
+     * FirstFooter.
+     */
+    private string $firstFooter = '';
+
+    /**
+     * Different header for Odd/Even, defaults to false.
+     */
+    private bool $differentOddEven = false;
+
+    /**
+     * Different header for first page, defaults to false.
+     */
+    private bool $differentFirst = false;
+
+    /**
+     * Scale with document, defaults to true.
+     */
+    private bool $scaleWithDocument = true;
+
+    /**
+     * Align with margins, defaults to true.
+     */
+    private bool $alignWithMargins = true;
+
+    /**
+     * Header/footer images.
+     *
+     * @var HeaderFooterDrawing[]
+     */
+    private array $headerFooterImages = [];
+
+    /**
+     * Create a new HeaderFooter.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get OddHeader.
+     */
+    public function getOddHeader(): string
+    {
+        return $this->oddHeader;
+    }
+
+    /**
+     * Set OddHeader.
+     *
+     * @return $this
+     */
+    public function setOddHeader(string $oddHeader): static
+    {
+        $this->oddHeader = $oddHeader;
+
+        return $this;
+    }
+
+    /**
+     * Get OddFooter.
+     */
+    public function getOddFooter(): string
+    {
+        return $this->oddFooter;
+    }
+
+    /**
+     * Set OddFooter.
+     *
+     * @return $this
+     */
+    public function setOddFooter(string $oddFooter): static
+    {
+        $this->oddFooter = $oddFooter;
+
+        return $this;
+    }
+
+    /**
+     * Get EvenHeader.
+     */
+    public function getEvenHeader(): string
+    {
+        return $this->evenHeader;
+    }
+
+    /**
+     * Set EvenHeader.
+     *
+     * @return $this
+     */
+    public function setEvenHeader(string $eventHeader): static
+    {
+        $this->evenHeader = $eventHeader;
+
+        return $this;
+    }
+
+    /**
+     * Get EvenFooter.
+     */
+    public function getEvenFooter(): string
+    {
+        return $this->evenFooter;
+    }
+
+    /**
+     * Set EvenFooter.
+     *
+     * @return $this
+     */
+    public function setEvenFooter(string $evenFooter): static
+    {
+        $this->evenFooter = $evenFooter;
+
+        return $this;
+    }
+
+    /**
+     * Get FirstHeader.
+     */
+    public function getFirstHeader(): string
+    {
+        return $this->firstHeader;
+    }
+
+    /**
+     * Set FirstHeader.
+     *
+     * @return $this
+     */
+    public function setFirstHeader(string $firstHeader): static
+    {
+        $this->firstHeader = $firstHeader;
+
+        return $this;
+    }
+
+    /**
+     * Get FirstFooter.
+     */
+    public function getFirstFooter(): string
+    {
+        return $this->firstFooter;
+    }
+
+    /**
+     * Set FirstFooter.
+     *
+     * @return $this
+     */
+    public function setFirstFooter(string $firstFooter): static
+    {
+        $this->firstFooter = $firstFooter;
+
+        return $this;
+    }
+
+    /**
+     * Get DifferentOddEven.
+     */
+    public function getDifferentOddEven(): bool
+    {
+        return $this->differentOddEven;
+    }
+
+    /**
+     * Set DifferentOddEven.
+     *
+     * @return $this
+     */
+    public function setDifferentOddEven(bool $differentOddEvent): static
+    {
+        $this->differentOddEven = $differentOddEvent;
+
+        return $this;
+    }
+
+    /**
+     * Get DifferentFirst.
+     */
+    public function getDifferentFirst(): bool
+    {
+        return $this->differentFirst;
+    }
+
+    /**
+     * Set DifferentFirst.
+     *
+     * @return $this
+     */
+    public function setDifferentFirst(bool $differentFirst): static
+    {
+        $this->differentFirst = $differentFirst;
+
+        return $this;
+    }
+
+    /**
+     * Get ScaleWithDocument.
+     */
+    public function getScaleWithDocument(): bool
+    {
+        return $this->scaleWithDocument;
+    }
+
+    /**
+     * Set ScaleWithDocument.
+     *
+     * @return $this
+     */
+    public function setScaleWithDocument(bool $scaleWithDocument): static
+    {
+        $this->scaleWithDocument = $scaleWithDocument;
+
+        return $this;
+    }
+
+    /**
+     * Get AlignWithMargins.
+     */
+    public function getAlignWithMargins(): bool
+    {
+        return $this->alignWithMargins;
+    }
+
+    /**
+     * Set AlignWithMargins.
+     *
+     * @return $this
+     */
+    public function setAlignWithMargins(bool $alignWithMargins): static
+    {
+        $this->alignWithMargins = $alignWithMargins;
+
+        return $this;
+    }
+
+    /**
+     * Add header/footer image.
+     *
+     * @return $this
+     */
+    public function addImage(HeaderFooterDrawing $image, string $location = self::IMAGE_HEADER_LEFT): static
+    {
+        $this->headerFooterImages[$location] = $image;
+
+        return $this;
+    }
+
+    /**
+     * Remove header/footer image.
+     *
+     * @return $this
+     */
+    public function removeImage(string $location = self::IMAGE_HEADER_LEFT): static
+    {
+        if (isset($this->headerFooterImages[$location])) {
+            unset($this->headerFooterImages[$location]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set header/footer images.
+     *
+     * @param HeaderFooterDrawing[] $images
+     *
+     * @return $this
+     */
+    public function setImages(array $images): static
+    {
+        $this->headerFooterImages = $images;
+
+        return $this;
+    }
+
+    /**
+     * Get header/footer images.
+     *
+     * @return HeaderFooterDrawing[]
+     */
+    public function getImages(): array
+    {
+        // Sort array
+        $images = [];
+        if (isset($this->headerFooterImages[self::IMAGE_HEADER_LEFT])) {
+            $images[self::IMAGE_HEADER_LEFT] = $this->headerFooterImages[self::IMAGE_HEADER_LEFT];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_HEADER_CENTER])) {
+            $images[self::IMAGE_HEADER_CENTER] = $this->headerFooterImages[self::IMAGE_HEADER_CENTER];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_HEADER_RIGHT])) {
+            $images[self::IMAGE_HEADER_RIGHT] = $this->headerFooterImages[self::IMAGE_HEADER_RIGHT];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_FOOTER_LEFT])) {
+            $images[self::IMAGE_FOOTER_LEFT] = $this->headerFooterImages[self::IMAGE_FOOTER_LEFT];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_FOOTER_CENTER])) {
+            $images[self::IMAGE_FOOTER_CENTER] = $this->headerFooterImages[self::IMAGE_FOOTER_CENTER];
+        }
+        if (isset($this->headerFooterImages[self::IMAGE_FOOTER_RIGHT])) {
+            $images[self::IMAGE_FOOTER_RIGHT] = $this->headerFooterImages[self::IMAGE_FOOTER_RIGHT];
+        }
+        $this->headerFooterImages = $images;
+
+        return $this->headerFooterImages;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php
new file mode 100644
index 00000000..6dddb791
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+class HeaderFooterDrawing extends Drawing
+{
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->getPath()
+            . $this->name
+            . $this->offsetX
+            . $this->offsetY
+            . $this->width
+            . $this->height
+            . __CLASS__
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php
new file mode 100644
index 00000000..92237184
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+/**
+ * @implements \Iterator<int, Worksheet>
+ */
+class Iterator implements \Iterator
+{
+    /**
+     * Spreadsheet to iterate.
+     */
+    private Spreadsheet $subject;
+
+    /**
+     * Current iterator position.
+     */
+    private int $position = 0;
+
+    /**
+     * Create a new worksheet iterator.
+     */
+    public function __construct(Spreadsheet $subject)
+    {
+        // Set subject
+        $this->subject = $subject;
+    }
+
+    /**
+     * Rewind iterator.
+     */
+    public function rewind(): void
+    {
+        $this->position = 0;
+    }
+
+    /**
+     * Current Worksheet.
+     */
+    public function current(): Worksheet
+    {
+        return $this->subject->getSheet($this->position);
+    }
+
+    /**
+     * Current key.
+     */
+    public function key(): int
+    {
+        return $this->position;
+    }
+
+    /**
+     * Next value.
+     */
+    public function next(): void
+    {
+        ++$this->position;
+    }
+
+    /**
+     * Are there more Worksheet instances available?
+     */
+    public function valid(): bool
+    {
+        return $this->position < $this->subject->getSheetCount() && $this->position >= 0;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
new file mode 100644
index 00000000..e15a798d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
@@ -0,0 +1,333 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use GdImage;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+
+class MemoryDrawing extends BaseDrawing
+{
+    // Rendering functions
+    const RENDERING_DEFAULT = 'imagepng';
+    const RENDERING_PNG = 'imagepng';
+    const RENDERING_GIF = 'imagegif';
+    const RENDERING_JPEG = 'imagejpeg';
+
+    // MIME types
+    const MIMETYPE_DEFAULT = 'image/png';
+    const MIMETYPE_PNG = 'image/png';
+    const MIMETYPE_GIF = 'image/gif';
+    const MIMETYPE_JPEG = 'image/jpeg';
+
+    const SUPPORTED_MIME_TYPES = [
+        self::MIMETYPE_GIF,
+        self::MIMETYPE_JPEG,
+        self::MIMETYPE_PNG,
+    ];
+
+    /**
+     * Image resource.
+     */
+    private null|GdImage $imageResource = null;
+
+    /**
+     * Rendering function.
+     */
+    private string $renderingFunction;
+
+    /**
+     * Mime type.
+     */
+    private string $mimeType;
+
+    /**
+     * Unique name.
+     */
+    private string $uniqueName;
+
+    /**
+     * Create a new MemoryDrawing.
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->renderingFunction = self::RENDERING_DEFAULT;
+        $this->mimeType = self::MIMETYPE_DEFAULT;
+        $this->uniqueName = md5(mt_rand(0, 9999) . time() . mt_rand(0, 9999));
+
+        // Initialize parent
+        parent::__construct();
+    }
+
+    public function __destruct()
+    {
+        if ($this->imageResource) {
+            @imagedestroy($this->imageResource);
+            $this->imageResource = null;
+        }
+        $this->worksheet = null;
+    }
+
+    public function __clone()
+    {
+        parent::__clone();
+        $this->cloneResource();
+    }
+
+    private function cloneResource(): void
+    {
+        if (!$this->imageResource) {
+            return;
+        }
+
+        $width = (int) imagesx($this->imageResource);
+        $height = (int) imagesy($this->imageResource);
+
+        if (imageistruecolor($this->imageResource)) {
+            $clone = imagecreatetruecolor($width, $height);
+            if (!$clone) {
+                throw new Exception('Could not clone image resource');
+            }
+
+            imagealphablending($clone, false);
+            imagesavealpha($clone, true);
+        } else {
+            $clone = imagecreate($width, $height);
+            if (!$clone) {
+                throw new Exception('Could not clone image resource');
+            }
+
+            // If the image has transparency...
+            $transparent = imagecolortransparent($this->imageResource);
+            if ($transparent >= 0) {
+                // Starting with Php8.0, next function throws rather than return false
+                $rgb = imagecolorsforindex($this->imageResource, $transparent);
+
+                imagesavealpha($clone, true);
+                $color = imagecolorallocatealpha($clone, $rgb['red'], $rgb['green'], $rgb['blue'], $rgb['alpha']);
+                if ($color === false) {
+                    throw new Exception('Could not get image alpha color');
+                }
+
+                imagefill($clone, 0, 0, $color);
+            }
+        }
+
+        //Create the Clone!!
+        imagecopy($clone, $this->imageResource, 0, 0, 0, 0, $width, $height);
+
+        $this->imageResource = $clone;
+    }
+
+    /**
+     * @param resource $imageStream Stream data to be converted to a Memory Drawing
+     *
+     * @throws Exception
+     */
+    public static function fromStream($imageStream): self
+    {
+        $streamValue = stream_get_contents($imageStream);
+        if ($streamValue === false) {
+            throw new Exception('Unable to read data from stream');
+        }
+
+        return self::fromString($streamValue);
+    }
+
+    /**
+     * @param string $imageString String data to be converted to a Memory Drawing
+     *
+     * @throws Exception
+     */
+    public static function fromString(string $imageString): self
+    {
+        $gdImage = @imagecreatefromstring($imageString);
+        if ($gdImage === false) {
+            throw new Exception('Value cannot be converted to an image');
+        }
+
+        $mimeType = self::identifyMimeType($imageString);
+        if (imageistruecolor($gdImage) || imagecolortransparent($gdImage) >= 0) {
+            imagesavealpha($gdImage, true);
+        }
+        $renderingFunction = self::identifyRenderingFunction($mimeType);
+
+        $drawing = new self();
+        $drawing->setImageResource($gdImage);
+        $drawing->setRenderingFunction($renderingFunction);
+        $drawing->setMimeType($mimeType);
+
+        return $drawing;
+    }
+
+    private static function identifyRenderingFunction(string $mimeType): string
+    {
+        return match ($mimeType) {
+            self::MIMETYPE_PNG => self::RENDERING_PNG,
+            self::MIMETYPE_JPEG => self::RENDERING_JPEG,
+            self::MIMETYPE_GIF => self::RENDERING_GIF,
+            default => self::RENDERING_DEFAULT,
+        };
+    }
+
+    /**
+     * @throws Exception
+     */
+    private static function identifyMimeType(string $imageString): string
+    {
+        $temporaryFileName = File::temporaryFilename();
+        file_put_contents($temporaryFileName, $imageString);
+
+        $mimeType = self::identifyMimeTypeUsingExif($temporaryFileName);
+        if ($mimeType !== null) {
+            unlink($temporaryFileName);
+
+            return $mimeType;
+        }
+
+        $mimeType = self::identifyMimeTypeUsingGd($temporaryFileName);
+        if ($mimeType !== null) {
+            unlink($temporaryFileName);
+
+            return $mimeType;
+        }
+
+        unlink($temporaryFileName);
+
+        return self::MIMETYPE_DEFAULT;
+    }
+
+    private static function identifyMimeTypeUsingExif(string $temporaryFileName): ?string
+    {
+        if (function_exists('exif_imagetype')) {
+            $imageType = @exif_imagetype($temporaryFileName);
+            $mimeType = ($imageType) ? image_type_to_mime_type($imageType) : null;
+
+            return self::supportedMimeTypes($mimeType);
+        }
+
+        return null;
+    }
+
+    private static function identifyMimeTypeUsingGd(string $temporaryFileName): ?string
+    {
+        if (function_exists('getimagesize')) {
+            $imageSize = @getimagesize($temporaryFileName);
+            if (is_array($imageSize)) {
+                $mimeType = $imageSize['mime'];
+
+                return self::supportedMimeTypes($mimeType);
+            }
+        }
+
+        return null;
+    }
+
+    private static function supportedMimeTypes(?string $mimeType = null): ?string
+    {
+        if (in_array($mimeType, self::SUPPORTED_MIME_TYPES, true)) {
+            return $mimeType;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get image resource.
+     */
+    public function getImageResource(): ?GdImage
+    {
+        return $this->imageResource;
+    }
+
+    /**
+     * Set image resource.
+     *
+     * @return $this
+     */
+    public function setImageResource(?GdImage $value): static
+    {
+        $this->imageResource = $value;
+
+        if ($this->imageResource !== null) {
+            // Get width/height
+            $this->width = (int) imagesx($this->imageResource);
+            $this->height = (int) imagesy($this->imageResource);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get rendering function.
+     */
+    public function getRenderingFunction(): string
+    {
+        return $this->renderingFunction;
+    }
+
+    /**
+     * Set rendering function.
+     *
+     * @param string $value see self::RENDERING_*
+     *
+     * @return $this
+     */
+    public function setRenderingFunction(string $value): static
+    {
+        $this->renderingFunction = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get mime type.
+     */
+    public function getMimeType(): string
+    {
+        return $this->mimeType;
+    }
+
+    /**
+     * Set mime type.
+     *
+     * @param string $value see self::MIMETYPE_*
+     *
+     * @return $this
+     */
+    public function setMimeType(string $value): static
+    {
+        $this->mimeType = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get indexed filename (using image index).
+     */
+    public function getIndexedFilename(): string
+    {
+        $extension = strtolower($this->getMimeType());
+        $extension = explode('/', $extension);
+        $extension = $extension[1];
+
+        return $this->uniqueName . $this->getImageIndex() . '.' . $extension;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        return md5(
+            $this->renderingFunction
+            . $this->mimeType
+            . $this->uniqueName
+            . parent::getHashCode()
+            . __CLASS__
+        );
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php
new file mode 100644
index 00000000..05a6074d
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class PageBreak
+{
+    private int $breakType;
+
+    private string $coordinate;
+
+    private int $maxColOrRow;
+
+    /**
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate
+     */
+    public function __construct(int $breakType, CellAddress|string|array $coordinate, int $maxColOrRow = -1)
+    {
+        $coordinate = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+        $this->breakType = $breakType;
+        $this->coordinate = $coordinate;
+        $this->maxColOrRow = $maxColOrRow;
+    }
+
+    public function getBreakType(): int
+    {
+        return $this->breakType;
+    }
+
+    public function getCoordinate(): string
+    {
+        return $this->coordinate;
+    }
+
+    public function getMaxColOrRow(): int
+    {
+        return $this->maxColOrRow;
+    }
+
+    public function getColumnInt(): int
+    {
+        return Coordinate::indexesFromString($this->coordinate)[0];
+    }
+
+    public function getRow(): int
+    {
+        return Coordinate::indexesFromString($this->coordinate)[1];
+    }
+
+    public function getColumnString(): string
+    {
+        return Coordinate::indexesFromString($this->coordinate)[2];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php
new file mode 100644
index 00000000..1b3767a7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+class PageMargins
+{
+    /**
+     * Left.
+     */
+    private float $left = 0.7;
+
+    /**
+     * Right.
+     */
+    private float $right = 0.7;
+
+    /**
+     * Top.
+     */
+    private float $top = 0.75;
+
+    /**
+     * Bottom.
+     */
+    private float $bottom = 0.75;
+
+    /**
+     * Header.
+     */
+    private float $header = 0.3;
+
+    /**
+     * Footer.
+     */
+    private float $footer = 0.3;
+
+    /**
+     * Create a new PageMargins.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get Left.
+     */
+    public function getLeft(): float
+    {
+        return $this->left;
+    }
+
+    /**
+     * Set Left.
+     *
+     * @return $this
+     */
+    public function setLeft(float $left): static
+    {
+        $this->left = $left;
+
+        return $this;
+    }
+
+    /**
+     * Get Right.
+     */
+    public function getRight(): float
+    {
+        return $this->right;
+    }
+
+    /**
+     * Set Right.
+     *
+     * @return $this
+     */
+    public function setRight(float $right): static
+    {
+        $this->right = $right;
+
+        return $this;
+    }
+
+    /**
+     * Get Top.
+     */
+    public function getTop(): float
+    {
+        return $this->top;
+    }
+
+    /**
+     * Set Top.
+     *
+     * @return $this
+     */
+    public function setTop(float $top): static
+    {
+        $this->top = $top;
+
+        return $this;
+    }
+
+    /**
+     * Get Bottom.
+     */
+    public function getBottom(): float
+    {
+        return $this->bottom;
+    }
+
+    /**
+     * Set Bottom.
+     *
+     * @return $this
+     */
+    public function setBottom(float $bottom): static
+    {
+        $this->bottom = $bottom;
+
+        return $this;
+    }
+
+    /**
+     * Get Header.
+     */
+    public function getHeader(): float
+    {
+        return $this->header;
+    }
+
+    /**
+     * Set Header.
+     *
+     * @return $this
+     */
+    public function setHeader(float $header): static
+    {
+        $this->header = $header;
+
+        return $this;
+    }
+
+    /**
+     * Get Footer.
+     */
+    public function getFooter(): float
+    {
+        return $this->footer;
+    }
+
+    /**
+     * Set Footer.
+     *
+     * @return $this
+     */
+    public function setFooter(float $footer): static
+    {
+        $this->footer = $footer;
+
+        return $this;
+    }
+
+    public static function fromCentimeters(float $value): float
+    {
+        return $value / 2.54;
+    }
+
+    public static function toCentimeters(float $value): float
+    {
+        return $value * 2.54;
+    }
+
+    public static function fromMillimeters(float $value): float
+    {
+        return $value / 25.4;
+    }
+
+    public static function toMillimeters(float $value): float
+    {
+        return $value * 25.4;
+    }
+
+    public static function fromPoints(float $value): float
+    {
+        return $value / 72;
+    }
+
+    public static function toPoints(float $value): float
+    {
+        return $value * 72;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php
new file mode 100644
index 00000000..f8c2dd12
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php
@@ -0,0 +1,824 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+/**
+ * <code>
+ * Paper size taken from Office Open XML Part 4 - Markup Language Reference, page 1988:.
+ *
+ * 1 = Letter paper (8.5 in. by 11 in.)
+ * 2 = Letter small paper (8.5 in. by 11 in.)
+ * 3 = Tabloid paper (11 in. by 17 in.)
+ * 4 = Ledger paper (17 in. by 11 in.)
+ * 5 = Legal paper (8.5 in. by 14 in.)
+ * 6 = Statement paper (5.5 in. by 8.5 in.)
+ * 7 = Executive paper (7.25 in. by 10.5 in.)
+ * 8 = A3 paper (297 mm by 420 mm)
+ * 9 = A4 paper (210 mm by 297 mm)
+ * 10 = A4 small paper (210 mm by 297 mm)
+ * 11 = A5 paper (148 mm by 210 mm)
+ * 12 = B4 paper (250 mm by 353 mm)
+ * 13 = B5 paper (176 mm by 250 mm)
+ * 14 = Folio paper (8.5 in. by 13 in.)
+ * 15 = Quarto paper (215 mm by 275 mm)
+ * 16 = Standard paper (10 in. by 14 in.)
+ * 17 = Standard paper (11 in. by 17 in.)
+ * 18 = Note paper (8.5 in. by 11 in.)
+ * 19 = #9 envelope (3.875 in. by 8.875 in.)
+ * 20 = #10 envelope (4.125 in. by 9.5 in.)
+ * 21 = #11 envelope (4.5 in. by 10.375 in.)
+ * 22 = #12 envelope (4.75 in. by 11 in.)
+ * 23 = #14 envelope (5 in. by 11.5 in.)
+ * 24 = C paper (17 in. by 22 in.)
+ * 25 = D paper (22 in. by 34 in.)
+ * 26 = E paper (34 in. by 44 in.)
+ * 27 = DL envelope (110 mm by 220 mm)
+ * 28 = C5 envelope (162 mm by 229 mm)
+ * 29 = C3 envelope (324 mm by 458 mm)
+ * 30 = C4 envelope (229 mm by 324 mm)
+ * 31 = C6 envelope (114 mm by 162 mm)
+ * 32 = C65 envelope (114 mm by 229 mm)
+ * 33 = B4 envelope (250 mm by 353 mm)
+ * 34 = B5 envelope (176 mm by 250 mm)
+ * 35 = B6 envelope (176 mm by 125 mm)
+ * 36 = Italy envelope (110 mm by 230 mm)
+ * 37 = Monarch envelope (3.875 in. by 7.5 in.).
+ * 38 = 6 3/4 envelope (3.625 in. by 6.5 in.)
+ * 39 = US standard fanfold (14.875 in. by 11 in.)
+ * 40 = German standard fanfold (8.5 in. by 12 in.)
+ * 41 = German legal fanfold (8.5 in. by 13 in.)
+ * 42 = ISO B4 (250 mm by 353 mm)
+ * 43 = Japanese double postcard (200 mm by 148 mm)
+ * 44 = Standard paper (9 in. by 11 in.)
+ * 45 = Standard paper (10 in. by 11 in.)
+ * 46 = Standard paper (15 in. by 11 in.)
+ * 47 = Invite envelope (220 mm by 220 mm)
+ * 50 = Letter extra paper (9.275 in. by 12 in.)
+ * 51 = Legal extra paper (9.275 in. by 15 in.)
+ * 52 = Tabloid extra paper (11.69 in. by 18 in.)
+ * 53 = A4 extra paper (236 mm by 322 mm)
+ * 54 = Letter transverse paper (8.275 in. by 11 in.)
+ * 55 = A4 transverse paper (210 mm by 297 mm)
+ * 56 = Letter extra transverse paper (9.275 in. by 12 in.)
+ * 57 = SuperA/SuperA/A4 paper (227 mm by 356 mm)
+ * 58 = SuperB/SuperB/A3 paper (305 mm by 487 mm)
+ * 59 = Letter plus paper (8.5 in. by 12.69 in.)
+ * 60 = A4 plus paper (210 mm by 330 mm)
+ * 61 = A5 transverse paper (148 mm by 210 mm)
+ * 62 = JIS B5 transverse paper (182 mm by 257 mm)
+ * 63 = A3 extra paper (322 mm by 445 mm)
+ * 64 = A5 extra paper (174 mm by 235 mm)
+ * 65 = ISO B5 extra paper (201 mm by 276 mm)
+ * 66 = A2 paper (420 mm by 594 mm)
+ * 67 = A3 transverse paper (297 mm by 420 mm)
+ * 68 = A3 extra transverse paper (322 mm by 445 mm)
+ * </code>
+ */
+class PageSetup
+{
+    // Paper size
+    const PAPERSIZE_LETTER = 1;
+    const PAPERSIZE_LETTER_SMALL = 2;
+    const PAPERSIZE_TABLOID = 3;
+    const PAPERSIZE_LEDGER = 4;
+    const PAPERSIZE_LEGAL = 5;
+    const PAPERSIZE_STATEMENT = 6;
+    const PAPERSIZE_EXECUTIVE = 7;
+    const PAPERSIZE_A3 = 8;
+    const PAPERSIZE_A4 = 9;
+    const PAPERSIZE_A4_SMALL = 10;
+    const PAPERSIZE_A5 = 11;
+    const PAPERSIZE_B4 = 12;
+    const PAPERSIZE_B5 = 13;
+    const PAPERSIZE_FOLIO = 14;
+    const PAPERSIZE_QUARTO = 15;
+    const PAPERSIZE_STANDARD_1 = 16;
+    const PAPERSIZE_STANDARD_2 = 17;
+    const PAPERSIZE_NOTE = 18;
+    const PAPERSIZE_NO9_ENVELOPE = 19;
+    const PAPERSIZE_NO10_ENVELOPE = 20;
+    const PAPERSIZE_NO11_ENVELOPE = 21;
+    const PAPERSIZE_NO12_ENVELOPE = 22;
+    const PAPERSIZE_NO14_ENVELOPE = 23;
+    const PAPERSIZE_C = 24;
+    const PAPERSIZE_D = 25;
+    const PAPERSIZE_E = 26;
+    const PAPERSIZE_DL_ENVELOPE = 27;
+    const PAPERSIZE_C5_ENVELOPE = 28;
+    const PAPERSIZE_C3_ENVELOPE = 29;
+    const PAPERSIZE_C4_ENVELOPE = 30;
+    const PAPERSIZE_C6_ENVELOPE = 31;
+    const PAPERSIZE_C65_ENVELOPE = 32;
+    const PAPERSIZE_B4_ENVELOPE = 33;
+    const PAPERSIZE_B5_ENVELOPE = 34;
+    const PAPERSIZE_B6_ENVELOPE = 35;
+    const PAPERSIZE_ITALY_ENVELOPE = 36;
+    const PAPERSIZE_MONARCH_ENVELOPE = 37;
+    const PAPERSIZE_6_3_4_ENVELOPE = 38;
+    const PAPERSIZE_US_STANDARD_FANFOLD = 39;
+    const PAPERSIZE_GERMAN_STANDARD_FANFOLD = 40;
+    const PAPERSIZE_GERMAN_LEGAL_FANFOLD = 41;
+    const PAPERSIZE_ISO_B4 = 42;
+    const PAPERSIZE_JAPANESE_DOUBLE_POSTCARD = 43;
+    const PAPERSIZE_STANDARD_PAPER_1 = 44;
+    const PAPERSIZE_STANDARD_PAPER_2 = 45;
+    const PAPERSIZE_STANDARD_PAPER_3 = 46;
+    const PAPERSIZE_INVITE_ENVELOPE = 47;
+    const PAPERSIZE_LETTER_EXTRA_PAPER = 48;
+    const PAPERSIZE_LEGAL_EXTRA_PAPER = 49;
+    const PAPERSIZE_TABLOID_EXTRA_PAPER = 50;
+    const PAPERSIZE_A4_EXTRA_PAPER = 51;
+    const PAPERSIZE_LETTER_TRANSVERSE_PAPER = 52;
+    const PAPERSIZE_A4_TRANSVERSE_PAPER = 53;
+    const PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER = 54;
+    const PAPERSIZE_SUPERA_SUPERA_A4_PAPER = 55;
+    const PAPERSIZE_SUPERB_SUPERB_A3_PAPER = 56;
+    const PAPERSIZE_LETTER_PLUS_PAPER = 57;
+    const PAPERSIZE_A4_PLUS_PAPER = 58;
+    const PAPERSIZE_A5_TRANSVERSE_PAPER = 59;
+    const PAPERSIZE_JIS_B5_TRANSVERSE_PAPER = 60;
+    const PAPERSIZE_A3_EXTRA_PAPER = 61;
+    const PAPERSIZE_A5_EXTRA_PAPER = 62;
+    const PAPERSIZE_ISO_B5_EXTRA_PAPER = 63;
+    const PAPERSIZE_A2_PAPER = 64;
+    const PAPERSIZE_A3_TRANSVERSE_PAPER = 65;
+    const PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER = 66;
+
+    // Page orientation
+    const ORIENTATION_DEFAULT = 'default';
+    const ORIENTATION_LANDSCAPE = 'landscape';
+    const ORIENTATION_PORTRAIT = 'portrait';
+
+    // Print Range Set Method
+    const SETPRINTRANGE_OVERWRITE = 'O';
+    const SETPRINTRANGE_INSERT = 'I';
+
+    const PAGEORDER_OVER_THEN_DOWN = 'overThenDown';
+    const PAGEORDER_DOWN_THEN_OVER = 'downThenOver';
+
+    /**
+     * Paper size default.
+     */
+    private static int $paperSizeDefault = self::PAPERSIZE_LETTER;
+
+    /**
+     * Paper size.
+     */
+    private ?int $paperSize = null;
+
+    /**
+     * Orientation default.
+     */
+    private static string $orientationDefault = self::ORIENTATION_DEFAULT;
+
+    /**
+     * Orientation.
+     */
+    private string $orientation;
+
+    /**
+     * Scale (Print Scale).
+     *
+     * Print scaling. Valid values range from 10 to 400
+     * This setting is overridden when fitToWidth and/or fitToHeight are in use
+     */
+    private ?int $scale = 100;
+
+    /**
+     * Fit To Page
+     * Whether scale or fitToWith / fitToHeight applies.
+     */
+    private bool $fitToPage = false;
+
+    /**
+     * Fit To Height
+     * Number of vertical pages to fit on.
+     */
+    private ?int $fitToHeight = 1;
+
+    /**
+     * Fit To Width
+     * Number of horizontal pages to fit on.
+     */
+    private ?int $fitToWidth = 1;
+
+    /**
+     * Columns to repeat at left.
+     *
+     * @var array Containing start column and end column, empty array if option unset
+     */
+    private array $columnsToRepeatAtLeft = ['', ''];
+
+    /**
+     * Rows to repeat at top.
+     *
+     * @var array Containing start row number and end row number, empty array if option unset
+     */
+    private array $rowsToRepeatAtTop = [0, 0];
+
+    /**
+     * Center page horizontally.
+     */
+    private bool $horizontalCentered = false;
+
+    /**
+     * Center page vertically.
+     */
+    private bool $verticalCentered = false;
+
+    /**
+     * Print area.
+     */
+    private ?string $printArea = null;
+
+    /**
+     * First page number.
+     */
+    private ?int $firstPageNumber = null;
+
+    private string $pageOrder = self::PAGEORDER_DOWN_THEN_OVER;
+
+    /**
+     * Create a new PageSetup.
+     */
+    public function __construct()
+    {
+        $this->orientation = self::$orientationDefault;
+    }
+
+    /**
+     * Get Paper Size.
+     */
+    public function getPaperSize(): int
+    {
+        return $this->paperSize ?? self::$paperSizeDefault;
+    }
+
+    /**
+     * Set Paper Size.
+     *
+     * @param int $paperSize see self::PAPERSIZE_*
+     *
+     * @return $this
+     */
+    public function setPaperSize(int $paperSize): static
+    {
+        $this->paperSize = $paperSize;
+
+        return $this;
+    }
+
+    /**
+     * Get Paper Size default.
+     */
+    public static function getPaperSizeDefault(): int
+    {
+        return self::$paperSizeDefault;
+    }
+
+    /**
+     * Set Paper Size Default.
+     */
+    public static function setPaperSizeDefault(int $paperSize): void
+    {
+        self::$paperSizeDefault = $paperSize;
+    }
+
+    /**
+     * Get Orientation.
+     */
+    public function getOrientation(): string
+    {
+        return $this->orientation;
+    }
+
+    /**
+     * Set Orientation.
+     *
+     * @param string $orientation see self::ORIENTATION_*
+     *
+     * @return $this
+     */
+    public function setOrientation(string $orientation): static
+    {
+        if ($orientation === self::ORIENTATION_LANDSCAPE || $orientation === self::ORIENTATION_PORTRAIT || $orientation === self::ORIENTATION_DEFAULT) {
+            $this->orientation = $orientation;
+        }
+
+        return $this;
+    }
+
+    public static function getOrientationDefault(): string
+    {
+        return self::$orientationDefault;
+    }
+
+    public static function setOrientationDefault(string $orientation): void
+    {
+        if ($orientation === self::ORIENTATION_LANDSCAPE || $orientation === self::ORIENTATION_PORTRAIT || $orientation === self::ORIENTATION_DEFAULT) {
+            self::$orientationDefault = $orientation;
+        }
+    }
+
+    /**
+     * Get Scale.
+     */
+    public function getScale(): ?int
+    {
+        return $this->scale;
+    }
+
+    /**
+     * Set Scale.
+     * Print scaling. Valid values range from 10 to 400
+     * This setting is overridden when fitToWidth and/or fitToHeight are in use.
+     *
+     * @param bool $update Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
+     *
+     * @return $this
+     */
+    public function setScale(?int $scale, bool $update = true): static
+    {
+        // Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
+        // but it is apparently still able to handle any scale >= 0, where 0 results in 100
+        if ($scale === null || $scale >= 0) {
+            $this->scale = $scale;
+            if ($update) {
+                $this->fitToPage = false;
+            }
+        } else {
+            throw new PhpSpreadsheetException('Scale must not be negative');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Fit To Page.
+     */
+    public function getFitToPage(): bool
+    {
+        return $this->fitToPage;
+    }
+
+    /**
+     * Set Fit To Page.
+     *
+     * @return $this
+     */
+    public function setFitToPage(bool $fitToPage): static
+    {
+        $this->fitToPage = $fitToPage;
+
+        return $this;
+    }
+
+    /**
+     * Get Fit To Height.
+     */
+    public function getFitToHeight(): ?int
+    {
+        return $this->fitToHeight;
+    }
+
+    /**
+     * Set Fit To Height.
+     *
+     * @param bool $update Update fitToPage so it applies rather than scaling
+     *
+     * @return $this
+     */
+    public function setFitToHeight(?int $fitToHeight, bool $update = true): static
+    {
+        $this->fitToHeight = $fitToHeight;
+        if ($update) {
+            $this->fitToPage = true;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Fit To Width.
+     */
+    public function getFitToWidth(): ?int
+    {
+        return $this->fitToWidth;
+    }
+
+    /**
+     * Set Fit To Width.
+     *
+     * @param bool $update Update fitToPage so it applies rather than scaling
+     *
+     * @return $this
+     */
+    public function setFitToWidth(?int $value, bool $update = true): static
+    {
+        $this->fitToWidth = $value;
+        if ($update) {
+            $this->fitToPage = true;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Is Columns to repeat at left set?
+     */
+    public function isColumnsToRepeatAtLeftSet(): bool
+    {
+        if (!empty($this->columnsToRepeatAtLeft)) {
+            if ($this->columnsToRepeatAtLeft[0] != '' && $this->columnsToRepeatAtLeft[1] != '') {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Columns to repeat at left.
+     *
+     * @return array Containing start column and end column, empty array if option unset
+     */
+    public function getColumnsToRepeatAtLeft(): array
+    {
+        return $this->columnsToRepeatAtLeft;
+    }
+
+    /**
+     * Set Columns to repeat at left.
+     *
+     * @param array $columnsToRepeatAtLeft Containing start column and end column, empty array if option unset
+     *
+     * @return $this
+     */
+    public function setColumnsToRepeatAtLeft(array $columnsToRepeatAtLeft): static
+    {
+        $this->columnsToRepeatAtLeft = $columnsToRepeatAtLeft;
+
+        return $this;
+    }
+
+    /**
+     * Set Columns to repeat at left by start and end.
+     *
+     * @param string $start eg: 'A'
+     * @param string $end eg: 'B'
+     *
+     * @return $this
+     */
+    public function setColumnsToRepeatAtLeftByStartAndEnd(string $start, string $end): static
+    {
+        $this->columnsToRepeatAtLeft = [$start, $end];
+
+        return $this;
+    }
+
+    /**
+     * Is Rows to repeat at top set?
+     */
+    public function isRowsToRepeatAtTopSet(): bool
+    {
+        if (!empty($this->rowsToRepeatAtTop)) {
+            if ($this->rowsToRepeatAtTop[0] != 0 && $this->rowsToRepeatAtTop[1] != 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Rows to repeat at top.
+     *
+     * @return array Containing start column and end column, empty array if option unset
+     */
+    public function getRowsToRepeatAtTop(): array
+    {
+        return $this->rowsToRepeatAtTop;
+    }
+
+    /**
+     * Set Rows to repeat at top.
+     *
+     * @param array $rowsToRepeatAtTop Containing start column and end column, empty array if option unset
+     *
+     * @return $this
+     */
+    public function setRowsToRepeatAtTop(array $rowsToRepeatAtTop): static
+    {
+        $this->rowsToRepeatAtTop = $rowsToRepeatAtTop;
+
+        return $this;
+    }
+
+    /**
+     * Set Rows to repeat at top by start and end.
+     *
+     * @param int $start eg: 1
+     * @param int $end eg: 1
+     *
+     * @return $this
+     */
+    public function setRowsToRepeatAtTopByStartAndEnd(int $start, int $end): static
+    {
+        $this->rowsToRepeatAtTop = [$start, $end];
+
+        return $this;
+    }
+
+    /**
+     * Get center page horizontally.
+     */
+    public function getHorizontalCentered(): bool
+    {
+        return $this->horizontalCentered;
+    }
+
+    /**
+     * Set center page horizontally.
+     *
+     * @return $this
+     */
+    public function setHorizontalCentered(bool $value): static
+    {
+        $this->horizontalCentered = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get center page vertically.
+     */
+    public function getVerticalCentered(): bool
+    {
+        return $this->verticalCentered;
+    }
+
+    /**
+     * Set center page vertically.
+     *
+     * @return $this
+     */
+    public function setVerticalCentered(bool $value): static
+    {
+        $this->verticalCentered = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get print area.
+     *
+     * @param int $index Identifier for a specific print area range if several ranges have been set
+     *                            Default behaviour, or a index value of 0, will return all ranges as a comma-separated string
+     *                            Otherwise, the specific range identified by the value of $index will be returned
+     *                            Print areas are numbered from 1
+     */
+    public function getPrintArea(int $index = 0): string
+    {
+        if ($index == 0) {
+            return (string) $this->printArea;
+        }
+        $printAreas = explode(',', (string) $this->printArea);
+        if (isset($printAreas[$index - 1])) {
+            return $printAreas[$index - 1];
+        }
+
+        throw new PhpSpreadsheetException('Requested Print Area does not exist');
+    }
+
+    /**
+     * Is print area set?
+     *
+     * @param int $index Identifier for a specific print area range if several ranges have been set
+     *                            Default behaviour, or an index value of 0, will identify whether any print range is set
+     *                            Otherwise, existence of the range identified by the value of $index will be returned
+     *                            Print areas are numbered from 1
+     */
+    public function isPrintAreaSet(int $index = 0): bool
+    {
+        if ($index == 0) {
+            return $this->printArea !== null;
+        }
+        $printAreas = explode(',', (string) $this->printArea);
+
+        return isset($printAreas[$index - 1]);
+    }
+
+    /**
+     * Clear a print area.
+     *
+     * @param int $index Identifier for a specific print area range if several ranges have been set
+     *                            Default behaviour, or an index value of 0, will clear all print ranges that are set
+     *                            Otherwise, the range identified by the value of $index will be removed from the series
+     *                            Print areas are numbered from 1
+     *
+     * @return $this
+     */
+    public function clearPrintArea(int $index = 0): static
+    {
+        if ($index == 0) {
+            $this->printArea = null;
+        } else {
+            $printAreas = explode(',', (string) $this->printArea);
+            if (isset($printAreas[$index - 1])) {
+                unset($printAreas[$index - 1]);
+                $this->printArea = implode(',', $printAreas);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20'.
+     *
+     * @param int $index Identifier for a specific print area range allowing several ranges to be set
+     *                            When the method is "O"verwrite, then a positive integer index will overwrite that indexed
+     *                                entry in the print areas list; a negative index value will identify which entry to
+     *                                overwrite working bacward through the print area to the list, with the last entry as -1.
+     *                                Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
+     *                            When the method is "I"nsert, then a positive index will insert after that indexed entry in
+     *                                the print areas list, while a negative index will insert before the indexed entry.
+     *                                Specifying an index value of 0, will always append the new print range at the end of the
+     *                                list.
+     *                            Print areas are numbered from 1
+     * @param string $method Determines the method used when setting multiple print areas
+     *                            Default behaviour, or the "O" method, overwrites existing print area
+     *                            The "I" method, inserts the new print area before any specified index, or at the end of the list
+     *
+     * @return $this
+     */
+    public function setPrintArea(string $value, int $index = 0, string $method = self::SETPRINTRANGE_OVERWRITE): static
+    {
+        if (str_contains($value, '!')) {
+            throw new PhpSpreadsheetException('Cell coordinate must not specify a worksheet.');
+        } elseif (!str_contains($value, ':')) {
+            throw new PhpSpreadsheetException('Cell coordinate must be a range of cells.');
+        } elseif (str_contains($value, '$')) {
+            throw new PhpSpreadsheetException('Cell coordinate must not be absolute.');
+        }
+        $value = strtoupper($value);
+        if (!$this->printArea) {
+            $index = 0;
+        }
+
+        if ($method == self::SETPRINTRANGE_OVERWRITE) {
+            if ($index == 0) {
+                $this->printArea = $value;
+            } else {
+                $printAreas = explode(',', (string) $this->printArea);
+                if ($index < 0) {
+                    $index = count($printAreas) - abs($index) + 1;
+                }
+                if (($index <= 0) || ($index > count($printAreas))) {
+                    throw new PhpSpreadsheetException('Invalid index for setting print range.');
+                }
+                $printAreas[$index - 1] = $value;
+                $this->printArea = implode(',', $printAreas);
+            }
+        } elseif ($method == self::SETPRINTRANGE_INSERT) {
+            if ($index == 0) {
+                $this->printArea = $this->printArea ? ($this->printArea . ',' . $value) : $value;
+            } else {
+                $printAreas = explode(',', (string) $this->printArea);
+                if ($index < 0) {
+                    $index = (int) abs($index) - 1;
+                }
+                if ($index > count($printAreas)) {
+                    throw new PhpSpreadsheetException('Invalid index for setting print range.');
+                }
+                $printAreas = array_merge(array_slice($printAreas, 0, $index), [$value], array_slice($printAreas, $index));
+                $this->printArea = implode(',', $printAreas);
+            }
+        } else {
+            throw new PhpSpreadsheetException('Invalid method for setting print range.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas.
+     *
+     * @param int $index Identifier for a specific print area range allowing several ranges to be set
+     *                            A positive index will insert after that indexed entry in the print areas list, while a
+     *                                negative index will insert before the indexed entry.
+     *                                Specifying an index value of 0, will always append the new print range at the end of the
+     *                                list.
+     *                            Print areas are numbered from 1
+     *
+     * @return $this
+     */
+    public function addPrintArea(string $value, int $index = -1): static
+    {
+        return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT);
+    }
+
+    /**
+     * Set print area.
+     *
+     * @param int $column1 Column 1
+     * @param int $row1 Row 1
+     * @param int $column2 Column 2
+     * @param int $row2 Row 2
+     * @param int $index Identifier for a specific print area range allowing several ranges to be set
+     *                                When the method is "O"verwrite, then a positive integer index will overwrite that indexed
+     *                                    entry in the print areas list; a negative index value will identify which entry to
+     *                                    overwrite working backward through the print area to the list, with the last entry as -1.
+     *                                    Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
+     *                                When the method is "I"nsert, then a positive index will insert after that indexed entry in
+     *                                    the print areas list, while a negative index will insert before the indexed entry.
+     *                                    Specifying an index value of 0, will always append the new print range at the end of the
+     *                                    list.
+     *                                Print areas are numbered from 1
+     * @param string $method Determines the method used when setting multiple print areas
+     *                                Default behaviour, or the "O" method, overwrites existing print area
+     *                                The "I" method, inserts the new print area before any specified index, or at the end of the list
+     *
+     * @return $this
+     */
+    public function setPrintAreaByColumnAndRow(int $column1, int $row1, int $column2, int $row2, int $index = 0, string $method = self::SETPRINTRANGE_OVERWRITE): static
+    {
+        return $this->setPrintArea(
+            Coordinate::stringFromColumnIndex($column1) . $row1 . ':' . Coordinate::stringFromColumnIndex($column2) . $row2,
+            $index,
+            $method
+        );
+    }
+
+    /**
+     * Add a new print area to the list of print areas.
+     *
+     * @param int $column1 Start Column for the print area
+     * @param int $row1 Start Row for the print area
+     * @param int $column2 End Column for the print area
+     * @param int $row2 End Row for the print area
+     * @param int $index Identifier for a specific print area range allowing several ranges to be set
+     *                                A positive index will insert after that indexed entry in the print areas list, while a
+     *                                    negative index will insert before the indexed entry.
+     *                                    Specifying an index value of 0, will always append the new print range at the end of the
+     *                                    list.
+     *                                Print areas are numbered from 1
+     *
+     * @return $this
+     */
+    public function addPrintAreaByColumnAndRow(int $column1, int $row1, int $column2, int $row2, int $index = -1): static
+    {
+        return $this->setPrintArea(
+            Coordinate::stringFromColumnIndex($column1) . $row1 . ':' . Coordinate::stringFromColumnIndex($column2) . $row2,
+            $index,
+            self::SETPRINTRANGE_INSERT
+        );
+    }
+
+    /**
+     * Get first page number.
+     */
+    public function getFirstPageNumber(): ?int
+    {
+        return $this->firstPageNumber;
+    }
+
+    /**
+     * Set first page number.
+     *
+     * @return $this
+     */
+    public function setFirstPageNumber(?int $value): static
+    {
+        $this->firstPageNumber = $value;
+
+        return $this;
+    }
+
+    /**
+     * Reset first page number.
+     *
+     * @return $this
+     */
+    public function resetFirstPageNumber(): static
+    {
+        return $this->setFirstPageNumber(null);
+    }
+
+    public function getPageOrder(): string
+    {
+        return $this->pageOrder;
+    }
+
+    public function setPageOrder(?string $pageOrder): self
+    {
+        if ($pageOrder === null || $pageOrder === self::PAGEORDER_DOWN_THEN_OVER || $pageOrder === self::PAGEORDER_OVER_THEN_DOWN) {
+            $this->pageOrder = $pageOrder ?? self::PAGEORDER_DOWN_THEN_OVER;
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Pane.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Pane.php
new file mode 100644
index 00000000..cbf523d4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Pane.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+class Pane
+{
+    private string $sqref;
+
+    private string $activeCell;
+
+    private string $position;
+
+    public function __construct(string $position, string $sqref = '', string $activeCell = '')
+    {
+        $this->sqref = $sqref;
+        $this->activeCell = $activeCell;
+        $this->position = $position;
+    }
+
+    public function getPosition(): string
+    {
+        return $this->position;
+    }
+
+    public function getSqref(): string
+    {
+        return $this->sqref;
+    }
+
+    public function setSqref(string $sqref): self
+    {
+        $this->sqref = $sqref;
+
+        return $this;
+    }
+
+    public function getActiveCell(): string
+    {
+        return $this->activeCell;
+    }
+
+    public function setActiveCell(string $activeCell): self
+    {
+        $this->activeCell = $activeCell;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ProtectedRange.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ProtectedRange.php
new file mode 100644
index 00000000..bd419762
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ProtectedRange.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+class ProtectedRange
+{
+    private string $name = '';
+
+    private string $password = '';
+
+    private string $sqref;
+
+    private string $securityDescriptor = '';
+
+    /**
+     * No setters aside from constructor.
+     */
+    public function __construct(string $sqref, string $password = '', string $name = '', string $securityDescriptor = '')
+    {
+        $this->sqref = $sqref;
+        $this->name = $name;
+        $this->password = $password;
+        $this->securityDescriptor = $securityDescriptor;
+    }
+
+    public function getSqref(): string
+    {
+        return $this->sqref;
+    }
+
+    public function getName(): string
+    {
+        return $this->name ?: ('p' . md5($this->sqref));
+    }
+
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+
+    public function getSecurityDescriptor(): string
+    {
+        return $this->securityDescriptor;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php
new file mode 100644
index 00000000..520994dc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php
@@ -0,0 +1,474 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Shared\PasswordHasher;
+
+class Protection
+{
+    const ALGORITHM_MD2 = 'MD2';
+    const ALGORITHM_MD4 = 'MD4';
+    const ALGORITHM_MD5 = 'MD5';
+    const ALGORITHM_SHA_1 = 'SHA-1';
+    const ALGORITHM_SHA_256 = 'SHA-256';
+    const ALGORITHM_SHA_384 = 'SHA-384';
+    const ALGORITHM_SHA_512 = 'SHA-512';
+    const ALGORITHM_RIPEMD_128 = 'RIPEMD-128';
+    const ALGORITHM_RIPEMD_160 = 'RIPEMD-160';
+    const ALGORITHM_WHIRLPOOL = 'WHIRLPOOL';
+
+    /**
+     * Autofilters are locked when sheet is protected, default true.
+     */
+    private ?bool $autoFilter = null;
+
+    /**
+     * Deleting columns is locked when sheet is protected, default true.
+     */
+    private ?bool $deleteColumns = null;
+
+    /**
+     * Deleting rows is locked when sheet is protected, default true.
+     */
+    private ?bool $deleteRows = null;
+
+    /**
+     * Formatting cells is locked when sheet is protected, default true.
+     */
+    private ?bool $formatCells = null;
+
+    /**
+     * Formatting columns is locked when sheet is protected, default true.
+     */
+    private ?bool $formatColumns = null;
+
+    /**
+     * Formatting rows is locked when sheet is protected, default true.
+     */
+    private ?bool $formatRows = null;
+
+    /**
+     * Inserting columns is locked when sheet is protected, default true.
+     */
+    private ?bool $insertColumns = null;
+
+    /**
+     * Inserting hyperlinks is locked when sheet is protected, default true.
+     */
+    private ?bool $insertHyperlinks = null;
+
+    /**
+     * Inserting rows is locked when sheet is protected, default true.
+     */
+    private ?bool $insertRows = null;
+
+    /**
+     * Objects are locked when sheet is protected, default false.
+     */
+    private ?bool $objects = null;
+
+    /**
+     * Pivot tables are locked when the sheet is protected, default true.
+     */
+    private ?bool $pivotTables = null;
+
+    /**
+     * Scenarios are locked when sheet is protected, default false.
+     */
+    private ?bool $scenarios = null;
+
+    /**
+     * Selection of locked cells is locked when sheet is protected, default false.
+     */
+    private ?bool $selectLockedCells = null;
+
+    /**
+     * Selection of unlocked cells is locked when sheet is protected, default false.
+     */
+    private ?bool $selectUnlockedCells = null;
+
+    /**
+     * Sheet is locked when sheet is protected, default false.
+     */
+    private ?bool $sheet = null;
+
+    /**
+     * Sorting is locked when sheet is protected, default true.
+     */
+    private ?bool $sort = null;
+
+    /**
+     * Hashed password.
+     */
+    private string $password = '';
+
+    /**
+     * Algorithm name.
+     */
+    private string $algorithm = '';
+
+    /**
+     * Salt value.
+     */
+    private string $salt = '';
+
+    /**
+     * Spin count.
+     */
+    private int $spinCount = 10000;
+
+    /**
+     * Create a new Protection.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Is some sort of protection enabled?
+     */
+    public function isProtectionEnabled(): bool
+    {
+        return
+            $this->password !== ''
+            || isset($this->sheet)
+            || isset($this->objects)
+            || isset($this->scenarios)
+            || isset($this->formatCells)
+            || isset($this->formatColumns)
+            || isset($this->formatRows)
+            || isset($this->insertColumns)
+            || isset($this->insertRows)
+            || isset($this->insertHyperlinks)
+            || isset($this->deleteColumns)
+            || isset($this->deleteRows)
+            || isset($this->selectLockedCells)
+            || isset($this->sort)
+            || isset($this->autoFilter)
+            || isset($this->pivotTables)
+            || isset($this->selectUnlockedCells);
+    }
+
+    public function getSheet(): ?bool
+    {
+        return $this->sheet;
+    }
+
+    public function setSheet(?bool $sheet): self
+    {
+        $this->sheet = $sheet;
+
+        return $this;
+    }
+
+    public function getObjects(): ?bool
+    {
+        return $this->objects;
+    }
+
+    public function setObjects(?bool $objects): self
+    {
+        $this->objects = $objects;
+
+        return $this;
+    }
+
+    public function getScenarios(): ?bool
+    {
+        return $this->scenarios;
+    }
+
+    public function setScenarios(?bool $scenarios): self
+    {
+        $this->scenarios = $scenarios;
+
+        return $this;
+    }
+
+    public function getFormatCells(): ?bool
+    {
+        return $this->formatCells;
+    }
+
+    public function setFormatCells(?bool $formatCells): self
+    {
+        $this->formatCells = $formatCells;
+
+        return $this;
+    }
+
+    public function getFormatColumns(): ?bool
+    {
+        return $this->formatColumns;
+    }
+
+    public function setFormatColumns(?bool $formatColumns): self
+    {
+        $this->formatColumns = $formatColumns;
+
+        return $this;
+    }
+
+    public function getFormatRows(): ?bool
+    {
+        return $this->formatRows;
+    }
+
+    public function setFormatRows(?bool $formatRows): self
+    {
+        $this->formatRows = $formatRows;
+
+        return $this;
+    }
+
+    public function getInsertColumns(): ?bool
+    {
+        return $this->insertColumns;
+    }
+
+    public function setInsertColumns(?bool $insertColumns): self
+    {
+        $this->insertColumns = $insertColumns;
+
+        return $this;
+    }
+
+    public function getInsertRows(): ?bool
+    {
+        return $this->insertRows;
+    }
+
+    public function setInsertRows(?bool $insertRows): self
+    {
+        $this->insertRows = $insertRows;
+
+        return $this;
+    }
+
+    public function getInsertHyperlinks(): ?bool
+    {
+        return $this->insertHyperlinks;
+    }
+
+    public function setInsertHyperlinks(?bool $insertHyperLinks): self
+    {
+        $this->insertHyperlinks = $insertHyperLinks;
+
+        return $this;
+    }
+
+    public function getDeleteColumns(): ?bool
+    {
+        return $this->deleteColumns;
+    }
+
+    public function setDeleteColumns(?bool $deleteColumns): self
+    {
+        $this->deleteColumns = $deleteColumns;
+
+        return $this;
+    }
+
+    public function getDeleteRows(): ?bool
+    {
+        return $this->deleteRows;
+    }
+
+    public function setDeleteRows(?bool $deleteRows): self
+    {
+        $this->deleteRows = $deleteRows;
+
+        return $this;
+    }
+
+    public function getSelectLockedCells(): ?bool
+    {
+        return $this->selectLockedCells;
+    }
+
+    public function setSelectLockedCells(?bool $selectLockedCells): self
+    {
+        $this->selectLockedCells = $selectLockedCells;
+
+        return $this;
+    }
+
+    public function getSort(): ?bool
+    {
+        return $this->sort;
+    }
+
+    public function setSort(?bool $sort): self
+    {
+        $this->sort = $sort;
+
+        return $this;
+    }
+
+    public function getAutoFilter(): ?bool
+    {
+        return $this->autoFilter;
+    }
+
+    public function setAutoFilter(?bool $autoFilter): self
+    {
+        $this->autoFilter = $autoFilter;
+
+        return $this;
+    }
+
+    public function getPivotTables(): ?bool
+    {
+        return $this->pivotTables;
+    }
+
+    public function setPivotTables(?bool $pivotTables): self
+    {
+        $this->pivotTables = $pivotTables;
+
+        return $this;
+    }
+
+    public function getSelectUnlockedCells(): ?bool
+    {
+        return $this->selectUnlockedCells;
+    }
+
+    public function setSelectUnlockedCells(?bool $selectUnlockedCells): self
+    {
+        $this->selectUnlockedCells = $selectUnlockedCells;
+
+        return $this;
+    }
+
+    /**
+     * Get hashed password.
+     */
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+
+    /**
+     * Set Password.
+     *
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
+     *
+     * @return $this
+     */
+    public function setPassword(string $password, bool $alreadyHashed = false): static
+    {
+        if (!$alreadyHashed) {
+            $salt = $this->generateSalt();
+            $this->setSalt($salt);
+            $password = PasswordHasher::hashPassword($password, $this->getAlgorithm(), $this->getSalt(), $this->getSpinCount());
+        }
+
+        $this->password = $password;
+
+        return $this;
+    }
+
+    public function setHashValue(string $password): self
+    {
+        return $this->setPassword($password, true);
+    }
+
+    /**
+     * Create a pseudorandom string.
+     */
+    private function generateSalt(): string
+    {
+        return base64_encode(random_bytes(16));
+    }
+
+    /**
+     * Get algorithm name.
+     */
+    public function getAlgorithm(): string
+    {
+        return $this->algorithm;
+    }
+
+    /**
+     * Set algorithm name.
+     */
+    public function setAlgorithm(string $algorithm): self
+    {
+        return $this->setAlgorithmName($algorithm);
+    }
+
+    /**
+     * Set algorithm name.
+     */
+    public function setAlgorithmName(string $algorithm): self
+    {
+        $this->algorithm = $algorithm;
+
+        return $this;
+    }
+
+    public function getSalt(): string
+    {
+        return $this->salt;
+    }
+
+    public function setSalt(string $salt): self
+    {
+        return $this->setSaltValue($salt);
+    }
+
+    public function setSaltValue(string $salt): self
+    {
+        $this->salt = $salt;
+
+        return $this;
+    }
+
+    /**
+     * Get spin count.
+     */
+    public function getSpinCount(): int
+    {
+        return $this->spinCount;
+    }
+
+    /**
+     * Set spin count.
+     */
+    public function setSpinCount(int $spinCount): self
+    {
+        $this->spinCount = $spinCount;
+
+        return $this;
+    }
+
+    /**
+     * Verify that the given non-hashed password can "unlock" the protection.
+     */
+    public function verify(string $password): bool
+    {
+        if ($this->password === '') {
+            return true;
+        }
+
+        $hash = PasswordHasher::hashPassword($password, $this->getAlgorithm(), $this->getSalt(), $this->getSpinCount());
+
+        return $this->getPassword() === $hash;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php
new file mode 100644
index 00000000..49d13da5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+class Row
+{
+    private Worksheet $worksheet;
+
+    /**
+     * Row index.
+     */
+    private int $rowIndex;
+
+    /**
+     * Create a new row.
+     */
+    public function __construct(Worksheet $worksheet, int $rowIndex = 1)
+    {
+        // Set parent and row index
+        $this->worksheet = $worksheet;
+        $this->rowIndex = $rowIndex;
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        unset($this->worksheet);
+    }
+
+    /**
+     * Get row index.
+     */
+    public function getRowIndex(): int
+    {
+        return $this->rowIndex;
+    }
+
+    /**
+     * Get cell iterator.
+     *
+     * @param string $startColumn The column address at which to start iterating
+     * @param ?string $endColumn Optionally, the column address at which to stop iterating
+     */
+    public function getCellIterator(string $startColumn = 'A', ?string $endColumn = null, bool $iterateOnlyExistingCells = false): RowCellIterator
+    {
+        return new RowCellIterator($this->worksheet, $this->rowIndex, $startColumn, $endColumn, $iterateOnlyExistingCells);
+    }
+
+    /**
+     * Get column iterator. Synonym for getCellIterator().
+     *
+     * @param string $startColumn The column address at which to start iterating
+     * @param ?string $endColumn Optionally, the column address at which to stop iterating
+     */
+    public function getColumnIterator(string $startColumn = 'A', ?string $endColumn = null, bool $iterateOnlyExistingCells = false): RowCellIterator
+    {
+        return $this->getCellIterator($startColumn, $endColumn, $iterateOnlyExistingCells);
+    }
+
+    /**
+     * Returns a boolean true if the row contains no cells. By default, this means that no cell records exist in the
+     *         collection for this row. false will be returned otherwise.
+     *     This rule can be modified by passing a $definitionOfEmptyFlags value:
+     *          1 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL If the only cells in the collection are null value
+     *                  cells, then the row will be considered empty.
+     *          2 - CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL If the only cells in the collection are empty
+     *                  string value cells, then the row will be considered empty.
+     *          3 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     *                  If the only cells in the collection are null value or empty string value cells, then the row
+     *                  will be considered empty.
+     *
+     * @param int $definitionOfEmptyFlags
+     *              Possible Flag Values are:
+     *                  CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL
+     *                  CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     * @param string $startColumn The column address at which to start checking if cells are empty
+     * @param ?string $endColumn Optionally, the column address at which to stop checking if cells are empty
+     */
+    public function isEmpty(int $definitionOfEmptyFlags = 0, string $startColumn = 'A', ?string $endColumn = null): bool
+    {
+        $nullValueCellIsEmpty = (bool) ($definitionOfEmptyFlags & CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL);
+        $emptyStringCellIsEmpty = (bool) ($definitionOfEmptyFlags & CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL);
+
+        $cellIterator = $this->getCellIterator($startColumn, $endColumn);
+        $cellIterator->setIterateOnlyExistingCells(true);
+        foreach ($cellIterator as $cell) {
+            $value = $cell->getValue();
+            if ($value === null && $nullValueCellIsEmpty === true) {
+                continue;
+            }
+            if ($value === '' && $emptyStringCellIsEmpty === true) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns bound worksheet.
+     */
+    public function getWorksheet(): Worksheet
+    {
+        return $this->worksheet;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php
new file mode 100644
index 00000000..4d4901c8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+/**
+ * @extends CellIterator<string>
+ */
+class RowCellIterator extends CellIterator
+{
+    /**
+     * Current iterator position.
+     */
+    private int $currentColumnIndex;
+
+    /**
+     * Row index.
+     */
+    private int $rowIndex;
+
+    /**
+     * Start position.
+     */
+    private int $startColumnIndex = 1;
+
+    /**
+     * End position.
+     */
+    private int $endColumnIndex = 1;
+
+    /**
+     * Create a new column iterator.
+     *
+     * @param Worksheet $worksheet The worksheet to iterate over
+     * @param int $rowIndex The row that we want to iterate
+     * @param string $startColumn The column address at which to start iterating
+     * @param ?string $endColumn Optionally, the column address at which to stop iterating
+     */
+    public function __construct(Worksheet $worksheet, int $rowIndex = 1, string $startColumn = 'A', ?string $endColumn = null, bool $iterateOnlyExistingCells = false)
+    {
+        // Set subject and row index
+        $this->worksheet = $worksheet;
+        $this->cellCollection = $worksheet->getCellCollection();
+        $this->rowIndex = $rowIndex;
+        $this->resetEnd($endColumn);
+        $this->resetStart($startColumn);
+        $this->setIterateOnlyExistingCells($iterateOnlyExistingCells);
+    }
+
+    /**
+     * (Re)Set the start column and the current column pointer.
+     *
+     * @param string $startColumn The column address at which to start iterating
+     *
+     * @return $this
+     */
+    public function resetStart(string $startColumn = 'A'): static
+    {
+        $this->startColumnIndex = Coordinate::columnIndexFromString($startColumn);
+        $this->adjustForExistingOnlyRange();
+        $this->seek(Coordinate::stringFromColumnIndex($this->startColumnIndex));
+
+        return $this;
+    }
+
+    /**
+     * (Re)Set the end column.
+     *
+     * @param ?string $endColumn The column address at which to stop iterating
+     *
+     * @return $this
+     */
+    public function resetEnd(?string $endColumn = null): static
+    {
+        $endColumn = $endColumn ?: $this->worksheet->getHighestColumn();
+        $this->endColumnIndex = Coordinate::columnIndexFromString($endColumn);
+        $this->adjustForExistingOnlyRange();
+
+        return $this;
+    }
+
+    /**
+     * Set the column pointer to the selected column.
+     *
+     * @param string $column The column address to set the current pointer at
+     *
+     * @return $this
+     */
+    public function seek(string $column = 'A'): static
+    {
+        $columnId = Coordinate::columnIndexFromString($column);
+        if ($this->onlyExistingCells && !($this->cellCollection->has($column . $this->rowIndex))) {
+            throw new PhpSpreadsheetException('In "IterateOnlyExistingCells" mode and Cell does not exist');
+        }
+        if (($columnId < $this->startColumnIndex) || ($columnId > $this->endColumnIndex)) {
+            throw new PhpSpreadsheetException("Column $column is out of range ({$this->startColumnIndex} - {$this->endColumnIndex})");
+        }
+        $this->currentColumnIndex = $columnId;
+
+        return $this;
+    }
+
+    /**
+     * Rewind the iterator to the starting column.
+     */
+    public function rewind(): void
+    {
+        $this->currentColumnIndex = $this->startColumnIndex;
+    }
+
+    /**
+     * Return the current cell in this worksheet row.
+     */
+    public function current(): ?Cell
+    {
+        $cellAddress = Coordinate::stringFromColumnIndex($this->currentColumnIndex) . $this->rowIndex;
+
+        return $this->cellCollection->has($cellAddress)
+            ? $this->cellCollection->get($cellAddress)
+            : (
+                $this->ifNotExists === self::IF_NOT_EXISTS_CREATE_NEW
+                ? $this->worksheet->createNewCell($cellAddress)
+                : null
+            );
+    }
+
+    /**
+     * Return the current iterator key.
+     */
+    public function key(): string
+    {
+        return Coordinate::stringFromColumnIndex($this->currentColumnIndex);
+    }
+
+    /**
+     * Set the iterator to its next value.
+     */
+    public function next(): void
+    {
+        do {
+            ++$this->currentColumnIndex;
+        } while (($this->onlyExistingCells) && (!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->currentColumnIndex) . $this->rowIndex)) && ($this->currentColumnIndex <= $this->endColumnIndex));
+    }
+
+    /**
+     * Set the iterator to its previous value.
+     */
+    public function prev(): void
+    {
+        do {
+            --$this->currentColumnIndex;
+        } while (($this->onlyExistingCells) && (!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->currentColumnIndex) . $this->rowIndex)) && ($this->currentColumnIndex >= $this->startColumnIndex));
+    }
+
+    /**
+     * Indicate if more columns exist in the worksheet range of columns that we're iterating.
+     */
+    public function valid(): bool
+    {
+        return $this->currentColumnIndex <= $this->endColumnIndex && $this->currentColumnIndex >= $this->startColumnIndex;
+    }
+
+    /**
+     * Return the current iterator position.
+     */
+    public function getCurrentColumnIndex(): int
+    {
+        return $this->currentColumnIndex;
+    }
+
+    /**
+     * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary.
+     */
+    protected function adjustForExistingOnlyRange(): void
+    {
+        if ($this->onlyExistingCells) {
+            while ((!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->startColumnIndex) . $this->rowIndex)) && ($this->startColumnIndex <= $this->endColumnIndex)) {
+                ++$this->startColumnIndex;
+            }
+            while ((!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->endColumnIndex) . $this->rowIndex)) && ($this->endColumnIndex >= $this->startColumnIndex)) {
+                --$this->endColumnIndex;
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php
new file mode 100644
index 00000000..e94a63b3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
+
+class RowDimension extends Dimension
+{
+    /**
+     * Row index.
+     */
+    private ?int $rowIndex;
+
+    /**
+     * Row height (in pt).
+     *
+     * When this is set to a negative value, the row height should be ignored by IWriter
+     */
+    private float $height = -1;
+
+    /**
+     * ZeroHeight for Row?
+     */
+    private bool $zeroHeight = false;
+
+    /**
+     * Create a new RowDimension.
+     *
+     * @param ?int $index Numeric row index
+     */
+    public function __construct(?int $index = 0)
+    {
+        // Initialise values
+        $this->rowIndex = $index;
+
+        // set dimension as unformatted by default
+        parent::__construct(null);
+    }
+
+    /**
+     * Get Row Index.
+     */
+    public function getRowIndex(): ?int
+    {
+        return $this->rowIndex;
+    }
+
+    /**
+     * Set Row Index.
+     *
+     * @return $this
+     */
+    public function setRowIndex(int $index): static
+    {
+        $this->rowIndex = $index;
+
+        return $this;
+    }
+
+    /**
+     * Get Row Height.
+     * By default, this will be in points; but this method also accepts an optional unit of measure
+     *    argument, and will convert the value from points to the specified UoM.
+     *    A value of -1 tells Excel to display this column in its default height.
+     */
+    public function getRowHeight(?string $unitOfMeasure = null): float
+    {
+        return ($unitOfMeasure === null || $this->height < 0)
+            ? $this->height
+            : (new CssDimension($this->height . CssDimension::UOM_POINTS))->toUnit($unitOfMeasure);
+    }
+
+    /**
+     * Set Row Height.
+     *
+     * @param float $height in points. A value of -1 tells Excel to display this column in its default height.
+     * By default, this will be the passed argument value; but this method also accepts an optional unit of measure
+     *    argument, and will convert the passed argument value to points from the specified UoM
+     *
+     * @return $this
+     */
+    public function setRowHeight(float $height, ?string $unitOfMeasure = null): static
+    {
+        $this->height = ($unitOfMeasure === null || $height < 0)
+            ? $height
+            : (new CssDimension("{$height}{$unitOfMeasure}"))->height();
+
+        return $this;
+    }
+
+    /**
+     * Get ZeroHeight.
+     */
+    public function getZeroHeight(): bool
+    {
+        return $this->zeroHeight;
+    }
+
+    /**
+     * Set ZeroHeight.
+     *
+     * @return $this
+     */
+    public function setZeroHeight(bool $zeroHeight): static
+    {
+        $this->zeroHeight = $zeroHeight;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php
new file mode 100644
index 00000000..9d42ee98
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use Iterator as NativeIterator;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+/**
+ * @implements NativeIterator<int, Row>
+ */
+class RowIterator implements NativeIterator
+{
+    /**
+     * Worksheet to iterate.
+     */
+    private Worksheet $subject;
+
+    /**
+     * Current iterator position.
+     */
+    private int $position = 1;
+
+    /**
+     * Start position.
+     */
+    private int $startRow = 1;
+
+    /**
+     * End position.
+     */
+    private int $endRow = 1;
+
+    /**
+     * Create a new row iterator.
+     *
+     * @param Worksheet $subject The worksheet to iterate over
+     * @param int $startRow The row number at which to start iterating
+     * @param ?int $endRow Optionally, the row number at which to stop iterating
+     */
+    public function __construct(Worksheet $subject, int $startRow = 1, ?int $endRow = null)
+    {
+        // Set subject
+        $this->subject = $subject;
+        $this->resetEnd($endRow);
+        $this->resetStart($startRow);
+    }
+
+    public function __destruct()
+    {
+        unset($this->subject);
+    }
+
+    /**
+     * (Re)Set the start row and the current row pointer.
+     *
+     * @param int $startRow The row number at which to start iterating
+     *
+     * @return $this
+     */
+    public function resetStart(int $startRow = 1): static
+    {
+        if ($startRow > $this->subject->getHighestRow()) {
+            throw new PhpSpreadsheetException(
+                "Start row ({$startRow}) is beyond highest row ({$this->subject->getHighestRow()})"
+            );
+        }
+
+        $this->startRow = $startRow;
+        if ($this->endRow < $this->startRow) {
+            $this->endRow = $this->startRow;
+        }
+        $this->seek($startRow);
+
+        return $this;
+    }
+
+    /**
+     * (Re)Set the end row.
+     *
+     * @param ?int $endRow The row number at which to stop iterating
+     *
+     * @return $this
+     */
+    public function resetEnd(?int $endRow = null): static
+    {
+        $this->endRow = $endRow ?: $this->subject->getHighestRow();
+
+        return $this;
+    }
+
+    /**
+     * Set the row pointer to the selected row.
+     *
+     * @param int $row The row number to set the current pointer at
+     *
+     * @return $this
+     */
+    public function seek(int $row = 1): static
+    {
+        if (($row < $this->startRow) || ($row > $this->endRow)) {
+            throw new PhpSpreadsheetException("Row $row is out of range ({$this->startRow} - {$this->endRow})");
+        }
+        $this->position = $row;
+
+        return $this;
+    }
+
+    /**
+     * Rewind the iterator to the starting row.
+     */
+    public function rewind(): void
+    {
+        $this->position = $this->startRow;
+    }
+
+    /**
+     * Return the current row in this worksheet.
+     */
+    public function current(): Row
+    {
+        return new Row($this->subject, $this->position);
+    }
+
+    /**
+     * Return the current iterator key.
+     */
+    public function key(): int
+    {
+        return $this->position;
+    }
+
+    /**
+     * Set the iterator to its next value.
+     */
+    public function next(): void
+    {
+        ++$this->position;
+    }
+
+    /**
+     * Set the iterator to its previous value.
+     */
+    public function prev(): void
+    {
+        --$this->position;
+    }
+
+    /**
+     * Indicate if more rows exist in the worksheet range of rows that we're iterating.
+     */
+    public function valid(): bool
+    {
+        return $this->position <= $this->endRow && $this->position >= $this->startRow;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php
new file mode 100644
index 00000000..dca2bf5c
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class SheetView
+{
+    // Sheet View types
+    const SHEETVIEW_NORMAL = 'normal';
+    const SHEETVIEW_PAGE_LAYOUT = 'pageLayout';
+    const SHEETVIEW_PAGE_BREAK_PREVIEW = 'pageBreakPreview';
+
+    private const SHEET_VIEW_TYPES = [
+        self::SHEETVIEW_NORMAL,
+        self::SHEETVIEW_PAGE_LAYOUT,
+        self::SHEETVIEW_PAGE_BREAK_PREVIEW,
+    ];
+
+    /**
+     * ZoomScale.
+     *
+     * Valid values range from 10 to 400.
+     */
+    private ?int $zoomScale = 100;
+
+    /**
+     * ZoomScaleNormal.
+     *
+     * Valid values range from 10 to 400.
+     */
+    private ?int $zoomScaleNormal = 100;
+
+    /**
+     * ZoomScalePageLayoutView.
+     *
+     * Valid values range from 10 to 400.
+     */
+    private int $zoomScalePageLayoutView = 100;
+
+    /**
+     * ZoomScaleSheetLayoutView.
+     *
+     * Valid values range from 10 to 400.
+     */
+    private int $zoomScaleSheetLayoutView = 100;
+
+    /**
+     * ShowZeros.
+     *
+     * If true, "null" values from a calculation will be shown as "0". This is the default Excel behaviour and can be changed
+     * with the advanced worksheet option "Show a zero in cells that have zero value"
+     */
+    private bool $showZeros = true;
+
+    /**
+     * View.
+     *
+     * Valid values range from 10 to 400.
+     */
+    private string $sheetviewType = self::SHEETVIEW_NORMAL;
+
+    /**
+     * Create a new SheetView.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get ZoomScale.
+     */
+    public function getZoomScale(): ?int
+    {
+        return $this->zoomScale;
+    }
+
+    /**
+     * Set ZoomScale.
+     * Valid values range from 10 to 400.
+     *
+     * @return $this
+     */
+    public function setZoomScale(?int $zoomScale): static
+    {
+        // Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
+        // but it is apparently still able to handle any scale >= 1
+        if ($zoomScale === null || $zoomScale >= 1) {
+            $this->zoomScale = $zoomScale;
+        } else {
+            throw new PhpSpreadsheetException('Scale must be greater than or equal to 1.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get ZoomScaleNormal.
+     */
+    public function getZoomScaleNormal(): ?int
+    {
+        return $this->zoomScaleNormal;
+    }
+
+    /**
+     * Set ZoomScale.
+     * Valid values range from 10 to 400.
+     *
+     * @return $this
+     */
+    public function setZoomScaleNormal(?int $zoomScaleNormal): static
+    {
+        if ($zoomScaleNormal === null || $zoomScaleNormal >= 1) {
+            $this->zoomScaleNormal = $zoomScaleNormal;
+        } else {
+            throw new PhpSpreadsheetException('Scale must be greater than or equal to 1.');
+        }
+
+        return $this;
+    }
+
+    public function getZoomScalePageLayoutView(): int
+    {
+        return $this->zoomScalePageLayoutView;
+    }
+
+    public function setZoomScalePageLayoutView(int $zoomScalePageLayoutView): static
+    {
+        if ($zoomScalePageLayoutView >= 1) {
+            $this->zoomScalePageLayoutView = $zoomScalePageLayoutView;
+        } else {
+            throw new PhpSpreadsheetException('Scale must be greater than or equal to 1.');
+        }
+
+        return $this;
+    }
+
+    public function getZoomScaleSheetLayoutView(): int
+    {
+        return $this->zoomScaleSheetLayoutView;
+    }
+
+    public function setZoomScaleSheetLayoutView(int $zoomScaleSheetLayoutView): static
+    {
+        if ($zoomScaleSheetLayoutView >= 1) {
+            $this->zoomScaleSheetLayoutView = $zoomScaleSheetLayoutView;
+        } else {
+            throw new PhpSpreadsheetException('Scale must be greater than or equal to 1.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set ShowZeroes setting.
+     */
+    public function setShowZeros(bool $showZeros): void
+    {
+        $this->showZeros = $showZeros;
+    }
+
+    public function getShowZeros(): bool
+    {
+        return $this->showZeros;
+    }
+
+    /**
+     * Get View.
+     */
+    public function getView(): string
+    {
+        return $this->sheetviewType;
+    }
+
+    /**
+     * Set View.
+     *
+     * Valid values are
+     *        'normal'            self::SHEETVIEW_NORMAL
+     *        'pageLayout'        self::SHEETVIEW_PAGE_LAYOUT
+     *        'pageBreakPreview'  self::SHEETVIEW_PAGE_BREAK_PREVIEW
+     *
+     * @return $this
+     */
+    public function setView(?string $sheetViewType): static
+    {
+        // MS Excel 2007 allows setting the view to 'normal', 'pageLayout' or 'pageBreakPreview' via the user interface
+        if ($sheetViewType === null) {
+            $sheetViewType = self::SHEETVIEW_NORMAL;
+        }
+        if (in_array($sheetViewType, self::SHEET_VIEW_TYPES)) {
+            $this->sheetviewType = $sheetViewType;
+        } else {
+            throw new PhpSpreadsheetException('Invalid sheetview layout type.');
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php
new file mode 100644
index 00000000..234014a0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php
@@ -0,0 +1,579 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
+use Stringable;
+
+class Table implements Stringable
+{
+    /**
+     * Table Name.
+     */
+    private string $name;
+
+    /**
+     * Show Header Row.
+     */
+    private bool $showHeaderRow = true;
+
+    /**
+     * Show Totals Row.
+     */
+    private bool $showTotalsRow = false;
+
+    /**
+     * Table Range.
+     */
+    private string $range = '';
+
+    /**
+     * Table Worksheet.
+     */
+    private ?Worksheet $workSheet = null;
+
+    /**
+     * Table allow filter.
+     */
+    private bool $allowFilter = true;
+
+    /**
+     * Table Column.
+     *
+     * @var Table\Column[]
+     */
+    private array $columns = [];
+
+    /**
+     * Table Style.
+     */
+    private TableStyle $style;
+
+    /**
+     * Table AutoFilter.
+     */
+    private AutoFilter $autoFilter;
+
+    /**
+     * Create a new Table.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
+     *            A simple string containing a Cell range like 'A1:E10' is permitted
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange object.
+     * @param string $name (e.g. Table1)
+     */
+    public function __construct(AddressRange|string|array $range = '', string $name = '')
+    {
+        $this->style = new TableStyle();
+        $this->autoFilter = new AutoFilter($range);
+        $this->setRange($range);
+        $this->setName($name);
+    }
+
+    /**
+     * Code to execute when this table is unset().
+     */
+    public function __destruct()
+    {
+        $this->workSheet = null;
+    }
+
+    /**
+     * Get Table name.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set Table name.
+     *
+     * @throws PhpSpreadsheetException
+     */
+    public function setName(string $name): self
+    {
+        $name = trim($name);
+
+        if (!empty($name)) {
+            if (strlen($name) === 1 && in_array($name, ['C', 'c', 'R', 'r'])) {
+                throw new PhpSpreadsheetException('The table name is invalid');
+            }
+            if (StringHelper::countCharacters($name) > 255) {
+                throw new PhpSpreadsheetException('The table name cannot be longer than 255 characters');
+            }
+            // Check for A1 or R1C1 cell reference notation
+            if (
+                preg_match(Coordinate::A1_COORDINATE_REGEX, $name)
+                || preg_match('/^R\[?\-?[0-9]*\]?C\[?\-?[0-9]*\]?$/i', $name)
+            ) {
+                throw new PhpSpreadsheetException('The table name can\'t be the same as a cell reference');
+            }
+            if (!preg_match('/^[\p{L}_\\\\]/iu', $name)) {
+                throw new PhpSpreadsheetException('The table name must begin a name with a letter, an underscore character (_), or a backslash (\)');
+            }
+            if (!preg_match('/^[\p{L}_\\\\][\p{L}\p{M}0-9\._]+$/iu', $name)) {
+                throw new PhpSpreadsheetException('The table name contains invalid characters');
+            }
+
+            $this->checkForDuplicateTableNames($name, $this->workSheet);
+            $this->updateStructuredReferences($name);
+        }
+
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * @throws PhpSpreadsheetException
+     */
+    private function checkForDuplicateTableNames(string $name, ?Worksheet $worksheet): void
+    {
+        // Remember that table names are case-insensitive
+        $tableName = StringHelper::strToLower($name);
+
+        if ($worksheet !== null && StringHelper::strToLower($this->name) !== $name) {
+            $spreadsheet = $worksheet->getParentOrThrow();
+
+            foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+                foreach ($sheet->getTableCollection() as $table) {
+                    if (StringHelper::strToLower($table->getName()) === $tableName && $table != $this) {
+                        throw new PhpSpreadsheetException("Spreadsheet already contains a table named '{$this->name}'");
+                    }
+                }
+            }
+        }
+    }
+
+    private function updateStructuredReferences(string $name): void
+    {
+        if (!$this->workSheet || !$this->name) {
+            return;
+        }
+
+        // Remember that table names are case-insensitive
+        if (StringHelper::strToLower($this->name) !== StringHelper::strToLower($name)) {
+            // We need to check all formula cells that might contain fully-qualified Structured References
+            //    that refer to this table, and update those formulae to reference the new table name
+            $spreadsheet = $this->workSheet->getParentOrThrow();
+            foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+                $this->updateStructuredReferencesInCells($sheet, $name);
+            }
+            $this->updateStructuredReferencesInNamedFormulae($spreadsheet, $name);
+        }
+    }
+
+    private function updateStructuredReferencesInCells(Worksheet $worksheet, string $newName): void
+    {
+        $pattern = '/' . preg_quote($this->name, '/') . '\[/mui';
+
+        foreach ($worksheet->getCoordinates(false) as $coordinate) {
+            $cell = $worksheet->getCell($coordinate);
+            if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                $formula = $cell->getValueString();
+                if (preg_match($pattern, $formula) === 1) {
+                    $formula = preg_replace($pattern, "{$newName}[", $formula);
+                    $cell->setValueExplicit($formula, DataType::TYPE_FORMULA);
+                }
+            }
+        }
+    }
+
+    private function updateStructuredReferencesInNamedFormulae(Spreadsheet $spreadsheet, string $newName): void
+    {
+        $pattern = '/' . preg_quote($this->name, '/') . '\[/mui';
+
+        foreach ($spreadsheet->getNamedFormulae() as $namedFormula) {
+            $formula = $namedFormula->getValue();
+            if (preg_match($pattern, $formula) === 1) {
+                $formula = preg_replace($pattern, "{$newName}[", $formula) ?? '';
+                $namedFormula->setValue($formula);
+            }
+        }
+    }
+
+    /**
+     * Get show Header Row.
+     */
+    public function getShowHeaderRow(): bool
+    {
+        return $this->showHeaderRow;
+    }
+
+    /**
+     * Set show Header Row.
+     */
+    public function setShowHeaderRow(bool $showHeaderRow): self
+    {
+        $this->showHeaderRow = $showHeaderRow;
+
+        return $this;
+    }
+
+    /**
+     * Get show Totals Row.
+     */
+    public function getShowTotalsRow(): bool
+    {
+        return $this->showTotalsRow;
+    }
+
+    /**
+     * Set show Totals Row.
+     */
+    public function setShowTotalsRow(bool $showTotalsRow): self
+    {
+        $this->showTotalsRow = $showTotalsRow;
+
+        return $this;
+    }
+
+    /**
+     * Get allow filter.
+     * If false, autofiltering is disabled for the table, if true it is enabled.
+     */
+    public function getAllowFilter(): bool
+    {
+        return $this->allowFilter;
+    }
+
+    /**
+     * Set show Autofiltering.
+     * Disabling autofiltering has the same effect as hiding the filter button on all the columns in the table.
+     */
+    public function setAllowFilter(bool $allowFilter): self
+    {
+        $this->allowFilter = $allowFilter;
+
+        return $this;
+    }
+
+    /**
+     * Get Table Range.
+     */
+    public function getRange(): string
+    {
+        return $this->range;
+    }
+
+    /**
+     * Set Table Cell Range.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range
+     *            A simple string containing a Cell range like 'A1:E10' is permitted
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange object.
+     */
+    public function setRange(AddressRange|string|array $range = ''): self
+    {
+        // extract coordinate
+        if ($range !== '') {
+            [, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
+        }
+        if (empty($range)) {
+            //    Discard all column rules
+            $this->columns = [];
+            $this->range = '';
+
+            return $this;
+        }
+
+        if (!str_contains($range, ':')) {
+            throw new PhpSpreadsheetException('Table must be set on a range of cells.');
+        }
+
+        [$width, $height] = Coordinate::rangeDimension($range);
+        if ($width < 1 || $height < 1) {
+            throw new PhpSpreadsheetException('The table range must be at least 1 column and row');
+        }
+
+        $this->range = $range;
+        $this->autoFilter->setRange($range);
+
+        //    Discard any column rules that are no longer valid within this range
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        foreach ($this->columns as $key => $value) {
+            $colIndex = Coordinate::columnIndexFromString($key);
+            if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
+                unset($this->columns[$key]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Table Cell Range to max row.
+     */
+    public function setRangeToMaxRow(): self
+    {
+        if ($this->workSheet !== null) {
+            $thisrange = $this->range;
+            $range = (string) preg_replace('/\\d+$/', (string) $this->workSheet->getHighestRow(), $thisrange);
+            if ($range !== $thisrange) {
+                $this->setRange($range);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Table's Worksheet.
+     */
+    public function getWorksheet(): ?Worksheet
+    {
+        return $this->workSheet;
+    }
+
+    /**
+     * Set Table's Worksheet.
+     */
+    public function setWorksheet(?Worksheet $worksheet = null): self
+    {
+        if ($this->name !== '' && $worksheet !== null) {
+            $spreadsheet = $worksheet->getParentOrThrow();
+            $tableName = StringHelper::strToUpper($this->name);
+
+            foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+                foreach ($sheet->getTableCollection() as $table) {
+                    if (StringHelper::strToUpper($table->getName()) === $tableName) {
+                        throw new PhpSpreadsheetException("Workbook already contains a table named '{$this->name}'");
+                    }
+                }
+            }
+        }
+
+        $this->workSheet = $worksheet;
+        $this->autoFilter->setParent($worksheet);
+
+        return $this;
+    }
+
+    /**
+     * Get all Table Columns.
+     *
+     * @return Table\Column[]
+     */
+    public function getColumns(): array
+    {
+        return $this->columns;
+    }
+
+    /**
+     * Validate that the specified column is in the Table range.
+     *
+     * @param string $column Column name (e.g. A)
+     *
+     * @return int The column offset within the table range
+     */
+    public function isColumnInRange(string $column): int
+    {
+        if (empty($this->range)) {
+            throw new PhpSpreadsheetException('No table range is defined.');
+        }
+
+        $columnIndex = Coordinate::columnIndexFromString($column);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
+            throw new PhpSpreadsheetException('Column is outside of current table range.');
+        }
+
+        return $columnIndex - $rangeStart[0];
+    }
+
+    /**
+     * Get a specified Table Column Offset within the defined Table range.
+     *
+     * @param string $column Column name (e.g. A)
+     *
+     * @return int The offset of the specified column within the table range
+     */
+    public function getColumnOffset(string $column): int
+    {
+        return $this->isColumnInRange($column);
+    }
+
+    /**
+     * Get a specified Table Column.
+     *
+     * @param string $column Column name (e.g. A)
+     */
+    public function getColumn(string $column): Table\Column
+    {
+        $this->isColumnInRange($column);
+
+        if (!isset($this->columns[$column])) {
+            $this->columns[$column] = new Table\Column($column, $this);
+        }
+
+        return $this->columns[$column];
+    }
+
+    /**
+     * Get a specified Table Column by it's offset.
+     *
+     * @param int $columnOffset Column offset within range (starting from 0)
+     */
+    public function getColumnByOffset(int $columnOffset): Table\Column
+    {
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        $pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $columnOffset);
+
+        return $this->getColumn($pColumn);
+    }
+
+    /**
+     * Set Table.
+     *
+     * @param string|Table\Column $columnObjectOrString
+     *            A simple string containing a Column ID like 'A' is permitted
+     */
+    public function setColumn(string|Table\Column $columnObjectOrString): self
+    {
+        if ((is_string($columnObjectOrString)) && (!empty($columnObjectOrString))) {
+            $column = $columnObjectOrString;
+        } elseif (is_object($columnObjectOrString) && ($columnObjectOrString instanceof Table\Column)) {
+            $column = $columnObjectOrString->getColumnIndex();
+        } else {
+            throw new PhpSpreadsheetException('Column is not within the table range.');
+        }
+        $this->isColumnInRange($column);
+
+        if (is_string($columnObjectOrString)) {
+            $this->columns[$columnObjectOrString] = new Table\Column($columnObjectOrString, $this);
+        } else {
+            $columnObjectOrString->setTable($this);
+            $this->columns[$column] = $columnObjectOrString;
+        }
+        ksort($this->columns);
+
+        return $this;
+    }
+
+    /**
+     * Clear a specified Table Column.
+     *
+     * @param string $column Column name (e.g. A)
+     */
+    public function clearColumn(string $column): self
+    {
+        $this->isColumnInRange($column);
+
+        if (isset($this->columns[$column])) {
+            unset($this->columns[$column]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Shift an Table Column Rule to a different column.
+     *
+     * Note: This method bypasses validation of the destination column to ensure it is within this Table range.
+     *        Nor does it verify whether any column rule already exists at $toColumn, but will simply override any existing value.
+     *        Use with caution.
+     *
+     * @param string $fromColumn Column name (e.g. A)
+     * @param string $toColumn Column name (e.g. B)
+     */
+    public function shiftColumn(string $fromColumn, string $toColumn): self
+    {
+        $fromColumn = strtoupper($fromColumn);
+        $toColumn = strtoupper($toColumn);
+
+        if (($fromColumn !== null) && (isset($this->columns[$fromColumn])) && ($toColumn !== null)) {
+            $this->columns[$fromColumn]->setTable();
+            $this->columns[$fromColumn]->setColumnIndex($toColumn);
+            $this->columns[$toColumn] = $this->columns[$fromColumn];
+            $this->columns[$toColumn]->setTable($this);
+            unset($this->columns[$fromColumn]);
+
+            ksort($this->columns);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get table Style.
+     */
+    public function getStyle(): TableStyle
+    {
+        return $this->style;
+    }
+
+    /**
+     * Set table Style.
+     */
+    public function setStyle(TableStyle $style): self
+    {
+        $this->style = $style;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter.
+     */
+    public function getAutoFilter(): AutoFilter
+    {
+        return $this->autoFilter;
+    }
+
+    /**
+     * Set AutoFilter.
+     */
+    public function setAutoFilter(AutoFilter $autoFilter): self
+    {
+        $this->autoFilter = $autoFilter;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                if ($key === 'workSheet') {
+                    //    Detach from worksheet
+                    $this->{$key} = null;
+                } else {
+                    $this->{$key} = clone $value;
+                }
+            } elseif ((is_array($value)) && ($key === 'columns')) {
+                //    The columns array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table objects
+                $this->{$key} = [];
+                foreach ($value as $k => $v) {
+                    $this->{$key}[$k] = clone $v;
+                    // attach the new cloned Column to this new cloned Table object
+                    $this->{$key}[$k]->setTable($this);
+                }
+            } else {
+                $this->{$key} = $value;
+            }
+        }
+    }
+
+    /**
+     * toString method replicates previous behavior by returning the range if object is
+     * referenced as a property of its worksheet.
+     */
+    public function __toString(): string
+    {
+        return (string) $this->range;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php
new file mode 100644
index 00000000..257e3e39
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php
@@ -0,0 +1,240 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet\Table;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Column
+{
+    /**
+     * Table Column Index.
+     */
+    private string $columnIndex;
+
+    /**
+     * Show Filter Button.
+     */
+    private bool $showFilterButton = true;
+
+    /**
+     * Total Row Label.
+     */
+    private ?string $totalsRowLabel = null;
+
+    /**
+     * Total Row Function.
+     */
+    private ?string $totalsRowFunction = null;
+
+    /**
+     * Total Row Formula.
+     */
+    private ?string $totalsRowFormula = null;
+
+    /**
+     * Column Formula.
+     */
+    private ?string $columnFormula = null;
+
+    /**
+     * Table.
+     */
+    private ?Table $table;
+
+    /**
+     * Create a new Column.
+     *
+     * @param string $column Column (e.g. A)
+     * @param ?Table $table Table for this column
+     */
+    public function __construct(string $column, ?Table $table = null)
+    {
+        $this->columnIndex = $column;
+        $this->table = $table;
+    }
+
+    /**
+     * Get Table column index as string eg: 'A'.
+     */
+    public function getColumnIndex(): string
+    {
+        return $this->columnIndex;
+    }
+
+    /**
+     * Set Table column index as string eg: 'A'.
+     *
+     * @param string $column Column (e.g. A)
+     */
+    public function setColumnIndex(string $column): self
+    {
+        // Uppercase coordinate
+        $column = strtoupper($column);
+        if ($this->table !== null) {
+            $this->table->isColumnInRange($column);
+        }
+
+        $this->columnIndex = $column;
+
+        return $this;
+    }
+
+    /**
+     * Get show Filter Button.
+     */
+    public function getShowFilterButton(): bool
+    {
+        return $this->showFilterButton;
+    }
+
+    /**
+     * Set show Filter Button.
+     */
+    public function setShowFilterButton(bool $showFilterButton): self
+    {
+        $this->showFilterButton = $showFilterButton;
+
+        return $this;
+    }
+
+    /**
+     * Get total Row Label.
+     */
+    public function getTotalsRowLabel(): ?string
+    {
+        return $this->totalsRowLabel;
+    }
+
+    /**
+     * Set total Row Label.
+     */
+    public function setTotalsRowLabel(string $totalsRowLabel): self
+    {
+        $this->totalsRowLabel = $totalsRowLabel;
+
+        return $this;
+    }
+
+    /**
+     * Get total Row Function.
+     */
+    public function getTotalsRowFunction(): ?string
+    {
+        return $this->totalsRowFunction;
+    }
+
+    /**
+     * Set total Row Function.
+     */
+    public function setTotalsRowFunction(string $totalsRowFunction): self
+    {
+        $this->totalsRowFunction = $totalsRowFunction;
+
+        return $this;
+    }
+
+    /**
+     * Get total Row Formula.
+     */
+    public function getTotalsRowFormula(): ?string
+    {
+        return $this->totalsRowFormula;
+    }
+
+    /**
+     * Set total Row Formula.
+     */
+    public function setTotalsRowFormula(string $totalsRowFormula): self
+    {
+        $this->totalsRowFormula = $totalsRowFormula;
+
+        return $this;
+    }
+
+    /**
+     * Get column Formula.
+     */
+    public function getColumnFormula(): ?string
+    {
+        return $this->columnFormula;
+    }
+
+    /**
+     * Set column Formula.
+     */
+    public function setColumnFormula(string $columnFormula): self
+    {
+        $this->columnFormula = $columnFormula;
+
+        return $this;
+    }
+
+    /**
+     * Get this Column's Table.
+     */
+    public function getTable(): ?Table
+    {
+        return $this->table;
+    }
+
+    /**
+     * Set this Column's Table.
+     */
+    public function setTable(?Table $table = null): self
+    {
+        $this->table = $table;
+
+        return $this;
+    }
+
+    public static function updateStructuredReferences(?Worksheet $workSheet, ?string $oldTitle, ?string $newTitle): void
+    {
+        if ($workSheet === null || $oldTitle === null || $oldTitle === '' || $newTitle === null) {
+            return;
+        }
+
+        // Remember that table headings are case-insensitive
+        if (StringHelper::strToLower($oldTitle) !== StringHelper::strToLower($newTitle)) {
+            // We need to check all formula cells that might contain Structured References that refer
+            //    to this column, and update those formulae to reference the new column text
+            $spreadsheet = $workSheet->getParentOrThrow();
+            foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+                self::updateStructuredReferencesInCells($sheet, $oldTitle, $newTitle);
+            }
+            self::updateStructuredReferencesInNamedFormulae($spreadsheet, $oldTitle, $newTitle);
+        }
+    }
+
+    private static function updateStructuredReferencesInCells(Worksheet $worksheet, string $oldTitle, string $newTitle): void
+    {
+        $pattern = '/\[(@?)' . preg_quote($oldTitle, '/') . '\]/mui';
+
+        foreach ($worksheet->getCoordinates(false) as $coordinate) {
+            $cell = $worksheet->getCell($coordinate);
+            if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                $formula = $cell->getValueString();
+                if (preg_match($pattern, $formula) === 1) {
+                    $formula = preg_replace($pattern, "[$1{$newTitle}]", $formula);
+                    $cell->setValueExplicit($formula, DataType::TYPE_FORMULA);
+                }
+            }
+        }
+    }
+
+    private static function updateStructuredReferencesInNamedFormulae(Spreadsheet $spreadsheet, string $oldTitle, string $newTitle): void
+    {
+        $pattern = '/\[(@?)' . preg_quote($oldTitle, '/') . '\]/mui';
+
+        foreach ($spreadsheet->getNamedFormulae() as $namedFormula) {
+            $formula = $namedFormula->getValue();
+            if (preg_match($pattern, $formula) === 1) {
+                $formula = preg_replace($pattern, "[$1{$newTitle}]", $formula) ?? '';
+                $namedFormula->setValue($formula);
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php
new file mode 100644
index 00000000..81153027
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php
@@ -0,0 +1,218 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet\Table;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+
+class TableStyle
+{
+    const TABLE_STYLE_NONE = '';
+    const TABLE_STYLE_LIGHT1 = 'TableStyleLight1';
+    const TABLE_STYLE_LIGHT2 = 'TableStyleLight2';
+    const TABLE_STYLE_LIGHT3 = 'TableStyleLight3';
+    const TABLE_STYLE_LIGHT4 = 'TableStyleLight4';
+    const TABLE_STYLE_LIGHT5 = 'TableStyleLight5';
+    const TABLE_STYLE_LIGHT6 = 'TableStyleLight6';
+    const TABLE_STYLE_LIGHT7 = 'TableStyleLight7';
+    const TABLE_STYLE_LIGHT8 = 'TableStyleLight8';
+    const TABLE_STYLE_LIGHT9 = 'TableStyleLight9';
+    const TABLE_STYLE_LIGHT10 = 'TableStyleLight10';
+    const TABLE_STYLE_LIGHT11 = 'TableStyleLight11';
+    const TABLE_STYLE_LIGHT12 = 'TableStyleLight12';
+    const TABLE_STYLE_LIGHT13 = 'TableStyleLight13';
+    const TABLE_STYLE_LIGHT14 = 'TableStyleLight14';
+    const TABLE_STYLE_LIGHT15 = 'TableStyleLight15';
+    const TABLE_STYLE_LIGHT16 = 'TableStyleLight16';
+    const TABLE_STYLE_LIGHT17 = 'TableStyleLight17';
+    const TABLE_STYLE_LIGHT18 = 'TableStyleLight18';
+    const TABLE_STYLE_LIGHT19 = 'TableStyleLight19';
+    const TABLE_STYLE_LIGHT20 = 'TableStyleLight20';
+    const TABLE_STYLE_LIGHT21 = 'TableStyleLight21';
+    const TABLE_STYLE_MEDIUM1 = 'TableStyleMedium1';
+    const TABLE_STYLE_MEDIUM2 = 'TableStyleMedium2';
+    const TABLE_STYLE_MEDIUM3 = 'TableStyleMedium3';
+    const TABLE_STYLE_MEDIUM4 = 'TableStyleMedium4';
+    const TABLE_STYLE_MEDIUM5 = 'TableStyleMedium5';
+    const TABLE_STYLE_MEDIUM6 = 'TableStyleMedium6';
+    const TABLE_STYLE_MEDIUM7 = 'TableStyleMedium7';
+    const TABLE_STYLE_MEDIUM8 = 'TableStyleMedium8';
+    const TABLE_STYLE_MEDIUM9 = 'TableStyleMedium9';
+    const TABLE_STYLE_MEDIUM10 = 'TableStyleMedium10';
+    const TABLE_STYLE_MEDIUM11 = 'TableStyleMedium11';
+    const TABLE_STYLE_MEDIUM12 = 'TableStyleMedium12';
+    const TABLE_STYLE_MEDIUM13 = 'TableStyleMedium13';
+    const TABLE_STYLE_MEDIUM14 = 'TableStyleMedium14';
+    const TABLE_STYLE_MEDIUM15 = 'TableStyleMedium15';
+    const TABLE_STYLE_MEDIUM16 = 'TableStyleMedium16';
+    const TABLE_STYLE_MEDIUM17 = 'TableStyleMedium17';
+    const TABLE_STYLE_MEDIUM18 = 'TableStyleMedium18';
+    const TABLE_STYLE_MEDIUM19 = 'TableStyleMedium19';
+    const TABLE_STYLE_MEDIUM20 = 'TableStyleMedium20';
+    const TABLE_STYLE_MEDIUM21 = 'TableStyleMedium21';
+    const TABLE_STYLE_MEDIUM22 = 'TableStyleMedium22';
+    const TABLE_STYLE_MEDIUM23 = 'TableStyleMedium23';
+    const TABLE_STYLE_MEDIUM24 = 'TableStyleMedium24';
+    const TABLE_STYLE_MEDIUM25 = 'TableStyleMedium25';
+    const TABLE_STYLE_MEDIUM26 = 'TableStyleMedium26';
+    const TABLE_STYLE_MEDIUM27 = 'TableStyleMedium27';
+    const TABLE_STYLE_MEDIUM28 = 'TableStyleMedium28';
+    const TABLE_STYLE_DARK1 = 'TableStyleDark1';
+    const TABLE_STYLE_DARK2 = 'TableStyleDark2';
+    const TABLE_STYLE_DARK3 = 'TableStyleDark3';
+    const TABLE_STYLE_DARK4 = 'TableStyleDark4';
+    const TABLE_STYLE_DARK5 = 'TableStyleDark5';
+    const TABLE_STYLE_DARK6 = 'TableStyleDark6';
+    const TABLE_STYLE_DARK7 = 'TableStyleDark7';
+    const TABLE_STYLE_DARK8 = 'TableStyleDark8';
+    const TABLE_STYLE_DARK9 = 'TableStyleDark9';
+    const TABLE_STYLE_DARK10 = 'TableStyleDark10';
+    const TABLE_STYLE_DARK11 = 'TableStyleDark11';
+
+    /**
+     * Theme.
+     */
+    private string $theme;
+
+    /**
+     * Show First Column.
+     */
+    private bool $showFirstColumn = false;
+
+    /**
+     * Show Last Column.
+     */
+    private bool $showLastColumn = false;
+
+    /**
+     * Show Row Stripes.
+     */
+    private bool $showRowStripes = false;
+
+    /**
+     * Show Column Stripes.
+     */
+    private bool $showColumnStripes = false;
+
+    /**
+     * Table.
+     */
+    private ?Table $table = null;
+
+    /**
+     * Create a new Table Style.
+     *
+     * @param string $theme (e.g. TableStyle::TABLE_STYLE_MEDIUM2)
+     */
+    public function __construct(string $theme = self::TABLE_STYLE_MEDIUM2)
+    {
+        $this->theme = $theme;
+    }
+
+    /**
+     * Get theme.
+     */
+    public function getTheme(): string
+    {
+        return $this->theme;
+    }
+
+    /**
+     * Set theme.
+     */
+    public function setTheme(string $theme): self
+    {
+        $this->theme = $theme;
+
+        return $this;
+    }
+
+    /**
+     * Get show First Column.
+     */
+    public function getShowFirstColumn(): bool
+    {
+        return $this->showFirstColumn;
+    }
+
+    /**
+     * Set show First Column.
+     */
+    public function setShowFirstColumn(bool $showFirstColumn): self
+    {
+        $this->showFirstColumn = $showFirstColumn;
+
+        return $this;
+    }
+
+    /**
+     * Get show Last Column.
+     */
+    public function getShowLastColumn(): bool
+    {
+        return $this->showLastColumn;
+    }
+
+    /**
+     * Set show Last Column.
+     */
+    public function setShowLastColumn(bool $showLastColumn): self
+    {
+        $this->showLastColumn = $showLastColumn;
+
+        return $this;
+    }
+
+    /**
+     * Get show Row Stripes.
+     */
+    public function getShowRowStripes(): bool
+    {
+        return $this->showRowStripes;
+    }
+
+    /**
+     * Set show Row Stripes.
+     */
+    public function setShowRowStripes(bool $showRowStripes): self
+    {
+        $this->showRowStripes = $showRowStripes;
+
+        return $this;
+    }
+
+    /**
+     * Get show Column Stripes.
+     */
+    public function getShowColumnStripes(): bool
+    {
+        return $this->showColumnStripes;
+    }
+
+    /**
+     * Set show Column Stripes.
+     */
+    public function setShowColumnStripes(bool $showColumnStripes): self
+    {
+        $this->showColumnStripes = $showColumnStripes;
+
+        return $this;
+    }
+
+    /**
+     * Get this Style's Table.
+     */
+    public function getTable(): ?Table
+    {
+        return $this->table;
+    }
+
+    /**
+     * Set this Style's Table.
+     */
+    public function setTable(?Table $table = null): self
+    {
+        $this->table = $table;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Validations.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Validations.php
new file mode 100644
index 00000000..99b5eedb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Validations.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\CellRange;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+
+class Validations
+{
+    /**
+     * Validate a cell address.
+     *
+     * @param null|array{0: int, 1: int}|CellAddress|string $cellAddress Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     */
+    public static function validateCellAddress(null|CellAddress|string|array $cellAddress): string
+    {
+        if (is_string($cellAddress)) {
+            [$worksheet, $address] = Worksheet::extractSheetTitle($cellAddress, true);
+//            if (!empty($worksheet) && $worksheet !== $this->getTitle()) {
+//                throw new Exception('Reference is not for this worksheet');
+//            }
+
+            return empty($worksheet) ? strtoupper("$address") : $worksheet . '!' . strtoupper("$address");
+        }
+
+        if (is_array($cellAddress)) {
+            $cellAddress = CellAddress::fromColumnRowArray($cellAddress);
+        }
+
+        return (string) $cellAddress;
+    }
+
+    /**
+     * Validate a cell address or cell range.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12';
+     *               or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
+     *               or as a CellAddress or AddressRange object.
+     */
+    public static function validateCellOrCellRange(AddressRange|CellAddress|int|string|array $cellRange): string
+    {
+        if (is_string($cellRange) || is_numeric($cellRange)) {
+            // Convert a single column reference like 'A' to 'A:A',
+            //    a single row reference like '1' to '1:1'
+            $cellRange = (string) preg_replace('/^([A-Z]+|\d+)$/', '${1}:${1}', (string) $cellRange);
+        } elseif (is_object($cellRange) && $cellRange instanceof CellAddress) {
+            $cellRange = new CellRange($cellRange, $cellRange);
+        }
+
+        return self::validateCellRange($cellRange);
+    }
+
+    private const SETMAXROW = '${1}1:${2}' . AddressRange::MAX_ROW;
+    private const SETMAXCOL = 'A${1}:' . AddressRange::MAX_COLUMN . '${2}';
+
+    /**
+     * Validate a cell range.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $cellRange Coordinate of the cells as a string, eg: 'C5:F12';
+     *               or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
+     *               or as an AddressRange object.
+     */
+    public static function validateCellRange(AddressRange|string|array $cellRange): string
+    {
+        if (is_string($cellRange)) {
+            [$worksheet, $addressRange] = Worksheet::extractSheetTitle($cellRange, true);
+
+            // Convert Column ranges like 'A:C' to 'A1:C1048576'
+            //      or Row ranges like '1:3' to 'A1:XFD3'
+            $addressRange = (string) preg_replace(
+                ['/^([A-Z]+):([A-Z]+)$/i', '/^(\\d+):(\\d+)$/'],
+                [self::SETMAXROW, self::SETMAXCOL],
+                $addressRange ?? ''
+            );
+
+            return empty($worksheet) ? strtoupper($addressRange) : $worksheet . '!' . strtoupper($addressRange);
+        }
+
+        if (is_array($cellRange)) {
+            switch (count($cellRange)) {
+                case 4:
+                    $from = [$cellRange[0], $cellRange[1]];
+                    $to = [$cellRange[2], $cellRange[3]];
+
+                    break;
+                case 2:
+                    $from = [$cellRange[0], $cellRange[1]];
+                    $to = [$cellRange[0], $cellRange[1]];
+
+                    break;
+                default:
+                    throw new SpreadsheetException('CellRange array length must be 2 or 4');
+            }
+            $cellRange = new CellRange(CellAddress::fromColumnRowArray($from), CellAddress::fromColumnRowArray($to));
+        }
+
+        return (string) $cellRange;
+    }
+
+    public static function definedNameToCoordinate(string $coordinate, Worksheet $worksheet): string
+    {
+        // Uppercase coordinate
+        $coordinate = strtoupper($coordinate);
+        // Eliminate leading equal sign
+        $testCoordinate = (string) preg_replace('/^=/', '', $coordinate);
+        $defined = $worksheet->getParentOrThrow()->getDefinedName($testCoordinate, $worksheet);
+        if ($defined !== null) {
+            if ($defined->getWorksheet() === $worksheet && !$defined->isFormula()) {
+                $coordinate = (string) preg_replace('/^=/', '', $defined->getValue());
+            }
+        }
+
+        return $coordinate;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php
new file mode 100644
index 00000000..7afa82b5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -0,0 +1,3693 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use ArrayObject;
+use Generator;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
+use PhpOffice\PhpSpreadsheet\Cell\IValueBinder;
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Collection\Cells;
+use PhpOffice\PhpSpreadsheet\Collection\CellsFactory;
+use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\IComparable;
+use PhpOffice\PhpSpreadsheet\ReferenceHelper;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Protection as StyleProtection;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+class Worksheet implements IComparable
+{
+    // Break types
+    public const BREAK_NONE = 0;
+    public const BREAK_ROW = 1;
+    public const BREAK_COLUMN = 2;
+    // Maximum column for row break
+    public const BREAK_ROW_MAX_COLUMN = 16383;
+
+    // Sheet state
+    public const SHEETSTATE_VISIBLE = 'visible';
+    public const SHEETSTATE_HIDDEN = 'hidden';
+    public const SHEETSTATE_VERYHIDDEN = 'veryHidden';
+
+    public const MERGE_CELL_CONTENT_EMPTY = 'empty';
+    public const MERGE_CELL_CONTENT_HIDE = 'hide';
+    public const MERGE_CELL_CONTENT_MERGE = 'merge';
+
+    protected const SHEET_NAME_REQUIRES_NO_QUOTES = '/^[_\p{L}][_\p{L}\p{N}]*$/mui';
+
+    /**
+     * Maximum 31 characters allowed for sheet title.
+     *
+     * @var int
+     */
+    const SHEET_TITLE_MAXIMUM_LENGTH = 31;
+
+    /**
+     * Invalid characters in sheet title.
+     */
+    private static array $invalidCharacters = ['*', ':', '/', '\\', '?', '[', ']'];
+
+    /**
+     * Parent spreadsheet.
+     */
+    private ?Spreadsheet $parent = null;
+
+    /**
+     * Collection of cells.
+     */
+    private Cells $cellCollection;
+
+    private bool $cellCollectionInitialized = true;
+
+    /**
+     * Collection of row dimensions.
+     *
+     * @var RowDimension[]
+     */
+    private array $rowDimensions = [];
+
+    /**
+     * Default row dimension.
+     */
+    private RowDimension $defaultRowDimension;
+
+    /**
+     * Collection of column dimensions.
+     *
+     * @var ColumnDimension[]
+     */
+    private array $columnDimensions = [];
+
+    /**
+     * Default column dimension.
+     */
+    private ColumnDimension $defaultColumnDimension;
+
+    /**
+     * Collection of drawings.
+     *
+     * @var ArrayObject<int, BaseDrawing>
+     */
+    private ArrayObject $drawingCollection;
+
+    /**
+     * Collection of Chart objects.
+     *
+     * @var ArrayObject<int, Chart>
+     */
+    private ArrayObject $chartCollection;
+
+    /**
+     * Collection of Table objects.
+     *
+     * @var ArrayObject<int, Table>
+     */
+    private ArrayObject $tableCollection;
+
+    /**
+     * Worksheet title.
+     */
+    private string $title = '';
+
+    /**
+     * Sheet state.
+     */
+    private string $sheetState;
+
+    /**
+     * Page setup.
+     */
+    private PageSetup $pageSetup;
+
+    /**
+     * Page margins.
+     */
+    private PageMargins $pageMargins;
+
+    /**
+     * Page header/footer.
+     */
+    private HeaderFooter $headerFooter;
+
+    /**
+     * Sheet view.
+     */
+    private SheetView $sheetView;
+
+    /**
+     * Protection.
+     */
+    private Protection $protection;
+
+    /**
+     * Collection of styles.
+     *
+     * @var Style[]
+     */
+    private array $styles = [];
+
+    /**
+     * Conditional styles. Indexed by cell coordinate, e.g. 'A1'.
+     */
+    private array $conditionalStylesCollection = [];
+
+    /**
+     * Collection of row breaks.
+     *
+     * @var PageBreak[]
+     */
+    private array $rowBreaks = [];
+
+    /**
+     * Collection of column breaks.
+     *
+     * @var PageBreak[]
+     */
+    private array $columnBreaks = [];
+
+    /**
+     * Collection of merged cell ranges.
+     *
+     * @var string[]
+     */
+    private array $mergeCells = [];
+
+    /**
+     * Collection of protected cell ranges.
+     *
+     * @var ProtectedRange[]
+     */
+    private array $protectedCells = [];
+
+    /**
+     * Autofilter Range and selection.
+     */
+    private AutoFilter $autoFilter;
+
+    /**
+     * Freeze pane.
+     */
+    private ?string $freezePane = null;
+
+    /**
+     * Default position of the right bottom pane.
+     */
+    private ?string $topLeftCell = null;
+
+    private string $paneTopLeftCell = '';
+
+    private string $activePane = '';
+
+    private int $xSplit = 0;
+
+    private int $ySplit = 0;
+
+    private string $paneState = '';
+
+    /**
+     * Properties of the 4 panes.
+     *
+     * @var (null|Pane)[]
+     */
+    private array $panes = [
+        'bottomRight' => null,
+        'bottomLeft' => null,
+        'topRight' => null,
+        'topLeft' => null,
+    ];
+
+    /**
+     * Show gridlines?
+     */
+    private bool $showGridlines = true;
+
+    /**
+     * Print gridlines?
+     */
+    private bool $printGridlines = false;
+
+    /**
+     * Show row and column headers?
+     */
+    private bool $showRowColHeaders = true;
+
+    /**
+     * Show summary below? (Row/Column outline).
+     */
+    private bool $showSummaryBelow = true;
+
+    /**
+     * Show summary right? (Row/Column outline).
+     */
+    private bool $showSummaryRight = true;
+
+    /**
+     * Collection of comments.
+     *
+     * @var Comment[]
+     */
+    private array $comments = [];
+
+    /**
+     * Active cell. (Only one!).
+     */
+    private string $activeCell = 'A1';
+
+    /**
+     * Selected cells.
+     */
+    private string $selectedCells = 'A1';
+
+    /**
+     * Cached highest column.
+     */
+    private int $cachedHighestColumn = 1;
+
+    /**
+     * Cached highest row.
+     */
+    private int $cachedHighestRow = 1;
+
+    /**
+     * Right-to-left?
+     */
+    private bool $rightToLeft = false;
+
+    /**
+     * Hyperlinks. Indexed by cell coordinate, e.g. 'A1'.
+     */
+    private array $hyperlinkCollection = [];
+
+    /**
+     * Data validation objects. Indexed by cell coordinate, e.g. 'A1'.
+     */
+    private array $dataValidationCollection = [];
+
+    /**
+     * Tab color.
+     */
+    private ?Color $tabColor = null;
+
+    /**
+     * Dirty flag.
+     */
+    private bool $dirty = true;
+
+    /**
+     * Hash.
+     */
+    private string $hash;
+
+    /**
+     * CodeName.
+     */
+    private ?string $codeName = null;
+
+    /**
+     * Create a new worksheet.
+     */
+    public function __construct(?Spreadsheet $parent = null, string $title = 'Worksheet')
+    {
+        // Set parent and title
+        $this->parent = $parent;
+        $this->setTitle($title, false);
+        // setTitle can change $pTitle
+        $this->setCodeName($this->getTitle());
+        $this->setSheetState(self::SHEETSTATE_VISIBLE);
+
+        $this->cellCollection = CellsFactory::getInstance($this);
+        // Set page setup
+        $this->pageSetup = new PageSetup();
+        // Set page margins
+        $this->pageMargins = new PageMargins();
+        // Set page header/footer
+        $this->headerFooter = new HeaderFooter();
+        // Set sheet view
+        $this->sheetView = new SheetView();
+        // Drawing collection
+        $this->drawingCollection = new ArrayObject();
+        // Chart collection
+        $this->chartCollection = new ArrayObject();
+        // Protection
+        $this->protection = new Protection();
+        // Default row dimension
+        $this->defaultRowDimension = new RowDimension(null);
+        // Default column dimension
+        $this->defaultColumnDimension = new ColumnDimension(null);
+        // AutoFilter
+        $this->autoFilter = new AutoFilter('', $this);
+        // Table collection
+        $this->tableCollection = new ArrayObject();
+    }
+
+    /**
+     * Disconnect all cells from this Worksheet object,
+     * typically so that the worksheet object can be unset.
+     */
+    public function disconnectCells(): void
+    {
+        if ($this->cellCollectionInitialized) {
+            $this->cellCollection->unsetWorksheetCells();
+            unset($this->cellCollection);
+            $this->cellCollectionInitialized = false;
+        }
+        //    detach ourself from the workbook, so that it can then delete this worksheet successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Code to execute when this worksheet is unset().
+     */
+    public function __destruct()
+    {
+        Calculation::getInstance($this->parent)->clearCalculationCacheForWorksheet($this->title);
+
+        $this->disconnectCells();
+        unset($this->rowDimensions, $this->columnDimensions, $this->tableCollection, $this->drawingCollection, $this->chartCollection, $this->autoFilter);
+    }
+
+    /**
+     * Return the cell collection.
+     */
+    public function getCellCollection(): Cells
+    {
+        return $this->cellCollection;
+    }
+
+    /**
+     * Get array of invalid characters for sheet title.
+     */
+    public static function getInvalidCharacters(): array
+    {
+        return self::$invalidCharacters;
+    }
+
+    /**
+     * Check sheet code name for valid Excel syntax.
+     *
+     * @param string $sheetCodeName The string to check
+     *
+     * @return string The valid string
+     */
+    private static function checkSheetCodeName(string $sheetCodeName): string
+    {
+        $charCount = Shared\StringHelper::countCharacters($sheetCodeName);
+        if ($charCount == 0) {
+            throw new Exception('Sheet code name cannot be empty.');
+        }
+        // Some of the printable ASCII characters are invalid:  * : / \ ? [ ] and  first and last characters cannot be a "'"
+        if (
+            (str_replace(self::$invalidCharacters, '', $sheetCodeName) !== $sheetCodeName)
+            || (Shared\StringHelper::substring($sheetCodeName, -1, 1) == '\'')
+            || (Shared\StringHelper::substring($sheetCodeName, 0, 1) == '\'')
+        ) {
+            throw new Exception('Invalid character found in sheet code name');
+        }
+
+        // Enforce maximum characters allowed for sheet title
+        if ($charCount > self::SHEET_TITLE_MAXIMUM_LENGTH) {
+            throw new Exception('Maximum ' . self::SHEET_TITLE_MAXIMUM_LENGTH . ' characters allowed in sheet code name.');
+        }
+
+        return $sheetCodeName;
+    }
+
+    /**
+     * Check sheet title for valid Excel syntax.
+     *
+     * @param string $sheetTitle The string to check
+     *
+     * @return string The valid string
+     */
+    private static function checkSheetTitle(string $sheetTitle): string
+    {
+        // Some of the printable ASCII characters are invalid:  * : / \ ? [ ]
+        if (str_replace(self::$invalidCharacters, '', $sheetTitle) !== $sheetTitle) {
+            throw new Exception('Invalid character found in sheet title');
+        }
+
+        // Enforce maximum characters allowed for sheet title
+        if (Shared\StringHelper::countCharacters($sheetTitle) > self::SHEET_TITLE_MAXIMUM_LENGTH) {
+            throw new Exception('Maximum ' . self::SHEET_TITLE_MAXIMUM_LENGTH . ' characters allowed in sheet title.');
+        }
+
+        return $sheetTitle;
+    }
+
+    /**
+     * Get a sorted list of all cell coordinates currently held in the collection by row and column.
+     *
+     * @param bool $sorted Also sort the cell collection?
+     *
+     * @return string[]
+     */
+    public function getCoordinates(bool $sorted = true): array
+    {
+        if ($this->cellCollectionInitialized === false) {
+            return [];
+        }
+
+        if ($sorted) {
+            return $this->cellCollection->getSortedCoordinates();
+        }
+
+        return $this->cellCollection->getCoordinates();
+    }
+
+    /**
+     * Get collection of row dimensions.
+     *
+     * @return RowDimension[]
+     */
+    public function getRowDimensions(): array
+    {
+        return $this->rowDimensions;
+    }
+
+    /**
+     * Get default row dimension.
+     */
+    public function getDefaultRowDimension(): RowDimension
+    {
+        return $this->defaultRowDimension;
+    }
+
+    /**
+     * Get collection of column dimensions.
+     *
+     * @return ColumnDimension[]
+     */
+    public function getColumnDimensions(): array
+    {
+        /** @var callable $callable */
+        $callable = [self::class, 'columnDimensionCompare'];
+        uasort($this->columnDimensions, $callable);
+
+        return $this->columnDimensions;
+    }
+
+    private static function columnDimensionCompare(ColumnDimension $a, ColumnDimension $b): int
+    {
+        return $a->getColumnNumeric() - $b->getColumnNumeric();
+    }
+
+    /**
+     * Get default column dimension.
+     */
+    public function getDefaultColumnDimension(): ColumnDimension
+    {
+        return $this->defaultColumnDimension;
+    }
+
+    /**
+     * Get collection of drawings.
+     *
+     * @return ArrayObject<int, BaseDrawing>
+     */
+    public function getDrawingCollection(): ArrayObject
+    {
+        return $this->drawingCollection;
+    }
+
+    /**
+     * Get collection of charts.
+     *
+     * @return ArrayObject<int, Chart>
+     */
+    public function getChartCollection(): ArrayObject
+    {
+        return $this->chartCollection;
+    }
+
+    public function addChart(Chart $chart): Chart
+    {
+        $chart->setWorksheet($this);
+        $this->chartCollection[] = $chart;
+
+        return $chart;
+    }
+
+    /**
+     * Return the count of charts on this worksheet.
+     *
+     * @return int The number of charts
+     */
+    public function getChartCount(): int
+    {
+        return count($this->chartCollection);
+    }
+
+    /**
+     * Get a chart by its index position.
+     *
+     * @param ?string $index Chart index position
+     *
+     * @return Chart|false
+     */
+    public function getChartByIndex(?string $index)
+    {
+        $chartCount = count($this->chartCollection);
+        if ($chartCount == 0) {
+            return false;
+        }
+        if ($index === null) {
+            $index = --$chartCount;
+        }
+        if (!isset($this->chartCollection[$index])) {
+            return false;
+        }
+
+        return $this->chartCollection[$index];
+    }
+
+    /**
+     * Return an array of the names of charts on this worksheet.
+     *
+     * @return string[] The names of charts
+     */
+    public function getChartNames(): array
+    {
+        $chartNames = [];
+        foreach ($this->chartCollection as $chart) {
+            $chartNames[] = $chart->getName();
+        }
+
+        return $chartNames;
+    }
+
+    /**
+     * Get a chart by name.
+     *
+     * @param string $chartName Chart name
+     *
+     * @return Chart|false
+     */
+    public function getChartByName(string $chartName)
+    {
+        foreach ($this->chartCollection as $index => $chart) {
+            if ($chart->getName() == $chartName) {
+                return $chart;
+            }
+        }
+
+        return false;
+    }
+
+    public function getChartByNameOrThrow(string $chartName): Chart
+    {
+        $chart = $this->getChartByName($chartName);
+        if ($chart !== false) {
+            return $chart;
+        }
+
+        throw new Exception("Sheet does not have a chart named $chartName.");
+    }
+
+    /**
+     * Refresh column dimensions.
+     *
+     * @return $this
+     */
+    public function refreshColumnDimensions(): static
+    {
+        $newColumnDimensions = [];
+        foreach ($this->getColumnDimensions() as $objColumnDimension) {
+            $newColumnDimensions[$objColumnDimension->getColumnIndex()] = $objColumnDimension;
+        }
+
+        $this->columnDimensions = $newColumnDimensions;
+
+        return $this;
+    }
+
+    /**
+     * Refresh row dimensions.
+     *
+     * @return $this
+     */
+    public function refreshRowDimensions(): static
+    {
+        $newRowDimensions = [];
+        foreach ($this->getRowDimensions() as $objRowDimension) {
+            $newRowDimensions[$objRowDimension->getRowIndex()] = $objRowDimension;
+        }
+
+        $this->rowDimensions = $newRowDimensions;
+
+        return $this;
+    }
+
+    /**
+     * Calculate worksheet dimension.
+     *
+     * @return string String containing the dimension of this worksheet
+     */
+    public function calculateWorksheetDimension(): string
+    {
+        // Return
+        return 'A1:' . $this->getHighestColumn() . $this->getHighestRow();
+    }
+
+    /**
+     * Calculate worksheet data dimension.
+     *
+     * @return string String containing the dimension of this worksheet that actually contain data
+     */
+    public function calculateWorksheetDataDimension(): string
+    {
+        // Return
+        return 'A1:' . $this->getHighestDataColumn() . $this->getHighestDataRow();
+    }
+
+    /**
+     * Calculate widths for auto-size columns.
+     *
+     * @return $this
+     */
+    public function calculateColumnWidths(): static
+    {
+        // initialize $autoSizes array
+        $autoSizes = [];
+        foreach ($this->getColumnDimensions() as $colDimension) {
+            if ($colDimension->getAutoSize()) {
+                $autoSizes[$colDimension->getColumnIndex()] = -1;
+            }
+        }
+
+        // There is only something to do if there are some auto-size columns
+        if (!empty($autoSizes)) {
+            $holdActivePane = $this->activePane;
+            // build list of cells references that participate in a merge
+            $isMergeCell = [];
+            foreach ($this->getMergeCells() as $cells) {
+                foreach (Coordinate::extractAllCellReferencesInRange($cells) as $cellReference) {
+                    $isMergeCell[$cellReference] = true;
+                }
+            }
+
+            $autoFilterIndentRanges = (new AutoFit($this))->getAutoFilterIndentRanges();
+
+            // loop through all cells in the worksheet
+            foreach ($this->getCoordinates(false) as $coordinate) {
+                $cell = $this->getCellOrNull($coordinate);
+
+                if ($cell !== null && isset($autoSizes[$this->cellCollection->getCurrentColumn()])) {
+                    //Determine if cell is in merge range
+                    $isMerged = isset($isMergeCell[$this->cellCollection->getCurrentCoordinate()]);
+
+                    //By default merged cells should be ignored
+                    $isMergedButProceed = false;
+
+                    //The only exception is if it's a merge range value cell of a 'vertical' range (1 column wide)
+                    if ($isMerged && $cell->isMergeRangeValueCell()) {
+                        $range = (string) $cell->getMergeRange();
+                        $rangeBoundaries = Coordinate::rangeDimension($range);
+                        if ($rangeBoundaries[0] === 1) {
+                            $isMergedButProceed = true;
+                        }
+                    }
+
+                    // Determine width if cell is not part of a merge or does and is a value cell of 1-column wide range
+                    if (!$isMerged || $isMergedButProceed) {
+                        // Determine if we need to make an adjustment for the first row in an AutoFilter range that
+                        //    has a column filter dropdown
+                        $filterAdjustment = false;
+                        if (!empty($autoFilterIndentRanges)) {
+                            foreach ($autoFilterIndentRanges as $autoFilterFirstRowRange) {
+                                if ($cell->isInRange($autoFilterFirstRowRange)) {
+                                    $filterAdjustment = true;
+
+                                    break;
+                                }
+                            }
+                        }
+
+                        $indentAdjustment = $cell->getStyle()->getAlignment()->getIndent();
+                        $indentAdjustment += (int) ($cell->getStyle()->getAlignment()->getHorizontal() === Alignment::HORIZONTAL_CENTER);
+
+                        // Calculated value
+                        // To formatted string
+                        $cellValue = NumberFormat::toFormattedString(
+                            $cell->getCalculatedValueString(),
+                            (string) $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())
+                                ->getNumberFormat()->getFormatCode(true)
+                        );
+
+                        if ($cellValue !== null && $cellValue !== '') {
+                            $autoSizes[$this->cellCollection->getCurrentColumn()] = max(
+                                $autoSizes[$this->cellCollection->getCurrentColumn()],
+                                round(
+                                    Shared\Font::calculateColumnWidth(
+                                        $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont(),
+                                        $cellValue,
+                                        (int) $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())
+                                            ->getAlignment()->getTextRotation(),
+                                        $this->getParentOrThrow()->getDefaultStyle()->getFont(),
+                                        $filterAdjustment,
+                                        $indentAdjustment
+                                    ),
+                                    3
+                                )
+                            );
+                        }
+                    }
+                }
+            }
+
+            // adjust column widths
+            foreach ($autoSizes as $columnIndex => $width) {
+                if ($width == -1) {
+                    $width = $this->getDefaultColumnDimension()->getWidth();
+                }
+                $this->getColumnDimension($columnIndex)->setWidth($width);
+            }
+            $this->activePane = $holdActivePane;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get parent or null.
+     */
+    public function getParent(): ?Spreadsheet
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Get parent, throw exception if null.
+     */
+    public function getParentOrThrow(): Spreadsheet
+    {
+        if ($this->parent !== null) {
+            return $this->parent;
+        }
+
+        throw new Exception('Sheet does not have a parent.');
+    }
+
+    /**
+     * Re-bind parent.
+     *
+     * @return $this
+     */
+    public function rebindParent(Spreadsheet $parent): static
+    {
+        if ($this->parent !== null) {
+            $definedNames = $this->parent->getDefinedNames();
+            foreach ($definedNames as $definedName) {
+                $parent->addDefinedName($definedName);
+            }
+
+            $this->parent->removeSheetByIndex(
+                $this->parent->getIndex($this)
+            );
+        }
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Get title.
+     */
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * Set title.
+     *
+     * @param string $title String containing the dimension of this worksheet
+     * @param bool $updateFormulaCellReferences Flag indicating whether cell references in formulae should
+     *            be updated to reflect the new sheet name.
+     *          This should be left as the default true, unless you are
+     *          certain that no formula cells on any worksheet contain
+     *          references to this worksheet
+     * @param bool $validate False to skip validation of new title. WARNING: This should only be set
+     *                       at parse time (by Readers), where titles can be assumed to be valid.
+     *
+     * @return $this
+     */
+    public function setTitle(string $title, bool $updateFormulaCellReferences = true, bool $validate = true): static
+    {
+        // Is this a 'rename' or not?
+        if ($this->getTitle() == $title) {
+            return $this;
+        }
+
+        // Old title
+        $oldTitle = $this->getTitle();
+
+        if ($validate) {
+            // Syntax check
+            self::checkSheetTitle($title);
+
+            if ($this->parent) {
+                // Is there already such sheet name?
+                if ($this->parent->sheetNameExists($title)) {
+                    // Use name, but append with lowest possible integer
+
+                    if (Shared\StringHelper::countCharacters($title) > 29) {
+                        $title = Shared\StringHelper::substring($title, 0, 29);
+                    }
+                    $i = 1;
+                    while ($this->parent->sheetNameExists($title . ' ' . $i)) {
+                        ++$i;
+                        if ($i == 10) {
+                            if (Shared\StringHelper::countCharacters($title) > 28) {
+                                $title = Shared\StringHelper::substring($title, 0, 28);
+                            }
+                        } elseif ($i == 100) {
+                            if (Shared\StringHelper::countCharacters($title) > 27) {
+                                $title = Shared\StringHelper::substring($title, 0, 27);
+                            }
+                        }
+                    }
+
+                    $title .= " $i";
+                }
+            }
+        }
+
+        // Set title
+        $this->title = $title;
+        $this->dirty = true;
+
+        if ($this->parent && $this->parent->getCalculationEngine()) {
+            // New title
+            $newTitle = $this->getTitle();
+            $this->parent->getCalculationEngine()
+                ->renameCalculationCacheForWorksheet($oldTitle, $newTitle);
+            if ($updateFormulaCellReferences) {
+                ReferenceHelper::getInstance()->updateNamedFormulae($this->parent, $oldTitle, $newTitle);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get sheet state.
+     *
+     * @return string Sheet state (visible, hidden, veryHidden)
+     */
+    public function getSheetState(): string
+    {
+        return $this->sheetState;
+    }
+
+    /**
+     * Set sheet state.
+     *
+     * @param string $value Sheet state (visible, hidden, veryHidden)
+     *
+     * @return $this
+     */
+    public function setSheetState(string $value): static
+    {
+        $this->sheetState = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get page setup.
+     */
+    public function getPageSetup(): PageSetup
+    {
+        return $this->pageSetup;
+    }
+
+    /**
+     * Set page setup.
+     *
+     * @return $this
+     */
+    public function setPageSetup(PageSetup $pageSetup): static
+    {
+        $this->pageSetup = $pageSetup;
+
+        return $this;
+    }
+
+    /**
+     * Get page margins.
+     */
+    public function getPageMargins(): PageMargins
+    {
+        return $this->pageMargins;
+    }
+
+    /**
+     * Set page margins.
+     *
+     * @return $this
+     */
+    public function setPageMargins(PageMargins $pageMargins): static
+    {
+        $this->pageMargins = $pageMargins;
+
+        return $this;
+    }
+
+    /**
+     * Get page header/footer.
+     */
+    public function getHeaderFooter(): HeaderFooter
+    {
+        return $this->headerFooter;
+    }
+
+    /**
+     * Set page header/footer.
+     *
+     * @return $this
+     */
+    public function setHeaderFooter(HeaderFooter $headerFooter): static
+    {
+        $this->headerFooter = $headerFooter;
+
+        return $this;
+    }
+
+    /**
+     * Get sheet view.
+     */
+    public function getSheetView(): SheetView
+    {
+        return $this->sheetView;
+    }
+
+    /**
+     * Set sheet view.
+     *
+     * @return $this
+     */
+    public function setSheetView(SheetView $sheetView): static
+    {
+        $this->sheetView = $sheetView;
+
+        return $this;
+    }
+
+    /**
+     * Get Protection.
+     */
+    public function getProtection(): Protection
+    {
+        return $this->protection;
+    }
+
+    /**
+     * Set Protection.
+     *
+     * @return $this
+     */
+    public function setProtection(Protection $protection): static
+    {
+        $this->protection = $protection;
+        $this->dirty = true;
+
+        return $this;
+    }
+
+    /**
+     * Get highest worksheet column.
+     *
+     * @param null|int|string $row Return the data highest column for the specified row,
+     *                                     or the highest column of any row if no row number is passed
+     *
+     * @return string Highest column name
+     */
+    public function getHighestColumn($row = null): string
+    {
+        if ($row === null) {
+            return Coordinate::stringFromColumnIndex($this->cachedHighestColumn);
+        }
+
+        return $this->getHighestDataColumn($row);
+    }
+
+    /**
+     * Get highest worksheet column that contains data.
+     *
+     * @param null|int|string $row Return the highest data column for the specified row,
+     *                                     or the highest data column of any row if no row number is passed
+     *
+     * @return string Highest column name that contains data
+     */
+    public function getHighestDataColumn($row = null): string
+    {
+        return $this->cellCollection->getHighestColumn($row);
+    }
+
+    /**
+     * Get highest worksheet row.
+     *
+     * @param null|string $column Return the highest data row for the specified column,
+     *                                     or the highest row of any column if no column letter is passed
+     *
+     * @return int Highest row number
+     */
+    public function getHighestRow(?string $column = null): int
+    {
+        if ($column === null) {
+            return $this->cachedHighestRow;
+        }
+
+        return $this->getHighestDataRow($column);
+    }
+
+    /**
+     * Get highest worksheet row that contains data.
+     *
+     * @param null|string $column Return the highest data row for the specified column,
+     *                                     or the highest data row of any column if no column letter is passed
+     *
+     * @return int Highest row number that contains data
+     */
+    public function getHighestDataRow(?string $column = null): int
+    {
+        return $this->cellCollection->getHighestRow($column);
+    }
+
+    /**
+     * Get highest worksheet column and highest row that have cell records.
+     *
+     * @return array Highest column name and highest row number
+     */
+    public function getHighestRowAndColumn(): array
+    {
+        return $this->cellCollection->getHighestRowAndColumn();
+    }
+
+    /**
+     * Set a cell value.
+     *
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @param mixed $value Value for the cell
+     * @param null|IValueBinder $binder Value Binder to override the currently set Value Binder
+     *
+     * @return $this
+     */
+    public function setCellValue(CellAddress|string|array $coordinate, mixed $value, ?IValueBinder $binder = null): static
+    {
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+        $this->getCell($cellAddress)->setValue($value, $binder);
+
+        return $this;
+    }
+
+    /**
+     * Set a cell value.
+     *
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @param mixed $value Value of the cell
+     * @param string $dataType Explicit data type, see DataType::TYPE_*
+     *        Note that PhpSpreadsheet does not validate that the value and datatype are consistent, in using this
+     *             method, then it is your responsibility as an end-user developer to validate that the value and
+     *             the datatype match.
+     *       If you do mismatch value and datatpe, then the value you enter may be changed to match the datatype
+     *          that you specify.
+     *
+     * @see DataType
+     *
+     * @return $this
+     */
+    public function setCellValueExplicit(CellAddress|string|array $coordinate, mixed $value, string $dataType): static
+    {
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+        $this->getCell($cellAddress)->setValueExplicit($value, $dataType);
+
+        return $this;
+    }
+
+    /**
+     * Get cell at a specific coordinate.
+     *
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
+     * @return Cell Cell that was found or created
+     *              WARNING: Because the cell collection can be cached to reduce memory, it only allows one
+     *              "active" cell at a time in memory. If you assign that cell to a variable, then select
+     *              another cell using getCell() or any of its variants, the newly selected cell becomes
+     *              the "active" cell, and any previous assignment becomes a disconnected reference because
+     *              the active cell has changed.
+     */
+    public function getCell(CellAddress|string|array $coordinate): Cell
+    {
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+
+        // Shortcut for increased performance for the vast majority of simple cases
+        if ($this->cellCollection->has($cellAddress)) {
+            /** @var Cell $cell */
+            $cell = $this->cellCollection->get($cellAddress);
+
+            return $cell;
+        }
+
+        /** @var Worksheet $sheet */
+        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
+        $cell = $sheet->getCellCollection()->get($finalCoordinate);
+
+        return $cell ?? $sheet->createNewCell($finalCoordinate);
+    }
+
+    /**
+     * Get the correct Worksheet and coordinate from a coordinate that may
+     * contains reference to another sheet or a named range.
+     *
+     * @return array{0: Worksheet, 1: string}
+     */
+    private function getWorksheetAndCoordinate(string $coordinate): array
+    {
+        $sheet = null;
+        $finalCoordinate = null;
+
+        // Worksheet reference?
+        if (str_contains($coordinate, '!')) {
+            $worksheetReference = self::extractSheetTitle($coordinate, true);
+
+            $sheet = $this->getParentOrThrow()->getSheetByName($worksheetReference[0]);
+            $finalCoordinate = strtoupper($worksheetReference[1]);
+
+            if ($sheet === null) {
+                throw new Exception('Sheet not found for name: ' . $worksheetReference[0]);
+            }
+        } elseif (
+            !preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $coordinate)
+            && preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/iu', $coordinate)
+        ) {
+            // Named range?
+            $namedRange = $this->validateNamedRange($coordinate, true);
+            if ($namedRange !== null) {
+                $sheet = $namedRange->getWorksheet();
+                if ($sheet === null) {
+                    throw new Exception('Sheet not found for named range: ' . $namedRange->getName());
+                }
+
+                /** @phpstan-ignore-next-line */
+                $cellCoordinate = ltrim(substr($namedRange->getValue(), strrpos($namedRange->getValue(), '!')), '!');
+                $finalCoordinate = str_replace('$', '', $cellCoordinate);
+            }
+        }
+
+        if ($sheet === null || $finalCoordinate === null) {
+            $sheet = $this;
+            $finalCoordinate = strtoupper($coordinate);
+        }
+
+        if (Coordinate::coordinateIsRange($finalCoordinate)) {
+            throw new Exception('Cell coordinate string can not be a range of cells.');
+        } elseif (str_contains($finalCoordinate, '$')) {
+            throw new Exception('Cell coordinate must not be absolute.');
+        }
+
+        return [$sheet, $finalCoordinate];
+    }
+
+    /**
+     * Get an existing cell at a specific coordinate, or null.
+     *
+     * @param string $coordinate Coordinate of the cell, eg: 'A1'
+     *
+     * @return null|Cell Cell that was found or null
+     */
+    private function getCellOrNull(string $coordinate): ?Cell
+    {
+        // Check cell collection
+        if ($this->cellCollection->has($coordinate)) {
+            return $this->cellCollection->get($coordinate);
+        }
+
+        return null;
+    }
+
+    /**
+     * Create a new cell at the specified coordinate.
+     *
+     * @param string $coordinate Coordinate of the cell
+     *
+     * @return Cell Cell that was created
+     *              WARNING: Because the cell collection can be cached to reduce memory, it only allows one
+     *              "active" cell at a time in memory. If you assign that cell to a variable, then select
+     *              another cell using getCell() or any of its variants, the newly selected cell becomes
+     *              the "active" cell, and any previous assignment becomes a disconnected reference because
+     *              the active cell has changed.
+     */
+    public function createNewCell(string $coordinate): Cell
+    {
+        [$column, $row, $columnString] = Coordinate::indexesFromString($coordinate);
+        $cell = new Cell(null, DataType::TYPE_NULL, $this);
+        $this->cellCollection->add($coordinate, $cell);
+
+        // Coordinates
+        if ($column > $this->cachedHighestColumn) {
+            $this->cachedHighestColumn = $column;
+        }
+        if ($row > $this->cachedHighestRow) {
+            $this->cachedHighestRow = $row;
+        }
+
+        // Cell needs appropriate xfIndex from dimensions records
+        //    but don't create dimension records if they don't already exist
+        $rowDimension = $this->rowDimensions[$row] ?? null;
+        $columnDimension = $this->columnDimensions[$columnString] ?? null;
+
+        $xfSet = false;
+        if ($rowDimension !== null) {
+            $rowXf = (int) $rowDimension->getXfIndex();
+            if ($rowXf > 0) {
+                // then there is a row dimension with explicit style, assign it to the cell
+                $cell->setXfIndex($rowXf);
+                $xfSet = true;
+            }
+        }
+        if (!$xfSet && $columnDimension !== null) {
+            $colXf = (int) $columnDimension->getXfIndex();
+            if ($colXf > 0) {
+                // then there is a column dimension, assign it to the cell
+                $cell->setXfIndex($colXf);
+            }
+        }
+
+        return $cell;
+    }
+
+    /**
+     * Does the cell at a specific coordinate exist?
+     *
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     */
+    public function cellExists(CellAddress|string|array $coordinate): bool
+    {
+        $cellAddress = Validations::validateCellAddress($coordinate);
+        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
+
+        return $sheet->getCellCollection()->has($finalCoordinate);
+    }
+
+    /**
+     * Get row dimension at a specific row.
+     *
+     * @param int $row Numeric index of the row
+     */
+    public function getRowDimension(int $row): RowDimension
+    {
+        // Get row dimension
+        if (!isset($this->rowDimensions[$row])) {
+            $this->rowDimensions[$row] = new RowDimension($row);
+
+            $this->cachedHighestRow = max($this->cachedHighestRow, $row);
+        }
+
+        return $this->rowDimensions[$row];
+    }
+
+    public function rowDimensionExists(int $row): bool
+    {
+        return isset($this->rowDimensions[$row]);
+    }
+
+    public function columnDimensionExists(string $column): bool
+    {
+        return isset($this->columnDimensions[$column]);
+    }
+
+    /**
+     * Get column dimension at a specific column.
+     *
+     * @param string $column String index of the column eg: 'A'
+     */
+    public function getColumnDimension(string $column): ColumnDimension
+    {
+        // Uppercase coordinate
+        $column = strtoupper($column);
+
+        // Fetch dimensions
+        if (!isset($this->columnDimensions[$column])) {
+            $this->columnDimensions[$column] = new ColumnDimension($column);
+
+            $columnIndex = Coordinate::columnIndexFromString($column);
+            if ($this->cachedHighestColumn < $columnIndex) {
+                $this->cachedHighestColumn = $columnIndex;
+            }
+        }
+
+        return $this->columnDimensions[$column];
+    }
+
+    /**
+     * Get column dimension at a specific column by using numeric cell coordinates.
+     *
+     * @param int $columnIndex Numeric column coordinate of the cell
+     */
+    public function getColumnDimensionByColumn(int $columnIndex): ColumnDimension
+    {
+        return $this->getColumnDimension(Coordinate::stringFromColumnIndex($columnIndex));
+    }
+
+    /**
+     * Get styles.
+     *
+     * @return Style[]
+     */
+    public function getStyles(): array
+    {
+        return $this->styles;
+    }
+
+    /**
+     * Get style for cell.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $cellCoordinate
+     *              A simple string containing a cell address like 'A1' or a cell range like 'A1:E10'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or a CellAddress or AddressRange object.
+     */
+    public function getStyle(AddressRange|CellAddress|int|string|array $cellCoordinate): Style
+    {
+        $cellCoordinate = Validations::validateCellOrCellRange($cellCoordinate);
+
+        // set this sheet as active
+        $this->getParentOrThrow()->setActiveSheetIndex($this->getParentOrThrow()->getIndex($this));
+
+        // set cell coordinate as active
+        $this->setSelectedCells($cellCoordinate);
+
+        return $this->getParentOrThrow()->getCellXfSupervisor();
+    }
+
+    /**
+     * Get conditional styles for a cell.
+     *
+     * @param string $coordinate eg: 'A1' or 'A1:A3'.
+     *          If a single cell is referenced, then the array of conditional styles will be returned if the cell is
+     *               included in a conditional style range.
+     *          If a range of cells is specified, then the styles will only be returned if the range matches the entire
+     *               range of the conditional.
+     *
+     * @return Conditional[]
+     */
+    public function getConditionalStyles(string $coordinate): array
+    {
+        $coordinate = strtoupper($coordinate);
+        if (str_contains($coordinate, ':')) {
+            return $this->conditionalStylesCollection[$coordinate] ?? [];
+        }
+
+        $cell = $this->getCell($coordinate);
+        foreach (array_keys($this->conditionalStylesCollection) as $conditionalRange) {
+            $cellBlocks = explode(',', Coordinate::resolveUnionAndIntersection($conditionalRange));
+            foreach ($cellBlocks as $cellBlock) {
+                if ($cell->isInRange($cellBlock)) {
+                    return $this->conditionalStylesCollection[$conditionalRange];
+                }
+            }
+        }
+
+        return [];
+    }
+
+    public function getConditionalRange(string $coordinate): ?string
+    {
+        $coordinate = strtoupper($coordinate);
+        $cell = $this->getCell($coordinate);
+        foreach (array_keys($this->conditionalStylesCollection) as $conditionalRange) {
+            $cellBlocks = explode(',', Coordinate::resolveUnionAndIntersection($conditionalRange));
+            foreach ($cellBlocks as $cellBlock) {
+                if ($cell->isInRange($cellBlock)) {
+                    return $conditionalRange;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Do conditional styles exist for this cell?
+     *
+     * @param string $coordinate eg: 'A1' or 'A1:A3'.
+     *          If a single cell is specified, then this method will return true if that cell is included in a
+     *               conditional style range.
+     *          If a range of cells is specified, then true will only be returned if the range matches the entire
+     *               range of the conditional.
+     */
+    public function conditionalStylesExists(string $coordinate): bool
+    {
+        $coordinate = strtoupper($coordinate);
+        if (str_contains($coordinate, ':')) {
+            return isset($this->conditionalStylesCollection[$coordinate]);
+        }
+
+        $cell = $this->getCell($coordinate);
+        foreach (array_keys($this->conditionalStylesCollection) as $conditionalRange) {
+            if ($cell->isInRange($conditionalRange)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes conditional styles for a cell.
+     *
+     * @param string $coordinate eg: 'A1'
+     *
+     * @return $this
+     */
+    public function removeConditionalStyles(string $coordinate): static
+    {
+        unset($this->conditionalStylesCollection[strtoupper($coordinate)]);
+
+        return $this;
+    }
+
+    /**
+     * Get collection of conditional styles.
+     */
+    public function getConditionalStylesCollection(): array
+    {
+        return $this->conditionalStylesCollection;
+    }
+
+    /**
+     * Set conditional styles.
+     *
+     * @param string $coordinate eg: 'A1'
+     * @param Conditional[] $styles
+     *
+     * @return $this
+     */
+    public function setConditionalStyles(string $coordinate, array $styles): static
+    {
+        $this->conditionalStylesCollection[strtoupper($coordinate)] = $styles;
+
+        return $this;
+    }
+
+    /**
+     * Duplicate cell style to a range of cells.
+     *
+     * Please note that this will overwrite existing cell styles for cells in range!
+     *
+     * @param Style $style Cell style to duplicate
+     * @param string $range Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     *
+     * @return $this
+     */
+    public function duplicateStyle(Style $style, string $range): static
+    {
+        // Add the style to the workbook if necessary
+        $workbook = $this->getParentOrThrow();
+        if ($existingStyle = $workbook->getCellXfByHashCode($style->getHashCode())) {
+            // there is already such cell Xf in our collection
+            $xfIndex = $existingStyle->getIndex();
+        } else {
+            // we don't have such a cell Xf, need to add
+            $workbook->addCellXf($style);
+            $xfIndex = $style->getIndex();
+        }
+
+        // Calculate range outer borders
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range . ':' . $range);
+
+        // Make sure we can loop upwards on rows and columns
+        if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
+            $tmp = $rangeStart;
+            $rangeStart = $rangeEnd;
+            $rangeEnd = $tmp;
+        }
+
+        // Loop through cells and apply styles
+        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                $this->getCell(Coordinate::stringFromColumnIndex($col) . $row)->setXfIndex($xfIndex);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Duplicate conditional style to a range of cells.
+     *
+     * Please note that this will overwrite existing cell styles for cells in range!
+     *
+     * @param Conditional[] $styles Cell style to duplicate
+     * @param string $range Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     *
+     * @return $this
+     */
+    public function duplicateConditionalStyle(array $styles, string $range = ''): static
+    {
+        foreach ($styles as $cellStyle) {
+            if (!($cellStyle instanceof Conditional)) {
+                throw new Exception('Style is not a conditional style');
+            }
+        }
+
+        // Calculate range outer borders
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range . ':' . $range);
+
+        // Make sure we can loop upwards on rows and columns
+        if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
+            $tmp = $rangeStart;
+            $rangeStart = $rangeEnd;
+            $rangeEnd = $tmp;
+        }
+
+        // Loop through cells and apply styles
+        for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+            for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+                $this->setConditionalStyles(Coordinate::stringFromColumnIndex($col) . $row, $styles);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set break on a cell.
+     *
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @param int $break Break type (type of Worksheet::BREAK_*)
+     *
+     * @return $this
+     */
+    public function setBreak(CellAddress|string|array $coordinate, int $break, int $max = -1): static
+    {
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+
+        if ($break === self::BREAK_NONE) {
+            unset($this->rowBreaks[$cellAddress], $this->columnBreaks[$cellAddress]);
+        } elseif ($break === self::BREAK_ROW) {
+            $this->rowBreaks[$cellAddress] = new PageBreak($break, $cellAddress, $max);
+        } elseif ($break === self::BREAK_COLUMN) {
+            $this->columnBreaks[$cellAddress] = new PageBreak($break, $cellAddress, $max);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get breaks.
+     *
+     * @return int[]
+     */
+    public function getBreaks(): array
+    {
+        $breaks = [];
+        /** @var callable $compareFunction */
+        $compareFunction = [self::class, 'compareRowBreaks'];
+        uksort($this->rowBreaks, $compareFunction);
+        foreach ($this->rowBreaks as $break) {
+            $breaks[$break->getCoordinate()] = self::BREAK_ROW;
+        }
+        /** @var callable $compareFunction */
+        $compareFunction = [self::class, 'compareColumnBreaks'];
+        uksort($this->columnBreaks, $compareFunction);
+        foreach ($this->columnBreaks as $break) {
+            $breaks[$break->getCoordinate()] = self::BREAK_COLUMN;
+        }
+
+        return $breaks;
+    }
+
+    /**
+     * Get row breaks.
+     *
+     * @return PageBreak[]
+     */
+    public function getRowBreaks(): array
+    {
+        /** @var callable $compareFunction */
+        $compareFunction = [self::class, 'compareRowBreaks'];
+        uksort($this->rowBreaks, $compareFunction);
+
+        return $this->rowBreaks;
+    }
+
+    protected static function compareRowBreaks(string $coordinate1, string $coordinate2): int
+    {
+        $row1 = Coordinate::indexesFromString($coordinate1)[1];
+        $row2 = Coordinate::indexesFromString($coordinate2)[1];
+
+        return $row1 - $row2;
+    }
+
+    protected static function compareColumnBreaks(string $coordinate1, string $coordinate2): int
+    {
+        $column1 = Coordinate::indexesFromString($coordinate1)[0];
+        $column2 = Coordinate::indexesFromString($coordinate2)[0];
+
+        return $column1 - $column2;
+    }
+
+    /**
+     * Get column breaks.
+     *
+     * @return PageBreak[]
+     */
+    public function getColumnBreaks(): array
+    {
+        /** @var callable $compareFunction */
+        $compareFunction = [self::class, 'compareColumnBreaks'];
+        uksort($this->columnBreaks, $compareFunction);
+
+        return $this->columnBreaks;
+    }
+
+    /**
+     * Set merge on a cell range.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange.
+     * @param string $behaviour How the merged cells should behave.
+     *               Possible values are:
+     *                   MERGE_CELL_CONTENT_EMPTY - Empty the content of the hidden cells
+     *                   MERGE_CELL_CONTENT_HIDE - Keep the content of the hidden cells
+     *                   MERGE_CELL_CONTENT_MERGE - Move the content of the hidden cells into the first cell
+     *
+     * @return $this
+     */
+    public function mergeCells(AddressRange|string|array $range, string $behaviour = self::MERGE_CELL_CONTENT_EMPTY): static
+    {
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
+
+        if (!str_contains($range, ':')) {
+            $range .= ":{$range}";
+        }
+
+        if (preg_match('/^([A-Z]+)(\\d+):([A-Z]+)(\\d+)$/', $range, $matches) !== 1) {
+            throw new Exception('Merge must be on a valid range of cells.');
+        }
+
+        $this->mergeCells[$range] = $range;
+        $firstRow = (int) $matches[2];
+        $lastRow = (int) $matches[4];
+        $firstColumn = $matches[1];
+        $lastColumn = $matches[3];
+        $firstColumnIndex = Coordinate::columnIndexFromString($firstColumn);
+        $lastColumnIndex = Coordinate::columnIndexFromString($lastColumn);
+        $numberRows = $lastRow - $firstRow;
+        $numberColumns = $lastColumnIndex - $firstColumnIndex;
+
+        if ($numberRows === 1 && $numberColumns === 1) {
+            return $this;
+        }
+
+        // create upper left cell if it does not already exist
+        $upperLeft = "{$firstColumn}{$firstRow}";
+        if (!$this->cellExists($upperLeft)) {
+            $this->getCell($upperLeft)->setValueExplicit(null, DataType::TYPE_NULL);
+        }
+
+        if ($behaviour !== self::MERGE_CELL_CONTENT_HIDE) {
+            // Blank out the rest of the cells in the range (if they exist)
+            if ($numberRows > $numberColumns) {
+                $this->clearMergeCellsByColumn($firstColumn, $lastColumn, $firstRow, $lastRow, $upperLeft, $behaviour);
+            } else {
+                $this->clearMergeCellsByRow($firstColumn, $lastColumnIndex, $firstRow, $lastRow, $upperLeft, $behaviour);
+            }
+        }
+
+        return $this;
+    }
+
+    private function clearMergeCellsByColumn(string $firstColumn, string $lastColumn, int $firstRow, int $lastRow, string $upperLeft, string $behaviour): void
+    {
+        $leftCellValue = ($behaviour === self::MERGE_CELL_CONTENT_MERGE)
+            ? [$this->getCell($upperLeft)->getFormattedValue()]
+            : [];
+
+        foreach ($this->getColumnIterator($firstColumn, $lastColumn) as $column) {
+            $iterator = $column->getCellIterator($firstRow);
+            $iterator->setIterateOnlyExistingCells(true);
+            foreach ($iterator as $cell) {
+                if ($cell !== null) {
+                    $row = $cell->getRow();
+                    if ($row > $lastRow) {
+                        break;
+                    }
+                    $leftCellValue = $this->mergeCellBehaviour($cell, $upperLeft, $behaviour, $leftCellValue);
+                }
+            }
+        }
+
+        if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+            $this->getCell($upperLeft)->setValueExplicit(implode(' ', $leftCellValue), DataType::TYPE_STRING);
+        }
+    }
+
+    private function clearMergeCellsByRow(string $firstColumn, int $lastColumnIndex, int $firstRow, int $lastRow, string $upperLeft, string $behaviour): void
+    {
+        $leftCellValue = ($behaviour === self::MERGE_CELL_CONTENT_MERGE)
+            ? [$this->getCell($upperLeft)->getFormattedValue()]
+            : [];
+
+        foreach ($this->getRowIterator($firstRow, $lastRow) as $row) {
+            $iterator = $row->getCellIterator($firstColumn);
+            $iterator->setIterateOnlyExistingCells(true);
+            foreach ($iterator as $cell) {
+                if ($cell !== null) {
+                    $column = $cell->getColumn();
+                    $columnIndex = Coordinate::columnIndexFromString($column);
+                    if ($columnIndex > $lastColumnIndex) {
+                        break;
+                    }
+                    $leftCellValue = $this->mergeCellBehaviour($cell, $upperLeft, $behaviour, $leftCellValue);
+                }
+            }
+        }
+
+        if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+            $this->getCell($upperLeft)->setValueExplicit(implode(' ', $leftCellValue), DataType::TYPE_STRING);
+        }
+    }
+
+    public function mergeCellBehaviour(Cell $cell, string $upperLeft, string $behaviour, array $leftCellValue): array
+    {
+        if ($cell->getCoordinate() !== $upperLeft) {
+            Calculation::getInstance($cell->getWorksheet()->getParentOrThrow())->flushInstance();
+            if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+                $cellValue = $cell->getFormattedValue();
+                if ($cellValue !== '') {
+                    $leftCellValue[] = $cellValue;
+                }
+            }
+            $cell->setValueExplicit(null, DataType::TYPE_NULL);
+        }
+
+        return $leftCellValue;
+    }
+
+    /**
+     * Remove merge on a cell range.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|string $range A simple string containing a Cell range like 'A1:E10'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange.
+     *
+     * @return $this
+     */
+    public function unmergeCells(AddressRange|string|array $range): static
+    {
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
+
+        if (str_contains($range, ':')) {
+            if (isset($this->mergeCells[$range])) {
+                unset($this->mergeCells[$range]);
+            } else {
+                throw new Exception('Cell range ' . $range . ' not known as merged.');
+            }
+        } else {
+            throw new Exception('Merge can only be removed from a range of cells.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get merge cells array.
+     *
+     * @return string[]
+     */
+    public function getMergeCells(): array
+    {
+        return $this->mergeCells;
+    }
+
+    /**
+     * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
+     * a single cell range.
+     *
+     * @param string[] $mergeCells
+     *
+     * @return $this
+     */
+    public function setMergeCells(array $mergeCells): static
+    {
+        $this->mergeCells = $mergeCells;
+
+        return $this;
+    }
+
+    /**
+     * Set protection on a cell or cell range.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or a CellAddress or AddressRange object.
+     * @param string $password Password to unlock the protection
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
+     *
+     * @return $this
+     */
+    public function protectCells(AddressRange|CellAddress|int|string|array $range, string $password = '', bool $alreadyHashed = false, string $name = '', string $securityDescriptor = ''): static
+    {
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
+
+        if (!$alreadyHashed && $password !== '') {
+            $password = Shared\PasswordHasher::hashPassword($password);
+        }
+        $this->protectedCells[$range] = new ProtectedRange($range, $password, $name, $securityDescriptor);
+
+        return $this;
+    }
+
+    /**
+     * Remove protection on a cell or cell range.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $range A simple string containing a Cell range like 'A1:E10'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or a CellAddress or AddressRange object.
+     *
+     * @return $this
+     */
+    public function unprotectCells(AddressRange|CellAddress|int|string|array $range): static
+    {
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
+
+        if (isset($this->protectedCells[$range])) {
+            unset($this->protectedCells[$range]);
+        } else {
+            throw new Exception('Cell range ' . $range . ' not known as protected.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get password for protected cells.
+     *
+     * @return string[]
+     *
+     * @deprecated 2.0.1 use getProtectedCellRanges instead
+     * @see Worksheet::getProtectedCellRanges()
+     */
+    public function getProtectedCells(): array
+    {
+        $array = [];
+        foreach ($this->protectedCells as $key => $protectedRange) {
+            $array[$key] = $protectedRange->getPassword();
+        }
+
+        return $array;
+    }
+
+    /**
+     * Get protected cells.
+     *
+     * @return ProtectedRange[]
+     */
+    public function getProtectedCellRanges(): array
+    {
+        return $this->protectedCells;
+    }
+
+    /**
+     * Get Autofilter.
+     */
+    public function getAutoFilter(): AutoFilter
+    {
+        return $this->autoFilter;
+    }
+
+    /**
+     * Set AutoFilter.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|AutoFilter|string $autoFilterOrRange
+     *            A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange.
+     *
+     * @return $this
+     */
+    public function setAutoFilter(AddressRange|string|array|AutoFilter $autoFilterOrRange): static
+    {
+        if (is_object($autoFilterOrRange) && ($autoFilterOrRange instanceof AutoFilter)) {
+            $this->autoFilter = $autoFilterOrRange;
+        } else {
+            $cellRange = Functions::trimSheetFromCellReference(Validations::validateCellRange($autoFilterOrRange));
+
+            $this->autoFilter->setRange($cellRange);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove autofilter.
+     */
+    public function removeAutoFilter(): self
+    {
+        $this->autoFilter->setRange('');
+
+        return $this;
+    }
+
+    /**
+     * Get collection of Tables.
+     *
+     * @return ArrayObject<int, Table>
+     */
+    public function getTableCollection(): ArrayObject
+    {
+        return $this->tableCollection;
+    }
+
+    /**
+     * Add Table.
+     *
+     * @return $this
+     */
+    public function addTable(Table $table): self
+    {
+        $table->setWorksheet($this);
+        $this->tableCollection[] = $table;
+
+        return $this;
+    }
+
+    /**
+     * @return string[] array of Table names
+     */
+    public function getTableNames(): array
+    {
+        $tableNames = [];
+
+        foreach ($this->tableCollection as $table) {
+            /** @var Table $table */
+            $tableNames[] = $table->getName();
+        }
+
+        return $tableNames;
+    }
+
+    /**
+     * @param string $name the table name to search
+     *
+     * @return null|Table The table from the tables collection, or null if not found
+     */
+    public function getTableByName(string $name): ?Table
+    {
+        $tableIndex = $this->getTableIndexByName($name);
+
+        return ($tableIndex === null) ? null : $this->tableCollection[$tableIndex];
+    }
+
+    /**
+     * @param string $name the table name to search
+     *
+     * @return null|int The index of the located table in the tables collection, or null if not found
+     */
+    protected function getTableIndexByName(string $name): ?int
+    {
+        $name = Shared\StringHelper::strToUpper($name);
+        foreach ($this->tableCollection as $index => $table) {
+            /** @var Table $table */
+            if (Shared\StringHelper::strToUpper($table->getName()) === $name) {
+                return $index;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Remove Table by name.
+     *
+     * @param string $name Table name
+     *
+     * @return $this
+     */
+    public function removeTableByName(string $name): self
+    {
+        $tableIndex = $this->getTableIndexByName($name);
+
+        if ($tableIndex !== null) {
+            unset($this->tableCollection[$tableIndex]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove collection of Tables.
+     */
+    public function removeTableCollection(): self
+    {
+        $this->tableCollection = new ArrayObject();
+
+        return $this;
+    }
+
+    /**
+     * Get Freeze Pane.
+     */
+    public function getFreezePane(): ?string
+    {
+        return $this->freezePane;
+    }
+
+    /**
+     * Freeze Pane.
+     *
+     * Examples:
+     *
+     *     - A2 will freeze the rows above cell A2 (i.e row 1)
+     *     - B1 will freeze the columns to the left of cell B1 (i.e column A)
+     *     - B2 will freeze the rows above and to the left of cell B2 (i.e row 1 and column A)
+     *
+     * @param null|array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *            or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *        Passing a null value for this argument will clear any existing freeze pane for this worksheet.
+     * @param null|array{0: int, 1: int}|CellAddress|string $topLeftCell default position of the right bottom pane
+     *            Coordinate of the cell as a string, eg: 'C5'; or as an array of [$columnIndex, $row] (e.g. [3, 5]),
+     *            or a CellAddress object.
+     *
+     * @return $this
+     */
+    public function freezePane(null|CellAddress|string|array $coordinate, null|CellAddress|string|array $topLeftCell = null, bool $frozenSplit = false): static
+    {
+        $this->panes = [
+            'bottomRight' => null,
+            'bottomLeft' => null,
+            'topRight' => null,
+            'topLeft' => null,
+        ];
+        $cellAddress = ($coordinate !== null)
+            ? Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate))
+            : null;
+        if ($cellAddress !== null && Coordinate::coordinateIsRange($cellAddress)) {
+            throw new Exception('Freeze pane can not be set on a range of cells.');
+        }
+        $topLeftCell = ($topLeftCell !== null)
+            ? Functions::trimSheetFromCellReference(Validations::validateCellAddress($topLeftCell))
+            : null;
+
+        if ($cellAddress !== null && $topLeftCell === null) {
+            $coordinate = Coordinate::coordinateFromString($cellAddress);
+            $topLeftCell = $coordinate[0] . $coordinate[1];
+        }
+
+        $topLeftCell = "$topLeftCell";
+        $this->paneTopLeftCell = $topLeftCell;
+
+        $this->freezePane = $cellAddress;
+        $this->topLeftCell = $topLeftCell;
+        if ($cellAddress === null) {
+            $this->paneState = '';
+            $this->xSplit = $this->ySplit = 0;
+            $this->activePane = '';
+        } else {
+            $coordinates = Coordinate::indexesFromString($cellAddress);
+            $this->xSplit = $coordinates[0] - 1;
+            $this->ySplit = $coordinates[1] - 1;
+            if ($this->xSplit > 0 || $this->ySplit > 0) {
+                $this->paneState = $frozenSplit ? self::PANE_FROZENSPLIT : self::PANE_FROZEN;
+                $this->setSelectedCellsActivePane();
+            } else {
+                $this->paneState = '';
+                $this->freezePane = null;
+                $this->activePane = '';
+            }
+        }
+
+        return $this;
+    }
+
+    public function setTopLeftCell(string $topLeftCell): self
+    {
+        $this->topLeftCell = $topLeftCell;
+
+        return $this;
+    }
+
+    /**
+     * Unfreeze Pane.
+     *
+     * @return $this
+     */
+    public function unfreezePane(): static
+    {
+        return $this->freezePane(null);
+    }
+
+    /**
+     * Get the default position of the right bottom pane.
+     */
+    public function getTopLeftCell(): ?string
+    {
+        return $this->topLeftCell;
+    }
+
+    public function getPaneTopLeftCell(): string
+    {
+        return $this->paneTopLeftCell;
+    }
+
+    public function setPaneTopLeftCell(string $paneTopLeftCell): self
+    {
+        $this->paneTopLeftCell = $paneTopLeftCell;
+
+        return $this;
+    }
+
+    public function usesPanes(): bool
+    {
+        return $this->xSplit > 0 || $this->ySplit > 0;
+    }
+
+    public function getPane(string $position): ?Pane
+    {
+        return $this->panes[$position] ?? null;
+    }
+
+    public function setPane(string $position, ?Pane $pane): self
+    {
+        if (array_key_exists($position, $this->panes)) {
+            $this->panes[$position] = $pane;
+        }
+
+        return $this;
+    }
+
+    /** @return (null|Pane)[] */
+    public function getPanes(): array
+    {
+        return $this->panes;
+    }
+
+    public function getActivePane(): string
+    {
+        return $this->activePane;
+    }
+
+    public function setActivePane(string $activePane): self
+    {
+        $this->activePane = array_key_exists($activePane, $this->panes) ? $activePane : '';
+
+        return $this;
+    }
+
+    public function getXSplit(): int
+    {
+        return $this->xSplit;
+    }
+
+    public function setXSplit(int $xSplit): self
+    {
+        $this->xSplit = $xSplit;
+        if (in_array($this->paneState, self::VALIDFROZENSTATE, true)) {
+            $this->freezePane([$this->xSplit + 1, $this->ySplit + 1], $this->topLeftCell, $this->paneState === self::PANE_FROZENSPLIT);
+        }
+
+        return $this;
+    }
+
+    public function getYSplit(): int
+    {
+        return $this->ySplit;
+    }
+
+    public function setYSplit(int $ySplit): self
+    {
+        $this->ySplit = $ySplit;
+        if (in_array($this->paneState, self::VALIDFROZENSTATE, true)) {
+            $this->freezePane([$this->xSplit + 1, $this->ySplit + 1], $this->topLeftCell, $this->paneState === self::PANE_FROZENSPLIT);
+        }
+
+        return $this;
+    }
+
+    public function getPaneState(): string
+    {
+        return $this->paneState;
+    }
+
+    public const PANE_FROZEN = 'frozen';
+    public const PANE_FROZENSPLIT = 'frozenSplit';
+    public const PANE_SPLIT = 'split';
+    private const VALIDPANESTATE = [self::PANE_FROZEN, self::PANE_SPLIT, self::PANE_FROZENSPLIT];
+    private const VALIDFROZENSTATE = [self::PANE_FROZEN, self::PANE_FROZENSPLIT];
+
+    public function setPaneState(string $paneState): self
+    {
+        $this->paneState = in_array($paneState, self::VALIDPANESTATE, true) ? $paneState : '';
+        if (in_array($this->paneState, self::VALIDFROZENSTATE, true)) {
+            $this->freezePane([$this->xSplit + 1, $this->ySplit + 1], $this->topLeftCell, $this->paneState === self::PANE_FROZENSPLIT);
+        } else {
+            $this->freezePane = null;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Insert a new row, updating all possible related data.
+     *
+     * @param int $before Insert before this row number
+     * @param int $numberOfRows Number of new rows to insert
+     *
+     * @return $this
+     */
+    public function insertNewRowBefore(int $before, int $numberOfRows = 1): static
+    {
+        if ($before >= 1) {
+            $objReferenceHelper = ReferenceHelper::getInstance();
+            $objReferenceHelper->insertNewBefore('A' . $before, 0, $numberOfRows, $this);
+        } else {
+            throw new Exception('Rows can only be inserted before at least row 1.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Insert a new column, updating all possible related data.
+     *
+     * @param string $before Insert before this column Name, eg: 'A'
+     * @param int $numberOfColumns Number of new columns to insert
+     *
+     * @return $this
+     */
+    public function insertNewColumnBefore(string $before, int $numberOfColumns = 1): static
+    {
+        if (!is_numeric($before)) {
+            $objReferenceHelper = ReferenceHelper::getInstance();
+            $objReferenceHelper->insertNewBefore($before . '1', $numberOfColumns, 0, $this);
+        } else {
+            throw new Exception('Column references should not be numeric.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Insert a new column, updating all possible related data.
+     *
+     * @param int $beforeColumnIndex Insert before this column ID (numeric column coordinate of the cell)
+     * @param int $numberOfColumns Number of new columns to insert
+     *
+     * @return $this
+     */
+    public function insertNewColumnBeforeByIndex(int $beforeColumnIndex, int $numberOfColumns = 1): static
+    {
+        if ($beforeColumnIndex >= 1) {
+            return $this->insertNewColumnBefore(Coordinate::stringFromColumnIndex($beforeColumnIndex), $numberOfColumns);
+        }
+
+        throw new Exception('Columns can only be inserted before at least column A (1).');
+    }
+
+    /**
+     * Delete a row, updating all possible related data.
+     *
+     * @param int $row Remove rows, starting with this row number
+     * @param int $numberOfRows Number of rows to remove
+     *
+     * @return $this
+     */
+    public function removeRow(int $row, int $numberOfRows = 1): static
+    {
+        if ($row < 1) {
+            throw new Exception('Rows to be deleted should at least start from row 1.');
+        }
+
+        $holdRowDimensions = $this->removeRowDimensions($row, $numberOfRows);
+        $highestRow = $this->getHighestDataRow();
+        $removedRowsCounter = 0;
+
+        for ($r = 0; $r < $numberOfRows; ++$r) {
+            if ($row + $r <= $highestRow) {
+                $this->cellCollection->removeRow($row + $r);
+                ++$removedRowsCounter;
+            }
+        }
+
+        $objReferenceHelper = ReferenceHelper::getInstance();
+        $objReferenceHelper->insertNewBefore('A' . ($row + $numberOfRows), 0, -$numberOfRows, $this);
+        for ($r = 0; $r < $removedRowsCounter; ++$r) {
+            $this->cellCollection->removeRow($highestRow);
+            --$highestRow;
+        }
+
+        $this->rowDimensions = $holdRowDimensions;
+
+        return $this;
+    }
+
+    private function removeRowDimensions(int $row, int $numberOfRows): array
+    {
+        $highRow = $row + $numberOfRows - 1;
+        $holdRowDimensions = [];
+        foreach ($this->rowDimensions as $rowDimension) {
+            $num = $rowDimension->getRowIndex();
+            if ($num < $row) {
+                $holdRowDimensions[$num] = $rowDimension;
+            } elseif ($num > $highRow) {
+                $num -= $numberOfRows;
+                $cloneDimension = clone $rowDimension;
+                $cloneDimension->setRowIndex($num);
+                $holdRowDimensions[$num] = $cloneDimension;
+            }
+        }
+
+        return $holdRowDimensions;
+    }
+
+    /**
+     * Remove a column, updating all possible related data.
+     *
+     * @param string $column Remove columns starting with this column name, eg: 'A'
+     * @param int $numberOfColumns Number of columns to remove
+     *
+     * @return $this
+     */
+    public function removeColumn(string $column, int $numberOfColumns = 1): static
+    {
+        if (is_numeric($column)) {
+            throw new Exception('Column references should not be numeric.');
+        }
+
+        $highestColumn = $this->getHighestDataColumn();
+        $highestColumnIndex = Coordinate::columnIndexFromString($highestColumn);
+        $pColumnIndex = Coordinate::columnIndexFromString($column);
+
+        $holdColumnDimensions = $this->removeColumnDimensions($pColumnIndex, $numberOfColumns);
+
+        $column = Coordinate::stringFromColumnIndex($pColumnIndex + $numberOfColumns);
+        $objReferenceHelper = ReferenceHelper::getInstance();
+        $objReferenceHelper->insertNewBefore($column . '1', -$numberOfColumns, 0, $this);
+
+        $this->columnDimensions = $holdColumnDimensions;
+
+        if ($pColumnIndex > $highestColumnIndex) {
+            return $this;
+        }
+
+        $maxPossibleColumnsToBeRemoved = $highestColumnIndex - $pColumnIndex + 1;
+
+        for ($c = 0, $n = min($maxPossibleColumnsToBeRemoved, $numberOfColumns); $c < $n; ++$c) {
+            $this->cellCollection->removeColumn($highestColumn);
+            $highestColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($highestColumn) - 1);
+        }
+
+        $this->garbageCollect();
+
+        return $this;
+    }
+
+    private function removeColumnDimensions(int $pColumnIndex, int $numberOfColumns): array
+    {
+        $highCol = $pColumnIndex + $numberOfColumns - 1;
+        $holdColumnDimensions = [];
+        foreach ($this->columnDimensions as $columnDimension) {
+            $num = $columnDimension->getColumnNumeric();
+            if ($num < $pColumnIndex) {
+                $str = $columnDimension->getColumnIndex();
+                $holdColumnDimensions[$str] = $columnDimension;
+            } elseif ($num > $highCol) {
+                $cloneDimension = clone $columnDimension;
+                $cloneDimension->setColumnNumeric($num - $numberOfColumns);
+                $str = $cloneDimension->getColumnIndex();
+                $holdColumnDimensions[$str] = $cloneDimension;
+            }
+        }
+
+        return $holdColumnDimensions;
+    }
+
+    /**
+     * Remove a column, updating all possible related data.
+     *
+     * @param int $columnIndex Remove starting with this column Index (numeric column coordinate)
+     * @param int $numColumns Number of columns to remove
+     *
+     * @return $this
+     */
+    public function removeColumnByIndex(int $columnIndex, int $numColumns = 1): static
+    {
+        if ($columnIndex >= 1) {
+            return $this->removeColumn(Coordinate::stringFromColumnIndex($columnIndex), $numColumns);
+        }
+
+        throw new Exception('Columns to be deleted should at least start from column A (1)');
+    }
+
+    /**
+     * Show gridlines?
+     */
+    public function getShowGridlines(): bool
+    {
+        return $this->showGridlines;
+    }
+
+    /**
+     * Set show gridlines.
+     *
+     * @param bool $showGridLines Show gridlines (true/false)
+     *
+     * @return $this
+     */
+    public function setShowGridlines(bool $showGridLines): self
+    {
+        $this->showGridlines = $showGridLines;
+
+        return $this;
+    }
+
+    /**
+     * Print gridlines?
+     */
+    public function getPrintGridlines(): bool
+    {
+        return $this->printGridlines;
+    }
+
+    /**
+     * Set print gridlines.
+     *
+     * @param bool $printGridLines Print gridlines (true/false)
+     *
+     * @return $this
+     */
+    public function setPrintGridlines(bool $printGridLines): self
+    {
+        $this->printGridlines = $printGridLines;
+
+        return $this;
+    }
+
+    /**
+     * Show row and column headers?
+     */
+    public function getShowRowColHeaders(): bool
+    {
+        return $this->showRowColHeaders;
+    }
+
+    /**
+     * Set show row and column headers.
+     *
+     * @param bool $showRowColHeaders Show row and column headers (true/false)
+     *
+     * @return $this
+     */
+    public function setShowRowColHeaders(bool $showRowColHeaders): self
+    {
+        $this->showRowColHeaders = $showRowColHeaders;
+
+        return $this;
+    }
+
+    /**
+     * Show summary below? (Row/Column outlining).
+     */
+    public function getShowSummaryBelow(): bool
+    {
+        return $this->showSummaryBelow;
+    }
+
+    /**
+     * Set show summary below.
+     *
+     * @param bool $showSummaryBelow Show summary below (true/false)
+     *
+     * @return $this
+     */
+    public function setShowSummaryBelow(bool $showSummaryBelow): self
+    {
+        $this->showSummaryBelow = $showSummaryBelow;
+
+        return $this;
+    }
+
+    /**
+     * Show summary right? (Row/Column outlining).
+     */
+    public function getShowSummaryRight(): bool
+    {
+        return $this->showSummaryRight;
+    }
+
+    /**
+     * Set show summary right.
+     *
+     * @param bool $showSummaryRight Show summary right (true/false)
+     *
+     * @return $this
+     */
+    public function setShowSummaryRight(bool $showSummaryRight): self
+    {
+        $this->showSummaryRight = $showSummaryRight;
+
+        return $this;
+    }
+
+    /**
+     * Get comments.
+     *
+     * @return Comment[]
+     */
+    public function getComments(): array
+    {
+        return $this->comments;
+    }
+
+    /**
+     * Set comments array for the entire sheet.
+     *
+     * @param Comment[] $comments
+     *
+     * @return $this
+     */
+    public function setComments(array $comments): self
+    {
+        $this->comments = $comments;
+
+        return $this;
+    }
+
+    /**
+     * Remove comment from cell.
+     *
+     * @param array{0: int, 1: int}|CellAddress|string $cellCoordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
+     * @return $this
+     */
+    public function removeComment(CellAddress|string|array $cellCoordinate): self
+    {
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
+
+        if (Coordinate::coordinateIsRange($cellAddress)) {
+            throw new Exception('Cell coordinate string can not be a range of cells.');
+        } elseif (str_contains($cellAddress, '$')) {
+            throw new Exception('Cell coordinate string must not be absolute.');
+        } elseif ($cellAddress == '') {
+            throw new Exception('Cell coordinate can not be zero-length string.');
+        }
+        // Check if we have a comment for this cell and delete it
+        if (isset($this->comments[$cellAddress])) {
+            unset($this->comments[$cellAddress]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get comment for cell.
+     *
+     * @param array{0: int, 1: int}|CellAddress|string $cellCoordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     */
+    public function getComment(CellAddress|string|array $cellCoordinate, bool $attachNew = true): Comment
+    {
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
+
+        if (Coordinate::coordinateIsRange($cellAddress)) {
+            throw new Exception('Cell coordinate string can not be a range of cells.');
+        } elseif (str_contains($cellAddress, '$')) {
+            throw new Exception('Cell coordinate string must not be absolute.');
+        } elseif ($cellAddress == '') {
+            throw new Exception('Cell coordinate can not be zero-length string.');
+        }
+
+        // Check if we already have a comment for this cell.
+        if (isset($this->comments[$cellAddress])) {
+            return $this->comments[$cellAddress];
+        }
+
+        // If not, create a new comment.
+        $newComment = new Comment();
+        if ($attachNew) {
+            $this->comments[$cellAddress] = $newComment;
+        }
+
+        return $newComment;
+    }
+
+    /**
+     * Get active cell.
+     *
+     * @return string Example: 'A1'
+     */
+    public function getActiveCell(): string
+    {
+        return $this->activeCell;
+    }
+
+    /**
+     * Get selected cells.
+     */
+    public function getSelectedCells(): string
+    {
+        return $this->selectedCells;
+    }
+
+    /**
+     * Selected cell.
+     *
+     * @param string $coordinate Cell (i.e. A1)
+     *
+     * @return $this
+     */
+    public function setSelectedCell(string $coordinate): static
+    {
+        return $this->setSelectedCells($coordinate);
+    }
+
+    /**
+     * Select a range of cells.
+     *
+     * @param AddressRange<CellAddress>|array{0: int, 1: int, 2: int, 3: int}|array{0: int, 1: int}|CellAddress|int|string $coordinate A simple string containing a Cell range like 'A1:E10'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or a CellAddress or AddressRange object.
+     *
+     * @return $this
+     */
+    public function setSelectedCells(AddressRange|CellAddress|int|string|array $coordinate): static
+    {
+        if (is_string($coordinate)) {
+            $coordinate = Validations::definedNameToCoordinate($coordinate, $this);
+        }
+        $coordinate = Validations::validateCellOrCellRange($coordinate);
+
+        if (Coordinate::coordinateIsRange($coordinate)) {
+            [$first] = Coordinate::splitRange($coordinate);
+            $this->activeCell = $first[0];
+        } else {
+            $this->activeCell = $coordinate;
+        }
+        $this->selectedCells = $coordinate;
+        $this->setSelectedCellsActivePane();
+
+        return $this;
+    }
+
+    private function setSelectedCellsActivePane(): void
+    {
+        if (!empty($this->freezePane)) {
+            $coordinateC = Coordinate::indexesFromString($this->freezePane);
+            $coordinateT = Coordinate::indexesFromString($this->activeCell);
+            if ($coordinateC[0] === 1) {
+                $activePane = ($coordinateT[1] <= $coordinateC[1]) ? 'topLeft' : 'bottomLeft';
+            } elseif ($coordinateC[1] === 1) {
+                $activePane = ($coordinateT[0] <= $coordinateC[0]) ? 'topLeft' : 'topRight';
+            } elseif ($coordinateT[1] <= $coordinateC[1]) {
+                $activePane = ($coordinateT[0] <= $coordinateC[0]) ? 'topLeft' : 'topRight';
+            } else {
+                $activePane = ($coordinateT[0] <= $coordinateC[0]) ? 'bottomLeft' : 'bottomRight';
+            }
+            $this->setActivePane($activePane);
+            $this->panes[$activePane] = new Pane($activePane, $this->selectedCells, $this->activeCell);
+        }
+    }
+
+    /**
+     * Get right-to-left.
+     */
+    public function getRightToLeft(): bool
+    {
+        return $this->rightToLeft;
+    }
+
+    /**
+     * Set right-to-left.
+     *
+     * @param bool $value Right-to-left true/false
+     *
+     * @return $this
+     */
+    public function setRightToLeft(bool $value): static
+    {
+        $this->rightToLeft = $value;
+
+        return $this;
+    }
+
+    /**
+     * Fill worksheet from values in array.
+     *
+     * @param array $source Source array
+     * @param mixed $nullValue Value in source array that stands for blank cell
+     * @param string $startCell Insert array starting from this cell address as the top left coordinate
+     * @param bool $strictNullComparison Apply strict comparison when testing for null values in the array
+     *
+     * @return $this
+     */
+    public function fromArray(array $source, mixed $nullValue = null, string $startCell = 'A1', bool $strictNullComparison = false): static
+    {
+        //    Convert a 1-D array to 2-D (for ease of looping)
+        if (!is_array(end($source))) {
+            $source = [$source];
+        }
+
+        // start coordinate
+        [$startColumn, $startRow] = Coordinate::coordinateFromString($startCell);
+
+        // Loop through $source
+        foreach ($source as $rowData) {
+            $currentColumn = $startColumn;
+            foreach ($rowData as $cellValue) {
+                if ($strictNullComparison) {
+                    if ($cellValue !== $nullValue) {
+                        // Set cell value
+                        $this->getCell($currentColumn . $startRow)->setValue($cellValue);
+                    }
+                } else {
+                    if ($cellValue != $nullValue) {
+                        // Set cell value
+                        $this->getCell($currentColumn . $startRow)->setValue($cellValue);
+                    }
+                }
+                ++$currentColumn;
+            }
+            ++$startRow;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param null|bool|float|int|RichText|string $nullValue value to use when null
+     *
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Calculation\Exception
+     */
+    protected function cellToArray(Cell $cell, bool $calculateFormulas, bool $formatData, mixed $nullValue): mixed
+    {
+        $returnValue = $nullValue;
+
+        if ($cell->getValue() !== null) {
+            if ($cell->getValue() instanceof RichText) {
+                $returnValue = $cell->getValue()->getPlainText();
+            } else {
+                $returnValue = ($calculateFormulas) ? $cell->getCalculatedValue() : $cell->getValue();
+            }
+
+            if ($formatData) {
+                $style = $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex());
+                /** @var null|bool|float|int|RichText|string */
+                $returnValuex = $returnValue;
+                $returnValue = NumberFormat::toFormattedString(
+                    $returnValuex,
+                    $style->getNumberFormat()->getFormatCode() ?? NumberFormat::FORMAT_GENERAL
+                );
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Create array from a range of cells.
+     *
+     * @param null|bool|float|int|RichText|string $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param bool $calculateFormulas Should formulas be calculated?
+     * @param bool $formatData Should formatting be applied to cell values?
+     * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                             True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                            True - Don't return values for rows/columns that are defined as hidden.
+     */
+    public function rangeToArray(
+        string $range,
+        mixed $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false
+    ): array {
+        $returnValue = [];
+
+        // Loop through rows
+        foreach ($this->rangeToArrayYieldRows($range, $nullValue, $calculateFormulas, $formatData, $returnCellRef, $ignoreHidden) as $rowRef => $rowArray) {
+            $returnValue[$rowRef] = $rowArray;
+        }
+
+        // Return
+        return $returnValue;
+    }
+
+    /**
+     * Create array from a range of cells, yielding each row in turn.
+     *
+     * @param null|bool|float|int|RichText|string $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param bool $calculateFormulas Should formulas be calculated?
+     * @param bool $formatData Should formatting be applied to cell values?
+     * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                             True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                            True - Don't return values for rows/columns that are defined as hidden.
+     *
+     * @return Generator<array>
+     */
+    public function rangeToArrayYieldRows(
+        string $range,
+        mixed $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false
+    ) {
+        $range = Validations::validateCellOrCellRange($range);
+
+        //    Identify the range that we need to extract from the worksheet
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range);
+        $minCol = Coordinate::stringFromColumnIndex($rangeStart[0]);
+        $minRow = $rangeStart[1];
+        $maxCol = Coordinate::stringFromColumnIndex($rangeEnd[0]);
+        $maxRow = $rangeEnd[1];
+        $minColInt = $rangeStart[0];
+        $maxColInt = $rangeEnd[0];
+
+        ++$maxCol;
+        /** @var array<string, bool> */
+        $hiddenColumns = [];
+        $nullRow = $this->buildNullRow($nullValue, $minCol, $maxCol, $returnCellRef, $ignoreHidden, $hiddenColumns);
+        $hideColumns = !empty($hiddenColumns);
+
+        $keys = $this->cellCollection->getSortedCoordinatesInt();
+        $keyIndex = 0;
+        $keysCount = count($keys);
+        // Loop through rows
+        for ($row = $minRow; $row <= $maxRow; ++$row) {
+            if (($ignoreHidden === true) && ($this->isRowVisible($row) === false)) {
+                continue;
+            }
+            $rowRef = $returnCellRef ? $row : ($row - $minRow);
+            $returnValue = $nullRow;
+
+            $index = ($row - 1) * AddressRange::MAX_COLUMN_INT + 1;
+            $indexPlus = $index + AddressRange::MAX_COLUMN_INT - 1;
+            while ($keyIndex < $keysCount && $keys[$keyIndex] < $index) {
+                ++$keyIndex;
+            }
+            while ($keyIndex < $keysCount && $keys[$keyIndex] <= $indexPlus) {
+                $key = $keys[$keyIndex];
+                $thisRow = intdiv($key - 1, AddressRange::MAX_COLUMN_INT) + 1;
+                $thisCol = ($key % AddressRange::MAX_COLUMN_INT) ?: AddressRange::MAX_COLUMN_INT;
+                if ($thisCol >= $minColInt && $thisCol <= $maxColInt) {
+                    $col = Coordinate::stringFromColumnIndex($thisCol);
+                    if ($hideColumns === false || !isset($hiddenColumns[$col])) {
+                        $columnRef = $returnCellRef ? $col : ($thisCol - $minColInt);
+                        $cell = $this->cellCollection->get("{$col}{$thisRow}");
+                        if ($cell !== null) {
+                            $value = $this->cellToArray($cell, $calculateFormulas, $formatData, $nullValue);
+                            if ($value !== $nullValue) {
+                                $returnValue[$columnRef] = $value;
+                            }
+                        }
+                    }
+                }
+                ++$keyIndex;
+            }
+
+            yield $rowRef => $returnValue;
+        }
+    }
+
+    /**
+     * Prepare a row data filled with null values to deduplicate the memory areas for empty rows.
+     *
+     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param string $minCol Start column of the range
+     * @param string $maxCol End column of the range
+     * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                              True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                             True - Don't return values for rows/columns that are defined as hidden.
+     * @param array<string, bool> $hiddenColumns
+     */
+    private function buildNullRow(
+        mixed $nullValue,
+        string $minCol,
+        string $maxCol,
+        bool $returnCellRef,
+        bool $ignoreHidden,
+        array &$hiddenColumns
+    ): array {
+        $nullRow = [];
+        $c = -1;
+        for ($col = $minCol; $col !== $maxCol; ++$col) {
+            if ($ignoreHidden === true && $this->columnDimensionExists($col) && $this->getColumnDimension($col)->getVisible() === false) {
+                $hiddenColumns[$col] = true;
+            } else {
+                $columnRef = $returnCellRef ? $col : ++$c;
+                $nullRow[$columnRef] = $nullValue;
+            }
+        }
+
+        return $nullRow;
+    }
+
+    private function validateNamedRange(string $definedName, bool $returnNullIfInvalid = false): ?DefinedName
+    {
+        $namedRange = DefinedName::resolveName($definedName, $this);
+        if ($namedRange === null) {
+            if ($returnNullIfInvalid) {
+                return null;
+            }
+
+            throw new Exception('Named Range ' . $definedName . ' does not exist.');
+        }
+
+        if ($namedRange->isFormula()) {
+            if ($returnNullIfInvalid) {
+                return null;
+            }
+
+            throw new Exception('Defined Named ' . $definedName . ' is a formula, not a range or cell.');
+        }
+
+        if ($namedRange->getLocalOnly()) {
+            $worksheet = $namedRange->getWorksheet();
+            if ($worksheet === null || $this->getHashCode() !== $worksheet->getHashCode()) {
+                if ($returnNullIfInvalid) {
+                    return null;
+                }
+
+                throw new Exception(
+                    'Named range ' . $definedName . ' is not accessible from within sheet ' . $this->getTitle()
+                );
+            }
+        }
+
+        return $namedRange;
+    }
+
+    /**
+     * Create array from a range of cells.
+     *
+     * @param string $definedName The Named Range that should be returned
+     * @param null|bool|float|int|RichText|string $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param bool $calculateFormulas Should formulas be calculated?
+     * @param bool $formatData Should formatting be applied to cell values?
+     * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                             True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                            True - Don't return values for rows/columns that are defined as hidden.
+     */
+    public function namedRangeToArray(
+        string $definedName,
+        mixed $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false
+    ): array {
+        $retVal = [];
+        $namedRange = $this->validateNamedRange($definedName);
+        if ($namedRange !== null) {
+            $cellRange = ltrim(substr($namedRange->getValue(), (int) strrpos($namedRange->getValue(), '!')), '!');
+            $cellRange = str_replace('$', '', $cellRange);
+            $workSheet = $namedRange->getWorksheet();
+            if ($workSheet !== null) {
+                $retVal = $workSheet->rangeToArray($cellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef, $ignoreHidden);
+            }
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Create array from worksheet.
+     *
+     * @param null|bool|float|int|RichText|string $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param bool $calculateFormulas Should formulas be calculated?
+     * @param bool $formatData Should formatting be applied to cell values?
+     * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                             True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                            True - Don't return values for rows/columns that are defined as hidden.
+     */
+    public function toArray(
+        mixed $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false
+    ): array {
+        // Garbage collect...
+        $this->garbageCollect();
+
+        //    Identify the range that we need to extract from the worksheet
+        $maxCol = $this->getHighestColumn();
+        $maxRow = $this->getHighestRow();
+
+        // Return
+        return $this->rangeToArray("A1:{$maxCol}{$maxRow}", $nullValue, $calculateFormulas, $formatData, $returnCellRef, $ignoreHidden);
+    }
+
+    /**
+     * Get row iterator.
+     *
+     * @param int $startRow The row number at which to start iterating
+     * @param ?int $endRow The row number at which to stop iterating
+     */
+    public function getRowIterator(int $startRow = 1, ?int $endRow = null): RowIterator
+    {
+        return new RowIterator($this, $startRow, $endRow);
+    }
+
+    /**
+     * Get column iterator.
+     *
+     * @param string $startColumn The column address at which to start iterating
+     * @param ?string $endColumn The column address at which to stop iterating
+     */
+    public function getColumnIterator(string $startColumn = 'A', ?string $endColumn = null): ColumnIterator
+    {
+        return new ColumnIterator($this, $startColumn, $endColumn);
+    }
+
+    /**
+     * Run PhpSpreadsheet garbage collector.
+     *
+     * @return $this
+     */
+    public function garbageCollect(): static
+    {
+        // Flush cache
+        $this->cellCollection->get('A1');
+
+        // Lookup highest column and highest row if cells are cleaned
+        $colRow = $this->cellCollection->getHighestRowAndColumn();
+        $highestRow = $colRow['row'];
+        $highestColumn = Coordinate::columnIndexFromString($colRow['column']);
+
+        // Loop through column dimensions
+        foreach ($this->columnDimensions as $dimension) {
+            $highestColumn = max($highestColumn, Coordinate::columnIndexFromString($dimension->getColumnIndex()));
+        }
+
+        // Loop through row dimensions
+        foreach ($this->rowDimensions as $dimension) {
+            $highestRow = max($highestRow, $dimension->getRowIndex());
+        }
+
+        // Cache values
+        if ($highestColumn < 1) {
+            $this->cachedHighestColumn = 1;
+        } else {
+            $this->cachedHighestColumn = $highestColumn;
+        }
+        $this->cachedHighestRow = $highestRow;
+
+        // Return
+        return $this;
+    }
+
+    /**
+     * Get hash code.
+     *
+     * @return string Hash code
+     */
+    public function getHashCode(): string
+    {
+        if ($this->dirty) {
+            $this->hash = md5($this->title . $this->autoFilter . ($this->protection->isProtectionEnabled() ? 't' : 'f') . __CLASS__);
+            $this->dirty = false;
+        }
+
+        return $this->hash;
+    }
+
+    /**
+     * Extract worksheet title from range.
+     *
+     * Example: extractSheetTitle("testSheet!A1") ==> 'A1'
+     * Example: extractSheetTitle("testSheet!A1:C3") ==> 'A1:C3'
+     * Example: extractSheetTitle("'testSheet 1'!A1", true) ==> ['testSheet 1', 'A1'];
+     * Example: extractSheetTitle("'testSheet 1'!A1:C3", true) ==> ['testSheet 1', 'A1:C3'];
+     * Example: extractSheetTitle("A1", true) ==> ['', 'A1'];
+     * Example: extractSheetTitle("A1:C3", true) ==> ['', 'A1:C3']
+     *
+     * @param ?string $range Range to extract title from
+     * @param bool $returnRange Return range? (see example)
+     *
+     * @return ($range is non-empty-string ? ($returnRange is true ? array{0: string, 1: string} : string) : ($returnRange is true ? array{0: null, 1: null} : null))
+     */
+    public static function extractSheetTitle(?string $range, bool $returnRange = false): array|null|string
+    {
+        if (empty($range)) {
+            return $returnRange ? [null, null] : null;
+        }
+
+        // Sheet title included?
+        if (($sep = strrpos($range, '!')) === false) {
+            return $returnRange ? ['', $range] : '';
+        }
+
+        if ($returnRange) {
+            return [substr($range, 0, $sep), substr($range, $sep + 1)];
+        }
+
+        return substr($range, $sep + 1);
+    }
+
+    /**
+     * Get hyperlink.
+     *
+     * @param string $cellCoordinate Cell coordinate to get hyperlink for, eg: 'A1'
+     */
+    public function getHyperlink(string $cellCoordinate): Hyperlink
+    {
+        // return hyperlink if we already have one
+        if (isset($this->hyperlinkCollection[$cellCoordinate])) {
+            return $this->hyperlinkCollection[$cellCoordinate];
+        }
+
+        // else create hyperlink
+        $this->hyperlinkCollection[$cellCoordinate] = new Hyperlink();
+
+        return $this->hyperlinkCollection[$cellCoordinate];
+    }
+
+    /**
+     * Set hyperlink.
+     *
+     * @param string $cellCoordinate Cell coordinate to insert hyperlink, eg: 'A1'
+     *
+     * @return $this
+     */
+    public function setHyperlink(string $cellCoordinate, ?Hyperlink $hyperlink = null): static
+    {
+        if ($hyperlink === null) {
+            unset($this->hyperlinkCollection[$cellCoordinate]);
+        } else {
+            $this->hyperlinkCollection[$cellCoordinate] = $hyperlink;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Hyperlink at a specific coordinate exists?
+     *
+     * @param string $coordinate eg: 'A1'
+     */
+    public function hyperlinkExists(string $coordinate): bool
+    {
+        return isset($this->hyperlinkCollection[$coordinate]);
+    }
+
+    /**
+     * Get collection of hyperlinks.
+     *
+     * @return Hyperlink[]
+     */
+    public function getHyperlinkCollection(): array
+    {
+        return $this->hyperlinkCollection;
+    }
+
+    /**
+     * Get data validation.
+     *
+     * @param string $cellCoordinate Cell coordinate to get data validation for, eg: 'A1'
+     */
+    public function getDataValidation(string $cellCoordinate): DataValidation
+    {
+        // return data validation if we already have one
+        if (isset($this->dataValidationCollection[$cellCoordinate])) {
+            return $this->dataValidationCollection[$cellCoordinate];
+        }
+
+        // else create data validation
+        $this->dataValidationCollection[$cellCoordinate] = new DataValidation();
+
+        return $this->dataValidationCollection[$cellCoordinate];
+    }
+
+    /**
+     * Set data validation.
+     *
+     * @param string $cellCoordinate Cell coordinate to insert data validation, eg: 'A1'
+     *
+     * @return $this
+     */
+    public function setDataValidation(string $cellCoordinate, ?DataValidation $dataValidation = null): static
+    {
+        if ($dataValidation === null) {
+            unset($this->dataValidationCollection[$cellCoordinate]);
+        } else {
+            $this->dataValidationCollection[$cellCoordinate] = $dataValidation;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Data validation at a specific coordinate exists?
+     *
+     * @param string $coordinate eg: 'A1'
+     */
+    public function dataValidationExists(string $coordinate): bool
+    {
+        return isset($this->dataValidationCollection[$coordinate]);
+    }
+
+    /**
+     * Get collection of data validations.
+     *
+     * @return DataValidation[]
+     */
+    public function getDataValidationCollection(): array
+    {
+        return $this->dataValidationCollection;
+    }
+
+    /**
+     * Accepts a range, returning it as a range that falls within the current highest row and column of the worksheet.
+     *
+     * @return string Adjusted range value
+     */
+    public function shrinkRangeToFit(string $range): string
+    {
+        $maxCol = $this->getHighestColumn();
+        $maxRow = $this->getHighestRow();
+        $maxCol = Coordinate::columnIndexFromString($maxCol);
+
+        $rangeBlocks = explode(' ', $range);
+        foreach ($rangeBlocks as &$rangeSet) {
+            $rangeBoundaries = Coordinate::getRangeBoundaries($rangeSet);
+
+            if (Coordinate::columnIndexFromString($rangeBoundaries[0][0]) > $maxCol) {
+                $rangeBoundaries[0][0] = Coordinate::stringFromColumnIndex($maxCol);
+            }
+            if ($rangeBoundaries[0][1] > $maxRow) {
+                $rangeBoundaries[0][1] = $maxRow;
+            }
+            if (Coordinate::columnIndexFromString($rangeBoundaries[1][0]) > $maxCol) {
+                $rangeBoundaries[1][0] = Coordinate::stringFromColumnIndex($maxCol);
+            }
+            if ($rangeBoundaries[1][1] > $maxRow) {
+                $rangeBoundaries[1][1] = $maxRow;
+            }
+            $rangeSet = $rangeBoundaries[0][0] . $rangeBoundaries[0][1] . ':' . $rangeBoundaries[1][0] . $rangeBoundaries[1][1];
+        }
+        unset($rangeSet);
+
+        return implode(' ', $rangeBlocks);
+    }
+
+    /**
+     * Get tab color.
+     */
+    public function getTabColor(): Color
+    {
+        if ($this->tabColor === null) {
+            $this->tabColor = new Color();
+        }
+
+        return $this->tabColor;
+    }
+
+    /**
+     * Reset tab color.
+     *
+     * @return $this
+     */
+    public function resetTabColor(): static
+    {
+        $this->tabColor = null;
+
+        return $this;
+    }
+
+    /**
+     * Tab color set?
+     */
+    public function isTabColorSet(): bool
+    {
+        return $this->tabColor !== null;
+    }
+
+    /**
+     * Copy worksheet (!= clone!).
+     */
+    public function copy(): static
+    {
+        return clone $this;
+    }
+
+    /**
+     * Returns a boolean true if the specified row contains no cells. By default, this means that no cell records
+     *          exist in the collection for this row. false will be returned otherwise.
+     *     This rule can be modified by passing a $definitionOfEmptyFlags value:
+     *          1 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL If the only cells in the collection are null value
+     *                  cells, then the row will be considered empty.
+     *          2 - CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL If the only cells in the collection are empty
+     *                  string value cells, then the row will be considered empty.
+     *          3 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     *                  If the only cells in the collection are null value or empty string value cells, then the row
+     *                  will be considered empty.
+     *
+     * @param int $definitionOfEmptyFlags
+     *              Possible Flag Values are:
+     *                  CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL
+     *                  CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     */
+    public function isEmptyRow(int $rowId, int $definitionOfEmptyFlags = 0): bool
+    {
+        try {
+            $iterator = new RowIterator($this, $rowId, $rowId);
+            $iterator->seek($rowId);
+            $row = $iterator->current();
+        } catch (Exception) {
+            return true;
+        }
+
+        return $row->isEmpty($definitionOfEmptyFlags);
+    }
+
+    /**
+     * Returns a boolean true if the specified column contains no cells. By default, this means that no cell records
+     *          exist in the collection for this column. false will be returned otherwise.
+     *     This rule can be modified by passing a $definitionOfEmptyFlags value:
+     *          1 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL If the only cells in the collection are null value
+     *                  cells, then the column will be considered empty.
+     *          2 - CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL If the only cells in the collection are empty
+     *                  string value cells, then the column will be considered empty.
+     *          3 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     *                  If the only cells in the collection are null value or empty string value cells, then the column
+     *                  will be considered empty.
+     *
+     * @param int $definitionOfEmptyFlags
+     *              Possible Flag Values are:
+     *                  CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL
+     *                  CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     */
+    public function isEmptyColumn(string $columnId, int $definitionOfEmptyFlags = 0): bool
+    {
+        try {
+            $iterator = new ColumnIterator($this, $columnId, $columnId);
+            $iterator->seek($columnId);
+            $column = $iterator->current();
+        } catch (Exception) {
+            return true;
+        }
+
+        return $column->isEmpty($definitionOfEmptyFlags);
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        // @phpstan-ignore-next-line
+        foreach ($this as $key => $val) {
+            if ($key == 'parent') {
+                continue;
+            }
+
+            if (is_object($val) || (is_array($val))) {
+                if ($key == 'cellCollection') {
+                    $newCollection = $this->cellCollection->cloneCellCollection($this);
+                    $this->cellCollection = $newCollection;
+                } elseif ($key == 'drawingCollection') {
+                    $currentCollection = $this->drawingCollection;
+                    $this->drawingCollection = new ArrayObject();
+                    foreach ($currentCollection as $item) {
+                        $newDrawing = clone $item;
+                        $newDrawing->setWorksheet($this);
+                    }
+                } elseif ($key == 'tableCollection') {
+                    $currentCollection = $this->tableCollection;
+                    $this->tableCollection = new ArrayObject();
+                    foreach ($currentCollection as $item) {
+                        $newTable = clone $item;
+                        $newTable->setName($item->getName() . 'clone');
+                        $this->addTable($newTable);
+                    }
+                } elseif ($key == 'chartCollection') {
+                    $currentCollection = $this->chartCollection;
+                    $this->chartCollection = new ArrayObject();
+                    foreach ($currentCollection as $item) {
+                        $newChart = clone $item;
+                        $this->addChart($newChart);
+                    }
+                } elseif (($key == 'autoFilter') && ($this->autoFilter instanceof AutoFilter)) {
+                    $newAutoFilter = clone $this->autoFilter;
+                    $this->autoFilter = $newAutoFilter;
+                    $this->autoFilter->setParent($this);
+                } else {
+                    $this->{$key} = unserialize(serialize($val));
+                }
+            }
+        }
+    }
+
+    /**
+     * Define the code name of the sheet.
+     *
+     * @param string $codeName Same rule as Title minus space not allowed (but, like Excel, change
+     *                       silently space to underscore)
+     * @param bool $validate False to skip validation of new title. WARNING: This should only be set
+     *                       at parse time (by Readers), where titles can be assumed to be valid.
+     *
+     * @return $this
+     */
+    public function setCodeName(string $codeName, bool $validate = true): static
+    {
+        // Is this a 'rename' or not?
+        if ($this->getCodeName() == $codeName) {
+            return $this;
+        }
+
+        if ($validate) {
+            $codeName = str_replace(' ', '_', $codeName); //Excel does this automatically without flinching, we are doing the same
+
+            // Syntax check
+            // throw an exception if not valid
+            self::checkSheetCodeName($codeName);
+
+            // We use the same code that setTitle to find a valid codeName else not using a space (Excel don't like) but a '_'
+
+            if ($this->parent !== null) {
+                // Is there already such sheet name?
+                if ($this->parent->sheetCodeNameExists($codeName)) {
+                    // Use name, but append with lowest possible integer
+
+                    if (Shared\StringHelper::countCharacters($codeName) > 29) {
+                        $codeName = Shared\StringHelper::substring($codeName, 0, 29);
+                    }
+                    $i = 1;
+                    while ($this->getParentOrThrow()->sheetCodeNameExists($codeName . '_' . $i)) {
+                        ++$i;
+                        if ($i == 10) {
+                            if (Shared\StringHelper::countCharacters($codeName) > 28) {
+                                $codeName = Shared\StringHelper::substring($codeName, 0, 28);
+                            }
+                        } elseif ($i == 100) {
+                            if (Shared\StringHelper::countCharacters($codeName) > 27) {
+                                $codeName = Shared\StringHelper::substring($codeName, 0, 27);
+                            }
+                        }
+                    }
+
+                    $codeName .= '_' . $i; // ok, we have a valid name
+                }
+            }
+        }
+
+        $this->codeName = $codeName;
+
+        return $this;
+    }
+
+    /**
+     * Return the code name of the sheet.
+     */
+    public function getCodeName(): ?string
+    {
+        return $this->codeName;
+    }
+
+    /**
+     * Sheet has a code name ?
+     */
+    public function hasCodeName(): bool
+    {
+        return $this->codeName !== null;
+    }
+
+    public static function nameRequiresQuotes(string $sheetName): bool
+    {
+        return preg_match(self::SHEET_NAME_REQUIRES_NO_QUOTES, $sheetName) !== 1;
+    }
+
+    public function isRowVisible(int $row): bool
+    {
+        return !$this->rowDimensionExists($row) || $this->getRowDimension($row)->getVisible();
+    }
+
+    /**
+     * Same as Cell->isLocked, but without creating cell if it doesn't exist.
+     */
+    public function isCellLocked(string $coordinate): bool
+    {
+        if ($this->getProtection()->getsheet() !== true) {
+            return false;
+        }
+        if ($this->cellExists($coordinate)) {
+            return $this->getCell($coordinate)->isLocked();
+        }
+        $spreadsheet = $this->parent;
+        $xfIndex = $this->getXfIndex($coordinate);
+        if ($spreadsheet === null || $xfIndex === null) {
+            return true;
+        }
+
+        return $spreadsheet->getCellXfByIndex($xfIndex)->getProtection()->getLocked() !== StyleProtection::PROTECTION_UNPROTECTED;
+    }
+
+    /**
+     * Same as Cell->isHiddenOnFormulaBar, but without creating cell if it doesn't exist.
+     */
+    public function isCellHiddenOnFormulaBar(string $coordinate): bool
+    {
+        if ($this->cellExists($coordinate)) {
+            return $this->getCell($coordinate)->isHiddenOnFormulaBar();
+        }
+
+        // cell doesn't exist, therefore isn't a formula,
+        // therefore isn't hidden on formula bar.
+        return false;
+    }
+
+    private function getXfIndex(string $coordinate): ?int
+    {
+        [$column, $row] = Coordinate::coordinateFromString($coordinate);
+        $row = (int) $row;
+        $xfIndex = null;
+        if ($this->rowDimensionExists($row)) {
+            $xfIndex = $this->getRowDimension($row)->getXfIndex();
+        }
+        if ($xfIndex === null && $this->ColumnDimensionExists($column)) {
+            $xfIndex = $this->getColumnDimension($column)->getXfIndex();
+        }
+
+        return $xfIndex;
+    }
+
+    private string $backgroundImage = '';
+
+    private string $backgroundMime = '';
+
+    private string $backgroundExtension = '';
+
+    public function getBackgroundImage(): string
+    {
+        return $this->backgroundImage;
+    }
+
+    public function getBackgroundMime(): string
+    {
+        return $this->backgroundMime;
+    }
+
+    public function getBackgroundExtension(): string
+    {
+        return $this->backgroundExtension;
+    }
+
+    /**
+     * Set background image.
+     * Used on read/write for Xlsx.
+     * Used on write for Html.
+     *
+     * @param string $backgroundImage Image represented as a string, e.g. results of file_get_contents
+     */
+    public function setBackgroundImage(string $backgroundImage): self
+    {
+        $imageArray = getimagesizefromstring($backgroundImage) ?: ['mime' => ''];
+        $mime = $imageArray['mime'];
+        if ($mime !== '') {
+            $extension = explode('/', $mime);
+            $extension = $extension[1];
+            $this->backgroundImage = $backgroundImage;
+            $this->backgroundMime = $mime;
+            $this->backgroundExtension = $extension;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Copy cells, adjusting relative cell references in formulas.
+     * Acts similarly to Excel "fill handle" feature.
+     *
+     * @param string $fromCell Single source cell, e.g. C3
+     * @param string $toCells Single cell or cell range, e.g. C4 or C4:C10
+     * @param bool $copyStyle Copy styles as well as values, defaults to true
+     */
+    public function copyCells(string $fromCell, string $toCells, bool $copyStyle = true): void
+    {
+        $toArray = Coordinate::extractAllCellReferencesInRange($toCells);
+        $valueString = $this->getCell($fromCell)->getValueString();
+        $style = $this->getStyle($fromCell)->exportArray();
+        $fromIndexes = Coordinate::indexesFromString($fromCell);
+        $referenceHelper = ReferenceHelper::getInstance();
+        foreach ($toArray as $destination) {
+            if ($destination !== $fromCell) {
+                $toIndexes = Coordinate::indexesFromString($destination);
+                $this->getCell($destination)->setValue($referenceHelper->updateFormulaReferences($valueString, 'A1', $toIndexes[0] - $fromIndexes[0], $toIndexes[1] - $fromIndexes[1]));
+                if ($copyStyle) {
+                    $this->getCell($destination)->getStyle()->applyFromArray($style);
+                }
+            }
+        }
+    }
+
+    public function applyStylesFromArray(string $coordinate, array $styleArray): bool
+    {
+        $spreadsheet = $this->parent;
+        if ($spreadsheet === null) {
+            return false;
+        }
+        $activeSheetIndex = $spreadsheet->getActiveSheetIndex();
+        $originalSelected = $this->selectedCells;
+        $this->getStyle($coordinate)->applyFromArray($styleArray);
+        $this->selectedCells = $originalSelected;
+        if ($activeSheetIndex >= 0) {
+            $spreadsheet->setActiveSheetIndex($activeSheetIndex);
+        }
+
+        return true;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php
new file mode 100644
index 00000000..38832441
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+abstract class BaseWriter implements IWriter
+{
+    /**
+     * Write charts that are defined in the workbook?
+     * Identifies whether the Writer should write definitions for any charts that exist in the PhpSpreadsheet object.
+     */
+    protected bool $includeCharts = false;
+
+    /**
+     * Pre-calculate formulas
+     * Forces PhpSpreadsheet to recalculate all formulae in a workbook when saving, so that the pre-calculated values are
+     * immediately available to MS Excel or other office spreadsheet viewer when opening the file.
+     */
+    protected bool $preCalculateFormulas = true;
+
+    /**
+     * Use disk caching where possible?
+     */
+    private bool $useDiskCaching = false;
+
+    /**
+     * Disk caching directory.
+     */
+    private string $diskCachingDirectory = './';
+
+    /**
+     * @var resource
+     */
+    protected $fileHandle;
+
+    private bool $shouldCloseFile;
+
+    public function getIncludeCharts(): bool
+    {
+        return $this->includeCharts;
+    }
+
+    public function setIncludeCharts(bool $includeCharts): self
+    {
+        $this->includeCharts = $includeCharts;
+
+        return $this;
+    }
+
+    public function getPreCalculateFormulas(): bool
+    {
+        return $this->preCalculateFormulas;
+    }
+
+    public function setPreCalculateFormulas(bool $precalculateFormulas): self
+    {
+        $this->preCalculateFormulas = $precalculateFormulas;
+
+        return $this;
+    }
+
+    public function getUseDiskCaching(): bool
+    {
+        return $this->useDiskCaching;
+    }
+
+    public function setUseDiskCaching(bool $useDiskCache, ?string $cacheDirectory = null): self
+    {
+        $this->useDiskCaching = $useDiskCache;
+
+        if ($cacheDirectory !== null) {
+            if (is_dir($cacheDirectory)) {
+                $this->diskCachingDirectory = $cacheDirectory;
+            } else {
+                throw new Exception("Directory does not exist: $cacheDirectory");
+            }
+        }
+
+        return $this;
+    }
+
+    public function getDiskCachingDirectory(): string
+    {
+        return $this->diskCachingDirectory;
+    }
+
+    protected function processFlags(int $flags): void
+    {
+        if (((bool) ($flags & self::SAVE_WITH_CHARTS)) === true) {
+            $this->setIncludeCharts(true);
+        }
+        if (((bool) ($flags & self::DISABLE_PRECALCULATE_FORMULAE)) === true) {
+            $this->setPreCalculateFormulas(false);
+        }
+    }
+
+    /**
+     * Open file handle.
+     *
+     * @param resource|string $filename
+     */
+    public function openFileHandle($filename): void
+    {
+        if (is_resource($filename)) {
+            $this->fileHandle = $filename;
+            $this->shouldCloseFile = false;
+
+            return;
+        }
+
+        $mode = 'wb';
+        $scheme = parse_url($filename, PHP_URL_SCHEME);
+        if ($scheme === 's3') {
+            // @codeCoverageIgnoreStart
+            $mode = 'w';
+            // @codeCoverageIgnoreEnd
+        }
+        $fileHandle = $filename ? fopen($filename, $mode) : false;
+        if ($fileHandle === false) {
+            throw new Exception('Could not open file "' . $filename . '" for writing.');
+        }
+
+        $this->fileHandle = $fileHandle;
+        $this->shouldCloseFile = true;
+    }
+
+    /**
+     * Close file handle only if we opened it ourselves.
+     */
+    protected function maybeCloseFileHandle(): void
+    {
+        if ($this->shouldCloseFile) {
+            if (!fclose($this->fileHandle)) {
+                throw new Exception('Could not close file after writing.');
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php
new file mode 100644
index 00000000..de7de30a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php
@@ -0,0 +1,346 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use Stringable;
+
+class Csv extends BaseWriter
+{
+    /**
+     * PhpSpreadsheet object.
+     */
+    private Spreadsheet $spreadsheet;
+
+    /**
+     * Delimiter.
+     */
+    private string $delimiter = ',';
+
+    /**
+     * Enclosure.
+     */
+    private string $enclosure = '"';
+
+    /**
+     * Line ending.
+     */
+    private string $lineEnding = PHP_EOL;
+
+    /**
+     * Sheet index to write.
+     */
+    private int $sheetIndex = 0;
+
+    /**
+     * Whether to write a UTF8 BOM.
+     */
+    private bool $useBOM = false;
+
+    /**
+     * Whether to write a Separator line as the first line of the file
+     *     sep=x.
+     */
+    private bool $includeSeparatorLine = false;
+
+    /**
+     * Whether to write a fully Excel compatible CSV file.
+     */
+    private bool $excelCompatibility = false;
+
+    /**
+     * Output encoding.
+     */
+    private string $outputEncoding = '';
+
+    /**
+     * Whether number of columns should be allowed to vary
+     * between rows, or use a fixed range based on the max
+     * column overall.
+     */
+    private bool $variableColumns = false;
+
+    /**
+     * Create a new CSV.
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    /**
+     * Save PhpSpreadsheet to file.
+     *
+     * @param resource|string $filename
+     */
+    public function save($filename, int $flags = 0): void
+    {
+        $this->processFlags($flags);
+
+        // Fetch sheet
+        $sheet = $this->spreadsheet->getSheet($this->sheetIndex);
+
+        $saveDebugLog = Calculation::getInstance($this->spreadsheet)->getDebugLog()->getWriteDebugLog();
+        Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog(false);
+        $saveArrayReturnType = Calculation::getArrayReturnType();
+        Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
+
+        // Open file
+        $this->openFileHandle($filename);
+
+        if ($this->excelCompatibility) {
+            $this->setUseBOM(true); //  Enforce UTF-8 BOM Header
+            $this->setIncludeSeparatorLine(true); //  Set separator line
+            $this->setEnclosure('"'); //  Set enclosure to "
+            $this->setDelimiter(';'); //  Set delimiter to a semi-colon
+            $this->setLineEnding("\r\n");
+        }
+
+        if ($this->useBOM) {
+            // Write the UTF-8 BOM code if required
+            fwrite($this->fileHandle, "\xEF\xBB\xBF");
+        }
+
+        if ($this->includeSeparatorLine) {
+            // Write the separator line if required
+            fwrite($this->fileHandle, 'sep=' . $this->getDelimiter() . $this->lineEnding);
+        }
+
+        //    Identify the range that we need to extract from the worksheet
+        $maxCol = $sheet->getHighestDataColumn();
+        $maxRow = $sheet->getHighestDataRow();
+
+        // Write rows to file
+        $row = 0;
+        foreach ($sheet->rangeToArrayYieldRows("A1:$maxCol$maxRow", '', $this->preCalculateFormulas) as $cellsArray) {
+            ++$row;
+            if ($this->variableColumns) {
+                $column = $sheet->getHighestDataColumn($row);
+                if ($column === 'A' && !$sheet->cellExists("A$row")) {
+                    $cellsArray = [];
+                } else {
+                    array_splice($cellsArray, Coordinate::columnIndexFromString($column));
+                }
+            }
+            $this->writeLine($this->fileHandle, $cellsArray);
+        }
+
+        $this->maybeCloseFileHandle();
+        Calculation::setArrayReturnType($saveArrayReturnType);
+        Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+    }
+
+    public function getDelimiter(): string
+    {
+        return $this->delimiter;
+    }
+
+    public function setDelimiter(string $delimiter): self
+    {
+        $this->delimiter = $delimiter;
+
+        return $this;
+    }
+
+    public function getEnclosure(): string
+    {
+        return $this->enclosure;
+    }
+
+    public function setEnclosure(string $enclosure = '"'): self
+    {
+        $this->enclosure = $enclosure;
+
+        return $this;
+    }
+
+    public function getLineEnding(): string
+    {
+        return $this->lineEnding;
+    }
+
+    public function setLineEnding(string $lineEnding): self
+    {
+        $this->lineEnding = $lineEnding;
+
+        return $this;
+    }
+
+    /**
+     * Get whether BOM should be used.
+     */
+    public function getUseBOM(): bool
+    {
+        return $this->useBOM;
+    }
+
+    /**
+     * Set whether BOM should be used, typically when non-ASCII characters are used.
+     */
+    public function setUseBOM(bool $useBOM): self
+    {
+        $this->useBOM = $useBOM;
+
+        return $this;
+    }
+
+    /**
+     * Get whether a separator line should be included.
+     */
+    public function getIncludeSeparatorLine(): bool
+    {
+        return $this->includeSeparatorLine;
+    }
+
+    /**
+     * Set whether a separator line should be included as the first line of the file.
+     */
+    public function setIncludeSeparatorLine(bool $includeSeparatorLine): self
+    {
+        $this->includeSeparatorLine = $includeSeparatorLine;
+
+        return $this;
+    }
+
+    /**
+     * Get whether the file should be saved with full Excel Compatibility.
+     */
+    public function getExcelCompatibility(): bool
+    {
+        return $this->excelCompatibility;
+    }
+
+    /**
+     * Set whether the file should be saved with full Excel Compatibility.
+     *
+     * @param bool $excelCompatibility Set the file to be written as a fully Excel compatible csv file
+     *                                Note that this overrides other settings such as useBOM, enclosure and delimiter
+     */
+    public function setExcelCompatibility(bool $excelCompatibility): self
+    {
+        $this->excelCompatibility = $excelCompatibility;
+
+        return $this;
+    }
+
+    public function getSheetIndex(): int
+    {
+        return $this->sheetIndex;
+    }
+
+    public function setSheetIndex(int $sheetIndex): self
+    {
+        $this->sheetIndex = $sheetIndex;
+
+        return $this;
+    }
+
+    public function getOutputEncoding(): string
+    {
+        return $this->outputEncoding;
+    }
+
+    public function setOutputEncoding(string $outputEnconding): self
+    {
+        $this->outputEncoding = $outputEnconding;
+
+        return $this;
+    }
+
+    private bool $enclosureRequired = true;
+
+    public function setEnclosureRequired(bool $value): self
+    {
+        $this->enclosureRequired = $value;
+
+        return $this;
+    }
+
+    public function getEnclosureRequired(): bool
+    {
+        return $this->enclosureRequired;
+    }
+
+    /**
+     * Convert boolean to TRUE/FALSE; otherwise return element cast to string.
+     *
+     * @param null|bool|float|int|string|Stringable $element element to be converted
+     */
+    private static function elementToString(mixed $element): string
+    {
+        if (is_bool($element)) {
+            return $element ? 'TRUE' : 'FALSE';
+        }
+
+        return (string) $element;
+    }
+
+    /**
+     * Write line to CSV file.
+     *
+     * @param resource $fileHandle PHP filehandle
+     * @param array $values Array containing values in a row
+     */
+    private function writeLine($fileHandle, array $values): void
+    {
+        // No leading delimiter
+        $delimiter = '';
+
+        // Build the line
+        $line = '';
+
+        /** @var null|bool|float|int|string|Stringable $element */
+        foreach ($values as $element) {
+            $element = self::elementToString($element);
+            // Add delimiter
+            $line .= $delimiter;
+            $delimiter = $this->delimiter;
+            // Escape enclosures
+            $enclosure = $this->enclosure;
+            if ($enclosure) {
+                // If enclosure is not required, use enclosure only if
+                // element contains newline, delimiter, or enclosure.
+                if (!$this->enclosureRequired && strpbrk($element, "$delimiter$enclosure\n") === false) {
+                    $enclosure = '';
+                } else {
+                    $element = str_replace($enclosure, $enclosure . $enclosure, $element);
+                }
+            }
+            // Add enclosed string
+            $line .= $enclosure . $element . $enclosure;
+        }
+
+        // Add line ending
+        $line .= $this->lineEnding;
+
+        // Write to file
+        if ($this->outputEncoding != '') {
+            $line = mb_convert_encoding($line, $this->outputEncoding);
+        }
+        fwrite($fileHandle, $line);
+    }
+
+    /**
+     * Get whether number of columns should be allowed to vary
+     * between rows, or use a fixed range based on the max
+     * column overall.
+     */
+    public function getVariableColumns(): bool
+    {
+        return $this->variableColumns;
+    }
+
+    /**
+     * Set whether number of columns should be allowed to vary
+     * between rows, or use a fixed range based on the max
+     * column overall.
+     */
+    public function setVariableColumns(bool $pValue): self
+    {
+        $this->variableColumns = $pValue;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Exception.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Exception.php
new file mode 100644
index 00000000..92e6f5f4
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+
+class Exception extends PhpSpreadsheetException
+{
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php
new file mode 100644
index 00000000..37a9c899
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php
@@ -0,0 +1,1884 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\RichText\Run;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Shared\Font as SharedFont;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Html extends BaseWriter
+{
+    private const DEFAULT_CELL_WIDTH_POINTS = 42;
+
+    private const DEFAULT_CELL_WIDTH_PIXELS = 56;
+
+    /**
+     * Migration aid to tell if html tags will be treated as plaintext in comments.
+     *     if (
+     *         defined(
+     *             \PhpOffice\PhpSpreadsheet\Writer\Html::class
+     *             . '::COMMENT_HTML_TAGS_PLAINTEXT'
+     *         )
+     *     ) {
+     *         new logic with styling in TextRun elements
+     *     } else {
+     *         old logic with styling via Html tags
+     *     }.
+     */
+    public const COMMENT_HTML_TAGS_PLAINTEXT = true;
+
+    /**
+     * Spreadsheet object.
+     */
+    protected Spreadsheet $spreadsheet;
+
+    /**
+     * Sheet index to write.
+     */
+    private ?int $sheetIndex = 0;
+
+    /**
+     * Images root.
+     */
+    private string $imagesRoot = '';
+
+    /**
+     * embed images, or link to images.
+     */
+    protected bool $embedImages = false;
+
+    /**
+     * Use inline CSS?
+     */
+    private bool $useInlineCss = false;
+
+    /**
+     * Array of CSS styles.
+     */
+    private ?array $cssStyles = null;
+
+    /**
+     * Array of column widths in points.
+     */
+    private array $columnWidths;
+
+    /**
+     * Default font.
+     */
+    private Font $defaultFont;
+
+    /**
+     * Flag whether spans have been calculated.
+     */
+    private bool $spansAreCalculated = false;
+
+    /**
+     * Excel cells that should not be written as HTML cells.
+     */
+    private array $isSpannedCell = [];
+
+    /**
+     * Excel cells that are upper-left corner in a cell merge.
+     */
+    private array $isBaseCell = [];
+
+    /**
+     * Excel rows that should not be written as HTML rows.
+     */
+    private array $isSpannedRow = [];
+
+    /**
+     * Is the current writer creating PDF?
+     */
+    protected bool $isPdf = false;
+
+    /**
+     * Is the current writer creating mPDF?
+     *
+     * @deprecated 2.0.1 use instanceof Mpdf instead
+     */
+    protected bool $isMPdf = false;
+
+    /**
+     * Generate the Navigation block.
+     */
+    private bool $generateSheetNavigationBlock = true;
+
+    /**
+     * Callback for editing generated html.
+     *
+     * @var null|callable
+     */
+    private $editHtmlCallback;
+
+    /** @var BaseDrawing[] */
+    private $sheetDrawings;
+
+    /** @var Chart[] */
+    private $sheetCharts;
+
+    /**
+     * Create a new HTML.
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+        $this->defaultFont = $this->spreadsheet->getDefaultStyle()->getFont();
+    }
+
+    /**
+     * Save Spreadsheet to file.
+     *
+     * @param resource|string $filename
+     */
+    public function save($filename, int $flags = 0): void
+    {
+        $this->processFlags($flags);
+
+        // Open file
+        $this->openFileHandle($filename);
+
+        // Write html
+        fwrite($this->fileHandle, $this->generateHTMLAll());
+
+        // Close file
+        $this->maybeCloseFileHandle();
+    }
+
+    /**
+     * Save Spreadsheet as html to variable.
+     */
+    public function generateHtmlAll(): string
+    {
+        // garbage collect
+        $this->spreadsheet->garbageCollect();
+
+        $saveDebugLog = Calculation::getInstance($this->spreadsheet)->getDebugLog()->getWriteDebugLog();
+        Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog(false);
+        $saveArrayReturnType = Calculation::getArrayReturnType();
+        Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
+
+        // Build CSS
+        $this->buildCSS(!$this->useInlineCss);
+
+        $html = '';
+
+        // Write headers
+        $html .= $this->generateHTMLHeader(!$this->useInlineCss);
+
+        // Write navigation (tabs)
+        if ((!$this->isPdf) && ($this->generateSheetNavigationBlock)) {
+            $html .= $this->generateNavigation();
+        }
+
+        // Write data
+        $html .= $this->generateSheetData();
+
+        // Write footer
+        $html .= $this->generateHTMLFooter();
+        $callback = $this->editHtmlCallback;
+        if ($callback) {
+            $html = $callback($html);
+        }
+
+        Calculation::setArrayReturnType($saveArrayReturnType);
+        Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+
+        return $html;
+    }
+
+    /**
+     * Set a callback to edit the entire HTML.
+     *
+     * The callback must accept the HTML as string as first parameter,
+     * and it must return the edited HTML as string.
+     */
+    public function setEditHtmlCallback(?callable $callback): void
+    {
+        $this->editHtmlCallback = $callback;
+    }
+
+    /**
+     * Map VAlign.
+     *
+     * @param string $vAlign Vertical alignment
+     */
+    private function mapVAlign(string $vAlign): string
+    {
+        return Alignment::VERTICAL_ALIGNMENT_FOR_HTML[$vAlign] ?? '';
+    }
+
+    /**
+     * Map HAlign.
+     *
+     * @param string $hAlign Horizontal alignment
+     */
+    private function mapHAlign(string $hAlign): string
+    {
+        return Alignment::HORIZONTAL_ALIGNMENT_FOR_HTML[$hAlign] ?? '';
+    }
+
+    const BORDER_NONE = 'none';
+    const BORDER_ARR = [
+        Border::BORDER_NONE => self::BORDER_NONE,
+        Border::BORDER_DASHDOT => '1px dashed',
+        Border::BORDER_DASHDOTDOT => '1px dotted',
+        Border::BORDER_DASHED => '1px dashed',
+        Border::BORDER_DOTTED => '1px dotted',
+        Border::BORDER_DOUBLE => '3px double',
+        Border::BORDER_HAIR => '1px solid',
+        Border::BORDER_MEDIUM => '2px solid',
+        Border::BORDER_MEDIUMDASHDOT => '2px dashed',
+        Border::BORDER_MEDIUMDASHDOTDOT => '2px dotted',
+        Border::BORDER_SLANTDASHDOT => '2px dashed',
+        Border::BORDER_THICK => '3px solid',
+    ];
+
+    /**
+     * Map border style.
+     *
+     * @param int|string $borderStyle Sheet index
+     */
+    private function mapBorderStyle($borderStyle): string
+    {
+        return self::BORDER_ARR[$borderStyle] ?? '1px solid';
+    }
+
+    /**
+     * Get sheet index.
+     */
+    public function getSheetIndex(): ?int
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index.
+     *
+     * @param int $sheetIndex Sheet index
+     *
+     * @return $this
+     */
+    public function setSheetIndex(int $sheetIndex): static
+    {
+        $this->sheetIndex = $sheetIndex;
+
+        return $this;
+    }
+
+    /**
+     * Get sheet index.
+     */
+    public function getGenerateSheetNavigationBlock(): bool
+    {
+        return $this->generateSheetNavigationBlock;
+    }
+
+    /**
+     * Set sheet index.
+     *
+     * @param bool $generateSheetNavigationBlock Flag indicating whether the sheet navigation block should be generated or not
+     *
+     * @return $this
+     */
+    public function setGenerateSheetNavigationBlock(bool $generateSheetNavigationBlock): static
+    {
+        $this->generateSheetNavigationBlock = (bool) $generateSheetNavigationBlock;
+
+        return $this;
+    }
+
+    /**
+     * Write all sheets (resets sheetIndex to NULL).
+     *
+     * @return $this
+     */
+    public function writeAllSheets(): static
+    {
+        $this->sheetIndex = null;
+
+        return $this;
+    }
+
+    private static function generateMeta(?string $val, string $desc): string
+    {
+        return ($val || $val === '0')
+            ? ('      <meta name="' . $desc . '" content="' . htmlspecialchars($val, Settings::htmlEntityFlags()) . '" />' . PHP_EOL)
+            : '';
+    }
+
+    public const BODY_LINE = '  <body>' . PHP_EOL;
+
+    private const CUSTOM_TO_META = [
+        Properties::PROPERTY_TYPE_BOOLEAN => 'bool',
+        Properties::PROPERTY_TYPE_DATE => 'date',
+        Properties::PROPERTY_TYPE_FLOAT => 'float',
+        Properties::PROPERTY_TYPE_INTEGER => 'int',
+        Properties::PROPERTY_TYPE_STRING => 'string',
+    ];
+
+    /**
+     * Generate HTML header.
+     *
+     * @param bool $includeStyles Include styles?
+     */
+    public function generateHTMLHeader(bool $includeStyles = false): string
+    {
+        // Construct HTML
+        $properties = $this->spreadsheet->getProperties();
+        $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . PHP_EOL;
+        $html .= '<html xmlns="http://www.w3.org/1999/xhtml">' . PHP_EOL;
+        $html .= '  <head>' . PHP_EOL;
+        $html .= '      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . PHP_EOL;
+        $html .= '      <meta name="generator" content="PhpSpreadsheet, https://github.com/PHPOffice/PhpSpreadsheet" />' . PHP_EOL;
+        $title = $properties->getTitle();
+        if ($title === '') {
+            $title = $this->spreadsheet->getActiveSheet()->getTitle();
+        }
+        $html .= '      <title>' . htmlspecialchars($title, Settings::htmlEntityFlags()) . '</title>' . PHP_EOL;
+        $html .= self::generateMeta($properties->getCreator(), 'author');
+        $html .= self::generateMeta($properties->getTitle(), 'title');
+        $html .= self::generateMeta($properties->getDescription(), 'description');
+        $html .= self::generateMeta($properties->getSubject(), 'subject');
+        $html .= self::generateMeta($properties->getKeywords(), 'keywords');
+        $html .= self::generateMeta($properties->getCategory(), 'category');
+        $html .= self::generateMeta($properties->getCompany(), 'company');
+        $html .= self::generateMeta($properties->getManager(), 'manager');
+        $html .= self::generateMeta($properties->getLastModifiedBy(), 'lastModifiedBy');
+        $html .= self::generateMeta($properties->getViewport(), 'viewport');
+        $date = Date::dateTimeFromTimestamp((string) $properties->getCreated());
+        $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+        $html .= self::generateMeta($date->format(DATE_W3C), 'created');
+        $date = Date::dateTimeFromTimestamp((string) $properties->getModified());
+        $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+        $html .= self::generateMeta($date->format(DATE_W3C), 'modified');
+
+        $customProperties = $properties->getCustomProperties();
+        foreach ($customProperties as $customProperty) {
+            $propertyValue = $properties->getCustomPropertyValue($customProperty);
+            $propertyType = $properties->getCustomPropertyType($customProperty);
+            $propertyQualifier = self::CUSTOM_TO_META[$propertyType] ?? null;
+            if ($propertyQualifier !== null) {
+                if ($propertyType === Properties::PROPERTY_TYPE_BOOLEAN) {
+                    $propertyValue = $propertyValue ? '1' : '0';
+                } elseif ($propertyType === Properties::PROPERTY_TYPE_DATE) {
+                    $date = Date::dateTimeFromTimestamp((string) $propertyValue);
+                    $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+                    $propertyValue = $date->format(DATE_W3C);
+                } else {
+                    $propertyValue = (string) $propertyValue;
+                }
+                $html .= self::generateMeta($propertyValue, "custom.$propertyQualifier.$customProperty");
+            }
+        }
+
+        if (!empty($properties->getHyperlinkBase())) {
+            $html .= '      <base href="' . $properties->getHyperlinkBase() . '" />' . PHP_EOL;
+        }
+
+        $html .= $includeStyles ? $this->generateStyles(true) : $this->generatePageDeclarations(true);
+
+        $html .= '  </head>' . PHP_EOL;
+        $html .= '' . PHP_EOL;
+        $html .= self::BODY_LINE;
+
+        return $html;
+    }
+
+    private function generateSheetPrep(): array
+    {
+        // Ensure that Spans have been calculated?
+        $this->calculateSpans();
+
+        // Fetch sheets
+        if ($this->sheetIndex === null) {
+            $sheets = $this->spreadsheet->getAllSheets();
+        } else {
+            $sheets = [$this->spreadsheet->getSheet($this->sheetIndex)];
+        }
+
+        return $sheets;
+    }
+
+    private function generateSheetStarts(Worksheet $sheet, int $rowMin): array
+    {
+        // calculate start of <tbody>, <thead>
+        $tbodyStart = $rowMin;
+        $theadStart = $theadEnd = 0; // default: no <thead>    no </thead>
+        if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+            $rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop();
+
+            // we can only support repeating rows that start at top row
+            if ($rowsToRepeatAtTop[0] == 1) {
+                $theadStart = $rowsToRepeatAtTop[0];
+                $theadEnd = $rowsToRepeatAtTop[1];
+                $tbodyStart = $rowsToRepeatAtTop[1] + 1;
+            }
+        }
+
+        return [$theadStart, $theadEnd, $tbodyStart];
+    }
+
+    private function generateSheetTags(int $row, int $theadStart, int $theadEnd, int $tbodyStart): array
+    {
+        // <thead> ?
+        $startTag = ($row == $theadStart) ? ('        <thead>' . PHP_EOL) : '';
+        if (!$startTag) {
+            $startTag = ($row == $tbodyStart) ? ('        <tbody>' . PHP_EOL) : '';
+        }
+        $endTag = ($row == $theadEnd) ? ('        </thead>' . PHP_EOL) : '';
+        $cellType = ($row >= $tbodyStart) ? 'td' : 'th';
+
+        return [$cellType, $startTag, $endTag];
+    }
+
+    /**
+     * Generate sheet data.
+     */
+    public function generateSheetData(): string
+    {
+        $sheets = $this->generateSheetPrep();
+
+        // Construct HTML
+        $html = '';
+
+        // Loop all sheets
+        $sheetId = 0;
+        foreach ($sheets as $sheet) {
+            // Write table header
+            $html .= $this->generateTableHeader($sheet);
+            $this->sheetCharts = [];
+            $this->sheetDrawings = [];
+
+            // Get worksheet dimension
+            [$min, $max] = explode(':', $sheet->calculateWorksheetDataDimension());
+            [$minCol, $minRow, $minColString] = Coordinate::indexesFromString($min);
+            [$maxCol, $maxRow] = Coordinate::indexesFromString($max);
+            $this->extendRowsAndColumns($sheet, $maxCol, $maxRow);
+
+            [$theadStart, $theadEnd, $tbodyStart] = $this->generateSheetStarts($sheet, $minRow);
+
+            // Loop through cells
+            $row = $minRow - 1;
+            while ($row++ < $maxRow) {
+                [$cellType, $startTag, $endTag] = $this->generateSheetTags($row, $theadStart, $theadEnd, $tbodyStart);
+                $html .= $startTag;
+
+                // Write row if there are HTML table cells in it
+                if ($this->shouldGenerateRow($sheet, $row) && !isset($this->isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row])) {
+                    // Start a new rowData
+                    $rowData = [];
+                    // Loop through columns
+                    $column = $minCol;
+                    $colStr = $minColString;
+                    while ($column <= $maxCol) {
+                        // Cell exists?
+                        $cellAddress = Coordinate::stringFromColumnIndex($column) . $row;
+                        if ($this->shouldGenerateColumn($sheet, $colStr)) {
+                            $rowData[$column] = ($sheet->getCellCollection()->has($cellAddress)) ? $cellAddress : '';
+                        }
+                        ++$column;
+                        ++$colStr;
+                    }
+                    $html .= $this->generateRow($sheet, $rowData, $row - 1, $cellType);
+                }
+
+                $html .= $endTag;
+            }
+
+            // Write table footer
+            $html .= $this->generateTableFooter();
+            // Writing PDF?
+            if ($this->isPdf && $this->useInlineCss) {
+                if ($this->sheetIndex === null && $sheetId + 1 < $this->spreadsheet->getSheetCount()) {
+                    $html .= '<div style="page-break-before:always" ></div>';
+                }
+            }
+
+            // Next sheet
+            ++$sheetId;
+        }
+
+        return $html;
+    }
+
+    /**
+     * Generate sheet tabs.
+     */
+    public function generateNavigation(): string
+    {
+        // Fetch sheets
+        $sheets = [];
+        if ($this->sheetIndex === null) {
+            $sheets = $this->spreadsheet->getAllSheets();
+        } else {
+            $sheets[] = $this->spreadsheet->getSheet($this->sheetIndex);
+        }
+
+        // Construct HTML
+        $html = '';
+
+        // Only if there are more than 1 sheets
+        if (count($sheets) > 1) {
+            // Loop all sheets
+            $sheetId = 0;
+
+            $html .= '<ul class="navigation">' . PHP_EOL;
+
+            foreach ($sheets as $sheet) {
+                $html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
+                ++$sheetId;
+            }
+
+            $html .= '</ul>' . PHP_EOL;
+        }
+
+        return $html;
+    }
+
+    private function extendRowsAndColumns(Worksheet $worksheet, int &$colMax, int &$rowMax): void
+    {
+        if ($this->includeCharts) {
+            foreach ($worksheet->getChartCollection() as $chart) {
+                if ($chart instanceof Chart) {
+                    $chartCoordinates = $chart->getTopLeftPosition();
+                    $this->sheetCharts[$chartCoordinates['cell']] = $chart;
+                    $chartTL = Coordinate::indexesFromString($chartCoordinates['cell']);
+                    if ($chartTL[1] > $rowMax) {
+                        $rowMax = $chartTL[1];
+                    }
+                    if ($chartTL[0] > $colMax) {
+                        $colMax = $chartTL[0];
+                    }
+                }
+            }
+        }
+        foreach ($worksheet->getDrawingCollection() as $drawing) {
+            $imageTL = Coordinate::indexesFromString($drawing->getCoordinates());
+            $this->sheetDrawings[$drawing->getCoordinates()] = $drawing;
+            if ($imageTL[1] > $rowMax) {
+                $rowMax = $imageTL[1];
+            }
+            if ($imageTL[0] > $colMax) {
+                $colMax = $imageTL[0];
+            }
+        }
+    }
+
+    /**
+     * Convert Windows file name to file protocol URL.
+     *
+     * @param string $filename file name on local system
+     */
+    public static function winFileToUrl(string $filename, bool $mpdf = false): string
+    {
+        // Windows filename
+        if (substr($filename, 1, 2) === ':\\') {
+            $protocol = $mpdf ? '' : 'file:///';
+            $filename = $protocol . str_replace('\\', '/', $filename);
+        }
+
+        return $filename;
+    }
+
+    /**
+     * Generate image tag in cell.
+     *
+     * @param string $coordinates Cell coordinates
+     */
+    private function writeImageInCell(string $coordinates): string
+    {
+        // Construct HTML
+        $html = '';
+
+        // Write images
+        $drawing = $this->sheetDrawings[$coordinates] ?? null;
+        if ($drawing !== null) {
+            $filedesc = $drawing->getDescription();
+            $filedesc = $filedesc ? htmlspecialchars($filedesc, ENT_QUOTES) : 'Embedded image';
+            if ($drawing instanceof Drawing) {
+                $filename = $drawing->getPath();
+
+                // Strip off eventual '.'
+                $filename = (string) preg_replace('/^[.]/', '', $filename);
+
+                // Prepend images root
+                $filename = $this->getImagesRoot() . $filename;
+
+                // Strip off eventual '.' if followed by non-/
+                $filename = (string) preg_replace('@^[.]([^/])@', '$1', $filename);
+
+                // Convert UTF8 data to PCDATA
+                $filename = htmlspecialchars($filename, Settings::htmlEntityFlags());
+
+                $html .= PHP_EOL;
+                $imageData = self::winFileToUrl($filename, $this instanceof Pdf\Mpdf);
+
+                if ($this->embedImages || str_starts_with($imageData, 'zip://')) {
+                    $picture = @file_get_contents($filename);
+                    if ($picture !== false) {
+                        $imageDetails = getimagesize($filename) ?: ['mime' => ''];
+                        // base64 encode the binary data
+                        $base64 = base64_encode($picture);
+                        $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
+                    }
+                }
+
+                $html .= '<img style="position: absolute; z-index: 1; left: '
+                    . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: '
+                    . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="'
+                    . $imageData . '" alt="' . $filedesc . '" />';
+            } elseif ($drawing instanceof MemoryDrawing) {
+                $imageResource = $drawing->getImageResource();
+                if ($imageResource) {
+                    ob_start(); //  Let's start output buffering.
+                    imagepng($imageResource); //  This will normally output the image, but because of ob_start(), it won't.
+                    $contents = (string) ob_get_contents(); //  Instead, output above is saved to $contents
+                    ob_end_clean(); //  End the output buffer.
+
+                    $dataUri = 'data:image/png;base64,' . base64_encode($contents);
+
+                    //  Because of the nature of tables, width is more important than height.
+                    //  max-width: 100% ensures that image doesnt overflow containing cell
+                    //    However, PR #3535 broke test
+                    //    25_In_memory_image, apparently because
+                    //    of the use of max-with. In addition,
+                    //    non-memory-drawings don't use max-width.
+                    //    Its use here is suspect and is being eliminated.
+                    //  width: X sets width of supplied image.
+                    //  As a result, images bigger than cell will be contained and images smaller will not get stretched
+                    $html .= '<img alt="' . $filedesc . '" src="' . $dataUri . '" style="width:' . $drawing->getWidth() . 'px;left: '
+                        . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px;position: absolute; z-index: 1;" />';
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Generate chart tag in cell.
+     * This code should be exercised by sample:
+     * Chart/32_Chart_read_write_PDF.php.
+     */
+    private function writeChartInCell(Worksheet $worksheet, string $coordinates): string
+    {
+        // Construct HTML
+        $html = '';
+
+        // Write charts
+        $chart = $this->sheetCharts[$coordinates] ?? null;
+        if ($chart !== null) {
+            $chartCoordinates = $chart->getTopLeftPosition();
+            $chartFileName = File::sysGetTempDir() . '/' . uniqid('', true) . '.png';
+            $renderedWidth = $chart->getRenderedWidth();
+            $renderedHeight = $chart->getRenderedHeight();
+            if ($renderedWidth === null || $renderedHeight === null) {
+                $this->adjustRendererPositions($chart, $worksheet);
+            }
+            $title = $chart->getTitle();
+            $caption = null;
+            $filedesc = '';
+            if ($title !== null) {
+                $calculatedTitle = $title->getCalculatedTitle($worksheet->getParent());
+                if ($calculatedTitle !== null) {
+                    $caption = $title->getCaption();
+                    $title->setCaption($calculatedTitle);
+                }
+                $filedesc = $title->getCaptionText($worksheet->getParent());
+            }
+            $renderSuccessful = $chart->render($chartFileName);
+            $chart->setRenderedWidth($renderedWidth);
+            $chart->setRenderedHeight($renderedHeight);
+            if (isset($title, $caption)) {
+                $title->setCaption($caption);
+            }
+            if (!$renderSuccessful) {
+                return '';
+            }
+
+            $html .= PHP_EOL;
+            $imageDetails = getimagesize($chartFileName) ?: ['', '', 'mime' => ''];
+
+            $filedesc = $filedesc ? htmlspecialchars($filedesc, ENT_QUOTES) : 'Embedded chart';
+            $picture = file_get_contents($chartFileName);
+            unlink($chartFileName);
+            if ($picture !== false) {
+                $base64 = base64_encode($picture);
+                $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
+
+                $html .= '<img style="position: absolute; z-index: 1; left: ' . $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' . $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' . $imageData . '" alt="' . $filedesc . '" />' . PHP_EOL;
+            }
+        }
+
+        // Return
+        return $html;
+    }
+
+    private function adjustRendererPositions(Chart $chart, Worksheet $sheet): void
+    {
+        $topLeft = $chart->getTopLeftPosition();
+        $bottomRight = $chart->getBottomRightPosition();
+        $tlCell = $topLeft['cell'];
+        $brCell = $bottomRight['cell'];
+        if ($tlCell !== '' && $brCell !== '') {
+            $tlCoordinate = Coordinate::indexesFromString($tlCell);
+            $brCoordinate = Coordinate::indexesFromString($brCell);
+            $totalHeight = 0.0;
+            $totalWidth = 0.0;
+            $defaultRowHeight = $sheet->getDefaultRowDimension()->getRowHeight();
+            $defaultRowHeight = SharedDrawing::pointsToPixels(($defaultRowHeight >= 0) ? $defaultRowHeight : SharedFont::getDefaultRowHeightByFont($this->defaultFont));
+            if ($tlCoordinate[1] <= $brCoordinate[1] && $tlCoordinate[0] <= $brCoordinate[0]) {
+                for ($row = $tlCoordinate[1]; $row <= $brCoordinate[1]; ++$row) {
+                    $height = $sheet->getRowDimension($row)->getRowHeight('pt');
+                    $totalHeight += ($height >= 0) ? $height : $defaultRowHeight;
+                }
+                $rightEdge = $brCoordinate[2];
+                ++$rightEdge;
+                for ($column = $tlCoordinate[2]; $column !== $rightEdge; ++$column) {
+                    $width = $sheet->getColumnDimension($column)->getWidth();
+                    $width = ($width < 0) ? self::DEFAULT_CELL_WIDTH_PIXELS : SharedDrawing::cellDimensionToPixels($sheet->getColumnDimension($column)->getWidth(), $this->defaultFont);
+                    $totalWidth += $width;
+                }
+                $chart->setRenderedWidth($totalWidth);
+                $chart->setRenderedHeight($totalHeight);
+            }
+        }
+    }
+
+    /**
+     * Generate CSS styles.
+     *
+     * @param bool $generateSurroundingHTML Generate surrounding HTML tags? (&lt;style&gt; and &lt;/style&gt;)
+     */
+    public function generateStyles(bool $generateSurroundingHTML = true): string
+    {
+        // Build CSS
+        $css = $this->buildCSS($generateSurroundingHTML);
+
+        // Construct HTML
+        $html = '';
+
+        // Start styles
+        if ($generateSurroundingHTML) {
+            $html .= '    <style type="text/css">' . PHP_EOL;
+            $html .= (array_key_exists('html', $css)) ? ('      html { ' . $this->assembleCSS($css['html']) . ' }' . PHP_EOL) : '';
+        }
+
+        // Write all other styles
+        foreach ($css as $styleName => $styleDefinition) {
+            if ($styleName != 'html') {
+                $html .= '      ' . $styleName . ' { ' . $this->assembleCSS($styleDefinition) . ' }' . PHP_EOL;
+            }
+        }
+        $html .= $this->generatePageDeclarations(false);
+
+        // End styles
+        if ($generateSurroundingHTML) {
+            $html .= '    </style>' . PHP_EOL;
+        }
+
+        // Return
+        return $html;
+    }
+
+    private function buildCssRowHeights(Worksheet $sheet, array &$css, int $sheetIndex): void
+    {
+        // Calculate row heights
+        foreach ($sheet->getRowDimensions() as $rowDimension) {
+            $row = $rowDimension->getRowIndex() - 1;
+
+            // table.sheetN tr.rowYYYYYY { }
+            $css['table.sheet' . $sheetIndex . ' tr.row' . $row] = [];
+
+            if ($rowDimension->getRowHeight() != -1) {
+                $pt_height = $rowDimension->getRowHeight();
+                $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'] = $pt_height . 'pt';
+            }
+            if ($rowDimension->getVisible() === false) {
+                $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['display'] = 'none';
+                $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['visibility'] = 'hidden';
+            }
+        }
+    }
+
+    private function buildCssPerSheet(Worksheet $sheet, array &$css): void
+    {
+        // Calculate hash code
+        $sheetIndex = $sheet->getParentOrThrow()->getIndex($sheet);
+        $setup = $sheet->getPageSetup();
+        if ($setup->getFitToPage() && $setup->getFitToHeight() === 1) {
+            $css["table.sheet$sheetIndex"]['page-break-inside'] = 'avoid';
+            $css["table.sheet$sheetIndex"]['break-inside'] = 'avoid';
+        }
+        $picture = $sheet->getBackgroundImage();
+        if ($picture !== '') {
+            $base64 = base64_encode($picture);
+            $css["table.sheet$sheetIndex"]['background-image'] = 'url(data:' . $sheet->getBackgroundMime() . ';base64,' . $base64 . ')';
+        }
+
+        // Build styles
+        // Calculate column widths
+        $sheet->calculateColumnWidths();
+
+        // col elements, initialize
+        $highestColumnIndex = Coordinate::columnIndexFromString($sheet->getHighestColumn()) - 1;
+        $column = -1;
+        $colStr = 'A';
+        while ($column++ < $highestColumnIndex) {
+            $this->columnWidths[$sheetIndex][$column] = self::DEFAULT_CELL_WIDTH_POINTS; // approximation
+            if ($this->shouldGenerateColumn($sheet, $colStr)) {
+                $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = self::DEFAULT_CELL_WIDTH_POINTS . 'pt';
+            }
+            ++$colStr;
+        }
+
+        // col elements, loop through columnDimensions and set width
+        foreach ($sheet->getColumnDimensions() as $columnDimension) {
+            $column = Coordinate::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
+            $width = SharedDrawing::cellDimensionToPixels($columnDimension->getWidth(), $this->defaultFont);
+            $width = SharedDrawing::pixelsToPoints($width);
+            if ($columnDimension->getVisible() === false) {
+                $css['table.sheet' . $sheetIndex . ' .column' . $column]['display'] = 'none';
+                // This would be better but Firefox has an 11-year-old bug.
+                // https://bugzilla.mozilla.org/show_bug.cgi?id=819045
+                //$css['table.sheet' . $sheetIndex . ' col.col' . $column]['visibility'] = 'collapse';
+            }
+            if ($width >= 0) {
+                $this->columnWidths[$sheetIndex][$column] = $width;
+                $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
+            }
+        }
+
+        // Default row height
+        $rowDimension = $sheet->getDefaultRowDimension();
+
+        // table.sheetN tr { }
+        $css['table.sheet' . $sheetIndex . ' tr'] = [];
+
+        if ($rowDimension->getRowHeight() == -1) {
+            $pt_height = SharedFont::getDefaultRowHeightByFont($this->spreadsheet->getDefaultStyle()->getFont());
+        } else {
+            $pt_height = $rowDimension->getRowHeight();
+        }
+        $css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt';
+        if ($rowDimension->getVisible() === false) {
+            $css['table.sheet' . $sheetIndex . ' tr']['display'] = 'none';
+            $css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden';
+        }
+
+        $this->buildCssRowHeights($sheet, $css, $sheetIndex);
+    }
+
+    /**
+     * Build CSS styles.
+     *
+     * @param bool $generateSurroundingHTML Generate surrounding HTML style? (html { })
+     */
+    public function buildCSS(bool $generateSurroundingHTML = true): array
+    {
+        // Cached?
+        if ($this->cssStyles !== null) {
+            return $this->cssStyles;
+        }
+
+        // Ensure that spans have been calculated
+        $this->calculateSpans();
+
+        // Construct CSS
+        $css = [];
+
+        // Start styles
+        if ($generateSurroundingHTML) {
+            // html { }
+            $css['html']['font-family'] = 'Calibri, Arial, Helvetica, sans-serif';
+            $css['html']['font-size'] = '11pt';
+            $css['html']['background-color'] = 'white';
+        }
+
+        // CSS for comments as found in LibreOffice
+        $css['a.comment-indicator:hover + div.comment'] = [
+            'background' => '#ffd',
+            'position' => 'absolute',
+            'display' => 'block',
+            'border' => '1px solid black',
+            'padding' => '0.5em',
+        ];
+
+        $css['a.comment-indicator'] = [
+            'background' => 'red',
+            'display' => 'inline-block',
+            'border' => '1px solid black',
+            'width' => '0.5em',
+            'height' => '0.5em',
+        ];
+
+        $css['div.comment']['display'] = 'none';
+
+        // table { }
+        $css['table']['border-collapse'] = 'collapse';
+
+        // .b {}
+        $css['.b']['text-align'] = 'center'; // BOOL
+
+        // .e {}
+        $css['.e']['text-align'] = 'center'; // ERROR
+
+        // .f {}
+        $css['.f']['text-align'] = 'right'; // FORMULA
+
+        // .inlineStr {}
+        $css['.inlineStr']['text-align'] = 'left'; // INLINE
+
+        // .n {}
+        $css['.n']['text-align'] = 'right'; // NUMERIC
+
+        // .s {}
+        $css['.s']['text-align'] = 'left'; // STRING
+
+        // Calculate cell style hashes
+        foreach ($this->spreadsheet->getCellXfCollection() as $index => $style) {
+            $css['td.style' . $index . ', th.style' . $index] = $this->createCSSStyle($style);
+            //$css['th.style' . $index] = $this->createCSSStyle($style);
+        }
+
+        // Fetch sheets
+        $sheets = [];
+        if ($this->sheetIndex === null) {
+            $sheets = $this->spreadsheet->getAllSheets();
+        } else {
+            $sheets[] = $this->spreadsheet->getSheet($this->sheetIndex);
+        }
+
+        // Build styles per sheet
+        foreach ($sheets as $sheet) {
+            $this->buildCssPerSheet($sheet, $css);
+        }
+
+        // Cache
+        if ($this->cssStyles === null) {
+            $this->cssStyles = $css;
+        }
+
+        // Return
+        return $css;
+    }
+
+    /**
+     * Create CSS style.
+     */
+    private function createCSSStyle(Style $style): array
+    {
+        // Create CSS
+        return array_merge(
+            $this->createCSSStyleAlignment($style->getAlignment()),
+            $this->createCSSStyleBorders($style->getBorders()),
+            $this->createCSSStyleFont($style->getFont()),
+            $this->createCSSStyleFill($style->getFill())
+        );
+    }
+
+    /**
+     * Create CSS style.
+     */
+    private function createCSSStyleAlignment(Alignment $alignment): array
+    {
+        // Construct CSS
+        $css = [];
+
+        // Create CSS
+        $verticalAlign = $this->mapVAlign($alignment->getVertical() ?? '');
+        if ($verticalAlign) {
+            $css['vertical-align'] = $verticalAlign;
+        }
+        $textAlign = $this->mapHAlign($alignment->getHorizontal() ?? '');
+        if ($textAlign) {
+            $css['text-align'] = $textAlign;
+            if (in_array($textAlign, ['left', 'right'])) {
+                $css['padding-' . $textAlign] = (string) ((int) $alignment->getIndent() * 9) . 'px';
+            }
+        }
+        $rotation = $alignment->getTextRotation();
+        if ($rotation !== 0 && $rotation !== Alignment::TEXTROTATION_STACK_PHPSPREADSHEET) {
+            if ($this instanceof Pdf\Mpdf) {
+                $css['text-rotate'] = "$rotation";
+            } else {
+                $css['transform'] = "rotate({$rotation}deg)";
+            }
+        }
+
+        return $css;
+    }
+
+    /**
+     * Create CSS style.
+     */
+    private function createCSSStyleFont(Font $font): array
+    {
+        // Construct CSS
+        $css = [];
+
+        // Create CSS
+        if ($font->getBold()) {
+            $css['font-weight'] = 'bold';
+        }
+        if ($font->getUnderline() != Font::UNDERLINE_NONE && $font->getStrikethrough()) {
+            $css['text-decoration'] = 'underline line-through';
+        } elseif ($font->getUnderline() != Font::UNDERLINE_NONE) {
+            $css['text-decoration'] = 'underline';
+        } elseif ($font->getStrikethrough()) {
+            $css['text-decoration'] = 'line-through';
+        }
+        if ($font->getItalic()) {
+            $css['font-style'] = 'italic';
+        }
+
+        $css['color'] = '#' . $font->getColor()->getRGB();
+        $css['font-family'] = '\'' . htmlspecialchars((string) $font->getName(), ENT_QUOTES) . '\'';
+        $css['font-size'] = $font->getSize() . 'pt';
+
+        return $css;
+    }
+
+    /**
+     * Create CSS style.
+     *
+     * @param Borders $borders Borders
+     */
+    private function createCSSStyleBorders(Borders $borders): array
+    {
+        // Construct CSS
+        $css = [];
+
+        // Create CSS
+        if (!($this instanceof Pdf\Mpdf)) {
+            $css['border-bottom'] = $this->createCSSStyleBorder($borders->getBottom());
+            $css['border-top'] = $this->createCSSStyleBorder($borders->getTop());
+            $css['border-left'] = $this->createCSSStyleBorder($borders->getLeft());
+            $css['border-right'] = $this->createCSSStyleBorder($borders->getRight());
+        } else {
+            // Mpdf doesn't process !important, so omit unimportant border none
+            if ($borders->getBottom()->getBorderStyle() !== Border::BORDER_NONE) {
+                $css['border-bottom'] = $this->createCSSStyleBorder($borders->getBottom());
+            }
+            if ($borders->getTop()->getBorderStyle() !== Border::BORDER_NONE) {
+                $css['border-top'] = $this->createCSSStyleBorder($borders->getTop());
+            }
+            if ($borders->getLeft()->getBorderStyle() !== Border::BORDER_NONE) {
+                $css['border-left'] = $this->createCSSStyleBorder($borders->getLeft());
+            }
+            if ($borders->getRight()->getBorderStyle() !== Border::BORDER_NONE) {
+                $css['border-right'] = $this->createCSSStyleBorder($borders->getRight());
+            }
+        }
+
+        return $css;
+    }
+
+    /**
+     * Create CSS style.
+     *
+     * @param Border $border Border
+     */
+    private function createCSSStyleBorder(Border $border): string
+    {
+        //    Create CSS - add !important to non-none border styles for merged cells
+        $borderStyle = $this->mapBorderStyle($border->getBorderStyle());
+
+        return $borderStyle . ' #' . $border->getColor()->getRGB() . (($borderStyle === self::BORDER_NONE) ? '' : ' !important');
+    }
+
+    /**
+     * Create CSS style (Fill).
+     *
+     * @param Fill $fill Fill
+     */
+    private function createCSSStyleFill(Fill $fill): array
+    {
+        // Construct HTML
+        $css = [];
+
+        // Create CSS
+        if ($fill->getFillType() !== Fill::FILL_NONE) {
+            $value = $fill->getFillType() == Fill::FILL_NONE
+                ? 'white' : '#' . $fill->getStartColor()->getRGB();
+            $css['background-color'] = $value;
+        }
+
+        return $css;
+    }
+
+    /**
+     * Generate HTML footer.
+     */
+    public function generateHTMLFooter(): string
+    {
+        // Construct HTML
+        $html = '';
+        $html .= '  </body>' . PHP_EOL;
+        $html .= '</html>' . PHP_EOL;
+
+        return $html;
+    }
+
+    private function generateTableTagInline(Worksheet $worksheet, string $id): string
+    {
+        $style = isset($this->cssStyles['table'])
+            ? $this->assembleCSS($this->cssStyles['table']) : '';
+
+        $prntgrid = $worksheet->getPrintGridlines();
+        $viewgrid = $this->isPdf ? $prntgrid : $worksheet->getShowGridlines();
+        if ($viewgrid && $prntgrid) {
+            $html = "    <table border='1' cellpadding='1' $id cellspacing='1' style='$style' class='gridlines gridlinesp'>" . PHP_EOL;
+        } elseif ($viewgrid) {
+            $html = "    <table border='0' cellpadding='0' $id cellspacing='0' style='$style' class='gridlines'>" . PHP_EOL;
+        } elseif ($prntgrid) {
+            $html = "    <table border='0' cellpadding='0' $id cellspacing='0' style='$style' class='gridlinesp'>" . PHP_EOL;
+        } else {
+            $html = "    <table border='0' cellpadding='1' $id cellspacing='0' style='$style'>" . PHP_EOL;
+        }
+
+        return $html;
+    }
+
+    private function generateTableTag(Worksheet $worksheet, string $id, string &$html, int $sheetIndex): void
+    {
+        if (!$this->useInlineCss) {
+            $gridlines = $worksheet->getShowGridlines() ? ' gridlines' : '';
+            $gridlinesp = $worksheet->getPrintGridlines() ? ' gridlinesp' : '';
+            $html .= "    <table border='0' cellpadding='0' cellspacing='0' $id class='sheet$sheetIndex$gridlines$gridlinesp'>" . PHP_EOL;
+        } else {
+            $html .= $this->generateTableTagInline($worksheet, $id);
+        }
+    }
+
+    /**
+     * Generate table header.
+     *
+     * @param Worksheet $worksheet The worksheet for the table we are writing
+     * @param bool $showid whether or not to add id to table tag
+     */
+    private function generateTableHeader(Worksheet $worksheet, bool $showid = true): string
+    {
+        $sheetIndex = $worksheet->getParentOrThrow()->getIndex($worksheet);
+
+        // Construct HTML
+        $html = '';
+        $id = $showid ? "id='sheet$sheetIndex'" : '';
+        if ($showid) {
+            $html .= "<div style='page: page$sheetIndex'>" . PHP_EOL;
+        } else {
+            $html .= "<div style='page: page$sheetIndex' class='scrpgbrk'>" . PHP_EOL;
+        }
+
+        $this->generateTableTag($worksheet, $id, $html, $sheetIndex);
+
+        // Write <col> elements
+        $highestColumnIndex = Coordinate::columnIndexFromString($worksheet->getHighestColumn()) - 1;
+        $i = -1;
+        while ($i++ < $highestColumnIndex) {
+            if (!$this->useInlineCss) {
+                $html .= '        <col class="col' . $i . '" />' . PHP_EOL;
+            } else {
+                $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i])
+                    ? $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
+                $html .= '        <col style="' . $style . '" />' . PHP_EOL;
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Generate table footer.
+     */
+    private function generateTableFooter(): string
+    {
+        return '    </tbody></table>' . PHP_EOL . '</div>' . PHP_EOL;
+    }
+
+    /**
+     * Generate row start.
+     *
+     * @param int $sheetIndex Sheet index (0-based)
+     * @param int $row row number
+     */
+    private function generateRowStart(Worksheet $worksheet, int $sheetIndex, int $row): string
+    {
+        $html = '';
+        if (count($worksheet->getBreaks()) > 0) {
+            $breaks = $worksheet->getRowBreaks();
+
+            // check if a break is needed before this row
+            if (isset($breaks['A' . $row])) {
+                // close table: </table>
+                $html .= $this->generateTableFooter();
+                if ($this->isPdf && $this->useInlineCss) {
+                    $html .= '<div style="page-break-before:always" />';
+                }
+
+                // open table again: <table> + <col> etc.
+                $html .= $this->generateTableHeader($worksheet, false);
+                $html .= '<tbody>' . PHP_EOL;
+            }
+        }
+
+        // Write row start
+        if (!$this->useInlineCss) {
+            $html .= '          <tr class="row' . $row . '">' . PHP_EOL;
+        } else {
+            $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row])
+                ? $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row]) : '';
+
+            $html .= '          <tr style="' . $style . '">' . PHP_EOL;
+        }
+
+        return $html;
+    }
+
+    private function generateRowCellCss(Worksheet $worksheet, string $cellAddress, int $row, int $columnNumber): array
+    {
+        $cell = ($cellAddress > '') ? $worksheet->getCellCollection()->get($cellAddress) : '';
+        $coordinate = Coordinate::stringFromColumnIndex($columnNumber + 1) . ($row + 1);
+        if (!$this->useInlineCss) {
+            $cssClass = 'column' . $columnNumber;
+        } else {
+            $cssClass = [];
+            // The statements below do nothing.
+            // Commenting out the code rather than deleting it
+            // in case someone can figure out what their intent was.
+            //if ($cellType == 'th') {
+            //    if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum])) {
+            //        $this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum];
+            //    }
+            //} else {
+            //    if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
+            //        $this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
+            //    }
+            //}
+            // End of mystery statements.
+        }
+
+        return [$cell, $cssClass, $coordinate];
+    }
+
+    private function generateRowCellDataValueRich(RichText $richText): string
+    {
+        $cellData = '';
+        // Loop through rich text elements
+        $elements = $richText->getRichTextElements();
+        foreach ($elements as $element) {
+            // Rich text start?
+            if ($element instanceof Run) {
+                $cellEnd = '';
+                if ($element->getFont() !== null) {
+                    $cellData .= '<span style="' . $this->assembleCSS($this->createCSSStyleFont($element->getFont())) . '">';
+
+                    if ($element->getFont()->getSuperscript()) {
+                        $cellData .= '<sup>';
+                        $cellEnd = '</sup>';
+                    } elseif ($element->getFont()->getSubscript()) {
+                        $cellData .= '<sub>';
+                        $cellEnd = '</sub>';
+                    }
+                } else {
+                    $cellData .= '<span>';
+                }
+
+                // Convert UTF8 data to PCDATA
+                $cellText = $element->getText();
+                $cellData .= htmlspecialchars($cellText, Settings::htmlEntityFlags());
+
+                $cellData .= $cellEnd;
+
+                $cellData .= '</span>';
+            } else {
+                // Convert UTF8 data to PCDATA
+                $cellText = $element->getText();
+                $cellData .= htmlspecialchars($cellText, Settings::htmlEntityFlags());
+            }
+        }
+
+        return nl2br($cellData);
+    }
+
+    private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, string &$cellData): void
+    {
+        if ($cell->getValue() instanceof RichText) {
+            $cellData .= $this->generateRowCellDataValueRich($cell->getValue());
+        } else {
+            $origData = $this->preCalculateFormulas ? $cell->getCalculatedValue() : $cell->getValue();
+            $origData2 = $this->preCalculateFormulas ? $cell->getCalculatedValueString() : $cell->getValueString();
+            $formatCode = $worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode();
+
+            $cellData = NumberFormat::toFormattedString(
+                $origData2,
+                $formatCode ?? NumberFormat::FORMAT_GENERAL,
+                [$this, 'formatColor']
+            );
+
+            if ($cellData === $origData) {
+                $cellData = htmlspecialchars($cellData, Settings::htmlEntityFlags());
+            }
+            if ($worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) {
+                $cellData = '<sup>' . $cellData . '</sup>';
+            } elseif ($worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubscript()) {
+                $cellData = '<sub>' . $cellData . '</sub>';
+            }
+        }
+    }
+
+    private function generateRowCellData(Worksheet $worksheet, null|Cell|string $cell, array|string &$cssClass): string
+    {
+        $cellData = '&nbsp;';
+        if ($cell instanceof Cell) {
+            $cellData = '';
+            // Don't know what this does, and no test cases.
+            //if ($cell->getParent() === null) {
+            //    $cell->attach($worksheet);
+            //}
+            // Value
+            $this->generateRowCellDataValue($worksheet, $cell, $cellData);
+
+            // Converts the cell content so that spaces occuring at beginning of each new line are replaced by &nbsp;
+            // Example: "  Hello\n to the world" is converted to "&nbsp;&nbsp;Hello\n&nbsp;to the world"
+            $cellData = (string) preg_replace('/(?m)(?:^|\\G) /', '&nbsp;', $cellData);
+
+            // convert newline "\n" to '<br>'
+            $cellData = nl2br($cellData);
+
+            // Extend CSS class?
+            if (!$this->useInlineCss && is_string($cssClass)) {
+                $cssClass .= ' style' . $cell->getXfIndex();
+                $cssClass .= ' ' . $cell->getDataType();
+            } elseif (is_array($cssClass)) {
+                $index = $cell->getXfIndex();
+                $styleIndex = 'td.style' . $index . ', th.style' . $index;
+                if (isset($this->cssStyles[$styleIndex])) {
+                    $cssClass = array_merge($cssClass, $this->cssStyles[$styleIndex]);
+                }
+
+                // General horizontal alignment: Actual horizontal alignment depends on dataType
+                $sharedStyle = $worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex());
+                if (
+                    $sharedStyle->getAlignment()->getHorizontal() == Alignment::HORIZONTAL_GENERAL
+                    && isset($this->cssStyles['.' . $cell->getDataType()]['text-align'])
+                ) {
+                    $cssClass['text-align'] = $this->cssStyles['.' . $cell->getDataType()]['text-align'];
+                }
+            }
+        } else {
+            // Use default borders for empty cell
+            if (is_string($cssClass)) {
+                $cssClass .= ' style0';
+            }
+        }
+
+        return $cellData;
+    }
+
+    private function generateRowIncludeCharts(Worksheet $worksheet, string $coordinate): string
+    {
+        return $this->includeCharts ? $this->writeChartInCell($worksheet, $coordinate) : '';
+    }
+
+    private function generateRowSpans(string $html, int $rowSpan, int $colSpan): string
+    {
+        $html .= ($colSpan > 1) ? (' colspan="' . $colSpan . '"') : '';
+        $html .= ($rowSpan > 1) ? (' rowspan="' . $rowSpan . '"') : '';
+
+        return $html;
+    }
+
+    private function generateRowWriteCell(
+        string &$html,
+        Worksheet $worksheet,
+        string $coordinate,
+        string $cellType,
+        string $cellData,
+        int $colSpan,
+        int $rowSpan,
+        array|string $cssClass,
+        int $colNum,
+        int $sheetIndex,
+        int $row
+    ): void {
+        // Image?
+        $htmlx = $this->writeImageInCell($coordinate);
+        // Chart?
+        $htmlx .= $this->generateRowIncludeCharts($worksheet, $coordinate);
+        // Column start
+        $html .= '            <' . $cellType;
+        if (!$this->useInlineCss && !$this->isPdf && is_string($cssClass)) {
+            $html .= ' class="' . $cssClass . '"';
+            if ($htmlx) {
+                $html .= " style='position: relative;'";
+            }
+        } else {
+            //** Necessary redundant code for the sake of \PhpOffice\PhpSpreadsheet\Writer\Pdf **
+            // We must explicitly write the width of the <td> element because TCPDF
+            // does not recognize e.g. <col style="width:42pt">
+            if ($this->useInlineCss) {
+                $xcssClass = is_array($cssClass) ? $cssClass : [];
+            } else {
+                if (is_string($cssClass)) {
+                    $html .= ' class="' . $cssClass . '"';
+                }
+                $xcssClass = [];
+            }
+            $width = 0;
+            $i = $colNum - 1;
+            $e = $colNum + $colSpan - 1;
+            while ($i++ < $e) {
+                if (isset($this->columnWidths[$sheetIndex][$i])) {
+                    $width += $this->columnWidths[$sheetIndex][$i];
+                }
+            }
+            $xcssClass['width'] = (string) $width . 'pt';
+            // We must also explicitly write the height of the <td> element because TCPDF
+            // does not recognize e.g. <tr style="height:50pt">
+            if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'])) {
+                $height = $this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'];
+                $xcssClass['height'] = $height;
+            }
+            //** end of redundant code **
+            if ($this->useInlineCss) {
+                foreach (['border-top', 'border-bottom', 'border-right', 'border-left'] as $borderType) {
+                    if (($xcssClass[$borderType] ?? '') === 'none #000000') {
+                        unset($xcssClass[$borderType]);
+                    }
+                }
+            }
+
+            if ($htmlx) {
+                $xcssClass['position'] = 'relative';
+            }
+            $html .= ' style="' . $this->assembleCSS($xcssClass) . '"';
+            if ($this->useInlineCss) {
+                $html .= ' class="gridlines gridlinesp"';
+            }
+        }
+        $html = $this->generateRowSpans($html, $rowSpan, $colSpan);
+
+        $html .= '>';
+        $html .= $htmlx;
+
+        $html .= $this->writeComment($worksheet, $coordinate);
+
+        // Cell data
+        $html .= $cellData;
+
+        // Column end
+        $html .= '</' . $cellType . '>' . PHP_EOL;
+    }
+
+    /**
+     * Generate row.
+     *
+     * @param array $values Array containing cells in a row
+     * @param int $row Row number (0-based)
+     * @param string $cellType eg: 'td'
+     */
+    private function generateRow(Worksheet $worksheet, array $values, int $row, string $cellType): string
+    {
+        // Sheet index
+        $sheetIndex = $worksheet->getParentOrThrow()->getIndex($worksheet);
+        $html = $this->generateRowStart($worksheet, $sheetIndex, $row);
+
+        // Write cells
+        $colNum = 0;
+        foreach ($values as $cellAddress) {
+            [$cell, $cssClass, $coordinate] = $this->generateRowCellCss($worksheet, $cellAddress, $row, $colNum);
+
+            // Cell Data
+            $cellData = $this->generateRowCellData($worksheet, $cell, $cssClass);
+
+            // Hyperlink?
+            if ($worksheet->hyperlinkExists($coordinate) && !$worksheet->getHyperlink($coordinate)->isInternal()) {
+                $cellData = '<a href="' . htmlspecialchars($worksheet->getHyperlink($coordinate)->getUrl(), Settings::htmlEntityFlags()) . '" title="' . htmlspecialchars($worksheet->getHyperlink($coordinate)->getTooltip(), Settings::htmlEntityFlags()) . '">' . $cellData . '</a>';
+            }
+
+            // Should the cell be written or is it swallowed by a rowspan or colspan?
+            $writeCell = !(isset($this->isSpannedCell[$worksheet->getParentOrThrow()->getIndex($worksheet)][$row + 1][$colNum])
+                && $this->isSpannedCell[$worksheet->getParentOrThrow()->getIndex($worksheet)][$row + 1][$colNum]);
+
+            // Colspan and Rowspan
+            $colSpan = 1;
+            $rowSpan = 1;
+            if (isset($this->isBaseCell[$worksheet->getParentOrThrow()->getIndex($worksheet)][$row + 1][$colNum])) {
+                $spans = $this->isBaseCell[$worksheet->getParentOrThrow()->getIndex($worksheet)][$row + 1][$colNum];
+                $rowSpan = $spans['rowspan'];
+                $colSpan = $spans['colspan'];
+
+                //    Also apply style from last cell in merge to fix borders -
+                //        relies on !important for non-none border declarations in createCSSStyleBorder
+                $endCellCoord = Coordinate::stringFromColumnIndex($colNum + $colSpan) . ($row + $rowSpan);
+                if (!$this->useInlineCss) {
+                    $cssClass .= ' style' . $worksheet->getCell($endCellCoord)->getXfIndex();
+                } else {
+                    $endBorders = $this->spreadsheet->getCellXfByIndex($worksheet->getCell($endCellCoord)->getXfIndex())->getBorders();
+                    $altBorders = $this->createCSSStyleBorders($endBorders);
+                    foreach ($altBorders as $altKey => $altValue) {
+                        if (str_contains($altValue, '!important')) {
+                            $cssClass[$altKey] = $altValue;
+                        }
+                    }
+                }
+            }
+
+            // Write
+            if ($writeCell) {
+                $this->generateRowWriteCell($html, $worksheet, $coordinate, $cellType, $cellData, $colSpan, $rowSpan, $cssClass, $colNum, $sheetIndex, $row);
+            }
+
+            // Next column
+            ++$colNum;
+        }
+
+        // Write row end
+        $html .= '          </tr>' . PHP_EOL;
+
+        // Return
+        return $html;
+    }
+
+    /**
+     * Takes array where of CSS properties / values and converts to CSS string.
+     */
+    private function assembleCSS(array $values = []): string
+    {
+        $pairs = [];
+        foreach ($values as $property => $value) {
+            $pairs[] = $property . ':' . $value;
+        }
+        $string = implode('; ', $pairs);
+
+        return $string;
+    }
+
+    /**
+     * Get images root.
+     */
+    public function getImagesRoot(): string
+    {
+        return $this->imagesRoot;
+    }
+
+    /**
+     * Set images root.
+     *
+     * @return $this
+     */
+    public function setImagesRoot(string $imagesRoot): static
+    {
+        $this->imagesRoot = $imagesRoot;
+
+        return $this;
+    }
+
+    /**
+     * Get embed images.
+     */
+    public function getEmbedImages(): bool
+    {
+        return $this->embedImages;
+    }
+
+    /**
+     * Set embed images.
+     *
+     * @return $this
+     */
+    public function setEmbedImages(bool $embedImages): static
+    {
+        $this->embedImages = $embedImages;
+
+        return $this;
+    }
+
+    /**
+     * Get use inline CSS?
+     */
+    public function getUseInlineCss(): bool
+    {
+        return $this->useInlineCss;
+    }
+
+    /**
+     * Set use inline CSS?
+     *
+     * @return $this
+     */
+    public function setUseInlineCss(bool $useInlineCss): static
+    {
+        $this->useInlineCss = $useInlineCss;
+
+        return $this;
+    }
+
+    /**
+     * Add color to formatted string as inline style.
+     *
+     * @param string $value Plain formatted value without color
+     * @param string $format Format code
+     */
+    public function formatColor(string $value, string $format): string
+    {
+        // Color information, e.g. [Red] is always at the beginning
+        $color = null; // initialize
+        $matches = [];
+
+        $color_regex = '/^\\[[a-zA-Z]+\\]/';
+        if (preg_match($color_regex, $format, $matches)) {
+            $color = str_replace(['[', ']'], '', $matches[0]);
+            $color = strtolower($color);
+        }
+
+        // convert to PCDATA
+        $result = htmlspecialchars($value, Settings::htmlEntityFlags());
+
+        // color span tag
+        if ($color !== null) {
+            $result = '<span style="color:' . $color . '">' . $result . '</span>';
+        }
+
+        return $result;
+    }
+
+    /**
+     * Calculate information about HTML colspan and rowspan which is not always the same as Excel's.
+     */
+    private function calculateSpans(): void
+    {
+        if ($this->spansAreCalculated) {
+            return;
+        }
+        // Identify all cells that should be omitted in HTML due to cell merge.
+        // In HTML only the upper-left cell should be written and it should have
+        //   appropriate rowspan / colspan attribute
+        $sheetIndexes = $this->sheetIndex !== null
+            ? [$this->sheetIndex] : range(0, $this->spreadsheet->getSheetCount() - 1);
+
+        foreach ($sheetIndexes as $sheetIndex) {
+            $sheet = $this->spreadsheet->getSheet($sheetIndex);
+
+            $candidateSpannedRow = [];
+
+            // loop through all Excel merged cells
+            foreach ($sheet->getMergeCells() as $cells) {
+                [$cells] = Coordinate::splitRange($cells);
+                $first = $cells[0];
+                $last = $cells[1];
+
+                [$fc, $fr] = Coordinate::indexesFromString($first);
+                $fc = $fc - 1;
+
+                [$lc, $lr] = Coordinate::indexesFromString($last);
+                $lc = $lc - 1;
+
+                // loop through the individual cells in the individual merge
+                $r = $fr - 1;
+                while ($r++ < $lr) {
+                    // also, flag this row as a HTML row that is candidate to be omitted
+                    $candidateSpannedRow[$r] = $r;
+
+                    $c = $fc - 1;
+                    while ($c++ < $lc) {
+                        if (!($c == $fc && $r == $fr)) {
+                            // not the upper-left cell (should not be written in HTML)
+                            $this->isSpannedCell[$sheetIndex][$r][$c] = [
+                                'baseCell' => [$fr, $fc],
+                            ];
+                        } else {
+                            // upper-left is the base cell that should hold the colspan/rowspan attribute
+                            $this->isBaseCell[$sheetIndex][$r][$c] = [
+                                'xlrowspan' => $lr - $fr + 1, // Excel rowspan
+                                'rowspan' => $lr - $fr + 1, // HTML rowspan, value may change
+                                'xlcolspan' => $lc - $fc + 1, // Excel colspan
+                                'colspan' => $lc - $fc + 1, // HTML colspan, value may change
+                            ];
+                        }
+                    }
+                }
+            }
+
+            $this->calculateSpansOmitRows($sheet, $sheetIndex, $candidateSpannedRow);
+
+            // TODO: Same for columns
+        }
+
+        // We have calculated the spans
+        $this->spansAreCalculated = true;
+    }
+
+    private function calculateSpansOmitRows(Worksheet $sheet, int $sheetIndex, array $candidateSpannedRow): void
+    {
+        // Identify which rows should be omitted in HTML. These are the rows where all the cells
+        //   participate in a merge and the where base cells are somewhere above.
+        $countColumns = Coordinate::columnIndexFromString($sheet->getHighestColumn());
+        foreach ($candidateSpannedRow as $rowIndex) {
+            if (isset($this->isSpannedCell[$sheetIndex][$rowIndex])) {
+                if (count($this->isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
+                    $this->isSpannedRow[$sheetIndex][$rowIndex] = $rowIndex;
+                }
+            }
+        }
+
+        // For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
+        if (isset($this->isSpannedRow[$sheetIndex])) {
+            foreach ($this->isSpannedRow[$sheetIndex] as $rowIndex) {
+                $adjustedBaseCells = [];
+                $c = -1;
+                $e = $countColumns - 1;
+                while ($c++ < $e) {
+                    $baseCell = $this->isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
+
+                    if (!in_array($baseCell, $adjustedBaseCells, true)) {
+                        // subtract rowspan by 1
+                        --$this->isBaseCell[$sheetIndex][$baseCell[0]][$baseCell[1]]['rowspan'];
+                        $adjustedBaseCells[] = $baseCell;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Write a comment in the same format as LibreOffice.
+     *
+     * @see https://github.com/LibreOffice/core/blob/9fc9bf3240f8c62ad7859947ab8a033ac1fe93fa/sc/source/filter/html/htmlexp.cxx#L1073-L1092
+     */
+    private function writeComment(Worksheet $worksheet, string $coordinate): string
+    {
+        $result = '';
+        if (!$this->isPdf && isset($worksheet->getComments()[$coordinate])) {
+            $sanitizedString = $this->generateRowCellDataValueRich($worksheet->getComment($coordinate)->getText());
+            $dir = ($worksheet->getComment($coordinate)->getTextboxDirection() === Comment::TEXTBOX_DIRECTION_RTL) ? ' dir="rtl"' : '';
+            $align = strtolower($worksheet->getComment($coordinate)->getAlignment());
+            $alignment = Alignment::HORIZONTAL_ALIGNMENT_FOR_HTML[$align] ?? '';
+            if ($alignment !== '') {
+                $alignment = " style=\"text-align:$alignment\"";
+            }
+            if ($sanitizedString !== '') {
+                $result .= '<a class="comment-indicator"></a>';
+                $result .= "<div class=\"comment\"$dir$alignment>" . $sanitizedString . '</div>';
+                $result .= PHP_EOL;
+            }
+        }
+
+        return $result;
+    }
+
+    public function getOrientation(): ?string
+    {
+        // Expect Pdf classes to override this method.
+        return $this->isPdf ? PageSetup::ORIENTATION_PORTRAIT : null;
+    }
+
+    /**
+     * Generate @page declarations.
+     */
+    private function generatePageDeclarations(bool $generateSurroundingHTML): string
+    {
+        // Ensure that Spans have been calculated?
+        $this->calculateSpans();
+
+        // Fetch sheets
+        $sheets = [];
+        if ($this->sheetIndex === null) {
+            $sheets = $this->spreadsheet->getAllSheets();
+        } else {
+            $sheets[] = $this->spreadsheet->getSheet($this->sheetIndex);
+        }
+
+        // Construct HTML
+        $htmlPage = $generateSurroundingHTML ? ('<style type="text/css">' . PHP_EOL) : '';
+
+        // Loop all sheets
+        $sheetId = 0;
+        foreach ($sheets as $worksheet) {
+            $htmlPage .= "@page page$sheetId { ";
+            $left = StringHelper::formatNumber($worksheet->getPageMargins()->getLeft()) . 'in; ';
+            $htmlPage .= 'margin-left: ' . $left;
+            $right = StringHelper::FormatNumber($worksheet->getPageMargins()->getRight()) . 'in; ';
+            $htmlPage .= 'margin-right: ' . $right;
+            $top = StringHelper::FormatNumber($worksheet->getPageMargins()->getTop()) . 'in; ';
+            $htmlPage .= 'margin-top: ' . $top;
+            $bottom = StringHelper::FormatNumber($worksheet->getPageMargins()->getBottom()) . 'in; ';
+            $htmlPage .= 'margin-bottom: ' . $bottom;
+            $orientation = $this->getOrientation() ?? $worksheet->getPageSetup()->getOrientation();
+            if ($orientation === PageSetup::ORIENTATION_LANDSCAPE) {
+                $htmlPage .= 'size: landscape; ';
+            } elseif ($orientation === PageSetup::ORIENTATION_PORTRAIT) {
+                $htmlPage .= 'size: portrait; ';
+            }
+            $htmlPage .= '}' . PHP_EOL;
+            ++$sheetId;
+        }
+        $htmlPage .= implode(PHP_EOL, [
+            '.navigation {page-break-after: always;}',
+            '.scrpgbrk, div + div {page-break-before: always;}',
+            '@media screen {',
+            '  .gridlines td {border: 1px solid black;}',
+            '  .gridlines th {border: 1px solid black;}',
+            '  body>div {margin-top: 5px;}',
+            '  body>div:first-child {margin-top: 0;}',
+            '  .scrpgbrk {margin-top: 1px;}',
+            '}',
+            '@media print {',
+            '  .gridlinesp td {border: 1px solid black;}',
+            '  .gridlinesp th {border: 1px solid black;}',
+            '  .navigation {display: none;}',
+            '}',
+            '',
+        ]);
+        $htmlPage .= $generateSurroundingHTML ? ('</style>' . PHP_EOL) : '';
+
+        return $htmlPage;
+    }
+
+    private function shouldGenerateRow(Worksheet $sheet, int $row): bool
+    {
+        if (!($this instanceof Pdf\Mpdf || $this instanceof Pdf\Tcpdf)) {
+            return true;
+        }
+
+        return $sheet->isRowVisible($row);
+    }
+
+    private function shouldGenerateColumn(Worksheet $sheet, string $colStr): bool
+    {
+        if (!($this instanceof Pdf\Mpdf || $this instanceof Pdf\Tcpdf)) {
+            return true;
+        }
+        if (!$sheet->columnDimensionExists($colStr)) {
+            return true;
+        }
+
+        return $sheet->getColumnDimension($colStr)->getVisible();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php
new file mode 100644
index 00000000..cd483067
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+interface IWriter
+{
+    public const SAVE_WITH_CHARTS = 1;
+
+    public const DISABLE_PRECALCULATE_FORMULAE = 2;
+
+    /**
+     * IWriter constructor.
+     *
+     * @param Spreadsheet $spreadsheet The spreadsheet that we want to save using this Writer
+     */
+    public function __construct(Spreadsheet $spreadsheet);
+
+    /**
+     * Write charts in workbook?
+     *        If this is true, then the Writer will write definitions for any charts that exist in the PhpSpreadsheet object.
+     *        If false (the default) it will ignore any charts defined in the PhpSpreadsheet object.
+     */
+    public function getIncludeCharts(): bool;
+
+    /**
+     * Set write charts in workbook
+     *        Set to true, to advise the Writer to include any charts that exist in the PhpSpreadsheet object.
+     *        Set to false (the default) to ignore charts.
+     *
+     * @return $this
+     */
+    public function setIncludeCharts(bool $includeCharts): self;
+
+    /**
+     * Get Pre-Calculate Formulas flag
+     *     If this is true (the default), then the writer will recalculate all formulae in a workbook when saving,
+     *        so that the pre-calculated values are immediately available to MS Excel or other office spreadsheet
+     *        viewer when opening the file
+     *     If false, then formulae are not calculated on save. This is faster for saving in PhpSpreadsheet, but slower
+     *        when opening the resulting file in MS Excel, because Excel has to recalculate the formulae itself.
+     */
+    public function getPreCalculateFormulas(): bool;
+
+    /**
+     * Set Pre-Calculate Formulas
+     *        Set to true (the default) to advise the Writer to calculate all formulae on save
+     *        Set to false to prevent precalculation of formulae on save.
+     *
+     * @param bool $precalculateFormulas Pre-Calculate Formulas?
+     *
+     * @return $this
+     */
+    public function setPreCalculateFormulas(bool $precalculateFormulas): self;
+
+    /**
+     * Save PhpSpreadsheet to file.
+     *
+     * @param resource|string $filename Name of the file to save
+     * @param int $flags Flags that can change the behaviour of the Writer:
+     *            self::SAVE_WITH_CHARTS                Save any charts that are defined (if the Writer supports Charts)
+     *            self::DISABLE_PRECALCULATE_FORMULAE   Don't Precalculate formulae before saving the file
+     *
+     * @throws Exception
+     */
+    public function save($filename, int $flags = 0): void;
+
+    /**
+     * Get use disk caching where possible?
+     */
+    public function getUseDiskCaching(): bool;
+
+    /**
+     * Set use disk caching where possible?
+     *
+     * @param ?string $cacheDirectory Disk caching directory
+     *
+     * @return $this
+     */
+    public function setUseDiskCaching(bool $useDiskCache, ?string $cacheDirectory = null): self;
+
+    /**
+     * Get disk caching directory.
+     */
+    public function getDiskCachingDirectory(): string;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php
new file mode 100644
index 00000000..638c16f1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\Content;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\Meta;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\MetaInf;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\Mimetype;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\Settings;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\Styles;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\Thumbnails;
+use ZipStream\Exception\OverflowException;
+use ZipStream\ZipStream;
+
+class Ods extends BaseWriter
+{
+    /**
+     * Private PhpSpreadsheet.
+     */
+    private Spreadsheet $spreadSheet;
+
+    private Content $writerPartContent;
+
+    private Meta $writerPartMeta;
+
+    private MetaInf $writerPartMetaInf;
+
+    private Mimetype $writerPartMimetype;
+
+    private Settings $writerPartSettings;
+
+    private Styles $writerPartStyles;
+
+    private Thumbnails $writerPartThumbnails;
+
+    /**
+     * Create a new Ods.
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->setSpreadsheet($spreadsheet);
+
+        $this->writerPartContent = new Content($this);
+        $this->writerPartMeta = new Meta($this);
+        $this->writerPartMetaInf = new MetaInf($this);
+        $this->writerPartMimetype = new Mimetype($this);
+        $this->writerPartSettings = new Settings($this);
+        $this->writerPartStyles = new Styles($this);
+        $this->writerPartThumbnails = new Thumbnails($this);
+    }
+
+    public function getWriterPartContent(): Content
+    {
+        return $this->writerPartContent;
+    }
+
+    public function getWriterPartMeta(): Meta
+    {
+        return $this->writerPartMeta;
+    }
+
+    public function getWriterPartMetaInf(): MetaInf
+    {
+        return $this->writerPartMetaInf;
+    }
+
+    public function getWriterPartMimetype(): Mimetype
+    {
+        return $this->writerPartMimetype;
+    }
+
+    public function getWriterPartSettings(): Settings
+    {
+        return $this->writerPartSettings;
+    }
+
+    public function getWriterPartStyles(): Styles
+    {
+        return $this->writerPartStyles;
+    }
+
+    public function getWriterPartThumbnails(): Thumbnails
+    {
+        return $this->writerPartThumbnails;
+    }
+
+    /**
+     * Save PhpSpreadsheet to file.
+     *
+     * @param resource|string $filename
+     */
+    public function save($filename, int $flags = 0): void
+    {
+        $this->processFlags($flags);
+
+        // garbage collect
+        $this->spreadSheet->garbageCollect();
+
+        $this->openFileHandle($filename);
+
+        $zip = $this->createZip();
+
+        $zip->addFile('META-INF/manifest.xml', $this->getWriterPartMetaInf()->write());
+        $zip->addFile('Thumbnails/thumbnail.png', $this->getWriterPartthumbnails()->write());
+        // Settings always need to be written before Content; Styles after Content
+        $zip->addFile('settings.xml', $this->getWriterPartsettings()->write());
+        $zip->addFile('content.xml', $this->getWriterPartcontent()->write());
+        $zip->addFile('meta.xml', $this->getWriterPartmeta()->write());
+        $zip->addFile('mimetype', $this->getWriterPartmimetype()->write());
+        $zip->addFile('styles.xml', $this->getWriterPartstyles()->write());
+
+        // Close file
+        try {
+            $zip->finish();
+        } catch (OverflowException) {
+            throw new WriterException('Could not close resource.');
+        }
+
+        $this->maybeCloseFileHandle();
+    }
+
+    /**
+     * Create zip object.
+     */
+    private function createZip(): ZipStream
+    {
+        // Try opening the ZIP file
+        if (!is_resource($this->fileHandle)) {
+            throw new WriterException('Could not open resource for writing.');
+        }
+
+        // Create new ZIP stream
+        return ZipStream0::newZipStream($this->fileHandle);
+    }
+
+    /**
+     * Get Spreadsheet object.
+     */
+    public function getSpreadsheet(): Spreadsheet
+    {
+        return $this->spreadSheet;
+    }
+
+    /**
+     * Set Spreadsheet object.
+     *
+     * @param Spreadsheet $spreadsheet PhpSpreadsheet object
+     *
+     * @return $this
+     */
+    public function setSpreadsheet(Spreadsheet $spreadsheet): static
+    {
+        $this->spreadSheet = $spreadsheet;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
new file mode 100644
index 00000000..6d757e91
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class AutoFilters
+{
+    private XMLWriter $objWriter;
+
+    private Spreadsheet $spreadsheet;
+
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet)
+    {
+        $this->objWriter = $objWriter;
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function write(): void
+    {
+        $wrapperWritten = false;
+        $sheetCount = $this->spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $worksheet = $this->spreadsheet->getSheet($i);
+            $autofilter = $worksheet->getAutoFilter();
+            if ($autofilter !== null && !empty($autofilter->getRange())) {
+                if ($wrapperWritten === false) {
+                    $this->objWriter->startElement('table:database-ranges');
+                    $wrapperWritten = true;
+                }
+                $this->objWriter->startElement('table:database-range');
+                $this->objWriter->writeAttribute('table:orientation', 'column');
+                $this->objWriter->writeAttribute('table:display-filter-buttons', 'true');
+                $this->objWriter->writeAttribute(
+                    'table:target-range-address',
+                    $this->formatRange($worksheet, $autofilter)
+                );
+                $this->objWriter->endElement();
+            }
+        }
+
+        if ($wrapperWritten === true) {
+            $this->objWriter->endElement();
+        }
+    }
+
+    protected function formatRange(Worksheet $worksheet, AutoFilter $autofilter): string
+    {
+        $title = $worksheet->getTitle();
+        $range = $autofilter->getRange();
+
+        return "'{$title}'.{$range}";
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
new file mode 100644
index 00000000..f0b7d570
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods\Cell;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+
+/**
+ * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
+ */
+class Comment
+{
+    public static function write(XMLWriter $objWriter, Cell $cell): void
+    {
+        $comments = $cell->getWorksheet()->getComments();
+        if (!isset($comments[$cell->getCoordinate()])) {
+            return;
+        }
+        $comment = $comments[$cell->getCoordinate()];
+
+        $objWriter->startElement('office:annotation');
+        $objWriter->writeAttribute('svg:width', $comment->getWidth());
+        $objWriter->writeAttribute('svg:height', $comment->getHeight());
+        $objWriter->writeAttribute('svg:x', $comment->getMarginLeft());
+        $objWriter->writeAttribute('svg:y', $comment->getMarginTop());
+        $objWriter->writeElement('dc:creator', $comment->getAuthor());
+
+        $objWriter->startElement('text:p');
+        $text = $comment->getText()->getPlainText();
+        $textElements = explode("\n", $text);
+        $newLineOwed = false;
+        foreach ($textElements as $textSegment) {
+            if ($newLineOwed) {
+                $objWriter->writeElement('text:line-break');
+            }
+            $newLineOwed = true;
+            if ($textSegment !== '') {
+                $objWriter->writeElement('text:span', $textSegment);
+            }
+        }
+        $objWriter->endElement(); // text:p
+
+        $objWriter->endElement();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
new file mode 100644
index 00000000..75732306
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
@@ -0,0 +1,320 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods\Cell;
+
+use PhpOffice\PhpSpreadsheet\Helper\Dimension;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\Style as CellStyle;
+use PhpOffice\PhpSpreadsheet\Worksheet\ColumnDimension;
+use PhpOffice\PhpSpreadsheet\Worksheet\RowDimension;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Style
+{
+    public const CELL_STYLE_PREFIX = 'ce';
+    public const COLUMN_STYLE_PREFIX = 'co';
+    public const ROW_STYLE_PREFIX = 'ro';
+    public const TABLE_STYLE_PREFIX = 'ta';
+
+    private XMLWriter $writer;
+
+    public function __construct(XMLWriter $writer)
+    {
+        $this->writer = $writer;
+    }
+
+    private function mapHorizontalAlignment(string $horizontalAlignment): string
+    {
+        return match ($horizontalAlignment) {
+            Alignment::HORIZONTAL_CENTER, Alignment::HORIZONTAL_CENTER_CONTINUOUS, Alignment::HORIZONTAL_DISTRIBUTED => 'center',
+            Alignment::HORIZONTAL_RIGHT => 'end',
+            Alignment::HORIZONTAL_FILL, Alignment::HORIZONTAL_JUSTIFY => 'justify',
+            default => 'start',
+        };
+    }
+
+    private function mapVerticalAlignment(string $verticalAlignment): string
+    {
+        return match ($verticalAlignment) {
+            Alignment::VERTICAL_TOP => 'top',
+            Alignment::VERTICAL_CENTER => 'middle',
+            Alignment::VERTICAL_DISTRIBUTED, Alignment::VERTICAL_JUSTIFY => 'automatic',
+            default => 'bottom',
+        };
+    }
+
+    private function writeFillStyle(Fill $fill): void
+    {
+        switch ($fill->getFillType()) {
+            case Fill::FILL_SOLID:
+                $this->writer->writeAttribute('fo:background-color', sprintf(
+                    '#%s',
+                    strtolower($fill->getStartColor()->getRGB())
+                ));
+
+                break;
+            case Fill::FILL_GRADIENT_LINEAR:
+            case Fill::FILL_GRADIENT_PATH:
+                /// TODO :: To be implemented
+                break;
+            case Fill::FILL_NONE:
+            default:
+        }
+    }
+
+    private function writeBordersStyle(Borders $borders): void
+    {
+        $this->writeBorderStyle('bottom', $borders->getBottom());
+        $this->writeBorderStyle('left', $borders->getLeft());
+        $this->writeBorderStyle('right', $borders->getRight());
+        $this->writeBorderStyle('top', $borders->getTop());
+    }
+
+    private function writeBorderStyle(string $direction, Border $border): void
+    {
+        if ($border->getBorderStyle() === Border::BORDER_NONE) {
+            return;
+        }
+
+        $this->writer->writeAttribute('fo:border-' . $direction, sprintf(
+            '%s %s #%s',
+            $this->mapBorderWidth($border),
+            $this->mapBorderStyle($border),
+            $border->getColor()->getRGB(),
+        ));
+    }
+
+    private function mapBorderWidth(Border $border): string
+    {
+        switch ($border->getBorderStyle()) {
+            case Border::BORDER_THIN:
+            case Border::BORDER_DASHED:
+            case Border::BORDER_DASHDOT:
+            case Border::BORDER_DASHDOTDOT:
+            case Border::BORDER_DOTTED:
+            case Border::BORDER_HAIR:
+                return '0.75pt';
+            case Border::BORDER_MEDIUM:
+            case Border::BORDER_MEDIUMDASHED:
+            case Border::BORDER_MEDIUMDASHDOT:
+            case Border::BORDER_MEDIUMDASHDOTDOT:
+            case Border::BORDER_SLANTDASHDOT:
+                return '1.75pt';
+            case Border::BORDER_DOUBLE:
+            case Border::BORDER_THICK:
+                return '2.5pt';
+        }
+
+        return '1pt';
+    }
+
+    private function mapBorderStyle(Border $border): string
+    {
+        switch ($border->getBorderStyle()) {
+            case Border::BORDER_DOTTED:
+            case Border::BORDER_MEDIUMDASHDOTDOT:
+                return Border::BORDER_DOTTED;
+
+            case Border::BORDER_DASHED:
+            case Border::BORDER_DASHDOT:
+            case Border::BORDER_DASHDOTDOT:
+            case Border::BORDER_MEDIUMDASHDOT:
+            case Border::BORDER_MEDIUMDASHED:
+            case Border::BORDER_SLANTDASHDOT:
+                return Border::BORDER_DASHED;
+
+            case Border::BORDER_DOUBLE:
+                return Border::BORDER_DOUBLE;
+
+            case Border::BORDER_HAIR:
+            case Border::BORDER_MEDIUM:
+            case Border::BORDER_THICK:
+            case Border::BORDER_THIN:
+                return 'solid';
+        }
+
+        return 'solid';
+    }
+
+    private function writeCellProperties(CellStyle $style): void
+    {
+        // Align
+        $hAlign = $style->getAlignment()->getHorizontal();
+        $vAlign = $style->getAlignment()->getVertical();
+        $wrap = $style->getAlignment()->getWrapText();
+
+        $this->writer->startElement('style:table-cell-properties');
+        if (!empty($vAlign) || $wrap) {
+            if (!empty($vAlign)) {
+                $vAlign = $this->mapVerticalAlignment($vAlign);
+                $this->writer->writeAttribute('style:vertical-align', $vAlign);
+            }
+            if ($wrap) {
+                $this->writer->writeAttribute('fo:wrap-option', 'wrap');
+            }
+        }
+        $this->writer->writeAttribute('style:rotation-align', 'none');
+
+        // Fill
+        $this->writeFillStyle($style->getFill());
+
+        // Border
+        $this->writeBordersStyle($style->getBorders());
+
+        $this->writer->endElement();
+
+        if (!empty($hAlign)) {
+            $hAlign = $this->mapHorizontalAlignment($hAlign);
+            $this->writer->startElement('style:paragraph-properties');
+            $this->writer->writeAttribute('fo:text-align', $hAlign);
+            $this->writer->endElement();
+        }
+    }
+
+    protected function mapUnderlineStyle(Font $font): string
+    {
+        return match ($font->getUnderline()) {
+            Font::UNDERLINE_DOUBLE, Font::UNDERLINE_DOUBLEACCOUNTING => 'double',
+            Font::UNDERLINE_SINGLE, Font::UNDERLINE_SINGLEACCOUNTING => 'single',
+            default => 'none',
+        };
+    }
+
+    protected function writeTextProperties(CellStyle $style): void
+    {
+        // Font
+        $this->writer->startElement('style:text-properties');
+
+        $font = $style->getFont();
+
+        if ($font->getBold()) {
+            $this->writer->writeAttribute('fo:font-weight', 'bold');
+            $this->writer->writeAttribute('style:font-weight-complex', 'bold');
+            $this->writer->writeAttribute('style:font-weight-asian', 'bold');
+        }
+
+        if ($font->getItalic()) {
+            $this->writer->writeAttribute('fo:font-style', 'italic');
+        }
+
+        $this->writer->writeAttribute('fo:color', sprintf('#%s', $font->getColor()->getRGB()));
+
+        if ($family = $font->getName()) {
+            $this->writer->writeAttribute('fo:font-family', $family);
+        }
+
+        if ($size = $font->getSize()) {
+            $this->writer->writeAttribute('fo:font-size', sprintf('%.1Fpt', $size));
+        }
+
+        if ($font->getUnderline() && $font->getUnderline() !== Font::UNDERLINE_NONE) {
+            $this->writer->writeAttribute('style:text-underline-style', 'solid');
+            $this->writer->writeAttribute('style:text-underline-width', 'auto');
+            $this->writer->writeAttribute('style:text-underline-color', 'font-color');
+
+            $underline = $this->mapUnderlineStyle($font);
+            $this->writer->writeAttribute('style:text-underline-type', $underline);
+        }
+
+        $this->writer->endElement(); // Close style:text-properties
+    }
+
+    protected function writeColumnProperties(ColumnDimension $columnDimension): void
+    {
+        $this->writer->startElement('style:table-column-properties');
+        $this->writer->writeAttribute(
+            'style:column-width',
+            round($columnDimension->getWidth(Dimension::UOM_CENTIMETERS), 3) . 'cm'
+        );
+        $this->writer->writeAttribute('fo:break-before', 'auto');
+
+        // End
+        $this->writer->endElement(); // Close style:table-column-properties
+    }
+
+    public function writeColumnStyles(ColumnDimension $columnDimension, int $sheetId): void
+    {
+        $this->writer->startElement('style:style');
+        $this->writer->writeAttribute('style:family', 'table-column');
+        $this->writer->writeAttribute(
+            'style:name',
+            sprintf('%s_%d_%d', self::COLUMN_STYLE_PREFIX, $sheetId, $columnDimension->getColumnNumeric())
+        );
+
+        $this->writeColumnProperties($columnDimension);
+
+        // End
+        $this->writer->endElement(); // Close style:style
+    }
+
+    protected function writeRowProperties(RowDimension $rowDimension): void
+    {
+        $this->writer->startElement('style:table-row-properties');
+        $this->writer->writeAttribute(
+            'style:row-height',
+            round($rowDimension->getRowHeight(Dimension::UOM_CENTIMETERS), 3) . 'cm'
+        );
+        $this->writer->writeAttribute('style:use-optimal-row-height', 'false');
+        $this->writer->writeAttribute('fo:break-before', 'auto');
+
+        // End
+        $this->writer->endElement(); // Close style:table-row-properties
+    }
+
+    public function writeRowStyles(RowDimension $rowDimension, int $sheetId): void
+    {
+        $this->writer->startElement('style:style');
+        $this->writer->writeAttribute('style:family', 'table-row');
+        $this->writer->writeAttribute(
+            'style:name',
+            sprintf('%s_%d_%d', self::ROW_STYLE_PREFIX, $sheetId, $rowDimension->getRowIndex())
+        );
+
+        $this->writeRowProperties($rowDimension);
+
+        // End
+        $this->writer->endElement(); // Close style:style
+    }
+
+    public function writeTableStyle(Worksheet $worksheet, int $sheetId): void
+    {
+        $this->writer->startElement('style:style');
+        $this->writer->writeAttribute('style:family', 'table');
+        $this->writer->writeAttribute(
+            'style:name',
+            sprintf('%s%d', self::TABLE_STYLE_PREFIX, $sheetId)
+        );
+
+        $this->writer->startElement('style:table-properties');
+
+        $this->writer->writeAttribute(
+            'table:display',
+            $worksheet->getSheetState() === Worksheet::SHEETSTATE_VISIBLE ? 'true' : 'false'
+        );
+
+        $this->writer->endElement(); // Close style:table-properties
+        $this->writer->endElement(); // Close style:style
+    }
+
+    public function write(CellStyle $style): void
+    {
+        $this->writer->startElement('style:style');
+        $this->writer->writeAttribute('style:name', self::CELL_STYLE_PREFIX . $style->getIndex());
+        $this->writer->writeAttribute('style:family', 'table-cell');
+        $this->writer->writeAttribute('style:parent-style-name', 'Default');
+
+        // Alignment, fill colour, etc
+        $this->writeCellProperties($style);
+
+        // style:text-properties
+        $this->writeTextProperties($style);
+
+        // End
+        $this->writer->endElement(); // Close style:style
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php
new file mode 100644
index 00000000..7ffcd46b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php
@@ -0,0 +1,357 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\RowCellIterator;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Writer\Ods;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\Cell\Comment;
+use PhpOffice\PhpSpreadsheet\Writer\Ods\Cell\Style;
+
+/**
+ * @author     Alexander Pervakov <frost-nzcr4@jagmort.com>
+ */
+class Content extends WriterPart
+{
+    const NUMBER_COLS_REPEATED_MAX = 1024;
+    const NUMBER_ROWS_REPEATED_MAX = 1048576;
+
+    private Formula $formulaConvertor;
+
+    /**
+     * Set parent Ods writer.
+     */
+    public function __construct(Ods $writer)
+    {
+        parent::__construct($writer);
+
+        $this->formulaConvertor = new Formula($this->getParentWriter()->getSpreadsheet()->getDefinedNames());
+    }
+
+    /**
+     * Write content.xml to XML format.
+     *
+     * @return string XML Output
+     */
+    public function write(): string
+    {
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Content
+        $objWriter->startElement('office:document-content');
+        $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
+        $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0');
+        $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0');
+        $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0');
+        $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0');
+        $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0');
+        $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+        $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
+        $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
+        $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0');
+        $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0');
+        $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0');
+        $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0');
+        $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0');
+        $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML');
+        $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0');
+        $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0');
+        $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
+        $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer');
+        $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc');
+        $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events');
+        $objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms');
+        $objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema');
+        $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+        $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report');
+        $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2');
+        $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
+        $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
+        $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table');
+        $objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0');
+        $objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0');
+        $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/');
+        $objWriter->writeAttribute('office:version', '1.2');
+
+        $objWriter->writeElement('office:scripts');
+        $objWriter->writeElement('office:font-face-decls');
+
+        // Styles XF
+        $objWriter->startElement('office:automatic-styles');
+        $this->writeXfStyles($objWriter, $this->getParentWriter()->getSpreadsheet());
+        $objWriter->endElement();
+
+        $objWriter->startElement('office:body');
+        $objWriter->startElement('office:spreadsheet');
+        $objWriter->writeElement('table:calculation-settings');
+
+        $this->writeSheets($objWriter);
+
+        (new AutoFilters($objWriter, $this->getParentWriter()->getSpreadsheet()))->write();
+        // Defined names (ranges and formulae)
+        (new NamedExpressions($objWriter, $this->getParentWriter()->getSpreadsheet(), $this->formulaConvertor))->write();
+
+        $objWriter->endElement();
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write sheets.
+     */
+    private function writeSheets(XMLWriter $objWriter): void
+    {
+        $spreadsheet = $this->getParentWriter()->getSpreadsheet();
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($sheetIndex = 0; $sheetIndex < $sheetCount; ++$sheetIndex) {
+            $objWriter->startElement('table:table');
+            $objWriter->writeAttribute('table:name', $spreadsheet->getSheet($sheetIndex)->getTitle());
+            $objWriter->writeAttribute('table:style-name', Style::TABLE_STYLE_PREFIX . (string) ($sheetIndex + 1));
+            $objWriter->writeElement('office:forms');
+            $lastColumn = 0;
+            foreach ($spreadsheet->getSheet($sheetIndex)->getColumnDimensions() as $columnDimension) {
+                $thisColumn = $columnDimension->getColumnNumeric();
+                $emptyColumns = $thisColumn - $lastColumn - 1;
+                if ($emptyColumns > 0) {
+                    $objWriter->startElement('table:table-column');
+                    $objWriter->writeAttribute('table:number-columns-repeated', (string) $emptyColumns);
+                    $objWriter->endElement();
+                }
+                $lastColumn = $thisColumn;
+                $objWriter->startElement('table:table-column');
+                $objWriter->writeAttribute(
+                    'table:style-name',
+                    sprintf('%s_%d_%d', Style::COLUMN_STYLE_PREFIX, $sheetIndex, $columnDimension->getColumnNumeric())
+                );
+                $objWriter->writeAttribute('table:default-cell-style-name', 'ce0');
+//                $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
+                $objWriter->endElement();
+            }
+            $this->writeRows($objWriter, $spreadsheet->getSheet($sheetIndex), $sheetIndex);
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write rows of the specified sheet.
+     */
+    private function writeRows(XMLWriter $objWriter, Worksheet $sheet, int $sheetIndex): void
+    {
+        $numberRowsRepeated = self::NUMBER_ROWS_REPEATED_MAX;
+        $span_row = 0;
+        $rows = $sheet->getRowIterator();
+        foreach ($rows as $row) {
+            $cellIterator = $row->getCellIterator();
+            --$numberRowsRepeated;
+            if ($cellIterator->valid()) {
+                $objWriter->startElement('table:table-row');
+                if ($span_row) {
+                    if ($span_row > 1) {
+                        $objWriter->writeAttribute('table:number-rows-repeated', (string) $span_row);
+                    }
+                    $objWriter->startElement('table:table-cell');
+                    $objWriter->writeAttribute('table:number-columns-repeated', (string) self::NUMBER_COLS_REPEATED_MAX);
+                    $objWriter->endElement();
+                    $span_row = 0;
+                } else {
+                    if ($sheet->rowDimensionExists($row->getRowIndex()) && $sheet->getRowDimension($row->getRowIndex())->getRowHeight() > 0) {
+                        $objWriter->writeAttribute(
+                            'table:style-name',
+                            sprintf('%s_%d_%d', Style::ROW_STYLE_PREFIX, $sheetIndex, $row->getRowIndex())
+                        );
+                    }
+                    $this->writeCells($objWriter, $cellIterator);
+                }
+                $objWriter->endElement();
+            } else {
+                ++$span_row;
+            }
+        }
+    }
+
+    /**
+     * Write cells of the specified row.
+     */
+    private function writeCells(XMLWriter $objWriter, RowCellIterator $cells): void
+    {
+        $numberColsRepeated = self::NUMBER_COLS_REPEATED_MAX;
+        $prevColumn = -1;
+        foreach ($cells as $cell) {
+            /** @var Cell $cell */
+            $column = Coordinate::columnIndexFromString($cell->getColumn()) - 1;
+
+            $this->writeCellSpan($objWriter, $column, $prevColumn);
+            $objWriter->startElement('table:table-cell');
+            $this->writeCellMerge($objWriter, $cell);
+
+            // Style XF
+            $style = $cell->getXfIndex();
+            if ($style !== null) {
+                $objWriter->writeAttribute('table:style-name', Style::CELL_STYLE_PREFIX . $style);
+            }
+
+            switch ($cell->getDataType()) {
+                case DataType::TYPE_BOOL:
+                    $objWriter->writeAttribute('office:value-type', 'boolean');
+                    $objWriter->writeAttribute('office:boolean-value', $cell->getValue() ? 'true' : 'false');
+                    $objWriter->writeElement('text:p', Calculation::getInstance()->getLocaleBoolean($cell->getValue() ? 'TRUE' : 'FALSE'));
+
+                    break;
+                case DataType::TYPE_ERROR:
+                    $objWriter->writeAttribute('table:formula', 'of:=#NULL!');
+                    $objWriter->writeAttribute('office:value-type', 'string');
+                    $objWriter->writeAttribute('office:string-value', '');
+                    $objWriter->writeElement('text:p', '#NULL!');
+
+                    break;
+                case DataType::TYPE_FORMULA:
+                    $formulaValue = $cell->getValueString();
+                    if ($this->getParentWriter()->getPreCalculateFormulas()) {
+                        try {
+                            $formulaValue = $cell->getCalculatedValueString();
+                        } catch (CalculationException $e) {
+                            // don't do anything
+                        }
+                    }
+                    $objWriter->writeAttribute('table:formula', $this->formulaConvertor->convertFormula($cell->getValueString()));
+                    if (is_numeric($formulaValue)) {
+                        $objWriter->writeAttribute('office:value-type', 'float');
+                    } else {
+                        $objWriter->writeAttribute('office:value-type', 'string');
+                    }
+                    $objWriter->writeAttribute('office:value', $formulaValue);
+                    $objWriter->writeElement('text:p', $formulaValue);
+
+                    break;
+                case DataType::TYPE_NUMERIC:
+                    $objWriter->writeAttribute('office:value-type', 'float');
+                    $objWriter->writeAttribute('office:value', $cell->getValueString());
+                    $objWriter->writeElement('text:p', $cell->getValueString());
+
+                    break;
+                case DataType::TYPE_INLINE:
+                    // break intentionally omitted
+                case DataType::TYPE_STRING:
+                    $objWriter->writeAttribute('office:value-type', 'string');
+                    $url = $cell->getHyperlink()->getUrl();
+                    if (empty($url)) {
+                        $objWriter->writeElement('text:p', $cell->getValueString());
+                    } else {
+                        $objWriter->startElement('text:p');
+                        $objWriter->startElement('text:a');
+                        $sheets = 'sheet://';
+                        $lensheets = strlen($sheets);
+                        if (substr($url, 0, $lensheets) === $sheets) {
+                            $url = '#' . substr($url, $lensheets);
+                        }
+                        $objWriter->writeAttribute('xlink:href', $url);
+                        $objWriter->writeAttribute('xlink:type', 'simple');
+                        $objWriter->text($cell->getValueString());
+                        $objWriter->endElement(); // text:a
+                        $objWriter->endElement(); // text:p
+                    }
+
+                    break;
+            }
+            Comment::write($objWriter, $cell);
+            $objWriter->endElement();
+            $prevColumn = $column;
+        }
+
+        $numberColsRepeated = $numberColsRepeated - $prevColumn - 1;
+        if ($numberColsRepeated > 0) {
+            if ($numberColsRepeated > 1) {
+                $objWriter->startElement('table:table-cell');
+                $objWriter->writeAttribute('table:number-columns-repeated', (string) $numberColsRepeated);
+                $objWriter->endElement();
+            } else {
+                $objWriter->writeElement('table:table-cell');
+            }
+        }
+    }
+
+    /**
+     * Write span.
+     */
+    private function writeCellSpan(XMLWriter $objWriter, int $curColumn, int $prevColumn): void
+    {
+        $diff = $curColumn - $prevColumn - 1;
+        if (1 === $diff) {
+            $objWriter->writeElement('table:table-cell');
+        } elseif ($diff > 1) {
+            $objWriter->startElement('table:table-cell');
+            $objWriter->writeAttribute('table:number-columns-repeated', (string) $diff);
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write XF cell styles.
+     */
+    private function writeXfStyles(XMLWriter $writer, Spreadsheet $spreadsheet): void
+    {
+        $styleWriter = new Style($writer);
+
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $worksheet = $spreadsheet->getSheet($i);
+            $styleWriter->writeTableStyle($worksheet, $i + 1);
+
+            $worksheet->calculateColumnWidths();
+            foreach ($worksheet->getColumnDimensions() as $columnDimension) {
+                if ($columnDimension->getWidth() !== -1.0) {
+                    $styleWriter->writeColumnStyles($columnDimension, $i);
+                }
+            }
+        }
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $worksheet = $spreadsheet->getSheet($i);
+            foreach ($worksheet->getRowDimensions() as $rowDimension) {
+                if ($rowDimension->getRowHeight() > 0.0) {
+                    $styleWriter->writeRowStyles($rowDimension, $i);
+                }
+            }
+        }
+
+        foreach ($spreadsheet->getCellXfCollection() as $style) {
+            $styleWriter->write($style);
+        }
+    }
+
+    /**
+     * Write attributes for merged cell.
+     */
+    private function writeCellMerge(XMLWriter $objWriter, Cell $cell): void
+    {
+        if (!$cell->isMergeRangeValueCell()) {
+            return;
+        }
+
+        $mergeRange = Coordinate::splitRange((string) $cell->getMergeRange());
+        [$startCell, $endCell] = $mergeRange[0];
+        $start = Coordinate::coordinateFromString($startCell);
+        $end = Coordinate::coordinateFromString($endCell);
+        $columnSpan = Coordinate::columnIndexFromString($end[0]) - Coordinate::columnIndexFromString($start[0]) + 1;
+        $rowSpan = ((int) $end[1]) - ((int) $start[1]) + 1;
+
+        $objWriter->writeAttribute('table:number-columns-spanned', (string) $columnSpan);
+        $objWriter->writeAttribute('table:number-rows-spanned', (string) $rowSpan);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php
new file mode 100644
index 00000000..9385607b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+
+class Formula
+{
+    private array $definedNames = [];
+
+    /**
+     * @param DefinedName[] $definedNames
+     */
+    public function __construct(array $definedNames)
+    {
+        foreach ($definedNames as $definedName) {
+            $this->definedNames[] = $definedName->getName();
+        }
+    }
+
+    public function convertFormula(string $formula, string $worksheetName = ''): string
+    {
+        $formula = $this->convertCellReferences($formula, $worksheetName);
+        $formula = $this->convertDefinedNames($formula);
+
+        if (!str_starts_with($formula, '=')) {
+            $formula = '=' . $formula;
+        }
+
+        return 'of:' . $formula;
+    }
+
+    private function convertDefinedNames(string $formula): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+        $values = array_column($splitRanges[0], 0);
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $value = $values[$splitCount];
+
+            if (in_array($value, $this->definedNames, true)) {
+                $formula = substr($formula, 0, $offset) . '$$' . $value . substr($formula, $offset + $length);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function convertCellReferences(string $formula, string $worksheetName): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        // Replace any commas in the formula with semi-colons for Ods
+        // If by chance there are commas in worksheet names, then they will be "fixed" again in the loop
+        //    because we've already extracted worksheet names with our preg_match_all()
+        $formula = str_replace(',', ';', $formula);
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($formula[$offset - 1] !== ':')) {
+                    // We need a worksheet
+                    $worksheet = $worksheetName;
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "['" . str_replace("'", "''", $worksheet) . "'";
+            } elseif (substr($formula, $offset - 1, 1) !== ':') {
+                $newRange = '[';
+            }
+            $newRange .= '.';
+
+            if (!empty($column)) {
+                $newRange .= $column;
+            }
+            if (!empty($row)) {
+                $newRange .= $row;
+            }
+            // close the wrapping [] unless this is the first part of a range
+            $newRange .= substr($formula, $offset + $length, 1) !== ':' ? ']' : '';
+
+            $formula = substr($formula, 0, $offset) . $newRange . substr($formula, $offset + $length);
+        }
+
+        return $formula;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php
new file mode 100644
index 00000000..b47b2553
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+class Meta extends WriterPart
+{
+    /**
+     * Write meta.xml to XML format.
+     *
+     * @return string XML Output
+     */
+    public function write(): string
+    {
+        $spreadsheet = $this->getParentWriter()->getSpreadsheet();
+
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Meta
+        $objWriter->startElement('office:document-meta');
+
+        $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
+        $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+        $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
+        $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
+        $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
+        $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
+        $objWriter->writeAttribute('office:version', '1.2');
+
+        $objWriter->startElement('office:meta');
+
+        $objWriter->writeElement('meta:initial-creator', $spreadsheet->getProperties()->getCreator());
+        $objWriter->writeElement('dc:creator', $spreadsheet->getProperties()->getCreator());
+        $created = $spreadsheet->getProperties()->getCreated();
+        $date = Date::dateTimeFromTimestamp("$created");
+        $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+        $objWriter->writeElement('meta:creation-date', $date->format(DATE_W3C));
+        $created = $spreadsheet->getProperties()->getModified();
+        $date = Date::dateTimeFromTimestamp("$created");
+        $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+        $objWriter->writeElement('dc:date', $date->format(DATE_W3C));
+        $objWriter->writeElement('dc:title', $spreadsheet->getProperties()->getTitle());
+        $objWriter->writeElement('dc:description', $spreadsheet->getProperties()->getDescription());
+        $objWriter->writeElement('dc:subject', $spreadsheet->getProperties()->getSubject());
+        $objWriter->writeElement('meta:keyword', $spreadsheet->getProperties()->getKeywords());
+        // Don't know if this changed over time, but the keywords are all
+        //  in a single declaration now.
+        //$keywords = explode(' ', $spreadsheet->getProperties()->getKeywords());
+        //foreach ($keywords as $keyword) {
+        //    $objWriter->writeElement('meta:keyword', $keyword);
+        //}
+
+        //<meta:document-statistic meta:table-count="XXX" meta:cell-count="XXX" meta:object-count="XXX"/>
+        $objWriter->startElement('meta:user-defined');
+        $objWriter->writeAttribute('meta:name', 'Company');
+        $objWriter->writeRawData($spreadsheet->getProperties()->getCompany());
+        $objWriter->endElement();
+
+        $objWriter->startElement('meta:user-defined');
+        $objWriter->writeAttribute('meta:name', 'category');
+        $objWriter->writeRawData($spreadsheet->getProperties()->getCategory());
+        $objWriter->endElement();
+
+        self::writeDocPropsCustom($objWriter, $spreadsheet);
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    private static function writeDocPropsCustom(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
+    {
+        $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
+        foreach ($customPropertyList as $customProperty) {
+            $propertyValue = $spreadsheet->getProperties()->getCustomPropertyValue($customProperty);
+            $propertyType = $spreadsheet->getProperties()->getCustomPropertyType($customProperty);
+
+            $objWriter->startElement('meta:user-defined');
+            $objWriter->writeAttribute('meta:name', $customProperty);
+
+            switch ($propertyType) {
+                case Properties::PROPERTY_TYPE_INTEGER:
+                case Properties::PROPERTY_TYPE_FLOAT:
+                    $objWriter->writeAttribute('meta:value-type', 'float');
+                    $objWriter->writeRawData((string) $propertyValue);
+
+                    break;
+                case Properties::PROPERTY_TYPE_BOOLEAN:
+                    $objWriter->writeAttribute('meta:value-type', 'boolean');
+                    $objWriter->writeRawData($propertyValue ? 'true' : 'false');
+
+                    break;
+                case Properties::PROPERTY_TYPE_DATE:
+                    $objWriter->writeAttribute('meta:value-type', 'date');
+                    $dtobj = Date::dateTimeFromTimestamp((string) ($propertyValue ?? 0));
+                    $objWriter->writeRawData($dtobj->format(DATE_W3C));
+
+                    break;
+                default:
+                    $objWriter->writeRawData((string) $propertyValue);
+
+                    break;
+            }
+
+            $objWriter->endElement();
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php
new file mode 100644
index 00000000..f3f0d5fc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/MetaInf.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+
+class MetaInf extends WriterPart
+{
+    /**
+     * Write META-INF/manifest.xml to XML format.
+     *
+     * @return string XML Output
+     */
+    public function write(): string
+    {
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Manifest
+        $objWriter->startElement('manifest:manifest');
+        $objWriter->writeAttribute('xmlns:manifest', 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0');
+        $objWriter->writeAttribute('manifest:version', '1.2');
+
+        $objWriter->startElement('manifest:file-entry');
+        $objWriter->writeAttribute('manifest:full-path', '/');
+        $objWriter->writeAttribute('manifest:version', '1.2');
+        $objWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.spreadsheet');
+        $objWriter->endElement();
+        $objWriter->startElement('manifest:file-entry');
+        $objWriter->writeAttribute('manifest:full-path', 'meta.xml');
+        $objWriter->writeAttribute('manifest:media-type', 'text/xml');
+        $objWriter->endElement();
+        $objWriter->startElement('manifest:file-entry');
+        $objWriter->writeAttribute('manifest:full-path', 'settings.xml');
+        $objWriter->writeAttribute('manifest:media-type', 'text/xml');
+        $objWriter->endElement();
+        $objWriter->startElement('manifest:file-entry');
+        $objWriter->writeAttribute('manifest:full-path', 'content.xml');
+        $objWriter->writeAttribute('manifest:media-type', 'text/xml');
+        $objWriter->endElement();
+        $objWriter->startElement('manifest:file-entry');
+        $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png');
+        $objWriter->writeAttribute('manifest:media-type', 'image/png');
+        $objWriter->endElement();
+        $objWriter->startElement('manifest:file-entry');
+        $objWriter->writeAttribute('manifest:full-path', 'styles.xml');
+        $objWriter->writeAttribute('manifest:media-type', 'text/xml');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php
new file mode 100644
index 00000000..e109e6e7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Mimetype.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+class Mimetype extends WriterPart
+{
+    /**
+     * Write mimetype to plain text format.
+     *
+     * @return string XML Output
+     */
+    public function write(): string
+    {
+        return 'application/vnd.oasis.opendocument.spreadsheet';
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
new file mode 100644
index 00000000..72b1dd05
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class NamedExpressions
+{
+    private XMLWriter $objWriter;
+
+    private Spreadsheet $spreadsheet;
+
+    private Formula $formulaConvertor;
+
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet, Formula $formulaConvertor)
+    {
+        $this->objWriter = $objWriter;
+        $this->spreadsheet = $spreadsheet;
+        $this->formulaConvertor = $formulaConvertor;
+    }
+
+    public function write(): string
+    {
+        $this->objWriter->startElement('table:named-expressions');
+        $this->writeExpressions();
+        $this->objWriter->endElement();
+
+        return '';
+    }
+
+    private function writeExpressions(): void
+    {
+        $definedNames = $this->spreadsheet->getDefinedNames();
+
+        foreach ($definedNames as $definedName) {
+            if ($definedName->isFormula()) {
+                $this->objWriter->startElement('table:named-expression');
+                $this->writeNamedFormula($definedName, $this->spreadsheet->getActiveSheet());
+            } else {
+                $this->objWriter->startElement('table:named-range');
+                $this->writeNamedRange($definedName);
+            }
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    private function writeNamedFormula(DefinedName $definedName, Worksheet $defaultWorksheet): void
+    {
+        $title = ($definedName->getWorksheet() !== null) ? $definedName->getWorksheet()->getTitle() : $defaultWorksheet->getTitle();
+        $this->objWriter->writeAttribute('table:name', $definedName->getName());
+        $this->objWriter->writeAttribute(
+            'table:expression',
+            $this->formulaConvertor->convertFormula($definedName->getValue(), $title)
+        );
+        $this->objWriter->writeAttribute('table:base-cell-address', $this->convertAddress(
+            $definedName,
+            "'" . $title . "'!\$A\$1"
+        ));
+    }
+
+    private function writeNamedRange(DefinedName $definedName): void
+    {
+        $baseCell = '$A$1';
+        $ws = $definedName->getWorksheet();
+        if ($ws !== null) {
+            $baseCell = "'" . $ws->getTitle() . "'!$baseCell";
+        }
+        $this->objWriter->writeAttribute('table:name', $definedName->getName());
+        $this->objWriter->writeAttribute('table:base-cell-address', $this->convertAddress(
+            $definedName,
+            $baseCell
+        ));
+        $this->objWriter->writeAttribute('table:cell-range-address', $this->convertAddress($definedName, $definedName->getValue()));
+    }
+
+    private function convertAddress(DefinedName $definedName, string $address): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $address,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($address[$offset - 1] !== ':')) {
+                    // We need a worksheet
+                    $ws = $definedName->getWorksheet();
+                    if ($ws !== null) {
+                        $worksheet = $ws->getTitle();
+                    }
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'.";
+            }
+
+            if (!empty($column)) {
+                $newRange .= $column;
+            }
+            if (!empty($row)) {
+                $newRange .= $row;
+            }
+
+            $address = substr($address, 0, $offset) . $newRange . substr($address, $offset + $length);
+        }
+
+        if (str_starts_with($address, '=')) {
+            $address = substr($address, 1);
+        }
+
+        return $address;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php
new file mode 100644
index 00000000..cfe1b598
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Settings extends WriterPart
+{
+    /**
+     * Write settings.xml to XML format.
+     *
+     * @return string XML Output
+     */
+    public function write(): string
+    {
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Settings
+        $objWriter->startElement('office:document-settings');
+        $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
+        $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+        $objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0');
+        $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
+        $objWriter->writeAttribute('office:version', '1.2');
+
+        $objWriter->startElement('office:settings');
+        $objWriter->startElement('config:config-item-set');
+        $objWriter->writeAttribute('config:name', 'ooo:view-settings');
+        $objWriter->startElement('config:config-item-map-indexed');
+        $objWriter->writeAttribute('config:name', 'Views');
+        $objWriter->startElement('config:config-item-map-entry');
+        $spreadsheet = $this->getParentWriter()->getSpreadsheet();
+
+        $objWriter->startElement('config:config-item');
+        $objWriter->writeAttribute('config:name', 'ViewId');
+        $objWriter->writeAttribute('config:type', 'string');
+        $objWriter->text('view1');
+        $objWriter->endElement(); // ViewId
+        $objWriter->startElement('config:config-item-map-named');
+
+        $this->writeAllWorksheetSettings($objWriter, $spreadsheet);
+
+        $wstitle = $spreadsheet->getActiveSheet()->getTitle();
+        $objWriter->startElement('config:config-item');
+        $objWriter->writeAttribute('config:name', 'ActiveTable');
+        $objWriter->writeAttribute('config:type', 'string');
+        $objWriter->text($wstitle);
+        $objWriter->endElement(); // config:config-item ActiveTable
+
+        $objWriter->endElement(); // config:config-item-map-entry
+        $objWriter->endElement(); // config:config-item-map-indexed Views
+        $objWriter->endElement(); // config:config-item-set ooo:view-settings
+        $objWriter->startElement('config:config-item-set');
+        $objWriter->writeAttribute('config:name', 'ooo:configuration-settings');
+        $objWriter->endElement(); // config:config-item-set ooo:configuration-settings
+        $objWriter->endElement(); // office:settings
+        $objWriter->endElement(); // office:document-settings
+
+        return $objWriter->getData();
+    }
+
+    private function writeAllWorksheetSettings(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
+    {
+        $objWriter->writeAttribute('config:name', 'Tables');
+
+        foreach ($spreadsheet->getWorksheetIterator() as $worksheet) {
+            $this->writeWorksheetSettings($objWriter, $worksheet);
+        }
+
+        $objWriter->endElement(); // config:config-item-map-entry Tables
+    }
+
+    private function writeWorksheetSettings(XMLWriter $objWriter, Worksheet $worksheet): void
+    {
+        $objWriter->startElement('config:config-item-map-entry');
+        $objWriter->writeAttribute('config:name', $worksheet->getTitle());
+
+        $this->writeSelectedCells($objWriter, $worksheet);
+        if ($worksheet->getFreezePane() !== null) {
+            $this->writeFreezePane($objWriter, $worksheet);
+        }
+
+        $objWriter->endElement(); // config:config-item-map-entry Worksheet
+    }
+
+    private function writeSelectedCells(XMLWriter $objWriter, Worksheet $worksheet): void
+    {
+        $selected = $worksheet->getSelectedCells();
+        if (preg_match('/^([a-z]+)([0-9]+)/i', $selected, $matches) === 1) {
+            $colSel = Coordinate::columnIndexFromString($matches[1]) - 1;
+            $rowSel = (int) $matches[2] - 1;
+            $objWriter->startElement('config:config-item');
+            $objWriter->writeAttribute('config:name', 'CursorPositionX');
+            $objWriter->writeAttribute('config:type', 'int');
+            $objWriter->text((string) $colSel);
+            $objWriter->endElement();
+            $objWriter->startElement('config:config-item');
+            $objWriter->writeAttribute('config:name', 'CursorPositionY');
+            $objWriter->writeAttribute('config:type', 'int');
+            $objWriter->text((string) $rowSel);
+            $objWriter->endElement();
+        }
+    }
+
+    private function writeSplitValue(XMLWriter $objWriter, string $splitMode, string $type, string $value): void
+    {
+        $objWriter->startElement('config:config-item');
+        $objWriter->writeAttribute('config:name', $splitMode);
+        $objWriter->writeAttribute('config:type', $type);
+        $objWriter->text($value);
+        $objWriter->endElement();
+    }
+
+    private function writeFreezePane(XMLWriter $objWriter, Worksheet $worksheet): void
+    {
+        $freezePane = CellAddress::fromCellAddress($worksheet->getFreezePane() ?? '');
+        if ($freezePane->cellAddress() === 'A1') {
+            return;
+        }
+
+        $columnId = $freezePane->columnId();
+        $columnName = $freezePane->columnName();
+        $row = $freezePane->rowId();
+
+        $this->writeSplitValue($objWriter, 'HorizontalSplitMode', 'short', '2');
+        $this->writeSplitValue($objWriter, 'HorizontalSplitPosition', 'int', (string) ($columnId - 1));
+        $this->writeSplitValue($objWriter, 'PositionLeft', 'short', '0');
+        $this->writeSplitValue($objWriter, 'PositionRight', 'short', (string) ($columnId - 1));
+
+        for ($column = 'A'; $column !== $columnName; ++$column) {
+            $worksheet->getColumnDimension($column)->setAutoSize(true);
+        }
+
+        $this->writeSplitValue($objWriter, 'VerticalSplitMode', 'short', '2');
+        $this->writeSplitValue($objWriter, 'VerticalSplitPosition', 'int', (string) ($row - 1));
+        $this->writeSplitValue($objWriter, 'PositionTop', 'short', '0');
+        $this->writeSplitValue($objWriter, 'PositionBottom', 'short', (string) ($row - 1));
+
+        $this->writeSplitValue($objWriter, 'ActiveSplitRange', 'short', '3');
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php
new file mode 100644
index 00000000..448b1eff
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Styles.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+
+class Styles extends WriterPart
+{
+    /**
+     * Write styles.xml to XML format.
+     *
+     * @return string XML Output
+     */
+    public function write(): string
+    {
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8');
+
+        // Content
+        $objWriter->startElement('office:document-styles');
+        $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
+        $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0');
+        $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0');
+        $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0');
+        $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0');
+        $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0');
+        $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+        $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
+        $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
+        $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0');
+        $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0');
+        $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0');
+        $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0');
+        $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0');
+        $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML');
+        $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0');
+        $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0');
+        $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
+        $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer');
+        $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc');
+        $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events');
+        $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report');
+        $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2');
+        $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
+        $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
+        $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table');
+        $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/');
+        $objWriter->writeAttribute('office:version', '1.2');
+
+        $objWriter->writeElement('office:font-face-decls');
+        $objWriter->writeElement('office:styles');
+        $objWriter->writeElement('office:automatic-styles');
+        $objWriter->writeElement('office:master-styles');
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php
new file mode 100644
index 00000000..db9579d0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Thumbnails.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+class Thumbnails extends WriterPart
+{
+    /**
+     * Write Thumbnails/thumbnail.png to PNG format.
+     *
+     * @return string XML Output
+     */
+    public function write(): string
+    {
+        return '';
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php
new file mode 100644
index 00000000..366fdd90
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+abstract class WriterPart
+{
+    /**
+     * Parent Ods object.
+     */
+    private Ods $parentWriter;
+
+    /**
+     * Get Ods writer.
+     */
+    public function getParentWriter(): Ods
+    {
+        return $this->parentWriter;
+    }
+
+    /**
+     * Set parent Ods writer.
+     */
+    public function __construct(Ods $writer)
+    {
+        $this->parentWriter = $writer;
+    }
+
+    abstract public function write(): string;
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php
new file mode 100644
index 00000000..17e19050
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php
@@ -0,0 +1,227 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+
+abstract class Pdf extends Html
+{
+    /**
+     * Temporary storage directory.
+     */
+    protected string $tempDir;
+
+    /**
+     * Font.
+     */
+    protected string $font = 'freesans';
+
+    /**
+     * Orientation (Over-ride).
+     */
+    protected ?string $orientation = null;
+
+    /**
+     * Paper size (Over-ride).
+     */
+    protected ?int $paperSize = null;
+
+    /**
+     * Paper Sizes xRef List.
+     */
+    protected static array $paperSizes = [
+        PageSetup::PAPERSIZE_LETTER => 'LETTER', //    (8.5 in. by 11 in.)
+        PageSetup::PAPERSIZE_LETTER_SMALL => 'LETTER', //    (8.5 in. by 11 in.)
+        PageSetup::PAPERSIZE_TABLOID => [792.00, 1224.00], //    (11 in. by 17 in.)
+        PageSetup::PAPERSIZE_LEDGER => [1224.00, 792.00], //    (17 in. by 11 in.)
+        PageSetup::PAPERSIZE_LEGAL => 'LEGAL', //    (8.5 in. by 14 in.)
+        PageSetup::PAPERSIZE_STATEMENT => [396.00, 612.00], //    (5.5 in. by 8.5 in.)
+        PageSetup::PAPERSIZE_EXECUTIVE => 'EXECUTIVE', //    (7.25 in. by 10.5 in.)
+        PageSetup::PAPERSIZE_A3 => 'A3', //    (297 mm by 420 mm)
+        PageSetup::PAPERSIZE_A4 => 'A4', //    (210 mm by 297 mm)
+        PageSetup::PAPERSIZE_A4_SMALL => 'A4', //    (210 mm by 297 mm)
+        PageSetup::PAPERSIZE_A5 => 'A5', //    (148 mm by 210 mm)
+        PageSetup::PAPERSIZE_B4 => 'B4', //    (250 mm by 353 mm)
+        PageSetup::PAPERSIZE_B5 => 'B5', //    (176 mm by 250 mm)
+        PageSetup::PAPERSIZE_FOLIO => 'FOLIO', //    (8.5 in. by 13 in.)
+        PageSetup::PAPERSIZE_QUARTO => [609.45, 779.53], //    (215 mm by 275 mm)
+        PageSetup::PAPERSIZE_STANDARD_1 => [720.00, 1008.00], //    (10 in. by 14 in.)
+        PageSetup::PAPERSIZE_STANDARD_2 => [792.00, 1224.00], //    (11 in. by 17 in.)
+        PageSetup::PAPERSIZE_NOTE => 'LETTER', //    (8.5 in. by 11 in.)
+        PageSetup::PAPERSIZE_NO9_ENVELOPE => [279.00, 639.00], //    (3.875 in. by 8.875 in.)
+        PageSetup::PAPERSIZE_NO10_ENVELOPE => [297.00, 684.00], //    (4.125 in. by 9.5 in.)
+        PageSetup::PAPERSIZE_NO11_ENVELOPE => [324.00, 747.00], //    (4.5 in. by 10.375 in.)
+        PageSetup::PAPERSIZE_NO12_ENVELOPE => [342.00, 792.00], //    (4.75 in. by 11 in.)
+        PageSetup::PAPERSIZE_NO14_ENVELOPE => [360.00, 828.00], //    (5 in. by 11.5 in.)
+        PageSetup::PAPERSIZE_C => [1224.00, 1584.00], //    (17 in. by 22 in.)
+        PageSetup::PAPERSIZE_D => [1584.00, 2448.00], //    (22 in. by 34 in.)
+        PageSetup::PAPERSIZE_E => [2448.00, 3168.00], //    (34 in. by 44 in.)
+        PageSetup::PAPERSIZE_DL_ENVELOPE => [311.81, 623.62], //    (110 mm by 220 mm)
+        PageSetup::PAPERSIZE_C5_ENVELOPE => 'C5', //    (162 mm by 229 mm)
+        PageSetup::PAPERSIZE_C3_ENVELOPE => 'C3', //    (324 mm by 458 mm)
+        PageSetup::PAPERSIZE_C4_ENVELOPE => 'C4', //    (229 mm by 324 mm)
+        PageSetup::PAPERSIZE_C6_ENVELOPE => 'C6', //    (114 mm by 162 mm)
+        PageSetup::PAPERSIZE_C65_ENVELOPE => [323.15, 649.13], //    (114 mm by 229 mm)
+        PageSetup::PAPERSIZE_B4_ENVELOPE => 'B4', //    (250 mm by 353 mm)
+        PageSetup::PAPERSIZE_B5_ENVELOPE => 'B5', //    (176 mm by 250 mm)
+        PageSetup::PAPERSIZE_B6_ENVELOPE => [498.90, 354.33], //    (176 mm by 125 mm)
+        PageSetup::PAPERSIZE_ITALY_ENVELOPE => [311.81, 651.97], //    (110 mm by 230 mm)
+        PageSetup::PAPERSIZE_MONARCH_ENVELOPE => [279.00, 540.00], //    (3.875 in. by 7.5 in.)
+        PageSetup::PAPERSIZE_6_3_4_ENVELOPE => [261.00, 468.00], //    (3.625 in. by 6.5 in.)
+        PageSetup::PAPERSIZE_US_STANDARD_FANFOLD => [1071.00, 792.00], //    (14.875 in. by 11 in.)
+        PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD => [612.00, 864.00], //    (8.5 in. by 12 in.)
+        PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD => 'FOLIO', //    (8.5 in. by 13 in.)
+        PageSetup::PAPERSIZE_ISO_B4 => 'B4', //    (250 mm by 353 mm)
+        PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD => [566.93, 419.53], //    (200 mm by 148 mm)
+        PageSetup::PAPERSIZE_STANDARD_PAPER_1 => [648.00, 792.00], //    (9 in. by 11 in.)
+        PageSetup::PAPERSIZE_STANDARD_PAPER_2 => [720.00, 792.00], //    (10 in. by 11 in.)
+        PageSetup::PAPERSIZE_STANDARD_PAPER_3 => [1080.00, 792.00], //    (15 in. by 11 in.)
+        PageSetup::PAPERSIZE_INVITE_ENVELOPE => [623.62, 623.62], //    (220 mm by 220 mm)
+        PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER => [667.80, 864.00], //    (9.275 in. by 12 in.)
+        PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER => [667.80, 1080.00], //    (9.275 in. by 15 in.)
+        PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER => [841.68, 1296.00], //    (11.69 in. by 18 in.)
+        PageSetup::PAPERSIZE_A4_EXTRA_PAPER => [668.98, 912.76], //    (236 mm by 322 mm)
+        PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER => [595.80, 792.00], //    (8.275 in. by 11 in.)
+        PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER => 'A4', //    (210 mm by 297 mm)
+        PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER => [667.80, 864.00], //    (9.275 in. by 12 in.)
+        PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER => [643.46, 1009.13], //    (227 mm by 356 mm)
+        PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER => [864.57, 1380.47], //    (305 mm by 487 mm)
+        PageSetup::PAPERSIZE_LETTER_PLUS_PAPER => [612.00, 913.68], //    (8.5 in. by 12.69 in.)
+        PageSetup::PAPERSIZE_A4_PLUS_PAPER => [595.28, 935.43], //    (210 mm by 330 mm)
+        PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER => 'A5', //    (148 mm by 210 mm)
+        PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER => [515.91, 728.50], //    (182 mm by 257 mm)
+        PageSetup::PAPERSIZE_A3_EXTRA_PAPER => [912.76, 1261.42], //    (322 mm by 445 mm)
+        PageSetup::PAPERSIZE_A5_EXTRA_PAPER => [493.23, 666.14], //    (174 mm by 235 mm)
+        PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER => [569.76, 782.36], //    (201 mm by 276 mm)
+        PageSetup::PAPERSIZE_A2_PAPER => 'A2', //    (420 mm by 594 mm)
+        PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER => 'A3', //    (297 mm by 420 mm)
+        PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER => [912.76, 1261.42], //    (322 mm by 445 mm)
+    ];
+
+    /**
+     * Create a new PDF Writer instance.
+     *
+     * @param Spreadsheet $spreadsheet Spreadsheet object
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        parent::__construct($spreadsheet);
+        //$this->setUseInlineCss(true);
+        $this->tempDir = File::sysGetTempDir() . '/phpsppdf';
+        $this->isPdf = true;
+    }
+
+    /**
+     * Get Font.
+     */
+    public function getFont(): string
+    {
+        return $this->font;
+    }
+
+    /**
+     * Set font. Examples:
+     *      'arialunicid0-chinese-simplified'
+     *      'arialunicid0-chinese-traditional'
+     *      'arialunicid0-korean'
+     *      'arialunicid0-japanese'.
+     *
+     * @return $this
+     */
+    public function setFont(string $fontName)
+    {
+        $this->font = $fontName;
+
+        return $this;
+    }
+
+    /**
+     * Get Paper Size.
+     */
+    public function getPaperSize(): ?int
+    {
+        return $this->paperSize;
+    }
+
+    /**
+     * Set Paper Size.
+     *
+     * @param int $paperSize Paper size see PageSetup::PAPERSIZE_*
+     */
+    public function setPaperSize(int $paperSize): self
+    {
+        $this->paperSize = $paperSize;
+
+        return $this;
+    }
+
+    /**
+     * Get Orientation.
+     */
+    public function getOrientation(): ?string
+    {
+        return $this->orientation;
+    }
+
+    /**
+     * Set Orientation.
+     *
+     * @param string $orientation Page orientation see PageSetup::ORIENTATION_*
+     */
+    public function setOrientation(string $orientation): self
+    {
+        $this->orientation = $orientation;
+
+        return $this;
+    }
+
+    /**
+     * Get temporary storage directory.
+     */
+    public function getTempDir(): string
+    {
+        return $this->tempDir;
+    }
+
+    /**
+     * Set temporary storage directory.
+     *
+     * @param string $temporaryDirectory Temporary storage directory
+     */
+    public function setTempDir(string $temporaryDirectory): self
+    {
+        if (is_dir($temporaryDirectory)) {
+            $this->tempDir = $temporaryDirectory;
+        } else {
+            throw new WriterException("Directory does not exist: $temporaryDirectory");
+        }
+
+        return $this;
+    }
+
+    /**
+     * Save Spreadsheet to PDF file, pre-save.
+     *
+     * @param resource|string $filename Name of the file to save as
+     *
+     * @return resource
+     */
+    protected function prepareForSave($filename)
+    {
+        //  Open file
+        $this->openFileHandle($filename);
+
+        return $this->fileHandle;
+    }
+
+    /**
+     * Save PhpSpreadsheet to PDF file, post-save.
+     */
+    protected function restoreStateAfterSave(): void
+    {
+        $this->maybeCloseFileHandle();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
new file mode 100644
index 00000000..6569980a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Pdf;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf;
+
+class Dompdf extends Pdf
+{
+    /**
+     * embed images, or link to images.
+     */
+    protected bool $embedImages = true;
+
+    /**
+     * Gets the implementation of external PDF library that should be used.
+     *
+     * @return \Dompdf\Dompdf implementation
+     */
+    protected function createExternalWriterInstance(): \Dompdf\Dompdf
+    {
+        return new \Dompdf\Dompdf();
+    }
+
+    /**
+     * Save Spreadsheet to file.
+     *
+     * @param string $filename Name of the file to save as
+     */
+    public function save($filename, int $flags = 0): void
+    {
+        $fileHandle = parent::prepareForSave($filename);
+
+        //  Check for paper size and page orientation
+        $setup = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageSetup();
+        $orientation = $this->getOrientation() ?? $setup->getOrientation();
+        $orientation = ($orientation === PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+        $printPaperSize = $this->getPaperSize() ?? $setup->getPaperSize();
+        $paperSize = self::$paperSizes[$printPaperSize] ?? PageSetup::getPaperSizeDefault();
+        if (is_array($paperSize) && count($paperSize) === 2) {
+            $paperSize = [0.0, 0.0, $paperSize[0], $paperSize[1]];
+        }
+
+        $orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
+
+        //  Create PDF
+        $pdf = $this->createExternalWriterInstance();
+        $pdf->setPaper($paperSize, $orientation);
+
+        $pdf->loadHtml($this->generateHTMLAll());
+        $pdf->render();
+
+        //  Write to file
+        fwrite($fileHandle, $pdf->output() ?? '');
+
+        parent::restoreStateAfterSave();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
new file mode 100644
index 00000000..ca031b45
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Pdf;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf;
+
+class Mpdf extends Pdf
+{
+    public const SIMULATED_BODY_START = '<!-- simulated body start -->';
+    private const BODY_TAG = '<body>';
+
+    /**
+     * Is the current writer creating mPDF?
+     *
+     * @deprecated 2.0.1 use instanceof Mpdf instead
+     */
+    protected bool $isMPdf = true;
+
+    /**
+     * Gets the implementation of external PDF library that should be used.
+     *
+     * @param array $config Configuration array
+     *
+     * @return \Mpdf\Mpdf implementation
+     */
+    protected function createExternalWriterInstance(array $config): \Mpdf\Mpdf
+    {
+        return new \Mpdf\Mpdf($config);
+    }
+
+    /**
+     * Save Spreadsheet to file.
+     *
+     * @param string $filename Name of the file to save as
+     */
+    public function save($filename, int $flags = 0): void
+    {
+        $fileHandle = parent::prepareForSave($filename);
+
+        //  Check for paper size and page orientation
+        $setup = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageSetup();
+        $orientation = $this->getOrientation() ?? $setup->getOrientation();
+        $orientation = ($orientation === PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+        $printPaperSize = $this->getPaperSize() ?? $setup->getPaperSize();
+        $paperSize = self::$paperSizes[$printPaperSize] ?? PageSetup::getPaperSizeDefault();
+
+        //  Create PDF
+        $config = ['tempDir' => $this->tempDir . '/mpdf'];
+        $pdf = $this->createExternalWriterInstance($config);
+        $ortmp = $orientation;
+        $pdf->_setPageSize($paperSize, $ortmp);
+        $pdf->DefOrientation = $orientation;
+        $pdf->AddPageByArray([
+            'orientation' => $orientation,
+            'margin-left' => $this->inchesToMm($this->spreadsheet->getActiveSheet()->getPageMargins()->getLeft()),
+            'margin-right' => $this->inchesToMm($this->spreadsheet->getActiveSheet()->getPageMargins()->getRight()),
+            'margin-top' => $this->inchesToMm($this->spreadsheet->getActiveSheet()->getPageMargins()->getTop()),
+            'margin-bottom' => $this->inchesToMm($this->spreadsheet->getActiveSheet()->getPageMargins()->getBottom()),
+        ]);
+
+        //  Document info
+        $pdf->SetTitle($this->spreadsheet->getProperties()->getTitle());
+        $pdf->SetAuthor($this->spreadsheet->getProperties()->getCreator());
+        $pdf->SetSubject($this->spreadsheet->getProperties()->getSubject());
+        $pdf->SetKeywords($this->spreadsheet->getProperties()->getKeywords());
+        $pdf->SetCreator($this->spreadsheet->getProperties()->getCreator());
+
+        $html = $this->generateHTMLAll();
+        $bodyLocation = strpos($html, self::SIMULATED_BODY_START);
+        if ($bodyLocation === false) {
+            $bodyLocation = strpos($html, self::BODY_TAG);
+            if ($bodyLocation !== false) {
+                $bodyLocation += strlen(self::BODY_TAG);
+            }
+        }
+        // Make sure first data presented to Mpdf includes body tag
+        //   (and any htmlpageheader/htmlpagefooter tags)
+        //   so that Mpdf doesn't parse it as content. Issue 2432.
+        if ($bodyLocation !== false) {
+            $pdf->WriteHTML(substr($html, 0, $bodyLocation));
+            $html = substr($html, $bodyLocation);
+        }
+        foreach (explode("\n", $html) as $line) {
+            $pdf->WriteHTML("$line\n");
+        }
+
+        //  Write to file
+        fwrite($fileHandle, $pdf->Output('', 'S'));
+
+        parent::restoreStateAfterSave();
+    }
+
+    /**
+     * Convert inches to mm.
+     */
+    private function inchesToMm(float $inches): float
+    {
+        return $inches * 25.4;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
new file mode 100644
index 00000000..747ebbd5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Pdf;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf;
+
+class Tcpdf extends Pdf
+{
+    /**
+     * Create a new PDF Writer instance.
+     *
+     * @param Spreadsheet $spreadsheet Spreadsheet object
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        parent::__construct($spreadsheet);
+        $this->setUseInlineCss(true);
+    }
+
+    /**
+     * Gets the implementation of external PDF library that should be used.
+     *
+     * @param string $orientation Page orientation
+     * @param string $unit Unit measure
+     * @param array|string $paperSize Paper size
+     *
+     * @return \TCPDF implementation
+     */
+    protected function createExternalWriterInstance(string $orientation, string $unit, $paperSize): \TCPDF
+    {
+        return new \TCPDF($orientation, $unit, $paperSize);
+    }
+
+    /**
+     * Save Spreadsheet to file.
+     *
+     * @param string $filename Name of the file to save as
+     */
+    public function save($filename, int $flags = 0): void
+    {
+        $fileHandle = parent::prepareForSave($filename);
+
+        //  Default PDF paper size
+        $paperSize = 'LETTER'; //    Letter    (8.5 in. by 11 in.)
+
+        //  Check for paper size and page orientation
+        $setup = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageSetup();
+        $orientation = $this->getOrientation() ?? $setup->getOrientation();
+        $orientation = ($orientation === PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+        $printPaperSize = $this->getPaperSize() ?? $setup->getPaperSize();
+        $paperSize = self::$paperSizes[$printPaperSize] ?? PageSetup::getPaperSizeDefault();
+        $printMargins = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageMargins();
+
+        //  Create PDF
+        $pdf = $this->createExternalWriterInstance($orientation, 'pt', $paperSize);
+        $pdf->setFontSubsetting(false);
+        //    Set margins, converting inches to points (using 72 dpi)
+        $pdf->SetMargins($printMargins->getLeft() * 72, $printMargins->getTop() * 72, $printMargins->getRight() * 72);
+        $pdf->SetAutoPageBreak(true, $printMargins->getBottom() * 72);
+
+        $pdf->setPrintHeader(false);
+        $pdf->setPrintFooter(false);
+
+        $pdf->AddPage();
+
+        //  Set the appropriate font
+        $pdf->SetFont($this->getFont());
+        $pdf->writeHTML($this->generateHTMLAll());
+
+        //  Document info
+        $pdf->SetTitle($this->spreadsheet->getProperties()->getTitle());
+        $pdf->SetAuthor($this->spreadsheet->getProperties()->getCreator());
+        $pdf->SetSubject($this->spreadsheet->getProperties()->getSubject());
+        $pdf->SetKeywords($this->spreadsheet->getProperties()->getKeywords());
+        $pdf->SetCreator($this->spreadsheet->getProperties()->getCreator());
+
+        //  Write to file
+        fwrite($fileHandle, $pdf->output('', 'S'));
+
+        parent::restoreStateAfterSave();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php
new file mode 100644
index 00000000..401fad18
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php
@@ -0,0 +1,892 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\RichText\Run;
+use PhpOffice\PhpSpreadsheet\Shared\Escher;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer\SpContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE\Blip;
+use PhpOffice\PhpSpreadsheet\Shared\OLE;
+use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS\File;
+use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS\Root;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Parser;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Worksheet;
+
+class Xls extends BaseWriter
+{
+    /**
+     * PhpSpreadsheet object.
+     */
+    private Spreadsheet $spreadsheet;
+
+    /**
+     * Total number of shared strings in workbook.
+     */
+    private int $strTotal = 0;
+
+    /**
+     * Number of unique shared strings in workbook.
+     */
+    private int $strUnique = 0;
+
+    /**
+     * Array of unique shared strings in workbook.
+     */
+    private array $strTable = [];
+
+    /**
+     * Color cache. Mapping between RGB value and color index.
+     */
+    private array $colors;
+
+    /**
+     * Formula parser.
+     */
+    private Parser $parser;
+
+    /**
+     * Identifier clusters for drawings. Used in MSODRAWINGGROUP record.
+     */
+    private array $IDCLs;
+
+    /**
+     * Basic OLE object summary information.
+     */
+    private string $summaryInformation;
+
+    /**
+     * Extended OLE object document summary information.
+     */
+    private string $documentSummaryInformation;
+
+    private Workbook $writerWorkbook;
+
+    /**
+     * @var Worksheet[]
+     */
+    private array $writerWorksheets;
+
+    /**
+     * Create a new Xls Writer.
+     *
+     * @param Spreadsheet $spreadsheet PhpSpreadsheet object
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+
+        $this->parser = new Parser($spreadsheet);
+    }
+
+    /**
+     * Save Spreadsheet to file.
+     *
+     * @param resource|string $filename
+     */
+    public function save($filename, int $flags = 0): void
+    {
+        $this->processFlags($flags);
+
+        // garbage collect
+        $this->spreadsheet->garbageCollect();
+
+        $saveDebugLog = Calculation::getInstance($this->spreadsheet)->getDebugLog()->getWriteDebugLog();
+        Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog(false);
+        $saveDateReturnType = Functions::getReturnDateType();
+        Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+
+        // initialize colors array
+        $this->colors = [];
+
+        // Initialise workbook writer
+        $this->writerWorkbook = new Workbook($this->spreadsheet, $this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser);
+
+        // Initialise worksheet writers
+        $countSheets = $this->spreadsheet->getSheetCount();
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $this->writerWorksheets[$i] = new Worksheet($this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser, $this->preCalculateFormulas, $this->spreadsheet->getSheet($i), $this->writerWorkbook);
+        }
+
+        // build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook.
+        $this->buildWorksheetEschers();
+        $this->buildWorkbookEscher();
+
+        // add 15 identical cell style Xfs
+        // for now, we use the first cellXf instead of cellStyleXf
+        $cellXfCollection = $this->spreadsheet->getCellXfCollection();
+        for ($i = 0; $i < 15; ++$i) {
+            $this->writerWorkbook->addXfWriter($cellXfCollection[0], true);
+        }
+
+        // add all the cell Xfs
+        foreach ($this->spreadsheet->getCellXfCollection() as $style) {
+            $this->writerWorkbook->addXfWriter($style, false);
+        }
+
+        // add fonts from rich text eleemnts
+        for ($i = 0; $i < $countSheets; ++$i) {
+            foreach ($this->writerWorksheets[$i]->phpSheet->getCellCollection()->getCoordinates() as $coordinate) {
+                /** @var Cell $cell */
+                $cell = $this->writerWorksheets[$i]->phpSheet->getCellCollection()->get($coordinate);
+                $cVal = $cell->getValue();
+                if ($cVal instanceof RichText) {
+                    $elements = $cVal->getRichTextElements();
+                    foreach ($elements as $element) {
+                        if ($element instanceof Run) {
+                            $font = $element->getFont();
+                            if ($font !== null) {
+                                $this->writerWorksheets[$i]->fontHashIndex[$font->getHashCode()] = $this->writerWorkbook->addFont($font);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // initialize OLE file
+        $workbookStreamName = 'Workbook';
+        $OLE = new File(OLE::ascToUcs($workbookStreamName));
+
+        // Write the worksheet streams before the global workbook stream,
+        // because the byte sizes of these are needed in the global workbook stream
+        $worksheetSizes = [];
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $this->writerWorksheets[$i]->close();
+            $worksheetSizes[] = $this->writerWorksheets[$i]->_datasize;
+        }
+
+        // add binary data for global workbook stream
+        $OLE->append($this->writerWorkbook->writeWorkbook($worksheetSizes));
+
+        // add binary data for sheet streams
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $OLE->append($this->writerWorksheets[$i]->getData());
+        }
+
+        $this->documentSummaryInformation = $this->writeDocumentSummaryInformation();
+        // initialize OLE Document Summary Information
+        if (!empty($this->documentSummaryInformation)) {
+            $OLE_DocumentSummaryInformation = new File(OLE::ascToUcs(chr(5) . 'DocumentSummaryInformation'));
+            $OLE_DocumentSummaryInformation->append($this->documentSummaryInformation);
+        }
+
+        $this->summaryInformation = $this->writeSummaryInformation();
+        // initialize OLE Summary Information
+        if (!empty($this->summaryInformation)) {
+            $OLE_SummaryInformation = new File(OLE::ascToUcs(chr(5) . 'SummaryInformation'));
+            $OLE_SummaryInformation->append($this->summaryInformation);
+        }
+
+        // define OLE Parts
+        $arrRootData = [$OLE];
+        // initialize OLE Properties file
+        if (isset($OLE_SummaryInformation)) {
+            $arrRootData[] = $OLE_SummaryInformation;
+        }
+        // initialize OLE Extended Properties file
+        if (isset($OLE_DocumentSummaryInformation)) {
+            $arrRootData[] = $OLE_DocumentSummaryInformation;
+        }
+
+        $time = $this->spreadsheet->getProperties()->getModified();
+        $root = new Root($time, $time, $arrRootData);
+        // save the OLE file
+        $this->openFileHandle($filename);
+        $root->save($this->fileHandle);
+        $this->maybeCloseFileHandle();
+
+        Functions::setReturnDateType($saveDateReturnType);
+        Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+    }
+
+    /**
+     * Build the Worksheet Escher objects.
+     */
+    private function buildWorksheetEschers(): void
+    {
+        // 1-based index to BstoreContainer
+        $blipIndex = 0;
+        $lastReducedSpId = 0;
+        $lastSpId = 0;
+
+        foreach ($this->spreadsheet->getAllsheets() as $sheet) {
+            // sheet index
+            $sheetIndex = $sheet->getParentOrThrow()->getIndex($sheet);
+
+            // check if there are any shapes for this sheet
+            $filterRange = $sheet->getAutoFilter()->getRange();
+            if (count($sheet->getDrawingCollection()) == 0 && empty($filterRange)) {
+                continue;
+            }
+
+            // create intermediate Escher object
+            $escher = new Escher();
+
+            // dgContainer
+            $dgContainer = new DgContainer();
+
+            // set the drawing index (we use sheet index + 1)
+            $dgId = $sheet->getParentOrThrow()->getIndex($sheet) + 1;
+            $dgContainer->setDgId($dgId);
+            $escher->setDgContainer($dgContainer);
+
+            // spgrContainer
+            $spgrContainer = new SpgrContainer();
+            $dgContainer->setSpgrContainer($spgrContainer);
+
+            // add one shape which is the group shape
+            $spContainer = new SpContainer();
+            $spContainer->setSpgr(true);
+            $spContainer->setSpType(0);
+            $spContainer->setSpId(($sheet->getParentOrThrow()->getIndex($sheet) + 1) << 10);
+            $spgrContainer->addChild($spContainer);
+
+            // add the shapes
+
+            $countShapes[$sheetIndex] = 0; // count number of shapes (minus group shape), in sheet
+
+            foreach ($sheet->getDrawingCollection() as $drawing) {
+                ++$blipIndex;
+
+                ++$countShapes[$sheetIndex];
+
+                // add the shape
+                $spContainer = new SpContainer();
+
+                // set the shape type
+                $spContainer->setSpType(0x004B);
+                // set the shape flag
+                $spContainer->setSpFlag(0x02);
+
+                // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
+                $reducedSpId = $countShapes[$sheetIndex];
+                $spId = $reducedSpId | ($sheet->getParentOrThrow()->getIndex($sheet) + 1) << 10;
+                $spContainer->setSpId($spId);
+
+                // keep track of last reducedSpId
+                $lastReducedSpId = $reducedSpId;
+
+                // keep track of last spId
+                $lastSpId = $spId;
+
+                // set the BLIP index
+                $spContainer->setOPT(0x4104, $blipIndex);
+
+                // set coordinates and offsets, client anchor
+                $coordinates = $drawing->getCoordinates();
+                $offsetX = $drawing->getOffsetX();
+                $offsetY = $drawing->getOffsetY();
+                $width = $drawing->getWidth();
+                $height = $drawing->getHeight();
+
+                $twoAnchor = \PhpOffice\PhpSpreadsheet\Shared\Xls::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height);
+
+                if (is_array($twoAnchor)) {
+                    $spContainer->setStartCoordinates($twoAnchor['startCoordinates']);
+                    $spContainer->setStartOffsetX($twoAnchor['startOffsetX']);
+                    $spContainer->setStartOffsetY($twoAnchor['startOffsetY']);
+                    $spContainer->setEndCoordinates($twoAnchor['endCoordinates']);
+                    $spContainer->setEndOffsetX($twoAnchor['endOffsetX']);
+                    $spContainer->setEndOffsetY($twoAnchor['endOffsetY']);
+
+                    $spgrContainer->addChild($spContainer);
+                }
+            }
+
+            // AutoFilters
+            if (!empty($filterRange)) {
+                $rangeBounds = Coordinate::rangeBoundaries($filterRange);
+                $iNumColStart = $rangeBounds[0][0];
+                $iNumColEnd = $rangeBounds[1][0];
+
+                $iInc = $iNumColStart;
+                while ($iInc <= $iNumColEnd) {
+                    ++$countShapes[$sheetIndex];
+
+                    // create an Drawing Object for the dropdown
+                    $oDrawing = new BaseDrawing();
+                    // get the coordinates of drawing
+                    $cDrawing = Coordinate::stringFromColumnIndex($iInc) . $rangeBounds[0][1];
+                    $oDrawing->setCoordinates($cDrawing);
+                    $oDrawing->setWorksheet($sheet);
+
+                    // add the shape
+                    $spContainer = new SpContainer();
+                    // set the shape type
+                    $spContainer->setSpType(0x00C9);
+                    // set the shape flag
+                    $spContainer->setSpFlag(0x01);
+
+                    // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
+                    $reducedSpId = $countShapes[$sheetIndex];
+                    $spId = $reducedSpId | ($sheet->getParentOrThrow()->getIndex($sheet) + 1) << 10;
+                    $spContainer->setSpId($spId);
+
+                    // keep track of last reducedSpId
+                    $lastReducedSpId = $reducedSpId;
+
+                    // keep track of last spId
+                    $lastSpId = $spId;
+
+                    $spContainer->setOPT(0x007F, 0x01040104); // Protection -> fLockAgainstGrouping
+                    $spContainer->setOPT(0x00BF, 0x00080008); // Text -> fFitTextToShape
+                    $spContainer->setOPT(0x01BF, 0x00010000); // Fill Style -> fNoFillHitTest
+                    $spContainer->setOPT(0x01FF, 0x00080000); // Line Style -> fNoLineDrawDash
+                    $spContainer->setOPT(0x03BF, 0x000A0000); // Group Shape -> fPrint
+
+                    // set coordinates and offsets, client anchor
+                    $endCoordinates = Coordinate::stringFromColumnIndex($iInc);
+                    $endCoordinates .= $rangeBounds[0][1] + 1;
+
+                    $spContainer->setStartCoordinates($cDrawing);
+                    $spContainer->setStartOffsetX(0);
+                    $spContainer->setStartOffsetY(0);
+                    $spContainer->setEndCoordinates($endCoordinates);
+                    $spContainer->setEndOffsetX(0);
+                    $spContainer->setEndOffsetY(0);
+
+                    $spgrContainer->addChild($spContainer);
+                    ++$iInc;
+                }
+            }
+
+            // identifier clusters, used for workbook Escher object
+            $this->IDCLs[$dgId] = $lastReducedSpId;
+
+            // set last shape index
+            $dgContainer->setLastSpId($lastSpId);
+
+            // set the Escher object
+            $this->writerWorksheets[$sheetIndex]->setEscher($escher);
+        }
+    }
+
+    private function processMemoryDrawing(BstoreContainer &$bstoreContainer, MemoryDrawing $drawing, string $renderingFunctionx): void
+    {
+        switch ($renderingFunctionx) {
+            case MemoryDrawing::RENDERING_JPEG:
+                $blipType = BSE::BLIPTYPE_JPEG;
+                $renderingFunction = 'imagejpeg';
+
+                break;
+            default:
+                $blipType = BSE::BLIPTYPE_PNG;
+                $renderingFunction = 'imagepng';
+
+                break;
+        }
+
+        ob_start();
+        call_user_func($renderingFunction, $drawing->getImageResource());
+        $blipData = ob_get_contents();
+        ob_end_clean();
+
+        $blip = new Blip();
+        $blip->setData("$blipData");
+
+        $BSE = new BSE();
+        $BSE->setBlipType($blipType);
+        $BSE->setBlip($blip);
+
+        $bstoreContainer->addBSE($BSE);
+    }
+
+    private static int $two = 2; // phpstan silliness
+
+    private function processDrawing(BstoreContainer &$bstoreContainer, Drawing $drawing): void
+    {
+        $blipType = 0;
+        $blipData = '';
+        $filename = $drawing->getPath();
+
+        $imageSize = getimagesize($filename);
+        $imageFormat = empty($imageSize) ? 0 : ($imageSize[self::$two] ?? 0);
+
+        switch ($imageFormat) {
+            case 1: // GIF, not supported by BIFF8, we convert to PNG
+                $blipType = BSE::BLIPTYPE_PNG;
+                $newImage = @imagecreatefromgif($filename);
+                if ($newImage === false) {
+                    throw new Exception("Unable to create image from $filename");
+                }
+                ob_start();
+                imagepng($newImage);
+                $blipData = ob_get_contents();
+                ob_end_clean();
+
+                break;
+            case 2: // JPEG
+                $blipType = BSE::BLIPTYPE_JPEG;
+                $blipData = file_get_contents($filename);
+
+                break;
+            case 3: // PNG
+                $blipType = BSE::BLIPTYPE_PNG;
+                $blipData = file_get_contents($filename);
+
+                break;
+            case 6: // Windows DIB (BMP), we convert to PNG
+                $blipType = BSE::BLIPTYPE_PNG;
+                $newImage = @imagecreatefrombmp($filename);
+                if ($newImage === false) {
+                    throw new Exception("Unable to create image from $filename");
+                }
+                ob_start();
+                imagepng($newImage);
+                $blipData = ob_get_contents();
+                ob_end_clean();
+
+                break;
+        }
+        if ($blipData) {
+            $blip = new Blip();
+            $blip->setData($blipData);
+
+            $BSE = new BSE();
+            $BSE->setBlipType($blipType);
+            $BSE->setBlip($blip);
+
+            $bstoreContainer->addBSE($BSE);
+        }
+    }
+
+    private function processBaseDrawing(BstoreContainer &$bstoreContainer, BaseDrawing $drawing): void
+    {
+        if ($drawing instanceof Drawing) {
+            $this->processDrawing($bstoreContainer, $drawing);
+        } elseif ($drawing instanceof MemoryDrawing) {
+            $this->processMemoryDrawing($bstoreContainer, $drawing, $drawing->getRenderingFunction());
+        }
+    }
+
+    private function checkForDrawings(): bool
+    {
+        // any drawings in this workbook?
+        $found = false;
+        foreach ($this->spreadsheet->getAllSheets() as $sheet) {
+            if (count($sheet->getDrawingCollection()) > 0) {
+                $found = true;
+
+                break;
+            }
+        }
+
+        return $found;
+    }
+
+    /**
+     * Build the Escher object corresponding to the MSODRAWINGGROUP record.
+     */
+    private function buildWorkbookEscher(): void
+    {
+        // nothing to do if there are no drawings
+        if (!$this->checkForDrawings()) {
+            return;
+        }
+
+        // if we reach here, then there are drawings in the workbook
+        $escher = new Escher();
+
+        // dggContainer
+        $dggContainer = new DggContainer();
+        $escher->setDggContainer($dggContainer);
+
+        // set IDCLs (identifier clusters)
+        $dggContainer->setIDCLs($this->IDCLs);
+
+        // this loop is for determining maximum shape identifier of all drawing
+        $spIdMax = 0;
+        $totalCountShapes = 0;
+        $countDrawings = 0;
+
+        foreach ($this->spreadsheet->getAllsheets() as $sheet) {
+            $sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet
+
+            $addCount = 0;
+            foreach ($sheet->getDrawingCollection() as $drawing) {
+                $addCount = 1;
+                ++$sheetCountShapes;
+                ++$totalCountShapes;
+
+                $spId = $sheetCountShapes | ($this->spreadsheet->getIndex($sheet) + 1) << 10;
+                $spIdMax = max($spId, $spIdMax);
+            }
+            $countDrawings += $addCount;
+        }
+
+        $dggContainer->setSpIdMax($spIdMax + 1);
+        $dggContainer->setCDgSaved($countDrawings);
+        $dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing
+
+        // bstoreContainer
+        $bstoreContainer = new BstoreContainer();
+        $dggContainer->setBstoreContainer($bstoreContainer);
+
+        // the BSE's (all the images)
+        foreach ($this->spreadsheet->getAllsheets() as $sheet) {
+            foreach ($sheet->getDrawingCollection() as $drawing) {
+                $this->processBaseDrawing($bstoreContainer, $drawing);
+            }
+        }
+
+        // Set the Escher object
+        $this->writerWorkbook->setEscher($escher);
+    }
+
+    /**
+     * Build the OLE Part for DocumentSummary Information.
+     */
+    private function writeDocumentSummaryInformation(): string
+    {
+        // offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
+        $data = pack('v', 0xFFFE);
+        // offset: 2; size: 2;
+        $data .= pack('v', 0x0000);
+        // offset: 4; size: 2; OS version
+        $data .= pack('v', 0x0106);
+        // offset: 6; size: 2; OS indicator
+        $data .= pack('v', 0x0002);
+        // offset: 8; size: 16
+        $data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
+        // offset: 24; size: 4; section count
+        $data .= pack('V', 0x0001);
+
+        // offset: 28; size: 16; first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
+        $data .= pack('vvvvvvvv', 0xD502, 0xD5CD, 0x2E9C, 0x101B, 0x9793, 0x0008, 0x2C2B, 0xAEF9);
+        // offset: 44; size: 4; offset of the start
+        $data .= pack('V', 0x30);
+
+        // SECTION
+        $dataSection = [];
+        $dataSection_NumProps = 0;
+        $dataSection_Summary = '';
+        $dataSection_Content = '';
+
+        // GKPIDDSI_CODEPAGE: CodePage
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x01],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x02], // 2 byte signed integer
+            'data' => ['data' => 1252],
+        ];
+        ++$dataSection_NumProps;
+
+        // GKPIDDSI_CATEGORY : Category
+        $dataProp = $this->spreadsheet->getProperties()->getCategory();
+        if ($dataProp) {
+            $dataSection[] = [
+                'summary' => ['pack' => 'V', 'data' => 0x02],
+                'offset' => ['pack' => 'V'],
+                'type' => ['pack' => 'V', 'data' => 0x1E],
+                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
+            ];
+            ++$dataSection_NumProps;
+        }
+        // GKPIDDSI_VERSION :Version of the application that wrote the property storage
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x17],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x03],
+            'data' => ['pack' => 'V', 'data' => 0x000C0000],
+        ];
+        ++$dataSection_NumProps;
+        // GKPIDDSI_SCALE : FALSE
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x0B],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x0B],
+            'data' => ['data' => false],
+        ];
+        ++$dataSection_NumProps;
+        // GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x10],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x0B],
+            'data' => ['data' => false],
+        ];
+        ++$dataSection_NumProps;
+        // GKPIDDSI_SHAREDOC : FALSE
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x13],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x0B],
+            'data' => ['data' => false],
+        ];
+        ++$dataSection_NumProps;
+        // GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x16],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x0B],
+            'data' => ['data' => false],
+        ];
+        ++$dataSection_NumProps;
+
+        // GKPIDDSI_DOCSPARTS
+        // MS-OSHARED p75 (2.3.3.2.2.1)
+        // Structure is VtVecUnalignedLpstrValue (2.3.3.1.9)
+        // cElements
+        $dataProp = pack('v', 0x0001);
+        $dataProp .= pack('v', 0x0000);
+        // array of UnalignedLpstr
+        // cch
+        $dataProp .= pack('v', 0x000A);
+        $dataProp .= pack('v', 0x0000);
+        // value
+        $dataProp .= 'Worksheet' . chr(0);
+
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x0D],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x101E],
+            'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
+        ];
+        ++$dataSection_NumProps;
+
+        // GKPIDDSI_HEADINGPAIR
+        // VtVecHeadingPairValue
+        // cElements
+        $dataProp = pack('v', 0x0002);
+        $dataProp .= pack('v', 0x0000);
+        // Array of vtHeadingPair
+        // vtUnalignedString - headingString
+        // stringType
+        $dataProp .= pack('v', 0x001E);
+        // padding
+        $dataProp .= pack('v', 0x0000);
+        // UnalignedLpstr
+        // cch
+        $dataProp .= pack('v', 0x0013);
+        $dataProp .= pack('v', 0x0000);
+        // value
+        $dataProp .= 'Feuilles de calcul';
+        // vtUnalignedString - headingParts
+        // wType : 0x0003 = 32 bit signed integer
+        $dataProp .= pack('v', 0x0300);
+        // padding
+        $dataProp .= pack('v', 0x0000);
+        // value
+        $dataProp .= pack('v', 0x0100);
+        $dataProp .= pack('v', 0x0000);
+        $dataProp .= pack('v', 0x0000);
+        $dataProp .= pack('v', 0x0000);
+
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x0C],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x100C],
+            'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
+        ];
+        ++$dataSection_NumProps;
+
+        //         4     Section Length
+        //        4     Property count
+        //        8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
+        $dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
+        foreach ($dataSection as $dataProp) {
+            // Summary
+            $dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
+            // Offset
+            $dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
+            // DataType
+            $dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
+            // Data
+            if ($dataProp['type']['data'] == 0x02) { // 2 byte signed integer
+                $dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x03) { // 4 byte signed integer
+                $dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x0B) { // Boolean
+                $dataSection_Content .= pack('V', (int) $dataProp['data']['data']);
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
+                // Null-terminated string
+                $dataProp['data']['data'] .= chr(0);
+                ++$dataProp['data']['length'];
+                // Complete the string with null string for being a %4
+                $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+                $dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
+
+                $dataSection_Content .= pack('V', $dataProp['data']['length']);
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
+            } else {
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + $dataProp['data']['length'];
+            }
+        }
+        // Now $dataSection_Content_Offset contains the size of the content
+
+        // section header
+        // offset: $secOffset; size: 4; section length
+        //         + x  Size of the content (summary + content)
+        $data .= pack('V', $dataSection_Content_Offset);
+        // offset: $secOffset+4; size: 4; property count
+        $data .= pack('V', $dataSection_NumProps);
+        // Section Summary
+        $data .= $dataSection_Summary;
+        // Section Content
+        $data .= $dataSection_Content;
+
+        return $data;
+    }
+
+    private function writeSummaryPropOle(float|int $dataProp, int &$dataSection_NumProps, array &$dataSection, int $sumdata, int $typdata): void
+    {
+        if ($dataProp) {
+            $dataSection[] = [
+                'summary' => ['pack' => 'V', 'data' => $sumdata],
+                'offset' => ['pack' => 'V'],
+                'type' => ['pack' => 'V', 'data' => $typdata], // null-terminated string prepended by dword string length
+                'data' => ['data' => OLE::localDateToOLE($dataProp)],
+            ];
+            ++$dataSection_NumProps;
+        }
+    }
+
+    private function writeSummaryProp(string $dataProp, int &$dataSection_NumProps, array &$dataSection, int $sumdata, int $typdata): void
+    {
+        if ($dataProp) {
+            $dataSection[] = [
+                'summary' => ['pack' => 'V', 'data' => $sumdata],
+                'offset' => ['pack' => 'V'],
+                'type' => ['pack' => 'V', 'data' => $typdata], // null-terminated string prepended by dword string length
+                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
+            ];
+            ++$dataSection_NumProps;
+        }
+    }
+
+    /**
+     * Build the OLE Part for Summary Information.
+     */
+    private function writeSummaryInformation(): string
+    {
+        // offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
+        $data = pack('v', 0xFFFE);
+        // offset: 2; size: 2;
+        $data .= pack('v', 0x0000);
+        // offset: 4; size: 2; OS version
+        $data .= pack('v', 0x0106);
+        // offset: 6; size: 2; OS indicator
+        $data .= pack('v', 0x0002);
+        // offset: 8; size: 16
+        $data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
+        // offset: 24; size: 4; section count
+        $data .= pack('V', 0x0001);
+
+        // offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
+        $data .= pack('vvvvvvvv', 0x85E0, 0xF29F, 0x4FF9, 0x1068, 0x91AB, 0x0008, 0x272B, 0xD9B3);
+        // offset: 44; size: 4; offset of the start
+        $data .= pack('V', 0x30);
+
+        // SECTION
+        $dataSection = [];
+        $dataSection_NumProps = 0;
+        $dataSection_Summary = '';
+        $dataSection_Content = '';
+
+        // CodePage : CP-1252
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x01],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x02], // 2 byte signed integer
+            'data' => ['data' => 1252],
+        ];
+        ++$dataSection_NumProps;
+
+        $props = $this->spreadsheet->getProperties();
+        $this->writeSummaryProp($props->getTitle(), $dataSection_NumProps, $dataSection, 0x02, 0x1E);
+        $this->writeSummaryProp($props->getSubject(), $dataSection_NumProps, $dataSection, 0x03, 0x1E);
+        $this->writeSummaryProp($props->getCreator(), $dataSection_NumProps, $dataSection, 0x04, 0x1E);
+        $this->writeSummaryProp($props->getKeywords(), $dataSection_NumProps, $dataSection, 0x05, 0x1E);
+        $this->writeSummaryProp($props->getDescription(), $dataSection_NumProps, $dataSection, 0x06, 0x1E);
+        $this->writeSummaryProp($props->getLastModifiedBy(), $dataSection_NumProps, $dataSection, 0x08, 0x1E);
+        $this->writeSummaryPropOle($props->getCreated(), $dataSection_NumProps, $dataSection, 0x0C, 0x40);
+        $this->writeSummaryPropOle($props->getModified(), $dataSection_NumProps, $dataSection, 0x0D, 0x40);
+
+        //    Security
+        $dataSection[] = [
+            'summary' => ['pack' => 'V', 'data' => 0x13],
+            'offset' => ['pack' => 'V'],
+            'type' => ['pack' => 'V', 'data' => 0x03], // 4 byte signed integer
+            'data' => ['data' => 0x00],
+        ];
+        ++$dataSection_NumProps;
+
+        //         4     Section Length
+        //        4     Property count
+        //        8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
+        $dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
+        foreach ($dataSection as $dataProp) {
+            // Summary
+            $dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
+            // Offset
+            $dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
+            // DataType
+            $dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
+            // Data
+            if ($dataProp['type']['data'] == 0x02) { // 2 byte signed integer
+                $dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x03) { // 4 byte signed integer
+                $dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+                $dataSection_Content_Offset += 4 + 4;
+            } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
+                // Null-terminated string
+                $dataProp['data']['data'] .= chr(0);
+                ++$dataProp['data']['length'];
+                // Complete the string with null string for being a %4
+                $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+                $dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
+
+                $dataSection_Content .= pack('V', $dataProp['data']['length']);
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
+            } elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+                $dataSection_Content .= $dataProp['data']['data'];
+
+                $dataSection_Content_Offset += 4 + 8;
+            }
+            // Data Type Not Used at the moment
+        }
+        // Now $dataSection_Content_Offset contains the size of the content
+
+        // section header
+        // offset: $secOffset; size: 4; section length
+        //         + x  Size of the content (summary + content)
+        $data .= pack('V', $dataSection_Content_Offset);
+        // offset: $secOffset+4; size: 4; property count
+        $data .= pack('V', $dataSection_NumProps);
+        // Section Summary
+        $data .= $dataSection_Summary;
+        // Section Content
+        $data .= $dataSection_Content;
+
+        return $data;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
new file mode 100644
index 00000000..8db570d0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_BIFFwriter (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
+// *
+// *  The majority of this is _NOT_ my code.  I simply ported it from the
+// *  PERL Spreadsheet::WriteExcel module.
+// *
+// *  The author of the Spreadsheet::WriteExcel module is John McNamara
+// *  <jmcnamara@cpan.org>
+// *
+// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
+// *  porting of this code to PHP.  Any questions directly related to this
+// *  class library should be directed to me.
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class BIFFwriter
+{
+    /**
+     * The byte order of this architecture. 0 => little endian, 1 => big endian.
+     */
+    private static ?int $byteOrder;
+
+    /**
+     * The string containing the data of the BIFF stream.
+     */
+    public ?string $_data;
+
+    /**
+     * The size of the data in bytes. Should be the same as strlen($this->_data).
+     */
+    public int $_datasize;
+
+    /**
+     * The maximum length for a BIFF record (excluding record header and length field). See addContinue().
+     *
+     * @see addContinue()
+     */
+    private int $limit = 8224;
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->_data = '';
+        $this->_datasize = 0;
+    }
+
+    /**
+     * Determine the byte order and store it as class data to avoid
+     * recalculating it for each call to new().
+     */
+    public static function getByteOrder(): int
+    {
+        if (!isset(self::$byteOrder)) {
+            // Check if "pack" gives the required IEEE 64bit float
+            $teststr = pack('d', 1.2345);
+            $number = pack('C8', 0x8D, 0x97, 0x6E, 0x12, 0x83, 0xC0, 0xF3, 0x3F);
+            if ($number == $teststr) {
+                $byte_order = 0; // Little Endian
+            } elseif ($number == strrev($teststr)) {
+                $byte_order = 1; // Big Endian
+            } else {
+                // Give up. I'll fix this in a later version.
+                throw new WriterException('Required floating point format not supported on this platform.');
+            }
+            self::$byteOrder = $byte_order;
+        }
+
+        return self::$byteOrder;
+    }
+
+    /**
+     * General storage function.
+     *
+     * @param string $data binary data to append
+     */
+    protected function append(string $data): void
+    {
+        if (strlen($data) - 4 > $this->limit) {
+            $data = $this->addContinue($data);
+        }
+        $this->_data .= $data;
+        $this->_datasize += strlen($data);
+    }
+
+    /**
+     * General storage function like append, but returns string instead of modifying $this->_data.
+     *
+     * @param string $data binary data to write
+     */
+    public function writeData(string $data): string
+    {
+        if (strlen($data) - 4 > $this->limit) {
+            $data = $this->addContinue($data);
+        }
+        $this->_datasize += strlen($data);
+
+        return $data;
+    }
+
+    /**
+     * Writes Excel BOF record to indicate the beginning of a stream or
+     * sub-stream in the BIFF file.
+     *
+     * @param int $type type of BIFF file to write: 0x0005 Workbook,
+     *                       0x0010 Worksheet
+     */
+    protected function storeBof(int $type): void
+    {
+        $record = 0x0809; // Record identifier    (BIFF5-BIFF8)
+        $length = 0x0010;
+
+        // by inspection of real files, MS Office Excel 2007 writes the following
+        $unknown = pack('VV', 0x000100D1, 0x00000406);
+
+        $build = 0x0DBB; //    Excel 97
+        $year = 0x07CC; //    Excel 97
+
+        $version = 0x0600; //    BIFF8
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvv', $version, $type, $build, $year);
+        $this->append($header . $data . $unknown);
+    }
+
+    /**
+     * Writes Excel EOF record to indicate the end of a BIFF stream.
+     */
+    protected function storeEof(): void
+    {
+        $record = 0x000A; // Record identifier
+        $length = 0x0000; // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $this->append($header);
+    }
+
+    /**
+     * Writes Excel EOF record to indicate the end of a BIFF stream.
+     */
+    public function writeEof(): string
+    {
+        $record = 0x000A; // Record identifier
+        $length = 0x0000; // Number of bytes to follow
+        $header = pack('vv', $record, $length);
+
+        return $this->writeData($header);
+    }
+
+    /**
+     * Excel limits the size of BIFF records. In Excel 5 the limit is 2084 bytes. In
+     * Excel 97 the limit is 8228 bytes. Records that are longer than these limits
+     * must be split up into CONTINUE blocks.
+     *
+     * This function takes a long BIFF record and inserts CONTINUE records as
+     * necessary.
+     *
+     * @param string $data The original binary data to be written
+     *
+     * @return string A very convenient string of continue blocks
+     */
+    private function addContinue(string $data): string
+    {
+        $limit = $this->limit;
+        $record = 0x003C; // Record identifier
+
+        // The first 2080/8224 bytes remain intact. However, we have to change
+        // the length field of the record.
+        $tmp = substr($data, 0, 2) . pack('v', $limit) . substr($data, 4, $limit);
+
+        $header = pack('vv', $record, $limit); // Headers for continue records
+
+        // Retrieve chunks of 2080/8224 bytes +4 for the header.
+        $data_length = strlen($data);
+        for ($i = $limit + 4; $i < ($data_length - $limit); $i += $limit) {
+            $tmp .= $header;
+            $tmp .= substr($data, $i, $limit);
+        }
+
+        // Retrieve the last chunk of data
+        $header = pack('vv', $record, strlen($data) - $i);
+        $tmp .= $header;
+        $tmp .= substr($data, $i);
+
+        return $tmp;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php
new file mode 100644
index 00000000..fee123f5
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+
+class CellDataValidation
+{
+    /**
+     * @var array<string, int>
+     */
+    protected static array $validationTypeMap = [
+        DataValidation::TYPE_NONE => 0x00,
+        DataValidation::TYPE_WHOLE => 0x01,
+        DataValidation::TYPE_DECIMAL => 0x02,
+        DataValidation::TYPE_LIST => 0x03,
+        DataValidation::TYPE_DATE => 0x04,
+        DataValidation::TYPE_TIME => 0x05,
+        DataValidation::TYPE_TEXTLENGTH => 0x06,
+        DataValidation::TYPE_CUSTOM => 0x07,
+    ];
+
+    /**
+     * @var array<string, int>
+     */
+    protected static array $errorStyleMap = [
+        DataValidation::STYLE_STOP => 0x00,
+        DataValidation::STYLE_WARNING => 0x01,
+        DataValidation::STYLE_INFORMATION => 0x02,
+    ];
+
+    /**
+     * @var array<string, int>
+     */
+    protected static array $operatorMap = [
+        DataValidation::OPERATOR_BETWEEN => 0x00,
+        DataValidation::OPERATOR_NOTBETWEEN => 0x01,
+        DataValidation::OPERATOR_EQUAL => 0x02,
+        DataValidation::OPERATOR_NOTEQUAL => 0x03,
+        DataValidation::OPERATOR_GREATERTHAN => 0x04,
+        DataValidation::OPERATOR_LESSTHAN => 0x05,
+        DataValidation::OPERATOR_GREATERTHANOREQUAL => 0x06,
+        DataValidation::OPERATOR_LESSTHANOREQUAL => 0x07,
+    ];
+
+    public static function type(DataValidation $dataValidation): int
+    {
+        $validationType = $dataValidation->getType();
+
+        if (is_string($validationType) && array_key_exists($validationType, self::$validationTypeMap)) {
+            return self::$validationTypeMap[$validationType];
+        }
+
+        return self::$validationTypeMap[DataValidation::TYPE_NONE];
+    }
+
+    public static function errorStyle(DataValidation $dataValidation): int
+    {
+        $errorStyle = $dataValidation->getErrorStyle();
+
+        if (is_string($errorStyle) && array_key_exists($errorStyle, self::$errorStyleMap)) {
+            return self::$errorStyleMap[$errorStyle];
+        }
+
+        return self::$errorStyleMap[DataValidation::STYLE_STOP];
+    }
+
+    public static function operator(DataValidation $dataValidation): int
+    {
+        $operator = $dataValidation->getOperator();
+
+        if (is_string($operator) && array_key_exists($operator, self::$operatorMap)) {
+            return self::$operatorMap[$operator];
+        }
+
+        return self::$operatorMap[DataValidation::OPERATOR_BETWEEN];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php
new file mode 100644
index 00000000..c33d0d05
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+class ConditionalHelper
+{
+    /**
+     * Formula parser.
+     */
+    protected Parser $parser;
+
+    protected mixed $condition;
+
+    protected string $cellRange;
+
+    protected ?string $tokens = null;
+
+    protected int $size;
+
+    public function __construct(Parser $parser)
+    {
+        $this->parser = $parser;
+    }
+
+    public function processCondition(mixed $condition, string $cellRange): void
+    {
+        $this->condition = $condition;
+        $this->cellRange = $cellRange;
+
+        if (is_int($condition) || is_float($condition)) {
+            $this->size = ($condition <= 65535 ? 3 : 0x0000);
+            $this->tokens = pack('Cv', 0x1E, $condition);
+        } else {
+            try {
+                /** @var float|int|string */
+                $conditionx = $condition;
+                $formula = Wizard\WizardAbstract::reverseAdjustCellRef((string) $conditionx, $cellRange);
+                $this->parser->parse($formula);
+                $this->tokens = $this->parser->toReversePolish();
+                $this->size = strlen($this->tokens ?? '');
+            } catch (PhpSpreadsheetException) {
+                // In the event of a parser error with a formula value, we set the expression to ptgInt + 0
+                $this->tokens = pack('Cv', 0x1E, 0);
+                $this->size = 3;
+            }
+        }
+    }
+
+    public function tokens(): ?string
+    {
+        return $this->tokens;
+    }
+
+    public function size(): int
+    {
+        return $this->size;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php
new file mode 100644
index 00000000..e74f4f40
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+class ErrorCode
+{
+    /**
+     * @var array<string, int>
+     */
+    protected static array $errorCodeMap = [
+        '#NULL!' => 0x00,
+        '#DIV/0!' => 0x07,
+        '#VALUE!' => 0x0F,
+        '#REF!' => 0x17,
+        '#NAME?' => 0x1D,
+        '#NUM!' => 0x24,
+        '#N/A' => 0x2A,
+    ];
+
+    public static function error(string $errorCode): int
+    {
+        if (array_key_exists($errorCode, self::$errorCodeMap)) {
+            return self::$errorCodeMap[$errorCode];
+        }
+
+        return 0;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php
new file mode 100644
index 00000000..c3993be0
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php
@@ -0,0 +1,497 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\Escher as SharedEscher;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer\SpContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE\Blip;
+
+class Escher
+{
+    /**
+     * The object we are writing.
+     */
+    private Blip|BSE|BstoreContainer|DgContainer|DggContainer|Escher|SpContainer|SpgrContainer|SharedEscher $object;
+
+    /**
+     * The written binary data.
+     */
+    private string $data;
+
+    /**
+     * Shape offsets. Positions in binary stream where a new shape record begins.
+     */
+    private array $spOffsets;
+
+    /**
+     * Shape types.
+     */
+    private array $spTypes;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(Blip|BSE|BstoreContainer|DgContainer|DggContainer|self|SpContainer|SpgrContainer|SharedEscher $object)
+    {
+        $this->object = $object;
+    }
+
+    /**
+     * Process the object to be written.
+     */
+    public function close(): string
+    {
+        // initialize
+        $this->data = '';
+
+        switch ($this->object::class) {
+            case SharedEscher::class:
+                if ($dggContainer = $this->object->getDggContainer()) {
+                    $writer = new self($dggContainer);
+                    $this->data = $writer->close();
+                } elseif ($dgContainer = $this->object->getDgContainer()) {
+                    $writer = new self($dgContainer);
+                    $this->data = $writer->close();
+                    $this->spOffsets = $writer->getSpOffsets();
+                    $this->spTypes = $writer->getSpTypes();
+                }
+
+                break;
+            case DggContainer::class:
+                // this is a container record
+
+                // initialize
+                $innerData = '';
+
+                // write the dgg
+                $recVer = 0x0;
+                $recInstance = 0x0000;
+                $recType = 0xF006;
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                // dgg data
+                $dggData
+                    = pack(
+                        'VVVV',
+                        $this->object->getSpIdMax(), // maximum shape identifier increased by one
+                        $this->object->getCDgSaved() + 1, // number of file identifier clusters increased by one
+                        $this->object->getCSpSaved(),
+                        $this->object->getCDgSaved() // count total number of drawings saved
+                    );
+
+                // add file identifier clusters (one per drawing)
+                $IDCLs = $this->object->getIDCLs();
+
+                foreach ($IDCLs as $dgId => $maxReducedSpId) {
+                    $dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
+                }
+
+                $header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
+                $innerData .= $header . $dggData;
+
+                // write the bstoreContainer
+                if ($bstoreContainer = $this->object->getBstoreContainer()) {
+                    $writer = new self($bstoreContainer);
+                    $innerData .= $writer->close();
+                }
+
+                // write the record
+                $recVer = 0xF;
+                $recInstance = 0x0000;
+                $recType = 0xF000;
+                $length = strlen($innerData);
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $innerData;
+
+                break;
+            case BstoreContainer::class:
+                // this is a container record
+
+                // initialize
+                $innerData = '';
+
+                // treat the inner data
+                if ($BSECollection = $this->object->getBSECollection()) {
+                    foreach ($BSECollection as $BSE) {
+                        $writer = new self($BSE);
+                        $innerData .= $writer->close();
+                    }
+                }
+
+                // write the record
+                $recVer = 0xF;
+                $recInstance = count($this->object->getBSECollection());
+                $recType = 0xF001;
+                $length = strlen($innerData);
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $innerData;
+
+                break;
+            case BSE::class:
+                // this is a semi-container record
+
+                // initialize
+                $innerData = '';
+
+                // here we treat the inner data
+                if ($blip = $this->object->getBlip()) {
+                    $writer = new self($blip);
+                    $innerData .= $writer->close();
+                }
+
+                // initialize
+                $data = '';
+
+                $btWin32 = $this->object->getBlipType();
+                $btMacOS = $this->object->getBlipType();
+                $data .= pack('CC', $btWin32, $btMacOS);
+
+                $rgbUid = pack('VVVV', 0, 0, 0, 0); // todo
+                $data .= $rgbUid;
+
+                $tag = 0;
+                $size = strlen($innerData);
+                $cRef = 1;
+                $foDelay = 0; //todo
+                $unused1 = 0x0;
+                $cbName = 0x0;
+                $unused2 = 0x0;
+                $unused3 = 0x0;
+                $data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
+
+                $data .= $innerData;
+
+                // write the record
+                $recVer = 0x2;
+                $recInstance = $this->object->getBlipType();
+                $recType = 0xF007;
+                $length = strlen($data);
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header;
+
+                $this->data .= $data;
+
+                break;
+            case Blip::class:
+                // this is an atom record
+
+                // write the record
+                switch ($this->object->getParent()->getBlipType()) {
+                    case BSE::BLIPTYPE_JPEG:
+                        // initialize
+                        $innerData = '';
+
+                        $rgbUid1 = pack('VVVV', 0, 0, 0, 0); // todo
+                        $innerData .= $rgbUid1;
+
+                        $tag = 0xFF; // todo
+                        $innerData .= pack('C', $tag);
+
+                        $innerData .= $this->object->getData();
+
+                        $recVer = 0x0;
+                        $recInstance = 0x46A;
+                        $recType = 0xF01D;
+                        $length = strlen($innerData);
+
+                        $recVerInstance = $recVer;
+                        $recVerInstance |= $recInstance << 4;
+
+                        $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                        $this->data = $header;
+
+                        $this->data .= $innerData;
+
+                        break;
+                    case BSE::BLIPTYPE_PNG:
+                        // initialize
+                        $innerData = '';
+
+                        $rgbUid1 = pack('VVVV', 0, 0, 0, 0); // todo
+                        $innerData .= $rgbUid1;
+
+                        $tag = 0xFF; // todo
+                        $innerData .= pack('C', $tag);
+
+                        $innerData .= $this->object->getData();
+
+                        $recVer = 0x0;
+                        $recInstance = 0x6E0;
+                        $recType = 0xF01E;
+                        $length = strlen($innerData);
+
+                        $recVerInstance = $recVer;
+                        $recVerInstance |= $recInstance << 4;
+
+                        $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                        $this->data = $header;
+
+                        $this->data .= $innerData;
+
+                        break;
+                }
+
+                break;
+            case DgContainer::class:
+                // this is a container record
+
+                // initialize
+                $innerData = '';
+
+                // write the dg
+                $recVer = 0x0;
+                $recInstance = $this->object->getDgId();
+                $recType = 0xF008;
+                $length = 8;
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                // number of shapes in this drawing (including group shape)
+                $countShapes = count($this->object->getSpgrContainerOrThrow()->getChildren());
+                $innerData .= $header . pack('VV', $countShapes, $this->object->getLastSpId());
+
+                // write the spgrContainer
+                if ($spgrContainer = $this->object->getSpgrContainer()) {
+                    $writer = new self($spgrContainer);
+                    $innerData .= $writer->close();
+
+                    // get the shape offsets relative to the spgrContainer record
+                    $spOffsets = $writer->getSpOffsets();
+                    $spTypes = $writer->getSpTypes();
+
+                    // save the shape offsets relative to dgContainer
+                    foreach ($spOffsets as &$spOffset) {
+                        $spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
+                    }
+
+                    $this->spOffsets = $spOffsets;
+                    $this->spTypes = $spTypes;
+                }
+
+                // write the record
+                $recVer = 0xF;
+                $recInstance = 0x0000;
+                $recType = 0xF002;
+                $length = strlen($innerData);
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $innerData;
+
+                break;
+            case SpgrContainer::class:
+                // this is a container record
+
+                // initialize
+                $innerData = '';
+
+                // initialize spape offsets
+                $totalSize = 8;
+                $spOffsets = [];
+                $spTypes = [];
+
+                // treat the inner data
+                foreach ($this->object->getChildren() as $spContainer) {
+                    $writer = new self($spContainer);
+                    $spData = $writer->close();
+                    $innerData .= $spData;
+
+                    // save the shape offsets (where new shape records begin)
+                    $totalSize += strlen($spData);
+                    $spOffsets[] = $totalSize;
+
+                    $spTypes = array_merge($spTypes, $writer->getSpTypes());
+                }
+
+                // write the record
+                $recVer = 0xF;
+                $recInstance = 0x0000;
+                $recType = 0xF003;
+                $length = strlen($innerData);
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $innerData;
+                $this->spOffsets = $spOffsets;
+                $this->spTypes = $spTypes;
+
+                break;
+            case SpContainer::class:
+                // initialize
+                $data = '';
+
+                // build the data
+
+                // write group shape record, if necessary?
+                if ($this->object->getSpgr()) {
+                    $recVer = 0x1;
+                    $recInstance = 0x0000;
+                    $recType = 0xF009;
+                    $length = 0x00000010;
+
+                    $recVerInstance = $recVer;
+                    $recVerInstance |= $recInstance << 4;
+
+                    $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                    $data .= $header . pack('VVVV', 0, 0, 0, 0);
+                }
+                $this->spTypes[] = ($this->object->getSpType());
+
+                // write the shape record
+                $recVer = 0x2;
+                $recInstance = $this->object->getSpType(); // shape type
+                $recType = 0xF00A;
+                $length = 0x00000008;
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $data .= $header . pack('VV', $this->object->getSpId(), $this->object->getSpgr() ? 0x0005 : 0x0A00);
+
+                // the options
+                if ($this->object->getOPTCollection()) {
+                    $optData = '';
+
+                    $recVer = 0x3;
+                    $recInstance = count($this->object->getOPTCollection());
+                    $recType = 0xF00B;
+                    foreach ($this->object->getOPTCollection() as $property => $value) {
+                        $optData .= pack('vV', $property, $value);
+                    }
+                    $length = strlen($optData);
+
+                    $recVerInstance = $recVer;
+                    $recVerInstance |= $recInstance << 4;
+
+                    $header = pack('vvV', $recVerInstance, $recType, $length);
+                    $data .= $header . $optData;
+                }
+
+                // the client anchor
+                if ($this->object->getStartCoordinates()) {
+                    $recVer = 0x0;
+                    $recInstance = 0x0;
+                    $recType = 0xF010;
+
+                    // start coordinates
+                    [$column, $row] = Coordinate::indexesFromString($this->object->getStartCoordinates());
+                    $c1 = $column - 1;
+                    $r1 = $row - 1;
+
+                    // start offsetX
+                    $startOffsetX = $this->object->getStartOffsetX();
+
+                    // start offsetY
+                    $startOffsetY = $this->object->getStartOffsetY();
+
+                    // end coordinates
+                    [$column, $row] = Coordinate::indexesFromString($this->object->getEndCoordinates());
+                    $c2 = $column - 1;
+                    $r2 = $row - 1;
+
+                    // end offsetX
+                    $endOffsetX = $this->object->getEndOffsetX();
+
+                    // end offsetY
+                    $endOffsetY = $this->object->getEndOffsetY();
+
+                    $clientAnchorData = pack('vvvvvvvvv', $this->object->getSpFlag(), $c1, $startOffsetX, $r1, $startOffsetY, $c2, $endOffsetX, $r2, $endOffsetY);
+
+                    $length = strlen($clientAnchorData);
+
+                    $recVerInstance = $recVer;
+                    $recVerInstance |= $recInstance << 4;
+
+                    $header = pack('vvV', $recVerInstance, $recType, $length);
+                    $data .= $header . $clientAnchorData;
+                }
+
+                // the client data, just empty for now
+                if (!$this->object->getSpgr()) {
+                    $clientDataData = '';
+
+                    $recVer = 0x0;
+                    $recInstance = 0x0;
+                    $recType = 0xF011;
+
+                    $length = strlen($clientDataData);
+
+                    $recVerInstance = $recVer;
+                    $recVerInstance |= $recInstance << 4;
+
+                    $header = pack('vvV', $recVerInstance, $recType, $length);
+                    $data .= $header . $clientDataData;
+                }
+
+                // write the record
+                $recVer = 0xF;
+                $recInstance = 0x0000;
+                $recType = 0xF004;
+                $length = strlen($data);
+
+                $recVerInstance = $recVer;
+                $recVerInstance |= $recInstance << 4;
+
+                $header = pack('vvV', $recVerInstance, $recType, $length);
+
+                $this->data = $header . $data;
+
+                break;
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * Gets the shape offsets.
+     */
+    public function getSpOffsets(): array
+    {
+        return $this->spOffsets;
+    }
+
+    /**
+     * Gets the shape types.
+     */
+    public function getSpTypes(): array
+    {
+        return $this->spTypes;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php
new file mode 100644
index 00000000..9a1aa8a1
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Font
+{
+    /**
+     * Color index.
+     */
+    private int $colorIndex;
+
+    /**
+     * Font.
+     */
+    private \PhpOffice\PhpSpreadsheet\Style\Font $font;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(\PhpOffice\PhpSpreadsheet\Style\Font $font)
+    {
+        $this->colorIndex = 0x7FFF;
+        $this->font = $font;
+    }
+
+    /**
+     * Set the color index.
+     */
+    public function setColorIndex(int $colorIndex): void
+    {
+        $this->colorIndex = $colorIndex;
+    }
+
+    private static int $notImplemented = 0;
+
+    /**
+     * Get font record data.
+     */
+    public function writeFont(): string
+    {
+        $font_outline = self::$notImplemented;
+        $font_shadow = self::$notImplemented;
+
+        $icv = $this->colorIndex; // Index to color palette
+        if ($this->font->getSuperscript()) {
+            $sss = 1;
+        } elseif ($this->font->getSubscript()) {
+            $sss = 2;
+        } else {
+            $sss = 0;
+        }
+        $bFamily = 0; // Font family
+        $bCharSet = \PhpOffice\PhpSpreadsheet\Shared\Font::getCharsetFromFontName((string) $this->font->getName()); // Character set
+
+        $record = 0x31; // Record identifier
+        $reserved = 0x00; // Reserved
+        $grbit = 0x00; // Font attributes
+        if ($this->font->getItalic()) {
+            $grbit |= 0x02;
+        }
+        if ($this->font->getStrikethrough()) {
+            $grbit |= 0x08;
+        }
+        if ($font_outline) {
+            $grbit |= 0x10;
+        }
+        if ($font_shadow) {
+            $grbit |= 0x20;
+        }
+
+        $data = pack(
+            'vvvvvCCCC',
+            // Fontsize (in twips)
+            $this->font->getSize() * 20,
+            $grbit,
+            // Colour
+            $icv,
+            // Font weight
+            self::mapBold($this->font->getBold()),
+            // Superscript/Subscript
+            $sss,
+            self::mapUnderline((string) $this->font->getUnderline()),
+            $bFamily,
+            $bCharSet,
+            $reserved
+        );
+        $data .= StringHelper::UTF8toBIFF8UnicodeShort((string) $this->font->getName());
+
+        $length = strlen($data);
+        $header = pack('vv', $record, $length);
+
+        return $header . $data;
+    }
+
+    /**
+     * Map to BIFF5-BIFF8 codes for bold.
+     */
+    private static function mapBold(?bool $bold): int
+    {
+        if ($bold === true) {
+            return 0x2BC; //  700 = Bold font weight
+        }
+
+        return 0x190; //  400 = Normal font weight
+    }
+
+    /**
+     * Map of BIFF2-BIFF8 codes for underline styles.
+     *
+     * @var int[]
+     */
+    private static array $mapUnderline = [
+        \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_NONE => 0x00,
+        \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE => 0x01,
+        \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLE => 0x02,
+        \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLEACCOUNTING => 0x21,
+        \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLEACCOUNTING => 0x22,
+    ];
+
+    /**
+     * Map underline.
+     */
+    private static function mapUnderline(string $underline): int
+    {
+        if (isset(self::$mapUnderline[$underline])) {
+            return self::$mapUnderline[$underline];
+        }
+
+        return 0x00;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php
new file mode 100644
index 00000000..9e9b6fe7
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -0,0 +1,1506 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as PhpspreadsheetWorksheet;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_Parser (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// *  Class for parsing Excel formulas
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class Parser
+{
+    /**    Constants                */
+    // Sheet title in unquoted form
+    // Invalid sheet title characters cannot occur in the sheet title:
+    //         *:/\?[]
+    // Moreover, there are valid sheet title characters that cannot occur in unquoted form (there may be more?)
+    // +-% '^&<>=,;#()"{}
+    const REGEX_SHEET_TITLE_UNQUOTED = '[^\*\:\/\\\\\?\[\]\+\-\% \\\'\^\&\<\>\=\,\;\#\(\)\"\{\}]+';
+
+    // Sheet title in quoted form (without surrounding quotes)
+    // Invalid sheet title characters cannot occur in the sheet title:
+    // *:/\?[]                    (usual invalid sheet title characters)
+    // Single quote is represented as a pair ''
+    const REGEX_SHEET_TITLE_QUOTED = '(([^\*\:\/\\\\\?\[\]\\\'])+|(\\\'\\\')+)+';
+
+    /**
+     * The index of the character we are currently looking at.
+     */
+    public int $currentCharacter;
+
+    /**
+     * The token we are working on.
+     */
+    public string $currentToken;
+
+    /**
+     * The formula to parse.
+     */
+    private string $formula;
+
+    /**
+     * The character ahead of the current char.
+     */
+    public string $lookAhead;
+
+    /**
+     * The parse tree to be generated.
+     */
+    public array|string $parseTree;
+
+    /**
+     * Array of external sheets.
+     */
+    private array $externalSheets;
+
+    /**
+     * Array of sheet references in the form of REF structures.
+     */
+    public array $references;
+
+    /**
+     * The Excel ptg indices.
+     */
+    private array $ptg = [
+        'ptgExp' => 0x01,
+        'ptgTbl' => 0x02,
+        'ptgAdd' => 0x03,
+        'ptgSub' => 0x04,
+        'ptgMul' => 0x05,
+        'ptgDiv' => 0x06,
+        'ptgPower' => 0x07,
+        'ptgConcat' => 0x08,
+        'ptgLT' => 0x09,
+        'ptgLE' => 0x0A,
+        'ptgEQ' => 0x0B,
+        'ptgGE' => 0x0C,
+        'ptgGT' => 0x0D,
+        'ptgNE' => 0x0E,
+        'ptgIsect' => 0x0F,
+        'ptgUnion' => 0x10,
+        'ptgRange' => 0x11,
+        'ptgUplus' => 0x12,
+        'ptgUminus' => 0x13,
+        'ptgPercent' => 0x14,
+        'ptgParen' => 0x15,
+        'ptgMissArg' => 0x16,
+        'ptgStr' => 0x17,
+        'ptgAttr' => 0x19,
+        'ptgSheet' => 0x1A,
+        'ptgEndSheet' => 0x1B,
+        'ptgErr' => 0x1C,
+        'ptgBool' => 0x1D,
+        'ptgInt' => 0x1E,
+        'ptgNum' => 0x1F,
+        'ptgArray' => 0x20,
+        'ptgFunc' => 0x21,
+        'ptgFuncVar' => 0x22,
+        'ptgName' => 0x23,
+        'ptgRef' => 0x24,
+        'ptgArea' => 0x25,
+        'ptgMemArea' => 0x26,
+        'ptgMemErr' => 0x27,
+        'ptgMemNoMem' => 0x28,
+        'ptgMemFunc' => 0x29,
+        'ptgRefErr' => 0x2A,
+        'ptgAreaErr' => 0x2B,
+        'ptgRefN' => 0x2C,
+        'ptgAreaN' => 0x2D,
+        'ptgMemAreaN' => 0x2E,
+        'ptgMemNoMemN' => 0x2F,
+        'ptgNameX' => 0x39,
+        'ptgRef3d' => 0x3A,
+        'ptgArea3d' => 0x3B,
+        'ptgRefErr3d' => 0x3C,
+        'ptgAreaErr3d' => 0x3D,
+        'ptgArrayV' => 0x40,
+        'ptgFuncV' => 0x41,
+        'ptgFuncVarV' => 0x42,
+        'ptgNameV' => 0x43,
+        'ptgRefV' => 0x44,
+        'ptgAreaV' => 0x45,
+        'ptgMemAreaV' => 0x46,
+        'ptgMemErrV' => 0x47,
+        'ptgMemNoMemV' => 0x48,
+        'ptgMemFuncV' => 0x49,
+        'ptgRefErrV' => 0x4A,
+        'ptgAreaErrV' => 0x4B,
+        'ptgRefNV' => 0x4C,
+        'ptgAreaNV' => 0x4D,
+        'ptgMemAreaNV' => 0x4E,
+        'ptgMemNoMemNV' => 0x4F,
+        'ptgFuncCEV' => 0x58,
+        'ptgNameXV' => 0x59,
+        'ptgRef3dV' => 0x5A,
+        'ptgArea3dV' => 0x5B,
+        'ptgRefErr3dV' => 0x5C,
+        'ptgAreaErr3dV' => 0x5D,
+        'ptgArrayA' => 0x60,
+        'ptgFuncA' => 0x61,
+        'ptgFuncVarA' => 0x62,
+        'ptgNameA' => 0x63,
+        'ptgRefA' => 0x64,
+        'ptgAreaA' => 0x65,
+        'ptgMemAreaA' => 0x66,
+        'ptgMemErrA' => 0x67,
+        'ptgMemNoMemA' => 0x68,
+        'ptgMemFuncA' => 0x69,
+        'ptgRefErrA' => 0x6A,
+        'ptgAreaErrA' => 0x6B,
+        'ptgRefNA' => 0x6C,
+        'ptgAreaNA' => 0x6D,
+        'ptgMemAreaNA' => 0x6E,
+        'ptgMemNoMemNA' => 0x6F,
+        'ptgFuncCEA' => 0x78,
+        'ptgNameXA' => 0x79,
+        'ptgRef3dA' => 0x7A,
+        'ptgArea3dA' => 0x7B,
+        'ptgRefErr3dA' => 0x7C,
+        'ptgAreaErr3dA' => 0x7D,
+    ];
+
+    /**
+     * Thanks to Michael Meeks and Gnumeric for the initial arg values.
+     *
+     * The following hash was generated by "function_locale.pl" in the distro.
+     * Refer to function_locale.pl for non-English function names.
+     *
+     * The array elements are as follow:
+     * ptg:   The Excel function ptg code.
+     * args:  The number of arguments that the function takes:
+     *           >=0 is a fixed number of arguments.
+     *           -1  is a variable  number of arguments.
+     * class: The reference, value or array class of the function args.
+     * vol:   The function is volatile.
+     */
+    private array $functions = [
+        // function                  ptg  args  class  vol
+        'COUNT' => [0, -1, 0, 0],
+        'IF' => [1, -1, 1, 0],
+        'ISNA' => [2, 1, 1, 0],
+        'ISERROR' => [3, 1, 1, 0],
+        'SUM' => [4, -1, 0, 0],
+        'AVERAGE' => [5, -1, 0, 0],
+        'MIN' => [6, -1, 0, 0],
+        'MAX' => [7, -1, 0, 0],
+        'ROW' => [8, -1, 0, 0],
+        'COLUMN' => [9, -1, 0, 0],
+        'NA' => [10, 0, 0, 0],
+        'NPV' => [11, -1, 1, 0],
+        'STDEV' => [12, -1, 0, 0],
+        'DOLLAR' => [13, -1, 1, 0],
+        'FIXED' => [14, -1, 1, 0],
+        'SIN' => [15, 1, 1, 0],
+        'COS' => [16, 1, 1, 0],
+        'TAN' => [17, 1, 1, 0],
+        'ATAN' => [18, 1, 1, 0],
+        'PI' => [19, 0, 1, 0],
+        'SQRT' => [20, 1, 1, 0],
+        'EXP' => [21, 1, 1, 0],
+        'LN' => [22, 1, 1, 0],
+        'LOG10' => [23, 1, 1, 0],
+        'ABS' => [24, 1, 1, 0],
+        'INT' => [25, 1, 1, 0],
+        'SIGN' => [26, 1, 1, 0],
+        'ROUND' => [27, 2, 1, 0],
+        'LOOKUP' => [28, -1, 0, 0],
+        'INDEX' => [29, -1, 0, 1],
+        'REPT' => [30, 2, 1, 0],
+        'MID' => [31, 3, 1, 0],
+        'LEN' => [32, 1, 1, 0],
+        'VALUE' => [33, 1, 1, 0],
+        'TRUE' => [34, 0, 1, 0],
+        'FALSE' => [35, 0, 1, 0],
+        'AND' => [36, -1, 0, 0],
+        'OR' => [37, -1, 0, 0],
+        'NOT' => [38, 1, 1, 0],
+        'MOD' => [39, 2, 1, 0],
+        'DCOUNT' => [40, 3, 0, 0],
+        'DSUM' => [41, 3, 0, 0],
+        'DAVERAGE' => [42, 3, 0, 0],
+        'DMIN' => [43, 3, 0, 0],
+        'DMAX' => [44, 3, 0, 0],
+        'DSTDEV' => [45, 3, 0, 0],
+        'VAR' => [46, -1, 0, 0],
+        'DVAR' => [47, 3, 0, 0],
+        'TEXT' => [48, 2, 1, 0],
+        'LINEST' => [49, -1, 0, 0],
+        'TREND' => [50, -1, 0, 0],
+        'LOGEST' => [51, -1, 0, 0],
+        'GROWTH' => [52, -1, 0, 0],
+        'PV' => [56, -1, 1, 0],
+        'FV' => [57, -1, 1, 0],
+        'NPER' => [58, -1, 1, 0],
+        'PMT' => [59, -1, 1, 0],
+        'RATE' => [60, -1, 1, 0],
+        'MIRR' => [61, 3, 0, 0],
+        'IRR' => [62, -1, 0, 0],
+        'RAND' => [63, 0, 1, 1],
+        'MATCH' => [64, -1, 0, 0],
+        'DATE' => [65, 3, 1, 0],
+        'TIME' => [66, 3, 1, 0],
+        'DAY' => [67, 1, 1, 0],
+        'MONTH' => [68, 1, 1, 0],
+        'YEAR' => [69, 1, 1, 0],
+        'WEEKDAY' => [70, -1, 1, 0],
+        'HOUR' => [71, 1, 1, 0],
+        'MINUTE' => [72, 1, 1, 0],
+        'SECOND' => [73, 1, 1, 0],
+        'NOW' => [74, 0, 1, 1],
+        'AREAS' => [75, 1, 0, 1],
+        'ROWS' => [76, 1, 0, 1],
+        'COLUMNS' => [77, 1, 0, 1],
+        'OFFSET' => [78, -1, 0, 1],
+        'SEARCH' => [82, -1, 1, 0],
+        'TRANSPOSE' => [83, 1, 1, 0],
+        'TYPE' => [86, 1, 1, 0],
+        'ATAN2' => [97, 2, 1, 0],
+        'ASIN' => [98, 1, 1, 0],
+        'ACOS' => [99, 1, 1, 0],
+        'CHOOSE' => [100, -1, 1, 0],
+        'HLOOKUP' => [101, -1, 0, 0],
+        'VLOOKUP' => [102, -1, 0, 0],
+        'ISREF' => [105, 1, 0, 0],
+        'LOG' => [109, -1, 1, 0],
+        'CHAR' => [111, 1, 1, 0],
+        'LOWER' => [112, 1, 1, 0],
+        'UPPER' => [113, 1, 1, 0],
+        'PROPER' => [114, 1, 1, 0],
+        'LEFT' => [115, -1, 1, 0],
+        'RIGHT' => [116, -1, 1, 0],
+        'EXACT' => [117, 2, 1, 0],
+        'TRIM' => [118, 1, 1, 0],
+        'REPLACE' => [119, 4, 1, 0],
+        'SUBSTITUTE' => [120, -1, 1, 0],
+        'CODE' => [121, 1, 1, 0],
+        'FIND' => [124, -1, 1, 0],
+        'CELL' => [125, -1, 0, 1],
+        'ISERR' => [126, 1, 1, 0],
+        'ISTEXT' => [127, 1, 1, 0],
+        'ISNUMBER' => [128, 1, 1, 0],
+        'ISBLANK' => [129, 1, 1, 0],
+        'T' => [130, 1, 0, 0],
+        'N' => [131, 1, 0, 0],
+        'DATEVALUE' => [140, 1, 1, 0],
+        'TIMEVALUE' => [141, 1, 1, 0],
+        'SLN' => [142, 3, 1, 0],
+        'SYD' => [143, 4, 1, 0],
+        'DDB' => [144, -1, 1, 0],
+        'INDIRECT' => [148, -1, 1, 1],
+        'CALL' => [150, -1, 1, 0],
+        'CLEAN' => [162, 1, 1, 0],
+        'MDETERM' => [163, 1, 2, 0],
+        'MINVERSE' => [164, 1, 2, 0],
+        'MMULT' => [165, 2, 2, 0],
+        'IPMT' => [167, -1, 1, 0],
+        'PPMT' => [168, -1, 1, 0],
+        'COUNTA' => [169, -1, 0, 0],
+        'PRODUCT' => [183, -1, 0, 0],
+        'FACT' => [184, 1, 1, 0],
+        'DPRODUCT' => [189, 3, 0, 0],
+        'ISNONTEXT' => [190, 1, 1, 0],
+        'STDEVP' => [193, -1, 0, 0],
+        'VARP' => [194, -1, 0, 0],
+        'DSTDEVP' => [195, 3, 0, 0],
+        'DVARP' => [196, 3, 0, 0],
+        'TRUNC' => [197, -1, 1, 0],
+        'ISLOGICAL' => [198, 1, 1, 0],
+        'DCOUNTA' => [199, 3, 0, 0],
+        'USDOLLAR' => [204, -1, 1, 0],
+        'FINDB' => [205, -1, 1, 0],
+        'SEARCHB' => [206, -1, 1, 0],
+        'REPLACEB' => [207, 4, 1, 0],
+        'LEFTB' => [208, -1, 1, 0],
+        'RIGHTB' => [209, -1, 1, 0],
+        'MIDB' => [210, 3, 1, 0],
+        'LENB' => [211, 1, 1, 0],
+        'ROUNDUP' => [212, 2, 1, 0],
+        'ROUNDDOWN' => [213, 2, 1, 0],
+        'ASC' => [214, 1, 1, 0],
+        'DBCS' => [215, 1, 1, 0],
+        'RANK' => [216, -1, 0, 0],
+        'ADDRESS' => [219, -1, 1, 0],
+        'DAYS360' => [220, -1, 1, 0],
+        'TODAY' => [221, 0, 1, 1],
+        'VDB' => [222, -1, 1, 0],
+        'MEDIAN' => [227, -1, 0, 0],
+        'SUMPRODUCT' => [228, -1, 2, 0],
+        'SINH' => [229, 1, 1, 0],
+        'COSH' => [230, 1, 1, 0],
+        'TANH' => [231, 1, 1, 0],
+        'ASINH' => [232, 1, 1, 0],
+        'ACOSH' => [233, 1, 1, 0],
+        'ATANH' => [234, 1, 1, 0],
+        'DGET' => [235, 3, 0, 0],
+        'INFO' => [244, 1, 1, 1],
+        'DB' => [247, -1, 1, 0],
+        'FREQUENCY' => [252, 2, 0, 0],
+        'ERROR.TYPE' => [261, 1, 1, 0],
+        'REGISTER.ID' => [267, -1, 1, 0],
+        'AVEDEV' => [269, -1, 0, 0],
+        'BETADIST' => [270, -1, 1, 0],
+        'GAMMALN' => [271, 1, 1, 0],
+        'BETAINV' => [272, -1, 1, 0],
+        'BINOMDIST' => [273, 4, 1, 0],
+        'CHIDIST' => [274, 2, 1, 0],
+        'CHIINV' => [275, 2, 1, 0],
+        'COMBIN' => [276, 2, 1, 0],
+        'CONFIDENCE' => [277, 3, 1, 0],
+        'CRITBINOM' => [278, 3, 1, 0],
+        'EVEN' => [279, 1, 1, 0],
+        'EXPONDIST' => [280, 3, 1, 0],
+        'FDIST' => [281, 3, 1, 0],
+        'FINV' => [282, 3, 1, 0],
+        'FISHER' => [283, 1, 1, 0],
+        'FISHERINV' => [284, 1, 1, 0],
+        'FLOOR' => [285, 2, 1, 0],
+        'GAMMADIST' => [286, 4, 1, 0],
+        'GAMMAINV' => [287, 3, 1, 0],
+        'CEILING' => [288, 2, 1, 0],
+        'HYPGEOMDIST' => [289, 4, 1, 0],
+        'LOGNORMDIST' => [290, 3, 1, 0],
+        'LOGINV' => [291, 3, 1, 0],
+        'NEGBINOMDIST' => [292, 3, 1, 0],
+        'NORMDIST' => [293, 4, 1, 0],
+        'NORMSDIST' => [294, 1, 1, 0],
+        'NORMINV' => [295, 3, 1, 0],
+        'NORMSINV' => [296, 1, 1, 0],
+        'STANDARDIZE' => [297, 3, 1, 0],
+        'ODD' => [298, 1, 1, 0],
+        'PERMUT' => [299, 2, 1, 0],
+        'POISSON' => [300, 3, 1, 0],
+        'TDIST' => [301, 3, 1, 0],
+        'WEIBULL' => [302, 4, 1, 0],
+        'SUMXMY2' => [303, 2, 2, 0],
+        'SUMX2MY2' => [304, 2, 2, 0],
+        'SUMX2PY2' => [305, 2, 2, 0],
+        'CHITEST' => [306, 2, 2, 0],
+        'CORREL' => [307, 2, 2, 0],
+        'COVAR' => [308, 2, 2, 0],
+        'FORECAST' => [309, 3, 2, 0],
+        'FTEST' => [310, 2, 2, 0],
+        'INTERCEPT' => [311, 2, 2, 0],
+        'PEARSON' => [312, 2, 2, 0],
+        'RSQ' => [313, 2, 2, 0],
+        'STEYX' => [314, 2, 2, 0],
+        'SLOPE' => [315, 2, 2, 0],
+        'TTEST' => [316, 4, 2, 0],
+        'PROB' => [317, -1, 2, 0],
+        'DEVSQ' => [318, -1, 0, 0],
+        'GEOMEAN' => [319, -1, 0, 0],
+        'HARMEAN' => [320, -1, 0, 0],
+        'SUMSQ' => [321, -1, 0, 0],
+        'KURT' => [322, -1, 0, 0],
+        'SKEW' => [323, -1, 0, 0],
+        'ZTEST' => [324, -1, 0, 0],
+        'LARGE' => [325, 2, 0, 0],
+        'SMALL' => [326, 2, 0, 0],
+        'QUARTILE' => [327, 2, 0, 0],
+        'PERCENTILE' => [328, 2, 0, 0],
+        'PERCENTRANK' => [329, -1, 0, 0],
+        'MODE' => [330, -1, 2, 0],
+        'TRIMMEAN' => [331, 2, 0, 0],
+        'TINV' => [332, 2, 1, 0],
+        'CONCATENATE' => [336, -1, 1, 0],
+        'POWER' => [337, 2, 1, 0],
+        'RADIANS' => [342, 1, 1, 0],
+        'DEGREES' => [343, 1, 1, 0],
+        'SUBTOTAL' => [344, -1, 0, 0],
+        'SUMIF' => [345, -1, 0, 0],
+        'COUNTIF' => [346, 2, 0, 0],
+        'COUNTBLANK' => [347, 1, 0, 0],
+        'ISPMT' => [350, 4, 1, 0],
+        'DATEDIF' => [351, 3, 1, 0],
+        'DATESTRING' => [352, 1, 1, 0],
+        'NUMBERSTRING' => [353, 2, 1, 0],
+        'ROMAN' => [354, -1, 1, 0],
+        'GETPIVOTDATA' => [358, -1, 0, 0],
+        'HYPERLINK' => [359, -1, 1, 0],
+        'PHONETIC' => [360, 1, 0, 0],
+        'AVERAGEA' => [361, -1, 0, 0],
+        'MAXA' => [362, -1, 0, 0],
+        'MINA' => [363, -1, 0, 0],
+        'STDEVPA' => [364, -1, 0, 0],
+        'VARPA' => [365, -1, 0, 0],
+        'STDEVA' => [366, -1, 0, 0],
+        'VARA' => [367, -1, 0, 0],
+        'BAHTTEXT' => [368, 1, 0, 0],
+    ];
+
+    private Spreadsheet $spreadsheet;
+
+    /**
+     * The class constructor.
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+
+        $this->currentCharacter = 0;
+        $this->currentToken = ''; // The token we are working on.
+        $this->formula = ''; // The formula to parse.
+        $this->lookAhead = ''; // The character ahead of the current char.
+        $this->parseTree = ''; // The parse tree to be generated.
+        $this->externalSheets = [];
+        $this->references = [];
+    }
+
+    /**
+     * Convert a token to the proper ptg value.
+     *
+     * @param string $token the token to convert
+     *
+     * @return string the converted token on success
+     */
+    private function convert(string $token): string
+    {
+        if (preg_match('/"([^"]|""){0,255}"/', $token)) {
+            return $this->convertString($token);
+        }
+        if (is_numeric($token)) {
+            return $this->convertNumber($token);
+        }
+        // match references like A1 or $A$1
+        if (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) {
+            return $this->convertRef2d($token);
+        }
+        // match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1
+        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?(\\d+)$/u', $token)) {
+            return $this->convertRef3d($token);
+        }
+        // match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1
+        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\\d+)$/u", $token)) {
+            return $this->convertRef3d($token);
+        }
+        // match ranges like A1:B2 or $A$1:$B$2
+        if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
+            return $this->convertRange2d($token);
+        }
+        // match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
+        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)\\:\$?([A-Ia-i]?[A-Za-z])?\$?(\\d+)$/u', $token)) {
+            return $this->convertRange3d($token);
+        }
+        // match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
+        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)\\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\\d+)$/u", $token)) {
+            return $this->convertRange3d($token);
+        }
+        // operators (including parentheses)
+        if (isset($this->ptg[$token])) {
+            return pack('C', $this->ptg[$token]);
+        }
+        // match error codes
+        if (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') {
+            return $this->convertError($token);
+        }
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
+            return $this->convertDefinedName($token);
+        }
+        // commented so argument number can be processed correctly. See toReversePolish().
+        /*if (preg_match("/[A-Z0-9\xc0-\xdc\.]+/", $token))
+        {
+            return($this->convertFunction($token, $this->_func_args));
+        }*/
+        // if it's an argument, ignore the token (the argument remains)
+        if ($token == 'arg') {
+            return '';
+        }
+        if (preg_match('/^true$/i', $token)) {
+            return $this->convertBool(1);
+        }
+        if (preg_match('/^false$/i', $token)) {
+            return $this->convertBool(0);
+        }
+
+        // TODO: use real error codes
+        throw new WriterException("Unknown token $token");
+    }
+
+    /**
+     * Convert a number token to ptgInt or ptgNum.
+     *
+     * @param float|int|string $num an integer or double for conversion to its ptg value
+     */
+    private function convertNumber(mixed $num): string
+    {
+        // Integer in the range 0..2**16-1
+        if ((preg_match('/^\\d+$/', (string) $num)) && ($num <= 65535)) {
+            return pack('Cv', $this->ptg['ptgInt'], $num);
+        }
+
+        // A float
+        if (BIFFwriter::getByteOrder()) { // if it's Big Endian
+            $num = strrev((string) $num);
+        }
+
+        return pack('Cd', $this->ptg['ptgNum'], $num);
+    }
+
+    private function convertBool(int $num): string
+    {
+        return pack('CC', $this->ptg['ptgBool'], $num);
+    }
+
+    /**
+     * Convert a string token to ptgStr.
+     *
+     * @param string $string a string for conversion to its ptg value
+     *
+     * @return string the converted token
+     */
+    private function convertString(string $string): string
+    {
+        // chop away beggining and ending quotes
+        $string = substr($string, 1, -1);
+        if (strlen($string) > 255) {
+            throw new WriterException('String is too long');
+        }
+
+        return pack('C', $this->ptg['ptgStr']) . StringHelper::UTF8toBIFF8UnicodeShort($string);
+    }
+
+    /**
+     * Convert a function to a ptgFunc or ptgFuncVarV depending on the number of
+     * args that it takes.
+     *
+     * @param string $token the name of the function for convertion to ptg value
+     * @param int $num_args the number of arguments the function receives
+     *
+     * @return string The packed ptg for the function
+     */
+    private function convertFunction(string $token, int $num_args): string
+    {
+        $args = $this->functions[$token][1];
+
+        // Fixed number of args eg. TIME($i, $j, $k).
+        if ($args >= 0) {
+            return pack('Cv', $this->ptg['ptgFuncV'], $this->functions[$token][0]);
+        }
+
+        // Variable number of args eg. SUM($i, $j, $k, ..).
+        return pack('CCv', $this->ptg['ptgFuncVarV'], $num_args, $this->functions[$token][0]);
+    }
+
+    /**
+     * Convert an Excel range such as A1:D4 to a ptgRefV.
+     *
+     * @param string $range An Excel range in the A1:A2
+     */
+    private function convertRange2d(string $range, int $class = 0): string
+    {
+        // TODO: possible class value 0,1,2 check Formula.pm
+        // Split the range into 2 cell refs
+        if (preg_match('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) {
+            [$cell1, $cell2] = explode(':', $range);
+        } else {
+            // TODO: use real error codes
+            throw new WriterException('Unknown range separator');
+        }
+        // Convert the cell references
+        [$row1, $col1] = $this->cellToPackedRowcol($cell1);
+        [$row2, $col2] = $this->cellToPackedRowcol($cell2);
+
+        // The ptg value depends on the class of the ptg.
+        if ($class == 0) {
+            $ptgArea = pack('C', $this->ptg['ptgArea']);
+        } elseif ($class == 1) {
+            $ptgArea = pack('C', $this->ptg['ptgAreaV']);
+        } elseif ($class == 2) {
+            $ptgArea = pack('C', $this->ptg['ptgAreaA']);
+        } else {
+            // TODO: use real error codes
+            throw new WriterException("Unknown class $class");
+        }
+
+        return $ptgArea . $row1 . $row2 . $col1 . $col2;
+    }
+
+    /**
+     * Convert an Excel 3d range such as "Sheet1!A1:D4" or "Sheet1:Sheet2!A1:D4" to
+     * a ptgArea3d.
+     *
+     * @param string $token an Excel range in the Sheet1!A1:A2 format
+     *
+     * @return string the packed ptgArea3d token on success
+     */
+    private function convertRange3d(string $token): string
+    {
+        // Split the ref at the ! symbol
+        [$ext_ref, $range] = PhpspreadsheetWorksheet::extractSheetTitle($token, true);
+
+        // Convert the external reference part (different for BIFF8)
+        $ext_ref = $this->getRefIndex($ext_ref ?? '');
+
+        // Split the range into 2 cell refs
+        [$cell1, $cell2] = explode(':', $range ?? '');
+
+        // Convert the cell references
+        if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\\d+)$/', $cell1)) {
+            [$row1, $col1] = $this->cellToPackedRowcol($cell1);
+            [$row2, $col2] = $this->cellToPackedRowcol($cell2);
+        } else { // It's a rows range (like 26:27)
+            [$row1, $col1, $row2, $col2] = $this->rangeToPackedRange($cell1 . ':' . $cell2);
+        }
+
+        // The ptg value depends on the class of the ptg.
+        $ptgArea = pack('C', $this->ptg['ptgArea3d']);
+
+        return $ptgArea . $ext_ref . $row1 . $row2 . $col1 . $col2;
+    }
+
+    /**
+     * Convert an Excel reference such as A1, $B2, C$3 or $D$4 to a ptgRefV.
+     *
+     * @param string $cell An Excel cell reference
+     *
+     * @return string The cell in packed() format with the corresponding ptg
+     */
+    private function convertRef2d(string $cell): string
+    {
+        // Convert the cell reference
+        $cell_array = $this->cellToPackedRowcol($cell);
+        [$row, $col] = $cell_array;
+
+        // The ptg value depends on the class of the ptg.
+        $ptgRef = pack('C', $this->ptg['ptgRefA']);
+
+        return $ptgRef . $row . $col;
+    }
+
+    /**
+     * Convert an Excel 3d reference such as "Sheet1!A1" or "Sheet1:Sheet2!A1" to a
+     * ptgRef3d.
+     *
+     * @param string $cell An Excel cell reference
+     *
+     * @return string the packed ptgRef3d token on success
+     */
+    private function convertRef3d(string $cell): string
+    {
+        // Split the ref at the ! symbol
+        [$ext_ref, $cell] = PhpspreadsheetWorksheet::extractSheetTitle($cell, true);
+
+        // Convert the external reference part (different for BIFF8)
+        $ext_ref = $this->getRefIndex($ext_ref ?? '');
+
+        // Convert the cell reference part
+        [$row, $col] = $this->cellToPackedRowcol($cell ?? '');
+
+        // The ptg value depends on the class of the ptg.
+        $ptgRef = pack('C', $this->ptg['ptgRef3dA']);
+
+        return $ptgRef . $ext_ref . $row . $col;
+    }
+
+    /**
+     * Convert an error code to a ptgErr.
+     *
+     * @param string $errorCode The error code for conversion to its ptg value
+     *
+     * @return string The error code ptgErr
+     */
+    private function convertError(string $errorCode): string
+    {
+        return match ($errorCode) {
+            '#NULL!' => pack('C', 0x00),
+            '#DIV/0!' => pack('C', 0x07),
+            '#VALUE!' => pack('C', 0x0F),
+            '#REF!' => pack('C', 0x17),
+            '#NAME?' => pack('C', 0x1D),
+            '#NUM!' => pack('C', 0x24),
+            '#N/A' => pack('C', 0x2A),
+            default => pack('C', 0xFF),
+        };
+    }
+
+    private bool $tryDefinedName = false;
+
+    private function convertDefinedName(string $name): string
+    {
+        if (strlen($name) > 255) {
+            throw new WriterException('Defined Name is too long');
+        }
+
+        if ($this->tryDefinedName) {
+            // @codeCoverageIgnoreStart
+            $nameReference = 1;
+            foreach ($this->spreadsheet->getDefinedNames() as $definedName) {
+                if ($name === $definedName->getName()) {
+                    break;
+                }
+                ++$nameReference;
+            }
+
+            $ptgRef = pack('Cvxx', $this->ptg['ptgName'], $nameReference);
+
+            return $ptgRef;
+            // @codeCoverageIgnoreEnd
+        }
+
+        throw new WriterException('Cannot yet write formulae with defined names to Xls');
+    }
+
+    /**
+     * Look up the REF index that corresponds to an external sheet name
+     * (or range). If it doesn't exist yet add it to the workbook's references
+     * array. It assumes all sheet names given must exist.
+     *
+     * @param string $ext_ref The name of the external reference
+     *
+     * @return string The reference index in packed() format on success
+     */
+    private function getRefIndex(string $ext_ref): string
+    {
+        $ext_ref = (string) preg_replace(["/^'/", "/'$/"], ['', ''], $ext_ref); // Remove leading and trailing ' if any.
+        $ext_ref = str_replace('\'\'', '\'', $ext_ref); // Replace escaped '' with '
+
+        // Check if there is a sheet range eg., Sheet1:Sheet2.
+        if (preg_match('/:/', $ext_ref)) {
+            [$sheet_name1, $sheet_name2] = explode(':', $ext_ref);
+
+            $sheet1 = $this->getSheetIndex($sheet_name1);
+            if ($sheet1 == -1) {
+                throw new WriterException("Unknown sheet name $sheet_name1 in formula");
+            }
+            $sheet2 = $this->getSheetIndex($sheet_name2);
+            if ($sheet2 == -1) {
+                throw new WriterException("Unknown sheet name $sheet_name2 in formula");
+            }
+
+            // Reverse max and min sheet numbers if necessary
+            if ($sheet1 > $sheet2) {
+                [$sheet1, $sheet2] = [$sheet2, $sheet1];
+            }
+        } else { // Single sheet name only.
+            $sheet1 = $this->getSheetIndex($ext_ref);
+            if ($sheet1 == -1) {
+                throw new WriterException("Unknown sheet name $ext_ref in formula");
+            }
+            $sheet2 = $sheet1;
+        }
+
+        // assume all references belong to this document
+        $supbook_index = 0x00;
+        $ref = pack('vvv', $supbook_index, $sheet1, $sheet2);
+        $totalreferences = count($this->references);
+        $index = -1;
+        for ($i = 0; $i < $totalreferences; ++$i) {
+            if ($ref == $this->references[$i]) {
+                $index = $i;
+
+                break;
+            }
+        }
+        // if REF was not found add it to references array
+        if ($index == -1) {
+            $this->references[$totalreferences] = $ref;
+            $index = $totalreferences;
+        }
+
+        return pack('v', $index);
+    }
+
+    /**
+     * Look up the index that corresponds to an external sheet name. The hash of
+     * sheet names is updated by the addworksheet() method of the
+     * \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook class.
+     *
+     * @param string $sheet_name Sheet name
+     *
+     * @return int The sheet index, -1 if the sheet was not found
+     */
+    private function getSheetIndex(string $sheet_name): int
+    {
+        if (!isset($this->externalSheets[$sheet_name])) {
+            return -1;
+        }
+
+        return $this->externalSheets[$sheet_name];
+    }
+
+    /**
+     * This method is used to update the array of sheet names. It is
+     * called by the addWorksheet() method of the
+     * \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook class.
+     *
+     * @param string $name The name of the worksheet being added
+     * @param int $index The index of the worksheet being added
+     *
+     * @see Workbook::addWorksheet
+     */
+    public function setExtSheet(string $name, int $index): void
+    {
+        $this->externalSheets[$name] = $index;
+    }
+
+    /**
+     * pack() row and column into the required 3 or 4 byte format.
+     *
+     * @param string $cell The Excel cell reference to be packed
+     *
+     * @return array Array containing the row and column in packed() format
+     */
+    private function cellToPackedRowcol(string $cell): array
+    {
+        $cell = strtoupper($cell);
+        [$row, $col, $row_rel, $col_rel] = $this->cellToRowcol($cell);
+        if ($col >= 256) {
+            throw new WriterException("Column in: $cell greater than 255");
+        }
+        if ($row >= 65536) {
+            throw new WriterException("Row in: $cell greater than 65536 ");
+        }
+
+        // Set the high bits to indicate if row or col are relative.
+        $col |= $col_rel << 14;
+        $col |= $row_rel << 15;
+        $col = pack('v', $col);
+
+        $row = pack('v', $row);
+
+        return [$row, $col];
+    }
+
+    /**
+     * pack() row range into the required 3 or 4 byte format.
+     * Just using maximum col/rows, which is probably not the correct solution.
+     *
+     * @param string $range The Excel range to be packed
+     *
+     * @return array Array containing (row1,col1,row2,col2) in packed() format
+     */
+    private function rangeToPackedRange(string $range): array
+    {
+        preg_match('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match);
+        // return absolute rows if there is a $ in the ref
+        $row1_rel = empty($match[1]) ? 1 : 0;
+        $row1 = $match[2];
+        $row2_rel = empty($match[3]) ? 1 : 0;
+        $row2 = $match[4];
+        // Convert 1-index to zero-index
+        --$row1;
+        --$row2;
+        // Trick poor inocent Excel
+        $col1 = 0;
+        $col2 = 65535; // FIXME: maximum possible value for Excel 5 (change this!!!)
+
+        // FIXME: this changes for BIFF8
+        if (($row1 >= 65536) || ($row2 >= 65536)) {
+            throw new WriterException("Row in: $range greater than 65536 ");
+        }
+
+        // Set the high bits to indicate if rows are relative.
+        $col1 |= $row1_rel << 15;
+        $col2 |= $row2_rel << 15;
+        $col1 = pack('v', $col1);
+        $col2 = pack('v', $col2);
+
+        $row1 = pack('v', $row1);
+        $row2 = pack('v', $row2);
+
+        return [$row1, $col1, $row2, $col2];
+    }
+
+    /**
+     * Convert an Excel cell reference such as A1 or $B2 or C$3 or $D$4 to a zero
+     * indexed row and column number. Also returns two (0,1) values to indicate
+     * whether the row or column are relative references.
+     *
+     * @param string $cell the Excel cell reference in A1 format
+     */
+    private function cellToRowcol(string $cell): array
+    {
+        preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/', $cell, $match);
+        // return absolute column if there is a $ in the ref
+        $col_rel = empty($match[1]) ? 1 : 0;
+        $col_ref = $match[2];
+        $row_rel = empty($match[3]) ? 1 : 0;
+        $row = $match[4];
+
+        // Convert base26 column string to a number.
+        $expn = strlen($col_ref) - 1;
+        $col = 0;
+        $col_ref_length = strlen($col_ref);
+        for ($i = 0; $i < $col_ref_length; ++$i) {
+            $col += (ord($col_ref[$i]) - 64) * 26 ** $expn;
+            --$expn;
+        }
+
+        // Convert 1-index to zero-index
+        --$row;
+        --$col;
+
+        return [$row, $col, $row_rel, $col_rel];
+    }
+
+    /**
+     * Advance to the next valid token.
+     */
+    private function advance(): void
+    {
+        $token = '';
+        $i = $this->currentCharacter;
+        $formula_length = strlen($this->formula);
+        // eat up white spaces
+        if ($i < $formula_length) {
+            while ($this->formula[$i] == ' ') {
+                ++$i;
+            }
+
+            if ($i < ($formula_length - 1)) {
+                $this->lookAhead = $this->formula[$i + 1];
+            }
+            $token = '';
+        }
+
+        while ($i < $formula_length) {
+            $token .= $this->formula[$i];
+
+            if ($i < ($formula_length - 1)) {
+                $this->lookAhead = $this->formula[$i + 1];
+            } else {
+                $this->lookAhead = '';
+            }
+
+            if ($this->match($token) != '') {
+                $this->currentCharacter = $i + 1;
+                $this->currentToken = $token;
+
+                return;
+            }
+
+            if ($i < ($formula_length - 2)) {
+                $this->lookAhead = $this->formula[$i + 2];
+            } else { // if we run out of characters lookAhead becomes empty
+                $this->lookAhead = '';
+            }
+            ++$i;
+        }
+    }
+
+    /**
+     * Checks if it's a valid token.
+     *
+     * @param string $token the token to check
+     *
+     * @return string The checked token or empty string on failure
+     */
+    private function match(string $token): string
+    {
+        switch ($token) {
+            case '+':
+            case '-':
+            case '*':
+            case '/':
+            case '(':
+            case ')':
+            case ',':
+            case ';':
+            case '>=':
+            case '<=':
+            case '=':
+            case '<>':
+            case '^':
+            case '&':
+            case '%':
+                return $token;
+
+            case '>':
+                if ($this->lookAhead === '=') { // it's a GE token
+                    break;
+                }
+
+                return $token;
+
+            case '<':
+                // it's a LE or a NE token
+                if (($this->lookAhead === '=') || ($this->lookAhead === '>')) {
+                    break;
+                }
+
+                return $token;
+        }
+
+        // if it's a reference A1 or $A$1 or $A1 or A$1
+        if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.') && ($this->lookAhead !== '!')) {
+            return $token;
+        }
+        // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
+        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.')) {
+            return $token;
+        }
+        // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
+        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $token) && !preg_match('/\d/', $this->lookAhead) && ($this->lookAhead !== ':') && ($this->lookAhead !== '.')) {
+            return $token;
+        }
+        // if it's a range A1:A2 or $A$1:$A$2
+        if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $token) && !preg_match('/\d/', $this->lookAhead)) {
+            return $token;
+        }
+        // If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
+        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $token) && !preg_match('/\d/', $this->lookAhead)) {
+            return $token;
+        }
+        // If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
+        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $token) && !preg_match('/\d/', $this->lookAhead)) {
+            return $token;
+        }
+        // If it's a number (check that it's not a sheet name or range)
+        if (is_numeric($token) && (!is_numeric($token . $this->lookAhead) || ($this->lookAhead == '')) && ($this->lookAhead !== '!') && ($this->lookAhead !== ':')) {
+            return $token;
+        }
+        if (preg_match('/"([^"]|""){0,255}"/', $token) && $this->lookAhead !== '"' && (substr_count($token, '"') % 2 == 0)) {
+            // If it's a string (of maximum 255 characters)
+            return $token;
+        }
+        // If it's an error code
+        if (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token === '#N/A') {
+            return $token;
+        }
+        // if it's a function call
+        if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $token) && ($this->lookAhead === '(')) {
+            return $token;
+        }
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
+            return $token;
+        }
+        if (preg_match('/^true$/i', $token) && ($this->lookAhead === ')' || $this->lookAhead === ',')) {
+            return $token;
+        }
+        if (preg_match('/^false$/i', $token) && ($this->lookAhead === ')' || $this->lookAhead === ',')) {
+            return $token;
+        }
+        if (str_ends_with($token, ')')) {
+            //    It's an argument of some description (e.g. a named range),
+            //        precise nature yet to be determined
+            return $token;
+        }
+
+        return '';
+    }
+
+    /**
+     * The parsing method. It parses a formula.
+     *
+     * @param string $formula the formula to parse, without the initial equal
+     *                        sign (=)
+     *
+     * @return bool true on success
+     */
+    public function parse(string $formula): bool
+    {
+        $this->currentCharacter = 0;
+        $this->formula = (string) $formula;
+        $this->lookAhead = $formula[1] ?? '';
+        $this->advance();
+        $this->parseTree = $this->condition();
+
+        return true;
+    }
+
+    /**
+     * It parses a condition. It assumes the following rule:
+     * Cond -> Expr [(">" | "<") Expr].
+     *
+     * @return array The parsed ptg'd tree on success
+     */
+    private function condition(): array
+    {
+        $result = $this->expression();
+        if ($this->currentToken == '<') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgLT', $result, $result2);
+        } elseif ($this->currentToken == '>') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgGT', $result, $result2);
+        } elseif ($this->currentToken == '<=') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgLE', $result, $result2);
+        } elseif ($this->currentToken == '>=') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgGE', $result, $result2);
+        } elseif ($this->currentToken == '=') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgEQ', $result, $result2);
+        } elseif ($this->currentToken == '<>') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgNE', $result, $result2);
+        }
+
+        return $result;
+    }
+
+    /**
+     * It parses a expression. It assumes the following rule:
+     * Expr -> Term [("+" | "-") Term]
+     *      -> "string"
+     *      -> "-" Term : Negative value
+     *      -> "+" Term : Positive value
+     *      -> Error code.
+     *
+     * @return array The parsed ptg'd tree on success
+     */
+    private function expression(): array
+    {
+        // If it's a string return a string node
+        if (preg_match('/"([^"]|""){0,255}"/', $this->currentToken)) {
+            $tmp = str_replace('""', '"', $this->currentToken);
+            if (($tmp == '"') || ($tmp == '')) {
+                //    Trap for "" that has been used for an empty string
+                $tmp = '""';
+            }
+            $result = $this->createTree($tmp, '', '');
+            $this->advance();
+
+            return $result;
+        } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $this->currentToken) || $this->currentToken == '#N/A') { // error code
+            $result = $this->createTree($this->currentToken, 'ptgErr', '');
+            $this->advance();
+
+            return $result;
+        } elseif ($this->currentToken == '-') { // negative value
+            // catch "-" Term
+            $this->advance();
+            $result2 = $this->expression();
+
+            return $this->createTree('ptgUminus', $result2, '');
+        } elseif ($this->currentToken == '+') { // positive value
+            // catch "+" Term
+            $this->advance();
+            $result2 = $this->expression();
+
+            return $this->createTree('ptgUplus', $result2, '');
+        }
+        $result = $this->term();
+        while ($this->currentToken === '&') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgConcat', $result, $result2);
+        }
+        while (
+            ($this->currentToken == '+')
+            || ($this->currentToken == '-')
+            || ($this->currentToken == '^')
+        ) {
+            if ($this->currentToken == '+') {
+                $this->advance();
+                $result2 = $this->term();
+                $result = $this->createTree('ptgAdd', $result, $result2);
+            } elseif ($this->currentToken == '-') {
+                $this->advance();
+                $result2 = $this->term();
+                $result = $this->createTree('ptgSub', $result, $result2);
+            } else {
+                $this->advance();
+                $result2 = $this->term();
+                $result = $this->createTree('ptgPower', $result, $result2);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * This function just introduces a ptgParen element in the tree, so that Excel
+     * doesn't get confused when working with a parenthesized formula afterwards.
+     *
+     * @return array The parsed ptg'd tree
+     *
+     * @see fact()
+     */
+    private function parenthesizedExpression(): array
+    {
+        return $this->createTree('ptgParen', $this->expression(), '');
+    }
+
+    /**
+     * It parses a term. It assumes the following rule:
+     * Term -> Fact [("*" | "/") Fact].
+     *
+     * @return array The parsed ptg'd tree on success
+     */
+    private function term(): array
+    {
+        $result = $this->fact();
+        while (
+            ($this->currentToken == '*')
+            || ($this->currentToken == '/')
+        ) {
+            if ($this->currentToken == '*') {
+                $this->advance();
+                $result2 = $this->fact();
+                $result = $this->createTree('ptgMul', $result, $result2);
+            } else {
+                $this->advance();
+                $result2 = $this->fact();
+                $result = $this->createTree('ptgDiv', $result, $result2);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * It parses a factor. It assumes the following rule:
+     * Fact -> ( Expr )
+     *       | CellRef
+     *       | CellRange
+     *       | Number
+     *       | Function.
+     *
+     * @return array The parsed ptg'd tree on success
+     */
+    private function fact(): array
+    {
+        $currentToken = $this->currentToken;
+        if ($currentToken === '(') {
+            $this->advance(); // eat the "("
+            $result = $this->parenthesizedExpression();
+            if ($this->currentToken !== ')') {
+                throw new WriterException("')' token expected.");
+            }
+            $this->advance(); // eat the ")"
+
+            return $result;
+        }
+        // if it's a reference
+        if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?\d+$/', $this->currentToken)) {
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+
+            return $result;
+        }
+        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $this->currentToken)) {
+            // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+
+            return $result;
+        }
+        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $this->currentToken)) {
+            // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+
+            return $result;
+        }
+        if (
+            preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken)
+            || preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken)
+        ) {
+            // if it's a range A1:B2 or $A$1:$B$2
+            // must be an error?
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+
+            return $result;
+        }
+        if (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?([A-Ia-i]?[A-Za-z])?\$?\\d+:\$?([A-Ia-i]?[A-Za-z])?\$?\\d+$/u', $this->currentToken)) {
+            // If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2)
+            // must be an error?
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+
+            return $result;
+        }
+        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+:\\$?([A-Ia-i]?[A-Za-z])?\\$?\\d+$/u", $this->currentToken)) {
+            // If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2)
+            // must be an error?
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+
+            return $result;
+        }
+        if (is_numeric($this->currentToken)) {
+            // If it's a number or a percent
+            if ($this->lookAhead === '%') {
+                $result = $this->createTree('ptgPercent', $this->currentToken, '');
+                $this->advance(); // Skip the percentage operator once we've pre-built that tree
+            } else {
+                $result = $this->createTree($this->currentToken, '', '');
+            }
+            $this->advance();
+
+            return $result;
+        }
+        if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken) && ($this->lookAhead === '(')) {
+            // if it's a function call
+            return $this->func();
+        }
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $this->currentToken) && $this->spreadsheet->getDefinedName($this->currentToken) !== null) {
+            $result = $this->createTree('ptgName', $this->currentToken, '');
+            $this->advance();
+
+            return $result;
+        }
+        if (preg_match('/^true|false$/i', $this->currentToken)) {
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+
+            return $result;
+        }
+
+        throw new WriterException('Syntax error: ' . $this->currentToken . ', lookahead: ' . $this->lookAhead . ', current char: ' . $this->currentCharacter);
+    }
+
+    /**
+     * It parses a function call. It assumes the following rule:
+     * Func -> ( Expr [,Expr]* ).
+     *
+     * @return array The parsed ptg'd tree on success
+     */
+    private function func(): array
+    {
+        $num_args = 0; // number of arguments received
+        $function = strtoupper($this->currentToken);
+        $result = ''; // initialize result
+        $this->advance();
+        $this->advance(); // eat the "("
+        while ($this->currentToken !== ')') {
+            if ($num_args > 0) {
+                if ($this->currentToken === ',' || $this->currentToken === ';') {
+                    $this->advance(); // eat the "," or ";"
+                } else {
+                    throw new WriterException("Syntax error: comma expected in function $function, arg #{$num_args}");
+                }
+                $result2 = $this->condition();
+                $result = $this->createTree('arg', $result, $result2);
+            } else { // first argument
+                $result2 = $this->condition();
+                $result = $this->createTree('arg', '', $result2);
+            }
+            ++$num_args;
+        }
+        if (!isset($this->functions[$function])) {
+            throw new WriterException("Function $function() doesn't exist");
+        }
+        $args = $this->functions[$function][1];
+        // If fixed number of args eg. TIME($i, $j, $k). Check that the number of args is valid.
+        if (($args >= 0) && ($args != $num_args)) {
+            throw new WriterException("Incorrect number of arguments in function $function() ");
+        }
+
+        $result = $this->createTree($function, $result, $num_args);
+        $this->advance(); // eat the ")"
+
+        return $result;
+    }
+
+    /**
+     * Creates a tree. In fact an array which may have one or two arrays (sub-trees)
+     * as elements.
+     *
+     * @param mixed $value the value of this node
+     * @param mixed $left the left array (sub-tree) or a final node
+     * @param mixed $right the right array (sub-tree) or a final node
+     *
+     * @return array A tree
+     */
+    private function createTree(mixed $value, mixed $left, mixed $right): array
+    {
+        return ['value' => $value, 'left' => $left, 'right' => $right];
+    }
+
+    /**
+     * Builds a string containing the tree in reverse polish notation (What you
+     * would use in a HP calculator stack).
+     * The following tree:.
+     *
+     *    +
+     *   / \
+     *  2   3
+     *
+     * produces: "23+"
+     *
+     * The following tree:
+     *
+     *    +
+     *   / \
+     *  3   *
+     *     / \
+     *    6   A1
+     *
+     * produces: "36A1*+"
+     *
+     * In fact all operands, functions, references, etc... are written as ptg's
+     *
+     * @param array $tree the optional tree to convert
+     *
+     * @return string The tree in reverse polish notation
+     */
+    public function toReversePolish(array $tree = []): string
+    {
+        $polish = ''; // the string we are going to return
+        if (empty($tree)) { // If it's the first call use parseTree
+            $tree = $this->parseTree;
+        }
+        if (!is_array($tree) || !isset($tree['left'], $tree['right'], $tree['value'])) {
+            throw new WriterException('Unexpected non-array');
+        }
+
+        if (is_array($tree['left'])) {
+            $converted_tree = $this->toReversePolish($tree['left']);
+            $polish .= $converted_tree;
+        } elseif ($tree['left'] != '') { // It's a final node
+            $converted_tree = $this->convert($tree['left']);
+            $polish .= $converted_tree;
+        }
+        if (is_array($tree['right'])) {
+            $converted_tree = $this->toReversePolish($tree['right']);
+            $polish .= $converted_tree;
+        } elseif ($tree['right'] != '') { // It's a final node
+            $converted_tree = $this->convert($tree['right']);
+            $polish .= $converted_tree;
+        }
+        // if it's a function convert it here (so we can set it's arguments)
+        if (
+            preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/", $tree['value'])
+            && !preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value'])
+            && !preg_match('/^[A-Ia-i]?[A-Za-z](\\d+)\\.\\.[A-Ia-i]?[A-Za-z](\\d+)$/', $tree['value'])
+            && !is_numeric($tree['value'])
+            && !isset($this->ptg[$tree['value']])
+        ) {
+            // left subtree for a function is always an array.
+            if ($tree['left'] != '') {
+                $left_tree = $this->toReversePolish($tree['left']);
+            } else {
+                $left_tree = '';
+            }
+
+            // add its left subtree and return.
+            return $left_tree . $this->convertFunction($tree['value'], $tree['right']);
+        }
+        $converted_tree = $this->convert($tree['value']);
+
+        return $polish . $converted_tree;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php
new file mode 100644
index 00000000..81da6353
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+class CellAlignment
+{
+    /**
+     * @var array<string, int>
+     */
+    private static array $horizontalMap = [
+        Alignment::HORIZONTAL_GENERAL => 0,
+        Alignment::HORIZONTAL_LEFT => 1,
+        Alignment::HORIZONTAL_RIGHT => 3,
+        Alignment::HORIZONTAL_CENTER => 2,
+        Alignment::HORIZONTAL_CENTER_CONTINUOUS => 6,
+        Alignment::HORIZONTAL_JUSTIFY => 5,
+    ];
+
+    /**
+     * @var array<string, int>
+     */
+    private static array $verticalMap = [
+        Alignment::VERTICAL_BOTTOM => 2,
+        Alignment::VERTICAL_TOP => 0,
+        Alignment::VERTICAL_CENTER => 1,
+        Alignment::VERTICAL_JUSTIFY => 3,
+    ];
+
+    public static function horizontal(Alignment $alignment): int
+    {
+        $horizontalAlignment = $alignment->getHorizontal();
+
+        if (is_string($horizontalAlignment) && array_key_exists($horizontalAlignment, self::$horizontalMap)) {
+            return self::$horizontalMap[$horizontalAlignment];
+        }
+
+        return self::$horizontalMap[Alignment::HORIZONTAL_GENERAL];
+    }
+
+    public static function wrap(Alignment $alignment): int
+    {
+        $wrap = $alignment->getWrapText();
+
+        return ($wrap === true) ? 1 : 0;
+    }
+
+    public static function vertical(Alignment $alignment): int
+    {
+        $verticalAlignment = $alignment->getVertical();
+
+        if (is_string($verticalAlignment) && array_key_exists($verticalAlignment, self::$verticalMap)) {
+            return self::$verticalMap[$verticalAlignment];
+        }
+
+        return self::$verticalMap[Alignment::VERTICAL_BOTTOM];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php
new file mode 100644
index 00000000..e97a1f79
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Border;
+
+class CellBorder
+{
+    /**
+     * @var array<string, int>
+     */
+    protected static array $styleMap = [
+        Border::BORDER_NONE => 0x00,
+        Border::BORDER_THIN => 0x01,
+        Border::BORDER_MEDIUM => 0x02,
+        Border::BORDER_DASHED => 0x03,
+        Border::BORDER_DOTTED => 0x04,
+        Border::BORDER_THICK => 0x05,
+        Border::BORDER_DOUBLE => 0x06,
+        Border::BORDER_HAIR => 0x07,
+        Border::BORDER_MEDIUMDASHED => 0x08,
+        Border::BORDER_DASHDOT => 0x09,
+        Border::BORDER_MEDIUMDASHDOT => 0x0A,
+        Border::BORDER_DASHDOTDOT => 0x0B,
+        Border::BORDER_MEDIUMDASHDOTDOT => 0x0C,
+        Border::BORDER_SLANTDASHDOT => 0x0D,
+        Border::BORDER_OMIT => 0x00,
+    ];
+
+    public static function style(Border $border): int
+    {
+        $borderStyle = $border->getBorderStyle();
+
+        if (is_string($borderStyle) && array_key_exists($borderStyle, self::$styleMap)) {
+            return self::$styleMap[$borderStyle];
+        }
+
+        return self::$styleMap[Border::BORDER_NONE];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php
new file mode 100644
index 00000000..a0a932a9
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+class CellFill
+{
+    /**
+     * @var array<string, int>
+     */
+    protected static array $fillStyleMap = [
+        Fill::FILL_NONE => 0x00,
+        Fill::FILL_SOLID => 0x01,
+        Fill::FILL_PATTERN_MEDIUMGRAY => 0x02,
+        Fill::FILL_PATTERN_DARKGRAY => 0x03,
+        Fill::FILL_PATTERN_LIGHTGRAY => 0x04,
+        Fill::FILL_PATTERN_DARKHORIZONTAL => 0x05,
+        Fill::FILL_PATTERN_DARKVERTICAL => 0x06,
+        Fill::FILL_PATTERN_DARKDOWN => 0x07,
+        Fill::FILL_PATTERN_DARKUP => 0x08,
+        Fill::FILL_PATTERN_DARKGRID => 0x09,
+        Fill::FILL_PATTERN_DARKTRELLIS => 0x0A,
+        Fill::FILL_PATTERN_LIGHTHORIZONTAL => 0x0B,
+        Fill::FILL_PATTERN_LIGHTVERTICAL => 0x0C,
+        Fill::FILL_PATTERN_LIGHTDOWN => 0x0D,
+        Fill::FILL_PATTERN_LIGHTUP => 0x0E,
+        Fill::FILL_PATTERN_LIGHTGRID => 0x0F,
+        Fill::FILL_PATTERN_LIGHTTRELLIS => 0x10,
+        Fill::FILL_PATTERN_GRAY125 => 0x11,
+        Fill::FILL_PATTERN_GRAY0625 => 0x12,
+        Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8
+        Fill::FILL_GRADIENT_PATH => 0x00,   // does not exist in BIFF8
+    ];
+
+    public static function style(Fill $fill): int
+    {
+        $fillStyle = $fill->getFillType();
+
+        if (is_string($fillStyle) && array_key_exists($fillStyle, self::$fillStyleMap)) {
+            return self::$fillStyleMap[$fillStyle];
+        }
+
+        return self::$fillStyleMap[Fill::FILL_NONE];
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php
new file mode 100644
index 00000000..209d13bc
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Color;
+
+/*
+ * Static array incorrectly used by Xls Writer for Conditional Styles.
+ *
+ * @deprecated since version 2.2
+ *
+ * @codecoverageignore
+ */
+
+class ColorMap
+{
+    /**
+     * @var array<string, int>
+     */
+    private static array $colorMap = [
+        '#000000' => 0x08,
+        '#FFFFFF' => 0x09,
+        '#FF0000' => 0x0A,
+        '#00FF00' => 0x0B,
+        '#0000FF' => 0x0C,
+        '#FFFF00' => 0x0D,
+        '#FF00FF' => 0x0E,
+        '#00FFFF' => 0x0F,
+        '#800000' => 0x10,
+        '#008000' => 0x11,
+        '#000080' => 0x12,
+        '#808000' => 0x13,
+        '#800080' => 0x14,
+        '#008080' => 0x15,
+        '#C0C0C0' => 0x16,
+        '#808080' => 0x17,
+        '#9999FF' => 0x18,
+        '#993366' => 0x19,
+        '#FFFFCC' => 0x1A,
+        '#CCFFFF' => 0x1B,
+        '#660066' => 0x1C,
+        '#FF8080' => 0x1D,
+        '#0066CC' => 0x1E,
+        '#CCCCFF' => 0x1F,
+        //        '#000080' => 0x20,
+        //        '#FF00FF' => 0x21,
+        //        '#FFFF00' => 0x22,
+        //        '#00FFFF' => 0x23,
+        //        '#800080' => 0x24,
+        //        '#800000' => 0x25,
+        //        '#008080' => 0x26,
+        //        '#0000FF' => 0x27,
+        '#00CCFF' => 0x28,
+        //        '#CCFFFF' => 0x29,
+        '#CCFFCC' => 0x2A,
+        '#FFFF99' => 0x2B,
+        '#99CCFF' => 0x2C,
+        '#FF99CC' => 0x2D,
+        '#CC99FF' => 0x2E,
+        '#FFCC99' => 0x2F,
+        '#3366FF' => 0x30,
+        '#33CCCC' => 0x31,
+        '#99CC00' => 0x32,
+        '#FFCC00' => 0x33,
+        '#FF9900' => 0x34,
+        '#FF6600' => 0x35,
+        '#666699' => 0x36,
+        '#969696' => 0x37,
+        '#003366' => 0x38,
+        '#339966' => 0x39,
+        '#003300' => 0x3A,
+        '#333300' => 0x3B,
+        '#993300' => 0x3C,
+        //        '#993366' => 0x3D,
+        '#333399' => 0x3E,
+        '#333333' => 0x3F,
+    ];
+
+    public static function lookup(Color $color, int $defaultIndex = 0x00): int
+    {
+        $colorRgb = strtoupper($color->getRGB());
+        if (is_string($colorRgb) && array_key_exists("#{$colorRgb}", self::$colorMap)) {
+            return self::$colorMap["#{$colorRgb}"];
+        }
+
+//      TODO Try and map RGB value to nearest colour within the define pallette
+//        $red =  Color::getRed($colorRgb, false);
+//        $green = Color::getGreen($colorRgb, false);
+//        $blue = Color::getBlue($colorRgb, false);
+
+//        $paletteSpace = 3;
+//        $newColor = ($red * $paletteSpace / 256) * ($paletteSpace * $paletteSpace) +
+//            ($green * $paletteSpace / 256) * $paletteSpace +
+//            ($blue * $paletteSpace / 256);
+
+        return $defaultIndex;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php
new file mode 100644
index 00000000..a1a5faf8
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php
@@ -0,0 +1,1135 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_Workbook (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// /*
+// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
+// *
+// *  The majority of this is _NOT_ my code.  I simply ported it from the
+// *  PERL Spreadsheet::WriteExcel module.
+// *
+// *  The author of the Spreadsheet::WriteExcel module is John McNamara
+// *  <jmcnamara@cpan.org>
+// *
+// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
+// *  porting of this code to PHP.  Any questions directly related to this
+// *  class library should be directed to me.
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class Workbook extends BIFFwriter
+{
+    /**
+     * Formula parser.
+     */
+    private Parser $parser;
+
+    /*
+     * The BIFF file size for the workbook. Not currently used.
+     *
+     * @see calcSheetOffsets()
+     */
+    //private int $biffSize;
+
+    /**
+     * XF Writers.
+     *
+     * @var Xf[]
+     */
+    private array $xfWriters = [];
+
+    /**
+     * Array containing the colour palette.
+     */
+    private array $palette;
+
+    /**
+     * The codepage indicates the text encoding used for strings.
+     */
+    private int $codepage;
+
+    /**
+     * The country code used for localization.
+     */
+    private int $countryCode;
+
+    /**
+     * Workbook.
+     */
+    private Spreadsheet $spreadsheet;
+
+    /**
+     * Fonts writers.
+     *
+     * @var Font[]
+     */
+    private array $fontWriters = [];
+
+    /**
+     * Added fonts. Maps from font's hash => index in workbook.
+     */
+    private array $addedFonts = [];
+
+    /**
+     * Shared number formats.
+     */
+    private array $numberFormats = [];
+
+    /**
+     * Added number formats. Maps from numberFormat's hash => index in workbook.
+     */
+    private array $addedNumberFormats = [];
+
+    /**
+     * Sizes of the binary worksheet streams.
+     */
+    private array $worksheetSizes = [];
+
+    /**
+     * Offsets of the binary worksheet streams relative to the start of the global workbook stream.
+     */
+    private array $worksheetOffsets = [];
+
+    /**
+     * Total number of shared strings in workbook.
+     */
+    private int $stringTotal;
+
+    /**
+     * Number of unique shared strings in workbook.
+     */
+    private int $stringUnique;
+
+    /**
+     * Array of unique shared strings in workbook.
+     */
+    private array $stringTable;
+
+    /**
+     * Color cache.
+     */
+    private array $colors;
+
+    /**
+     * Escher object corresponding to MSODRAWINGGROUP.
+     */
+    private ?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher = null;
+
+    /**
+     * Class constructor.
+     *
+     * @param Spreadsheet $spreadsheet The Workbook
+     * @param int $str_total Total number of strings
+     * @param int $str_unique Total number of unique strings
+     * @param array $str_table String Table
+     * @param array $colors Colour Table
+     * @param Parser $parser The formula parser created for the Workbook
+     */
+    public function __construct(Spreadsheet $spreadsheet, int &$str_total, int &$str_unique, array &$str_table, array &$colors, Parser $parser)
+    {
+        // It needs to call its parent's constructor explicitly
+        parent::__construct();
+
+        $this->parser = $parser;
+        //$this->biffSize = 0;
+        $this->palette = [];
+        $this->countryCode = -1;
+
+        $this->stringTotal = &$str_total;
+        $this->stringUnique = &$str_unique;
+        $this->stringTable = &$str_table;
+        $this->colors = &$colors;
+        $this->setPaletteXl97();
+
+        $this->spreadsheet = $spreadsheet;
+
+        $this->codepage = 0x04B0;
+
+        // Add empty sheets and Build color cache
+        $countSheets = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $countSheets; ++$i) {
+            $phpSheet = $spreadsheet->getSheet($i);
+
+            $this->parser->setExtSheet($phpSheet->getTitle(), $i); // Register worksheet name with parser
+
+            $supbook_index = 0x00;
+            $ref = pack('vvv', $supbook_index, $i, $i);
+            $this->parser->references[] = $ref; // Register reference with parser
+
+            // Sheet tab colors?
+            if ($phpSheet->isTabColorSet()) {
+                $this->addColor($phpSheet->getTabColor()->getRGB());
+            }
+        }
+    }
+
+    /**
+     * Add a new XF writer.
+     *
+     * @param bool $isStyleXf Is it a style XF?
+     *
+     * @return int Index to XF record
+     */
+    public function addXfWriter(Style $style, bool $isStyleXf = false): int
+    {
+        $xfWriter = new Xf($style);
+        $xfWriter->setIsStyleXf($isStyleXf);
+
+        // Add the font if not already added
+        $fontIndex = $this->addFont($style->getFont());
+
+        // Assign the font index to the xf record
+        $xfWriter->setFontIndex($fontIndex);
+
+        // Background colors, best to treat these after the font so black will come after white in custom palette
+        $xfWriter->setFgColor($this->addColor($style->getFill()->getStartColor()->getRGB()));
+        $xfWriter->setBgColor($this->addColor($style->getFill()->getEndColor()->getRGB()));
+        $xfWriter->setBottomColor($this->addColor($style->getBorders()->getBottom()->getColor()->getRGB()));
+        $xfWriter->setTopColor($this->addColor($style->getBorders()->getTop()->getColor()->getRGB()));
+        $xfWriter->setRightColor($this->addColor($style->getBorders()->getRight()->getColor()->getRGB()));
+        $xfWriter->setLeftColor($this->addColor($style->getBorders()->getLeft()->getColor()->getRGB()));
+        $xfWriter->setDiagColor($this->addColor($style->getBorders()->getDiagonal()->getColor()->getRGB()));
+
+        // Add the number format if it is not a built-in one and not already added
+        if ($style->getNumberFormat()->getBuiltInFormatCode() === false) {
+            $numberFormatHashCode = $style->getNumberFormat()->getHashCode();
+
+            if (isset($this->addedNumberFormats[$numberFormatHashCode])) {
+                $numberFormatIndex = $this->addedNumberFormats[$numberFormatHashCode];
+            } else {
+                $numberFormatIndex = 164 + count($this->numberFormats);
+                $this->numberFormats[$numberFormatIndex] = $style->getNumberFormat();
+                $this->addedNumberFormats[$numberFormatHashCode] = $numberFormatIndex;
+            }
+        } else {
+            $numberFormatIndex = (int) $style->getNumberFormat()->getBuiltInFormatCode();
+        }
+
+        // Assign the number format index to xf record
+        $xfWriter->setNumberFormatIndex($numberFormatIndex);
+
+        $this->xfWriters[] = $xfWriter;
+
+        return count($this->xfWriters) - 1;
+    }
+
+    /**
+     * Add a font to added fonts.
+     *
+     * @return int Index to FONT record
+     */
+    public function addFont(\PhpOffice\PhpSpreadsheet\Style\Font $font): int
+    {
+        $fontHashCode = $font->getHashCode();
+        if (isset($this->addedFonts[$fontHashCode])) {
+            $fontIndex = $this->addedFonts[$fontHashCode];
+        } else {
+            $countFonts = count($this->fontWriters);
+            $fontIndex = ($countFonts < 4) ? $countFonts : $countFonts + 1;
+
+            $fontWriter = new Font($font);
+            $fontWriter->setColorIndex($this->addColor($font->getColor()->getRGB()));
+            $this->fontWriters[] = $fontWriter;
+
+            $this->addedFonts[$fontHashCode] = $fontIndex;
+        }
+
+        return $fontIndex;
+    }
+
+    /**
+     * Alter color palette adding a custom color.
+     *
+     * @param string $rgb E.g. 'FF00AA'
+     *
+     * @return int Color index
+     */
+    public function addColor(string $rgb, int $default = 0): int
+    {
+        if (!isset($this->colors[$rgb])) {
+            $color
+                = [
+                    hexdec(substr($rgb, 0, 2)),
+                    hexdec(substr($rgb, 2, 2)),
+                    hexdec(substr($rgb, 4)),
+                    0,
+                ];
+            $colorIndex = array_search($color, $this->palette);
+            if ($colorIndex) {
+                $this->colors[$rgb] = $colorIndex;
+            } else {
+                if (count($this->colors) === 0) {
+                    $lastColor = 7;
+                } else {
+                    $lastColor = end($this->colors);
+                }
+                if ($lastColor < 57) {
+                    // then we add a custom color altering the palette
+                    $colorIndex = $lastColor + 1;
+                    $this->palette[$colorIndex] = $color;
+                    $this->colors[$rgb] = $colorIndex;
+                } else {
+                    // no room for more custom colors, just map to black
+                    $colorIndex = $default;
+                }
+            }
+        } else {
+            // fetch already added custom color
+            $colorIndex = $this->colors[$rgb];
+        }
+
+        return $colorIndex;
+    }
+
+    /**
+     * Sets the colour palette to the Excel 97+ default.
+     */
+    private function setPaletteXl97(): void
+    {
+        $this->palette = [
+            0x08 => [0x00, 0x00, 0x00, 0x00],
+            0x09 => [0xFF, 0xFF, 0xFF, 0x00],
+            0x0A => [0xFF, 0x00, 0x00, 0x00],
+            0x0B => [0x00, 0xFF, 0x00, 0x00],
+            0x0C => [0x00, 0x00, 0xFF, 0x00],
+            0x0D => [0xFF, 0xFF, 0x00, 0x00],
+            0x0E => [0xFF, 0x00, 0xFF, 0x00],
+            0x0F => [0x00, 0xFF, 0xFF, 0x00],
+            0x10 => [0x80, 0x00, 0x00, 0x00],
+            0x11 => [0x00, 0x80, 0x00, 0x00],
+            0x12 => [0x00, 0x00, 0x80, 0x00],
+            0x13 => [0x80, 0x80, 0x00, 0x00],
+            0x14 => [0x80, 0x00, 0x80, 0x00],
+            0x15 => [0x00, 0x80, 0x80, 0x00],
+            0x16 => [0xC0, 0xC0, 0xC0, 0x00],
+            0x17 => [0x80, 0x80, 0x80, 0x00],
+            0x18 => [0x99, 0x99, 0xFF, 0x00],
+            0x19 => [0x99, 0x33, 0x66, 0x00],
+            0x1A => [0xFF, 0xFF, 0xCC, 0x00],
+            0x1B => [0xCC, 0xFF, 0xFF, 0x00],
+            0x1C => [0x66, 0x00, 0x66, 0x00],
+            0x1D => [0xFF, 0x80, 0x80, 0x00],
+            0x1E => [0x00, 0x66, 0xCC, 0x00],
+            0x1F => [0xCC, 0xCC, 0xFF, 0x00],
+            0x20 => [0x00, 0x00, 0x80, 0x00],
+            0x21 => [0xFF, 0x00, 0xFF, 0x00],
+            0x22 => [0xFF, 0xFF, 0x00, 0x00],
+            0x23 => [0x00, 0xFF, 0xFF, 0x00],
+            0x24 => [0x80, 0x00, 0x80, 0x00],
+            0x25 => [0x80, 0x00, 0x00, 0x00],
+            0x26 => [0x00, 0x80, 0x80, 0x00],
+            0x27 => [0x00, 0x00, 0xFF, 0x00],
+            0x28 => [0x00, 0xCC, 0xFF, 0x00],
+            0x29 => [0xCC, 0xFF, 0xFF, 0x00],
+            0x2A => [0xCC, 0xFF, 0xCC, 0x00],
+            0x2B => [0xFF, 0xFF, 0x99, 0x00],
+            0x2C => [0x99, 0xCC, 0xFF, 0x00],
+            0x2D => [0xFF, 0x99, 0xCC, 0x00],
+            0x2E => [0xCC, 0x99, 0xFF, 0x00],
+            0x2F => [0xFF, 0xCC, 0x99, 0x00],
+            0x30 => [0x33, 0x66, 0xFF, 0x00],
+            0x31 => [0x33, 0xCC, 0xCC, 0x00],
+            0x32 => [0x99, 0xCC, 0x00, 0x00],
+            0x33 => [0xFF, 0xCC, 0x00, 0x00],
+            0x34 => [0xFF, 0x99, 0x00, 0x00],
+            0x35 => [0xFF, 0x66, 0x00, 0x00],
+            0x36 => [0x66, 0x66, 0x99, 0x00],
+            0x37 => [0x96, 0x96, 0x96, 0x00],
+            0x38 => [0x00, 0x33, 0x66, 0x00],
+            0x39 => [0x33, 0x99, 0x66, 0x00],
+            0x3A => [0x00, 0x33, 0x00, 0x00],
+            0x3B => [0x33, 0x33, 0x00, 0x00],
+            0x3C => [0x99, 0x33, 0x00, 0x00],
+            0x3D => [0x99, 0x33, 0x66, 0x00],
+            0x3E => [0x33, 0x33, 0x99, 0x00],
+            0x3F => [0x33, 0x33, 0x33, 0x00],
+        ];
+    }
+
+    /**
+     * Assemble worksheets into a workbook and send the BIFF data to an OLE
+     * storage.
+     *
+     * @param array $worksheetSizes The sizes in bytes of the binary worksheet streams
+     *
+     * @return string Binary data for workbook stream
+     */
+    public function writeWorkbook(array $worksheetSizes): string
+    {
+        $this->worksheetSizes = $worksheetSizes;
+
+        // Calculate the number of selected worksheet tabs and call the finalization
+        // methods for each worksheet
+        $total_worksheets = $this->spreadsheet->getSheetCount();
+
+        // Add part 1 of the Workbook globals, what goes before the SHEET records
+        $this->storeBof(0x0005);
+        $this->writeCodepage();
+        $this->writeWindow1();
+
+        $this->writeDateMode();
+        $this->writeAllFonts();
+        $this->writeAllNumberFormats();
+        $this->writeAllXfs();
+        $this->writeAllStyles();
+        $this->writePalette();
+
+        // Prepare part 3 of the workbook global stream, what goes after the SHEET records
+        $part3 = '';
+        if ($this->countryCode !== -1) {
+            $part3 .= $this->writeCountry();
+        }
+        $part3 .= $this->writeRecalcId();
+
+        $part3 .= $this->writeSupbookInternal();
+        /* TODO: store external SUPBOOK records and XCT and CRN records
+        in case of external references for BIFF8 */
+        $part3 .= $this->writeExternalsheetBiff8();
+        $part3 .= $this->writeAllDefinedNamesBiff8();
+        $part3 .= $this->writeMsoDrawingGroup();
+        $part3 .= $this->writeSharedStringsTable();
+
+        $part3 .= $this->writeEof();
+
+        // Add part 2 of the Workbook globals, the SHEET records
+        $this->calcSheetOffsets();
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $this->writeBoundSheet($this->spreadsheet->getSheet($i), $this->worksheetOffsets[$i]);
+        }
+
+        // Add part 3 of the Workbook globals
+        $this->_data .= $part3;
+
+        return $this->_data;
+    }
+
+    /**
+     * Calculate offsets for Worksheet BOF records.
+     */
+    private function calcSheetOffsets(): void
+    {
+        $boundsheet_length = 10; // fixed length for a BOUNDSHEET record
+
+        // size of Workbook globals part 1 + 3
+        $offset = $this->_datasize;
+
+        // add size of Workbook globals part 2, the length of the SHEET records
+        $total_worksheets = count($this->spreadsheet->getAllSheets());
+        foreach ($this->spreadsheet->getWorksheetIterator() as $sheet) {
+            $offset += $boundsheet_length + strlen(StringHelper::UTF8toBIFF8UnicodeShort($sheet->getTitle()));
+        }
+
+        // add the sizes of each of the Sheet substreams, respectively
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $this->worksheetOffsets[$i] = $offset;
+            $offset += $this->worksheetSizes[$i];
+        }
+        //$this->biffSize = $offset;
+    }
+
+    /**
+     * Store the Excel FONT records.
+     */
+    private function writeAllFonts(): void
+    {
+        foreach ($this->fontWriters as $fontWriter) {
+            $this->append($fontWriter->writeFont());
+        }
+    }
+
+    /**
+     * Store user defined numerical formats i.e. FORMAT records.
+     */
+    private function writeAllNumberFormats(): void
+    {
+        foreach ($this->numberFormats as $numberFormatIndex => $numberFormat) {
+            $this->writeNumberFormat($numberFormat->getFormatCode(), $numberFormatIndex);
+        }
+    }
+
+    /**
+     * Write all XF records.
+     */
+    private function writeAllXfs(): void
+    {
+        foreach ($this->xfWriters as $xfWriter) {
+            $this->append($xfWriter->writeXf());
+        }
+    }
+
+    /**
+     * Write all STYLE records.
+     */
+    private function writeAllStyles(): void
+    {
+        $this->writeStyle();
+    }
+
+    private function parseDefinedNameValue(DefinedName $definedName): string
+    {
+        $definedRange = $definedName->getValue();
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF . '/mui',
+            $definedRange,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
+                    // We should have a worksheet
+                    $worksheet = $definedName->getWorksheet() ? $definedName->getWorksheet()->getTitle() : null;
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'!";
+            }
+
+            if (!empty($column)) {
+                $newRange .= "\${$column}";
+            }
+            if (!empty($row)) {
+                $newRange .= "\${$row}";
+            }
+
+            $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
+        }
+
+        return $definedRange;
+    }
+
+    /**
+     * Writes all the DEFINEDNAME records (BIFF8).
+     * So far this is only used for repeating rows/columns (print titles) and print areas.
+     */
+    private function writeAllDefinedNamesBiff8(): string
+    {
+        $chunk = '';
+
+        // Named ranges
+        $definedNames = $this->spreadsheet->getDefinedNames();
+        if (count($definedNames) > 0) {
+            // Loop named ranges
+            foreach ($definedNames as $definedName) {
+                $range = $this->parseDefinedNameValue($definedName);
+
+                // parse formula
+                try {
+                    $this->parser->parse($range);
+                    $formulaData = $this->parser->toReversePolish();
+
+                    // make sure tRef3d is of type tRef3dR (0x3A)
+                    if (isset($formulaData[0]) && ($formulaData[0] == "\x7A" || $formulaData[0] == "\x5A")) {
+                        $formulaData = "\x3A" . substr($formulaData, 1);
+                    }
+
+                    if ($definedName->getLocalOnly()) {
+                        // local scope
+                        $scopeWs = $definedName->getScope();
+                        $scope = ($scopeWs === null) ? 0 : ($this->spreadsheet->getIndex($scopeWs) + 1);
+                    } else {
+                        // global scope
+                        $scope = 0;
+                    }
+                    $chunk .= $this->writeData($this->writeDefinedNameBiff8($definedName->getName(), $formulaData, $scope, false));
+                } catch (PhpSpreadsheetException) {
+                    // do nothing
+                }
+            }
+        }
+
+        // total number of sheets
+        $total_worksheets = $this->spreadsheet->getSheetCount();
+
+        // write the print titles (repeating rows, columns), if any
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $sheetSetup = $this->spreadsheet->getSheet($i)->getPageSetup();
+            // simultaneous repeatColumns repeatRows
+            if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
+                $repeat = $sheetSetup->getColumnsToRepeatAtLeft();
+                $colmin = Coordinate::columnIndexFromString($repeat[0]) - 1;
+                $colmax = Coordinate::columnIndexFromString($repeat[1]) - 1;
+
+                $repeat = $sheetSetup->getRowsToRepeatAtTop();
+                $rowmin = $repeat[0] - 1;
+                $rowmax = $repeat[1] - 1;
+
+                // construct formula data manually
+                $formulaData = pack('Cv', 0x29, 0x17); // tMemFunc
+                $formulaData .= pack('Cvvvvv', 0x3B, $i, 0, 65535, $colmin, $colmax); // tArea3d
+                $formulaData .= pack('Cvvvvv', 0x3B, $i, $rowmin, $rowmax, 0, 255); // tArea3d
+                $formulaData .= pack('C', 0x10); // tList
+
+                // store the DEFINEDNAME record
+                $chunk .= $this->writeData($this->writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
+            } elseif ($sheetSetup->isColumnsToRepeatAtLeftSet() || $sheetSetup->isRowsToRepeatAtTopSet()) {
+                // (exclusive) either repeatColumns or repeatRows.
+                // Columns to repeat
+                if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
+                    $repeat = $sheetSetup->getColumnsToRepeatAtLeft();
+                    $colmin = Coordinate::columnIndexFromString($repeat[0]) - 1;
+                    $colmax = Coordinate::columnIndexFromString($repeat[1]) - 1;
+                } else {
+                    $colmin = 0;
+                    $colmax = 255;
+                }
+                // Rows to repeat
+                if ($sheetSetup->isRowsToRepeatAtTopSet()) {
+                    $repeat = $sheetSetup->getRowsToRepeatAtTop();
+                    $rowmin = $repeat[0] - 1;
+                    $rowmax = $repeat[1] - 1;
+                } else {
+                    $rowmin = 0;
+                    $rowmax = 65535;
+                }
+
+                // construct formula data manually because parser does not recognize absolute 3d cell references
+                $formulaData = pack('Cvvvvv', 0x3B, $i, $rowmin, $rowmax, $colmin, $colmax);
+
+                // store the DEFINEDNAME record
+                $chunk .= $this->writeData($this->writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
+            }
+        }
+
+        // write the print areas, if any
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $sheetSetup = $this->spreadsheet->getSheet($i)->getPageSetup();
+            if ($sheetSetup->isPrintAreaSet()) {
+                // Print area, e.g. A3:J6,H1:X20
+                $printArea = Coordinate::splitRange($sheetSetup->getPrintArea());
+                $countPrintArea = count($printArea);
+
+                $formulaData = '';
+                for ($j = 0; $j < $countPrintArea; ++$j) {
+                    $printAreaRect = $printArea[$j]; // e.g. A3:J6
+                    $printAreaRect[0] = Coordinate::indexesFromString($printAreaRect[0]);
+                    $printAreaRect[1] = Coordinate::indexesFromString($printAreaRect[1]);
+
+                    $print_rowmin = $printAreaRect[0][1] - 1;
+                    $print_rowmax = $printAreaRect[1][1] - 1;
+                    $print_colmin = $printAreaRect[0][0] - 1;
+                    $print_colmax = $printAreaRect[1][0] - 1;
+
+                    // construct formula data manually because parser does not recognize absolute 3d cell references
+                    $formulaData .= pack('Cvvvvv', 0x3B, $i, $print_rowmin, $print_rowmax, $print_colmin, $print_colmax);
+
+                    if ($j > 0) {
+                        $formulaData .= pack('C', 0x10); // list operator token ','
+                    }
+                }
+
+                // store the DEFINEDNAME record
+                $chunk .= $this->writeData($this->writeDefinedNameBiff8(pack('C', 0x06), $formulaData, $i + 1, true));
+            }
+        }
+
+        // write autofilters, if any
+        for ($i = 0; $i < $total_worksheets; ++$i) {
+            $sheetAutoFilter = $this->spreadsheet->getSheet($i)->getAutoFilter();
+            $autoFilterRange = $sheetAutoFilter->getRange();
+            if (!empty($autoFilterRange)) {
+                $rangeBounds = Coordinate::rangeBoundaries($autoFilterRange);
+
+                //Autofilter built in name
+                $name = pack('C', 0x0D);
+
+                $chunk .= $this->writeData($this->writeShortNameBiff8($name, $i + 1, $rangeBounds, true));
+            }
+        }
+
+        return $chunk;
+    }
+
+    /**
+     * Write a DEFINEDNAME record for BIFF8 using explicit binary formula data.
+     *
+     * @param string $name The name in UTF-8
+     * @param string $formulaData The binary formula data
+     * @param int $sheetIndex 1-based sheet index the defined name applies to. 0 = global
+     * @param bool $isBuiltIn Built-in name?
+     *
+     * @return string Complete binary record data
+     */
+    private function writeDefinedNameBiff8(string $name, string $formulaData, int $sheetIndex = 0, bool $isBuiltIn = false): string
+    {
+        $record = 0x0018;
+
+        // option flags
+        $options = $isBuiltIn ? 0x20 : 0x00;
+
+        // length of the name, character count
+        $nlen = StringHelper::countCharacters($name);
+
+        // name with stripped length field
+        $name = substr(StringHelper::UTF8toBIFF8UnicodeLong($name), 2);
+
+        // size of the formula (in bytes)
+        $sz = strlen($formulaData);
+
+        // combine the parts
+        $data = pack('vCCvvvCCCC', $options, 0, $nlen, $sz, 0, $sheetIndex, 0, 0, 0, 0)
+            . $name . $formulaData;
+        $length = strlen($data);
+
+        $header = pack('vv', $record, $length);
+
+        return $header . $data;
+    }
+
+    /**
+     * Write a short NAME record.
+     *
+     * @param int $sheetIndex 1-based sheet index the defined name applies to. 0 = global
+     * @param int[][] $rangeBounds range boundaries
+     *
+     * @return string Complete binary record data
+     * */
+    private function writeShortNameBiff8(string $name, int $sheetIndex, array $rangeBounds, bool $isHidden = false): string
+    {
+        $record = 0x0018;
+
+        // option flags
+        $options = ($isHidden ? 0x21 : 0x00);
+
+        $extra = pack(
+            'Cvvvvv',
+            0x3B,
+            $sheetIndex - 1,
+            $rangeBounds[0][1] - 1,
+            $rangeBounds[1][1] - 1,
+            $rangeBounds[0][0] - 1,
+            $rangeBounds[1][0] - 1
+        );
+
+        // size of the formula (in bytes)
+        $sz = strlen($extra);
+
+        // combine the parts
+        $data = pack('vCCvvvCCCCC', $options, 0, 1, $sz, 0, $sheetIndex, 0, 0, 0, 0, 0)
+            . $name . $extra;
+        $length = strlen($data);
+
+        $header = pack('vv', $record, $length);
+
+        return $header . $data;
+    }
+
+    /**
+     * Stores the CODEPAGE biff record.
+     */
+    private function writeCodepage(): void
+    {
+        $record = 0x0042; // Record identifier
+        $length = 0x0002; // Number of bytes to follow
+        $cv = $this->codepage; // The code page
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $cv);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write Excel BIFF WINDOW1 record.
+     */
+    private function writeWindow1(): void
+    {
+        $record = 0x003D; // Record identifier
+        $length = 0x0012; // Number of bytes to follow
+
+        $xWn = 0x0000; // Horizontal position of window
+        $yWn = 0x0000; // Vertical position of window
+        $dxWn = 0x25BC; // Width of window
+        $dyWn = 0x1572; // Height of window
+
+        $grbit = 0x0038; // Option flags
+
+        // not supported by PhpSpreadsheet, so there is only one selected sheet, the active
+        $ctabsel = 1; // Number of workbook tabs selected
+
+        $wTabRatio = 0x0258; // Tab to scrollbar ratio
+
+        // not supported by PhpSpreadsheet, set to 0
+        $itabFirst = 0; // 1st displayed worksheet
+        $itabCur = $this->spreadsheet->getActiveSheetIndex(); // Active worksheet
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvvvvvvv', $xWn, $yWn, $dxWn, $dyWn, $grbit, $itabCur, $itabFirst, $ctabsel, $wTabRatio);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Writes Excel BIFF BOUNDSHEET record.
+     *
+     * @param int $offset Location of worksheet BOF
+     */
+    private function writeBoundSheet(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheet, int $offset): void
+    {
+        $sheetname = $sheet->getTitle();
+        $record = 0x0085; // Record identifier
+        $ss = match ($sheet->getSheetState()) {
+            \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_VISIBLE => 0x00,
+            \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_HIDDEN => 0x01,
+            \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_VERYHIDDEN => 0x02,
+            default => 0x00,
+        };
+
+        // sheet type
+        $st = 0x00;
+
+        //$grbit = 0x0000; // Visibility and sheet type
+
+        $data = pack('VCC', $offset, $ss, $st);
+        $data .= StringHelper::UTF8toBIFF8UnicodeShort($sheetname);
+
+        $length = strlen($data);
+        $header = pack('vv', $record, $length);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write Internal SUPBOOK record.
+     */
+    private function writeSupbookInternal(): string
+    {
+        $record = 0x01AE; // Record identifier
+        $length = 0x0004; // Bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vv', $this->spreadsheet->getSheetCount(), 0x0401);
+
+        return $this->writeData($header . $data);
+    }
+
+    /**
+     * Writes the Excel BIFF EXTERNSHEET record. These references are used by
+     * formulas.
+     */
+    private function writeExternalsheetBiff8(): string
+    {
+        $totalReferences = count($this->parser->references);
+        $record = 0x0017; // Record identifier
+        $length = 2 + 6 * $totalReferences; // Number of bytes to follow
+
+        //$supbook_index = 0; // FIXME: only using internal SUPBOOK record
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $totalReferences);
+        for ($i = 0; $i < $totalReferences; ++$i) {
+            $data .= $this->parser->references[$i];
+        }
+
+        return $this->writeData($header . $data);
+    }
+
+    /**
+     * Write Excel BIFF STYLE records.
+     */
+    private function writeStyle(): void
+    {
+        $record = 0x0293; // Record identifier
+        $length = 0x0004; // Bytes to follow
+
+        $ixfe = 0x8000; // Index to cell style XF
+        $BuiltIn = 0x00; // Built-in style
+        $iLevel = 0xFF; // Outline style level
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vCC', $ixfe, $BuiltIn, $iLevel);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Writes Excel FORMAT record for non "built-in" numerical formats.
+     *
+     * @param string $format Custom format string
+     * @param int $ifmt Format index code
+     */
+    private function writeNumberFormat(string $format, int $ifmt): void
+    {
+        $record = 0x041E; // Record identifier
+
+        $numberFormatString = StringHelper::UTF8toBIFF8UnicodeLong($format);
+        $length = 2 + strlen($numberFormatString); // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $ifmt) . $numberFormatString;
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write DATEMODE record to indicate the date system in use (1904 or 1900).
+     */
+    private function writeDateMode(): void
+    {
+        $record = 0x0022; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $f1904 = ($this->spreadsheet->getExcelCalendar() === Date::CALENDAR_MAC_1904)
+            ? 1  // Flag for 1904 date system
+            : 0; // Flag for 1900 date system
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $f1904);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Stores the COUNTRY record for localization.
+     */
+    private function writeCountry(): string
+    {
+        $record = 0x008C; // Record identifier
+        $length = 4; // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+        // using the same country code always for simplicity
+        $data = pack('vv', $this->countryCode, $this->countryCode);
+
+        return $this->writeData($header . $data);
+    }
+
+    /**
+     * Write the RECALCID record.
+     */
+    private function writeRecalcId(): string
+    {
+        $record = 0x01C1; // Record identifier
+        $length = 8; // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+
+        // by inspection of real Excel files, MS Office Excel 2007 writes this
+        $data = pack('VV', 0x000001C1, 0x00001E667);
+
+        return $this->writeData($header . $data);
+    }
+
+    /**
+     * Stores the PALETTE biff record.
+     */
+    private function writePalette(): void
+    {
+        $aref = $this->palette;
+
+        $record = 0x0092; // Record identifier
+        $length = 2 + 4 * count($aref); // Number of bytes to follow
+        $ccv = count($aref); // Number of RGB values to follow
+        $data = ''; // The RGB data
+
+        // Pack the RGB data
+        foreach ($aref as $color) {
+            foreach ($color as $byte) {
+                $data .= pack('C', $byte);
+            }
+        }
+
+        $header = pack('vvv', $record, $length, $ccv);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Handling of the SST continue blocks is complicated by the need to include an
+     * additional continuation byte depending on whether the string is split between
+     * blocks or whether it starts at the beginning of the block. (There are also
+     * additional complications that will arise later when/if Rich Strings are
+     * supported).
+     *
+     * The Excel documentation says that the SST record should be followed by an
+     * EXTSST record. The EXTSST record is a hash table that is used to optimise
+     * access to SST. However, despite the documentation it doesn't seem to be
+     * required so we will ignore it.
+     *
+     * @return string Binary data
+     */
+    private function writeSharedStringsTable(): string
+    {
+        // maximum size of record data (excluding record header)
+        $continue_limit = 8224;
+
+        // initialize array of record data blocks
+        $recordDatas = [];
+
+        // start SST record data block with total number of strings, total number of unique strings
+        $recordData = pack('VV', $this->stringTotal, $this->stringUnique);
+
+        // loop through all (unique) strings in shared strings table
+        foreach (array_keys($this->stringTable) as $string) {
+            // here $string is a BIFF8 encoded string
+
+            // length = character count
+            $headerinfo = unpack('vlength/Cencoding', $string);
+
+            // currently, this is always 1 = uncompressed
+            $encoding = $headerinfo['encoding'] ?? 1;
+
+            // initialize finished writing current $string
+            $finished = false;
+
+            while ($finished === false) {
+                // normally, there will be only one cycle, but if string cannot immediately be written as is
+                // there will be need for more than one cylcle, if string longer than one record data block, there
+                // may be need for even more cycles
+
+                if (strlen($recordData) + strlen($string) <= $continue_limit) {
+                    // then we can write the string (or remainder of string) without any problems
+                    $recordData .= $string;
+
+                    if (strlen($recordData) + strlen($string) == $continue_limit) {
+                        // we close the record data block, and initialize a new one
+                        $recordDatas[] = $recordData;
+                        $recordData = '';
+                    }
+
+                    // we are finished writing this string
+                    $finished = true;
+                } else {
+                    // special treatment writing the string (or remainder of the string)
+                    // If the string is very long it may need to be written in more than one CONTINUE record.
+
+                    // check how many bytes more there is room for in the current record
+                    $space_remaining = $continue_limit - strlen($recordData);
+
+                    // minimum space needed
+                    // uncompressed: 2 byte string length length field + 1 byte option flags + 2 byte character
+                    // compressed:   2 byte string length length field + 1 byte option flags + 1 byte character
+                    $min_space_needed = ($encoding == 1) ? 5 : 4;
+
+                    // We have two cases
+                    // 1. space remaining is less than minimum space needed
+                    //        here we must waste the space remaining and move to next record data block
+                    // 2. space remaining is greater than or equal to minimum space needed
+                    //        here we write as much as we can in the current block, then move to next record data block
+
+                    if ($space_remaining < $min_space_needed) {
+                        // 1. space remaining is less than minimum space needed.
+                        // we close the block, store the block data
+                        $recordDatas[] = $recordData;
+
+                        // and start new record data block where we start writing the string
+                        $recordData = '';
+                    } else {
+                        // 2. space remaining is greater than or equal to minimum space needed.
+                        // initialize effective remaining space, for Unicode strings this may need to be reduced by 1, see below
+                        $effective_space_remaining = $space_remaining;
+
+                        // for uncompressed strings, sometimes effective space remaining is reduced by 1
+                        if ($encoding == 1 && (strlen($string) - $space_remaining) % 2 == 1) {
+                            --$effective_space_remaining;
+                        }
+
+                        // one block fininshed, store the block data
+                        $recordData .= substr($string, 0, $effective_space_remaining);
+
+                        $string = substr($string, $effective_space_remaining); // for next cycle in while loop
+                        $recordDatas[] = $recordData;
+
+                        // start new record data block with the repeated option flags
+                        $recordData = pack('C', $encoding);
+                    }
+                }
+            }
+        }
+
+        // Store the last record data block unless it is empty
+        // if there was no need for any continue records, this will be the for SST record data block itself
+        if ($recordData !== '') {
+            $recordDatas[] = $recordData;
+        }
+
+        // combine into one chunk with all the blocks SST, CONTINUE,...
+        $chunk = '';
+        foreach ($recordDatas as $i => $recordData) {
+            // first block should have the SST record header, remaing should have CONTINUE header
+            $record = ($i == 0) ? 0x00FC : 0x003C;
+
+            $header = pack('vv', $record, strlen($recordData));
+            $data = $header . $recordData;
+
+            $chunk .= $this->writeData($data);
+        }
+
+        return $chunk;
+    }
+
+    /**
+     * Writes the MSODRAWINGGROUP record if needed. Possibly split using CONTINUE records.
+     */
+    private function writeMsoDrawingGroup(): string
+    {
+        // write the Escher stream if necessary
+        if (isset($this->escher)) {
+            $writer = new Escher($this->escher);
+            $data = $writer->close();
+
+            $record = 0x00EB;
+            $length = strlen($data);
+            $header = pack('vv', $record, $length);
+
+            return $this->writeData($header . $data);
+        }
+
+        return '';
+    }
+
+    /**
+     * Get Escher object.
+     */
+    public function getEscher(): ?\PhpOffice\PhpSpreadsheet\Shared\Escher
+    {
+        return $this->escher;
+    }
+
+    /**
+     * Set Escher object.
+     */
+    public function setEscher(?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher): void
+    {
+        $this->escher = $escher;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
new file mode 100644
index 00000000..1254ca2b
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -0,0 +1,3190 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use GdImage;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\RichText\Run;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Shared\Xls;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_Worksheet (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// /*
+// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
+// *
+// *  The majority of this is _NOT_ my code.  I simply ported it from the
+// *  PERL Spreadsheet::WriteExcel module.
+// *
+// *  The author of the Spreadsheet::WriteExcel module is John McNamara
+// *  <jmcnamara@cpan.org>
+// *
+// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
+// *  porting of this code to PHP.  Any questions directly related to this
+// *  class library should be directed to me.
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class Worksheet extends BIFFwriter
+{
+    private static int $always0 = 0;
+
+    private static int $always1 = 1;
+
+    /**
+     * Formula parser.
+     */
+    private Parser $parser;
+
+    /**
+     * Array containing format information for columns.
+     */
+    private array $columnInfo;
+
+    /**
+     * The active pane for the worksheet.
+     */
+    private int $activePane;
+
+    /**
+     * Whether to use outline.
+     */
+    private bool $outlineOn;
+
+    /**
+     * Auto outline styles.
+     */
+    private bool $outlineStyle;
+
+    /**
+     * Whether to have outline summary below.
+     * Not currently used.
+     */
+    private bool $outlineBelow; //* @phpstan-ignore-line
+
+    /**
+     * Whether to have outline summary at the right.
+     * Not currently used.
+     */
+    private bool $outlineRight; //* @phpstan-ignore-line
+
+    /**
+     * Reference to the total number of strings in the workbook.
+     */
+    private int $stringTotal;
+
+    /**
+     * Reference to the number of unique strings in the workbook.
+     */
+    private int $stringUnique;
+
+    /**
+     * Reference to the array containing all the unique strings in the workbook.
+     */
+    private array $stringTable;
+
+    /**
+     * Color cache.
+     */
+    private array $colors;
+
+    /**
+     * Index of first used row (at least 0).
+     */
+    private int $firstRowIndex;
+
+    /**
+     * Index of last used row. (no used rows means -1).
+     */
+    private int $lastRowIndex;
+
+    /**
+     * Index of first used column (at least 0).
+     */
+    private int $firstColumnIndex;
+
+    /**
+     * Index of last used column (no used columns means -1).
+     */
+    private int $lastColumnIndex;
+
+    /**
+     * Sheet object.
+     */
+    public \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $phpSheet;
+
+    /**
+     * Escher object corresponding to MSODRAWING.
+     */
+    private ?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher = null;
+
+    /**
+     * Array of font hashes associated to FONT records index.
+     */
+    public array $fontHashIndex;
+
+    private bool $preCalculateFormulas;
+
+    private int $printHeaders;
+
+    private ?Workbook $writerWorkbook;
+
+    /**
+     * Constructor.
+     *
+     * @param int $str_total Total number of strings
+     * @param int $str_unique Total number of unique strings
+     * @param array $str_table String Table
+     * @param array $colors Colour Table
+     * @param Parser $parser The formula parser created for the Workbook
+     * @param bool $preCalculateFormulas Flag indicating whether formulas should be calculated or just written
+     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $phpSheet The worksheet to write
+     */
+    public function __construct(int &$str_total, int &$str_unique, array &$str_table, array &$colors, Parser $parser, bool $preCalculateFormulas, \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $phpSheet, ?Workbook $writerWorkbook = null)
+    {
+        // It needs to call its parent's constructor explicitly
+        parent::__construct();
+
+        $this->preCalculateFormulas = $preCalculateFormulas;
+        $this->stringTotal = &$str_total;
+        $this->stringUnique = &$str_unique;
+        $this->stringTable = &$str_table;
+        $this->colors = &$colors;
+        $this->parser = $parser;
+
+        $this->phpSheet = $phpSheet;
+
+        $this->columnInfo = [];
+        $this->activePane = 3;
+
+        $this->printHeaders = 0;
+
+        $this->outlineStyle = false;
+        $this->outlineBelow = true;
+        $this->outlineRight = true;
+        $this->outlineOn = true;
+
+        $this->fontHashIndex = [];
+
+        // calculate values for DIMENSIONS record
+        $minR = 1;
+        $minC = 'A';
+
+        $maxR = $this->phpSheet->getHighestRow();
+        $maxC = $this->phpSheet->getHighestColumn();
+
+        // Determine lowest and highest column and row
+        $this->firstRowIndex = $minR;
+        $this->lastRowIndex = ($maxR > 65535) ? 65535 : $maxR;
+
+        $this->firstColumnIndex = Coordinate::columnIndexFromString($minC);
+        $this->lastColumnIndex = Coordinate::columnIndexFromString($maxC);
+
+        if ($this->lastColumnIndex > 255) {
+            $this->lastColumnIndex = 255;
+        }
+        $this->writerWorkbook = $writerWorkbook;
+    }
+
+    /**
+     * Add data to the beginning of the workbook (note the reverse order)
+     * and to the end of the workbook.
+     *
+     * @see Workbook::storeWorkbook
+     */
+    public function close(): void
+    {
+        $phpSheet = $this->phpSheet;
+
+        // Storing selected cells and active sheet because it changes while parsing cells with formulas.
+        $selectedCells = $this->phpSheet->getSelectedCells();
+        $activeSheetIndex = $this->phpSheet->getParentOrThrow()->getActiveSheetIndex();
+
+        // Write BOF record
+        $this->storeBof(0x0010);
+
+        // Write PRINTHEADERS
+        $this->writePrintHeaders();
+
+        // Write PRINTGRIDLINES
+        $this->writePrintGridlines();
+
+        // Write GRIDSET
+        $this->writeGridset();
+
+        // Calculate column widths
+        $phpSheet->calculateColumnWidths();
+
+        // Column dimensions
+        if (($defaultWidth = $phpSheet->getDefaultColumnDimension()->getWidth()) < 0) {
+            $defaultWidth = \PhpOffice\PhpSpreadsheet\Shared\Font::getDefaultColumnWidthByFont($phpSheet->getParentOrThrow()->getDefaultStyle()->getFont());
+        }
+
+        $columnDimensions = $phpSheet->getColumnDimensions();
+        $maxCol = $this->lastColumnIndex - 1;
+        for ($i = 0; $i <= $maxCol; ++$i) {
+            $hidden = 0;
+            $level = 0;
+            $xfIndex = 15; // there are 15 cell style Xfs
+
+            $width = $defaultWidth;
+
+            $columnLetter = Coordinate::stringFromColumnIndex($i + 1);
+            if (isset($columnDimensions[$columnLetter])) {
+                $columnDimension = $columnDimensions[$columnLetter];
+                if ($columnDimension->getWidth() >= 0) {
+                    $width = $columnDimension->getWidth();
+                }
+                $hidden = $columnDimension->getVisible() ? 0 : 1;
+                $level = $columnDimension->getOutlineLevel();
+                $xfIndex = $columnDimension->getXfIndex() + 15; // there are 15 cell style Xfs
+            }
+
+            // Components of columnInfo:
+            // $firstcol first column on the range
+            // $lastcol  last column on the range
+            // $width    width to set
+            // $xfIndex  The optional cell style Xf index to apply to the columns
+            // $hidden   The optional hidden atribute
+            // $level    The optional outline level
+            $this->columnInfo[] = [$i, $i, $width, $xfIndex, $hidden, $level];
+        }
+
+        // Write GUTS
+        $this->writeGuts();
+
+        // Write DEFAULTROWHEIGHT
+        $this->writeDefaultRowHeight();
+        // Write WSBOOL
+        $this->writeWsbool();
+        // Write horizontal and vertical page breaks
+        $this->writeBreaks();
+        // Write page header
+        $this->writeHeader();
+        // Write page footer
+        $this->writeFooter();
+        // Write page horizontal centering
+        $this->writeHcenter();
+        // Write page vertical centering
+        $this->writeVcenter();
+        // Write left margin
+        $this->writeMarginLeft();
+        // Write right margin
+        $this->writeMarginRight();
+        // Write top margin
+        $this->writeMarginTop();
+        // Write bottom margin
+        $this->writeMarginBottom();
+        // Write page setup
+        $this->writeSetup();
+        // Write sheet protection
+        $this->writeProtect();
+        // Write SCENPROTECT
+        $this->writeScenProtect();
+        // Write OBJECTPROTECT
+        $this->writeObjectProtect();
+        // Write sheet password
+        $this->writePassword();
+        // Write DEFCOLWIDTH record
+        $this->writeDefcol();
+
+        // Write the COLINFO records if they exist
+        if (!empty($this->columnInfo)) {
+            $colcount = count($this->columnInfo);
+            for ($i = 0; $i < $colcount; ++$i) {
+                $this->writeColinfo($this->columnInfo[$i]);
+            }
+        }
+        $autoFilterRange = $phpSheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            // Write AUTOFILTERINFO
+            $this->writeAutoFilterInfo();
+        }
+
+        // Write sheet dimensions
+        $this->writeDimensions();
+
+        // Row dimensions
+        foreach ($phpSheet->getRowDimensions() as $rowDimension) {
+            $xfIndex = $rowDimension->getXfIndex() + 15; // there are 15 cellXfs
+            $this->writeRow(
+                $rowDimension->getRowIndex() - 1,
+                (int) $rowDimension->getRowHeight(),
+                $xfIndex,
+                !$rowDimension->getVisible(),
+                $rowDimension->getOutlineLevel()
+            );
+        }
+
+        // Write Cells
+        foreach ($phpSheet->getCellCollection()->getSortedCoordinates() as $coordinate) {
+            /** @var Cell $cell */
+            $cell = $phpSheet->getCellCollection()->get($coordinate);
+            $row = $cell->getRow() - 1;
+            $column = Coordinate::columnIndexFromString($cell->getColumn()) - 1;
+
+            // Don't break Excel break the code!
+            if ($row > 65535 || $column > 255) {
+                throw new WriterException('Rows or columns overflow! Excel5 has limit to 65535 rows and 255 columns. Use XLSX instead.');
+            }
+
+            // Write cell value
+            $xfIndex = $cell->getXfIndex() + 15; // there are 15 cell style Xfs
+
+            $cVal = $cell->getValue();
+            if ($cVal instanceof RichText) {
+                $arrcRun = [];
+                $str_pos = 0;
+                $elements = $cVal->getRichTextElements();
+                foreach ($elements as $element) {
+                    // FONT Index
+                    $str_fontidx = 0;
+                    if ($element instanceof Run) {
+                        $getFont = $element->getFont();
+                        if ($getFont !== null) {
+                            $str_fontidx = $this->fontHashIndex[$getFont->getHashCode()];
+                        }
+                    }
+                    $arrcRun[] = ['strlen' => $str_pos, 'fontidx' => $str_fontidx];
+                    // Position FROM
+                    $str_pos += StringHelper::countCharacters($element->getText(), 'UTF-8');
+                }
+                $this->writeRichTextString($row, $column, $cVal->getPlainText(), $xfIndex, $arrcRun);
+            } else {
+                switch ($cell->getDatatype()) {
+                    case DataType::TYPE_STRING:
+                    case DataType::TYPE_INLINE:
+                    case DataType::TYPE_NULL:
+                        if ($cVal === '' || $cVal === null) {
+                            $this->writeBlank($row, $column, $xfIndex);
+                        } else {
+                            $this->writeString($row, $column, $cell->getValueString(), $xfIndex);
+                        }
+
+                        break;
+                    case DataType::TYPE_NUMERIC:
+                        $this->writeNumber($row, $column, is_numeric($cVal) ? ($cVal + 0) : 0, $xfIndex);
+
+                        break;
+                    case DataType::TYPE_FORMULA:
+                        $calculatedValue = $this->preCalculateFormulas ? $cell->getCalculatedValue() : null;
+                        $calculatedValueString = $this->preCalculateFormulas ? $cell->getCalculatedValueString() : '';
+                        if (self::WRITE_FORMULA_EXCEPTION == $this->writeFormula($row, $column, $cell->getValueString(), $xfIndex, $calculatedValue)) {
+                            if ($calculatedValue === null) {
+                                $calculatedValue = $cell->getCalculatedValue();
+                            }
+                            $calctype = gettype($calculatedValue);
+                            match ($calctype) {
+                                'integer', 'double' => $this->writeNumber($row, $column, is_numeric($calculatedValue) ? ((float) $calculatedValue) : 0.0, $xfIndex),
+                                'string' => $this->writeString($row, $column, $calculatedValueString, $xfIndex),
+                                'boolean' => $this->writeBoolErr($row, $column, (int) $calculatedValueString, 0, $xfIndex),
+                                default => $this->writeString($row, $column, $cell->getValueString(), $xfIndex),
+                            };
+                        }
+
+                        break;
+                    case DataType::TYPE_BOOL:
+                        $this->writeBoolErr($row, $column, (int) $cell->getValueString(), 0, $xfIndex);
+
+                        break;
+                    case DataType::TYPE_ERROR:
+                        $this->writeBoolErr($row, $column, ErrorCode::error($cell->getValueString()), 1, $xfIndex);
+
+                        break;
+                }
+            }
+        }
+
+        // Append
+        $this->writeMsoDrawing();
+
+        // Restoring active sheet.
+        $this->phpSheet->getParentOrThrow()->setActiveSheetIndex($activeSheetIndex);
+
+        // Write WINDOW2 record
+        $this->writeWindow2();
+
+        // Write PLV record
+        $this->writePageLayoutView();
+
+        // Write ZOOM record
+        $this->writeZoom();
+        if ($phpSheet->getFreezePane()) {
+            $this->writePanes();
+        }
+
+        // Restoring selected cells.
+        $this->phpSheet->setSelectedCells($selectedCells);
+
+        // Write SELECTION record
+        $this->writeSelection();
+
+        // Write MergedCellsTable Record
+        $this->writeMergedCells();
+
+        // Hyperlinks
+        $phpParent = $phpSheet->getParent();
+        $hyperlinkbase = ($phpParent === null) ? '' : $phpParent->getProperties()->getHyperlinkBase();
+        foreach ($phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
+            [$column, $row] = Coordinate::indexesFromString($coordinate);
+
+            $url = $hyperlink->getUrl();
+
+            if (str_contains($url, 'sheet://')) {
+                // internal to current workbook
+                $url = str_replace('sheet://', 'internal:', $url);
+            } elseif (preg_match('/^(http:|https:|ftp:|mailto:)/', $url)) {
+                // URL
+            } elseif (!empty($hyperlinkbase) && preg_match('~^([A-Za-z]:)?[/\\\\]~', $url) !== 1) {
+                $url = "$hyperlinkbase$url";
+                if (preg_match('/^(http:|https:|ftp:|mailto:)/', $url) !== 1) {
+                    $url = 'external:' . $url;
+                }
+            } else {
+                // external (local file)
+                $url = 'external:' . $url;
+            }
+
+            $this->writeUrl($row - 1, $column - 1, $url);
+        }
+
+        $this->writeDataValidity();
+        $this->writeSheetLayout();
+
+        // Write SHEETPROTECTION record
+        $this->writeSheetProtection();
+        $this->writeRangeProtection();
+
+        // Write Conditional Formatting Rules and Styles
+        $this->writeConditionalFormatting();
+
+        $this->storeEof();
+    }
+
+    private function writeConditionalFormatting(): void
+    {
+        $conditionalFormulaHelper = new ConditionalHelper($this->parser);
+
+        $arrConditionalStyles = [];
+        foreach ($this->phpSheet->getConditionalStylesCollection() as $key => $value) {
+            $keyExplode = explode(',', Coordinate::resolveUnionAndIntersection($key));
+            foreach ($keyExplode as $exploded) {
+                $arrConditionalStyles[$exploded] = $value;
+            }
+        }
+        if (!empty($arrConditionalStyles)) {
+            // Write ConditionalFormattingTable records
+            foreach ($arrConditionalStyles as $cellCoordinate => $conditionalStyles) {
+                $cfHeaderWritten = false;
+                foreach ($conditionalStyles as $conditional) {
+                    /** @var Conditional $conditional */
+                    if (
+                        $conditional->getConditionType() === Conditional::CONDITION_EXPRESSION
+                        || $conditional->getConditionType() === Conditional::CONDITION_CELLIS
+                    ) {
+                        // Write CFHEADER record (only if there are Conditional Styles that we are able to write)
+                        if ($cfHeaderWritten === false) {
+                            $cfHeaderWritten = $this->writeCFHeader($cellCoordinate, $conditionalStyles);
+                        }
+                        if ($cfHeaderWritten === true) {
+                            // Write CFRULE record
+                            $this->writeCFRule($conditionalFormulaHelper, $conditional, $cellCoordinate);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Write a cell range address in BIFF8
+     * always fixed range
+     * See section 2.5.14 in OpenOffice.org's Documentation of the Microsoft Excel File Format.
+     *
+     * @param string $range E.g. 'A1' or 'A1:B6'
+     *
+     * @return string Binary data
+     */
+    private function writeBIFF8CellRangeAddressFixed(string $range): string
+    {
+        $explodes = explode(':', $range);
+
+        // extract first cell, e.g. 'A1'
+        $firstCell = $explodes[0];
+
+        // extract last cell, e.g. 'B6'
+        if (count($explodes) == 1) {
+            $lastCell = $firstCell;
+        } else {
+            $lastCell = $explodes[1];
+        }
+
+        $firstCellCoordinates = Coordinate::indexesFromString($firstCell); // e.g. [0, 1]
+        $lastCellCoordinates = Coordinate::indexesFromString($lastCell); // e.g. [1, 6]
+
+        return pack('vvvv', $firstCellCoordinates[1] - 1, $lastCellCoordinates[1] - 1, $firstCellCoordinates[0] - 1, $lastCellCoordinates[0] - 1);
+    }
+
+    /**
+     * Retrieves data from memory in one chunk, or from disk
+     * sized chunks.
+     *
+     * @return string The data
+     */
+    public function getData(): string
+    {
+        // Return data stored in memory
+        if (isset($this->_data)) {
+            $tmp = $this->_data;
+            $this->_data = null;
+
+            return $tmp;
+        }
+
+        // No data to return
+        return '';
+    }
+
+    /**
+     * Set the option to print the row and column headers on the printed page.
+     *
+     * @param int $print Whether to print the headers or not. Defaults to 1 (print).
+     */
+    public function printRowColHeaders(int $print = 1): void
+    {
+        $this->printHeaders = $print;
+    }
+
+    /**
+     * This method sets the properties for outlining and grouping. The defaults
+     * correspond to Excel's defaults.
+     */
+    public function setOutline(bool $visible = true, bool $symbols_below = true, bool $symbols_right = true, bool $auto_style = false): void
+    {
+        $this->outlineOn = $visible;
+        $this->outlineBelow = $symbols_below;
+        $this->outlineRight = $symbols_right;
+        $this->outlineStyle = $auto_style;
+    }
+
+    /**
+     * Write a double to the specified row and column (zero indexed).
+     * An integer can be written as a double. Excel will display an
+     * integer. $format is optional.
+     *
+     * Returns  0 : normal termination
+     *         -2 : row or column out of range
+     *
+     * @param int $row Zero indexed row
+     * @param int $col Zero indexed column
+     * @param float $num The number to write
+     * @param int $xfIndex The optional XF format
+     */
+    private function writeNumber(int $row, int $col, float $num, int $xfIndex): int
+    {
+        $record = 0x0203; // Record identifier
+        $length = 0x000E; // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvv', $row, $col, $xfIndex);
+        $xl_double = pack('d', $num);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $xl_double = strrev($xl_double);
+        }
+
+        $this->append($header . $data . $xl_double);
+
+        return 0;
+    }
+
+    /**
+     * Write a LABELSST record or a LABEL record. Which one depends on BIFF version.
+     *
+     * @param int $row Row index (0-based)
+     * @param int $col Column index (0-based)
+     * @param string $str The string
+     * @param int $xfIndex Index to XF record
+     */
+    private function writeString(int $row, int $col, string $str, int $xfIndex): void
+    {
+        $this->writeLabelSst($row, $col, $str, $xfIndex);
+    }
+
+    /**
+     * Write a LABELSST record or a LABEL record. Which one depends on BIFF version
+     * It differs from writeString by the writing of rich text strings.
+     *
+     * @param int $row Row index (0-based)
+     * @param int $col Column index (0-based)
+     * @param string $str The string
+     * @param int $xfIndex The XF format index for the cell
+     * @param array $arrcRun Index to Font record and characters beginning
+     */
+    private function writeRichTextString(int $row, int $col, string $str, int $xfIndex, array $arrcRun): void
+    {
+        $record = 0x00FD; // Record identifier
+        $length = 0x000A; // Bytes to follow
+        $str = StringHelper::UTF8toBIFF8UnicodeShort($str, $arrcRun);
+
+        // check if string is already present
+        if (!isset($this->stringTable[$str])) {
+            $this->stringTable[$str] = $this->stringUnique++;
+        }
+        ++$this->stringTotal;
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write a string to the specified row and column (zero indexed).
+     * This is the BIFF8 version (no 255 chars limit).
+     * $format is optional.
+     *
+     * @param int $row Zero indexed row
+     * @param int $col Zero indexed column
+     * @param string $str The string to write
+     * @param int $xfIndex The XF format index for the cell
+     */
+    private function writeLabelSst(int $row, int $col, string $str, int $xfIndex): void
+    {
+        $record = 0x00FD; // Record identifier
+        $length = 0x000A; // Bytes to follow
+
+        $str = StringHelper::UTF8toBIFF8UnicodeLong($str);
+
+        // check if string is already present
+        if (!isset($this->stringTable[$str])) {
+            $this->stringTable[$str] = $this->stringUnique++;
+        }
+        ++$this->stringTotal;
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvV', $row, $col, $xfIndex, $this->stringTable[$str]);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write a blank cell to the specified row and column (zero indexed).
+     * A blank cell is used to specify formatting without adding a string
+     * or a number.
+     *
+     * A blank cell without a format serves no purpose. Therefore, we don't write
+     * a BLANK record unless a format is specified.
+     *
+     * Returns  0 : normal termination (including no format)
+     *         -1 : insufficient number of arguments
+     *         -2 : row or column out of range
+     *
+     * @param int $row Zero indexed row
+     * @param int $col Zero indexed column
+     * @param int $xfIndex The XF format index
+     */
+    public function writeBlank(int $row, int $col, int $xfIndex): int
+    {
+        $record = 0x0201; // Record identifier
+        $length = 0x0006; // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvv', $row, $col, $xfIndex);
+        $this->append($header . $data);
+
+        return 0;
+    }
+
+    /**
+     * Write a boolean or an error type to the specified row and column (zero indexed).
+     *
+     * @param int $row Row index (0-based)
+     * @param int $col Column index (0-based)
+     * @param int $isError Error or Boolean?
+     */
+    private function writeBoolErr(int $row, int $col, int $value, int $isError, int $xfIndex): int
+    {
+        $record = 0x0205;
+        $length = 8;
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvCC', $row, $col, $xfIndex, $value, $isError);
+        $this->append($header . $data);
+
+        return 0;
+    }
+
+    const WRITE_FORMULA_NORMAL = 0;
+    const WRITE_FORMULA_ERRORS = -1;
+    const WRITE_FORMULA_RANGE = -2;
+    const WRITE_FORMULA_EXCEPTION = -3;
+
+    private static bool $allowThrow = false;
+
+    public static function setAllowThrow(bool $allowThrow): void
+    {
+        self::$allowThrow = $allowThrow;
+    }
+
+    public static function getAllowThrow(): bool
+    {
+        return self::$allowThrow;
+    }
+
+    /**
+     * Write a formula to the specified row and column (zero indexed).
+     * The textual representation of the formula is passed to the parser in
+     * Parser.php which returns a packed binary string.
+     *
+     * Returns  0 : WRITE_FORMULA_NORMAL  normal termination
+     *         -1 : WRITE_FORMULA_ERRORS formula errors (bad formula)
+     *         -2 : WRITE_FORMULA_RANGE  row or column out of range
+     *         -3 : WRITE_FORMULA_EXCEPTION parse raised exception, probably due to definedname
+     *
+     * @param int $row Zero indexed row
+     * @param int $col Zero indexed column
+     * @param string $formula The formula text string
+     * @param int $xfIndex The XF format index
+     * @param mixed $calculatedValue Calculated value
+     */
+    private function writeFormula(int $row, int $col, string $formula, int $xfIndex, mixed $calculatedValue): int
+    {
+        $record = 0x0006; // Record identifier
+        // Initialize possible additional value for STRING record that should be written after the FORMULA record?
+        $stringValue = null;
+
+        // calculated value
+        if (isset($calculatedValue)) {
+            // Since we can't yet get the data type of the calculated value,
+            // we use best effort to determine data type
+            if (is_bool($calculatedValue)) {
+                // Boolean value
+                $num = pack('CCCvCv', 0x01, 0x00, (int) $calculatedValue, 0x00, 0x00, 0xFFFF);
+            } elseif (is_int($calculatedValue) || is_float($calculatedValue)) {
+                // Numeric value
+                $num = pack('d', $calculatedValue);
+            } elseif (is_string($calculatedValue)) {
+                $errorCodes = DataType::getErrorCodes();
+                if (isset($errorCodes[$calculatedValue])) {
+                    // Error value
+                    $num = pack('CCCvCv', 0x02, 0x00, ErrorCode::error($calculatedValue), 0x00, 0x00, 0xFFFF);
+                } elseif ($calculatedValue === '') {
+                    // Empty string (and BIFF8)
+                    $num = pack('CCCvCv', 0x03, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
+                } else {
+                    // Non-empty string value (or empty string BIFF5)
+                    $stringValue = $calculatedValue;
+                    $num = pack('CCCvCv', 0x00, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
+                }
+            } else {
+                // We are really not supposed to reach here
+                $num = pack('d', 0x00);
+            }
+        } else {
+            $num = pack('d', 0x00);
+        }
+
+        $grbit = 0x03; // Option flags
+        $unknown = 0x0000; // Must be zero
+
+        // Strip the '=' or '@' sign at the beginning of the formula string
+        if ($formula[0] == '=') {
+            $formula = substr($formula, 1);
+        } else {
+            // Error handling
+            $this->writeString($row, $col, 'Unrecognised character for formula', 0);
+
+            return self::WRITE_FORMULA_ERRORS;
+        }
+
+        // Parse the formula using the parser in Parser.php
+        try {
+            $this->parser->parse($formula);
+            $formula = $this->parser->toReversePolish();
+
+            $formlen = strlen($formula); // Length of the binary string
+            $length = 0x16 + $formlen; // Length of the record data
+
+            $header = pack('vv', $record, $length);
+
+            $data = pack('vvv', $row, $col, $xfIndex)
+                . $num
+                . pack('vVv', $grbit, $unknown, $formlen);
+            $this->append($header . $data . $formula);
+
+            // Append also a STRING record if necessary
+            if ($stringValue !== null) {
+                $this->writeStringRecord($stringValue);
+            }
+
+            return self::WRITE_FORMULA_NORMAL;
+        } catch (PhpSpreadsheetException $e) {
+            if (self::$allowThrow) {
+                throw $e;
+            }
+
+            return self::WRITE_FORMULA_EXCEPTION;
+        }
+    }
+
+    /**
+     * Write a STRING record. This.
+     */
+    private function writeStringRecord(string $stringValue): void
+    {
+        $record = 0x0207; // Record identifier
+        $data = StringHelper::UTF8toBIFF8UnicodeLong($stringValue);
+
+        $length = strlen($data);
+        $header = pack('vv', $record, $length);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write a hyperlink.
+     * This is comprised of two elements: the visible label and
+     * the invisible link. The visible label is the same as the link unless an
+     * alternative string is specified. The label is written using the
+     * writeString() method. Therefore the 255 characters string limit applies.
+     * $string and $format are optional.
+     *
+     * The hyperlink can be to a http, ftp, mail, internal sheet (not yet), or external
+     * directory url.
+     *
+     * @param int $row Row
+     * @param int $col Column
+     * @param string $url URL string
+     */
+    private function writeUrl(int $row, int $col, string $url): void
+    {
+        // Add start row and col to arg list
+        $this->writeUrlRange($row, $col, $row, $col, $url);
+    }
+
+    /**
+     * This is the more general form of writeUrl(). It allows a hyperlink to be
+     * written to a range of cells. This function also decides the type of hyperlink
+     * to be written. These are either, Web (http, ftp, mailto), Internal
+     * (Sheet1!A1) or external ('c:\temp\foo.xls#Sheet1!A1').
+     *
+     * @param int $row1 Start row
+     * @param int $col1 Start column
+     * @param int $row2 End row
+     * @param int $col2 End column
+     * @param string $url URL string
+     *
+     * @see writeUrl()
+     */
+    private function writeUrlRange(int $row1, int $col1, int $row2, int $col2, string $url): void
+    {
+        // Check for internal/external sheet links or default to web link
+        if (preg_match('[^internal:]', $url)) {
+            $this->writeUrlInternal($row1, $col1, $row2, $col2, $url);
+        }
+        if (preg_match('[^external:]', $url)) {
+            $this->writeUrlExternal($row1, $col1, $row2, $col2, $url);
+        }
+
+        $this->writeUrlWeb($row1, $col1, $row2, $col2, $url);
+    }
+
+    /**
+     * Used to write http, ftp and mailto hyperlinks.
+     * The link type ($options) is 0x03 is the same as absolute dir ref without
+     * sheet. However it is differentiated by the $unknown2 data stream.
+     *
+     * @param int $row1 Start row
+     * @param int $col1 Start column
+     * @param int $row2 End row
+     * @param int $col2 End column
+     * @param string $url URL string
+     *
+     * @see writeUrl()
+     */
+    public function writeUrlWeb(int $row1, int $col1, int $row2, int $col2, string $url): void
+    {
+        $record = 0x01B8; // Record identifier
+
+        // Pack the undocumented parts of the hyperlink stream
+        $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
+        $unknown2 = pack('H*', 'E0C9EA79F9BACE118C8200AA004BA90B');
+
+        // Pack the option flags
+        $options = pack('V', 0x03);
+
+        // Convert URL to a null terminated wchar string
+
+        /** @phpstan-ignore-next-line */
+        $url = implode("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
+        $url = $url . "\0\0\0";
+
+        // Pack the length of the URL
+        $url_len = pack('V', strlen($url));
+
+        // Calculate the data length
+        $length = 0x34 + strlen($url);
+
+        // Pack the header data
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvv', $row1, $row2, $col1, $col2);
+
+        // Write the packed data
+        $this->append($header . $data . $unknown1 . $options . $unknown2 . $url_len . $url);
+    }
+
+    /**
+     * Used to write internal reference hyperlinks such as "Sheet1!A1".
+     *
+     * @param int $row1 Start row
+     * @param int $col1 Start column
+     * @param int $row2 End row
+     * @param int $col2 End column
+     * @param string $url URL string
+     *
+     * @see writeUrl()
+     */
+    private function writeUrlInternal(int $row1, int $col1, int $row2, int $col2, string $url): void
+    {
+        $record = 0x01B8; // Record identifier
+
+        // Strip URL type
+        $url = (string) preg_replace('/^internal:/', '', $url);
+
+        // Pack the undocumented parts of the hyperlink stream
+        $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
+
+        // Pack the option flags
+        $options = pack('V', 0x08);
+
+        // Convert the URL type and to a null terminated wchar string
+        $url .= "\0";
+
+        // character count
+        $url_len = StringHelper::countCharacters($url);
+        $url_len = pack('V', $url_len);
+
+        $url = StringHelper::convertEncoding($url, 'UTF-16LE', 'UTF-8');
+
+        // Calculate the data length
+        $length = 0x24 + strlen($url);
+
+        // Pack the header data
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvv', $row1, $row2, $col1, $col2);
+
+        // Write the packed data
+        $this->append($header . $data . $unknown1 . $options . $url_len . $url);
+    }
+
+    /**
+     * Write links to external directory names such as 'c:\foo.xls',
+     * c:\foo.xls#Sheet1!A1', '../../foo.xls'. and '../../foo.xls#Sheet1!A1'.
+     *
+     * Note: Excel writes some relative links with the $dir_long string. We ignore
+     * these cases for the sake of simpler code.
+     *
+     * @param int $row1 Start row
+     * @param int $col1 Start column
+     * @param int $row2 End row
+     * @param int $col2 End column
+     * @param string $url URL string
+     *
+     * @see writeUrl()
+     */
+    private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, string $url): void
+    {
+        // Network drives are different. We will handle them separately
+        // MS/Novell network drives and shares start with \\
+        if (preg_match('[^external:\\\\]', $url)) {
+            return;
+        }
+
+        $record = 0x01B8; // Record identifier
+
+        // Strip URL type and change Unix dir separator to Dos style (if needed)
+        //
+        $url = (string) preg_replace(['/^external:/', '/\//'], ['', '\\'], $url);
+
+        // Determine if the link is relative or absolute:
+        //   relative if link contains no dir separator, "somefile.xls"
+        //   relative if link starts with up-dir, "..\..\somefile.xls"
+        //   otherwise, absolute
+
+        $absolute = 0x00; // relative path
+        if (preg_match('/^[A-Z]:/', $url)) {
+            $absolute = 0x02; // absolute path on Windows, e.g. C:\...
+        }
+        $link_type = 0x01 | $absolute;
+
+        // Determine if the link contains a sheet reference and change some of the
+        // parameters accordingly.
+        // Split the dir name and sheet name (if it exists)
+        $dir_long = $url;
+        if (preg_match('/\\#/', $url)) {
+            $link_type |= 0x08;
+        }
+
+        // Pack the link type
+        $link_type = pack('V', $link_type);
+
+        // Calculate the up-level dir count e.g.. (..\..\..\ == 3)
+        $up_count = preg_match_all('/\\.\\.\\\\/', $dir_long, $useless);
+        $up_count = pack('v', $up_count);
+
+        // Store the short dos dir name (null terminated)
+        $dir_short = (string) preg_replace('/\\.\\.\\\\/', '', $dir_long) . "\0";
+
+        // Store the long dir name as a wchar string (non-null terminated)
+        //$dir_long = $dir_long . "\0";
+
+        // Pack the lengths of the dir strings
+        $dir_short_len = pack('V', strlen($dir_short));
+        //$dir_long_len = pack('V', strlen($dir_long));
+        $stream_len = pack('V', 0); //strlen($dir_long) + 0x06);
+
+        // Pack the undocumented parts of the hyperlink stream
+        $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
+        $unknown2 = pack('H*', '0303000000000000C000000000000046');
+        $unknown3 = pack('H*', 'FFFFADDE000000000000000000000000000000000000000');
+        //$unknown4 = pack('v', 0x03);
+
+        // Pack the main data stream
+        $data = pack('vvvv', $row1, $row2, $col1, $col2)
+            . $unknown1
+            . $link_type
+            . $unknown2
+            . $up_count
+            . $dir_short_len
+            . $dir_short
+            . $unknown3
+            . $stream_len; /*.
+                          $dir_long_len .
+                          $unknown4     .
+                          $dir_long     .
+                          $sheet_len    .
+                          $sheet        ;*/
+
+        // Pack the header data
+        $length = strlen($data);
+        $header = pack('vv', $record, $length);
+
+        // Write the packed data
+        $this->append($header . $data);
+    }
+
+    /**
+     * This method is used to set the height and format for a row.
+     *
+     * @param int $row The row to set
+     * @param int $height Height we are giving to the row.
+     *                        Use null to set XF without setting height
+     * @param int $xfIndex The optional cell style Xf index to apply to the columns
+     * @param bool $hidden The optional hidden attribute
+     * @param int $level The optional outline level for row, in range [0,7]
+     */
+    private function writeRow(int $row, int $height, int $xfIndex, bool $hidden = false, int $level = 0): void
+    {
+        $record = 0x0208; // Record identifier
+        $length = 0x0010; // Number of bytes to follow
+
+        $colMic = 0x0000; // First defined column
+        $colMac = 0x0000; // Last defined column
+        $irwMac = 0x0000; // Used by Excel to optimise loading
+        $reserved = 0x0000; // Reserved
+        $grbit = 0x0000; // Option flags
+        $ixfe = $xfIndex;
+
+        if ($height < 0) {
+            $height = null;
+        }
+
+        // Use writeRow($row, null, $XF) to set XF format without setting height
+        if ($height !== null) {
+            $miyRw = $height * 20; // row height
+        } else {
+            $miyRw = 0xFF; // default row height is 256
+        }
+
+        // Set the options flags. fUnsynced is used to show that the font and row
+        // heights are not compatible. This is usually the case for WriteExcel.
+        // The collapsed flag 0x10 doesn't seem to be used to indicate that a row
+        // is collapsed. Instead it is used to indicate that the previous row is
+        // collapsed. The zero height flag, 0x20, is used to collapse a row.
+
+        $grbit |= $level;
+        if ($hidden === true) {
+            $grbit |= 0x0030;
+        }
+        if ($height !== null) {
+            $grbit |= 0x0040; // fUnsynced
+        }
+        if ($xfIndex !== 0xF) {
+            $grbit |= 0x0080;
+        }
+        $grbit |= 0x0100;
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvvvvvv', $row, $colMic, $colMac, $miyRw, $irwMac, $reserved, $grbit, $ixfe);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Writes Excel DIMENSIONS to define the area in which there is data.
+     */
+    private function writeDimensions(): void
+    {
+        $record = 0x0200; // Record identifier
+
+        $length = 0x000E;
+        $data = pack('VVvvv', $this->firstRowIndex, $this->lastRowIndex + 1, $this->firstColumnIndex, $this->lastColumnIndex + 1, 0x0000); // reserved
+
+        $header = pack('vv', $record, $length);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write BIFF record Window2.
+     */
+    private function writeWindow2(): void
+    {
+        $record = 0x023E; // Record identifier
+        $length = 0x0012;
+
+        $rwTop = 0x0000; // Top row visible in window
+        $colLeft = 0x0000; // Leftmost column visible in window
+
+        // The options flags that comprise $grbit
+        $fDspFmla = 0; // 0 - bit
+        $fDspGrid = $this->phpSheet->getShowGridlines() ? 1 : 0; // 1
+        $fDspRwCol = $this->phpSheet->getShowRowColHeaders() ? 1 : 0; // 2
+        $fFrozen = $this->phpSheet->getFreezePane() ? 1 : 0; // 3
+        $fDspZeros = 1; // 4
+        $fDefaultHdr = 1; // 5
+        $fArabic = $this->phpSheet->getRightToLeft() ? 1 : 0; // 6
+        $fDspGuts = $this->outlineOn; // 7
+        $fFrozenNoSplit = 0; // 0 - bit
+        // no support in PhpSpreadsheet for selected sheet, therefore sheet is only selected if it is the active sheet
+        $fSelected = ($this->phpSheet === $this->phpSheet->getParentOrThrow()->getActiveSheet()) ? 1 : 0;
+        $fPageBreakPreview = $this->phpSheet->getSheetView()->getView() === SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW;
+
+        $grbit = $fDspFmla;
+        $grbit |= $fDspGrid << 1;
+        $grbit |= $fDspRwCol << 2;
+        $grbit |= $fFrozen << 3;
+        $grbit |= $fDspZeros << 4;
+        $grbit |= $fDefaultHdr << 5;
+        $grbit |= $fArabic << 6;
+        $grbit |= $fDspGuts << 7;
+        $grbit |= $fFrozenNoSplit << 8;
+        $grbit |= $fSelected << 9; // Selected sheets.
+        $grbit |= $fSelected << 10; // Active sheet.
+        $grbit |= $fPageBreakPreview << 11;
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvv', $grbit, $rwTop, $colLeft);
+
+        // FIXME !!!
+        $rgbHdr = 0x0040; // Row/column heading and gridline color index
+        $zoom_factor_page_break = ($fPageBreakPreview ? $this->phpSheet->getSheetView()->getZoomScale() : 0x0000);
+        $zoom_factor_normal = $this->phpSheet->getSheetView()->getZoomScaleNormal();
+
+        $data .= pack('vvvvV', $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write BIFF record DEFAULTROWHEIGHT.
+     */
+    private function writeDefaultRowHeight(): void
+    {
+        $defaultRowHeight = $this->phpSheet->getDefaultRowDimension()->getRowHeight();
+
+        if ($defaultRowHeight < 0) {
+            return;
+        }
+
+        // convert to twips
+        $defaultRowHeight = (int) 20 * $defaultRowHeight;
+
+        $record = 0x0225; // Record identifier
+        $length = 0x0004; // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vv', 1, $defaultRowHeight);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write BIFF record DEFCOLWIDTH if COLINFO records are in use.
+     */
+    private function writeDefcol(): void
+    {
+        $defaultColWidth = 8;
+
+        $record = 0x0055; // Record identifier
+        $length = 0x0002; // Number of bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $defaultColWidth);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write BIFF record COLINFO to define column widths.
+     *
+     * Note: The SDK says the record length is 0x0B but Excel writes a 0x0C
+     * length record.
+     *
+     * @param array $col_array This is the only parameter received and is composed of the following:
+     *                0 => First formatted column,
+     *                1 => Last formatted column,
+     *                2 => Col width (8.43 is Excel default),
+     *                3 => The optional XF format of the column,
+     *                4 => Option flags.
+     *                5 => Optional outline level
+     */
+    private function writeColinfo(array $col_array): void
+    {
+        $colFirst = $col_array[0] ?? null;
+        $colLast = $col_array[1] ?? null;
+        $coldx = $col_array[2] ?? 8.43;
+        $xfIndex = $col_array[3] ?? 15;
+        $grbit = $col_array[4] ?? 0;
+        $level = $col_array[5] ?? 0;
+
+        $record = 0x007D; // Record identifier
+        $length = 0x000C; // Number of bytes to follow
+
+        $coldx *= 256; // Convert to units of 1/256 of a char
+
+        $ixfe = $xfIndex;
+        $reserved = 0x0000; // Reserved
+
+        $level = max(0, min($level, 7));
+        $grbit |= $level << 8;
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvvvv', $colFirst, $colLast, $coldx, $ixfe, $grbit, $reserved);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write BIFF record SELECTION.
+     */
+    private function writeSelection(): void
+    {
+        // look up the selected cell range
+        $selectedCells = Coordinate::splitRange($this->phpSheet->getSelectedCells());
+        $selectedCells = $selectedCells[0];
+        if (count($selectedCells) == 2) {
+            [$first, $last] = $selectedCells;
+        } else {
+            $first = $selectedCells[0];
+            $last = $selectedCells[0];
+        }
+
+        [$colFirst, $rwFirst] = Coordinate::coordinateFromString($first);
+        $colFirst = Coordinate::columnIndexFromString($colFirst) - 1; // base 0 column index
+        --$rwFirst; // base 0 row index
+
+        [$colLast, $rwLast] = Coordinate::coordinateFromString($last);
+        $colLast = Coordinate::columnIndexFromString($colLast) - 1; // base 0 column index
+        --$rwLast; // base 0 row index
+
+        // make sure we are not out of bounds
+        $colFirst = min($colFirst, 255);
+        $colLast = min($colLast, 255);
+
+        $rwFirst = min($rwFirst, 65535);
+        $rwLast = min($rwLast, 65535);
+
+        $record = 0x001D; // Record identifier
+        $length = 0x000F; // Number of bytes to follow
+
+        $pnn = $this->activePane; // Pane position
+        $rwAct = $rwFirst; // Active row
+        $colAct = $colFirst; // Active column
+        $irefAct = 0; // Active cell ref
+        $cref = 1; // Number of refs
+
+        // Swap last row/col for first row/col as necessary
+        if ($rwFirst > $rwLast) {
+            [$rwFirst, $rwLast] = [$rwLast, $rwFirst];
+        }
+
+        if ($colFirst > $colLast) {
+            [$colFirst, $colLast] = [$colLast, $colFirst];
+        }
+
+        $header = pack('vv', $record, $length);
+        $data = pack('CvvvvvvCC', $pnn, $rwAct, $colAct, $irefAct, $cref, $rwFirst, $rwLast, $colFirst, $colLast);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the MERGEDCELLS records for all ranges of merged cells.
+     */
+    private function writeMergedCells(): void
+    {
+        $mergeCells = $this->phpSheet->getMergeCells();
+        $countMergeCells = count($mergeCells);
+
+        if ($countMergeCells == 0) {
+            return;
+        }
+
+        // maximum allowed number of merged cells per record
+        $maxCountMergeCellsPerRecord = 1027;
+
+        // record identifier
+        $record = 0x00E5;
+
+        // counter for total number of merged cells treated so far by the writer
+        $i = 0;
+
+        // counter for number of merged cells written in record currently being written
+        $j = 0;
+
+        // initialize record data
+        $recordData = '';
+
+        // loop through the merged cells
+        foreach ($mergeCells as $mergeCell) {
+            ++$i;
+            ++$j;
+
+            // extract the row and column indexes
+            $range = Coordinate::splitRange($mergeCell);
+            [$first, $last] = $range[0];
+            [$firstColumn, $firstRow] = Coordinate::indexesFromString($first);
+            [$lastColumn, $lastRow] = Coordinate::indexesFromString($last);
+
+            $recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, $firstColumn - 1, $lastColumn - 1);
+
+            // flush record if we have reached limit for number of merged cells, or reached final merged cell
+            if ($j == $maxCountMergeCellsPerRecord || $i == $countMergeCells) {
+                $recordData = pack('v', $j) . $recordData;
+                $length = strlen($recordData);
+                $header = pack('vv', $record, $length);
+                $this->append($header . $recordData);
+
+                // initialize for next record, if any
+                $recordData = '';
+                $j = 0;
+            }
+        }
+    }
+
+    /**
+     * Write SHEETLAYOUT record.
+     */
+    private function writeSheetLayout(): void
+    {
+        if (!$this->phpSheet->isTabColorSet()) {
+            return;
+        }
+
+        $recordData = pack(
+            'vvVVVvv',
+            0x0862,
+            0x0000, // unused
+            0x00000000, // unused
+            0x00000000, // unused
+            0x00000014, // size of record data
+            $this->colors[$this->phpSheet->getTabColor()->getRGB()], // color index
+            0x0000        // unused
+        );
+
+        $length = strlen($recordData);
+
+        $record = 0x0862; // Record identifier
+        $header = pack('vv', $record, $length);
+        $this->append($header . $recordData);
+    }
+
+    private static function protectionBitsDefaultFalse(?bool $value, int $shift): int
+    {
+        if ($value === false) {
+            return 1 << $shift;
+        }
+
+        return 0;
+    }
+
+    private static function protectionBitsDefaultTrue(?bool $value, int $shift): int
+    {
+        if ($value !== false) {
+            return 1 << $shift;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Write SHEETPROTECTION.
+     */
+    private function writeSheetProtection(): void
+    {
+        // record identifier
+        $record = 0x0867;
+
+        // prepare options
+        $protection = $this->phpSheet->getProtection();
+        $options = self::protectionBitsDefaultTrue($protection->getObjects(), 0)
+            | self::protectionBitsDefaultTrue($protection->getScenarios(), 1)
+            | self::protectionBitsDefaultFalse($protection->getFormatCells(), 2)
+            | self::protectionBitsDefaultFalse($protection->getFormatColumns(), 3)
+            | self::protectionBitsDefaultFalse($protection->getFormatRows(), 4)
+            | self::protectionBitsDefaultFalse($protection->getInsertColumns(), 5)
+            | self::protectionBitsDefaultFalse($protection->getInsertRows(), 6)
+            | self::protectionBitsDefaultFalse($protection->getInsertHyperlinks(), 7)
+            | self::protectionBitsDefaultFalse($protection->getDeleteColumns(), 8)
+            | self::protectionBitsDefaultFalse($protection->getDeleteRows(), 9)
+            | self::protectionBitsDefaultTrue($protection->getSelectLockedCells(), 10)
+            | self::protectionBitsDefaultFalse($protection->getSort(), 11)
+            | self::protectionBitsDefaultFalse($protection->getAutoFilter(), 12)
+            | self::protectionBitsDefaultFalse($protection->getPivotTables(), 13)
+            | self::protectionBitsDefaultTrue($protection->getSelectUnlockedCells(), 14);
+
+        // record data
+        $recordData = pack(
+            'vVVCVVvv',
+            0x0867, // repeated record identifier
+            0x0000, // not used
+            0x0000, // not used
+            0x00, // not used
+            0x01000200, // unknown data
+            0xFFFFFFFF, // unknown data
+            $options, // options
+            0x0000 // not used
+        );
+
+        $length = strlen($recordData);
+        $header = pack('vv', $record, $length);
+
+        $this->append($header . $recordData);
+    }
+
+    /**
+     * Write BIFF record RANGEPROTECTION.
+     *
+     * Openoffice.org's Documentation of the Microsoft Excel File Format uses term RANGEPROTECTION for these records
+     * Microsoft Office Excel 97-2007 Binary File Format Specification uses term FEAT for these records
+     */
+    private function writeRangeProtection(): void
+    {
+        foreach ($this->phpSheet->getProtectedCellRanges() as $range => $protectedCells) {
+            $password = $protectedCells->getPassword();
+            // number of ranges, e.g. 'A1:B3 C20:D25'
+            $cellRanges = explode(' ', $range);
+            $cref = count($cellRanges);
+
+            $recordData = pack(
+                'vvVVvCVvVv',
+                0x0868,
+                0x00,
+                0x0000,
+                0x0000,
+                0x02,
+                0x0,
+                0x0000,
+                $cref,
+                0x0000,
+                0x00
+            );
+
+            foreach ($cellRanges as $cellRange) {
+                $recordData .= $this->writeBIFF8CellRangeAddressFixed($cellRange);
+            }
+
+            // the rgbFeat structure
+            $recordData .= pack(
+                'VV',
+                0x0000,
+                hexdec($password)
+            );
+
+            $recordData .= StringHelper::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
+
+            $length = strlen($recordData);
+
+            $record = 0x0868; // Record identifier
+            $header = pack('vv', $record, $length);
+            $this->append($header . $recordData);
+        }
+    }
+
+    /**
+     * Writes the Excel BIFF PANE record.
+     * The panes can either be frozen or thawed (unfrozen).
+     * Frozen panes are specified in terms of an integer number of rows and columns.
+     * Thawed panes are specified in terms of Excel's units for rows and columns.
+     */
+    private function writePanes(): void
+    {
+        if (!$this->phpSheet->getFreezePane()) {
+            // thaw panes
+            return;
+        }
+
+        [$column, $row] = Coordinate::indexesFromString($this->phpSheet->getFreezePane());
+        $x = $column - 1;
+        $y = $row - 1;
+
+        [$leftMostColumn, $topRow] = Coordinate::indexesFromString($this->phpSheet->getTopLeftCell() ?? '');
+        //Coordinates are zero-based in xls files
+        $rwTop = $topRow - 1;
+        $colLeft = $leftMostColumn - 1;
+
+        $record = 0x0041; // Record identifier
+        $length = 0x000A; // Number of bytes to follow
+
+        // Determine which pane should be active. There is also the undocumented
+        // option to override this should it be necessary: may be removed later.
+        $pnnAct = 0;
+        if ($x != 0 && $y != 0) {
+            $pnnAct = 0; // Bottom right
+        }
+        if ($x != 0 && $y == 0) {
+            $pnnAct = 1; // Top right
+        }
+        if ($x == 0 && $y != 0) {
+            $pnnAct = 2; // Bottom left
+        }
+        if ($x == 0 && $y == 0) {
+            $pnnAct = 3; // Top left
+        }
+
+        $this->activePane = $pnnAct; // Used in writeSelection
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvvv', $x, $y, $rwTop, $colLeft, $pnnAct);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the page setup SETUP BIFF record.
+     */
+    private function writeSetup(): void
+    {
+        $record = 0x00A1; // Record identifier
+        $length = 0x0022; // Number of bytes to follow
+
+        $iPaperSize = $this->phpSheet->getPageSetup()->getPaperSize(); // Paper size
+        $iScale = $this->phpSheet->getPageSetup()->getScale() ?: 100; // Print scaling factor
+
+        $iPageStart = 0x01; // Starting page number
+        $iFitWidth = (int) $this->phpSheet->getPageSetup()->getFitToWidth(); // Fit to number of pages wide
+        $iFitHeight = (int) $this->phpSheet->getPageSetup()->getFitToHeight(); // Fit to number of pages high
+        $iRes = 0x0258; // Print resolution
+        $iVRes = 0x0258; // Vertical print resolution
+
+        $numHdr = $this->phpSheet->getPageMargins()->getHeader(); // Header Margin
+
+        $numFtr = $this->phpSheet->getPageMargins()->getFooter(); // Footer Margin
+        $iCopies = 0x01; // Number of copies
+
+        // Order of printing pages
+        $fLeftToRight = $this->phpSheet->getPageSetup()->getPageOrder() === PageSetup::PAGEORDER_DOWN_THEN_OVER
+            ? 0x0 : 0x1;
+        // Page orientation
+        $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == PageSetup::ORIENTATION_LANDSCAPE)
+            ? 0x0 : 0x1;
+
+        $fNoPls = 0x0; // Setup not read from printer
+        $fNoColor = 0x0; // Print black and white
+        $fDraft = 0x0; // Print draft quality
+        $fNotes = 0x0; // Print notes
+        $fNoOrient = 0x0; // Orientation not set
+        $fUsePage = 0x0; // Use custom starting page
+
+        $grbit = $fLeftToRight;
+        $grbit |= $fLandscape << 1;
+        $grbit |= $fNoPls << 2;
+        $grbit |= $fNoColor << 3;
+        $grbit |= $fDraft << 4;
+        $grbit |= $fNotes << 5;
+        $grbit |= $fNoOrient << 6;
+        $grbit |= $fUsePage << 7;
+
+        $numHdr = pack('d', $numHdr);
+        $numFtr = pack('d', $numFtr);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $numHdr = strrev($numHdr);
+            $numFtr = strrev($numFtr);
+        }
+
+        $header = pack('vv', $record, $length);
+        $data1 = pack('vvvvvvvv', $iPaperSize, $iScale, $iPageStart, $iFitWidth, $iFitHeight, $grbit, $iRes, $iVRes);
+        $data2 = $numHdr . $numFtr;
+        $data3 = pack('v', $iCopies);
+        $this->append($header . $data1 . $data2 . $data3);
+    }
+
+    /**
+     * Store the header caption BIFF record.
+     */
+    private function writeHeader(): void
+    {
+        $record = 0x0014; // Record identifier
+
+        /* removing for now
+        // need to fix character count (multibyte!)
+        if (strlen($this->phpSheet->getHeaderFooter()->getOddHeader()) <= 255) {
+            $str      = $this->phpSheet->getHeaderFooter()->getOddHeader();       // header string
+        } else {
+            $str = '';
+        }
+        */
+
+        $recordData = StringHelper::UTF8toBIFF8UnicodeLong($this->phpSheet->getHeaderFooter()->getOddHeader());
+        $length = strlen($recordData);
+
+        $header = pack('vv', $record, $length);
+
+        $this->append($header . $recordData);
+    }
+
+    /**
+     * Store the footer caption BIFF record.
+     */
+    private function writeFooter(): void
+    {
+        $record = 0x0015; // Record identifier
+
+        /* removing for now
+        // need to fix character count (multibyte!)
+        if (strlen($this->phpSheet->getHeaderFooter()->getOddFooter()) <= 255) {
+            $str = $this->phpSheet->getHeaderFooter()->getOddFooter();
+        } else {
+            $str = '';
+        }
+        */
+
+        $recordData = StringHelper::UTF8toBIFF8UnicodeLong($this->phpSheet->getHeaderFooter()->getOddFooter());
+        $length = strlen($recordData);
+
+        $header = pack('vv', $record, $length);
+
+        $this->append($header . $recordData);
+    }
+
+    /**
+     * Store the horizontal centering HCENTER BIFF record.
+     */
+    private function writeHcenter(): void
+    {
+        $record = 0x0083; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $fHCenter = $this->phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0; // Horizontal centering
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $fHCenter);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the vertical centering VCENTER BIFF record.
+     */
+    private function writeVcenter(): void
+    {
+        $record = 0x0084; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $fVCenter = $this->phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0; // Horizontal centering
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $fVCenter);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the LEFTMARGIN BIFF record.
+     */
+    private function writeMarginLeft(): void
+    {
+        $record = 0x0026; // Record identifier
+        $length = 0x0008; // Bytes to follow
+
+        $margin = $this->phpSheet->getPageMargins()->getLeft(); // Margin in inches
+
+        $header = pack('vv', $record, $length);
+        $data = pack('d', $margin);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $data = strrev($data);
+        }
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the RIGHTMARGIN BIFF record.
+     */
+    private function writeMarginRight(): void
+    {
+        $record = 0x0027; // Record identifier
+        $length = 0x0008; // Bytes to follow
+
+        $margin = $this->phpSheet->getPageMargins()->getRight(); // Margin in inches
+
+        $header = pack('vv', $record, $length);
+        $data = pack('d', $margin);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $data = strrev($data);
+        }
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the TOPMARGIN BIFF record.
+     */
+    private function writeMarginTop(): void
+    {
+        $record = 0x0028; // Record identifier
+        $length = 0x0008; // Bytes to follow
+
+        $margin = $this->phpSheet->getPageMargins()->getTop(); // Margin in inches
+
+        $header = pack('vv', $record, $length);
+        $data = pack('d', $margin);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $data = strrev($data);
+        }
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Store the BOTTOMMARGIN BIFF record.
+     */
+    private function writeMarginBottom(): void
+    {
+        $record = 0x0029; // Record identifier
+        $length = 0x0008; // Bytes to follow
+
+        $margin = $this->phpSheet->getPageMargins()->getBottom(); // Margin in inches
+
+        $header = pack('vv', $record, $length);
+        $data = pack('d', $margin);
+        if (self::getByteOrder()) { // if it's Big Endian
+            $data = strrev($data);
+        }
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the PRINTHEADERS BIFF record.
+     */
+    private function writePrintHeaders(): void
+    {
+        $record = 0x002A; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $fPrintRwCol = $this->printHeaders; // Boolean flag
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $fPrintRwCol);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the PRINTGRIDLINES BIFF record. Must be used in conjunction with the
+     * GRIDSET record.
+     */
+    private function writePrintGridlines(): void
+    {
+        $record = 0x002B; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $fPrintGrid = $this->phpSheet->getPrintGridlines() ? 1 : 0; // Boolean flag
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $fPrintGrid);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the GRIDSET BIFF record. Must be used in conjunction with the
+     * PRINTGRIDLINES record.
+     */
+    private function writeGridset(): void
+    {
+        $record = 0x0082; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $fGridSet = !$this->phpSheet->getPrintGridlines(); // Boolean flag
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $fGridSet);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the AUTOFILTERINFO BIFF record. This is used to configure the number of autofilter select used in the sheet.
+     */
+    private function writeAutoFilterInfo(): void
+    {
+        $record = 0x009D; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $rangeBounds = Coordinate::rangeBoundaries($this->phpSheet->getAutoFilter()->getRange());
+        $iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $iNumFilters);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the GUTS BIFF record. This is used to configure the gutter margins
+     * where Excel outline symbols are displayed. The visibility of the gutters is
+     * controlled by a flag in WSBOOL.
+     *
+     * @see writeWsbool()
+     */
+    private function writeGuts(): void
+    {
+        $record = 0x0080; // Record identifier
+        $length = 0x0008; // Bytes to follow
+
+        $dxRwGut = 0x0000; // Size of row gutter
+        $dxColGut = 0x0000; // Size of col gutter
+
+        // determine maximum row outline level
+        $maxRowOutlineLevel = 0;
+        foreach ($this->phpSheet->getRowDimensions() as $rowDimension) {
+            $maxRowOutlineLevel = max($maxRowOutlineLevel, $rowDimension->getOutlineLevel());
+        }
+
+        $col_level = 0;
+
+        // Calculate the maximum column outline level. The equivalent calculation
+        // for the row outline level is carried out in writeRow().
+        $colcount = count($this->columnInfo);
+        for ($i = 0; $i < $colcount; ++$i) {
+            $col_level = max($this->columnInfo[$i][5], $col_level);
+        }
+
+        // Set the limits for the outline levels (0 <= x <= 7).
+        $col_level = max(0, min($col_level, 7));
+
+        // The displayed level is one greater than the max outline levels
+        if ($maxRowOutlineLevel) {
+            ++$maxRowOutlineLevel;
+        }
+        if ($col_level) {
+            ++$col_level;
+        }
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvvv', $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the WSBOOL BIFF record, mainly for fit-to-page. Used in conjunction
+     * with the SETUP record.
+     */
+    private function writeWsbool(): void
+    {
+        $record = 0x0081; // Record identifier
+        $length = 0x0002; // Bytes to follow
+        $grbit = 0x0000;
+
+        // The only option that is of interest is the flag for fit to page. So we
+        // set all the options in one go.
+        //
+        // Set the option flags
+        $grbit |= 0x0001; // Auto page breaks visible
+        if ($this->outlineStyle) {
+            $grbit |= 0x0020; // Auto outline styles
+        }
+        if ($this->phpSheet->getShowSummaryBelow()) {
+            $grbit |= 0x0040; // Outline summary below
+        }
+        if ($this->phpSheet->getShowSummaryRight()) {
+            $grbit |= 0x0080; // Outline summary right
+        }
+        if ($this->phpSheet->getPageSetup()->getFitToPage()) {
+            $grbit |= 0x0100; // Page setup fit to page
+        }
+        if ($this->outlineOn) {
+            $grbit |= 0x0400; // Outline symbols displayed
+        }
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $grbit);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the HORIZONTALPAGEBREAKS and VERTICALPAGEBREAKS BIFF records.
+     */
+    private function writeBreaks(): void
+    {
+        // initialize
+        $vbreaks = [];
+        $hbreaks = [];
+
+        foreach ($this->phpSheet->getRowBreaks() as $cell => $break) {
+            // Fetch coordinates
+            $coordinates = Coordinate::coordinateFromString($cell);
+            $hbreaks[] = $coordinates[1];
+        }
+        foreach ($this->phpSheet->getColumnBreaks() as $cell => $break) {
+            // Fetch coordinates
+            $coordinates = Coordinate::indexesFromString($cell);
+            $vbreaks[] = $coordinates[0] - 1;
+        }
+
+        //horizontal page breaks
+        if (!empty($hbreaks)) {
+            // Sort and filter array of page breaks
+            sort($hbreaks, SORT_NUMERIC);
+            if ($hbreaks[0] == 0) { // don't use first break if it's 0
+                array_shift($hbreaks);
+            }
+
+            $record = 0x001B; // Record identifier
+            $cbrk = count($hbreaks); // Number of page breaks
+            $length = 2 + 6 * $cbrk; // Bytes to follow
+
+            $header = pack('vv', $record, $length);
+            $data = pack('v', $cbrk);
+
+            // Append each page break
+            foreach ($hbreaks as $hbreak) {
+                $data .= pack('vvv', $hbreak, 0x0000, 0x00FF);
+            }
+
+            $this->append($header . $data);
+        }
+
+        // vertical page breaks
+        if (!empty($vbreaks)) {
+            // 1000 vertical pagebreaks appears to be an internal Excel 5 limit.
+            // It is slightly higher in Excel 97/200, approx. 1026
+            $vbreaks = array_slice($vbreaks, 0, 1000);
+
+            // Sort and filter array of page breaks
+            sort($vbreaks, SORT_NUMERIC);
+            if ($vbreaks[0] == 0) { // don't use first break if it's 0
+                array_shift($vbreaks);
+            }
+
+            $record = 0x001A; // Record identifier
+            $cbrk = count($vbreaks); // Number of page breaks
+            $length = 2 + 6 * $cbrk; // Bytes to follow
+
+            $header = pack('vv', $record, $length);
+            $data = pack('v', $cbrk);
+
+            // Append each page break
+            foreach ($vbreaks as $vbreak) {
+                $data .= pack('vvv', $vbreak, 0x0000, 0xFFFF);
+            }
+
+            $this->append($header . $data);
+        }
+    }
+
+    /**
+     * Set the Biff PROTECT record to indicate that the worksheet is protected.
+     */
+    private function writeProtect(): void
+    {
+        // Exit unless sheet protection has been specified
+        if ($this->phpSheet->getProtection()->getSheet() !== true) {
+            return;
+        }
+
+        $record = 0x0012; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $fLock = 1; // Worksheet is protected
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $fLock);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write SCENPROTECT.
+     */
+    private function writeScenProtect(): void
+    {
+        // Exit if sheet protection is not active
+        if ($this->phpSheet->getProtection()->getSheet() !== true) {
+            return;
+        }
+
+        // Exit if scenarios are not protected
+        if ($this->phpSheet->getProtection()->getScenarios() !== true) {
+            return;
+        }
+
+        $record = 0x00DD; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', 1);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write OBJECTPROTECT.
+     */
+    private function writeObjectProtect(): void
+    {
+        // Exit if sheet protection is not active
+        if ($this->phpSheet->getProtection()->getSheet() !== true) {
+            return;
+        }
+
+        // Exit if objects are not protected
+        if ($this->phpSheet->getProtection()->getObjects() !== true) {
+            return;
+        }
+
+        $record = 0x0063; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', 1);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write the worksheet PASSWORD record.
+     */
+    private function writePassword(): void
+    {
+        // Exit unless sheet protection and password have been specified
+        if ($this->phpSheet->getProtection()->getSheet() !== true || !$this->phpSheet->getProtection()->getPassword() || $this->phpSheet->getProtection()->getAlgorithm() !== '') {
+            return;
+        }
+
+        $record = 0x0013; // Record identifier
+        $length = 0x0002; // Bytes to follow
+
+        $wPassword = hexdec($this->phpSheet->getProtection()->getPassword()); // Encoded password
+
+        $header = pack('vv', $record, $length);
+        $data = pack('v', $wPassword);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Insert a 24bit bitmap image in a worksheet.
+     *
+     * @param int $row The row we are going to insert the bitmap into
+     * @param int $col The column we are going to insert the bitmap into
+     * @param GdImage|string $bitmap The bitmap filename or GD-image resource
+     * @param int $x the horizontal position (offset) of the image inside the cell
+     * @param int $y the vertical position (offset) of the image inside the cell
+     * @param float $scale_x The horizontal scale
+     * @param float $scale_y The vertical scale
+     */
+    public function insertBitmap(int $row, int $col, GdImage|string $bitmap, int $x = 0, int $y = 0, float $scale_x = 1, float $scale_y = 1): void
+    {
+        $bitmap_array = $bitmap instanceof GdImage
+            ? $this->processBitmapGd($bitmap)
+            : $this->processBitmap($bitmap);
+        [$width, $height, $size, $data] = $bitmap_array;
+
+        // Scale the frame of the image.
+        $width *= $scale_x;
+        $height *= $scale_y;
+
+        // Calculate the vertices of the image and write the OBJ record
+        $this->positionImage($col, $row, $x, $y, (int) $width, (int) $height);
+
+        // Write the IMDATA record to store the bitmap data
+        $record = 0x007F;
+        $length = 8 + $size;
+        $cf = 0x09;
+        $env = 0x01;
+        $lcb = $size;
+
+        $header = pack('vvvvV', $record, $length, $cf, $env, $lcb);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Calculate the vertices that define the position of the image as required by
+     * the OBJ record.
+     *
+     *         +------------+------------+
+     *         |     A      |      B     |
+     *   +-----+------------+------------+
+     *   |     |(x1,y1)     |            |
+     *   |  1  |(A1)._______|______      |
+     *   |     |    |              |     |
+     *   |     |    |              |     |
+     *   +-----+----|    BITMAP    |-----+
+     *   |     |    |              |     |
+     *   |  2  |    |______________.     |
+     *   |     |            |        (B2)|
+     *   |     |            |     (x2,y2)|
+     *   +---- +------------+------------+
+     *
+     * Example of a bitmap that covers some of the area from cell A1 to cell B2.
+     *
+     * Based on the width and height of the bitmap we need to calculate 8 vars:
+     *     $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
+     * The width and height of the cells are also variable and have to be taken into
+     * account.
+     * The values of $col_start and $row_start are passed in from the calling
+     * function. The values of $col_end and $row_end are calculated by subtracting
+     * the width and height of the bitmap from the width and height of the
+     * underlying cells.
+     * The vertices are expressed as a percentage of the underlying cell width as
+     * follows (rhs values are in pixels):
+     *
+     *       x1 = X / W *1024
+     *       y1 = Y / H *256
+     *       x2 = (X-1) / W *1024
+     *       y2 = (Y-1) / H *256
+     *
+     *       Where:  X is distance from the left side of the underlying cell
+     *               Y is distance from the top of the underlying cell
+     *               W is the width of the cell
+     *               H is the height of the cell
+     * The SDK incorrectly states that the height should be expressed as a
+     *        percentage of 1024.
+     *
+     * @param int $col_start Col containing upper left corner of object
+     * @param int $row_start Row containing top left corner of object
+     * @param int $x1 Distance to left side of object
+     * @param int $y1 Distance to top of object
+     * @param int $width Width of image frame
+     * @param int $height Height of image frame
+     */
+    public function positionImage(int $col_start, int $row_start, int $x1, int $y1, int $width, int $height): void
+    {
+        // Initialise end cell to the same as the start cell
+        $col_end = $col_start; // Col containing lower right corner of object
+        $row_end = $row_start; // Row containing bottom right corner of object
+
+        // Zero the specified offset if greater than the cell dimensions
+        if ($x1 >= Xls::sizeCol($this->phpSheet, Coordinate::stringFromColumnIndex($col_start + 1))) {
+            $x1 = 0;
+        }
+        if ($y1 >= Xls::sizeRow($this->phpSheet, $row_start + 1)) {
+            $y1 = 0;
+        }
+
+        $width = $width + $x1 - 1;
+        $height = $height + $y1 - 1;
+
+        // Subtract the underlying cell widths to find the end cell of the image
+        while ($width >= Xls::sizeCol($this->phpSheet, Coordinate::stringFromColumnIndex($col_end + 1))) {
+            $width -= Xls::sizeCol($this->phpSheet, Coordinate::stringFromColumnIndex($col_end + 1));
+            ++$col_end;
+        }
+
+        // Subtract the underlying cell heights to find the end cell of the image
+        while ($height >= Xls::sizeRow($this->phpSheet, $row_end + 1)) {
+            $height -= Xls::sizeRow($this->phpSheet, $row_end + 1);
+            ++$row_end;
+        }
+
+        // Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
+        // with zero eight or width.
+        //
+        if (Xls::sizeCol($this->phpSheet, Coordinate::stringFromColumnIndex($col_start + 1)) == 0) {
+            return;
+        }
+        if (Xls::sizeCol($this->phpSheet, Coordinate::stringFromColumnIndex($col_end + 1)) == 0) {
+            return;
+        }
+        if (Xls::sizeRow($this->phpSheet, $row_start + 1) == 0) {
+            return;
+        }
+        if (Xls::sizeRow($this->phpSheet, $row_end + 1) == 0) {
+            return;
+        }
+
+        // Convert the pixel values to the percentage value expected by Excel
+        $x1 = $x1 / Xls::sizeCol($this->phpSheet, Coordinate::stringFromColumnIndex($col_start + 1)) * 1024;
+        $y1 = $y1 / Xls::sizeRow($this->phpSheet, $row_start + 1) * 256;
+        $x2 = $width / Xls::sizeCol($this->phpSheet, Coordinate::stringFromColumnIndex($col_end + 1)) * 1024; // Distance to right side of object
+        $y2 = $height / Xls::sizeRow($this->phpSheet, $row_end + 1) * 256; // Distance to bottom of object
+
+        $this->writeObjPicture($col_start, $x1, $row_start, $y1, $col_end, $x2, $row_end, $y2);
+    }
+
+    /**
+     * Store the OBJ record that precedes an IMDATA record. This could be generalise
+     * to support other Excel objects.
+     *
+     * @param int $colL Column containing upper left corner of object
+     * @param int $dxL Distance from left side of cell
+     * @param int $rwT Row containing top left corner of object
+     * @param float|int $dyT Distance from top of cell
+     * @param int $colR Column containing lower right corner of object
+     * @param int $dxR Distance from right of cell
+     * @param int $rwB Row containing bottom right corner of object
+     * @param int $dyB Distance from bottom of cell
+     */
+    private function writeObjPicture(int $colL, int $dxL, int $rwT, int|float $dyT, int $colR, int $dxR, int $rwB, int $dyB): void
+    {
+        $record = 0x005D; // Record identifier
+        $length = 0x003C; // Bytes to follow
+
+        $cObj = 0x0001; // Count of objects in file (set to 1)
+        $OT = 0x0008; // Object type. 8 = Picture
+        $id = 0x0001; // Object ID
+        $grbit = 0x0614; // Option flags
+
+        $cbMacro = 0x0000; // Length of FMLA structure
+        $Reserved1 = 0x0000; // Reserved
+        $Reserved2 = 0x0000; // Reserved
+
+        $icvBack = 0x09; // Background colour
+        $icvFore = 0x09; // Foreground colour
+        $fls = 0x00; // Fill pattern
+        $fAuto = 0x00; // Automatic fill
+        $icv = 0x08; // Line colour
+        $lns = 0xFF; // Line style
+        $lnw = 0x01; // Line weight
+        $fAutoB = 0x00; // Automatic border
+        $frs = 0x0000; // Frame style
+        $cf = 0x0009; // Image format, 9 = bitmap
+        $Reserved3 = 0x0000; // Reserved
+        $cbPictFmla = 0x0000; // Length of FMLA structure
+        $Reserved4 = 0x0000; // Reserved
+        $grbit2 = 0x0001; // Option flags
+        $Reserved5 = 0x0000; // Reserved
+
+        $header = pack('vv', $record, $length);
+        $data = pack('V', $cObj);
+        $data .= pack('v', $OT);
+        $data .= pack('v', $id);
+        $data .= pack('v', $grbit);
+        $data .= pack('v', $colL);
+        $data .= pack('v', $dxL);
+        $data .= pack('v', $rwT);
+        $data .= pack('v', $dyT);
+        $data .= pack('v', $colR);
+        $data .= pack('v', $dxR);
+        $data .= pack('v', $rwB);
+        $data .= pack('v', $dyB);
+        $data .= pack('v', $cbMacro);
+        $data .= pack('V', $Reserved1);
+        $data .= pack('v', $Reserved2);
+        $data .= pack('C', $icvBack);
+        $data .= pack('C', $icvFore);
+        $data .= pack('C', $fls);
+        $data .= pack('C', $fAuto);
+        $data .= pack('C', $icv);
+        $data .= pack('C', $lns);
+        $data .= pack('C', $lnw);
+        $data .= pack('C', $fAutoB);
+        $data .= pack('v', $frs);
+        $data .= pack('V', $cf);
+        $data .= pack('v', $Reserved3);
+        $data .= pack('v', $cbPictFmla);
+        $data .= pack('v', $Reserved4);
+        $data .= pack('v', $grbit2);
+        $data .= pack('V', $Reserved5);
+
+        $this->append($header . $data);
+    }
+
+    /**
+     * Convert a GD-image into the internal format.
+     *
+     * @param GdImage $image The image to process
+     *
+     * @return array Array with data and properties of the bitmap
+     */
+    public function processBitmapGd(GdImage $image): array
+    {
+        $width = imagesx($image);
+        $height = imagesy($image);
+
+        $data = pack('Vvvvv', 0x000C, $width, $height, 0x01, 0x18);
+        for ($j = $height; --$j;) {
+            for ($i = 0; $i < $width; ++$i) {
+                /** @phpstan-ignore-next-line */
+                $color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
+                if ($color !== false) {
+                    foreach (['red', 'green', 'blue'] as $key) {
+                        $color[$key] = $color[$key] + (int) round((255 - $color[$key]) * $color['alpha'] / 127);
+                    }
+                    $data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
+                }
+            }
+            if (3 * $width % 4) {
+                $data .= str_repeat("\x00", 4 - 3 * $width % 4);
+            }
+        }
+
+        return [$width, $height, strlen($data), $data];
+    }
+
+    /**
+     * Convert a 24 bit bitmap into the modified internal format used by Windows.
+     * This is described in BITMAPCOREHEADER and BITMAPCOREINFO structures in the
+     * MSDN library.
+     *
+     * @param string $bitmap The bitmap to process
+     *
+     * @return array Array with data and properties of the bitmap
+     */
+    public function processBitmap(string $bitmap): array
+    {
+        // Open file.
+        $bmp_fd = @fopen($bitmap, 'rb');
+        if ($bmp_fd === false || 0 === (int) filesize($bitmap)) {
+            throw new WriterException("Couldn't import $bitmap");
+        }
+
+        // Slurp the file into a string.
+        $data = (string) fread($bmp_fd, (int) filesize($bitmap));
+
+        // Check that the file is big enough to be a bitmap.
+        if (strlen($data) <= 0x36) {
+            throw new WriterException("$bitmap doesn't contain enough data.\n");
+        }
+
+        // The first 2 bytes are used to identify the bitmap.
+
+        $identity = unpack('A2ident', $data);
+        if ($identity === false || $identity['ident'] != 'BM') {
+            throw new WriterException("$bitmap doesn't appear to be a valid bitmap image.\n");
+        }
+
+        // Remove bitmap data: ID.
+        $data = substr($data, 2);
+
+        // Read and remove the bitmap size. This is more reliable than reading
+        // the data size at offset 0x22.
+        //
+        $size_array = unpack('Vsa', substr($data, 0, 4)) ?: [];
+        $size = $size_array['sa'];
+        $data = substr($data, 4);
+        $size -= 0x36; // Subtract size of bitmap header.
+        $size += 0x0C; // Add size of BIFF header.
+
+        // Remove bitmap data: reserved, offset, header length.
+        $data = substr($data, 12);
+
+        // Read and remove the bitmap width and height. Verify the sizes.
+        $width_and_height = unpack('V2', substr($data, 0, 8)) ?: [];
+        $width = $width_and_height[1];
+        $height = $width_and_height[2];
+        $data = substr($data, 8);
+        if ($width > 0xFFFF) {
+            throw new WriterException("$bitmap: largest image width supported is 65k.\n");
+        }
+        if ($height > 0xFFFF) {
+            throw new WriterException("$bitmap: largest image height supported is 65k.\n");
+        }
+
+        // Read and remove the bitmap planes and bpp data. Verify them.
+        $planes_and_bitcount = unpack('v2', substr($data, 0, 4));
+        $data = substr($data, 4);
+        if ($planes_and_bitcount === false || $planes_and_bitcount[2] != 24) { // Bitcount
+            throw new WriterException("$bitmap isn't a 24bit true color bitmap.\n");
+        }
+        if ($planes_and_bitcount[1] != 1) {
+            throw new WriterException("$bitmap: only 1 plane supported in bitmap image.\n");
+        }
+
+        // Read and remove the bitmap compression. Verify compression.
+        $compression = unpack('Vcomp', substr($data, 0, 4));
+        $data = substr($data, 4);
+
+        if ($compression === false || $compression['comp'] != 0) {
+            throw new WriterException("$bitmap: compression not supported in bitmap image.\n");
+        }
+
+        // Remove bitmap data: data size, hres, vres, colours, imp. colours.
+        $data = substr($data, 20);
+
+        // Add the BITMAPCOREHEADER data
+        $header = pack('Vvvvv', 0x000C, $width, $height, 0x01, 0x18);
+        $data = $header . $data;
+
+        return [$width, $height, $size, $data];
+    }
+
+    /**
+     * Store the window zoom factor. This should be a reduced fraction but for
+     * simplicity we will store all fractions with a numerator of 100.
+     */
+    private function writeZoom(): void
+    {
+        // If scale is 100 we don't need to write a record
+        if ($this->phpSheet->getSheetView()->getZoomScale() == 100) {
+            return;
+        }
+
+        $record = 0x00A0; // Record identifier
+        $length = 0x0004; // Bytes to follow
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vv', $this->phpSheet->getSheetView()->getZoomScale(), 100);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Get Escher object.
+     */
+    public function getEscher(): ?\PhpOffice\PhpSpreadsheet\Shared\Escher
+    {
+        return $this->escher;
+    }
+
+    /**
+     * Set Escher object.
+     */
+    public function setEscher(?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher): void
+    {
+        $this->escher = $escher;
+    }
+
+    /**
+     * Write MSODRAWING record.
+     */
+    private function writeMsoDrawing(): void
+    {
+        // write the Escher stream if necessary
+        if (isset($this->escher)) {
+            $writer = new Escher($this->escher);
+            $data = $writer->close();
+            $spOffsets = $writer->getSpOffsets();
+            $spTypes = $writer->getSpTypes();
+            // write the neccesary MSODRAWING, OBJ records
+
+            // split the Escher stream
+            $spOffsets[0] = 0;
+            $nm = count($spOffsets) - 1; // number of shapes excluding first shape
+            for ($i = 1; $i <= $nm; ++$i) {
+                // MSODRAWING record
+                $record = 0x00EC; // Record identifier
+
+                // chunk of Escher stream for one shape
+                $dataChunk = substr($data, $spOffsets[$i - 1], $spOffsets[$i] - $spOffsets[$i - 1]);
+
+                $length = strlen($dataChunk);
+                $header = pack('vv', $record, $length);
+
+                $this->append($header . $dataChunk);
+
+                // OBJ record
+                $record = 0x005D; // record identifier
+                $objData = '';
+
+                // ftCmo
+                if ($spTypes[$i] == 0x00C9) {
+                    // Add ftCmo (common object data) subobject
+                    $objData
+                        .= pack(
+                            'vvvvvVVV',
+                            0x0015, // 0x0015 = ftCmo
+                            0x0012, // length of ftCmo data
+                            0x0014, // object type, 0x0014 = filter
+                            $i, // object id number, Excel seems to use 1-based index, local for the sheet
+                            0x2101, // option flags, 0x2001 is what OpenOffice.org uses
+                            0, // reserved
+                            0, // reserved
+                            0  // reserved
+                        );
+
+                    // Add ftSbs Scroll bar subobject
+                    $objData .= pack('vv', 0x00C, 0x0014);
+                    $objData .= pack('H*', '0000000000000000640001000A00000010000100');
+                    // Add ftLbsData (List box data) subobject
+                    $objData .= pack('vv', 0x0013, 0x1FEE);
+                    $objData .= pack('H*', '00000000010001030000020008005700');
+                } else {
+                    // Add ftCmo (common object data) subobject
+                    $objData
+                        .= pack(
+                            'vvvvvVVV',
+                            0x0015, // 0x0015 = ftCmo
+                            0x0012, // length of ftCmo data
+                            0x0008, // object type, 0x0008 = picture
+                            $i, // object id number, Excel seems to use 1-based index, local for the sheet
+                            0x6011, // option flags, 0x6011 is what OpenOffice.org uses
+                            0, // reserved
+                            0, // reserved
+                            0  // reserved
+                        );
+                }
+
+                // ftEnd
+                $objData
+                    .= pack(
+                        'vv',
+                        0x0000, // 0x0000 = ftEnd
+                        0x0000  // length of ftEnd data
+                    );
+
+                $length = strlen($objData);
+                $header = pack('vv', $record, $length);
+                $this->append($header . $objData);
+            }
+        }
+    }
+
+    /**
+     * Store the DATAVALIDATIONS and DATAVALIDATION records.
+     */
+    private function writeDataValidity(): void
+    {
+        // Datavalidation collection
+        $dataValidationCollection = $this->phpSheet->getDataValidationCollection();
+
+        // Write data validations?
+        if (!empty($dataValidationCollection)) {
+            // DATAVALIDATIONS record
+            $record = 0x01B2; // Record identifier
+            $length = 0x0012; // Bytes to follow
+
+            $grbit = 0x0000; // Prompt box at cell, no cached validity data at DV records
+            $horPos = 0x00000000; // Horizontal position of prompt box, if fixed position
+            $verPos = 0x00000000; // Vertical position of prompt box, if fixed position
+            $objId = 0xFFFFFFFF; // Object identifier of drop down arrow object, or -1 if not visible
+
+            $header = pack('vv', $record, $length);
+            $data = pack('vVVVV', $grbit, $horPos, $verPos, $objId, count($dataValidationCollection));
+            $this->append($header . $data);
+
+            // DATAVALIDATION records
+            $record = 0x01BE; // Record identifier
+
+            foreach ($dataValidationCollection as $cellCoordinate => $dataValidation) {
+                // options
+                $options = 0x00000000;
+
+                // data type
+                $type = CellDataValidation::type($dataValidation);
+
+                $options |= $type << 0;
+
+                // error style
+                $errorStyle = CellDataValidation::errorStyle($dataValidation);
+
+                $options |= $errorStyle << 4;
+
+                // explicit formula?
+                if ($type == 0x03 && preg_match('/^\".*\"$/', $dataValidation->getFormula1())) {
+                    $options |= 0x01 << 7;
+                }
+
+                // empty cells allowed
+                $options |= $dataValidation->getAllowBlank() << 8;
+
+                // show drop down
+                $options |= (!$dataValidation->getShowDropDown()) << 9;
+
+                // show input message
+                $options |= $dataValidation->getShowInputMessage() << 18;
+
+                // show error message
+                $options |= $dataValidation->getShowErrorMessage() << 19;
+
+                // condition operator
+                $operator = CellDataValidation::operator($dataValidation);
+
+                $options |= $operator << 20;
+
+                $data = pack('V', $options);
+
+                // prompt title
+                $promptTitle = $dataValidation->getPromptTitle() !== ''
+                    ? $dataValidation->getPromptTitle() : chr(0);
+                $data .= StringHelper::UTF8toBIFF8UnicodeLong($promptTitle);
+
+                // error title
+                $errorTitle = $dataValidation->getErrorTitle() !== ''
+                    ? $dataValidation->getErrorTitle() : chr(0);
+                $data .= StringHelper::UTF8toBIFF8UnicodeLong($errorTitle);
+
+                // prompt text
+                $prompt = $dataValidation->getPrompt() !== ''
+                    ? $dataValidation->getPrompt() : chr(0);
+                $data .= StringHelper::UTF8toBIFF8UnicodeLong($prompt);
+
+                // error text
+                $error = $dataValidation->getError() !== ''
+                    ? $dataValidation->getError() : chr(0);
+                $data .= StringHelper::UTF8toBIFF8UnicodeLong($error);
+
+                // formula 1
+                try {
+                    $formula1 = $dataValidation->getFormula1();
+                    if ($type == 0x03) { // list type
+                        $formula1 = str_replace(',', chr(0), $formula1);
+                    }
+                    $this->parser->parse($formula1);
+                    $formula1 = $this->parser->toReversePolish();
+                    $sz1 = strlen($formula1);
+                } catch (PhpSpreadsheetException $e) {
+                    $sz1 = 0;
+                    $formula1 = '';
+                }
+                $data .= pack('vv', $sz1, 0x0000);
+                $data .= $formula1;
+
+                // formula 2
+                try {
+                    $formula2 = $dataValidation->getFormula2();
+                    if ($formula2 === '') {
+                        throw new WriterException('No formula2');
+                    }
+                    $this->parser->parse($formula2);
+                    $formula2 = $this->parser->toReversePolish();
+                    $sz2 = strlen($formula2);
+                } catch (PhpSpreadsheetException) {
+                    $sz2 = 0;
+                    $formula2 = '';
+                }
+                $data .= pack('vv', $sz2, 0x0000);
+                $data .= $formula2;
+
+                // cell range address list
+                $data .= pack('v', 0x0001);
+                $data .= $this->writeBIFF8CellRangeAddressFixed($cellCoordinate);
+
+                $length = strlen($data);
+                $header = pack('vv', $record, $length);
+
+                $this->append($header . $data);
+            }
+        }
+    }
+
+    /**
+     * Write PLV Record.
+     */
+    private function writePageLayoutView(): void
+    {
+        $record = 0x088B; // Record identifier
+        $length = 0x0010; // Bytes to follow
+
+        $rt = 0x088B; // 2
+        $grbitFrt = 0x0000; // 2
+        //$reserved = 0x0000000000000000; // 8
+        $wScalvePLV = $this->phpSheet->getSheetView()->getZoomScale(); // 2
+
+        // The options flags that comprise $grbit
+        if ($this->phpSheet->getSheetView()->getView() == SheetView::SHEETVIEW_PAGE_LAYOUT) {
+            $fPageLayoutView = 1;
+        } else {
+            $fPageLayoutView = 0;
+        }
+        $fRulerVisible = 0;
+        $fWhitespaceHidden = 0;
+
+        $grbit = $fPageLayoutView; // 2
+        $grbit |= $fRulerVisible << 1;
+        $grbit |= $fWhitespaceHidden << 3;
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vvVVvv', $rt, $grbitFrt, 0x00000000, 0x00000000, $wScalvePLV, $grbit);
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write CFRule Record.
+     *
+     * @see https://www.openoffice.org/sc/excelfileformat.pdf Search for CFHEADER followed by CFRULE
+     */
+    private function writeCFRule(
+        ConditionalHelper $conditionalFormulaHelper,
+        Conditional $conditional,
+        string $cellRange
+    ): void {
+        $record = 0x01B1; // Record identifier
+        $type = null; // Type of the CF
+        $operatorType = null; // Comparison operator
+
+        if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION) {
+            $type = 0x02;
+            $operatorType = 0x00;
+        } elseif ($conditional->getConditionType() == Conditional::CONDITION_CELLIS) {
+            $type = 0x01;
+
+            switch ($conditional->getOperatorType()) {
+                case Conditional::OPERATOR_NONE:
+                    $operatorType = 0x00;
+
+                    break;
+                case Conditional::OPERATOR_EQUAL:
+                    $operatorType = 0x03;
+
+                    break;
+                case Conditional::OPERATOR_GREATERTHAN:
+                    $operatorType = 0x05;
+
+                    break;
+                case Conditional::OPERATOR_GREATERTHANOREQUAL:
+                    $operatorType = 0x07;
+
+                    break;
+                case Conditional::OPERATOR_LESSTHAN:
+                    $operatorType = 0x06;
+
+                    break;
+                case Conditional::OPERATOR_LESSTHANOREQUAL:
+                    $operatorType = 0x08;
+
+                    break;
+                case Conditional::OPERATOR_NOTEQUAL:
+                    $operatorType = 0x04;
+
+                    break;
+                case Conditional::OPERATOR_BETWEEN:
+                    $operatorType = 0x01;
+
+                    break;
+                    // not OPERATOR_NOTBETWEEN 0x02
+            }
+        }
+
+        // $szValue1 : size of the formula data for first value or formula
+        // $szValue2 : size of the formula data for second value or formula
+        $arrConditions = $conditional->getConditions();
+        $numConditions = count($arrConditions);
+
+        $szValue1 = 0x0000;
+        $szValue2 = 0x0000;
+        $operand1 = null;
+        $operand2 = null;
+
+        if ($numConditions === 1) {
+            $conditionalFormulaHelper->processCondition($arrConditions[0], $cellRange);
+            $szValue1 = $conditionalFormulaHelper->size();
+            $operand1 = $conditionalFormulaHelper->tokens();
+        } elseif ($numConditions === 2 && ($conditional->getOperatorType() === Conditional::OPERATOR_BETWEEN)) {
+            $conditionalFormulaHelper->processCondition($arrConditions[0], $cellRange);
+            $szValue1 = $conditionalFormulaHelper->size();
+            $operand1 = $conditionalFormulaHelper->tokens();
+            $conditionalFormulaHelper->processCondition($arrConditions[1], $cellRange);
+            $szValue2 = $conditionalFormulaHelper->size();
+            $operand2 = $conditionalFormulaHelper->tokens();
+        }
+
+        // $flags : Option flags
+        // Alignment
+        /*$bAlignHz = ($conditional->getStyle()->getAlignment()->getHorizontal() === null ? 1 : 0);
+        $bAlignVt = ($conditional->getStyle()->getAlignment()->getVertical() === null ? 1 : 0);
+        $bAlignWrapTx = ($conditional->getStyle()->getAlignment()->getWrapText() === false ? 1 : 0);
+        $bTxRotation = ($conditional->getStyle()->getAlignment()->getTextRotation() === null ? 1 : 0);
+        $bIndent = ($conditional->getStyle()->getAlignment()->getIndent() === 0 ? 1 : 0);
+        $bShrinkToFit = ($conditional->getStyle()->getAlignment()->getShrinkToFit() === false ? 1 : 0);
+        if ($bAlignHz == 0 || $bAlignVt == 0 || $bAlignWrapTx == 0 || $bTxRotation == 0 || $bIndent == 0 || $bShrinkToFit == 0) {
+            $bFormatAlign = 1;
+        } else {
+            $bFormatAlign = 0;
+        }*/
+        // Protection
+        /*$bProtLocked = ($conditional->getStyle()->getProtection()->getLocked() === null ? 1 : 0);
+        $bProtHidden = ($conditional->getStyle()->getProtection()->getHidden() === null ? 1 : 0);
+        if ($bProtLocked == 0 || $bProtHidden == 0) {
+            $bFormatProt = 1;
+        } else {
+            $bFormatProt = 0;
+        }*/
+        // Border
+        $bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() !== Border::BORDER_OMIT) ? 1 : 0;
+        $bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getBorderStyle() !== Border::BORDER_OMIT) ? 1 : 0;
+        $bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getBorderStyle() !== Border::BORDER_OMIT) ? 1 : 0;
+        $bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() !== Border::BORDER_OMIT) ? 1 : 0;
+        //$diagonalDirection = $conditional->getStyle()->getBorders()->getDiagonalDirection();
+        // Excel does not support conditional diagonal border even for xlsx
+        $bBorderDiagTop = self::$always0; //$diagonalDirection === Borders::DIAGONAL_DOWN || $diagonalDirection === Borders::DIAGONAL_BOTH;
+        $bBorderDiagBottom = self::$always0; //$diagonalDirection === Borders::DIAGONAL_UP || $diagonalDirection === Borders::DIAGONAL_BOTH;
+
+        if ($bBorderLeft === 1 || $bBorderRight === 1 || $bBorderTop === 1 || $bBorderBottom === 1 || $bBorderDiagTop === 1 || $bBorderDiagBottom === 1) {
+            $bFormatBorder = 1;
+        } else {
+            $bFormatBorder = 0;
+        }
+        // Pattern
+        $bFillStyle = ($conditional->getStyle()->getFill()->getFillType() === null ? 0 : 1);
+        $bFillColor = ($conditional->getStyle()->getFill()->getStartColor()->getARGB() === null ? 0 : 1);
+        $bFillColorBg = ($conditional->getStyle()->getFill()->getEndColor()->getARGB() === null ? 0 : 1);
+        if ($bFillStyle == 1 || $bFillColor == 1 || $bFillColorBg == 1) {
+            $bFormatFill = 1;
+        } else {
+            $bFormatFill = 0;
+        }
+        // Font
+        if (
+            $conditional->getStyle()->getFont()->getName() !== null
+            || $conditional->getStyle()->getFont()->getSize() !== null
+            || $conditional->getStyle()->getFont()->getBold() !== null
+            || $conditional->getStyle()->getFont()->getItalic() !== null
+            || $conditional->getStyle()->getFont()->getSuperscript() !== null
+            || $conditional->getStyle()->getFont()->getSubscript() !== null
+            || $conditional->getStyle()->getFont()->getUnderline() !== null
+            || $conditional->getStyle()->getFont()->getStrikethrough() !== null
+            || $conditional->getStyle()->getFont()->getColor()->getARGB() !== null
+        ) {
+            $bFormatFont = 1;
+        } else {
+            $bFormatFont = 0;
+        }
+        // Alignment
+        $flags = 0;
+        //$flags |= (1 == $bAlignHz ? 0x00000001 : 0);
+        //$flags |= (1 == $bAlignVt ? 0x00000002 : 0);
+        //$flags |= (1 == $bAlignWrapTx ? 0x00000004 : 0);
+        //$flags |= (1 == $bTxRotation ? 0x00000008 : 0);
+        // Justify last line flag
+        $flags |= (1 == self::$always1 ? 0x00000010 : 0);
+        //$flags |= (1 == $bIndent ? 0x00000020 : 0);
+        //$flags |= (1 == $bShrinkToFit ? 0x00000040 : 0);
+        // Default
+        $flags |= (1 == self::$always1 ? 0x00000080 : 0);
+        // Protection
+        //$flags |= (1 == $bProtLocked ? 0x00000100 : 0);
+        //$flags |= (1 == $bProtHidden ? 0x00000200 : 0);
+        // Border, note that flags are opposite of what you might expect
+        $flags |= (0 == $bBorderLeft ? 0x00000400 : 0);
+        $flags |= (0 == $bBorderRight ? 0x00000800 : 0);
+        $flags |= (0 == $bBorderTop ? 0x00001000 : 0);
+        $flags |= (0 == $bBorderBottom ? 0x00002000 : 0);
+        $flags |= (0 === $bBorderDiagTop ? 0x00004000 : 0); // Top left to Bottom right border
+        $flags |= (0 === $bBorderDiagBottom ? 0x00008000 : 0); // Bottom left to Top right border
+        // Pattern
+        $flags |= (1 == $bFillStyle ? 0x00010000 : 0);
+        $flags |= (1 == $bFillColor ? 0x00020000 : 0);
+        $flags |= (1 == $bFillColorBg ? 0x00040000 : 0);
+        $flags |= (1 == self::$always1 ? 0x00380000 : 0);
+        // Font
+        $flags |= (1 == $bFormatFont ? 0x04000000 : 0);
+        // Alignment:
+        //$flags |= (1 == $bFormatAlign ? 0x08000000 : 0);
+        // Border
+        $flags |= (1 == $bFormatBorder ? 0x10000000 : 0);
+        // Pattern
+        $flags |= (1 == $bFormatFill ? 0x20000000 : 0);
+        // Protection
+        //$flags |= (1 == $bFormatProt ? 0x40000000 : 0);
+        // Text direction
+        $flags |= (1 == self::$always0 ? 0x80000000 : 0);
+
+        $dataBlockFont = null;
+        //$dataBlockAlign = null;
+        $dataBlockBorder = null;
+        $dataBlockFill = null;
+
+        // Data Blocks
+        if ($bFormatFont == 1) {
+            // Font Name
+            if ($conditional->getStyle()->getFont()->getName() === null) {
+                $dataBlockFont = pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
+                $dataBlockFont .= pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
+            } else {
+                $dataBlockFont = StringHelper::UTF8toBIFF8UnicodeLong($conditional->getStyle()->getFont()->getName());
+            }
+            // Font Size
+            if ($conditional->getStyle()->getFont()->getSize() === null) {
+                $dataBlockFont .= pack('V', 20 * 11);
+            } else {
+                $dataBlockFont .= pack('V', 20 * $conditional->getStyle()->getFont()->getSize());
+            }
+            // Font Options
+            $italicStrike = 0;
+            if ($conditional->getStyle()->getFont()->getItalic() === true) {
+                $italicStrike |= 2;
+            }
+            if ($conditional->getStyle()->getFont()->getStrikethrough() === true) {
+                $italicStrike |= 0x80;
+            }
+            $dataBlockFont .= pack('V', $italicStrike);
+            // Font weight
+            if ($conditional->getStyle()->getFont()->getBold() === true) {
+                $dataBlockFont .= pack('v', 0x02BC);
+            } elseif ($conditional->getStyle()->getFont()->getBold() === null) {
+                $dataBlockFont .= pack('v', 0x0000);
+            } else {
+                $dataBlockFont .= pack('v', 0x0190);
+            }
+            // Escapement type
+            if ($conditional->getStyle()->getFont()->getSubscript() === true) {
+                $dataBlockFont .= pack('v', 0x02);
+                $fontEscapement = 0;
+            } elseif ($conditional->getStyle()->getFont()->getSuperscript() === true) {
+                $dataBlockFont .= pack('v', 0x01);
+                $fontEscapement = 0;
+            } else {
+                $dataBlockFont .= pack('v', 0x00);
+                $fontEscapement = 1;
+            }
+            // Underline type
+            switch ($conditional->getStyle()->getFont()->getUnderline()) {
+                case \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_NONE:
+                    $dataBlockFont .= pack('C', 0x00);
+                    $fontUnderline = 0;
+
+                    break;
+                case \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLE:
+                    $dataBlockFont .= pack('C', 0x02);
+                    $fontUnderline = 0;
+
+                    break;
+                case \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLEACCOUNTING:
+                    $dataBlockFont .= pack('C', 0x22);
+                    $fontUnderline = 0;
+
+                    break;
+                case \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE:
+                    $dataBlockFont .= pack('C', 0x01);
+                    $fontUnderline = 0;
+
+                    break;
+                case \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLEACCOUNTING:
+                    $dataBlockFont .= pack('C', 0x21);
+                    $fontUnderline = 0;
+
+                    break;
+                default:
+                    $dataBlockFont .= pack('C', 0x00);
+                    $fontUnderline = 1;
+
+                    break;
+            }
+            // Not used (3)
+            $dataBlockFont .= pack('vC', 0x0000, 0x00);
+            // Font color index
+            $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getFont()->getColor()->getRgb(), 0);
+            $dataBlockFont .= pack('V', $colorIdx);
+            // Not used (4)
+            $dataBlockFont .= pack('V', 0x00000000);
+            // Options flags for modified font attributes
+            $optionsFlags = 0;
+            $optionsFlags |= ($conditional->getStyle()->getFont()->getBold() === null && $conditional->getStyle()->getFont()->getItalic() === null) ? 2 : 0;
+            $optionsFlags |= (1 == self::$always1 ? 0x00000008 : 0);
+            $optionsFlags |= (1 == self::$always1 ? 0x00000010 : 0);
+            $optionsFlags |= (1 == self::$always0 ? 0x00000020 : 0);
+            $optionsFlags |= ($conditional->getStyle()->getFont()->getStrikethrough() === null) ? 0x80 : 0;
+            $dataBlockFont .= pack('V', $optionsFlags);
+            // Escapement type
+            $dataBlockFont .= pack('V', $fontEscapement);
+            // Underline type
+            $dataBlockFont .= pack('V', $fontUnderline);
+            // Always
+            $dataBlockFont .= pack('V', 0x00000000);
+            // Always
+            $dataBlockFont .= pack('V', 0x00000000);
+            // Not used (8)
+            $dataBlockFont .= pack('VV', 0x00000000, 0x00000000);
+            // Always
+            $dataBlockFont .= pack('v', 0x0001);
+        }
+        /*if ($bFormatAlign === 1) {
+            // Alignment and text break
+            $blockAlign = Style\CellAlignment::horizontal($conditional->getStyle()->getAlignment());
+            $blockAlign |= Style\CellAlignment::wrap($conditional->getStyle()->getAlignment()) << 3;
+            $blockAlign |= Style\CellAlignment::vertical($conditional->getStyle()->getAlignment()) << 4;
+            $blockAlign |= 0 << 7;
+
+            // Text rotation angle
+            $blockRotation = $conditional->getStyle()->getAlignment()->getTextRotation();
+
+            // Indentation
+            $blockIndent = $conditional->getStyle()->getAlignment()->getIndent();
+            if ($conditional->getStyle()->getAlignment()->getShrinkToFit() === true) {
+                $blockIndent |= 1 << 4;
+            } else {
+                $blockIndent |= 0 << 4;
+            }
+            $blockIndent |= 0 << 6;
+
+            // Relative indentation
+            $blockIndentRelative = 255;
+
+            $dataBlockAlign = pack('CCvvv', $blockAlign, $blockRotation, $blockIndent, $blockIndentRelative, 0x0000);
+        }*/
+        if ($bFormatBorder === 1) {
+            $blockLineStyle = Style\CellBorder::style($conditional->getStyle()->getBorders()->getLeft());
+            $blockLineStyle |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getRight()) << 4;
+            $blockLineStyle |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getTop()) << 8;
+            $blockLineStyle |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getBottom()) << 12;
+
+            if ($bBorderLeft !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getLeft()->getColor()->getRgb(), 0);
+                $blockLineStyle |= $colorIdx << 16;
+            }
+            if ($bBorderRight !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getRight()->getColor()->getRgb(), 0);
+                $blockLineStyle |= $colorIdx << 23;
+            }
+            $blockColor = 0;
+            if ($bBorderTop !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getTop()->getColor()->getRgb(), 0);
+                $blockColor |= $colorIdx;
+            }
+            if ($bBorderBottom !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getBottom()->getColor()->getRgb(), 0);
+                $blockColor |= $colorIdx << 7;
+            }
+            /* Excel does not support condtional diagonal borders even for xlsx
+            if ($bBorderDiagTop !== 0 || $bBorderDiagBottom !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getDiagonal()->getColor()->getRgb(), 0);
+                $blockColor |= $colorIdx << 14;
+                $blockColor |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getDiagonal()) << 21;
+                if ($bBorderDiagTop !== 0) {
+                    $blockLineStyle |= 1 << 30;
+                }
+                if ($bBorderDiagBottom !== 0) {
+                    $blockLineStyle |= 1 << 31;
+                }
+            }
+            */
+            $dataBlockBorder = pack('VV', $blockLineStyle, $blockColor);
+        }
+        if ($bFormatFill === 1) {
+            // Fill Pattern Style
+            $blockFillPatternStyle = Style\CellFill::style($conditional->getStyle()->getFill());
+            // Background Color
+            $colorIdxBg = $this->workbookColorIndex($conditional->getStyle()->getFill()->getStartColor()->getRgb(), 0x41);
+            // Foreground Color
+            $colorIdxFg = $this->workbookColorIndex($conditional->getStyle()->getFill()->getEndColor()->getRgb(), 0x40);
+
+            $dataBlockFill = pack('v', $blockFillPatternStyle);
+            $dataBlockFill .= pack('v', $colorIdxFg | ($colorIdxBg << 7));
+        }
+
+        $data = pack('CCvvVv', $type, $operatorType, $szValue1, $szValue2, $flags, 0x0000);
+        if ($bFormatFont === 1) { // Block Formatting : OK
+            $data .= $dataBlockFont;
+        }
+        //if ($bFormatAlign === 1) {
+        //    $data .= $dataBlockAlign;
+        //}
+        if ($bFormatBorder === 1) {
+            $data .= $dataBlockBorder;
+        }
+        if ($bFormatFill === 1) { // Block Formatting : OK
+            $data .= $dataBlockFill;
+        }
+        //if ($bFormatProt == 1) {
+        //    $data .= $this->getDataBlockProtection($conditional);
+        //}
+        if ($operand1 !== null) {
+            $data .= $operand1;
+        }
+        if ($operand2 !== null) {
+            $data .= $operand2;
+        }
+        $header = pack('vv', $record, strlen($data));
+        $this->append($header . $data);
+    }
+
+    /**
+     * Write CFHeader record.
+     *
+     * @param Conditional[] $conditionalStyles
+     */
+    private function writeCFHeader(string $cellCoordinate, array $conditionalStyles): bool
+    {
+        $record = 0x01B0; // Record identifier
+        $length = 0x0016; // Bytes to follow
+
+        $numColumnMin = null;
+        $numColumnMax = null;
+        $numRowMin = null;
+        $numRowMax = null;
+
+        $arrConditional = [];
+        foreach ($conditionalStyles as $conditional) {
+            if (!in_array($conditional->getHashCode(), $arrConditional)) {
+                $arrConditional[] = $conditional->getHashCode();
+            }
+            // Cells
+            $rangeCoordinates = Coordinate::rangeBoundaries($cellCoordinate);
+            if ($numColumnMin === null || ($numColumnMin > $rangeCoordinates[0][0])) {
+                $numColumnMin = $rangeCoordinates[0][0];
+            }
+            if ($numColumnMax === null || ($numColumnMax < $rangeCoordinates[1][0])) {
+                $numColumnMax = $rangeCoordinates[1][0];
+            }
+            if ($numRowMin === null || ($numRowMin > $rangeCoordinates[0][1])) {
+                $numRowMin = (int) $rangeCoordinates[0][1];
+            }
+            if ($numRowMax === null || ($numRowMax < $rangeCoordinates[1][1])) {
+                $numRowMax = (int) $rangeCoordinates[1][1];
+            }
+        }
+
+        if (count($arrConditional) === 0) {
+            return false;
+        }
+
+        $needRedraw = 1;
+        $cellRange = pack('vvvv', $numRowMin - 1, $numRowMax - 1, $numColumnMin - 1, $numColumnMax - 1);
+
+        $header = pack('vv', $record, $length);
+        $data = pack('vv', count($arrConditional), $needRedraw);
+        $data .= $cellRange;
+        $data .= pack('v', 0x0001);
+        $data .= $cellRange;
+        $this->append($header . $data);
+
+        return true;
+    }
+
+    /*private function getDataBlockProtection(Conditional $conditional): int
+    {
+        $dataBlockProtection = 0;
+        if ($conditional->getStyle()->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED) {
+            $dataBlockProtection = 1;
+        }
+        if ($conditional->getStyle()->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED) {
+            $dataBlockProtection = 1 << 1;
+        }
+
+        return $dataBlockProtection;
+    }*/
+
+    private function workbookColorIndex(?string $rgb, int $default): int
+    {
+        return (empty($rgb) || $this->writerWorkbook === null) ? $default : $this->writerWorkbook->addColor($rgb, $default);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php
new file mode 100644
index 00000000..2ab5a4eb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php
@@ -0,0 +1,374 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Style\CellAlignment;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Style\CellBorder;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Style\CellFill;
+
+// Original file header of PEAR::Spreadsheet_Excel_Writer_Format (used as the base for this class):
+// -----------------------------------------------------------------------------------------
+// /*
+// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
+// *
+// *  The majority of this is _NOT_ my code.  I simply ported it from the
+// *  PERL Spreadsheet::WriteExcel module.
+// *
+// *  The author of the Spreadsheet::WriteExcel module is John McNamara
+// *  <jmcnamara@cpan.org>
+// *
+// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
+// *  porting of this code to PHP.  Any questions directly related to this
+// *  class library should be directed to me.
+// *
+// *  License Information:
+// *
+// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
+// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
+// *
+// *    This library is free software; you can redistribute it and/or
+// *    modify it under the terms of the GNU Lesser General Public
+// *    License as published by the Free Software Foundation; either
+// *    version 2.1 of the License, or (at your option) any later version.
+// *
+// *    This library is distributed in the hope that it will be useful,
+// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// *    Lesser General Public License for more details.
+// *
+// *    You should have received a copy of the GNU Lesser General Public
+// *    License along with this library; if not, write to the Free Software
+// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+// */
+class Xf
+{
+    /**
+     * Style XF or a cell XF ?
+     */
+    private bool $isStyleXf;
+
+    /**
+     * Index to the FONT record. Index 4 does not exist.
+     */
+    private int $fontIndex;
+
+    /**
+     * An index (2 bytes) to a FORMAT record (number format).
+     */
+    private int $numberFormatIndex;
+
+    /**
+     * 1 bit, apparently not used.
+     */
+    private int $textJustLast;
+
+    /**
+     * The cell's foreground color.
+     */
+    private int $foregroundColor;
+
+    /**
+     * The cell's background color.
+     */
+    private int $backgroundColor;
+
+    /**
+     * Color of the bottom border of the cell.
+     */
+    private int $bottomBorderColor;
+
+    /**
+     * Color of the top border of the cell.
+     */
+    private int $topBorderColor;
+
+    /**
+     * Color of the left border of the cell.
+     */
+    private int $leftBorderColor;
+
+    /**
+     * Color of the right border of the cell.
+     */
+    private int $rightBorderColor;
+
+    //private $diag; // theoretically int, not yet implemented
+    private int $diagColor;
+
+    private Style $style;
+
+    /**
+     * Constructor.
+     *
+     * @param Style $style The XF format
+     */
+    public function __construct(Style $style)
+    {
+        $this->isStyleXf = false;
+        $this->fontIndex = 0;
+
+        $this->numberFormatIndex = 0;
+
+        $this->textJustLast = 0;
+
+        $this->foregroundColor = 0x40;
+        $this->backgroundColor = 0x41;
+
+        //$this->diag = 0;
+
+        $this->bottomBorderColor = 0x40;
+        $this->topBorderColor = 0x40;
+        $this->leftBorderColor = 0x40;
+        $this->rightBorderColor = 0x40;
+        $this->diagColor = 0x40;
+        $this->style = $style;
+    }
+
+    /**
+     * Generate an Excel BIFF XF record (style or cell).
+     *
+     * @return string The XF record
+     */
+    public function writeXf(): string
+    {
+        // Set the type of the XF record and some of the attributes.
+        if ($this->isStyleXf) {
+            $style = 0xFFF5;
+        } else {
+            $style = self::mapLocked($this->style->getProtection()->getLocked());
+            $style |= self::mapHidden($this->style->getProtection()->getHidden()) << 1;
+        }
+
+        // Flags to indicate if attributes have been set.
+        $atr_num = ($this->numberFormatIndex != 0) ? 1 : 0;
+        $atr_fnt = ($this->fontIndex != 0) ? 1 : 0;
+        $atr_alc = ((int) $this->style->getAlignment()->getWrapText()) ? 1 : 0;
+        $atr_bdr = (CellBorder::style($this->style->getBorders()->getBottom())
+            || CellBorder::style($this->style->getBorders()->getTop())
+            || CellBorder::style($this->style->getBorders()->getLeft())
+            || CellBorder::style($this->style->getBorders()->getRight())) ? 1 : 0;
+        $atr_pat = ($this->foregroundColor != 0x40) ? 1 : 0;
+        $atr_pat = ($this->backgroundColor != 0x41) ? 1 : $atr_pat;
+        $atr_pat = CellFill::style($this->style->getFill()) ? 1 : $atr_pat;
+        $atr_prot = self::mapLocked($this->style->getProtection()->getLocked())
+            | self::mapHidden($this->style->getProtection()->getHidden());
+
+        // Zero the default border colour if the border has not been set.
+        if (CellBorder::style($this->style->getBorders()->getBottom()) == 0) {
+            $this->bottomBorderColor = 0;
+        }
+        if (CellBorder::style($this->style->getBorders()->getTop()) == 0) {
+            $this->topBorderColor = 0;
+        }
+        if (CellBorder::style($this->style->getBorders()->getRight()) == 0) {
+            $this->rightBorderColor = 0;
+        }
+        if (CellBorder::style($this->style->getBorders()->getLeft()) == 0) {
+            $this->leftBorderColor = 0;
+        }
+        if (CellBorder::style($this->style->getBorders()->getDiagonal()) == 0) {
+            $this->diagColor = 0;
+        }
+
+        $record = 0x00E0; // Record identifier
+        $length = 0x0014; // Number of bytes to follow
+
+        $ifnt = $this->fontIndex; // Index to FONT record
+        $ifmt = $this->numberFormatIndex; // Index to FORMAT record
+
+        // Alignment
+        $align = CellAlignment::horizontal($this->style->getAlignment());
+        $align |= CellAlignment::wrap($this->style->getAlignment()) << 3;
+        $align |= CellAlignment::vertical($this->style->getAlignment()) << 4;
+        $align |= $this->textJustLast << 7;
+
+        $used_attrib = $atr_num << 2;
+        $used_attrib |= $atr_fnt << 3;
+        $used_attrib |= $atr_alc << 4;
+        $used_attrib |= $atr_bdr << 5;
+        $used_attrib |= $atr_pat << 6;
+        $used_attrib |= $atr_prot << 7;
+
+        $icv = $this->foregroundColor; // fg and bg pattern colors
+        $icv |= $this->backgroundColor << 7;
+
+        $border1 = CellBorder::style($this->style->getBorders()->getLeft()); // Border line style and color
+        $border1 |= CellBorder::style($this->style->getBorders()->getRight()) << 4;
+        $border1 |= CellBorder::style($this->style->getBorders()->getTop()) << 8;
+        $border1 |= CellBorder::style($this->style->getBorders()->getBottom()) << 12;
+        $border1 |= $this->leftBorderColor << 16;
+        $border1 |= $this->rightBorderColor << 23;
+
+        $diagonalDirection = $this->style->getBorders()->getDiagonalDirection();
+        $diag_tl_to_rb = $diagonalDirection == Borders::DIAGONAL_BOTH
+            || $diagonalDirection == Borders::DIAGONAL_DOWN;
+        $diag_tr_to_lb = $diagonalDirection == Borders::DIAGONAL_BOTH
+            || $diagonalDirection == Borders::DIAGONAL_UP;
+        $border1 |= $diag_tl_to_rb << 30;
+        $border1 |= $diag_tr_to_lb << 31;
+
+        $border2 = $this->topBorderColor; // Border color
+        $border2 |= $this->bottomBorderColor << 7;
+        $border2 |= $this->diagColor << 14;
+        $border2 |= CellBorder::style($this->style->getBorders()->getDiagonal()) << 21;
+        $border2 |= CellFill::style($this->style->getFill()) << 26;
+
+        $header = pack('vv', $record, $length);
+
+        //BIFF8 options: identation, shrinkToFit and  text direction
+        $biff8_options = $this->style->getAlignment()->getIndent();
+        $biff8_options |= (int) $this->style->getAlignment()->getShrinkToFit() << 4;
+
+        $data = pack('vvvC', $ifnt, $ifmt, $style, $align);
+        $data .= pack('CCC', self::mapTextRotation((int) $this->style->getAlignment()->getTextRotation()), $biff8_options, $used_attrib);
+        $data .= pack('VVv', $border1, $border2, $icv);
+
+        return $header . $data;
+    }
+
+    /**
+     * Is this a style XF ?
+     */
+    public function setIsStyleXf(bool $value): void
+    {
+        $this->isStyleXf = $value;
+    }
+
+    /**
+     * Sets the cell's bottom border color.
+     *
+     * @param int $colorIndex Color index
+     */
+    public function setBottomColor(int $colorIndex): void
+    {
+        $this->bottomBorderColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's top border color.
+     *
+     * @param int $colorIndex Color index
+     */
+    public function setTopColor(int $colorIndex): void
+    {
+        $this->topBorderColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's left border color.
+     *
+     * @param int $colorIndex Color index
+     */
+    public function setLeftColor(int $colorIndex): void
+    {
+        $this->leftBorderColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's right border color.
+     *
+     * @param int $colorIndex Color index
+     */
+    public function setRightColor(int $colorIndex): void
+    {
+        $this->rightBorderColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's diagonal border color.
+     *
+     * @param int $colorIndex Color index
+     */
+    public function setDiagColor(int $colorIndex): void
+    {
+        $this->diagColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's foreground color.
+     *
+     * @param int $colorIndex Color index
+     */
+    public function setFgColor(int $colorIndex): void
+    {
+        $this->foregroundColor = $colorIndex;
+    }
+
+    /**
+     * Sets the cell's background color.
+     *
+     * @param int $colorIndex Color index
+     */
+    public function setBgColor(int $colorIndex): void
+    {
+        $this->backgroundColor = $colorIndex;
+    }
+
+    /**
+     * Sets the index to the number format record
+     * It can be date, time, currency, etc...
+     *
+     * @param int $numberFormatIndex Index to format record
+     */
+    public function setNumberFormatIndex(int $numberFormatIndex): void
+    {
+        $this->numberFormatIndex = $numberFormatIndex;
+    }
+
+    /**
+     * Set the font index.
+     *
+     * @param int $value Font index, note that value 4 does not exist
+     */
+    public function setFontIndex(int $value): void
+    {
+        $this->fontIndex = $value;
+    }
+
+    /**
+     * Map to BIFF8 codes for text rotation angle.
+     */
+    private static function mapTextRotation(int $textRotation): int
+    {
+        if ($textRotation >= 0) {
+            return $textRotation;
+        }
+        if ($textRotation == Alignment::TEXTROTATION_STACK_PHPSPREADSHEET) {
+            return Alignment::TEXTROTATION_STACK_EXCEL;
+        }
+
+        return 90 - $textRotation;
+    }
+
+    private const LOCK_ARRAY = [
+        Protection::PROTECTION_INHERIT => 1,
+        Protection::PROTECTION_PROTECTED => 1,
+        Protection::PROTECTION_UNPROTECTED => 0,
+    ];
+
+    /**
+     * Map locked values.
+     */
+    private static function mapLocked(?string $locked): int
+    {
+        return $locked !== null && array_key_exists($locked, self::LOCK_ARRAY) ? self::LOCK_ARRAY[$locked] : 1;
+    }
+
+    private const HIDDEN_ARRAY = [
+        Protection::PROTECTION_INHERIT => 0,
+        Protection::PROTECTION_PROTECTED => 1,
+        Protection::PROTECTION_UNPROTECTED => 0,
+    ];
+
+    /**
+     * Map hidden.
+     */
+    private static function mapHidden(?string $hidden): int
+    {
+        return $hidden !== null && array_key_exists($hidden, self::HIDDEN_ARRAY) ? self::HIDDEN_ARRAY[$hidden] : 0;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php
new file mode 100644
index 00000000..f38eaff3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php
@@ -0,0 +1,714 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\HashTable;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing as WorksheetDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Chart;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Comments;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\ContentTypes;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\DocProps;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Drawing;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Rels;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\RelsRibbon;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\RelsVBA;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\StringTable;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Style;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Table;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Theme;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Workbook;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet;
+use ZipArchive;
+use ZipStream\Exception\OverflowException;
+use ZipStream\ZipStream;
+
+class Xlsx extends BaseWriter
+{
+    /**
+     * Office2003 compatibility.
+     */
+    private bool $office2003compatibility = false;
+
+    /**
+     * Private Spreadsheet.
+     */
+    private Spreadsheet $spreadSheet;
+
+    /**
+     * Private string table.
+     *
+     * @var string[]
+     */
+    private array $stringTable = [];
+
+    /**
+     * Private unique Conditional HashTable.
+     *
+     * @var HashTable<Conditional>
+     */
+    private HashTable $stylesConditionalHashTable;
+
+    /**
+     * Private unique Style HashTable.
+     *
+     * @var HashTable<\PhpOffice\PhpSpreadsheet\Style\Style>
+     */
+    private HashTable $styleHashTable;
+
+    /**
+     * Private unique Fill HashTable.
+     *
+     * @var HashTable<Fill>
+     */
+    private HashTable $fillHashTable;
+
+    /**
+     * Private unique \PhpOffice\PhpSpreadsheet\Style\Font HashTable.
+     *
+     * @var HashTable<Font>
+     */
+    private HashTable $fontHashTable;
+
+    /**
+     * Private unique Borders HashTable.
+     *
+     * @var HashTable<Borders>
+     */
+    private HashTable $bordersHashTable;
+
+    /**
+     * Private unique NumberFormat HashTable.
+     *
+     * @var HashTable<NumberFormat>
+     */
+    private HashTable $numFmtHashTable;
+
+    /**
+     * Private unique \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\BaseDrawing HashTable.
+     *
+     * @var HashTable<BaseDrawing>
+     */
+    private HashTable $drawingHashTable;
+
+    /**
+     * Private handle for zip stream.
+     */
+    private ZipStream $zip;
+
+    private Chart $writerPartChart;
+
+    private Comments $writerPartComments;
+
+    private ContentTypes $writerPartContentTypes;
+
+    private DocProps $writerPartDocProps;
+
+    private Drawing $writerPartDrawing;
+
+    private Rels $writerPartRels;
+
+    private RelsRibbon $writerPartRelsRibbon;
+
+    private RelsVBA $writerPartRelsVBA;
+
+    private StringTable $writerPartStringTable;
+
+    private Style $writerPartStyle;
+
+    private Theme $writerPartTheme;
+
+    private Table $writerPartTable;
+
+    private Workbook $writerPartWorkbook;
+
+    private Worksheet $writerPartWorksheet;
+
+    private bool $explicitStyle0 = false;
+
+    /**
+     * Create a new Xlsx Writer.
+     */
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        // Assign PhpSpreadsheet
+        $this->setSpreadsheet($spreadsheet);
+
+        $this->writerPartChart = new Chart($this);
+        $this->writerPartComments = new Comments($this);
+        $this->writerPartContentTypes = new ContentTypes($this);
+        $this->writerPartDocProps = new DocProps($this);
+        $this->writerPartDrawing = new Drawing($this);
+        $this->writerPartRels = new Rels($this);
+        $this->writerPartRelsRibbon = new RelsRibbon($this);
+        $this->writerPartRelsVBA = new RelsVBA($this);
+        $this->writerPartStringTable = new StringTable($this);
+        $this->writerPartStyle = new Style($this);
+        $this->writerPartTheme = new Theme($this);
+        $this->writerPartTable = new Table($this);
+        $this->writerPartWorkbook = new Workbook($this);
+        $this->writerPartWorksheet = new Worksheet($this);
+
+        // Set HashTable variables
+        $this->bordersHashTable = new HashTable();
+        $this->drawingHashTable = new HashTable();
+        $this->fillHashTable = new HashTable();
+        $this->fontHashTable = new HashTable();
+        $this->numFmtHashTable = new HashTable();
+        $this->styleHashTable = new HashTable();
+        $this->stylesConditionalHashTable = new HashTable();
+    }
+
+    public function getWriterPartChart(): Chart
+    {
+        return $this->writerPartChart;
+    }
+
+    public function getWriterPartComments(): Comments
+    {
+        return $this->writerPartComments;
+    }
+
+    public function getWriterPartContentTypes(): ContentTypes
+    {
+        return $this->writerPartContentTypes;
+    }
+
+    public function getWriterPartDocProps(): DocProps
+    {
+        return $this->writerPartDocProps;
+    }
+
+    public function getWriterPartDrawing(): Drawing
+    {
+        return $this->writerPartDrawing;
+    }
+
+    public function getWriterPartRels(): Rels
+    {
+        return $this->writerPartRels;
+    }
+
+    public function getWriterPartRelsRibbon(): RelsRibbon
+    {
+        return $this->writerPartRelsRibbon;
+    }
+
+    public function getWriterPartRelsVBA(): RelsVBA
+    {
+        return $this->writerPartRelsVBA;
+    }
+
+    public function getWriterPartStringTable(): StringTable
+    {
+        return $this->writerPartStringTable;
+    }
+
+    public function getWriterPartStyle(): Style
+    {
+        return $this->writerPartStyle;
+    }
+
+    public function getWriterPartTheme(): Theme
+    {
+        return $this->writerPartTheme;
+    }
+
+    public function getWriterPartTable(): Table
+    {
+        return $this->writerPartTable;
+    }
+
+    public function getWriterPartWorkbook(): Workbook
+    {
+        return $this->writerPartWorkbook;
+    }
+
+    public function getWriterPartWorksheet(): Worksheet
+    {
+        return $this->writerPartWorksheet;
+    }
+
+    /**
+     * Save PhpSpreadsheet to file.
+     *
+     * @param resource|string $filename
+     */
+    public function save($filename, int $flags = 0): void
+    {
+        $this->processFlags($flags);
+
+        // garbage collect
+        $this->pathNames = [];
+        $this->spreadSheet->garbageCollect();
+
+        $saveDebugLog = Calculation::getInstance($this->spreadSheet)->getDebugLog()->getWriteDebugLog();
+        Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog(false);
+        $saveDateReturnType = Functions::getReturnDateType();
+        Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+
+        // Create string lookup table
+        $this->stringTable = [];
+        for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+            $this->stringTable = $this->getWriterPartStringTable()->createStringTable($this->spreadSheet->getSheet($i), $this->stringTable);
+        }
+
+        // Create styles dictionaries
+        $this->styleHashTable->addFromSource($this->getWriterPartStyle()->allStyles($this->spreadSheet));
+        $this->stylesConditionalHashTable->addFromSource($this->getWriterPartStyle()->allConditionalStyles($this->spreadSheet));
+        $this->fillHashTable->addFromSource($this->getWriterPartStyle()->allFills($this->spreadSheet));
+        $this->fontHashTable->addFromSource($this->getWriterPartStyle()->allFonts($this->spreadSheet));
+        $this->bordersHashTable->addFromSource($this->getWriterPartStyle()->allBorders($this->spreadSheet));
+        $this->numFmtHashTable->addFromSource($this->getWriterPartStyle()->allNumberFormats($this->spreadSheet));
+
+        // Create drawing dictionary
+        $this->drawingHashTable->addFromSource($this->getWriterPartDrawing()->allDrawings($this->spreadSheet));
+
+        $zipContent = [];
+        // Add [Content_Types].xml to ZIP file
+        $zipContent['[Content_Types].xml'] = $this->getWriterPartContentTypes()->writeContentTypes($this->spreadSheet, $this->includeCharts);
+
+        //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
+        if ($this->spreadSheet->hasMacros()) {
+            $macrosCode = $this->spreadSheet->getMacrosCode();
+            if ($macrosCode !== null) {
+                // we have the code ?
+                $zipContent['xl/vbaProject.bin'] = $macrosCode; //allways in 'xl', allways named vbaProject.bin
+                if ($this->spreadSheet->hasMacrosCertificate()) {
+                    //signed macros ?
+                    // Yes : add the certificate file and the related rels file
+                    $zipContent['xl/vbaProjectSignature.bin'] = $this->spreadSheet->getMacrosCertificate();
+                    $zipContent['xl/_rels/vbaProject.bin.rels'] = $this->getWriterPartRelsVBA()->writeVBARelationships();
+                }
+            }
+        }
+        //a custom UI in this workbook ? add it ("base" xml and additional objects (pictures) and rels)
+        if ($this->spreadSheet->hasRibbon()) {
+            $tmpRibbonTarget = $this->spreadSheet->getRibbonXMLData('target');
+            $tmpRibbonTarget = is_string($tmpRibbonTarget) ? $tmpRibbonTarget : '';
+            $zipContent[$tmpRibbonTarget] = $this->spreadSheet->getRibbonXMLData('data');
+            if ($this->spreadSheet->hasRibbonBinObjects()) {
+                $tmpRootPath = dirname($tmpRibbonTarget) . '/';
+                $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write
+                if (is_array($ribbonBinObjects)) {
+                    foreach ($ribbonBinObjects as $aPath => $aContent) {
+                        $zipContent[$tmpRootPath . $aPath] = $aContent;
+                    }
+                }
+                //the rels for files
+                $zipContent[$tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels'] = $this->getWriterPartRelsRibbon()->writeRibbonRelationships($this->spreadSheet);
+            }
+        }
+
+        // Add relationships to ZIP file
+        $zipContent['_rels/.rels'] = $this->getWriterPartRels()->writeRelationships($this->spreadSheet);
+        $zipContent['xl/_rels/workbook.xml.rels'] = $this->getWriterPartRels()->writeWorkbookRelationships($this->spreadSheet);
+
+        // Add document properties to ZIP file
+        $zipContent['docProps/app.xml'] = $this->getWriterPartDocProps()->writeDocPropsApp($this->spreadSheet);
+        $zipContent['docProps/core.xml'] = $this->getWriterPartDocProps()->writeDocPropsCore($this->spreadSheet);
+        $customPropertiesPart = $this->getWriterPartDocProps()->writeDocPropsCustom($this->spreadSheet);
+        if ($customPropertiesPart !== null) {
+            $zipContent['docProps/custom.xml'] = $customPropertiesPart;
+        }
+
+        // Add theme to ZIP file
+        $zipContent['xl/theme/theme1.xml'] = $this->getWriterPartTheme()->writeTheme($this->spreadSheet);
+
+        // Add string table to ZIP file
+        $zipContent['xl/sharedStrings.xml'] = $this->getWriterPartStringTable()->writeStringTable($this->stringTable);
+
+        // Add styles to ZIP file
+        $zipContent['xl/styles.xml'] = $this->getWriterPartStyle()->writeStyles($this->spreadSheet);
+
+        // Add workbook to ZIP file
+        $zipContent['xl/workbook.xml'] = $this->getWriterPartWorkbook()->writeWorkbook($this->spreadSheet, $this->preCalculateFormulas);
+
+        $chartCount = 0;
+        // Add worksheets
+        for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+            $zipContent['xl/worksheets/sheet' . ($i + 1) . '.xml'] = $this->getWriterPartWorksheet()->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts);
+            if ($this->includeCharts) {
+                $charts = $this->spreadSheet->getSheet($i)->getChartCollection();
+                if (count($charts) > 0) {
+                    foreach ($charts as $chart) {
+                        $zipContent['xl/charts/chart' . ($chartCount + 1) . '.xml'] = $this->getWriterPartChart()->writeChart($chart, $this->preCalculateFormulas);
+                        ++$chartCount;
+                    }
+                }
+            }
+        }
+
+        $chartRef1 = 0;
+        $tableRef1 = 1;
+        // Add worksheet relationships (drawings, ...)
+        for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+            // Add relationships
+            $zipContent['xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels'] = $this->getWriterPartRels()->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts, $tableRef1, $zipContent);
+
+            // Add unparsedLoadedData
+            $sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName();
+            $unparsedLoadedData = $this->spreadSheet->getUnparsedLoadedData();
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'] as $ctrlProp) {
+                    $zipContent[$ctrlProp['filePath']] = $ctrlProp['content'];
+                }
+            }
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'] as $ctrlProp) {
+                    $zipContent[$ctrlProp['filePath']] = $ctrlProp['content'];
+                }
+            }
+
+            $drawings = $this->spreadSheet->getSheet($i)->getDrawingCollection();
+            $drawingCount = count($drawings);
+            if ($this->includeCharts) {
+                $chartCount = $this->spreadSheet->getSheet($i)->getChartCount();
+            }
+
+            // Add drawing and image relationship parts
+            if (($drawingCount > 0) || ($chartCount > 0)) {
+                // Drawing relationships
+                $zipContent['xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels'] = $this->getWriterPartRels()->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts);
+
+                // Drawings
+                $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = $this->getWriterPartDrawing()->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts);
+            } elseif (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingAlternateContents'])) {
+                // Drawings
+                $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = $this->getWriterPartDrawing()->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts);
+            }
+
+            // Add unparsed drawings
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings']) && !isset($zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'] as $relId => $drawingXml) {
+                    $drawingFile = array_search($relId, $unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']);
+                    if ($drawingFile !== false) {
+                        //$drawingFile = ltrim($drawingFile, '.');
+                        //$zipContent['xl' . $drawingFile] = $drawingXml;
+                        $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = $drawingXml;
+                    }
+                }
+            }
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']) && !isset($zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'])) {
+                $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = '<xml></xml>';
+            }
+
+            // Add comment relationship parts
+            $legacy = $unparsedLoadedData['sheets'][$this->spreadSheet->getSheet($i)->getCodeName()]['legacyDrawing'] ?? null;
+            if (count($this->spreadSheet->getSheet($i)->getComments()) > 0 || $legacy !== null) {
+                // VML Comments relationships
+                $zipContent['xl/drawings/_rels/vmlDrawing' . ($i + 1) . '.vml.rels'] = $this->getWriterPartRels()->writeVMLDrawingRelationships($this->spreadSheet->getSheet($i));
+
+                // VML Comments
+                $zipContent['xl/drawings/vmlDrawing' . ($i + 1) . '.vml'] = $legacy ?? $this->getWriterPartComments()->writeVMLComments($this->spreadSheet->getSheet($i));
+            }
+
+            // Comments
+            if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
+                $zipContent['xl/comments' . ($i + 1) . '.xml'] = $this->getWriterPartComments()->writeComments($this->spreadSheet->getSheet($i));
+
+                // Media
+                foreach ($this->spreadSheet->getSheet($i)->getComments() as $comment) {
+                    if ($comment->hasBackgroundImage()) {
+                        $image = $comment->getBackgroundImage();
+                        $zipContent['xl/media/' . $image->getMediaFilename()] = $this->processDrawing($image);
+                    }
+                }
+            }
+
+            // Add unparsed relationship parts
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'] as $vmlDrawing) {
+                    if (!isset($zipContent[$vmlDrawing['filePath']])) {
+                        $zipContent[$vmlDrawing['filePath']] = $vmlDrawing['content'];
+                    }
+                }
+            }
+
+            // Add header/footer relationship parts
+            if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
+                // VML Drawings
+                $zipContent['xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml'] = $this->getWriterPartDrawing()->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i));
+
+                // VML Drawing relationships
+                $zipContent['xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels'] = $this->getWriterPartRels()->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i));
+
+                // Media
+                foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
+                    $zipContent['xl/media/' . $image->getIndexedFilename()] = file_get_contents($image->getPath());
+                }
+            }
+
+            // Add Table parts
+            $tables = $this->spreadSheet->getSheet($i)->getTableCollection();
+            foreach ($tables as $table) {
+                $zipContent['xl/tables/table' . $tableRef1 . '.xml'] = $this->getWriterPartTable()->writeTable($table, $tableRef1++);
+            }
+        }
+
+        // Add media
+        for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
+            if ($this->getDrawingHashTable()->getByIndex($i) instanceof WorksheetDrawing) {
+                $imageContents = null;
+                $imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
+                if (str_contains($imagePath, 'zip://')) {
+                    $imagePath = substr($imagePath, 6);
+                    $imagePathSplitted = explode('#', $imagePath);
+
+                    $imageZip = new ZipArchive();
+                    $imageZip->open($imagePathSplitted[0]);
+                    $imageContents = $imageZip->getFromName($imagePathSplitted[1]);
+                    $imageZip->close();
+                    unset($imageZip);
+                } else {
+                    $imageContents = file_get_contents($imagePath);
+                }
+
+                $zipContent['xl/media/' . $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()] = $imageContents;
+            } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
+                ob_start();
+                /** @var callable $callable */
+                $callable = $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction();
+                call_user_func(
+                    $callable,
+                    $this->getDrawingHashTable()->getByIndex($i)->getImageResource()
+                );
+                $imageContents = ob_get_contents();
+                ob_end_clean();
+
+                $zipContent['xl/media/' . $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()] = $imageContents;
+            }
+        }
+
+        Functions::setReturnDateType($saveDateReturnType);
+        Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+
+        $this->openFileHandle($filename);
+
+        $this->zip = ZipStream0::newZipStream($this->fileHandle);
+
+        $this->addZipFiles($zipContent);
+
+        // Close file
+        try {
+            $this->zip->finish();
+        } catch (OverflowException) {
+            throw new WriterException('Could not close resource.');
+        }
+
+        $this->maybeCloseFileHandle();
+    }
+
+    /**
+     * Get Spreadsheet object.
+     */
+    public function getSpreadsheet(): Spreadsheet
+    {
+        return $this->spreadSheet;
+    }
+
+    /**
+     * Set Spreadsheet object.
+     *
+     * @param Spreadsheet $spreadsheet PhpSpreadsheet object
+     *
+     * @return $this
+     */
+    public function setSpreadsheet(Spreadsheet $spreadsheet): static
+    {
+        $this->spreadSheet = $spreadsheet;
+
+        return $this;
+    }
+
+    /**
+     * Get string table.
+     *
+     * @return string[]
+     */
+    public function getStringTable(): array
+    {
+        return $this->stringTable;
+    }
+
+    /**
+     * Get Style HashTable.
+     *
+     * @return HashTable<\PhpOffice\PhpSpreadsheet\Style\Style>
+     */
+    public function getStyleHashTable(): HashTable
+    {
+        return $this->styleHashTable;
+    }
+
+    /**
+     * Get Conditional HashTable.
+     *
+     * @return HashTable<Conditional>
+     */
+    public function getStylesConditionalHashTable(): HashTable
+    {
+        return $this->stylesConditionalHashTable;
+    }
+
+    /**
+     * Get Fill HashTable.
+     *
+     * @return HashTable<Fill>
+     */
+    public function getFillHashTable(): HashTable
+    {
+        return $this->fillHashTable;
+    }
+
+    /**
+     * Get \PhpOffice\PhpSpreadsheet\Style\Font HashTable.
+     *
+     * @return HashTable<Font>
+     */
+    public function getFontHashTable(): HashTable
+    {
+        return $this->fontHashTable;
+    }
+
+    /**
+     * Get Borders HashTable.
+     *
+     * @return HashTable<Borders>
+     */
+    public function getBordersHashTable(): HashTable
+    {
+        return $this->bordersHashTable;
+    }
+
+    /**
+     * Get NumberFormat HashTable.
+     *
+     * @return HashTable<NumberFormat>
+     */
+    public function getNumFmtHashTable(): HashTable
+    {
+        return $this->numFmtHashTable;
+    }
+
+    /**
+     * Get \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\BaseDrawing HashTable.
+     *
+     * @return HashTable<BaseDrawing>
+     */
+    public function getDrawingHashTable(): HashTable
+    {
+        return $this->drawingHashTable;
+    }
+
+    /**
+     * Get Office2003 compatibility.
+     */
+    public function getOffice2003Compatibility(): bool
+    {
+        return $this->office2003compatibility;
+    }
+
+    /**
+     * Set Office2003 compatibility.
+     *
+     * @param bool $office2003compatibility Office2003 compatibility?
+     *
+     * @return $this
+     */
+    public function setOffice2003Compatibility(bool $office2003compatibility): static
+    {
+        $this->office2003compatibility = $office2003compatibility;
+
+        return $this;
+    }
+
+    private array $pathNames = [];
+
+    private function addZipFile(string $path, string $content): void
+    {
+        if (!in_array($path, $this->pathNames)) {
+            $this->pathNames[] = $path;
+            $this->zip->addFile($path, $content);
+        }
+    }
+
+    private function addZipFiles(array $zipContent): void
+    {
+        foreach ($zipContent as $path => $content) {
+            $this->addZipFile($path, $content);
+        }
+    }
+
+    private function processDrawing(WorksheetDrawing $drawing): string|null|false
+    {
+        $data = null;
+        $filename = $drawing->getPath();
+        $imageData = getimagesize($filename);
+
+        if (!empty($imageData)) {
+            switch ($imageData[2]) {
+                case 1: // GIF, not supported by BIFF8, we convert to PNG
+                    $image = imagecreatefromgif($filename);
+                    if ($image !== false) {
+                        ob_start();
+                        imagepng($image);
+                        $data = ob_get_contents();
+                        ob_end_clean();
+                    }
+
+                    break;
+
+                case 2: // JPEG
+                    $data = file_get_contents($filename);
+
+                    break;
+
+                case 3: // PNG
+                    $data = file_get_contents($filename);
+
+                    break;
+
+                case 6: // Windows DIB (BMP), we convert to PNG
+                    $image = imagecreatefrombmp($filename);
+                    if ($image !== false) {
+                        ob_start();
+                        imagepng($image);
+                        $data = ob_get_contents();
+                        ob_end_clean();
+                    }
+
+                    break;
+            }
+        }
+
+        return $data;
+    }
+
+    public function getExplicitStyle0(): bool
+    {
+        return $this->explicitStyle0;
+    }
+
+    /**
+     * This may be useful if non-default Alignment is part of default style
+     * and you think you might want to open the spreadsheet
+     * with LibreOffice or Gnumeric.
+     */
+    public function setExplicitStyle0(bool $explicitStyle0): self
+    {
+        $this->explicitStyle0 = $explicitStyle0;
+
+        return $this;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/AutoFilter.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/AutoFilter.php
new file mode 100644
index 00000000..d96ac096
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/AutoFilter.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as ActualWorksheet;
+
+class AutoFilter extends WriterPart
+{
+    /**
+     * Write AutoFilter.
+     */
+    public static function writeAutoFilter(XMLWriter $objWriter, ActualWorksheet $worksheet): void
+    {
+        $autoFilterRange = $worksheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            // autoFilter
+            $objWriter->startElement('autoFilter');
+
+            // Strip any worksheet reference from the filter coordinates
+            $range = Coordinate::splitRange($autoFilterRange);
+            $range = $range[0];
+            //    Strip any worksheet ref
+            [$ws, $range[0]] = ActualWorksheet::extractSheetTitle($range[0], true);
+            $range = implode(':', $range);
+
+            $objWriter->writeAttribute('ref', str_replace('$', '', $range));
+
+            $columns = $worksheet->getAutoFilter()->getColumns();
+            if (count($columns) > 0) {
+                foreach ($columns as $columnID => $column) {
+                    $colId = $worksheet->getAutoFilter()->getColumnOffset($columnID);
+                    self::writeAutoFilterColumn($objWriter, $column, $colId);
+                }
+            }
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write AutoFilter's filterColumn.
+     */
+    public static function writeAutoFilterColumn(XMLWriter $objWriter, Column $column, int $colId): void
+    {
+        $rules = $column->getRules();
+        if (count($rules) > 0) {
+            $objWriter->startElement('filterColumn');
+            $objWriter->writeAttribute('colId', "$colId");
+
+            $objWriter->startElement($column->getFilterType());
+            if ($column->getJoin() == Column::AUTOFILTER_COLUMN_JOIN_AND) {
+                $objWriter->writeAttribute('and', '1');
+            }
+
+            foreach ($rules as $rule) {
+                self::writeAutoFilterColumnRule($column, $rule, $objWriter);
+            }
+
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write AutoFilter's filterColumn Rule.
+     */
+    private static function writeAutoFilterColumnRule(Column $column, Rule $rule, XMLWriter $objWriter): void
+    {
+        if (
+            ($column->getFilterType() === Column::AUTOFILTER_FILTERTYPE_FILTER)
+            && ($rule->getOperator() === Rule::AUTOFILTER_COLUMN_RULE_EQUAL)
+            && ($rule->getValue() === '')
+        ) {
+            //    Filter rule for Blanks
+            $objWriter->writeAttribute('blank', '1');
+        } elseif ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
+            //    Dynamic Filter Rule
+            $objWriter->writeAttribute('type', $rule->getGrouping());
+            $val = $column->getAttribute('val');
+            if ($val !== null) {
+                $objWriter->writeAttribute('val', "$val");
+            }
+            $maxVal = $column->getAttribute('maxVal');
+            if ($maxVal !== null) {
+                $objWriter->writeAttribute('maxVal', "$maxVal");
+            }
+        } elseif ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
+            //    Top 10 Filter Rule
+            $ruleValue = $rule->getValue();
+            if (!is_array($ruleValue)) {
+                $objWriter->writeAttribute('val', "$ruleValue");
+            }
+            $objWriter->writeAttribute('percent', (($rule->getOperator() === Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
+            $objWriter->writeAttribute('top', (($rule->getGrouping() === Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1' : '0'));
+        } else {
+            //    Filter, DateGroupItem or CustomFilter
+            $objWriter->startElement($rule->getRuleType());
+
+            if ($rule->getOperator() !== Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
+                $objWriter->writeAttribute('operator', $rule->getOperator());
+            }
+            if ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
+                // Date Group filters
+                $ruleValue = $rule->getValue();
+                if (is_array($ruleValue)) {
+                    foreach ($ruleValue as $key => $value) {
+                        $objWriter->writeAttribute($key, "$value");
+                    }
+                }
+                $objWriter->writeAttribute('dateTimeGrouping', $rule->getGrouping());
+            } else {
+                $ruleValue = $rule->getValue();
+                if (!is_array($ruleValue)) {
+                    $objWriter->writeAttribute('val', "$ruleValue");
+                }
+            }
+
+            $objWriter->endElement();
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
new file mode 100644
index 00000000..ca16557a
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
@@ -0,0 +1,1935 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
+use PhpOffice\PhpSpreadsheet\Chart\Layout;
+use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
+use PhpOffice\PhpSpreadsheet\Chart\Properties;
+use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+
+class Chart extends WriterPart
+{
+    private int $seriesIndex;
+
+    /**
+     * Write charts to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeChart(\PhpOffice\PhpSpreadsheet\Chart\Chart $chart, bool $calculateCellValues = true): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+        //    Ensure that data series values are up-to-date before we save
+        if ($calculateCellValues) {
+            $chart->refresh();
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // c:chartSpace
+        $objWriter->startElement('c:chartSpace');
+        $objWriter->writeAttribute('xmlns:c', Namespaces::CHART);
+        $objWriter->writeAttribute('xmlns:a', Namespaces::DRAWINGML);
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
+
+        $objWriter->startElement('c:date1904');
+        $objWriter->writeAttribute('val', '0');
+        $objWriter->endElement();
+        $objWriter->startElement('c:lang');
+        $objWriter->writeAttribute('val', 'en-GB');
+        $objWriter->endElement();
+        $objWriter->startElement('c:roundedCorners');
+        $objWriter->writeAttribute('val', $chart->getRoundedCorners() ? '1' : '0');
+        $objWriter->endElement();
+
+        $this->writeAlternateContent($objWriter);
+
+        $objWriter->startElement('c:chart');
+
+        $this->writeTitle($objWriter, $chart->getTitle());
+
+        $objWriter->startElement('c:autoTitleDeleted');
+        $objWriter->writeAttribute('val', (string) (int) $chart->getAutoTitleDeleted());
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:view3D');
+        $surface2D = false;
+        $plotArea = $chart->getPlotArea();
+        if ($plotArea !== null) {
+            $seriesArray = $plotArea->getPlotGroup();
+            foreach ($seriesArray as $series) {
+                if ($series->getPlotType() === DataSeries::TYPE_SURFACECHART) {
+                    $surface2D = true;
+
+                    break;
+                }
+            }
+        }
+        $this->writeView3D($objWriter, $chart->getRotX(), 'c:rotX', $surface2D, 90);
+        $this->writeView3D($objWriter, $chart->getRotY(), 'c:rotY', $surface2D);
+        $this->writeView3D($objWriter, $chart->getRAngAx(), 'c:rAngAx', $surface2D);
+        $this->writeView3D($objWriter, $chart->getPerspective(), 'c:perspective', $surface2D);
+        $objWriter->endElement(); // view3D
+
+        $this->writePlotArea($objWriter, $chart->getPlotArea(), $chart->getXAxisLabel(), $chart->getYAxisLabel(), $chart->getChartAxisX(), $chart->getChartAxisY());
+
+        $this->writeLegend($objWriter, $chart->getLegend());
+
+        $objWriter->startElement('c:plotVisOnly');
+        $objWriter->writeAttribute('val', (string) (int) $chart->getPlotVisibleOnly());
+        $objWriter->endElement();
+
+        if ($chart->getDisplayBlanksAs() !== '') {
+            $objWriter->startElement('c:dispBlanksAs');
+            $objWriter->writeAttribute('val', $chart->getDisplayBlanksAs());
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:showDLblsOverMax');
+        $objWriter->writeAttribute('val', '0');
+        $objWriter->endElement();
+
+        $objWriter->endElement(); // c:chart
+
+        $objWriter->startElement('c:spPr');
+        if ($chart->getNoFill()) {
+            $objWriter->startElement('a:noFill');
+            $objWriter->endElement(); // a:noFill
+        }
+        $fillColor = $chart->getFillColor();
+        if ($fillColor->isUsable()) {
+            $this->writeColor($objWriter, $fillColor);
+        }
+        $borderLines = $chart->getBorderLines();
+        $this->writeLineStyles($objWriter, $borderLines);
+        $this->writeEffects($objWriter, $borderLines);
+        $objWriter->endElement(); // c:spPr
+
+        $this->writePrintSettings($objWriter);
+
+        $objWriter->endElement(); // c:chartSpace
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    private function writeView3D(XMLWriter $objWriter, ?int $value, string $tag, bool $surface2D, int $default = 0): void
+    {
+        if ($value === null && $surface2D) {
+            $value = $default;
+        }
+        if ($value !== null) {
+            $objWriter->startElement($tag);
+            $objWriter->writeAttribute('val', "$value");
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Chart Title.
+     */
+    private function writeTitle(XMLWriter $objWriter, ?Title $title = null): void
+    {
+        if ($title === null) {
+            return;
+        }
+        if ($this->writeCalculatedTitle($objWriter, $title)) {
+            return;
+        }
+
+        $objWriter->startElement('c:title');
+        $caption = $title->getCaption();
+        if ($caption !== null) {
+            $objWriter->startElement('c:tx');
+            $objWriter->startElement('c:rich');
+
+            $objWriter->startElement('a:bodyPr');
+            $objWriter->endElement(); // a:bodyPr
+
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+
+            $objWriter->startElement('a:p');
+            $objWriter->startElement('a:pPr');
+            $objWriter->startElement('a:defRPr');
+            $objWriter->endElement(); // a:defRPr
+            $objWriter->endElement(); // a:pPr
+
+            if (is_array($caption)) {
+                $caption = $caption[0] ?? '';
+            }
+            $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
+
+            $objWriter->endElement(); // a:p
+            $objWriter->endElement(); // c:rich
+            $objWriter->endElement(); // c:tx
+        }
+
+        $this->writeLayout($objWriter, $title->getLayout());
+
+        $objWriter->startElement('c:overlay');
+        $objWriter->writeAttribute('val', ($title->getOverlay()) ? '1' : '0');
+        $objWriter->endElement(); // c:overlay
+
+        $objWriter->endElement(); // c:title
+    }
+
+    /**
+     * Write Calculated Chart Title.
+     */
+    private function writeCalculatedTitle(XMLWriter $objWriter, Title $title): bool
+    {
+        $calc = $title->getCalculatedTitle($this->getParentWriter()->getSpreadsheet());
+        if (empty($calc)) {
+            return false;
+        }
+
+        $objWriter->startElement('c:title');
+        $objWriter->startElement('c:tx');
+        $objWriter->startElement('c:strRef');
+        $objWriter->writeElement('c:f', $title->getCellReference());
+        $objWriter->startElement('c:strCache');
+
+        $objWriter->startElement('c:ptCount');
+        $objWriter->writeAttribute('val', '1');
+        $objWriter->endElement(); // c:ptCount
+        $objWriter->startElement('c:pt');
+        $objWriter->writeAttribute('idx', '0');
+        $objWriter->writeElement('c:v', $calc);
+        $objWriter->endElement(); // c:pt
+
+        $objWriter->endElement(); // c:strCache
+        $objWriter->endElement(); // c:strRef
+        $objWriter->endElement(); // c:tx
+
+        $this->writeLayout($objWriter, $title->getLayout());
+
+        $objWriter->startElement('c:overlay');
+        $objWriter->writeAttribute('val', ($title->getOverlay()) ? '1' : '0');
+        $objWriter->endElement(); // c:overlay
+        // c:spPr
+
+        // c:txPr
+        $labelFont = $title->getFont();
+        if ($labelFont !== null) {
+            $objWriter->startElement('c:txPr');
+
+            $objWriter->startElement('a:bodyPr');
+            $objWriter->endElement(); // a:bodyPr
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+            $this->writeLabelFont($objWriter, $labelFont, null);
+
+            $objWriter->endElement(); // c:txPr
+        }
+
+        $objWriter->endElement(); // c:title
+
+        return true;
+    }
+
+    /**
+     * Write Chart Legend.
+     */
+    private function writeLegend(XMLWriter $objWriter, ?Legend $legend = null): void
+    {
+        if ($legend === null) {
+            return;
+        }
+
+        $objWriter->startElement('c:legend');
+
+        $objWriter->startElement('c:legendPos');
+        $objWriter->writeAttribute('val', $legend->getPosition());
+        $objWriter->endElement();
+
+        $this->writeLayout($objWriter, $legend->getLayout());
+
+        $objWriter->startElement('c:overlay');
+        $objWriter->writeAttribute('val', ($legend->getOverlay()) ? '1' : '0');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:spPr');
+        $fillColor = $legend->getFillColor();
+        if ($fillColor->isUsable()) {
+            $this->writeColor($objWriter, $fillColor);
+        }
+        $borderLines = $legend->getBorderLines();
+        $this->writeLineStyles($objWriter, $borderLines);
+        $this->writeEffects($objWriter, $borderLines);
+        $objWriter->endElement(); // c:spPr
+
+        $legendText = $legend->getLegendText();
+        $objWriter->startElement('c:txPr');
+        $objWriter->startElement('a:bodyPr');
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:lstStyle');
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:p');
+        $objWriter->startElement('a:pPr');
+        $objWriter->writeAttribute('rtl', '0');
+
+        $objWriter->startElement('a:defRPr');
+        if ($legendText !== null) {
+            $this->writeColor($objWriter, $legendText->getFillColorObject());
+            $this->writeEffects($objWriter, $legendText);
+        }
+        $objWriter->endElement(); // a:defRpr
+        $objWriter->endElement(); // a:pPr
+
+        $objWriter->startElement('a:endParaRPr');
+        $objWriter->writeAttribute('lang', 'en-US');
+        $objWriter->endElement(); // a:endParaRPr
+
+        $objWriter->endElement(); // a:p
+        $objWriter->endElement(); // c:txPr
+
+        $objWriter->endElement(); // c:legend
+    }
+
+    /**
+     * Write Chart Plot Area.
+     */
+    private function writePlotArea(XMLWriter $objWriter, ?PlotArea $plotArea, ?Title $xAxisLabel = null, ?Title $yAxisLabel = null, ?Axis $xAxis = null, ?Axis $yAxis = null): void
+    {
+        if ($plotArea === null) {
+            return;
+        }
+
+        $id1 = $id2 = $id3 = '0';
+        $this->seriesIndex = 0;
+        $objWriter->startElement('c:plotArea');
+
+        $layout = $plotArea->getLayout();
+
+        $this->writeLayout($objWriter, $layout);
+
+        $chartTypes = self::getChartType($plotArea);
+        $catIsMultiLevelSeries = $valIsMultiLevelSeries = false;
+        $plotGroupingType = '';
+        $chartType = null;
+        foreach ($chartTypes as $chartType) {
+            $objWriter->startElement('c:' . $chartType);
+
+            $groupCount = $plotArea->getPlotGroupCount();
+            $plotGroup = null;
+            for ($i = 0; $i < $groupCount; ++$i) {
+                $plotGroup = $plotArea->getPlotGroupByIndex($i);
+                $groupType = $plotGroup->getPlotType();
+                if ($groupType == $chartType) {
+                    $plotStyle = $plotGroup->getPlotStyle();
+                    if (!empty($plotStyle) && $groupType === DataSeries::TYPE_RADARCHART) {
+                        $objWriter->startElement('c:radarStyle');
+                        $objWriter->writeAttribute('val', $plotStyle);
+                        $objWriter->endElement();
+                    } elseif (!empty($plotStyle) && $groupType === DataSeries::TYPE_SCATTERCHART) {
+                        $objWriter->startElement('c:scatterStyle');
+                        $objWriter->writeAttribute('val', $plotStyle);
+                        $objWriter->endElement();
+                    } elseif ($groupType === DataSeries::TYPE_SURFACECHART_3D || $groupType === DataSeries::TYPE_SURFACECHART) {
+                        $objWriter->startElement('c:wireframe');
+                        $objWriter->writeAttribute('val', $plotStyle ? '1' : '0');
+                        $objWriter->endElement();
+                    }
+
+                    $this->writePlotGroup($plotGroup, $chartType, $objWriter, $catIsMultiLevelSeries, $valIsMultiLevelSeries, $plotGroupingType);
+                }
+            }
+
+            $this->writeDataLabels($objWriter, $layout);
+
+            if ($chartType === DataSeries::TYPE_LINECHART && $plotGroup) {
+                //    Line only, Line3D can't be smoothed
+                $objWriter->startElement('c:smooth');
+                $objWriter->writeAttribute('val', (string) (int) $plotGroup->getSmoothLine());
+                $objWriter->endElement();
+            } elseif (($chartType === DataSeries::TYPE_BARCHART) || ($chartType === DataSeries::TYPE_BARCHART_3D)) {
+                $objWriter->startElement('c:gapWidth');
+                $objWriter->writeAttribute('val', '150');
+                $objWriter->endElement();
+
+                if ($plotGroupingType == 'percentStacked' || $plotGroupingType == 'stacked') {
+                    $objWriter->startElement('c:overlap');
+                    $objWriter->writeAttribute('val', '100');
+                    $objWriter->endElement();
+                }
+            } elseif ($chartType === DataSeries::TYPE_BUBBLECHART) {
+                $scale = ($plotGroup === null) ? '' : (string) $plotGroup->getPlotStyle();
+                if ($scale !== '') {
+                    $objWriter->startElement('c:bubbleScale');
+                    $objWriter->writeAttribute('val', $scale);
+                    $objWriter->endElement();
+                }
+
+                $objWriter->startElement('c:showNegBubbles');
+                $objWriter->writeAttribute('val', '0');
+                $objWriter->endElement();
+            } elseif ($chartType === DataSeries::TYPE_STOCKCHART) {
+                $objWriter->startElement('c:hiLowLines');
+                $objWriter->endElement();
+
+                $gapWidth = $plotArea->getGapWidth();
+                $upBars = $plotArea->getUseUpBars();
+                $downBars = $plotArea->getUseDownBars();
+                if ($gapWidth !== null || $upBars || $downBars) {
+                    $objWriter->startElement('c:upDownBars');
+                    if ($gapWidth !== null) {
+                        $objWriter->startElement('c:gapWidth');
+                        $objWriter->writeAttribute('val', "$gapWidth");
+                        $objWriter->endElement();
+                    }
+                    if ($upBars) {
+                        $objWriter->startElement('c:upBars');
+                        $objWriter->endElement();
+                    }
+                    if ($downBars) {
+                        $objWriter->startElement('c:downBars');
+                        $objWriter->endElement();
+                    }
+                    $objWriter->endElement(); // c:upDownBars
+                }
+            }
+
+            //    Generate 3 unique numbers to use for axId values
+            $id1 = '110438656';
+            $id2 = '110444544';
+            $id3 = '110365312'; // used in Surface Chart
+
+            if (($chartType !== DataSeries::TYPE_PIECHART) && ($chartType !== DataSeries::TYPE_PIECHART_3D) && ($chartType !== DataSeries::TYPE_DONUTCHART)) {
+                $objWriter->startElement('c:axId');
+                $objWriter->writeAttribute('val', $id1);
+                $objWriter->endElement();
+                $objWriter->startElement('c:axId');
+                $objWriter->writeAttribute('val', $id2);
+                $objWriter->endElement();
+                if ($chartType === DataSeries::TYPE_SURFACECHART_3D || $chartType === DataSeries::TYPE_SURFACECHART) {
+                    $objWriter->startElement('c:axId');
+                    $objWriter->writeAttribute('val', $id3);
+                    $objWriter->endElement();
+                }
+            } else {
+                $objWriter->startElement('c:firstSliceAng');
+                $objWriter->writeAttribute('val', '0');
+                $objWriter->endElement();
+
+                if ($chartType === DataSeries::TYPE_DONUTCHART) {
+                    $objWriter->startElement('c:holeSize');
+                    $objWriter->writeAttribute('val', '50');
+                    $objWriter->endElement();
+                }
+            }
+
+            $objWriter->endElement();
+        }
+
+        if (($chartType !== DataSeries::TYPE_PIECHART) && ($chartType !== DataSeries::TYPE_PIECHART_3D) && ($chartType !== DataSeries::TYPE_DONUTCHART)) {
+            if ($chartType === DataSeries::TYPE_BUBBLECHART) {
+                $this->writeValueAxis($objWriter, $xAxisLabel, $chartType, $id2, $id1, $catIsMultiLevelSeries, $xAxis ?? new Axis());
+            } else {
+                $this->writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $catIsMultiLevelSeries, $xAxis ?? new Axis());
+            }
+
+            $this->writeValueAxis($objWriter, $yAxisLabel, $chartType, $id1, $id2, $valIsMultiLevelSeries, $yAxis ?? new Axis());
+            if ($chartType === DataSeries::TYPE_SURFACECHART_3D || $chartType === DataSeries::TYPE_SURFACECHART) {
+                $this->writeSerAxis($objWriter, $id2, $id3);
+            }
+        }
+        $stops = $plotArea->getGradientFillStops();
+        if ($plotArea->getNoFill() || !empty($stops)) {
+            $objWriter->startElement('c:spPr');
+            if ($plotArea->getNoFill()) {
+                $objWriter->startElement('a:noFill');
+                $objWriter->endElement(); // a:noFill
+            }
+            if (!empty($stops)) {
+                $objWriter->startElement('a:gradFill');
+                $objWriter->startElement('a:gsLst');
+                foreach ($stops as $stop) {
+                    $objWriter->startElement('a:gs');
+                    $objWriter->writeAttribute('pos', (string) (Properties::PERCENTAGE_MULTIPLIER * (float) $stop[0]));
+                    $this->writeColor($objWriter, $stop[1], false);
+                    $objWriter->endElement(); // a:gs
+                }
+                $objWriter->endElement(); // a:gsLst
+                $angle = $plotArea->getGradientFillAngle();
+                if ($angle !== null) {
+                    $objWriter->startElement('a:lin');
+                    $objWriter->writeAttribute('ang', Properties::angleToXml($angle));
+                    $objWriter->endElement(); // a:lin
+                }
+                $objWriter->endElement(); // a:gradFill
+            }
+            $objWriter->endElement(); // c:spPr
+        }
+
+        $objWriter->endElement(); // c:plotArea
+    }
+
+    private function writeDataLabelsBool(XMLWriter $objWriter, string $name, ?bool $value): void
+    {
+        if ($value !== null) {
+            $objWriter->startElement("c:$name");
+            $objWriter->writeAttribute('val', $value ? '1' : '0');
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Data Labels.
+     */
+    private function writeDataLabels(XMLWriter $objWriter, ?Layout $chartLayout = null): void
+    {
+        if (!isset($chartLayout)) {
+            return;
+        }
+        $objWriter->startElement('c:dLbls');
+
+        $fillColor = $chartLayout->getLabelFillColor();
+        $borderColor = $chartLayout->getLabelBorderColor();
+        if ($fillColor && $fillColor->isUsable()) {
+            $objWriter->startElement('c:spPr');
+            $this->writeColor($objWriter, $fillColor);
+            if ($borderColor && $borderColor->isUsable()) {
+                $objWriter->startElement('a:ln');
+                $this->writeColor($objWriter, $borderColor);
+                $objWriter->endElement(); // a:ln
+            }
+            $objWriter->endElement(); // c:spPr
+        }
+        $labelFont = $chartLayout->getLabelFont();
+        if ($labelFont !== null) {
+            $objWriter->startElement('c:txPr');
+
+            $objWriter->startElement('a:bodyPr');
+            $objWriter->writeAttribute('wrap', 'square');
+            $objWriter->writeAttribute('lIns', '38100');
+            $objWriter->writeAttribute('tIns', '19050');
+            $objWriter->writeAttribute('rIns', '38100');
+            $objWriter->writeAttribute('bIns', '19050');
+            $objWriter->writeAttribute('anchor', 'ctr');
+            $objWriter->startElement('a:spAutoFit');
+            $objWriter->endElement(); // a:spAutoFit
+            $objWriter->endElement(); // a:bodyPr
+
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+            $this->writeLabelFont($objWriter, $labelFont, $chartLayout->getLabelEffects());
+
+            $objWriter->endElement(); // c:txPr
+        }
+
+        if ($chartLayout->getNumFmtCode() !== '') {
+            $objWriter->startElement('c:numFmt');
+            $objWriter->writeAttribute('formatCode', $chartLayout->getnumFmtCode());
+            $objWriter->writeAttribute('sourceLinked', (string) (int) $chartLayout->getnumFmtLinked());
+            $objWriter->endElement(); // c:numFmt
+        }
+        if ($chartLayout->getDLblPos() !== '') {
+            $objWriter->startElement('c:dLblPos');
+            $objWriter->writeAttribute('val', $chartLayout->getDLblPos());
+            $objWriter->endElement(); // c:dLblPos
+        }
+        $this->writeDataLabelsBool($objWriter, 'showLegendKey', $chartLayout->getShowLegendKey());
+        $this->writeDataLabelsBool($objWriter, 'showVal', $chartLayout->getShowVal());
+        $this->writeDataLabelsBool($objWriter, 'showCatName', $chartLayout->getShowCatName());
+        $this->writeDataLabelsBool($objWriter, 'showSerName', $chartLayout->getShowSerName());
+        $this->writeDataLabelsBool($objWriter, 'showPercent', $chartLayout->getShowPercent());
+        $this->writeDataLabelsBool($objWriter, 'showBubbleSize', $chartLayout->getShowBubbleSize());
+        $this->writeDataLabelsBool($objWriter, 'showLeaderLines', $chartLayout->getShowLeaderLines());
+
+        $objWriter->endElement(); // c:dLbls
+    }
+
+    /**
+     * Write Category Axis.
+     */
+    private function writeCategoryAxis(XMLWriter $objWriter, ?Title $xAxisLabel, string $id1, string $id2, bool $isMultiLevelSeries, Axis $yAxis): void
+    {
+        // N.B. writeCategoryAxis may be invoked with the last parameter($yAxis) using $xAxis for ScatterChart, etc
+        // In that case, xAxis may contain values like the yAxis, or it may be a date axis (LINECHART).
+        $axisType = $yAxis->getAxisType();
+        if ($axisType !== '') {
+            $objWriter->startElement("c:$axisType");
+        } elseif ($yAxis->getAxisIsNumericFormat()) {
+            $objWriter->startElement('c:' . Axis::AXIS_TYPE_VALUE);
+        } else {
+            $objWriter->startElement('c:' . Axis::AXIS_TYPE_CATEGORY);
+        }
+        $majorGridlines = $yAxis->getMajorGridlines();
+        $minorGridlines = $yAxis->getMinorGridlines();
+
+        if ($id1 !== '0') {
+            $objWriter->startElement('c:axId');
+            $objWriter->writeAttribute('val', $id1);
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:scaling');
+        if (is_numeric($yAxis->getAxisOptionsProperty('logBase'))) {
+            $logBase = $yAxis->getAxisOptionsProperty('logBase') + 0;
+            if ($logBase >= 2 && $logBase <= 1000) {
+                $objWriter->startElement('c:logBase');
+                $objWriter->writeAttribute('val', (string) $logBase);
+                $objWriter->endElement();
+            }
+        }
+        if ($yAxis->getAxisOptionsProperty('maximum') !== null) {
+            $objWriter->startElement('c:max');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('maximum'));
+            $objWriter->endElement();
+        }
+        if ($yAxis->getAxisOptionsProperty('minimum') !== null) {
+            $objWriter->startElement('c:min');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minimum'));
+            $objWriter->endElement();
+        }
+        if (!empty($yAxis->getAxisOptionsProperty('orientation'))) {
+            $objWriter->startElement('c:orientation');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('orientation'));
+            $objWriter->endElement();
+        }
+        $objWriter->endElement(); // c:scaling
+
+        $objWriter->startElement('c:delete');
+        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('hidden') ?? '0');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:axPos');
+        $objWriter->writeAttribute('val', 'b');
+        $objWriter->endElement();
+
+        if ($majorGridlines !== null) {
+            $objWriter->startElement('c:majorGridlines');
+            $objWriter->startElement('c:spPr');
+            $this->writeLineStyles($objWriter, $majorGridlines);
+            $this->writeEffects($objWriter, $majorGridlines);
+            $objWriter->endElement(); //end spPr
+            $objWriter->endElement(); //end majorGridLines
+        }
+
+        if ($minorGridlines !== null && $minorGridlines->getObjectState()) {
+            $objWriter->startElement('c:minorGridlines');
+            $objWriter->startElement('c:spPr');
+            $this->writeLineStyles($objWriter, $minorGridlines);
+            $this->writeEffects($objWriter, $minorGridlines);
+            $objWriter->endElement(); //end spPr
+            $objWriter->endElement(); //end minorGridLines
+        }
+
+        if ($xAxisLabel !== null) {
+            $objWriter->startElement('c:title');
+            $caption = $xAxisLabel->getCaption();
+            if ($caption !== null) {
+                $objWriter->startElement('c:tx');
+                $objWriter->startElement('c:rich');
+
+                $objWriter->startElement('a:bodyPr');
+                $objWriter->endElement(); // a:bodyPr
+
+                $objWriter->startElement('a:lstStyle');
+                $objWriter->endElement(); // a::lstStyle
+
+                $objWriter->startElement('a:p');
+
+                if (is_array($caption)) {
+                    $caption = $caption[0];
+                }
+                $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
+
+                $objWriter->endElement(); // a:p
+                $objWriter->endElement(); // c:rich
+                $objWriter->endElement(); // c:tx
+            }
+
+            $layout = $xAxisLabel->getLayout();
+            $this->writeLayout($objWriter, $layout);
+
+            $objWriter->startElement('c:overlay');
+            $objWriter->writeAttribute('val', '0');
+            $objWriter->endElement(); // c:overlay
+
+            $objWriter->endElement(); // c:title
+        }
+
+        $objWriter->startElement('c:numFmt');
+        $objWriter->writeAttribute('formatCode', $yAxis->getAxisNumberFormat());
+        $objWriter->writeAttribute('sourceLinked', $yAxis->getAxisNumberSourceLinked());
+        $objWriter->endElement();
+
+        if (!empty($yAxis->getAxisOptionsProperty('major_tick_mark'))) {
+            $objWriter->startElement('c:majorTickMark');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('major_tick_mark'));
+            $objWriter->endElement();
+        }
+
+        if (!empty($yAxis->getAxisOptionsProperty('minor_tick_mark'))) {
+            $objWriter->startElement('c:minorTickMark');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minor_tick_mark'));
+            $objWriter->endElement();
+        }
+
+        if (!empty($yAxis->getAxisOptionsProperty('axis_labels'))) {
+            $objWriter->startElement('c:tickLblPos');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('axis_labels'));
+            $objWriter->endElement();
+        }
+
+        $textRotation = $yAxis->getAxisOptionsProperty('textRotation');
+        $axisText = $yAxis->getAxisText();
+
+        if ($axisText !== null || is_numeric($textRotation)) {
+            $objWriter->startElement('c:txPr');
+            $objWriter->startElement('a:bodyPr');
+            if (is_numeric($textRotation)) {
+                $objWriter->writeAttribute('rot', Properties::angleToXml((float) $textRotation));
+            }
+            $objWriter->endElement(); // a:bodyPr
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+            $this->writeLabelFont($objWriter, ($axisText === null) ? null : $axisText->getFont(), $axisText);
+            $objWriter->endElement(); // c:txPr
+        }
+
+        $objWriter->startElement('c:spPr');
+        $this->writeColor($objWriter, $yAxis->getFillColorObject());
+        $this->writeLineStyles($objWriter, $yAxis, $yAxis->getNoFill());
+        $this->writeEffects($objWriter, $yAxis);
+        $objWriter->endElement(); // spPr
+
+        if ($yAxis->getAxisOptionsProperty('major_unit') !== null) {
+            $objWriter->startElement('c:majorUnit');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('major_unit'));
+            $objWriter->endElement();
+        }
+
+        if ($yAxis->getAxisOptionsProperty('minor_unit') !== null) {
+            $objWriter->startElement('c:minorUnit');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minor_unit'));
+            $objWriter->endElement();
+        }
+
+        if ($id2 !== '0') {
+            $objWriter->startElement('c:crossAx');
+            $objWriter->writeAttribute('val', $id2);
+            $objWriter->endElement();
+
+            if (!empty($yAxis->getAxisOptionsProperty('horizontal_crosses'))) {
+                $objWriter->startElement('c:crosses');
+                $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('horizontal_crosses'));
+                $objWriter->endElement();
+            }
+        }
+
+        $objWriter->startElement('c:auto');
+        // LineChart with dateAx wants '0'
+        $objWriter->writeAttribute('val', ($axisType === Axis::AXIS_TYPE_DATE) ? '0' : '1');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:lblAlgn');
+        $objWriter->writeAttribute('val', 'ctr');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:lblOffset');
+        $objWriter->writeAttribute('val', '100');
+        $objWriter->endElement();
+
+        if ($axisType === Axis::AXIS_TYPE_DATE) {
+            $property = 'baseTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+            $property = 'majorTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+            $property = 'minorTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+        }
+
+        if ($isMultiLevelSeries) {
+            $objWriter->startElement('c:noMultiLvlLbl');
+            $objWriter->writeAttribute('val', '0');
+            $objWriter->endElement();
+        }
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Value Axis.
+     *
+     * @param null|string $groupType Chart type
+     */
+    private function writeValueAxis(XMLWriter $objWriter, ?Title $yAxisLabel, ?string $groupType, string $id1, string $id2, bool $isMultiLevelSeries, Axis $xAxis): void
+    {
+        $objWriter->startElement('c:' . Axis::AXIS_TYPE_VALUE);
+        $majorGridlines = $xAxis->getMajorGridlines();
+        $minorGridlines = $xAxis->getMinorGridlines();
+
+        if ($id2 !== '0') {
+            $objWriter->startElement('c:axId');
+            $objWriter->writeAttribute('val', $id2);
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('c:scaling');
+        if (is_numeric($xAxis->getAxisOptionsProperty('logBase'))) {
+            $logBase = $xAxis->getAxisOptionsProperty('logBase') + 0;
+            if ($logBase >= 2 && $logBase <= 1000) {
+                $objWriter->startElement('c:logBase');
+                $objWriter->writeAttribute('val', (string) $logBase);
+                $objWriter->endElement();
+            }
+        }
+
+        if ($xAxis->getAxisOptionsProperty('maximum') !== null) {
+            $objWriter->startElement('c:max');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('maximum'));
+            $objWriter->endElement();
+        }
+
+        if ($xAxis->getAxisOptionsProperty('minimum') !== null) {
+            $objWriter->startElement('c:min');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minimum'));
+            $objWriter->endElement();
+        }
+
+        if (!empty($xAxis->getAxisOptionsProperty('orientation'))) {
+            $objWriter->startElement('c:orientation');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('orientation'));
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement(); // c:scaling
+
+        $objWriter->startElement('c:delete');
+        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('hidden') ?? '0');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:axPos');
+        $objWriter->writeAttribute('val', 'l');
+        $objWriter->endElement();
+
+        if ($majorGridlines !== null) {
+            $objWriter->startElement('c:majorGridlines');
+            $objWriter->startElement('c:spPr');
+            $this->writeLineStyles($objWriter, $majorGridlines);
+            $this->writeEffects($objWriter, $majorGridlines);
+            $objWriter->endElement(); //end spPr
+            $objWriter->endElement(); //end majorGridLines
+        }
+
+        if ($minorGridlines !== null && $minorGridlines->getObjectState()) {
+            $objWriter->startElement('c:minorGridlines');
+            $objWriter->startElement('c:spPr');
+            $this->writeLineStyles($objWriter, $minorGridlines);
+            $this->writeEffects($objWriter, $minorGridlines);
+            $objWriter->endElement(); //end spPr
+            $objWriter->endElement(); //end minorGridLines
+        }
+
+        if ($yAxisLabel !== null) {
+            $objWriter->startElement('c:title');
+            $caption = $yAxisLabel->getCaption();
+            if ($caption !== null) {
+                $objWriter->startElement('c:tx');
+                $objWriter->startElement('c:rich');
+
+                $objWriter->startElement('a:bodyPr');
+                $objWriter->endElement(); // a:bodyPr
+
+                $objWriter->startElement('a:lstStyle');
+                $objWriter->endElement(); // a:lstStyle
+
+                $objWriter->startElement('a:p');
+
+                if (is_array($caption)) {
+                    $caption = $caption[0];
+                }
+                $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
+
+                $objWriter->endElement(); // a:p
+                $objWriter->endElement(); // c:rich
+                $objWriter->endElement(); // c:tx
+            }
+
+            if ($groupType !== DataSeries::TYPE_BUBBLECHART) {
+                $layout = $yAxisLabel->getLayout();
+                $this->writeLayout($objWriter, $layout);
+            }
+
+            $objWriter->startElement('c:overlay');
+            $objWriter->writeAttribute('val', '0');
+            $objWriter->endElement(); // c:overlay
+
+            $objWriter->endElement(); // c:title
+        }
+
+        $objWriter->startElement('c:numFmt');
+        $objWriter->writeAttribute('formatCode', $xAxis->getAxisNumberFormat());
+        $objWriter->writeAttribute('sourceLinked', $xAxis->getAxisNumberSourceLinked());
+        $objWriter->endElement();
+
+        if (!empty($xAxis->getAxisOptionsProperty('major_tick_mark'))) {
+            $objWriter->startElement('c:majorTickMark');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_tick_mark'));
+            $objWriter->endElement();
+        }
+
+        if (!empty($xAxis->getAxisOptionsProperty('minor_tick_mark'))) {
+            $objWriter->startElement('c:minorTickMark');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minor_tick_mark'));
+            $objWriter->endElement();
+        }
+
+        if (!empty($xAxis->getAxisOptionsProperty('axis_labels'))) {
+            $objWriter->startElement('c:tickLblPos');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('axis_labels'));
+            $objWriter->endElement();
+        }
+
+        $textRotation = $xAxis->getAxisOptionsProperty('textRotation');
+        $axisText = $xAxis->getAxisText();
+
+        if ($axisText !== null || is_numeric($textRotation)) {
+            $objWriter->startElement('c:txPr');
+            $objWriter->startElement('a:bodyPr');
+            if (is_numeric($textRotation)) {
+                $objWriter->writeAttribute('rot', Properties::angleToXml((float) $textRotation));
+            }
+            $objWriter->endElement(); // a:bodyPr
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+
+            $this->writeLabelFont($objWriter, ($axisText === null) ? null : $axisText->getFont(), $axisText);
+
+            $objWriter->endElement(); // c:txPr
+        }
+
+        $objWriter->startElement('c:spPr');
+        $this->writeColor($objWriter, $xAxis->getFillColorObject());
+        $this->writeLineStyles($objWriter, $xAxis, $xAxis->getNoFill());
+        $this->writeEffects($objWriter, $xAxis);
+        $objWriter->endElement(); //end spPr
+
+        if ($id1 !== '0') {
+            $objWriter->startElement('c:crossAx');
+            $objWriter->writeAttribute('val', $id1);
+            $objWriter->endElement();
+
+            if ($xAxis->getAxisOptionsProperty('horizontal_crosses_value') !== null) {
+                $objWriter->startElement('c:crossesAt');
+                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses_value'));
+                $objWriter->endElement();
+            } else {
+                $crosses = $xAxis->getAxisOptionsProperty('horizontal_crosses');
+                if ($crosses) {
+                    $objWriter->startElement('c:crosses');
+                    $objWriter->writeAttribute('val', $crosses);
+                    $objWriter->endElement();
+                }
+            }
+
+            $crossBetween = $xAxis->getCrossBetween();
+            if ($crossBetween !== '') {
+                $objWriter->startElement('c:crossBetween');
+                $objWriter->writeAttribute('val', $crossBetween);
+                $objWriter->endElement();
+            }
+
+            if ($xAxis->getAxisType() === Axis::AXIS_TYPE_VALUE) {
+                $dispUnits = $xAxis->getAxisOptionsProperty('dispUnitsBuiltIn');
+                $dispUnits = ($dispUnits == Axis::TRILLION_INDEX) ? Axis::DISP_UNITS_TRILLIONS : (is_numeric($dispUnits) ? (Axis::DISP_UNITS_BUILTIN_INT[(int) $dispUnits] ?? '') : $dispUnits);
+                if (in_array($dispUnits, Axis::DISP_UNITS_BUILTIN_INT, true)) {
+                    $objWriter->startElement('c:dispUnits');
+                    $objWriter->startElement('c:builtInUnit');
+                    $objWriter->writeAttribute('val', $dispUnits);
+                    $objWriter->endElement(); // c:builtInUnit
+                    if ($xAxis->getDispUnitsTitle() !== null) {
+                        // TODO output title elements
+                        $objWriter->writeElement('c:dispUnitsLbl');
+                    }
+                    $objWriter->endElement(); // c:dispUnits
+                }
+            }
+
+            if ($xAxis->getAxisOptionsProperty('major_unit') !== null) {
+                $objWriter->startElement('c:majorUnit');
+                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_unit'));
+                $objWriter->endElement();
+            }
+
+            if ($xAxis->getAxisOptionsProperty('minor_unit') !== null) {
+                $objWriter->startElement('c:minorUnit');
+                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minor_unit'));
+                $objWriter->endElement();
+            }
+        }
+
+        if ($isMultiLevelSeries) {
+            if ($groupType !== DataSeries::TYPE_BUBBLECHART) {
+                $objWriter->startElement('c:noMultiLvlLbl');
+                $objWriter->writeAttribute('val', '0');
+                $objWriter->endElement();
+            }
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Ser Axis, for Surface chart.
+     */
+    private function writeSerAxis(XMLWriter $objWriter, string $id2, string $id3): void
+    {
+        $objWriter->startElement('c:serAx');
+
+        $objWriter->startElement('c:axId');
+        $objWriter->writeAttribute('val', $id3);
+        $objWriter->endElement(); // axId
+
+        $objWriter->startElement('c:scaling');
+        $objWriter->startElement('c:orientation');
+        $objWriter->writeAttribute('val', 'minMax');
+        $objWriter->endElement(); // orientation
+        $objWriter->endElement(); // scaling
+
+        $objWriter->startElement('c:delete');
+        $objWriter->writeAttribute('val', '0');
+        $objWriter->endElement(); // delete
+
+        $objWriter->startElement('c:axPos');
+        $objWriter->writeAttribute('val', 'b');
+        $objWriter->endElement(); // axPos
+
+        $objWriter->startElement('c:majorTickMark');
+        $objWriter->writeAttribute('val', 'out');
+        $objWriter->endElement(); // majorTickMark
+
+        $objWriter->startElement('c:minorTickMark');
+        $objWriter->writeAttribute('val', 'none');
+        $objWriter->endElement(); // minorTickMark
+
+        $objWriter->startElement('c:tickLblPos');
+        $objWriter->writeAttribute('val', 'nextTo');
+        $objWriter->endElement(); // tickLblPos
+
+        $objWriter->startElement('c:crossAx');
+        $objWriter->writeAttribute('val', $id2);
+        $objWriter->endElement(); // crossAx
+
+        $objWriter->startElement('c:crosses');
+        $objWriter->writeAttribute('val', 'autoZero');
+        $objWriter->endElement(); // crosses
+
+        $objWriter->endElement(); //serAx
+    }
+
+    /**
+     * Get the data series type(s) for a chart plot series.
+     *
+     * @return string[]
+     */
+    private static function getChartType(PlotArea $plotArea): array
+    {
+        $groupCount = $plotArea->getPlotGroupCount();
+
+        if ($groupCount == 1) {
+            $plotType = $plotArea->getPlotGroupByIndex(0)->getPlotType();
+            $chartType = ($plotType === null) ? [] : [$plotType];
+        } else {
+            $chartTypes = [];
+            for ($i = 0; $i < $groupCount; ++$i) {
+                $plotType = $plotArea->getPlotGroupByIndex($i)->getPlotType();
+                if ($plotType !== null) {
+                    $chartTypes[] = $plotType;
+                }
+            }
+            $chartType = array_unique($chartTypes);
+        }
+        if (count($chartType) == 0) {
+            throw new WriterException('Chart is not yet implemented');
+        }
+
+        return $chartType;
+    }
+
+    /**
+     * Method writing plot series values.
+     */
+    private function writePlotSeriesValuesElement(XMLWriter $objWriter, int $val, ?ChartColor $fillColor): void
+    {
+        if ($fillColor === null || !$fillColor->isUsable()) {
+            return;
+        }
+        $objWriter->startElement('c:dPt');
+
+        $objWriter->startElement('c:idx');
+        $objWriter->writeAttribute('val', "$val");
+        $objWriter->endElement(); // c:idx
+
+        $objWriter->startElement('c:spPr');
+        $this->writeColor($objWriter, $fillColor);
+        $objWriter->endElement(); // c:spPr
+
+        $objWriter->endElement(); // c:dPt
+    }
+
+    /**
+     * Write Plot Group (series of related plots).
+     *
+     * @param string $groupType Type of plot for dataseries
+     * @param bool $catIsMultiLevelSeries Is category a multi-series category
+     * @param bool $valIsMultiLevelSeries Is value set a multi-series set
+     * @param string $plotGroupingType Type of grouping for multi-series values
+     */
+    private function writePlotGroup(?DataSeries $plotGroup, string $groupType, XMLWriter $objWriter, bool &$catIsMultiLevelSeries, bool &$valIsMultiLevelSeries, string &$plotGroupingType): void
+    {
+        if ($plotGroup === null) {
+            return;
+        }
+
+        if (($groupType == DataSeries::TYPE_BARCHART) || ($groupType == DataSeries::TYPE_BARCHART_3D)) {
+            $objWriter->startElement('c:barDir');
+            $objWriter->writeAttribute('val', $plotGroup->getPlotDirection());
+            $objWriter->endElement();
+        }
+
+        $plotGroupingType = $plotGroup->getPlotGrouping();
+        if ($plotGroupingType !== null && $groupType !== DataSeries::TYPE_SURFACECHART && $groupType !== DataSeries::TYPE_SURFACECHART_3D) {
+            $objWriter->startElement('c:grouping');
+            $objWriter->writeAttribute('val', $plotGroupingType);
+            $objWriter->endElement();
+        }
+
+        //    Get these details before the loop, because we can use the count to check for varyColors
+        $plotSeriesOrder = $plotGroup->getPlotOrder();
+        $plotSeriesCount = count($plotSeriesOrder);
+
+        if (($groupType !== DataSeries::TYPE_RADARCHART) && ($groupType !== DataSeries::TYPE_STOCKCHART)) {
+            if ($groupType !== DataSeries::TYPE_LINECHART) {
+                if (($groupType == DataSeries::TYPE_PIECHART) || ($groupType == DataSeries::TYPE_PIECHART_3D) || ($groupType == DataSeries::TYPE_DONUTCHART) || ($plotSeriesCount > 1)) {
+                    $objWriter->startElement('c:varyColors');
+                    $objWriter->writeAttribute('val', '1');
+                    $objWriter->endElement();
+                } else {
+                    $objWriter->startElement('c:varyColors');
+                    $objWriter->writeAttribute('val', '0');
+                    $objWriter->endElement();
+                }
+            }
+        }
+
+        $plotSeriesIdx = 0;
+        foreach ($plotSeriesOrder as $plotSeriesIdx => $plotSeriesRef) {
+            $objWriter->startElement('c:ser');
+
+            $objWriter->startElement('c:idx');
+            $adder = array_key_exists(0, $plotSeriesOrder) ? $this->seriesIndex : 0;
+            $objWriter->writeAttribute('val', (string) ($adder + $plotSeriesIdx));
+            $objWriter->endElement();
+
+            $objWriter->startElement('c:order');
+            $objWriter->writeAttribute('val', (string) ($adder + $plotSeriesRef));
+            $objWriter->endElement();
+
+            $plotLabel = $plotGroup->getPlotLabelByIndex($plotSeriesIdx);
+            $labelFill = null;
+            if ($plotLabel && $groupType === DataSeries::TYPE_LINECHART) {
+                $labelFill = $plotLabel->getFillColorObject();
+                $labelFill = ($labelFill instanceof ChartColor) ? $labelFill : null;
+            }
+
+            //    Values
+            $plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesIdx);
+
+            if ($plotSeriesValues !== false && in_array($groupType, self::CUSTOM_COLOR_TYPES, true)) {
+                $fillColorValues = $plotSeriesValues->getFillColorObject();
+                if ($fillColorValues !== null && is_array($fillColorValues)) {
+                    foreach (($plotSeriesValues->getDataValues() ?? []) as $dataKey => $dataValue) {
+                        $this->writePlotSeriesValuesElement($objWriter, $dataKey, $fillColorValues[$dataKey] ?? null);
+                    }
+                }
+            }
+            if ($plotSeriesValues !== false && $plotSeriesValues->getLabelLayout()) {
+                $this->writeDataLabels($objWriter, $plotSeriesValues->getLabelLayout());
+            }
+
+            //    Labels
+            $plotSeriesLabel = $plotGroup->getPlotLabelByIndex($plotSeriesIdx);
+            if ($plotSeriesLabel && ($plotSeriesLabel->getPointCount() > 0)) {
+                $objWriter->startElement('c:tx');
+                $objWriter->startElement('c:strRef');
+                $this->writePlotSeriesLabel($plotSeriesLabel, $objWriter);
+                $objWriter->endElement();
+                $objWriter->endElement();
+            }
+
+            //    Formatting for the points
+            if (
+                $plotSeriesValues !== false
+            ) {
+                $objWriter->startElement('c:spPr');
+                if ($plotLabel && $groupType !== DataSeries::TYPE_LINECHART) {
+                    $fillColor = $plotLabel->getFillColorObject();
+                    if ($fillColor !== null && !is_array($fillColor) && $fillColor->isUsable()) {
+                        $this->writeColor($objWriter, $fillColor);
+                    }
+                }
+                $fillObject = $labelFill ?? $plotSeriesValues->getFillColorObject();
+                $callLineStyles = true;
+                if ($fillObject instanceof ChartColor && $fillObject->isUsable()) {
+                    if ($groupType === DataSeries::TYPE_LINECHART) {
+                        $objWriter->startElement('a:ln');
+                        $callLineStyles = false;
+                    }
+                    $this->writeColor($objWriter, $fillObject);
+                    if (!$callLineStyles) {
+                        $objWriter->endElement(); // a:ln
+                    }
+                }
+                $nofill = $groupType === DataSeries::TYPE_STOCKCHART || (($groupType === DataSeries::TYPE_SCATTERCHART || $groupType === DataSeries::TYPE_LINECHART) && !$plotSeriesValues->getScatterLines());
+                if ($callLineStyles) {
+                    $this->writeLineStyles($objWriter, $plotSeriesValues, $nofill);
+                    $this->writeEffects($objWriter, $plotSeriesValues);
+                }
+                $objWriter->endElement(); // c:spPr
+            }
+
+            if ($plotSeriesValues) {
+                $plotSeriesMarker = $plotSeriesValues->getPointMarker();
+                $markerFillColor = $plotSeriesValues->getMarkerFillColor();
+                $fillUsed = $markerFillColor->IsUsable();
+                $markerBorderColor = $plotSeriesValues->getMarkerBorderColor();
+                $borderUsed = $markerBorderColor->isUsable();
+                if ($plotSeriesMarker || $fillUsed || $borderUsed) {
+                    $objWriter->startElement('c:marker');
+                    $objWriter->startElement('c:symbol');
+                    if ($plotSeriesMarker) {
+                        $objWriter->writeAttribute('val', $plotSeriesMarker);
+                    }
+                    $objWriter->endElement();
+
+                    if ($plotSeriesMarker !== 'none') {
+                        $objWriter->startElement('c:size');
+                        $objWriter->writeAttribute('val', (string) $plotSeriesValues->getPointSize());
+                        $objWriter->endElement(); // c:size
+                        $objWriter->startElement('c:spPr');
+                        $this->writeColor($objWriter, $markerFillColor);
+                        if ($borderUsed) {
+                            $objWriter->startElement('a:ln');
+                            $this->writeColor($objWriter, $markerBorderColor);
+                            $objWriter->endElement(); // a:ln
+                        }
+                        $objWriter->endElement(); // spPr
+                    }
+
+                    $objWriter->endElement();
+                }
+            }
+
+            if (($groupType === DataSeries::TYPE_BARCHART) || ($groupType === DataSeries::TYPE_BARCHART_3D) || ($groupType === DataSeries::TYPE_BUBBLECHART)) {
+                $objWriter->startElement('c:invertIfNegative');
+                $objWriter->writeAttribute('val', '0');
+                $objWriter->endElement();
+            }
+            // Trendlines
+            if ($plotSeriesValues !== false) {
+                foreach ($plotSeriesValues->getTrendLines() as $trendLine) {
+                    $trendLineType = $trendLine->getTrendLineType();
+                    $order = $trendLine->getOrder();
+                    $period = $trendLine->getPeriod();
+                    $dispRSqr = $trendLine->getDispRSqr();
+                    $dispEq = $trendLine->getDispEq();
+                    $forward = $trendLine->getForward();
+                    $backward = $trendLine->getBackward();
+                    $intercept = $trendLine->getIntercept();
+                    $name = $trendLine->getName();
+                    $trendLineColor = $trendLine->getLineColor(); // ChartColor
+
+                    $objWriter->startElement('c:trendline'); // N.B. lowercase 'ell'
+                    if ($name !== '') {
+                        $objWriter->startElement('c:name');
+                        $objWriter->writeRawData($name);
+                        $objWriter->endElement(); // c:name
+                    }
+                    $objWriter->startElement('c:spPr');
+
+                    if (!$trendLineColor->isUsable()) {
+                        // use dataSeriesValues line color as a backup if $trendLineColor is null
+                        $dsvLineColor = $plotSeriesValues->getLineColor();
+                        if ($dsvLineColor->isUsable()) {
+                            $trendLine
+                                ->getLineColor()
+                                ->setColorProperties($dsvLineColor->getValue(), $dsvLineColor->getAlpha(), $dsvLineColor->getType());
+                        }
+                    } // otherwise, hope Excel does the right thing
+
+                    $this->writeLineStyles($objWriter, $trendLine, false); // suppress noFill
+
+                    $objWriter->endElement(); // spPr
+
+                    $objWriter->startElement('c:trendlineType'); // N.B lowercase 'ell'
+                    $objWriter->writeAttribute('val', $trendLineType);
+                    $objWriter->endElement(); // trendlineType
+                    if ($backward !== 0.0) {
+                        $objWriter->startElement('c:backward');
+                        $objWriter->writeAttribute('val', "$backward");
+                        $objWriter->endElement(); // c:backward
+                    }
+                    if ($forward !== 0.0) {
+                        $objWriter->startElement('c:forward');
+                        $objWriter->writeAttribute('val', "$forward");
+                        $objWriter->endElement(); // c:forward
+                    }
+                    if ($intercept !== 0.0) {
+                        $objWriter->startElement('c:intercept');
+                        $objWriter->writeAttribute('val', "$intercept");
+                        $objWriter->endElement(); // c:intercept
+                    }
+                    if ($trendLineType == TrendLine::TRENDLINE_POLYNOMIAL) {
+                        $objWriter->startElement('c:order');
+                        $objWriter->writeAttribute('val', $order);
+                        $objWriter->endElement(); // order
+                    }
+                    if ($trendLineType == TrendLine::TRENDLINE_MOVING_AVG) {
+                        $objWriter->startElement('c:period');
+                        $objWriter->writeAttribute('val', $period);
+                        $objWriter->endElement(); // period
+                    }
+                    $objWriter->startElement('c:dispRSqr');
+                    $objWriter->writeAttribute('val', $dispRSqr ? '1' : '0');
+                    $objWriter->endElement();
+                    $objWriter->startElement('c:dispEq');
+                    $objWriter->writeAttribute('val', $dispEq ? '1' : '0');
+                    $objWriter->endElement();
+                    if ($groupType === DataSeries::TYPE_SCATTERCHART || $groupType === DataSeries::TYPE_LINECHART) {
+                        $objWriter->startElement('c:trendlineLbl');
+                        $objWriter->startElement('c:numFmt');
+                        $objWriter->writeAttribute('formatCode', 'General');
+                        $objWriter->writeAttribute('sourceLinked', '0');
+                        $objWriter->endElement();  // numFmt
+                        $objWriter->endElement();  // trendlineLbl
+                    }
+
+                    $objWriter->endElement(); // trendline
+                }
+            }
+
+            //    Category Labels
+            $plotSeriesCategory = $plotGroup->getPlotCategoryByIndex($plotSeriesIdx);
+            if ($plotSeriesCategory && ($plotSeriesCategory->getPointCount() > 0)) {
+                $catIsMultiLevelSeries = $catIsMultiLevelSeries || $plotSeriesCategory->isMultiLevelSeries();
+
+                if (($groupType == DataSeries::TYPE_PIECHART) || ($groupType == DataSeries::TYPE_PIECHART_3D) || ($groupType == DataSeries::TYPE_DONUTCHART)) {
+                    $plotStyle = $plotGroup->getPlotStyle();
+                    if (is_numeric($plotStyle)) {
+                        $objWriter->startElement('c:explosion');
+                        $objWriter->writeAttribute('val', $plotStyle);
+                        $objWriter->endElement();
+                    }
+                }
+
+                if (($groupType === DataSeries::TYPE_BUBBLECHART) || ($groupType === DataSeries::TYPE_SCATTERCHART)) {
+                    $objWriter->startElement('c:xVal');
+                } else {
+                    $objWriter->startElement('c:cat');
+                }
+
+                // xVals (Categories) are not always 'str'
+                // Test X-axis Label's Datatype to decide 'str' vs 'num'
+                $CategoryDatatype = $plotSeriesCategory->getDataType();
+                if ($CategoryDatatype == DataSeriesValues::DATASERIES_TYPE_NUMBER) {
+                    $this->writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'num');
+                } else {
+                    $this->writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'str');
+                }
+                $objWriter->endElement();
+            }
+
+            //    Values
+            if ($plotSeriesValues) {
+                $valIsMultiLevelSeries = $valIsMultiLevelSeries || $plotSeriesValues->isMultiLevelSeries();
+
+                if (($groupType === DataSeries::TYPE_BUBBLECHART) || ($groupType === DataSeries::TYPE_SCATTERCHART)) {
+                    $objWriter->startElement('c:yVal');
+                } else {
+                    $objWriter->startElement('c:val');
+                }
+
+                $this->writePlotSeriesValues($plotSeriesValues, $objWriter, $groupType, 'num');
+                $objWriter->endElement();
+                if ($groupType === DataSeries::TYPE_SCATTERCHART && $plotGroup->getPlotStyle() === 'smoothMarker') {
+                    $objWriter->startElement('c:smooth');
+                    $objWriter->writeAttribute('val', $plotSeriesValues->getSmoothLine() ? '1' : '0');
+                    $objWriter->endElement();
+                }
+            }
+
+            if ($groupType === DataSeries::TYPE_BUBBLECHART) {
+                if (!empty($plotGroup->getPlotBubbleSizes()[$plotSeriesIdx])) {
+                    $objWriter->startElement('c:bubbleSize');
+                    $this->writePlotSeriesValues(
+                        $plotGroup->getPlotBubbleSizes()[$plotSeriesIdx],
+                        $objWriter,
+                        $groupType,
+                        'num'
+                    );
+                    $objWriter->endElement();
+                    if ($plotSeriesValues !== false) {
+                        $objWriter->startElement('c:bubble3D');
+                        $objWriter->writeAttribute('val', $plotSeriesValues->getBubble3D() ? '1' : '0');
+                        $objWriter->endElement();
+                    }
+                } elseif ($plotSeriesValues !== false) {
+                    $this->writeBubbles($plotSeriesValues, $objWriter);
+                }
+            }
+
+            $objWriter->endElement();
+        }
+
+        $this->seriesIndex += $plotSeriesIdx + 1;
+    }
+
+    /**
+     * Write Plot Series Label.
+     */
+    private function writePlotSeriesLabel(?DataSeriesValues $plotSeriesLabel, XMLWriter $objWriter): void
+    {
+        if ($plotSeriesLabel === null) {
+            return;
+        }
+
+        $objWriter->startElement('c:f');
+        $objWriter->writeRawData($plotSeriesLabel->getDataSource());
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:strCache');
+        $objWriter->startElement('c:ptCount');
+        $objWriter->writeAttribute('val', (string) $plotSeriesLabel->getPointCount());
+        $objWriter->endElement();
+
+        foreach (($plotSeriesLabel->getDataValues() ?? []) as $plotLabelKey => $plotLabelValue) {
+            $objWriter->startElement('c:pt');
+            $objWriter->writeAttribute('idx', $plotLabelKey);
+
+            $objWriter->startElement('c:v');
+            $objWriter->writeRawData($plotLabelValue);
+            $objWriter->endElement();
+            $objWriter->endElement();
+        }
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Plot Series Values.
+     *
+     * @param string $groupType Type of plot for dataseries
+     * @param string $dataType Datatype of series values
+     */
+    private function writePlotSeriesValues(?DataSeriesValues $plotSeriesValues, XMLWriter $objWriter, string $groupType, string $dataType = 'str'): void
+    {
+        if ($plotSeriesValues === null) {
+            return;
+        }
+
+        if ($plotSeriesValues->isMultiLevelSeries()) {
+            $levelCount = $plotSeriesValues->multiLevelCount();
+
+            $objWriter->startElement('c:multiLvlStrRef');
+
+            $objWriter->startElement('c:f');
+            $objWriter->writeRawData($plotSeriesValues->getDataSource());
+            $objWriter->endElement();
+
+            $objWriter->startElement('c:multiLvlStrCache');
+
+            $objWriter->startElement('c:ptCount');
+            $objWriter->writeAttribute('val', (string) $plotSeriesValues->getPointCount());
+            $objWriter->endElement();
+
+            for ($level = 0; $level < $levelCount; ++$level) {
+                $objWriter->startElement('c:lvl');
+
+                foreach (($plotSeriesValues->getDataValues() ?? []) as $plotSeriesKey => $plotSeriesValue) {
+                    if (isset($plotSeriesValue[$level])) {
+                        $objWriter->startElement('c:pt');
+                        $objWriter->writeAttribute('idx', $plotSeriesKey);
+
+                        $objWriter->startElement('c:v');
+                        $objWriter->writeRawData($plotSeriesValue[$level]);
+                        $objWriter->endElement();
+                        $objWriter->endElement();
+                    }
+                }
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        } else {
+            $objWriter->startElement('c:' . $dataType . 'Ref');
+
+            $objWriter->startElement('c:f');
+            $objWriter->writeRawData($plotSeriesValues->getDataSource());
+            $objWriter->endElement();
+
+            $count = $plotSeriesValues->getPointCount();
+            $source = $plotSeriesValues->getDataSource();
+            $values = $plotSeriesValues->getDataValues();
+            if ($count > 1 || ($count === 1 && is_array($values) && array_key_exists(0, $values) && "=$source" !== (string) $values[0])) {
+                $objWriter->startElement('c:' . $dataType . 'Cache');
+
+                if (($groupType != DataSeries::TYPE_PIECHART) && ($groupType != DataSeries::TYPE_PIECHART_3D) && ($groupType != DataSeries::TYPE_DONUTCHART)) {
+                    if (($plotSeriesValues->getFormatCode() !== null) && ($plotSeriesValues->getFormatCode() !== '')) {
+                        $objWriter->startElement('c:formatCode');
+                        $objWriter->writeRawData($plotSeriesValues->getFormatCode());
+                        $objWriter->endElement();
+                    }
+                }
+
+                $objWriter->startElement('c:ptCount');
+                $objWriter->writeAttribute('val', (string) $plotSeriesValues->getPointCount());
+                $objWriter->endElement();
+
+                $dataValues = $plotSeriesValues->getDataValues();
+                if (!empty($dataValues)) {
+                    foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
+                        $objWriter->startElement('c:pt');
+                        $objWriter->writeAttribute('idx', $plotSeriesKey);
+
+                        $objWriter->startElement('c:v');
+                        $objWriter->writeRawData($plotSeriesValue);
+                        $objWriter->endElement();
+                        $objWriter->endElement();
+                    }
+                }
+
+                $objWriter->endElement(); // *Cache
+            }
+
+            $objWriter->endElement(); // *Ref
+        }
+    }
+
+    private const CUSTOM_COLOR_TYPES = [
+        DataSeries::TYPE_BARCHART,
+        DataSeries::TYPE_BARCHART_3D,
+        DataSeries::TYPE_PIECHART,
+        DataSeries::TYPE_PIECHART_3D,
+        DataSeries::TYPE_DONUTCHART,
+    ];
+
+    /**
+     * Write Bubble Chart Details.
+     */
+    private function writeBubbles(?DataSeriesValues $plotSeriesValues, XMLWriter $objWriter): void
+    {
+        if ($plotSeriesValues === null) {
+            return;
+        }
+
+        $objWriter->startElement('c:bubbleSize');
+        $objWriter->startElement('c:numLit');
+
+        $objWriter->startElement('c:formatCode');
+        $objWriter->writeRawData('General');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:ptCount');
+        $objWriter->writeAttribute('val', (string) $plotSeriesValues->getPointCount());
+        $objWriter->endElement();
+
+        $dataValues = $plotSeriesValues->getDataValues();
+        if (!empty($dataValues)) {
+            foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
+                $objWriter->startElement('c:pt');
+                $objWriter->writeAttribute('idx', $plotSeriesKey);
+                $objWriter->startElement('c:v');
+                $objWriter->writeRawData('1');
+                $objWriter->endElement();
+                $objWriter->endElement();
+            }
+        }
+
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:bubble3D');
+        $objWriter->writeAttribute('val', $plotSeriesValues->getBubble3D() ? '1' : '0');
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Layout.
+     */
+    private function writeLayout(XMLWriter $objWriter, ?Layout $layout = null): void
+    {
+        $objWriter->startElement('c:layout');
+
+        if ($layout !== null) {
+            $objWriter->startElement('c:manualLayout');
+
+            $layoutTarget = $layout->getLayoutTarget();
+            if ($layoutTarget !== null) {
+                $objWriter->startElement('c:layoutTarget');
+                $objWriter->writeAttribute('val', $layoutTarget);
+                $objWriter->endElement();
+            }
+
+            $xMode = $layout->getXMode();
+            if ($xMode !== null) {
+                $objWriter->startElement('c:xMode');
+                $objWriter->writeAttribute('val', $xMode);
+                $objWriter->endElement();
+            }
+
+            $yMode = $layout->getYMode();
+            if ($yMode !== null) {
+                $objWriter->startElement('c:yMode');
+                $objWriter->writeAttribute('val', $yMode);
+                $objWriter->endElement();
+            }
+
+            $x = $layout->getXPosition();
+            if ($x !== null) {
+                $objWriter->startElement('c:x');
+                $objWriter->writeAttribute('val', "$x");
+                $objWriter->endElement();
+            }
+
+            $y = $layout->getYPosition();
+            if ($y !== null) {
+                $objWriter->startElement('c:y');
+                $objWriter->writeAttribute('val', "$y");
+                $objWriter->endElement();
+            }
+
+            $w = $layout->getWidth();
+            if ($w !== null) {
+                $objWriter->startElement('c:w');
+                $objWriter->writeAttribute('val', "$w");
+                $objWriter->endElement();
+            }
+
+            $h = $layout->getHeight();
+            if ($h !== null) {
+                $objWriter->startElement('c:h');
+                $objWriter->writeAttribute('val', "$h");
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Alternate Content block.
+     */
+    private function writeAlternateContent(XMLWriter $objWriter): void
+    {
+        $objWriter->startElement('mc:AlternateContent');
+        $objWriter->writeAttribute('xmlns:mc', Namespaces::COMPATIBILITY);
+
+        $objWriter->startElement('mc:Choice');
+        $objWriter->writeAttribute('Requires', 'c14');
+        $objWriter->writeAttribute('xmlns:c14', Namespaces::CHART_ALTERNATE);
+
+        $objWriter->startElement('c14:style');
+        $objWriter->writeAttribute('val', '102');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('mc:Fallback');
+        $objWriter->startElement('c:style');
+        $objWriter->writeAttribute('val', '2');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Printer Settings.
+     */
+    private function writePrintSettings(XMLWriter $objWriter): void
+    {
+        $objWriter->startElement('c:printSettings');
+
+        $objWriter->startElement('c:headerFooter');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:pageMargins');
+        $objWriter->writeAttribute('footer', '0.3');
+        $objWriter->writeAttribute('header', '0.3');
+        $objWriter->writeAttribute('r', '0.7');
+        $objWriter->writeAttribute('l', '0.7');
+        $objWriter->writeAttribute('t', '0.75');
+        $objWriter->writeAttribute('b', '0.75');
+        $objWriter->endElement();
+
+        $objWriter->startElement('c:pageSetup');
+        $objWriter->writeAttribute('orientation', 'portrait');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    private function writeEffects(XMLWriter $objWriter, Properties $yAxis): void
+    {
+        if (
+            !empty($yAxis->getSoftEdgesSize())
+            || !empty($yAxis->getShadowProperty('effect'))
+            || !empty($yAxis->getGlowProperty('size'))
+        ) {
+            $objWriter->startElement('a:effectLst');
+            $this->writeGlow($objWriter, $yAxis);
+            $this->writeShadow($objWriter, $yAxis);
+            $this->writeSoftEdge($objWriter, $yAxis);
+            $objWriter->endElement(); // effectLst
+        }
+    }
+
+    private function writeShadow(XMLWriter $objWriter, Properties $xAxis): void
+    {
+        if (empty($xAxis->getShadowProperty('effect'))) {
+            return;
+        }
+        /** @var string $effect */
+        $effect = $xAxis->getShadowProperty('effect');
+        $objWriter->startElement("a:$effect");
+
+        if (is_numeric($xAxis->getShadowProperty('blur'))) {
+            $objWriter->writeAttribute('blurRad', Properties::pointsToXml((float) $xAxis->getShadowProperty('blur')));
+        }
+        if (is_numeric($xAxis->getShadowProperty('distance'))) {
+            $objWriter->writeAttribute('dist', Properties::pointsToXml((float) $xAxis->getShadowProperty('distance')));
+        }
+        if (is_numeric($xAxis->getShadowProperty('direction'))) {
+            $objWriter->writeAttribute('dir', Properties::angleToXml((float) $xAxis->getShadowProperty('direction')));
+        }
+        $algn = $xAxis->getShadowProperty('algn');
+        if (is_string($algn) && $algn !== '') {
+            $objWriter->writeAttribute('algn', $algn);
+        }
+        foreach (['sx', 'sy'] as $sizeType) {
+            $sizeValue = $xAxis->getShadowProperty(['size', $sizeType]);
+            if (is_numeric($sizeValue)) {
+                $objWriter->writeAttribute($sizeType, Properties::tenthOfPercentToXml((float) $sizeValue));
+            }
+        }
+        foreach (['kx', 'ky'] as $sizeType) {
+            $sizeValue = $xAxis->getShadowProperty(['size', $sizeType]);
+            if (is_numeric($sizeValue)) {
+                $objWriter->writeAttribute($sizeType, Properties::angleToXml((float) $sizeValue));
+            }
+        }
+        $rotWithShape = $xAxis->getShadowProperty('rotWithShape');
+        if (is_numeric($rotWithShape)) {
+            $objWriter->writeAttribute('rotWithShape', (string) (int) $rotWithShape);
+        }
+
+        $this->writeColor($objWriter, $xAxis->getShadowColorObject(), false);
+
+        $objWriter->endElement();
+    }
+
+    private function writeGlow(XMLWriter $objWriter, Properties $yAxis): void
+    {
+        $size = $yAxis->getGlowProperty('size');
+        if (empty($size)) {
+            return;
+        }
+        $objWriter->startElement('a:glow');
+        $objWriter->writeAttribute('rad', Properties::pointsToXml((float) $size));
+        $this->writeColor($objWriter, $yAxis->getGlowColorObject(), false);
+        $objWriter->endElement(); // glow
+    }
+
+    private function writeSoftEdge(XMLWriter $objWriter, Properties $yAxis): void
+    {
+        $softEdgeSize = $yAxis->getSoftEdgesSize();
+        if (empty($softEdgeSize)) {
+            return;
+        }
+        $objWriter->startElement('a:softEdge');
+        $objWriter->writeAttribute('rad', Properties::pointsToXml((float) $softEdgeSize));
+        $objWriter->endElement(); //end softEdge
+    }
+
+    private function writeLineStyles(XMLWriter $objWriter, Properties $gridlines, bool $noFill = false): void
+    {
+        $objWriter->startElement('a:ln');
+        $widthTemp = $gridlines->getLineStyleProperty('width');
+        if (is_numeric($widthTemp)) {
+            $objWriter->writeAttribute('w', Properties::pointsToXml((float) $widthTemp));
+        }
+        $this->writeNotEmpty($objWriter, 'cap', $gridlines->getLineStyleProperty('cap'));
+        $this->writeNotEmpty($objWriter, 'cmpd', $gridlines->getLineStyleProperty('compound'));
+        if ($noFill) {
+            $objWriter->startElement('a:noFill');
+            $objWriter->endElement();
+        } else {
+            $this->writeColor($objWriter, $gridlines->getLineColor());
+        }
+
+        $dash = $gridlines->getLineStyleProperty('dash');
+        if (!empty($dash)) {
+            $objWriter->startElement('a:prstDash');
+            $this->writeNotEmpty($objWriter, 'val', $dash);
+            $objWriter->endElement();
+        }
+
+        if ($gridlines->getLineStyleProperty('join') === 'miter') {
+            $objWriter->startElement('a:miter');
+            $objWriter->writeAttribute('lim', '800000');
+            $objWriter->endElement();
+        } elseif ($gridlines->getLineStyleProperty('join') === 'bevel') {
+            $objWriter->startElement('a:bevel');
+            $objWriter->endElement();
+        }
+
+        if ($gridlines->getLineStyleProperty(['arrow', 'head', 'type'])) {
+            $objWriter->startElement('a:headEnd');
+            $objWriter->writeAttribute('type', $gridlines->getLineStyleProperty(['arrow', 'head', 'type']));
+            $this->writeNotEmpty($objWriter, 'w', $gridlines->getLineStyleArrowWidth('head'));
+            $this->writeNotEmpty($objWriter, 'len', $gridlines->getLineStyleArrowLength('head'));
+            $objWriter->endElement();
+        }
+
+        if ($gridlines->getLineStyleProperty(['arrow', 'end', 'type'])) {
+            $objWriter->startElement('a:tailEnd');
+            $objWriter->writeAttribute('type', $gridlines->getLineStyleProperty(['arrow', 'end', 'type']));
+            $this->writeNotEmpty($objWriter, 'w', $gridlines->getLineStyleArrowWidth('end'));
+            $this->writeNotEmpty($objWriter, 'len', $gridlines->getLineStyleArrowLength('end'));
+            $objWriter->endElement();
+        }
+        $objWriter->endElement(); //end ln
+    }
+
+    private function writeNotEmpty(XMLWriter $objWriter, string $name, ?string $value): void
+    {
+        if ($value !== null && $value !== '') {
+            $objWriter->writeAttribute($name, $value);
+        }
+    }
+
+    private function writeColor(XMLWriter $objWriter, ChartColor $chartColor, bool $solidFill = true): void
+    {
+        $type = $chartColor->getType();
+        $value = $chartColor->getValue();
+        if (!empty($type) && !empty($value)) {
+            if ($solidFill) {
+                $objWriter->startElement('a:solidFill');
+            }
+            $objWriter->startElement("a:$type");
+            $objWriter->writeAttribute('val', $value);
+            $alpha = $chartColor->getAlpha();
+            if (is_numeric($alpha)) {
+                $objWriter->startElement('a:alpha');
+                $objWriter->writeAttribute('val', ChartColor::alphaToXml((int) $alpha));
+                $objWriter->endElement(); // a:alpha
+            }
+            $brightness = $chartColor->getBrightness();
+            if (is_numeric($brightness)) {
+                $brightness = (int) $brightness;
+                $lumOff = 100 - $brightness;
+                $objWriter->startElement('a:lumMod');
+                $objWriter->writeAttribute('val', ChartColor::alphaToXml($brightness));
+                $objWriter->endElement(); // a:lumMod
+                $objWriter->startElement('a:lumOff');
+                $objWriter->writeAttribute('val', ChartColor::alphaToXml($lumOff));
+                $objWriter->endElement(); // a:lumOff
+            }
+            $objWriter->endElement(); //a:srgbClr/schemeClr/prstClr
+            if ($solidFill) {
+                $objWriter->endElement(); //a:solidFill
+            }
+        }
+    }
+
+    private function writeLabelFont(XMLWriter $objWriter, ?Font $labelFont, ?Properties $axisText): void
+    {
+        $objWriter->startElement('a:p');
+        $objWriter->startElement('a:pPr');
+        $objWriter->startElement('a:defRPr');
+        if ($labelFont !== null) {
+            $fontSize = $labelFont->getSize();
+            if (is_numeric($fontSize)) {
+                $fontSize *= (($fontSize < 100) ? 100 : 1);
+                $objWriter->writeAttribute('sz', (string) $fontSize);
+            }
+            if ($labelFont->getBold() === true) {
+                $objWriter->writeAttribute('b', '1');
+            }
+            if ($labelFont->getItalic() === true) {
+                $objWriter->writeAttribute('i', '1');
+            }
+            $cap = $labelFont->getCap();
+            if ($cap !== null) {
+                $objWriter->writeAttribute('cap', $cap);
+            }
+            $fontColor = $labelFont->getChartColor();
+            if ($fontColor !== null) {
+                $this->writeColor($objWriter, $fontColor);
+            }
+        }
+        if ($axisText !== null) {
+            $this->writeEffects($objWriter, $axisText);
+        }
+        if ($labelFont !== null) {
+            if (!empty($labelFont->getLatin())) {
+                $objWriter->startElement('a:latin');
+                $objWriter->writeAttribute('typeface', $labelFont->getLatin());
+                $objWriter->endElement();
+            }
+            if (!empty($labelFont->getEastAsian())) {
+                $objWriter->startElement('a:eastAsian');
+                $objWriter->writeAttribute('typeface', $labelFont->getEastAsian());
+                $objWriter->endElement();
+            }
+            if (!empty($labelFont->getComplexScript())) {
+                $objWriter->startElement('a:complexScript');
+                $objWriter->writeAttribute('typeface', $labelFont->getComplexScript());
+                $objWriter->endElement();
+            }
+        }
+        $objWriter->endElement(); // a:defRPr
+        $objWriter->endElement(); // a:pPr
+        $objWriter->endElement(); // a:p
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
new file mode 100644
index 00000000..f42c2427
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
@@ -0,0 +1,253 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+class Comments extends WriterPart
+{
+    private const VALID_HORIZONTAL_ALIGNMENT = [
+        Alignment::HORIZONTAL_CENTER,
+        Alignment::HORIZONTAL_DISTRIBUTED,
+        Alignment::HORIZONTAL_JUSTIFY,
+        Alignment::HORIZONTAL_LEFT,
+        Alignment::HORIZONTAL_RIGHT,
+    ];
+
+    /**
+     * Write comments to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Comments cache
+        $comments = $worksheet->getComments();
+
+        // Authors cache
+        $authors = [];
+        $authorId = 0;
+        foreach ($comments as $comment) {
+            if (!isset($authors[$comment->getAuthor()])) {
+                $authors[$comment->getAuthor()] = $authorId++;
+            }
+        }
+
+        // comments
+        $objWriter->startElement('comments');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+
+        // Loop through authors
+        $objWriter->startElement('authors');
+        foreach ($authors as $author => $index) {
+            $objWriter->writeElement('author', $author);
+        }
+        $objWriter->endElement();
+
+        // Loop through comments
+        $objWriter->startElement('commentList');
+        foreach ($comments as $key => $value) {
+            $this->writeComment($objWriter, $key, $value, $authors);
+        }
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write comment to XML format.
+     *
+     * @param string $cellReference Cell reference
+     * @param Comment $comment Comment
+     * @param array $authors Array of authors
+     */
+    private function writeComment(XMLWriter $objWriter, string $cellReference, Comment $comment, array $authors): void
+    {
+        // comment
+        $objWriter->startElement('comment');
+        $objWriter->writeAttribute('ref', $cellReference);
+        $objWriter->writeAttribute('authorId', $authors[$comment->getAuthor()]);
+
+        // text
+        $objWriter->startElement('text');
+        $this->getParentWriter()->getWriterPartstringtable()->writeRichText($objWriter, $comment->getText());
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write VML comments to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeVMLComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Comments cache
+        $comments = $worksheet->getComments();
+
+        // xml
+        $objWriter->startElement('xml');
+        $objWriter->writeAttribute('xmlns:v', Namespaces::URN_VML);
+        $objWriter->writeAttribute('xmlns:o', Namespaces::URN_MSOFFICE);
+        $objWriter->writeAttribute('xmlns:x', Namespaces::URN_EXCEL);
+
+        // o:shapelayout
+        $objWriter->startElement('o:shapelayout');
+        $objWriter->writeAttribute('v:ext', 'edit');
+
+        // o:idmap
+        $objWriter->startElement('o:idmap');
+        $objWriter->writeAttribute('v:ext', 'edit');
+        $objWriter->writeAttribute('data', '1');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // v:shapetype
+        $objWriter->startElement('v:shapetype');
+        $objWriter->writeAttribute('id', '_x0000_t202');
+        $objWriter->writeAttribute('coordsize', '21600,21600');
+        $objWriter->writeAttribute('o:spt', '202');
+        $objWriter->writeAttribute('path', 'm,l,21600r21600,l21600,xe');
+
+        // v:stroke
+        $objWriter->startElement('v:stroke');
+        $objWriter->writeAttribute('joinstyle', 'miter');
+        $objWriter->endElement();
+
+        // v:path
+        $objWriter->startElement('v:path');
+        $objWriter->writeAttribute('gradientshapeok', 't');
+        $objWriter->writeAttribute('o:connecttype', 'rect');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Loop through comments
+        foreach ($comments as $key => $value) {
+            $this->writeVMLComment($objWriter, $key, $value);
+        }
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write VML comment to XML format.
+     *
+     * @param string $cellReference Cell reference, eg: 'A1'
+     * @param Comment $comment Comment
+     */
+    private function writeVMLComment(XMLWriter $objWriter, string $cellReference, Comment $comment): void
+    {
+        // Metadata
+        [$column, $row] = Coordinate::indexesFromString($cellReference);
+        $id = 1024 + $column + $row;
+        $id = substr("$id", 0, 4);
+
+        // v:shape
+        $objWriter->startElement('v:shape');
+        $objWriter->writeAttribute('id', '_x0000_s' . $id);
+        $objWriter->writeAttribute('type', '#_x0000_t202');
+        $objWriter->writeAttribute('style', 'position:absolute;margin-left:' . $comment->getMarginLeft() . ';margin-top:' . $comment->getMarginTop() . ';width:' . $comment->getWidth() . ';height:' . $comment->getHeight() . ';z-index:1;visibility:' . ($comment->getVisible() ? 'visible' : 'hidden'));
+        $objWriter->writeAttribute('fillcolor', '#' . $comment->getFillColor()->getRGB());
+        $objWriter->writeAttribute('o:insetmode', 'auto');
+
+        // v:fill
+        $objWriter->startElement('v:fill');
+        $objWriter->writeAttribute('color2', '#' . $comment->getFillColor()->getRGB());
+        if ($comment->hasBackgroundImage()) {
+            $bgImage = $comment->getBackgroundImage();
+            $objWriter->writeAttribute('o:relid', 'rId' . $bgImage->getImageIndex());
+            $objWriter->writeAttribute('o:title', $bgImage->getName());
+            $objWriter->writeAttribute('type', 'frame');
+        }
+        $objWriter->endElement();
+
+        // v:shadow
+        $objWriter->startElement('v:shadow');
+        $objWriter->writeAttribute('on', 't');
+        $objWriter->writeAttribute('color', 'black');
+        $objWriter->writeAttribute('obscured', 't');
+        $objWriter->endElement();
+
+        // v:path
+        $objWriter->startElement('v:path');
+        $objWriter->writeAttribute('o:connecttype', 'none');
+        $objWriter->endElement();
+
+        // v:textbox
+        $textBoxArray = [Comment::TEXTBOX_DIRECTION_RTL => 'rtl', Comment::TEXTBOX_DIRECTION_LTR => 'ltr'];
+        $textboxRtl = $textBoxArray[strtolower($comment->getTextBoxDirection())] ?? 'auto';
+        $objWriter->startElement('v:textbox');
+        $objWriter->writeAttribute('style', "mso-direction-alt:$textboxRtl");
+
+        // div
+        $objWriter->startElement('div');
+        $objWriter->writeAttribute('style', ($textboxRtl === 'rtl' ? 'text-align:right;direction:rtl' : 'text-align:left'));
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // x:ClientData
+        $objWriter->startElement('x:ClientData');
+        $objWriter->writeAttribute('ObjectType', 'Note');
+
+        // x:MoveWithCells
+        $objWriter->writeElement('x:MoveWithCells', '');
+
+        // x:SizeWithCells
+        $objWriter->writeElement('x:SizeWithCells', '');
+
+        // x:AutoFill
+        $objWriter->writeElement('x:AutoFill', 'False');
+
+        // x:TextHAlign horizontal alignment of text
+        $alignment = strtolower($comment->getAlignment());
+        if (in_array($alignment, self::VALID_HORIZONTAL_ALIGNMENT, true)) {
+            $objWriter->writeElement('x:TextHAlign', ucfirst($alignment));
+        }
+
+        // x:Row
+        $objWriter->writeElement('x:Row', (string) ($row - 1));
+
+        // x:Column
+        $objWriter->writeElement('x:Column', (string) ($column - 1));
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
new file mode 100644
index 00000000..e3b9ba5e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
@@ -0,0 +1,275 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+
+class ContentTypes extends WriterPart
+{
+    /**
+     * Write content types to XML format.
+     *
+     * @param bool $includeCharts Flag indicating if we should include drawing details for charts
+     *
+     * @return string XML Output
+     */
+    public function writeContentTypes(Spreadsheet $spreadsheet, bool $includeCharts = false): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Types
+        $objWriter->startElement('Types');
+        $objWriter->writeAttribute('xmlns', Namespaces::CONTENT_TYPES);
+
+        // Theme
+        $this->writeOverrideContentType($objWriter, '/xl/theme/theme1.xml', 'application/vnd.openxmlformats-officedocument.theme+xml');
+
+        // Styles
+        $this->writeOverrideContentType($objWriter, '/xl/styles.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml');
+
+        // Rels
+        $this->writeDefaultContentType($objWriter, 'rels', 'application/vnd.openxmlformats-package.relationships+xml');
+
+        // XML
+        $this->writeDefaultContentType($objWriter, 'xml', 'application/xml');
+
+        // VML
+        $this->writeDefaultContentType($objWriter, 'vml', 'application/vnd.openxmlformats-officedocument.vmlDrawing');
+
+        // Workbook
+        if ($spreadsheet->hasMacros()) { //Macros in workbook ?
+            // Yes : not standard content but "macroEnabled"
+            $this->writeOverrideContentType($objWriter, '/xl/workbook.xml', 'application/vnd.ms-excel.sheet.macroEnabled.main+xml');
+            //... and define a new type for the VBA project
+            // Better use Override, because we can use 'bin' also for xl\printerSettings\printerSettings1.bin
+            $this->writeOverrideContentType($objWriter, '/xl/vbaProject.bin', 'application/vnd.ms-office.vbaProject');
+            if ($spreadsheet->hasMacrosCertificate()) {
+                // signed macros ?
+                // Yes : add needed information
+                $this->writeOverrideContentType($objWriter, '/xl/vbaProjectSignature.bin', 'application/vnd.ms-office.vbaProjectSignature');
+            }
+        } else {
+            // no macros in workbook, so standard type
+            $this->writeOverrideContentType($objWriter, '/xl/workbook.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml');
+        }
+
+        // DocProps
+        $this->writeOverrideContentType($objWriter, '/docProps/app.xml', 'application/vnd.openxmlformats-officedocument.extended-properties+xml');
+
+        $this->writeOverrideContentType($objWriter, '/docProps/core.xml', 'application/vnd.openxmlformats-package.core-properties+xml');
+
+        $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
+        if (!empty($customPropertyList)) {
+            $this->writeOverrideContentType($objWriter, '/docProps/custom.xml', 'application/vnd.openxmlformats-officedocument.custom-properties+xml');
+        }
+
+        // Worksheets
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $this->writeOverrideContentType($objWriter, '/xl/worksheets/sheet' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml');
+        }
+
+        // Shared strings
+        $this->writeOverrideContentType($objWriter, '/xl/sharedStrings.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml');
+
+        // Table
+        $table = 1;
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $tableCount = $spreadsheet->getSheet($i)->getTableCollection()->count();
+
+            for ($t = 1; $t <= $tableCount; ++$t) {
+                $this->writeOverrideContentType($objWriter, '/xl/tables/table' . $table++ . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml');
+            }
+        }
+
+        // Add worksheet relationship content types
+        $unparsedLoadedData = $spreadsheet->getUnparsedLoadedData();
+        $chart = 1;
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $drawings = $spreadsheet->getSheet($i)->getDrawingCollection();
+            $drawingCount = count($drawings);
+            $chartCount = ($includeCharts) ? $spreadsheet->getSheet($i)->getChartCount() : 0;
+            $hasUnparsedDrawing = isset($unparsedLoadedData['sheets'][$spreadsheet->getSheet($i)->getCodeName()]['drawingOriginalIds']);
+
+            //    We need a drawing relationship for the worksheet if we have either drawings or charts
+            if (($drawingCount > 0) || ($chartCount > 0) || $hasUnparsedDrawing) {
+                $this->writeOverrideContentType($objWriter, '/xl/drawings/drawing' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml');
+            }
+
+            //    If we have charts, then we need a chart relationship for every individual chart
+            if ($chartCount > 0) {
+                for ($c = 0; $c < $chartCount; ++$c) {
+                    $this->writeOverrideContentType($objWriter, '/xl/charts/chart' . $chart++ . '.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml');
+                }
+            }
+        }
+
+        // Comments
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            if (count($spreadsheet->getSheet($i)->getComments()) > 0) {
+                $this->writeOverrideContentType($objWriter, '/xl/comments' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml');
+            }
+        }
+
+        // Add media content-types
+        $aMediaContentTypes = [];
+        $mediaCount = $this->getParentWriter()->getDrawingHashTable()->count();
+        for ($i = 0; $i < $mediaCount; ++$i) {
+            $extension = '';
+            $mimeType = '';
+
+            if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing) {
+                $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());
+                $mimeType = $this->getImageMimeType($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getPath());
+            } elseif ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
+                $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType());
+                $extension = explode('/', $extension);
+                $extension = $extension[1];
+
+                $mimeType = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType();
+            }
+
+            if (!isset($aMediaContentTypes[$extension])) {
+                $aMediaContentTypes[$extension] = $mimeType;
+
+                $this->writeDefaultContentType($objWriter, $extension, $mimeType);
+            }
+        }
+        if ($spreadsheet->hasRibbonBinObjects()) {
+            // Some additional objects in the ribbon ?
+            // we need to write "Extension" but not already write for media content
+            $tabRibbonTypes = array_diff($spreadsheet->getRibbonBinObjects('types') ?? [], array_keys($aMediaContentTypes));
+            foreach ($tabRibbonTypes as $aRibbonType) {
+                $mimeType = 'image/.' . $aRibbonType; //we wrote $mimeType like customUI Editor
+                $this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType);
+            }
+        }
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            if (count($spreadsheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
+                foreach ($spreadsheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
+                    if (!isset($aMediaContentTypes[strtolower($image->getExtension())])) {
+                        $aMediaContentTypes[strtolower($image->getExtension())] = $this->getImageMimeType($image->getPath());
+
+                        $this->writeDefaultContentType($objWriter, strtolower($image->getExtension()), $aMediaContentTypes[strtolower($image->getExtension())]);
+                    }
+                }
+            }
+
+            if (count($spreadsheet->getSheet($i)->getComments()) > 0) {
+                foreach ($spreadsheet->getSheet($i)->getComments() as $comment) {
+                    if (!$comment->hasBackgroundImage()) {
+                        continue;
+                    }
+
+                    $bgImage = $comment->getBackgroundImage();
+                    $bgImageExtentionKey = strtolower($bgImage->getImageFileExtensionForSave(false));
+
+                    if (!isset($aMediaContentTypes[$bgImageExtentionKey])) {
+                        $aMediaContentTypes[$bgImageExtentionKey] = $bgImage->getImageMimeType();
+
+                        $this->writeDefaultContentType($objWriter, $bgImageExtentionKey, $aMediaContentTypes[$bgImageExtentionKey]);
+                    }
+                }
+            }
+
+            $bgImage = $spreadsheet->getSheet($i)->getBackgroundImage();
+            $mimeType = $spreadsheet->getSheet($i)->getBackgroundMime();
+            $extension = $spreadsheet->getSheet($i)->getBackgroundExtension();
+            if ($bgImage !== '' && !isset($aMediaContentTypes[$mimeType])) {
+                $this->writeDefaultContentType($objWriter, $extension, $mimeType);
+            }
+        }
+
+        // unparsed defaults
+        if (isset($unparsedLoadedData['default_content_types'])) {
+            foreach ($unparsedLoadedData['default_content_types'] as $extName => $contentType) {
+                $this->writeDefaultContentType($objWriter, $extName, $contentType);
+            }
+        }
+
+        // unparsed overrides
+        if (isset($unparsedLoadedData['override_content_types'])) {
+            foreach ($unparsedLoadedData['override_content_types'] as $partName => $overrideType) {
+                $this->writeOverrideContentType($objWriter, $partName, $overrideType);
+            }
+        }
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    private static int $three = 3; // phpstan silliness
+
+    /**
+     * Get image mime type.
+     *
+     * @param string $filename Filename
+     *
+     * @return string Mime Type
+     */
+    private function getImageMimeType(string $filename): string
+    {
+        if (File::fileExists($filename)) {
+            $image = getimagesize($filename);
+
+            return image_type_to_mime_type((is_array($image) && count($image) >= self::$three) ? $image[2] : 0);
+        }
+
+        throw new WriterException("File $filename does not exist");
+    }
+
+    /**
+     * Write Default content type.
+     *
+     * @param string $partName Part name
+     * @param string $contentType Content type
+     */
+    private function writeDefaultContentType(XMLWriter $objWriter, string $partName, string $contentType): void
+    {
+        if ($partName != '' && $contentType != '') {
+            // Write content type
+            $objWriter->startElement('Default');
+            $objWriter->writeAttribute('Extension', $partName);
+            $objWriter->writeAttribute('ContentType', $contentType);
+            $objWriter->endElement();
+        } else {
+            throw new WriterException('Invalid parameters passed.');
+        }
+    }
+
+    /**
+     * Write Override content type.
+     *
+     * @param string $partName Part name
+     * @param string $contentType Content type
+     */
+    private function writeOverrideContentType(XMLWriter $objWriter, string $partName, string $contentType): void
+    {
+        if ($partName != '' && $contentType != '') {
+            // Write content type
+            $objWriter->startElement('Override');
+            $objWriter->writeAttribute('PartName', $partName);
+            $objWriter->writeAttribute('ContentType', $contentType);
+            $objWriter->endElement();
+        } else {
+            throw new WriterException('Invalid parameters passed.');
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
new file mode 100644
index 00000000..4dac1855
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
@@ -0,0 +1,242 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as ActualWorksheet;
+
+class DefinedNames
+{
+    private XMLWriter $objWriter;
+
+    private Spreadsheet $spreadsheet;
+
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet)
+    {
+        $this->objWriter = $objWriter;
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function write(): void
+    {
+        // Write defined names
+        $this->objWriter->startElement('definedNames');
+
+        // Named ranges
+        if (count($this->spreadsheet->getDefinedNames()) > 0) {
+            // Named ranges
+            $this->writeNamedRangesAndFormulae();
+        }
+
+        // Other defined names
+        $sheetCount = $this->spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            // NamedRange for autoFilter
+            $this->writeNamedRangeForAutofilter($this->spreadsheet->getSheet($i), $i);
+
+            // NamedRange for Print_Titles
+            $this->writeNamedRangeForPrintTitles($this->spreadsheet->getSheet($i), $i);
+
+            // NamedRange for Print_Area
+            $this->writeNamedRangeForPrintArea($this->spreadsheet->getSheet($i), $i);
+        }
+
+        $this->objWriter->endElement();
+    }
+
+    /**
+     * Write defined names.
+     */
+    private function writeNamedRangesAndFormulae(): void
+    {
+        // Loop named ranges
+        $definedNames = $this->spreadsheet->getDefinedNames();
+        foreach ($definedNames as $definedName) {
+            $this->writeDefinedName($definedName);
+        }
+    }
+
+    /**
+     * Write Defined Name for named range.
+     */
+    private function writeDefinedName(DefinedName $definedName): void
+    {
+        // definedName for named range
+        $local = -1;
+        if ($definedName->getLocalOnly() && $definedName->getScope() !== null) {
+            try {
+                $local = $definedName->getScope()->getParentOrThrow()->getIndex($definedName->getScope());
+            } catch (Exception) {
+                // See issue 2266 - deleting sheet which contains
+                //     defined names will cause Exception above.
+                return;
+            }
+        }
+        $this->objWriter->startElement('definedName');
+        $this->objWriter->writeAttribute('name', $definedName->getName());
+        if ($local >= 0) {
+            $this->objWriter->writeAttribute(
+                'localSheetId',
+                "$local"
+            );
+        }
+
+        $definedRange = $this->getDefinedRange($definedName);
+
+        $this->objWriter->writeRawData($definedRange);
+
+        $this->objWriter->endElement();
+    }
+
+    /**
+     * Write Defined Name for autoFilter.
+     */
+    private function writeNamedRangeForAutofilter(ActualWorksheet $worksheet, int $worksheetId = 0): void
+    {
+        // NamedRange for autoFilter
+        $autoFilterRange = $worksheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm._FilterDatabase');
+            $this->objWriter->writeAttribute('localSheetId', "$worksheetId");
+            $this->objWriter->writeAttribute('hidden', '1');
+
+            // Create absolute coordinate and write as raw text
+            $range = Coordinate::splitRange($autoFilterRange);
+            $range = $range[0];
+            //    Strip any worksheet ref so we can make the cell ref absolute
+            [, $range[0]] = ActualWorksheet::extractSheetTitle($range[0], true);
+
+            $range[0] = Coordinate::absoluteCoordinate($range[0] ?? '');
+            if (count($range) > 1) {
+                $range[1] = Coordinate::absoluteCoordinate($range[1]);
+            }
+            $range = implode(':', $range);
+
+            $this->objWriter->writeRawData('\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!' . $range);
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Defined Name for PrintTitles.
+     */
+    private function writeNamedRangeForPrintTitles(ActualWorksheet $worksheet, int $worksheetId = 0): void
+    {
+        // NamedRange for PrintTitles
+        if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $worksheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm.Print_Titles');
+            $this->objWriter->writeAttribute('localSheetId', "$worksheetId");
+
+            // Setting string
+            $settingString = '';
+
+            // Columns to repeat
+            if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                $repeat = $worksheet->getPageSetup()->getColumnsToRepeatAtLeft();
+
+                $settingString .= '\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+            }
+
+            // Rows to repeat
+            if ($worksheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+                if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                    $settingString .= ',';
+                }
+
+                $repeat = $worksheet->getPageSetup()->getRowsToRepeatAtTop();
+
+                $settingString .= '\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+            }
+
+            $this->objWriter->writeRawData($settingString);
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Defined Name for PrintTitles.
+     */
+    private function writeNamedRangeForPrintArea(ActualWorksheet $worksheet, int $worksheetId = 0): void
+    {
+        // NamedRange for PrintArea
+        if ($worksheet->getPageSetup()->isPrintAreaSet()) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm.Print_Area');
+            $this->objWriter->writeAttribute('localSheetId', "$worksheetId");
+
+            // Print area
+            $printArea = Coordinate::splitRange($worksheet->getPageSetup()->getPrintArea());
+
+            $chunks = [];
+            foreach ($printArea as $printAreaRect) {
+                $printAreaRect[0] = Coordinate::absoluteReference($printAreaRect[0]);
+                $printAreaRect[1] = Coordinate::absoluteReference($printAreaRect[1]);
+                $chunks[] = '\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
+            }
+
+            $this->objWriter->writeRawData(implode(',', $chunks));
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    private function getDefinedRange(DefinedName $definedName): string
+    {
+        $definedRange = $definedName->getValue();
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $definedRange,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
+                    // We should have a worksheet
+                    $ws = $definedName->getWorksheet();
+                    $worksheet = ($ws === null) ? null : $ws->getTitle();
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'!";
+            }
+            $newRange = "{$newRange}{$column}{$row}";
+
+            $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
+        }
+
+        if (str_starts_with($definedRange, '=')) {
+            $definedRange = substr($definedRange, 1);
+        }
+
+        return $definedRange;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
new file mode 100644
index 00000000..e2c63207
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
@@ -0,0 +1,250 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+class DocProps extends WriterPart
+{
+    /**
+     * Write docProps/app.xml to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeDocPropsApp(Spreadsheet $spreadsheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Properties
+        $objWriter->startElement('Properties');
+        $objWriter->writeAttribute('xmlns', Namespaces::EXTENDED_PROPERTIES);
+        $objWriter->writeAttribute('xmlns:vt', Namespaces::PROPERTIES_VTYPES);
+
+        // Application
+        $objWriter->writeElement('Application', 'Microsoft Excel');
+
+        // DocSecurity
+        $objWriter->writeElement('DocSecurity', '0');
+
+        // ScaleCrop
+        $objWriter->writeElement('ScaleCrop', 'false');
+
+        // HeadingPairs
+        $objWriter->startElement('HeadingPairs');
+
+        // Vector
+        $objWriter->startElement('vt:vector');
+        $objWriter->writeAttribute('size', '2');
+        $objWriter->writeAttribute('baseType', 'variant');
+
+        // Variant
+        $objWriter->startElement('vt:variant');
+        $objWriter->writeElement('vt:lpstr', 'Worksheets');
+        $objWriter->endElement();
+
+        // Variant
+        $objWriter->startElement('vt:variant');
+        $objWriter->writeElement('vt:i4', (string) $spreadsheet->getSheetCount());
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // TitlesOfParts
+        $objWriter->startElement('TitlesOfParts');
+
+        // Vector
+        $objWriter->startElement('vt:vector');
+        $objWriter->writeAttribute('size', (string) $spreadsheet->getSheetCount());
+        $objWriter->writeAttribute('baseType', 'lpstr');
+
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $objWriter->writeElement('vt:lpstr', $spreadsheet->getSheet($i)->getTitle());
+        }
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Company
+        $objWriter->writeElement('Company', $spreadsheet->getProperties()->getCompany());
+
+        // Company
+        $objWriter->writeElement('Manager', $spreadsheet->getProperties()->getManager());
+
+        // LinksUpToDate
+        $objWriter->writeElement('LinksUpToDate', 'false');
+
+        // SharedDoc
+        $objWriter->writeElement('SharedDoc', 'false');
+
+        // HyperlinkBase
+        $objWriter->writeElement('HyperlinkBase', $spreadsheet->getProperties()->getHyperlinkBase());
+
+        // HyperlinksChanged
+        $objWriter->writeElement('HyperlinksChanged', 'false');
+
+        // AppVersion
+        $objWriter->writeElement('AppVersion', '12.0000');
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write docProps/core.xml to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeDocPropsCore(Spreadsheet $spreadsheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // cp:coreProperties
+        $objWriter->startElement('cp:coreProperties');
+        $objWriter->writeAttribute('xmlns:cp', Namespaces::CORE_PROPERTIES2);
+        $objWriter->writeAttribute('xmlns:dc', Namespaces::DC_ELEMENTS);
+        $objWriter->writeAttribute('xmlns:dcterms', Namespaces::DC_TERMS);
+        $objWriter->writeAttribute('xmlns:dcmitype', Namespaces::DC_DCMITYPE);
+        $objWriter->writeAttribute('xmlns:xsi', Namespaces::SCHEMA_INSTANCE);
+
+        // dc:creator
+        $objWriter->writeElement('dc:creator', $spreadsheet->getProperties()->getCreator());
+
+        // cp:lastModifiedBy
+        $objWriter->writeElement('cp:lastModifiedBy', $spreadsheet->getProperties()->getLastModifiedBy());
+
+        // dcterms:created
+        $objWriter->startElement('dcterms:created');
+        $objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
+        $created = $spreadsheet->getProperties()->getCreated();
+        $date = Date::dateTimeFromTimestamp("$created");
+        $objWriter->writeRawData($date->format(DATE_W3C));
+        $objWriter->endElement();
+
+        // dcterms:modified
+        $objWriter->startElement('dcterms:modified');
+        $objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
+        $created = $spreadsheet->getProperties()->getModified();
+        $date = Date::dateTimeFromTimestamp("$created");
+        $objWriter->writeRawData($date->format(DATE_W3C));
+        $objWriter->endElement();
+
+        // dc:title
+        $objWriter->writeElement('dc:title', $spreadsheet->getProperties()->getTitle());
+
+        // dc:description
+        $objWriter->writeElement('dc:description', $spreadsheet->getProperties()->getDescription());
+
+        // dc:subject
+        $objWriter->writeElement('dc:subject', $spreadsheet->getProperties()->getSubject());
+
+        // cp:keywords
+        $objWriter->writeElement('cp:keywords', $spreadsheet->getProperties()->getKeywords());
+
+        // cp:category
+        $objWriter->writeElement('cp:category', $spreadsheet->getProperties()->getCategory());
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write docProps/custom.xml to XML format.
+     *
+     * @return null|string XML Output
+     */
+    public function writeDocPropsCustom(Spreadsheet $spreadsheet): ?string
+    {
+        $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
+        if (empty($customPropertyList)) {
+            return null;
+        }
+
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // cp:coreProperties
+        $objWriter->startElement('Properties');
+        $objWriter->writeAttribute('xmlns', Namespaces::CUSTOM_PROPERTIES);
+        $objWriter->writeAttribute('xmlns:vt', Namespaces::PROPERTIES_VTYPES);
+
+        foreach ($customPropertyList as $key => $customProperty) {
+            $propertyValue = $spreadsheet->getProperties()->getCustomPropertyValue($customProperty);
+            $propertyType = $spreadsheet->getProperties()->getCustomPropertyType($customProperty);
+
+            $objWriter->startElement('property');
+            $objWriter->writeAttribute('fmtid', '{D5CDD505-2E9C-101B-9397-08002B2CF9AE}');
+            $objWriter->writeAttribute('pid', (string) ($key + 2));
+            $objWriter->writeAttribute('name', $customProperty);
+
+            switch ($propertyType) {
+                case Properties::PROPERTY_TYPE_INTEGER:
+                    $objWriter->writeElement('vt:i4', (string) $propertyValue);
+
+                    break;
+                case Properties::PROPERTY_TYPE_FLOAT:
+                    $objWriter->writeElement('vt:r8', sprintf('%F', $propertyValue));
+
+                    break;
+                case Properties::PROPERTY_TYPE_BOOLEAN:
+                    $objWriter->writeElement('vt:bool', ($propertyValue) ? 'true' : 'false');
+
+                    break;
+                case Properties::PROPERTY_TYPE_DATE:
+                    $objWriter->startElement('vt:filetime');
+                    $date = Date::dateTimeFromTimestamp("$propertyValue");
+                    $objWriter->writeRawData($date->format(DATE_W3C));
+                    $objWriter->endElement();
+
+                    break;
+                default:
+                    $objWriter->writeElement('vt:lpwstr', (string) $propertyValue);
+
+                    break;
+            }
+
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
new file mode 100644
index 00000000..fc84c67e
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
@@ -0,0 +1,583 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooterDrawing;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+
+class Drawing extends WriterPart
+{
+    /**
+     * Write drawings to XML format.
+     *
+     * @param bool $includeCharts Flag indicating if we should include drawing details for charts
+     *
+     * @return string XML Output
+     */
+    public function writeDrawings(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, bool $includeCharts = false): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // xdr:wsDr
+        $objWriter->startElement('xdr:wsDr');
+        $objWriter->writeAttribute('xmlns:xdr', Namespaces::SPREADSHEET_DRAWING);
+        $objWriter->writeAttribute('xmlns:a', Namespaces::DRAWINGML);
+
+        // Loop through images and write drawings
+        $i = 1;
+        $iterator = $worksheet->getDrawingCollection()->getIterator();
+        while ($iterator->valid()) {
+            /** @var BaseDrawing $pDrawing */
+            $pDrawing = $iterator->current();
+            $pRelationId = $i;
+            $hlinkClickId = $pDrawing->getHyperlink() === null ? null : ++$i;
+
+            $this->writeDrawing($objWriter, $pDrawing, $pRelationId, $hlinkClickId);
+
+            $iterator->next();
+            ++$i;
+        }
+
+        if ($includeCharts) {
+            $chartCount = $worksheet->getChartCount();
+            // Loop through charts and write the chart position
+            if ($chartCount > 0) {
+                for ($c = 0; $c < $chartCount; ++$c) {
+                    $chart = $worksheet->getChartByIndex((string) $c);
+                    if ($chart !== false) {
+                        $this->writeChart($objWriter, $chart, $c + $i);
+                    }
+                }
+            }
+        }
+
+        // unparsed AlternateContent
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingAlternateContents'])) {
+            foreach ($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingAlternateContents'] as $drawingAlternateContent) {
+                $objWriter->writeRaw($drawingAlternateContent);
+            }
+        }
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write drawings to XML format.
+     */
+    public function writeChart(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Chart\Chart $chart, int $relationId = -1): void
+    {
+        $tl = $chart->getTopLeftPosition();
+        $tlColRow = Coordinate::indexesFromString($tl['cell']);
+        $br = $chart->getBottomRightPosition();
+
+        $isTwoCellAnchor = $br['cell'] !== '';
+        if ($isTwoCellAnchor) {
+            $brColRow = Coordinate::indexesFromString($br['cell']);
+
+            $objWriter->startElement('xdr:twoCellAnchor');
+
+            $objWriter->startElement('xdr:from');
+            $objWriter->writeElement('xdr:col', (string) ($tlColRow[0] - 1));
+            $objWriter->writeElement('xdr:colOff', self::stringEmu($tl['xOffset']));
+            $objWriter->writeElement('xdr:row', (string) ($tlColRow[1] - 1));
+            $objWriter->writeElement('xdr:rowOff', self::stringEmu($tl['yOffset']));
+            $objWriter->endElement();
+            $objWriter->startElement('xdr:to');
+            $objWriter->writeElement('xdr:col', (string) ($brColRow[0] - 1));
+            $objWriter->writeElement('xdr:colOff', self::stringEmu($br['xOffset']));
+            $objWriter->writeElement('xdr:row', (string) ($brColRow[1] - 1));
+            $objWriter->writeElement('xdr:rowOff', self::stringEmu($br['yOffset']));
+            $objWriter->endElement();
+        } elseif ($chart->getOneCellAnchor()) {
+            $objWriter->startElement('xdr:oneCellAnchor');
+
+            $objWriter->startElement('xdr:from');
+            $objWriter->writeElement('xdr:col', (string) ($tlColRow[0] - 1));
+            $objWriter->writeElement('xdr:colOff', self::stringEmu($tl['xOffset']));
+            $objWriter->writeElement('xdr:row', (string) ($tlColRow[1] - 1));
+            $objWriter->writeElement('xdr:rowOff', self::stringEmu($tl['yOffset']));
+            $objWriter->endElement();
+            $objWriter->startElement('xdr:ext');
+            $objWriter->writeAttribute('cx', self::stringEmu($br['xOffset']));
+            $objWriter->writeAttribute('cy', self::stringEmu($br['yOffset']));
+            $objWriter->endElement();
+        } else {
+            $objWriter->startElement('xdr:absoluteAnchor');
+            $objWriter->startElement('xdr:pos');
+            $objWriter->writeAttribute('x', '0');
+            $objWriter->writeAttribute('y', '0');
+            $objWriter->endElement();
+            $objWriter->startElement('xdr:ext');
+            $objWriter->writeAttribute('cx', self::stringEmu($br['xOffset']));
+            $objWriter->writeAttribute('cy', self::stringEmu($br['yOffset']));
+            $objWriter->endElement();
+        }
+
+        $objWriter->startElement('xdr:graphicFrame');
+        $objWriter->writeAttribute('macro', '');
+        $objWriter->startElement('xdr:nvGraphicFramePr');
+        $objWriter->startElement('xdr:cNvPr');
+        $objWriter->writeAttribute('name', 'Chart ' . $relationId);
+        $objWriter->writeAttribute('id', (string) (1025 * $relationId));
+        $objWriter->endElement();
+        $objWriter->startElement('xdr:cNvGraphicFramePr');
+        $objWriter->startElement('a:graphicFrameLocks');
+        $objWriter->endElement();
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('xdr:xfrm');
+        $objWriter->startElement('a:off');
+        $objWriter->writeAttribute('x', '0');
+        $objWriter->writeAttribute('y', '0');
+        $objWriter->endElement();
+        $objWriter->startElement('a:ext');
+        $objWriter->writeAttribute('cx', '0');
+        $objWriter->writeAttribute('cy', '0');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('a:graphic');
+        $objWriter->startElement('a:graphicData');
+        $objWriter->writeAttribute('uri', Namespaces::CHART);
+        $objWriter->startElement('c:chart');
+        $objWriter->writeAttribute('xmlns:c', Namespaces::CHART);
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
+        $objWriter->writeAttribute('r:id', 'rId' . $relationId);
+        $objWriter->endElement();
+        $objWriter->endElement();
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        $objWriter->startElement('xdr:clientData');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write drawings to XML format.
+     */
+    public function writeDrawing(XMLWriter $objWriter, BaseDrawing $drawing, int $relationId = -1, ?int $hlinkClickId = null): void
+    {
+        if ($relationId >= 0) {
+            $isTwoCellAnchor = $drawing->getCoordinates2() !== '';
+            if ($isTwoCellAnchor) {
+                // xdr:twoCellAnchor
+                $objWriter->startElement('xdr:twoCellAnchor');
+                if ($drawing->validEditAs()) {
+                    $objWriter->writeAttribute('editAs', $drawing->getEditAs());
+                }
+                // Image location
+                $aCoordinates = Coordinate::indexesFromString($drawing->getCoordinates());
+                $aCoordinates2 = Coordinate::indexesFromString($drawing->getCoordinates2());
+
+                // xdr:from
+                $objWriter->startElement('xdr:from');
+                $objWriter->writeElement('xdr:col', (string) ($aCoordinates[0] - 1));
+                $objWriter->writeElement('xdr:colOff', self::stringEmu($drawing->getOffsetX()));
+                $objWriter->writeElement('xdr:row', (string) ($aCoordinates[1] - 1));
+                $objWriter->writeElement('xdr:rowOff', self::stringEmu($drawing->getOffsetY()));
+                $objWriter->endElement();
+
+                // xdr:to
+                $objWriter->startElement('xdr:to');
+                $objWriter->writeElement('xdr:col', (string) ($aCoordinates2[0] - 1));
+                $objWriter->writeElement('xdr:colOff', self::stringEmu($drawing->getOffsetX2()));
+                $objWriter->writeElement('xdr:row', (string) ($aCoordinates2[1] - 1));
+                $objWriter->writeElement('xdr:rowOff', self::stringEmu($drawing->getOffsetY2()));
+                $objWriter->endElement();
+            } else {
+                // xdr:oneCellAnchor
+                $objWriter->startElement('xdr:oneCellAnchor');
+                // Image location
+                $aCoordinates = Coordinate::indexesFromString($drawing->getCoordinates());
+
+                // xdr:from
+                $objWriter->startElement('xdr:from');
+                $objWriter->writeElement('xdr:col', (string) ($aCoordinates[0] - 1));
+                $objWriter->writeElement('xdr:colOff', self::stringEmu($drawing->getOffsetX()));
+                $objWriter->writeElement('xdr:row', (string) ($aCoordinates[1] - 1));
+                $objWriter->writeElement('xdr:rowOff', self::stringEmu($drawing->getOffsetY()));
+                $objWriter->endElement();
+
+                // xdr:ext
+                $objWriter->startElement('xdr:ext');
+                $objWriter->writeAttribute('cx', self::stringEmu($drawing->getWidth()));
+                $objWriter->writeAttribute('cy', self::stringEmu($drawing->getHeight()));
+                $objWriter->endElement();
+            }
+
+            // xdr:pic
+            $objWriter->startElement('xdr:pic');
+
+            // xdr:nvPicPr
+            $objWriter->startElement('xdr:nvPicPr');
+
+            // xdr:cNvPr
+            $objWriter->startElement('xdr:cNvPr');
+            $objWriter->writeAttribute('id', (string) $relationId);
+            $objWriter->writeAttribute('name', $drawing->getName());
+            $objWriter->writeAttribute('descr', $drawing->getDescription());
+
+            //a:hlinkClick
+            $this->writeHyperLinkDrawing($objWriter, $hlinkClickId);
+
+            $objWriter->endElement();
+
+            // xdr:cNvPicPr
+            $objWriter->startElement('xdr:cNvPicPr');
+
+            // a:picLocks
+            $objWriter->startElement('a:picLocks');
+            $objWriter->writeAttribute('noChangeAspect', '1');
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            // xdr:blipFill
+            $objWriter->startElement('xdr:blipFill');
+
+            // a:blip
+            $objWriter->startElement('a:blip');
+            $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
+            $objWriter->writeAttribute('r:embed', 'rId' . $relationId);
+            $objWriter->endElement();
+
+            $srcRect = $drawing->getSrcRect();
+            if (!empty($srcRect)) {
+                $objWriter->startElement('a:srcRect');
+                foreach ($srcRect as $key => $value) {
+                    $objWriter->writeAttribute($key, (string) $value);
+                }
+                $objWriter->endElement(); // a:srcRect
+                $objWriter->startElement('a:stretch');
+                $objWriter->endElement(); // a:stretch
+            } else {
+                // a:stretch
+                $objWriter->startElement('a:stretch');
+                $objWriter->writeElement('a:fillRect', null);
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+
+            // xdr:spPr
+            $objWriter->startElement('xdr:spPr');
+
+            // a:xfrm
+            $objWriter->startElement('a:xfrm');
+            $objWriter->writeAttribute('rot', (string) SharedDrawing::degreesToAngle($drawing->getRotation()));
+            self::writeAttributeIf($objWriter, $drawing->getFlipVertical(), 'flipV', '1');
+            self::writeAttributeIf($objWriter, $drawing->getFlipHorizontal(), 'flipH', '1');
+            if ($isTwoCellAnchor) {
+                $objWriter->startElement('a:ext');
+                $objWriter->writeAttribute('cx', self::stringEmu($drawing->getWidth()));
+                $objWriter->writeAttribute('cy', self::stringEmu($drawing->getHeight()));
+                $objWriter->endElement();
+            }
+            $objWriter->endElement();
+
+            // a:prstGeom
+            $objWriter->startElement('a:prstGeom');
+            $objWriter->writeAttribute('prst', 'rect');
+
+            // a:avLst
+            $objWriter->writeElement('a:avLst', null);
+
+            $objWriter->endElement();
+
+            if ($drawing->getShadow()->getVisible()) {
+                // a:effectLst
+                $objWriter->startElement('a:effectLst');
+
+                // a:outerShdw
+                $objWriter->startElement('a:outerShdw');
+                $objWriter->writeAttribute('blurRad', self::stringEmu($drawing->getShadow()->getBlurRadius()));
+                $objWriter->writeAttribute('dist', self::stringEmu($drawing->getShadow()->getDistance()));
+                $objWriter->writeAttribute('dir', (string) SharedDrawing::degreesToAngle($drawing->getShadow()->getDirection()));
+                $objWriter->writeAttribute('algn', $drawing->getShadow()->getAlignment());
+                $objWriter->writeAttribute('rotWithShape', '0');
+
+                // a:srgbClr
+                $objWriter->startElement('a:srgbClr');
+                $objWriter->writeAttribute('val', $drawing->getShadow()->getColor()->getRGB());
+
+                // a:alpha
+                $objWriter->startElement('a:alpha');
+                $objWriter->writeAttribute('val', (string) ($drawing->getShadow()->getAlpha() * 1000));
+                $objWriter->endElement();
+
+                $objWriter->endElement();
+
+                $objWriter->endElement();
+
+                $objWriter->endElement();
+            }
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+
+            // xdr:clientData
+            $objWriter->writeElement('xdr:clientData', null);
+
+            $objWriter->endElement();
+        } else {
+            throw new WriterException('Invalid parameters passed.');
+        }
+    }
+
+    /**
+     * Write VML header/footer images to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Header/footer images
+        $images = $worksheet->getHeaderFooter()->getImages();
+
+        // xml
+        $objWriter->startElement('xml');
+        $objWriter->writeAttribute('xmlns:v', Namespaces::URN_VML);
+        $objWriter->writeAttribute('xmlns:o', Namespaces::URN_MSOFFICE);
+        $objWriter->writeAttribute('xmlns:x', Namespaces::URN_EXCEL);
+
+        // o:shapelayout
+        $objWriter->startElement('o:shapelayout');
+        $objWriter->writeAttribute('v:ext', 'edit');
+
+        // o:idmap
+        $objWriter->startElement('o:idmap');
+        $objWriter->writeAttribute('v:ext', 'edit');
+        $objWriter->writeAttribute('data', '1');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // v:shapetype
+        $objWriter->startElement('v:shapetype');
+        $objWriter->writeAttribute('id', '_x0000_t75');
+        $objWriter->writeAttribute('coordsize', '21600,21600');
+        $objWriter->writeAttribute('o:spt', '75');
+        $objWriter->writeAttribute('o:preferrelative', 't');
+        $objWriter->writeAttribute('path', 'm@4@5l@4@11@9@11@9@5xe');
+        $objWriter->writeAttribute('filled', 'f');
+        $objWriter->writeAttribute('stroked', 'f');
+
+        // v:stroke
+        $objWriter->startElement('v:stroke');
+        $objWriter->writeAttribute('joinstyle', 'miter');
+        $objWriter->endElement();
+
+        // v:formulas
+        $objWriter->startElement('v:formulas');
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'if lineDrawn pixelLineWidth 0');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum @0 1 0');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum 0 0 @1');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @2 1 2');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @3 21600 pixelWidth');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @3 21600 pixelHeight');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum @0 0 1');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @6 1 2');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @7 21600 pixelWidth');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum @8 21600 0');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'prod @7 21600 pixelHeight');
+        $objWriter->endElement();
+
+        // v:f
+        $objWriter->startElement('v:f');
+        $objWriter->writeAttribute('eqn', 'sum @10 21600 0');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // v:path
+        $objWriter->startElement('v:path');
+        $objWriter->writeAttribute('o:extrusionok', 'f');
+        $objWriter->writeAttribute('gradientshapeok', 't');
+        $objWriter->writeAttribute('o:connecttype', 'rect');
+        $objWriter->endElement();
+
+        // o:lock
+        $objWriter->startElement('o:lock');
+        $objWriter->writeAttribute('v:ext', 'edit');
+        $objWriter->writeAttribute('aspectratio', 't');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Loop through images
+        foreach ($images as $key => $value) {
+            $this->writeVMLHeaderFooterImage($objWriter, $key, $value);
+        }
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write VML comment to XML format.
+     *
+     * @param string $reference Reference
+     */
+    private function writeVMLHeaderFooterImage(XMLWriter $objWriter, string $reference, HeaderFooterDrawing $image): void
+    {
+        // Calculate object id
+        preg_match('{(\d+)}', md5($reference), $m);
+        $id = 1500 + ((int) substr($m[1], 0, 2) * 1);
+
+        // Calculate offset
+        $width = $image->getWidth();
+        $height = $image->getHeight();
+        $marginLeft = $image->getOffsetX();
+        $marginTop = $image->getOffsetY();
+
+        // v:shape
+        $objWriter->startElement('v:shape');
+        $objWriter->writeAttribute('id', $reference);
+        $objWriter->writeAttribute('o:spid', '_x0000_s' . $id);
+        $objWriter->writeAttribute('type', '#_x0000_t75');
+        $objWriter->writeAttribute('style', "position:absolute;margin-left:{$marginLeft}px;margin-top:{$marginTop}px;width:{$width}px;height:{$height}px;z-index:1");
+
+        // v:imagedata
+        $objWriter->startElement('v:imagedata');
+        $objWriter->writeAttribute('o:relid', 'rId' . $reference);
+        $objWriter->writeAttribute('o:title', $image->getName());
+        $objWriter->endElement();
+
+        // o:lock
+        $objWriter->startElement('o:lock');
+        $objWriter->writeAttribute('v:ext', 'edit');
+        $objWriter->writeAttribute('textRotation', 't');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Get an array of all drawings.
+     *
+     * @return BaseDrawing[] All drawings in PhpSpreadsheet
+     */
+    public function allDrawings(Spreadsheet $spreadsheet): array
+    {
+        // Get an array of all drawings
+        $aDrawings = [];
+
+        // Loop through PhpSpreadsheet
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            // Loop through images and add to array
+            $iterator = $spreadsheet->getSheet($i)->getDrawingCollection()->getIterator();
+            while ($iterator->valid()) {
+                $aDrawings[] = $iterator->current();
+
+                $iterator->next();
+            }
+        }
+
+        return $aDrawings;
+    }
+
+    private function writeHyperLinkDrawing(XMLWriter $objWriter, ?int $hlinkClickId): void
+    {
+        if ($hlinkClickId === null) {
+            return;
+        }
+
+        $objWriter->startElement('a:hlinkClick');
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
+        $objWriter->writeAttribute('r:id', 'rId' . $hlinkClickId);
+        $objWriter->endElement();
+    }
+
+    private static function stringEmu(int $pixelValue): string
+    {
+        return (string) SharedDrawing::pixelsToEMU($pixelValue);
+    }
+
+    private static function writeAttributeIf(XMLWriter $objWriter, ?bool $condition, string $attr, string $val): void
+    {
+        if ($condition) {
+            $objWriter->writeAttribute($attr, $val);
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
new file mode 100644
index 00000000..6f66eccf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+class FunctionPrefix
+{
+    const XLFNREGEXP = '/(?:_xlfn\.)?((?:_xlws\.)?\b('
+        // functions added with Excel 2010
+        . 'beta[.]dist'
+        . '|beta[.]inv'
+        . '|binom[.]dist'
+        . '|binom[.]inv'
+        . '|ceiling[.]precise'
+        . '|chisq[.]dist'
+        . '|chisq[.]dist[.]rt'
+        . '|chisq[.]inv'
+        . '|chisq[.]inv[.]rt'
+        . '|chisq[.]test'
+        . '|confidence[.]norm'
+        . '|confidence[.]t'
+        . '|covariance[.]p'
+        . '|covariance[.]s'
+        . '|erf[.]precise'
+        . '|erfc[.]precise'
+        . '|expon[.]dist'
+        . '|f[.]dist'
+        . '|f[.]dist[.]rt'
+        . '|f[.]inv'
+        . '|f[.]inv[.]rt'
+        . '|f[.]test'
+        . '|floor[.]precise'
+        . '|gamma[.]dist'
+        . '|gamma[.]inv'
+        . '|gammaln[.]precise'
+        . '|lognorm[.]dist'
+        . '|lognorm[.]inv'
+        . '|mode[.]mult'
+        . '|mode[.]sngl'
+        . '|negbinom[.]dist'
+        . '|networkdays[.]intl'
+        . '|norm[.]dist'
+        . '|norm[.]inv'
+        . '|norm[.]s[.]dist'
+        . '|norm[.]s[.]inv'
+        . '|percentile[.]exc'
+        . '|percentile[.]inc'
+        . '|percentrank[.]exc'
+        . '|percentrank[.]inc'
+        . '|poisson[.]dist'
+        . '|quartile[.]exc'
+        . '|quartile[.]inc'
+        . '|rank[.]avg'
+        . '|rank[.]eq'
+        . '|stdev[.]p'
+        . '|stdev[.]s'
+        . '|t[.]dist'
+        . '|t[.]dist[.]2t'
+        . '|t[.]dist[.]rt'
+        . '|t[.]inv'
+        . '|t[.]inv[.]2t'
+        . '|t[.]test'
+        . '|var[.]p'
+        . '|var[.]s'
+        . '|weibull[.]dist'
+        . '|z[.]test'
+        // functions added with Excel 2013
+        . '|acot'
+        . '|acoth'
+        . '|arabic'
+        . '|averageifs'
+        . '|binom[.]dist[.]range'
+        . '|bitand'
+        . '|bitlshift'
+        . '|bitor'
+        . '|bitrshift'
+        . '|bitxor'
+        . '|ceiling[.]math'
+        . '|combina'
+        . '|cot'
+        . '|coth'
+        . '|csc'
+        . '|csch'
+        . '|days'
+        . '|dbcs'
+        . '|decimal'
+        . '|encodeurl'
+        . '|filterxml'
+        . '|floor[.]math'
+        . '|formulatext'
+        . '|gamma'
+        . '|gauss'
+        . '|ifna'
+        . '|imcosh'
+        . '|imcot'
+        . '|imcsc'
+        . '|imcsch'
+        . '|imsec'
+        . '|imsech'
+        . '|imsinh'
+        . '|imtan'
+        . '|isformula'
+        . '|iso[.]ceiling'
+        . '|isoweeknum'
+        . '|munit'
+        . '|numbervalue'
+        . '|pduration'
+        . '|permutationa'
+        . '|phi'
+        . '|rri'
+        . '|sec'
+        . '|sech'
+        . '|sheet'
+        . '|sheets'
+        . '|skew[.]p'
+        . '|unichar'
+        . '|unicode'
+        . '|webservice'
+        . '|xor'
+        // functions added with Excel 2016
+        . '|forecast[.]et2'
+        . '|forecast[.]ets[.]confint'
+        . '|forecast[.]ets[.]seasonality'
+        . '|forecast[.]ets[.]stat'
+        . '|forecast[.]linear'
+        . '|switch'
+        // functions added with Excel 2019
+        . '|concat'
+        . '|ifs'
+        . '|maxifs'
+        . '|minifs'
+        . '|sumifs'
+        . '|textjoin'
+        // functions added with Excel 365
+        . '|filter'
+        . '|randarray'
+        . '|anchorarray'
+        . '|sequence'
+        . '|sort'
+        . '|sortby'
+        . '|unique'
+        . '|xlookup'
+        . '|xmatch'
+        . '|arraytotext'
+        . '|call'
+        . '|let'
+        . '|lambda'
+        . '|single'
+        . '|register[.]id'
+        . '|textafter'
+        . '|textbefore'
+        . '|textsplit'
+        . '|valuetotext'
+        . '))\s*\(/Umui';
+
+    const XLWSREGEXP = '/(?<!_xlws\.)('
+        // functions added with Excel 365
+        . 'filter'
+        . '|sort'
+        . ')\s*\(/mui';
+
+    /**
+     * Prefix function name in string with _xlfn. where required.
+     */
+    protected static function addXlfnPrefix(string $functionString): string
+    {
+        return (string) preg_replace(self::XLFNREGEXP, '_xlfn.$1(', $functionString);
+    }
+
+    /**
+     * Prefix function name in string with _xlws. where required.
+     */
+    protected static function addXlwsPrefix(string $functionString): string
+    {
+        return (string) preg_replace(self::XLWSREGEXP, '_xlws.$1(', $functionString);
+    }
+
+    /**
+     * Prefix function name in string with _xlfn. where required.
+     */
+    public static function addFunctionPrefix(string $functionString): string
+    {
+        return self::addXlwsPrefix(self::addXlfnPrefix($functionString));
+    }
+
+    /**
+     * Prefix function name in string with _xlfn. where required.
+     * Leading character, expected to be equals sign, is stripped.
+     */
+    public static function addFunctionPrefixStripEquals(string $functionString): string
+    {
+        return self::addFunctionPrefix(substr($functionString, 1));
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
new file mode 100644
index 00000000..1e6e3b49
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
@@ -0,0 +1,511 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+
+class Rels extends WriterPart
+{
+    /**
+     * Write relationships to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeRelationships(Spreadsheet $spreadsheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+
+        $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
+        if (!empty($customPropertyList)) {
+            // Relationship docProps/app.xml
+            $this->writeRelationship(
+                $objWriter,
+                4,
+                Namespaces::RELATIONSHIPS_CUSTOM_PROPERTIES,
+                'docProps/custom.xml'
+            );
+        }
+
+        // Relationship docProps/app.xml
+        $this->writeRelationship(
+            $objWriter,
+            3,
+            Namespaces::RELATIONSHIPS_EXTENDED_PROPERTIES,
+            'docProps/app.xml'
+        );
+
+        // Relationship docProps/core.xml
+        $this->writeRelationship(
+            $objWriter,
+            2,
+            Namespaces::CORE_PROPERTIES,
+            'docProps/core.xml'
+        );
+
+        // Relationship xl/workbook.xml
+        $this->writeRelationship(
+            $objWriter,
+            1,
+            Namespaces::OFFICE_DOCUMENT,
+            'xl/workbook.xml'
+        );
+        // a custom UI in workbook ?
+        $target = $spreadsheet->getRibbonXMLData('target');
+        if ($spreadsheet->hasRibbon()) {
+            $this->writeRelationShip(
+                $objWriter,
+                5,
+                Namespaces::EXTENSIBILITY,
+                is_string($target) ? $target : ''
+            );
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write workbook relationships to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeWorkbookRelationships(Spreadsheet $spreadsheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+
+        // Relationship styles.xml
+        $this->writeRelationship(
+            $objWriter,
+            1,
+            Namespaces::STYLES,
+            'styles.xml'
+        );
+
+        // Relationship theme/theme1.xml
+        $this->writeRelationship(
+            $objWriter,
+            2,
+            Namespaces::THEME2,
+            'theme/theme1.xml'
+        );
+
+        // Relationship sharedStrings.xml
+        $this->writeRelationship(
+            $objWriter,
+            3,
+            Namespaces::SHARED_STRINGS,
+            'sharedStrings.xml'
+        );
+
+        // Relationships with sheets
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $this->writeRelationship(
+                $objWriter,
+                ($i + 1 + 3),
+                Namespaces::WORKSHEET,
+                'worksheets/sheet' . ($i + 1) . '.xml'
+            );
+        }
+        // Relationships for vbaProject if needed
+        // id : just after the last sheet
+        if ($spreadsheet->hasMacros()) {
+            $this->writeRelationShip(
+                $objWriter,
+                ($i + 1 + 3),
+                Namespaces::VBA,
+                'vbaProject.bin'
+            );
+            ++$i; //increment i if needed for an another relation
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write worksheet relationships to XML format.
+     *
+     * Numbering is as follows:
+     *     rId1                 - Drawings
+     *  rId_hyperlink_x     - Hyperlinks
+     *
+     * @param bool $includeCharts Flag indicating if we should write charts
+     * @param int $tableRef Table ID
+     *
+     * @return string XML Output
+     */
+    public function writeWorksheetRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, int $worksheetId = 1, bool $includeCharts = false, int $tableRef = 1, array &$zipContent = []): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+
+        // Write drawing relationships?
+        $drawingOriginalIds = [];
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds'])) {
+            $drawingOriginalIds = $unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds'];
+        }
+
+        if ($includeCharts) {
+            $charts = $worksheet->getChartCollection();
+        } else {
+            $charts = [];
+        }
+
+        if (($worksheet->getDrawingCollection()->count() > 0) || (count($charts) > 0) || $drawingOriginalIds) {
+            $rId = 1;
+
+            // Use original $relPath to get original $rId.
+            // Take first. In future can be overwritten.
+            // (! synchronize with \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet::writeDrawings)
+            reset($drawingOriginalIds);
+            $relPath = key($drawingOriginalIds);
+            if (isset($drawingOriginalIds[$relPath])) {
+                $rId = (int) (substr($drawingOriginalIds[$relPath], 3));
+            }
+
+            // Generate new $relPath to write drawing relationship
+            $relPath = '../drawings/drawing' . $worksheetId . '.xml';
+            $this->writeRelationship(
+                $objWriter,
+                $rId,
+                Namespaces::RELATIONSHIPS_DRAWING,
+                $relPath
+            );
+        }
+
+        $backgroundImage = $worksheet->getBackgroundImage();
+        if ($backgroundImage !== '') {
+            $rId = 'Bg';
+            $uniqueName = md5(mt_rand(0, 9999) . time() . mt_rand(0, 9999));
+            $relPath = "../media/$uniqueName." . $worksheet->getBackgroundExtension();
+            $this->writeRelationship(
+                $objWriter,
+                $rId,
+                Namespaces::IMAGE,
+                $relPath
+            );
+            $zipContent["xl/media/$uniqueName." . $worksheet->getBackgroundExtension()] = $backgroundImage;
+        }
+
+        // Write hyperlink relationships?
+        $i = 1;
+        foreach ($worksheet->getHyperlinkCollection() as $hyperlink) {
+            if (!$hyperlink->isInternal()) {
+                $this->writeRelationship(
+                    $objWriter,
+                    '_hyperlink_' . $i,
+                    Namespaces::HYPERLINK,
+                    $hyperlink->getUrl(),
+                    'External'
+                );
+
+                ++$i;
+            }
+        }
+
+        // Write comments relationship?
+        $i = 1;
+        if (count($worksheet->getComments()) > 0 || isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['legacyDrawing'])) {
+            $this->writeRelationship(
+                $objWriter,
+                '_comments_vml' . $i,
+                Namespaces::VML,
+                '../drawings/vmlDrawing' . $worksheetId . '.vml'
+            );
+        }
+
+        if (count($worksheet->getComments()) > 0) {
+            $this->writeRelationship(
+                $objWriter,
+                '_comments' . $i,
+                Namespaces::COMMENTS,
+                '../comments' . $worksheetId . '.xml'
+            );
+        }
+
+        // Write Table
+        $tableCount = $worksheet->getTableCollection()->count();
+        for ($i = 1; $i <= $tableCount; ++$i) {
+            $this->writeRelationship(
+                $objWriter,
+                '_table_' . $i,
+                Namespaces::RELATIONSHIPS_TABLE,
+                '../tables/table' . $tableRef++ . '.xml'
+            );
+        }
+
+        // Write header/footer relationship?
+        $i = 1;
+        if (count($worksheet->getHeaderFooter()->getImages()) > 0) {
+            $this->writeRelationship(
+                $objWriter,
+                '_headerfooter_vml' . $i,
+                Namespaces::VML,
+                '../drawings/vmlDrawingHF' . $worksheetId . '.vml'
+            );
+        }
+
+        $this->writeUnparsedRelationship($worksheet, $objWriter, 'ctrlProps', Namespaces::RELATIONSHIPS_CTRLPROP);
+        $this->writeUnparsedRelationship($worksheet, $objWriter, 'vmlDrawings', Namespaces::VML);
+        $this->writeUnparsedRelationship($worksheet, $objWriter, 'printerSettings', Namespaces::RELATIONSHIPS_PRINTER_SETTINGS);
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    private function writeUnparsedRelationship(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, XMLWriter $objWriter, string $relationship, string $type): void
+    {
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (!isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()][$relationship])) {
+            return;
+        }
+
+        foreach ($unparsedLoadedData['sheets'][$worksheet->getCodeName()][$relationship] as $rId => $value) {
+            if (!str_starts_with($rId, '_headerfooter_vml')) {
+                $this->writeRelationship(
+                    $objWriter,
+                    $rId,
+                    $type,
+                    $value['relFilePath']
+                );
+            }
+        }
+    }
+
+    /**
+     * Write drawing relationships to XML format.
+     *
+     * @param int $chartRef Chart ID
+     * @param bool $includeCharts Flag indicating if we should write charts
+     *
+     * @return string XML Output
+     */
+    public function writeDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, int &$chartRef, bool $includeCharts = false): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+
+        // Loop through images and write relationships
+        $i = 1;
+        $iterator = $worksheet->getDrawingCollection()->getIterator();
+        while ($iterator->valid()) {
+            $drawing = $iterator->current();
+            if (
+                $drawing instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing
+                || $drawing instanceof MemoryDrawing
+            ) {
+                // Write relationship for image drawing
+                $this->writeRelationship(
+                    $objWriter,
+                    $i,
+                    Namespaces::IMAGE,
+                    '../media/' . $drawing->getIndexedFilename()
+                );
+
+                $i = $this->writeDrawingHyperLink($objWriter, $drawing, $i);
+            }
+
+            $iterator->next();
+            ++$i;
+        }
+
+        if ($includeCharts) {
+            // Loop through charts and write relationships
+            $chartCount = $worksheet->getChartCount();
+            if ($chartCount > 0) {
+                for ($c = 0; $c < $chartCount; ++$c) {
+                    $this->writeRelationship(
+                        $objWriter,
+                        $i++,
+                        Namespaces::RELATIONSHIPS_CHART,
+                        '../charts/chart' . ++$chartRef . '.xml'
+                    );
+                }
+            }
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write header/footer drawing relationships to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeHeaderFooterDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+
+        // Loop through images and write relationships
+        foreach ($worksheet->getHeaderFooter()->getImages() as $key => $value) {
+            // Write relationship for image drawing
+            $this->writeRelationship(
+                $objWriter,
+                $key,
+                Namespaces::IMAGE,
+                '../media/' . $value->getIndexedFilename()
+            );
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    public function writeVMLDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+
+        // Loop through images and write relationships
+        foreach ($worksheet->getComments() as $comment) {
+            if (!$comment->hasBackgroundImage()) {
+                continue;
+            }
+
+            $bgImage = $comment->getBackgroundImage();
+            $this->writeRelationship(
+                $objWriter,
+                $bgImage->getImageIndex(),
+                Namespaces::IMAGE,
+                '../media/' . $bgImage->getMediaFilename()
+            );
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write Override content type.
+     *
+     * @param int|string $id Relationship ID. rId will be prepended!
+     * @param string $type Relationship type
+     * @param string $target Relationship target
+     * @param string $targetMode Relationship target mode
+     */
+    private function writeRelationship(XMLWriter $objWriter, $id, string $type, string $target, string $targetMode = ''): void
+    {
+        if ($type != '' && $target != '') {
+            // Write relationship
+            $objWriter->startElement('Relationship');
+            $objWriter->writeAttribute('Id', 'rId' . $id);
+            $objWriter->writeAttribute('Type', $type);
+            $objWriter->writeAttribute('Target', $target);
+
+            if ($targetMode != '') {
+                $objWriter->writeAttribute('TargetMode', $targetMode);
+            }
+
+            $objWriter->endElement();
+        } else {
+            throw new WriterException('Invalid parameters passed.');
+        }
+    }
+
+    private function writeDrawingHyperLink(XMLWriter $objWriter, BaseDrawing $drawing, int $i): int
+    {
+        if ($drawing->getHyperlink() === null) {
+            return $i;
+        }
+
+        ++$i;
+        $this->writeRelationship(
+            $objWriter,
+            $i,
+            Namespaces::HYPERLINK,
+            $drawing->getHyperlink()->getUrl(),
+            $drawing->getHyperlink()->getTypeHyperlink()
+        );
+
+        return $i;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php
new file mode 100644
index 00000000..93c97779
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+class RelsRibbon extends WriterPart
+{
+    /**
+     * Write relationships for additional objects of custom UI (ribbon).
+     *
+     * @return string XML Output
+     */
+    public function writeRibbonRelationships(Spreadsheet $spreadsheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+        $localRels = $spreadsheet->getRibbonBinObjects('names');
+        if (is_array($localRels)) {
+            foreach ($localRels as $aId => $aTarget) {
+                $objWriter->startElement('Relationship');
+                $objWriter->writeAttribute('Id', $aId);
+                $objWriter->writeAttribute('Type', Namespaces::IMAGE);
+                $objWriter->writeAttribute('Target', $aTarget);
+                $objWriter->endElement();
+            }
+        }
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php
new file mode 100644
index 00000000..4ec02025
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+
+class RelsVBA extends WriterPart
+{
+    /**
+     * Write relationships for a signed VBA Project.
+     *
+     * @return string XML Output
+     */
+    public function writeVBARelationships(): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+        $objWriter->startElement('Relationship');
+        $objWriter->writeAttribute('Id', 'rId1');
+        $objWriter->writeAttribute('Type', Namespaces::VBA_SIGNATURE);
+        $objWriter->writeAttribute('Target', 'vbaProjectSignature.bin');
+        $objWriter->endElement();
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
new file mode 100644
index 00000000..98b1dddb
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
@@ -0,0 +1,344 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\RichText\Run;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as ActualWorksheet;
+
+class StringTable extends WriterPart
+{
+    /**
+     * Create worksheet stringtable.
+     *
+     * @param string[] $existingTable Existing table to eventually merge with
+     *
+     * @return string[] String table for worksheet
+     */
+    public function createStringTable(ActualWorksheet $worksheet, ?array $existingTable = null): array
+    {
+        // Create string lookup table
+        $aStringTable = [];
+
+        // Is an existing table given?
+        if (($existingTable !== null) && is_array($existingTable)) {
+            $aStringTable = $existingTable;
+        }
+
+        // Fill index array
+        $aFlippedStringTable = $this->flipStringTable($aStringTable);
+
+        // Loop through cells
+        foreach ($worksheet->getCellCollection()->getCoordinates() as $coordinate) {
+            /** @var Cell $cell */
+            $cell = $worksheet->getCellCollection()->get($coordinate);
+            $cellValue = $cell->getValue();
+            if (
+                !is_object($cellValue)
+                && ($cellValue !== null)
+                && $cellValue !== ''
+                && ($cell->getDataType() == DataType::TYPE_STRING || $cell->getDataType() == DataType::TYPE_STRING2 || $cell->getDataType() == DataType::TYPE_NULL)
+                && !isset($aFlippedStringTable[$cellValue])
+            ) {
+                $aStringTable[] = $cellValue;
+                $aFlippedStringTable[$cellValue] = true;
+            } elseif (
+                $cellValue instanceof RichText
+                && ($cellValue !== null)
+                && !isset($aFlippedStringTable[$cellValue->getHashCode()])
+            ) {
+                $aStringTable[] = $cellValue;
+                $aFlippedStringTable[$cellValue->getHashCode()] = true;
+            }
+        }
+
+        return $aStringTable;
+    }
+
+    /**
+     * Write string table to XML format.
+     *
+     * @param (RichText|string)[] $stringTable
+     *
+     * @return string XML Output
+     */
+    public function writeStringTable(array $stringTable): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // String table
+        $objWriter->startElement('sst');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('uniqueCount', (string) count($stringTable));
+
+        // Loop through string table
+        foreach ($stringTable as $textElement) {
+            $objWriter->startElement('si');
+
+            if (!($textElement instanceof RichText)) {
+                $textToWrite = StringHelper::controlCharacterPHP2OOXML($textElement);
+                $objWriter->startElement('t');
+                if ($textToWrite !== trim($textToWrite)) {
+                    $objWriter->writeAttribute('xml:space', 'preserve');
+                }
+                $objWriter->writeRawData($textToWrite);
+                $objWriter->endElement();
+            } else {
+                $this->writeRichText($objWriter, $textElement);
+            }
+
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write Rich Text.
+     *
+     * @param ?string $prefix Optional Namespace prefix
+     */
+    public function writeRichText(XMLWriter $objWriter, RichText $richText, ?string $prefix = null): void
+    {
+        if ($prefix !== null) {
+            $prefix .= ':';
+        }
+
+        // Loop through rich text elements
+        $elements = $richText->getRichTextElements();
+        foreach ($elements as $element) {
+            // r
+            $objWriter->startElement($prefix . 'r');
+
+            // rPr
+            if ($element instanceof Run && $element->getFont() !== null) {
+                // rPr
+                $objWriter->startElement($prefix . 'rPr');
+
+                // rFont
+                if ($element->getFont()->getName() !== null) {
+                    $objWriter->startElement($prefix . 'rFont');
+                    $objWriter->writeAttribute('val', $element->getFont()->getName());
+                    $objWriter->endElement();
+                }
+
+                // Bold
+                $objWriter->startElement($prefix . 'b');
+                $objWriter->writeAttribute('val', ($element->getFont()->getBold() ? 'true' : 'false'));
+                $objWriter->endElement();
+
+                // Italic
+                $objWriter->startElement($prefix . 'i');
+                $objWriter->writeAttribute('val', ($element->getFont()->getItalic() ? 'true' : 'false'));
+                $objWriter->endElement();
+
+                // Superscript / subscript
+                if ($element->getFont()->getSuperscript() || $element->getFont()->getSubscript()) {
+                    $objWriter->startElement($prefix . 'vertAlign');
+                    if ($element->getFont()->getSuperscript()) {
+                        $objWriter->writeAttribute('val', 'superscript');
+                    } elseif ($element->getFont()->getSubscript()) {
+                        $objWriter->writeAttribute('val', 'subscript');
+                    }
+                    $objWriter->endElement();
+                }
+
+                // Strikethrough
+                $objWriter->startElement($prefix . 'strike');
+                $objWriter->writeAttribute('val', ($element->getFont()->getStrikethrough() ? 'true' : 'false'));
+                $objWriter->endElement();
+
+                // Color
+                if ($element->getFont()->getColor()->getARGB() !== null) {
+                    $objWriter->startElement($prefix . 'color');
+                    $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
+                    $objWriter->endElement();
+                }
+
+                // Size
+                if ($element->getFont()->getSize() !== null) {
+                    $objWriter->startElement($prefix . 'sz');
+                    $objWriter->writeAttribute('val', (string) $element->getFont()->getSize());
+                    $objWriter->endElement();
+                }
+
+                // Underline
+                if ($element->getFont()->getUnderline() !== null) {
+                    $objWriter->startElement($prefix . 'u');
+                    $objWriter->writeAttribute('val', $element->getFont()->getUnderline());
+                    $objWriter->endElement();
+                }
+
+                $objWriter->endElement();
+            }
+
+            // t
+            $objWriter->startElement($prefix . 't');
+            $objWriter->writeAttribute('xml:space', 'preserve');
+            $objWriter->writeRawData(StringHelper::controlCharacterPHP2OOXML($element->getText()));
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Rich Text.
+     *
+     * @param RichText|string $richText text string or Rich text
+     * @param string $prefix Optional Namespace prefix
+     */
+    public function writeRichTextForCharts(XMLWriter $objWriter, $richText = null, string $prefix = ''): void
+    {
+        if (!($richText instanceof RichText)) {
+            $textRun = $richText;
+            $richText = new RichText();
+            $run = $richText->createTextRun($textRun ?? '');
+            $run->setFont(null);
+        }
+
+        if ($prefix !== '') {
+            $prefix .= ':';
+        }
+
+        // Loop through rich text elements
+        $elements = $richText->getRichTextElements();
+        foreach ($elements as $element) {
+            // r
+            $objWriter->startElement($prefix . 'r');
+            if ($element->getFont() !== null) {
+                // rPr
+                $objWriter->startElement($prefix . 'rPr');
+                $fontSize = $element->getFont()->getSize();
+                if (is_numeric($fontSize)) {
+                    $fontSize *= (($fontSize < 100) ? 100 : 1);
+                    $objWriter->writeAttribute('sz', (string) $fontSize);
+                }
+
+                // Bold
+                $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? '1' : '0'));
+                // Italic
+                $objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? '1' : '0'));
+                // Underline
+                $underlineType = $element->getFont()->getUnderline();
+                switch ($underlineType) {
+                    case 'single':
+                        $underlineType = 'sng';
+
+                        break;
+                    case 'double':
+                        $underlineType = 'dbl';
+
+                        break;
+                }
+                if ($underlineType !== null) {
+                    $objWriter->writeAttribute('u', $underlineType);
+                }
+                // Strikethrough
+                $objWriter->writeAttribute('strike', ($element->getFont()->getStriketype() ?: 'noStrike'));
+                // Superscript/subscript
+                if ($element->getFont()->getBaseLine()) {
+                    $objWriter->writeAttribute('baseline', (string) $element->getFont()->getBaseLine());
+                }
+
+                // Color
+                $this->writeChartTextColor($objWriter, $element->getFont()->getChartColor(), $prefix);
+
+                // Underscore Color
+                $this->writeChartTextColor($objWriter, $element->getFont()->getUnderlineColor(), $prefix, 'uFill');
+
+                // fontName
+                if ($element->getFont()->getLatin()) {
+                    $objWriter->startElement($prefix . 'latin');
+                    $objWriter->writeAttribute('typeface', $element->getFont()->getLatin());
+                    $objWriter->endElement();
+                }
+                if ($element->getFont()->getEastAsian()) {
+                    $objWriter->startElement($prefix . 'ea');
+                    $objWriter->writeAttribute('typeface', $element->getFont()->getEastAsian());
+                    $objWriter->endElement();
+                }
+                if ($element->getFont()->getComplexScript()) {
+                    $objWriter->startElement($prefix . 'cs');
+                    $objWriter->writeAttribute('typeface', $element->getFont()->getComplexScript());
+                    $objWriter->endElement();
+                }
+
+                $objWriter->endElement();
+            }
+
+            // t
+            $objWriter->startElement($prefix . 't');
+            $objWriter->writeRawData(StringHelper::controlCharacterPHP2OOXML($element->getText()));
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+
+    private function writeChartTextColor(XMLWriter $objWriter, ?ChartColor $underlineColor, string $prefix, ?string $openTag = ''): void
+    {
+        if ($underlineColor !== null) {
+            $type = $underlineColor->getType();
+            $value = $underlineColor->getValue();
+            if (!empty($type) && !empty($value)) {
+                if ($openTag !== '') {
+                    $objWriter->startElement($prefix . $openTag);
+                }
+                $objWriter->startElement($prefix . 'solidFill');
+                $objWriter->startElement($prefix . $type);
+                $objWriter->writeAttribute('val', $value);
+                $alpha = $underlineColor->getAlpha();
+                if (is_numeric($alpha)) {
+                    $objWriter->startElement('a:alpha');
+                    $objWriter->writeAttribute('val', ChartColor::alphaToXml((int) $alpha));
+                    $objWriter->endElement();
+                }
+                $objWriter->endElement(); // srgbClr/schemeClr/prstClr
+                $objWriter->endElement(); // solidFill
+                if ($openTag !== '') {
+                    $objWriter->endElement(); // uFill
+                }
+            }
+        }
+    }
+
+    /**
+     * Flip string table (for index searching).
+     *
+     * @param array $stringTable Stringtable
+     */
+    public function flipStringTable(array $stringTable): array
+    {
+        // Return value
+        $returnValue = [];
+
+        // Loop through stringtable and add flipped items to $returnValue
+        foreach ($stringTable as $key => $value) {
+            if (!$value instanceof RichText) {
+                $returnValue[$value] = $key;
+            } elseif ($value instanceof RichText) {
+                $returnValue[$value->getHashCode()] = $key;
+            }
+        }
+
+        return $returnValue;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php
new file mode 100644
index 00000000..daac5d02
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php
@@ -0,0 +1,679 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+
+class Style extends WriterPart
+{
+    /**
+     * Write styles to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeStyles(Spreadsheet $spreadsheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // styleSheet
+        $objWriter->startElement('styleSheet');
+        $objWriter->writeAttribute('xml:space', 'preserve');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+
+        // numFmts
+        $objWriter->startElement('numFmts');
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getNumFmtHashTable()->count());
+
+        // numFmt
+        for ($i = 0; $i < $this->getParentWriter()->getNumFmtHashTable()->count(); ++$i) {
+            $this->writeNumFmt($objWriter, $this->getParentWriter()->getNumFmtHashTable()->getByIndex($i), $i);
+        }
+
+        $objWriter->endElement();
+
+        // fonts
+        $objWriter->startElement('fonts');
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getFontHashTable()->count());
+
+        // font
+        for ($i = 0; $i < $this->getParentWriter()->getFontHashTable()->count(); ++$i) {
+            $thisfont = $this->getParentWriter()->getFontHashTable()->getByIndex($i);
+            if ($thisfont !== null) {
+                $this->writeFont($objWriter, $thisfont);
+            }
+        }
+
+        $objWriter->endElement();
+
+        // fills
+        $objWriter->startElement('fills');
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getFillHashTable()->count());
+
+        // fill
+        for ($i = 0; $i < $this->getParentWriter()->getFillHashTable()->count(); ++$i) {
+            $thisfill = $this->getParentWriter()->getFillHashTable()->getByIndex($i);
+            if ($thisfill !== null) {
+                $this->writeFill($objWriter, $thisfill);
+            }
+        }
+
+        $objWriter->endElement();
+
+        // borders
+        $objWriter->startElement('borders');
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getBordersHashTable()->count());
+
+        // border
+        for ($i = 0; $i < $this->getParentWriter()->getBordersHashTable()->count(); ++$i) {
+            $thisborder = $this->getParentWriter()->getBordersHashTable()->getByIndex($i);
+            if ($thisborder !== null) {
+                $this->writeBorder($objWriter, $thisborder);
+            }
+        }
+
+        $objWriter->endElement();
+
+        // cellStyleXfs
+        $objWriter->startElement('cellStyleXfs');
+        $objWriter->writeAttribute('count', '1');
+
+        // xf
+        $objWriter->startElement('xf');
+        $objWriter->writeAttribute('numFmtId', '0');
+        $objWriter->writeAttribute('fontId', '0');
+        $objWriter->writeAttribute('fillId', '0');
+        $objWriter->writeAttribute('borderId', '0');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // cellXfs
+        $objWriter->startElement('cellXfs');
+        $objWriter->writeAttribute('count', (string) count($spreadsheet->getCellXfCollection()));
+
+        // xf
+        $alignment = new Alignment();
+        $defaultAlignHash = $alignment->getHashCode();
+        if ($defaultAlignHash !== $spreadsheet->getDefaultStyle()->getAlignment()->getHashCode()) {
+            $defaultAlignHash = '';
+        }
+        foreach ($spreadsheet->getCellXfCollection() as $cellXf) {
+            $this->writeCellStyleXf($objWriter, $cellXf, $spreadsheet, $defaultAlignHash);
+        }
+
+        $objWriter->endElement();
+
+        // cellStyles
+        $objWriter->startElement('cellStyles');
+        $objWriter->writeAttribute('count', '1');
+
+        // cellStyle
+        $objWriter->startElement('cellStyle');
+        $objWriter->writeAttribute('name', 'Normal');
+        $objWriter->writeAttribute('xfId', '0');
+        $objWriter->writeAttribute('builtinId', '0');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // dxfs
+        $objWriter->startElement('dxfs');
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getStylesConditionalHashTable()->count());
+
+        // dxf
+        for ($i = 0; $i < $this->getParentWriter()->getStylesConditionalHashTable()->count(); ++$i) {
+            $thisstyle = $this->getParentWriter()->getStylesConditionalHashTable()->getByIndex($i);
+            if ($thisstyle !== null) {
+                $this->writeCellStyleDxf($objWriter, $thisstyle->getStyle());
+            }
+        }
+
+        $objWriter->endElement();
+
+        // tableStyles
+        $objWriter->startElement('tableStyles');
+        $objWriter->writeAttribute('defaultTableStyle', 'TableStyleMedium9');
+        $objWriter->writeAttribute('defaultPivotStyle', 'PivotTableStyle1');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write Fill.
+     */
+    private function writeFill(XMLWriter $objWriter, Fill $fill): void
+    {
+        // Check if this is a pattern type or gradient type
+        if (
+            $fill->getFillType() === Fill::FILL_GRADIENT_LINEAR
+            || $fill->getFillType() === Fill::FILL_GRADIENT_PATH
+        ) {
+            // Gradient fill
+            $this->writeGradientFill($objWriter, $fill);
+        } elseif ($fill->getFillType() !== null) {
+            // Pattern fill
+            $this->writePatternFill($objWriter, $fill);
+        }
+    }
+
+    /**
+     * Write Gradient Fill.
+     */
+    private function writeGradientFill(XMLWriter $objWriter, Fill $fill): void
+    {
+        // fill
+        $objWriter->startElement('fill');
+
+        // gradientFill
+        $objWriter->startElement('gradientFill');
+        $objWriter->writeAttribute('type', (string) $fill->getFillType());
+        $objWriter->writeAttribute('degree', (string) $fill->getRotation());
+
+        // stop
+        $objWriter->startElement('stop');
+        $objWriter->writeAttribute('position', '0');
+
+        // color
+        if ($fill->getStartColor()->getARGB() !== null) {
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $fill->getStartColor()->getARGB());
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+
+        // stop
+        $objWriter->startElement('stop');
+        $objWriter->writeAttribute('position', '1');
+
+        // color
+        if ($fill->getEndColor()->getARGB() !== null) {
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $fill->getEndColor()->getARGB());
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    private static function writePatternColors(Fill $fill): bool
+    {
+        if ($fill->getFillType() === Fill::FILL_NONE) {
+            return false;
+        }
+
+        return $fill->getFillType() === Fill::FILL_SOLID || $fill->getColorsChanged();
+    }
+
+    /**
+     * Write Pattern Fill.
+     */
+    private function writePatternFill(XMLWriter $objWriter, Fill $fill): void
+    {
+        // fill
+        $objWriter->startElement('fill');
+
+        // patternFill
+        $objWriter->startElement('patternFill');
+        $objWriter->writeAttribute('patternType', (string) $fill->getFillType());
+
+        if (self::writePatternColors($fill)) {
+            // fgColor
+            if ($fill->getStartColor()->getARGB()) {
+                if (!$fill->getEndColor()->getARGB() && $fill->getFillType() === Fill::FILL_SOLID) {
+                    $objWriter->startElement('bgColor');
+                    $objWriter->writeAttribute('rgb', $fill->getStartColor()->getARGB());
+                } else {
+                    $objWriter->startElement('fgColor');
+                    $objWriter->writeAttribute('rgb', $fill->getStartColor()->getARGB());
+                }
+                $objWriter->endElement();
+            }
+            // bgColor
+            if ($fill->getEndColor()->getARGB()) {
+                $objWriter->startElement('bgColor');
+                $objWriter->writeAttribute('rgb', $fill->getEndColor()->getARGB());
+                $objWriter->endElement();
+            }
+        }
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    private function startFont(XMLWriter $objWriter, bool &$fontStarted): void
+    {
+        if (!$fontStarted) {
+            $fontStarted = true;
+            $objWriter->startElement('font');
+        }
+    }
+
+    /**
+     * Write Font.
+     */
+    private function writeFont(XMLWriter $objWriter, Font $font): void
+    {
+        $fontStarted = false;
+        // font
+        //    Weird! The order of these elements actually makes a difference when opening Xlsx
+        //        files in Excel2003 with the compatibility pack. It's not documented behaviour,
+        //        and makes for a real WTF!
+
+        // Bold. We explicitly write this element also when false (like MS Office Excel 2007 does
+        // for conditional formatting). Otherwise it will apparently not be picked up in conditional
+        // formatting style dialog
+        if ($font->getBold() !== null) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('b');
+            $objWriter->writeAttribute('val', $font->getBold() ? '1' : '0');
+            $objWriter->endElement();
+        }
+
+        // Italic
+        if ($font->getItalic() !== null) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('i');
+            $objWriter->writeAttribute('val', $font->getItalic() ? '1' : '0');
+            $objWriter->endElement();
+        }
+
+        // Strikethrough
+        if ($font->getStrikethrough() !== null) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('strike');
+            $objWriter->writeAttribute('val', $font->getStrikethrough() ? '1' : '0');
+            $objWriter->endElement();
+        }
+
+        // Underline
+        if ($font->getUnderline() !== null) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('u');
+            $objWriter->writeAttribute('val', $font->getUnderline());
+            $objWriter->endElement();
+        }
+
+        // Superscript / subscript
+        if ($font->getSuperscript() === true || $font->getSubscript() === true) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('vertAlign');
+            if ($font->getSuperscript() === true) {
+                $objWriter->writeAttribute('val', 'superscript');
+            } elseif ($font->getSubscript() === true) {
+                $objWriter->writeAttribute('val', 'subscript');
+            }
+            $objWriter->endElement();
+        }
+
+        // Size
+        if ($font->getSize() !== null) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('sz');
+            $objWriter->writeAttribute('val', StringHelper::formatNumber($font->getSize()));
+            $objWriter->endElement();
+        }
+
+        // Foreground color
+        if ($font->getColor()->getARGB() !== null) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $font->getColor()->getARGB());
+            $objWriter->endElement();
+        }
+
+        // Name
+        if ($font->getName() !== null) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('name');
+            $objWriter->writeAttribute('val', $font->getName());
+            $objWriter->endElement();
+        }
+
+        if (!empty($font->getScheme())) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('scheme');
+            $objWriter->writeAttribute('val', $font->getScheme());
+            $objWriter->endElement();
+        }
+
+        if ($fontStarted) {
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Border.
+     */
+    private function writeBorder(XMLWriter $objWriter, Borders $borders): void
+    {
+        // Write border
+        $objWriter->startElement('border');
+        // Diagonal?
+        switch ($borders->getDiagonalDirection()) {
+            case Borders::DIAGONAL_UP:
+                $objWriter->writeAttribute('diagonalUp', 'true');
+                $objWriter->writeAttribute('diagonalDown', 'false');
+
+                break;
+            case Borders::DIAGONAL_DOWN:
+                $objWriter->writeAttribute('diagonalUp', 'false');
+                $objWriter->writeAttribute('diagonalDown', 'true');
+
+                break;
+            case Borders::DIAGONAL_BOTH:
+                $objWriter->writeAttribute('diagonalUp', 'true');
+                $objWriter->writeAttribute('diagonalDown', 'true');
+
+                break;
+        }
+
+        // BorderPr
+        $this->writeBorderPr($objWriter, 'left', $borders->getLeft());
+        $this->writeBorderPr($objWriter, 'right', $borders->getRight());
+        $this->writeBorderPr($objWriter, 'top', $borders->getTop());
+        $this->writeBorderPr($objWriter, 'bottom', $borders->getBottom());
+        $this->writeBorderPr($objWriter, 'diagonal', $borders->getDiagonal());
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Cell Style Xf.
+     */
+    private function writeCellStyleXf(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Style\Style $style, Spreadsheet $spreadsheet, string $defaultAlignHash): void
+    {
+        // xf
+        $objWriter->startElement('xf');
+        $objWriter->writeAttribute('xfId', '0');
+        $objWriter->writeAttribute('fontId', (string) (int) $this->getParentWriter()->getFontHashTable()->getIndexForHashCode($style->getFont()->getHashCode()));
+        if ($style->getQuotePrefix()) {
+            $objWriter->writeAttribute('quotePrefix', '1');
+        }
+
+        if ($style->getNumberFormat()->getBuiltInFormatCode() === false) {
+            $objWriter->writeAttribute('numFmtId', (string) (int) ($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($style->getNumberFormat()->getHashCode()) + 164));
+        } else {
+            $objWriter->writeAttribute('numFmtId', (string) (int) $style->getNumberFormat()->getBuiltInFormatCode());
+        }
+
+        $objWriter->writeAttribute('fillId', (string) (int) $this->getParentWriter()->getFillHashTable()->getIndexForHashCode($style->getFill()->getHashCode()));
+        $objWriter->writeAttribute('borderId', (string) (int) $this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($style->getBorders()->getHashCode()));
+
+        // Apply styles?
+        $objWriter->writeAttribute('applyFont', ($spreadsheet->getDefaultStyle()->getFont()->getHashCode() != $style->getFont()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyNumberFormat', ($spreadsheet->getDefaultStyle()->getNumberFormat()->getHashCode() != $style->getNumberFormat()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyFill', ($spreadsheet->getDefaultStyle()->getFill()->getHashCode() != $style->getFill()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyBorder', ($spreadsheet->getDefaultStyle()->getBorders()->getHashCode() != $style->getBorders()->getHashCode()) ? '1' : '0');
+        if ($defaultAlignHash !== '' && $defaultAlignHash === $style->getAlignment()->getHashCode()) {
+            $applyAlignment = '0';
+        } else {
+            $applyAlignment = '1';
+        }
+        $objWriter->writeAttribute('applyAlignment', $applyAlignment);
+        if ($style->getProtection()->getLocked() != Protection::PROTECTION_INHERIT || $style->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
+            $objWriter->writeAttribute('applyProtection', 'true');
+        }
+
+        // alignment
+        if ($applyAlignment === '1') {
+            $objWriter->startElement('alignment');
+            $vertical = Alignment::VERTICAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getVertical()] ?? '';
+            $horizontal = Alignment::HORIZONTAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getHorizontal()] ?? '';
+            if ($horizontal !== '') {
+                $objWriter->writeAttribute('horizontal', $horizontal);
+            }
+            if ($vertical !== '') {
+                $objWriter->writeAttribute('vertical', $vertical);
+            }
+
+            if ($style->getAlignment()->getTextRotation() >= 0) {
+                $textRotation = $style->getAlignment()->getTextRotation();
+            } else {
+                $textRotation = 90 - $style->getAlignment()->getTextRotation();
+            }
+            $objWriter->writeAttribute('textRotation', (string) $textRotation);
+
+            $objWriter->writeAttribute('wrapText', ($style->getAlignment()->getWrapText() ? 'true' : 'false'));
+            $objWriter->writeAttribute('shrinkToFit', ($style->getAlignment()->getShrinkToFit() ? 'true' : 'false'));
+
+            if ($style->getAlignment()->getIndent() > 0) {
+                $objWriter->writeAttribute('indent', (string) $style->getAlignment()->getIndent());
+            }
+            if ($style->getAlignment()->getReadOrder() > 0) {
+                $objWriter->writeAttribute('readingOrder', (string) $style->getAlignment()->getReadOrder());
+            }
+            $objWriter->endElement();
+        }
+
+        // protection
+        if ($style->getProtection()->getLocked() != Protection::PROTECTION_INHERIT || $style->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
+            $objWriter->startElement('protection');
+            if ($style->getProtection()->getLocked() != Protection::PROTECTION_INHERIT) {
+                $objWriter->writeAttribute('locked', ($style->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+            }
+            if ($style->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
+                $objWriter->writeAttribute('hidden', ($style->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+            }
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Cell Style Dxf.
+     */
+    private function writeCellStyleDxf(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Style\Style $style): void
+    {
+        // dxf
+        $objWriter->startElement('dxf');
+
+        // font
+        $this->writeFont($objWriter, $style->getFont());
+
+        // numFmt
+        $this->writeNumFmt($objWriter, $style->getNumberFormat());
+
+        // fill
+        $this->writeFill($objWriter, $style->getFill());
+
+        // border
+        $this->writeBorder($objWriter, $style->getBorders());
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write BorderPr.
+     *
+     * @param string $name Element name
+     */
+    private function writeBorderPr(XMLWriter $objWriter, string $name, Border $border): void
+    {
+        // Write BorderPr
+        if ($border->getBorderStyle() === Border::BORDER_OMIT) {
+            return;
+        }
+        $objWriter->startElement($name);
+        if ($border->getBorderStyle() !== Border::BORDER_NONE) {
+            $objWriter->writeAttribute('style', $border->getBorderStyle());
+
+            // color
+            if ($border->getColor()->getARGB() !== null) {
+                $objWriter->startElement('color');
+                $objWriter->writeAttribute('rgb', $border->getColor()->getARGB());
+                $objWriter->endElement();
+            }
+        }
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write NumberFormat.
+     *
+     * @param int $id Number Format identifier
+     */
+    private function writeNumFmt(XMLWriter $objWriter, ?NumberFormat $numberFormat, int $id = 0): void
+    {
+        // Translate formatcode
+        $formatCode = ($numberFormat === null) ? null : $numberFormat->getFormatCode();
+
+        // numFmt
+        if ($formatCode !== null) {
+            $objWriter->startElement('numFmt');
+            $objWriter->writeAttribute('numFmtId', (string) ($id + 164));
+            $objWriter->writeAttribute('formatCode', $formatCode);
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Get an array of all styles.
+     *
+     * @return \PhpOffice\PhpSpreadsheet\Style\Style[] All styles in PhpSpreadsheet
+     */
+    public function allStyles(Spreadsheet $spreadsheet): array
+    {
+        return $spreadsheet->getCellXfCollection();
+    }
+
+    /**
+     * Get an array of all conditional styles.
+     *
+     * @return Conditional[] All conditional styles in PhpSpreadsheet
+     */
+    public function allConditionalStyles(Spreadsheet $spreadsheet): array
+    {
+        // Get an array of all styles
+        $aStyles = [];
+
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            foreach ($spreadsheet->getSheet($i)->getConditionalStylesCollection() as $conditionalStyles) {
+                foreach ($conditionalStyles as $conditionalStyle) {
+                    $aStyles[] = $conditionalStyle;
+                }
+            }
+        }
+
+        return $aStyles;
+    }
+
+    /**
+     * Get an array of all fills.
+     *
+     * @return Fill[] All fills in PhpSpreadsheet
+     */
+    public function allFills(Spreadsheet $spreadsheet): array
+    {
+        // Get an array of unique fills
+        $aFills = [];
+
+        // Two first fills are predefined
+        $fill0 = new Fill();
+        $fill0->setFillType(Fill::FILL_NONE);
+        $aFills[] = $fill0;
+
+        $fill1 = new Fill();
+        $fill1->setFillType(Fill::FILL_PATTERN_GRAY125);
+        $aFills[] = $fill1;
+        // The remaining fills
+        $aStyles = $this->allStyles($spreadsheet);
+        foreach ($aStyles as $style) {
+            if (!isset($aFills[$style->getFill()->getHashCode()])) {
+                $aFills[$style->getFill()->getHashCode()] = $style->getFill();
+            }
+        }
+
+        return $aFills;
+    }
+
+    /**
+     * Get an array of all fonts.
+     *
+     * @return Font[] All fonts in PhpSpreadsheet
+     */
+    public function allFonts(Spreadsheet $spreadsheet): array
+    {
+        // Get an array of unique fonts
+        $aFonts = [];
+        $aStyles = $this->allStyles($spreadsheet);
+
+        foreach ($aStyles as $style) {
+            if (!isset($aFonts[$style->getFont()->getHashCode()])) {
+                $aFonts[$style->getFont()->getHashCode()] = $style->getFont();
+            }
+        }
+
+        return $aFonts;
+    }
+
+    /**
+     * Get an array of all borders.
+     *
+     * @return Borders[] All borders in PhpSpreadsheet
+     */
+    public function allBorders(Spreadsheet $spreadsheet): array
+    {
+        // Get an array of unique borders
+        $aBorders = [];
+        $aStyles = $this->allStyles($spreadsheet);
+
+        foreach ($aStyles as $style) {
+            if (!isset($aBorders[$style->getBorders()->getHashCode()])) {
+                $aBorders[$style->getBorders()->getHashCode()] = $style->getBorders();
+            }
+        }
+
+        return $aBorders;
+    }
+
+    /**
+     * Get an array of all number formats.
+     *
+     * @return NumberFormat[] All number formats in PhpSpreadsheet
+     */
+    public function allNumberFormats(Spreadsheet $spreadsheet): array
+    {
+        // Get an array of unique number formats
+        $aNumFmts = [];
+        $aStyles = $this->allStyles($spreadsheet);
+
+        foreach ($aStyles as $style) {
+            if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !isset($aNumFmts[$style->getNumberFormat()->getHashCode()])) {
+                $aNumFmts[$style->getNumberFormat()->getHashCode()] = $style->getNumberFormat();
+            }
+        }
+
+        return $aNumFmts;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Table.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Table.php
new file mode 100644
index 00000000..f88b2a04
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Table.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table as WorksheetTable;
+
+class Table extends WriterPart
+{
+    /**
+     * Write Table to XML format.
+     *
+     * @param int $tableRef Table ID
+     *
+     * @return string XML Output
+     */
+    public function writeTable(WorksheetTable $table, int $tableRef): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Table
+        $name = 'Table' . $tableRef;
+        $range = $table->getRange();
+
+        $objWriter->startElement('table');
+        $objWriter->writeAttribute('xml:space', 'preserve');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('id', (string) $tableRef);
+        $objWriter->writeAttribute('name', $name);
+        $objWriter->writeAttribute('displayName', $table->getName() ?: $name);
+        $objWriter->writeAttribute('ref', $range);
+        $objWriter->writeAttribute('headerRowCount', $table->getShowHeaderRow() ? '1' : '0');
+        $objWriter->writeAttribute('totalsRowCount', $table->getShowTotalsRow() ? '1' : '0');
+
+        // Table Boundaries
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($table->getRange());
+
+        // Table Auto Filter
+        if ($table->getShowHeaderRow() && $table->getAllowFilter() === true) {
+            $objWriter->startElement('autoFilter');
+            $objWriter->writeAttribute('ref', $range);
+            foreach (range($rangeStart[0], $rangeEnd[0]) as $offset => $columnIndex) {
+                $column = $table->getColumnByOffset($offset);
+
+                if (!$column->getShowFilterButton()) {
+                    $objWriter->startElement('filterColumn');
+                    $objWriter->writeAttribute('colId', (string) $offset);
+                    $objWriter->writeAttribute('hiddenButton', '1');
+                    $objWriter->endElement();
+                } else {
+                    $column = $table->getAutoFilter()->getColumnByOffset($offset);
+                    AutoFilter::writeAutoFilterColumn($objWriter, $column, $offset);
+                }
+            }
+            $objWriter->endElement(); // autoFilter
+        }
+
+        // Table Columns
+        $objWriter->startElement('tableColumns');
+        $objWriter->writeAttribute('count', (string) ($rangeEnd[0] - $rangeStart[0] + 1));
+        foreach (range($rangeStart[0], $rangeEnd[0]) as $offset => $columnIndex) {
+            $worksheet = $table->getWorksheet();
+            if (!$worksheet) {
+                continue;
+            }
+
+            $column = $table->getColumnByOffset($offset);
+            $cell = $worksheet->getCell([$columnIndex, $rangeStart[1]]);
+
+            $objWriter->startElement('tableColumn');
+            $objWriter->writeAttribute('id', (string) ($offset + 1));
+            $objWriter->writeAttribute('name', $table->getShowHeaderRow() ? $cell->getValueString() : ('Column' . ($offset + 1)));
+
+            if ($table->getShowTotalsRow()) {
+                if ($column->getTotalsRowLabel()) {
+                    $objWriter->writeAttribute('totalsRowLabel', $column->getTotalsRowLabel());
+                }
+                if ($column->getTotalsRowFunction()) {
+                    $objWriter->writeAttribute('totalsRowFunction', $column->getTotalsRowFunction());
+                }
+            }
+            if ($column->getColumnFormula()) {
+                $objWriter->writeElement('calculatedColumnFormula', $column->getColumnFormula());
+            }
+
+            $objWriter->endElement();
+        }
+        $objWriter->endElement();
+
+        // Table Styles
+        $objWriter->startElement('tableStyleInfo');
+        $objWriter->writeAttribute('name', $table->getStyle()->getTheme());
+        $objWriter->writeAttribute('showFirstColumn', $table->getStyle()->getShowFirstColumn() ? '1' : '0');
+        $objWriter->writeAttribute('showLastColumn', $table->getStyle()->getShowLastColumn() ? '1' : '0');
+        $objWriter->writeAttribute('showRowStripes', $table->getStyle()->getShowRowStripes() ? '1' : '0');
+        $objWriter->writeAttribute('showColumnStripes', $table->getStyle()->getShowColumnStripes() ? '1' : '0');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php
new file mode 100644
index 00000000..abacd411
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php
@@ -0,0 +1,744 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Theme as SpreadsheetTheme;
+
+class Theme extends WriterPart
+{
+    /**
+     * Write theme to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeTheme(Spreadsheet $spreadsheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+        $theme = $spreadsheet->getTheme();
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // a:theme
+        $objWriter->startElement('a:theme');
+        $objWriter->writeAttribute('xmlns:a', Namespaces::DRAWINGML);
+        $objWriter->writeAttribute('name', 'Office Theme');
+
+        // a:themeElements
+        $objWriter->startElement('a:themeElements');
+
+        // a:clrScheme
+        $objWriter->startElement('a:clrScheme');
+        $objWriter->writeAttribute('name', $theme->getThemeColorName());
+
+        $this->writeColourScheme($objWriter, $theme);
+
+        $objWriter->endElement();
+
+        // a:fontScheme
+        $objWriter->startElement('a:fontScheme');
+        $objWriter->writeAttribute('name', $theme->getThemeFontName());
+
+        // a:majorFont
+        $objWriter->startElement('a:majorFont');
+        $this->writeFonts(
+            $objWriter,
+            $theme->getMajorFontLatin(),
+            $theme->getMajorFontEastAsian(),
+            $theme->getMajorFontComplexScript(),
+            $theme->getMajorFontSubstitutions()
+        );
+        $objWriter->endElement(); // a:majorFont
+
+        // a:minorFont
+        $objWriter->startElement('a:minorFont');
+        $this->writeFonts(
+            $objWriter,
+            $theme->getMinorFontLatin(),
+            $theme->getMinorFontEastAsian(),
+            $theme->getMinorFontComplexScript(),
+            $theme->getMinorFontSubstitutions()
+        );
+        $objWriter->endElement(); // a:minorFont
+
+        $objWriter->endElement(); // a:fontScheme
+
+        // a:fmtScheme
+        $objWriter->startElement('a:fmtScheme');
+        $objWriter->writeAttribute('name', 'Office');
+
+        // a:fillStyleLst
+        $objWriter->startElement('a:fillStyleLst');
+
+        // a:solidFill
+        $objWriter->startElement('a:solidFill');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gradFill
+        $objWriter->startElement('a:gradFill');
+        $objWriter->writeAttribute('rotWithShape', '1');
+
+        // a:gsLst
+        $objWriter->startElement('a:gsLst');
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '0');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:tint
+        $objWriter->startElement('a:tint');
+        $objWriter->writeAttribute('val', '50000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '300000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '35000');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:tint
+        $objWriter->startElement('a:tint');
+        $objWriter->writeAttribute('val', '37000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '300000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '100000');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:tint
+        $objWriter->startElement('a:tint');
+        $objWriter->writeAttribute('val', '15000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '350000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:lin
+        $objWriter->startElement('a:lin');
+        $objWriter->writeAttribute('ang', '16200000');
+        $objWriter->writeAttribute('scaled', '1');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gradFill
+        $objWriter->startElement('a:gradFill');
+        $objWriter->writeAttribute('rotWithShape', '1');
+
+        // a:gsLst
+        $objWriter->startElement('a:gsLst');
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '0');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:shade
+        $objWriter->startElement('a:shade');
+        $objWriter->writeAttribute('val', '51000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '130000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '80000');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:shade
+        $objWriter->startElement('a:shade');
+        $objWriter->writeAttribute('val', '93000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '130000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '100000');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:shade
+        $objWriter->startElement('a:shade');
+        $objWriter->writeAttribute('val', '94000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '135000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:lin
+        $objWriter->startElement('a:lin');
+        $objWriter->writeAttribute('ang', '16200000');
+        $objWriter->writeAttribute('scaled', '0');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:lnStyleLst
+        $objWriter->startElement('a:lnStyleLst');
+
+        // a:ln
+        $objWriter->startElement('a:ln');
+        $objWriter->writeAttribute('w', '9525');
+        $objWriter->writeAttribute('cap', 'flat');
+        $objWriter->writeAttribute('cmpd', 'sng');
+        $objWriter->writeAttribute('algn', 'ctr');
+
+        // a:solidFill
+        $objWriter->startElement('a:solidFill');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:shade
+        $objWriter->startElement('a:shade');
+        $objWriter->writeAttribute('val', '95000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '105000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:prstDash
+        $objWriter->startElement('a:prstDash');
+        $objWriter->writeAttribute('val', 'solid');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:ln
+        $objWriter->startElement('a:ln');
+        $objWriter->writeAttribute('w', '25400');
+        $objWriter->writeAttribute('cap', 'flat');
+        $objWriter->writeAttribute('cmpd', 'sng');
+        $objWriter->writeAttribute('algn', 'ctr');
+
+        // a:solidFill
+        $objWriter->startElement('a:solidFill');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:prstDash
+        $objWriter->startElement('a:prstDash');
+        $objWriter->writeAttribute('val', 'solid');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:ln
+        $objWriter->startElement('a:ln');
+        $objWriter->writeAttribute('w', '38100');
+        $objWriter->writeAttribute('cap', 'flat');
+        $objWriter->writeAttribute('cmpd', 'sng');
+        $objWriter->writeAttribute('algn', 'ctr');
+
+        // a:solidFill
+        $objWriter->startElement('a:solidFill');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:prstDash
+        $objWriter->startElement('a:prstDash');
+        $objWriter->writeAttribute('val', 'solid');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:effectStyleLst
+        $objWriter->startElement('a:effectStyleLst');
+
+        // a:effectStyle
+        $objWriter->startElement('a:effectStyle');
+
+        // a:effectLst
+        $objWriter->startElement('a:effectLst');
+
+        // a:outerShdw
+        $objWriter->startElement('a:outerShdw');
+        $objWriter->writeAttribute('blurRad', '40000');
+        $objWriter->writeAttribute('dist', '20000');
+        $objWriter->writeAttribute('dir', '5400000');
+        $objWriter->writeAttribute('rotWithShape', '0');
+
+        // a:srgbClr
+        $objWriter->startElement('a:srgbClr');
+        $objWriter->writeAttribute('val', '000000');
+
+        // a:alpha
+        $objWriter->startElement('a:alpha');
+        $objWriter->writeAttribute('val', '38000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:effectStyle
+        $objWriter->startElement('a:effectStyle');
+
+        // a:effectLst
+        $objWriter->startElement('a:effectLst');
+
+        // a:outerShdw
+        $objWriter->startElement('a:outerShdw');
+        $objWriter->writeAttribute('blurRad', '40000');
+        $objWriter->writeAttribute('dist', '23000');
+        $objWriter->writeAttribute('dir', '5400000');
+        $objWriter->writeAttribute('rotWithShape', '0');
+
+        // a:srgbClr
+        $objWriter->startElement('a:srgbClr');
+        $objWriter->writeAttribute('val', '000000');
+
+        // a:alpha
+        $objWriter->startElement('a:alpha');
+        $objWriter->writeAttribute('val', '35000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:effectStyle
+        $objWriter->startElement('a:effectStyle');
+
+        // a:effectLst
+        $objWriter->startElement('a:effectLst');
+
+        // a:outerShdw
+        $objWriter->startElement('a:outerShdw');
+        $objWriter->writeAttribute('blurRad', '40000');
+        $objWriter->writeAttribute('dist', '23000');
+        $objWriter->writeAttribute('dir', '5400000');
+        $objWriter->writeAttribute('rotWithShape', '0');
+
+        // a:srgbClr
+        $objWriter->startElement('a:srgbClr');
+        $objWriter->writeAttribute('val', '000000');
+
+        // a:alpha
+        $objWriter->startElement('a:alpha');
+        $objWriter->writeAttribute('val', '35000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:scene3d
+        $objWriter->startElement('a:scene3d');
+
+        // a:camera
+        $objWriter->startElement('a:camera');
+        $objWriter->writeAttribute('prst', 'orthographicFront');
+
+        // a:rot
+        $objWriter->startElement('a:rot');
+        $objWriter->writeAttribute('lat', '0');
+        $objWriter->writeAttribute('lon', '0');
+        $objWriter->writeAttribute('rev', '0');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:lightRig
+        $objWriter->startElement('a:lightRig');
+        $objWriter->writeAttribute('rig', 'threePt');
+        $objWriter->writeAttribute('dir', 't');
+
+        // a:rot
+        $objWriter->startElement('a:rot');
+        $objWriter->writeAttribute('lat', '0');
+        $objWriter->writeAttribute('lon', '0');
+        $objWriter->writeAttribute('rev', '1200000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:sp3d
+        $objWriter->startElement('a:sp3d');
+
+        // a:bevelT
+        $objWriter->startElement('a:bevelT');
+        $objWriter->writeAttribute('w', '63500');
+        $objWriter->writeAttribute('h', '25400');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:bgFillStyleLst
+        $objWriter->startElement('a:bgFillStyleLst');
+
+        // a:solidFill
+        $objWriter->startElement('a:solidFill');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gradFill
+        $objWriter->startElement('a:gradFill');
+        $objWriter->writeAttribute('rotWithShape', '1');
+
+        // a:gsLst
+        $objWriter->startElement('a:gsLst');
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '0');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:tint
+        $objWriter->startElement('a:tint');
+        $objWriter->writeAttribute('val', '40000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '350000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '40000');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:tint
+        $objWriter->startElement('a:tint');
+        $objWriter->writeAttribute('val', '45000');
+        $objWriter->endElement();
+
+        // a:shade
+        $objWriter->startElement('a:shade');
+        $objWriter->writeAttribute('val', '99000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '350000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '100000');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:shade
+        $objWriter->startElement('a:shade');
+        $objWriter->writeAttribute('val', '20000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '255000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:path
+        $objWriter->startElement('a:path');
+        $objWriter->writeAttribute('path', 'circle');
+
+        // a:fillToRect
+        $objWriter->startElement('a:fillToRect');
+        $objWriter->writeAttribute('l', '50000');
+        $objWriter->writeAttribute('t', '-80000');
+        $objWriter->writeAttribute('r', '50000');
+        $objWriter->writeAttribute('b', '180000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gradFill
+        $objWriter->startElement('a:gradFill');
+        $objWriter->writeAttribute('rotWithShape', '1');
+
+        // a:gsLst
+        $objWriter->startElement('a:gsLst');
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '0');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:tint
+        $objWriter->startElement('a:tint');
+        $objWriter->writeAttribute('val', '80000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '300000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:gs
+        $objWriter->startElement('a:gs');
+        $objWriter->writeAttribute('pos', '100000');
+
+        // a:schemeClr
+        $objWriter->startElement('a:schemeClr');
+        $objWriter->writeAttribute('val', 'phClr');
+
+        // a:shade
+        $objWriter->startElement('a:shade');
+        $objWriter->writeAttribute('val', '30000');
+        $objWriter->endElement();
+
+        // a:satMod
+        $objWriter->startElement('a:satMod');
+        $objWriter->writeAttribute('val', '200000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:path
+        $objWriter->startElement('a:path');
+        $objWriter->writeAttribute('path', 'circle');
+
+        // a:fillToRect
+        $objWriter->startElement('a:fillToRect');
+        $objWriter->writeAttribute('l', '50000');
+        $objWriter->writeAttribute('t', '50000');
+        $objWriter->writeAttribute('r', '50000');
+        $objWriter->writeAttribute('b', '50000');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // a:objectDefaults
+        $objWriter->writeElement('a:objectDefaults', null);
+
+        // a:extraClrSchemeLst
+        $objWriter->writeElement('a:extraClrSchemeLst', null);
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write fonts to XML format.
+     *
+     * @param string[] $fontSet
+     */
+    private function writeFonts(XMLWriter $objWriter, string $latinFont, string $eastAsianFont, string $complexScriptFont, array $fontSet): void
+    {
+        // a:latin
+        $objWriter->startElement('a:latin');
+        $objWriter->writeAttribute('typeface', $latinFont);
+        $objWriter->endElement();
+
+        // a:ea
+        $objWriter->startElement('a:ea');
+        $objWriter->writeAttribute('typeface', $eastAsianFont);
+        $objWriter->endElement();
+
+        // a:cs
+        $objWriter->startElement('a:cs');
+        $objWriter->writeAttribute('typeface', $complexScriptFont);
+        $objWriter->endElement();
+
+        foreach ($fontSet as $fontScript => $typeface) {
+            $objWriter->startElement('a:font');
+            $objWriter->writeAttribute('script', $fontScript);
+            $objWriter->writeAttribute('typeface', $typeface);
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write colour scheme to XML format.
+     */
+    private function writeColourScheme(XMLWriter $objWriter, SpreadsheetTheme $theme): void
+    {
+        $themeArray = $theme->getThemeColors();
+        // a:dk1
+        $objWriter->startElement('a:dk1');
+        $objWriter->startElement('a:sysClr');
+        $objWriter->writeAttribute('val', 'windowText');
+        $objWriter->writeAttribute('lastClr', $themeArray['dk1'] ?? '000000');
+        $objWriter->endElement(); // a:sysClr
+        $objWriter->endElement(); // a:dk1
+
+        // a:lt1
+        $objWriter->startElement('a:lt1');
+        $objWriter->startElement('a:sysClr');
+        $objWriter->writeAttribute('val', 'window');
+        $objWriter->writeAttribute('lastClr', $themeArray['lt1'] ?? 'FFFFFF');
+        $objWriter->endElement(); // a:sysClr
+        $objWriter->endElement(); // a:lt1
+
+        foreach ($themeArray as $colourName => $colourValue) {
+            if ($colourName !== 'dk1' && $colourName !== 'lt1') {
+                $objWriter->startElement('a:' . $colourName);
+                $objWriter->startElement('a:srgbClr');
+                $objWriter->writeAttribute('val', $colourValue);
+                $objWriter->endElement(); // a:srgbClr
+                $objWriter->endElement(); // a:$colourName
+            }
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
new file mode 100644
index 00000000..0cdfb3cd
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
@@ -0,0 +1,214 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\DefinedNames as DefinedNamesWriter;
+
+class Workbook extends WriterPart
+{
+    /**
+     * Write workbook to XML format.
+     *
+     * @param bool $recalcRequired Indicate whether formulas should be recalculated before writing
+     *
+     * @return string XML Output
+     */
+    public function writeWorkbook(Spreadsheet $spreadsheet, bool $recalcRequired = false): string
+    {
+        // Create XML writer
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // workbook
+        $objWriter->startElement('workbook');
+        $objWriter->writeAttribute('xml:space', 'preserve');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
+
+        // fileVersion
+        $this->writeFileVersion($objWriter);
+
+        // workbookPr
+        $this->writeWorkbookPr($objWriter, $spreadsheet);
+
+        // workbookProtection
+        $this->writeWorkbookProtection($objWriter, $spreadsheet);
+
+        // bookViews
+        if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
+            $this->writeBookViews($objWriter, $spreadsheet);
+        }
+
+        // sheets
+        $this->writeSheets($objWriter, $spreadsheet);
+
+        // definedNames
+        (new DefinedNamesWriter($objWriter, $spreadsheet))->write();
+
+        // calcPr
+        $this->writeCalcPr($objWriter, $recalcRequired);
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    /**
+     * Write file version.
+     */
+    private function writeFileVersion(XMLWriter $objWriter): void
+    {
+        $objWriter->startElement('fileVersion');
+        $objWriter->writeAttribute('appName', 'xl');
+        $objWriter->writeAttribute('lastEdited', '4');
+        $objWriter->writeAttribute('lowestEdited', '4');
+        $objWriter->writeAttribute('rupBuild', '4505');
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write WorkbookPr.
+     */
+    private function writeWorkbookPr(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
+    {
+        $objWriter->startElement('workbookPr');
+
+        if ($spreadsheet->getExcelCalendar() === Date::CALENDAR_MAC_1904) {
+            $objWriter->writeAttribute('date1904', '1');
+        }
+
+        $objWriter->writeAttribute('codeName', 'ThisWorkbook');
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write BookViews.
+     */
+    private function writeBookViews(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
+    {
+        // bookViews
+        $objWriter->startElement('bookViews');
+
+        // workbookView
+        $objWriter->startElement('workbookView');
+
+        $objWriter->writeAttribute('activeTab', (string) $spreadsheet->getActiveSheetIndex());
+        $objWriter->writeAttribute('autoFilterDateGrouping', ($spreadsheet->getAutoFilterDateGrouping() ? 'true' : 'false'));
+        $objWriter->writeAttribute('firstSheet', (string) $spreadsheet->getFirstSheetIndex());
+        $objWriter->writeAttribute('minimized', ($spreadsheet->getMinimized() ? 'true' : 'false'));
+        $objWriter->writeAttribute('showHorizontalScroll', ($spreadsheet->getShowHorizontalScroll() ? 'true' : 'false'));
+        $objWriter->writeAttribute('showSheetTabs', ($spreadsheet->getShowSheetTabs() ? 'true' : 'false'));
+        $objWriter->writeAttribute('showVerticalScroll', ($spreadsheet->getShowVerticalScroll() ? 'true' : 'false'));
+        $objWriter->writeAttribute('tabRatio', (string) $spreadsheet->getTabRatio());
+        $objWriter->writeAttribute('visibility', $spreadsheet->getVisibility());
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write WorkbookProtection.
+     */
+    private function writeWorkbookProtection(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
+    {
+        if ($spreadsheet->getSecurity()->isSecurityEnabled()) {
+            $objWriter->startElement('workbookProtection');
+            $objWriter->writeAttribute('lockRevision', ($spreadsheet->getSecurity()->getLockRevision() ? 'true' : 'false'));
+            $objWriter->writeAttribute('lockStructure', ($spreadsheet->getSecurity()->getLockStructure() ? 'true' : 'false'));
+            $objWriter->writeAttribute('lockWindows', ($spreadsheet->getSecurity()->getLockWindows() ? 'true' : 'false'));
+
+            if ($spreadsheet->getSecurity()->getRevisionsPassword() != '') {
+                $objWriter->writeAttribute('revisionsPassword', $spreadsheet->getSecurity()->getRevisionsPassword());
+            }
+
+            if ($spreadsheet->getSecurity()->getWorkbookPassword() != '') {
+                $objWriter->writeAttribute('workbookPassword', $spreadsheet->getSecurity()->getWorkbookPassword());
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write calcPr.
+     *
+     * @param bool $recalcRequired Indicate whether formulas should be recalculated before writing
+     */
+    private function writeCalcPr(XMLWriter $objWriter, bool $recalcRequired = true): void
+    {
+        $objWriter->startElement('calcPr');
+
+        //    Set the calcid to a higher value than Excel itself will use, otherwise Excel will always recalc
+        //  If MS Excel does do a recalc, then users opening a file in MS Excel will be prompted to save on exit
+        //     because the file has changed
+        $objWriter->writeAttribute('calcId', '999999');
+        $objWriter->writeAttribute('calcMode', 'auto');
+        //    fullCalcOnLoad isn't needed if we've recalculating for the save
+        $objWriter->writeAttribute('calcCompleted', ($recalcRequired) ? '1' : '0');
+        $objWriter->writeAttribute('fullCalcOnLoad', ($recalcRequired) ? '0' : '1');
+        $objWriter->writeAttribute('forceFullCalc', ($recalcRequired) ? '0' : '1');
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write sheets.
+     */
+    private function writeSheets(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
+    {
+        // Write sheets
+        $objWriter->startElement('sheets');
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            // sheet
+            $this->writeSheet(
+                $objWriter,
+                $spreadsheet->getSheet($i)->getTitle(),
+                ($i + 1),
+                ($i + 1 + 3),
+                $spreadsheet->getSheet($i)->getSheetState()
+            );
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write sheet.
+     *
+     * @param string $worksheetName Sheet name
+     * @param int $worksheetId Sheet id
+     * @param int $relId Relationship ID
+     * @param string $sheetState Sheet state (visible, hidden, veryHidden)
+     */
+    private function writeSheet(XMLWriter $objWriter, string $worksheetName, int $worksheetId = 1, int $relId = 1, string $sheetState = 'visible'): void
+    {
+        if ($worksheetName != '') {
+            // Write sheet
+            $objWriter->startElement('sheet');
+            $objWriter->writeAttribute('name', $worksheetName);
+            $objWriter->writeAttribute('sheetId', (string) $worksheetId);
+            if ($sheetState !== 'visible' && $sheetState != '') {
+                $objWriter->writeAttribute('state', $sheetState);
+            }
+            $objWriter->writeAttribute('r:id', 'rId' . $relId);
+            $objWriter->endElement();
+        } else {
+            throw new WriterException('Invalid parameters passed.');
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
new file mode 100644
index 00000000..bd6eec36
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -0,0 +1,1655 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalColorScale;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalDataBar;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormattingRuleExtension;
+use PhpOffice\PhpSpreadsheet\Worksheet\RowDimension;
+use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as PhpspreadsheetWorksheet;
+
+class Worksheet extends WriterPart
+{
+    private string $numberStoredAsText = '';
+
+    private string $formula = '';
+
+    private string $twoDigitTextYear = '';
+
+    private string $evalError = '';
+
+    private bool $explicitStyle0;
+
+    /**
+     * Write worksheet to XML format.
+     *
+     * @param string[] $stringTable
+     * @param bool $includeCharts Flag indicating if we should write charts
+     *
+     * @return string XML Output
+     */
+    public function writeWorksheet(PhpspreadsheetWorksheet $worksheet, array $stringTable = [], bool $includeCharts = false): string
+    {
+        $this->explicitStyle0 = $this->getParentWriter()->getExplicitStyle0();
+        $this->numberStoredAsText = '';
+        $this->formula = '';
+        $this->twoDigitTextYear = '';
+        $this->evalError = '';
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Worksheet
+        $objWriter->startElement('worksheet');
+        $objWriter->writeAttribute('xml:space', 'preserve');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
+
+        $objWriter->writeAttribute('xmlns:xdr', Namespaces::SPREADSHEET_DRAWING);
+        $objWriter->writeAttribute('xmlns:x14', Namespaces::DATA_VALIDATIONS1);
+        $objWriter->writeAttribute('xmlns:xm', Namespaces::DATA_VALIDATIONS2);
+        $objWriter->writeAttribute('xmlns:mc', Namespaces::COMPATIBILITY);
+        $objWriter->writeAttribute('mc:Ignorable', 'x14ac');
+        $objWriter->writeAttribute('xmlns:x14ac', Namespaces::SPREADSHEETML_AC);
+
+        // sheetPr
+        $this->writeSheetPr($objWriter, $worksheet);
+
+        // Dimension
+        $this->writeDimension($objWriter, $worksheet);
+
+        // sheetViews
+        $this->writeSheetViews($objWriter, $worksheet);
+
+        // sheetFormatPr
+        $this->writeSheetFormatPr($objWriter, $worksheet);
+
+        // cols
+        $this->writeCols($objWriter, $worksheet);
+
+        // sheetData
+        $this->writeSheetData($objWriter, $worksheet, $stringTable);
+
+        // sheetProtection
+        $this->writeSheetProtection($objWriter, $worksheet);
+
+        // protectedRanges
+        $this->writeProtectedRanges($objWriter, $worksheet);
+
+        // autoFilter
+        $this->writeAutoFilter($objWriter, $worksheet);
+
+        // mergeCells
+        $this->writeMergeCells($objWriter, $worksheet);
+
+        // conditionalFormatting
+        $this->writeConditionalFormatting($objWriter, $worksheet);
+
+        // dataValidations
+        $this->writeDataValidations($objWriter, $worksheet);
+
+        // hyperlinks
+        $this->writeHyperlinks($objWriter, $worksheet);
+
+        // Print options
+        $this->writePrintOptions($objWriter, $worksheet);
+
+        // Page margins
+        $this->writePageMargins($objWriter, $worksheet);
+
+        // Page setup
+        $this->writePageSetup($objWriter, $worksheet);
+
+        // Header / footer
+        $this->writeHeaderFooter($objWriter, $worksheet);
+
+        // Breaks
+        $this->writeBreaks($objWriter, $worksheet);
+
+        // Drawings and/or Charts
+        $this->writeDrawings($objWriter, $worksheet, $includeCharts);
+
+        // LegacyDrawing
+        $this->writeLegacyDrawing($objWriter, $worksheet);
+
+        // LegacyDrawingHF
+        $this->writeLegacyDrawingHF($objWriter, $worksheet);
+
+        // AlternateContent
+        $this->writeAlternateContent($objWriter, $worksheet);
+
+        // IgnoredErrors
+        $this->writeIgnoredErrors($objWriter);
+
+        // BackgroundImage must come after ignored, before table
+        $this->writeBackgroundImage($objWriter, $worksheet);
+
+        // Table
+        $this->writeTable($objWriter, $worksheet);
+
+        // ConditionalFormattingRuleExtensionList
+        // (Must be inserted last. Not insert last, an Excel parse error will occur)
+        $this->writeExtLst($objWriter, $worksheet);
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+
+    private function writeIgnoredError(XMLWriter $objWriter, bool &$started, string $attr, string $cells): void
+    {
+        if ($cells !== '') {
+            if (!$started) {
+                $objWriter->startElement('ignoredErrors');
+                $started = true;
+            }
+            $objWriter->startElement('ignoredError');
+            $objWriter->writeAttribute('sqref', substr($cells, 1));
+            $objWriter->writeAttribute($attr, '1');
+            $objWriter->endElement();
+        }
+    }
+
+    private function writeIgnoredErrors(XMLWriter $objWriter): void
+    {
+        $started = false;
+        $this->writeIgnoredError($objWriter, $started, 'numberStoredAsText', $this->numberStoredAsText);
+        $this->writeIgnoredError($objWriter, $started, 'formula', $this->formula);
+        $this->writeIgnoredError($objWriter, $started, 'twoDigitTextYear', $this->twoDigitTextYear);
+        $this->writeIgnoredError($objWriter, $started, 'evalError', $this->evalError);
+        if ($started) {
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write SheetPr.
+     */
+    private function writeSheetPr(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // sheetPr
+        $objWriter->startElement('sheetPr');
+        if ($worksheet->getParentOrThrow()->hasMacros()) {
+            //if the workbook have macros, we need to have codeName for the sheet
+            if (!$worksheet->hasCodeName()) {
+                $worksheet->setCodeName($worksheet->getTitle());
+            }
+            self::writeAttributeNotNull($objWriter, 'codeName', $worksheet->getCodeName());
+        }
+        $autoFilterRange = $worksheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            $objWriter->writeAttribute('filterMode', '1');
+            if (!$worksheet->getAutoFilter()->getEvaluated()) {
+                $worksheet->getAutoFilter()->showHideRows();
+            }
+        }
+        $tables = $worksheet->getTableCollection();
+        if (count($tables)) {
+            foreach ($tables as $table) {
+                if (!$table->getAutoFilter()->getEvaluated()) {
+                    $table->getAutoFilter()->showHideRows();
+                }
+            }
+        }
+
+        // tabColor
+        if ($worksheet->isTabColorSet()) {
+            $objWriter->startElement('tabColor');
+            $objWriter->writeAttribute('rgb', $worksheet->getTabColor()->getARGB() ?? '');
+            $objWriter->endElement();
+        }
+
+        // outlinePr
+        $objWriter->startElement('outlinePr');
+        $objWriter->writeAttribute('summaryBelow', ($worksheet->getShowSummaryBelow() ? '1' : '0'));
+        $objWriter->writeAttribute('summaryRight', ($worksheet->getShowSummaryRight() ? '1' : '0'));
+        $objWriter->endElement();
+
+        // pageSetUpPr
+        if ($worksheet->getPageSetup()->getFitToPage()) {
+            $objWriter->startElement('pageSetUpPr');
+            $objWriter->writeAttribute('fitToPage', '1');
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Dimension.
+     */
+    private function writeDimension(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // dimension
+        $objWriter->startElement('dimension');
+        $objWriter->writeAttribute('ref', $worksheet->calculateWorksheetDimension());
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write SheetViews.
+     */
+    private function writeSheetViews(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // sheetViews
+        $objWriter->startElement('sheetViews');
+
+        // Sheet selected?
+        $sheetSelected = false;
+        if ($this->getParentWriter()->getSpreadsheet()->getIndex($worksheet) == $this->getParentWriter()->getSpreadsheet()->getActiveSheetIndex()) {
+            $sheetSelected = true;
+        }
+
+        // sheetView
+        $objWriter->startElement('sheetView');
+        $objWriter->writeAttribute('tabSelected', $sheetSelected ? '1' : '0');
+        $objWriter->writeAttribute('workbookViewId', '0');
+
+        // Zoom scales
+        $zoomScale = $worksheet->getSheetView()->getZoomScale();
+        if ($zoomScale !== 100 && $zoomScale !== null) {
+            $objWriter->writeAttribute('zoomScale', (string) $zoomScale);
+        }
+        $zoomScale = $worksheet->getSheetView()->getZoomScaleNormal();
+        if ($zoomScale !== 100 && $zoomScale !== null) {
+            $objWriter->writeAttribute('zoomScaleNormal', (string) $zoomScale);
+        }
+        $zoomScale = $worksheet->getSheetView()->getZoomScalePageLayoutView();
+        if ($zoomScale !== 100) {
+            $objWriter->writeAttribute('zoomScalePageLayoutView', (string) $zoomScale);
+        }
+        $zoomScale = $worksheet->getSheetView()->getZoomScaleSheetLayoutView();
+        if ($zoomScale !== 100) {
+            $objWriter->writeAttribute('zoomScaleSheetLayoutView', (string) $zoomScale);
+        }
+
+        // Show zeros (Excel also writes this attribute only if set to false)
+        if ($worksheet->getSheetView()->getShowZeros() === false) {
+            $objWriter->writeAttribute('showZeros', '0');
+        }
+
+        // View Layout Type
+        if ($worksheet->getSheetView()->getView() !== SheetView::SHEETVIEW_NORMAL) {
+            $objWriter->writeAttribute('view', $worksheet->getSheetView()->getView());
+        }
+
+        // Gridlines
+        if ($worksheet->getShowGridlines()) {
+            $objWriter->writeAttribute('showGridLines', 'true');
+        } else {
+            $objWriter->writeAttribute('showGridLines', 'false');
+        }
+
+        // Row and column headers
+        if ($worksheet->getShowRowColHeaders()) {
+            $objWriter->writeAttribute('showRowColHeaders', '1');
+        } else {
+            $objWriter->writeAttribute('showRowColHeaders', '0');
+        }
+
+        // Right-to-left
+        if ($worksheet->getRightToLeft()) {
+            $objWriter->writeAttribute('rightToLeft', 'true');
+        }
+
+        $topLeftCell = $worksheet->getTopLeftCell();
+        if (!empty($topLeftCell) && $worksheet->getPaneState() !== PhpspreadsheetWorksheet::PANE_FROZEN && $worksheet->getPaneState() !== PhpspreadsheetWorksheet::PANE_FROZENSPLIT) {
+            $objWriter->writeAttribute('topLeftCell', $topLeftCell);
+        }
+        $activeCell = $worksheet->getActiveCell();
+        $sqref = $worksheet->getSelectedCells();
+
+        // Pane
+        if ($worksheet->usesPanes()) {
+            $objWriter->startElement('pane');
+            $xSplit = $worksheet->getXSplit();
+            $ySplit = $worksheet->getYSplit();
+            $pane = $worksheet->getActivePane();
+            $paneTopLeftCell = $worksheet->getPaneTopLeftCell();
+            $paneState = $worksheet->getPaneState();
+            $normalFreeze = '';
+            if ($paneState === PhpspreadsheetWorksheet::PANE_FROZEN) {
+                if ($ySplit > 0) {
+                    $normalFreeze = ($xSplit <= 0) ? 'bottomLeft' : 'bottomRight';
+                } else {
+                    $normalFreeze = 'topRight';
+                }
+            }
+            if ($xSplit > 0) {
+                $objWriter->writeAttribute('xSplit', "$xSplit");
+            }
+            if ($ySplit > 0) {
+                $objWriter->writeAttribute('ySplit', "$ySplit");
+            }
+            if ($normalFreeze !== '') {
+                $objWriter->writeAttribute('activePane', $normalFreeze);
+            } elseif ($pane !== '') {
+                $objWriter->writeAttribute('activePane', $pane);
+            }
+            if ($paneState !== '') {
+                $objWriter->writeAttribute('state', $paneState);
+            }
+            if ($paneTopLeftCell !== '') {
+                $objWriter->writeAttribute('topLeftCell', $paneTopLeftCell);
+            }
+            $objWriter->endElement(); // pane
+
+            if ($normalFreeze !== '') {
+                $objWriter->startElement('selection');
+                $objWriter->writeAttribute('pane', $normalFreeze);
+                if ($activeCell !== '') {
+                    $objWriter->writeAttribute('activeCell', $activeCell);
+                }
+                if ($sqref !== '') {
+                    $objWriter->writeAttribute('sqref', $sqref);
+                }
+                $objWriter->endElement(); // selection
+                $sqref = $activeCell = '';
+            } else {
+                foreach ($worksheet->getPanes() as $panex) {
+                    if ($panex !== null) {
+                        $sqref = $activeCell = '';
+                        $objWriter->startElement('selection');
+                        $objWriter->writeAttribute('pane', $panex->getPosition());
+                        $activeCellPane = $panex->getActiveCell();
+                        if ($activeCellPane !== '') {
+                            $objWriter->writeAttribute('activeCell', $activeCellPane);
+                        }
+                        $sqrefPane = $panex->getSqref();
+                        if ($sqrefPane !== '') {
+                            $objWriter->writeAttribute('sqref', $sqrefPane);
+                        }
+                        $objWriter->endElement(); // selection
+                    }
+                }
+            }
+        }
+
+        // Selection
+        // Only need to write selection element if we have a split pane
+        // We cheat a little by over-riding the active cell selection, setting it to the split cell
+        if (!empty($sqref) || !empty($activeCell)) {
+            $objWriter->startElement('selection');
+            if (!empty($activeCell)) {
+                $objWriter->writeAttribute('activeCell', $activeCell);
+            }
+            if (!empty($sqref)) {
+                $objWriter->writeAttribute('sqref', $sqref);
+            }
+            $objWriter->endElement(); // selection
+        }
+
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write SheetFormatPr.
+     */
+    private function writeSheetFormatPr(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // sheetFormatPr
+        $objWriter->startElement('sheetFormatPr');
+
+        // Default row height
+        if ($worksheet->getDefaultRowDimension()->getRowHeight() >= 0) {
+            $objWriter->writeAttribute('customHeight', 'true');
+            $objWriter->writeAttribute('defaultRowHeight', StringHelper::formatNumber($worksheet->getDefaultRowDimension()->getRowHeight()));
+        } else {
+            $objWriter->writeAttribute('defaultRowHeight', '14.4');
+        }
+
+        // Set Zero Height row
+        if ($worksheet->getDefaultRowDimension()->getZeroHeight()) {
+            $objWriter->writeAttribute('zeroHeight', '1');
+        }
+
+        // Default column width
+        if ($worksheet->getDefaultColumnDimension()->getWidth() >= 0) {
+            $objWriter->writeAttribute('defaultColWidth', StringHelper::formatNumber($worksheet->getDefaultColumnDimension()->getWidth()));
+        }
+
+        // Outline level - row
+        $outlineLevelRow = 0;
+        foreach ($worksheet->getRowDimensions() as $dimension) {
+            if ($dimension->getOutlineLevel() > $outlineLevelRow) {
+                $outlineLevelRow = $dimension->getOutlineLevel();
+            }
+        }
+        $objWriter->writeAttribute('outlineLevelRow', (string) (int) $outlineLevelRow);
+
+        // Outline level - column
+        $outlineLevelCol = 0;
+        foreach ($worksheet->getColumnDimensions() as $dimension) {
+            if ($dimension->getOutlineLevel() > $outlineLevelCol) {
+                $outlineLevelCol = $dimension->getOutlineLevel();
+            }
+        }
+        $objWriter->writeAttribute('outlineLevelCol', (string) (int) $outlineLevelCol);
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Cols.
+     */
+    private function writeCols(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // cols
+        if (count($worksheet->getColumnDimensions()) > 0) {
+            $objWriter->startElement('cols');
+
+            $worksheet->calculateColumnWidths();
+
+            // Loop through column dimensions
+            foreach ($worksheet->getColumnDimensions() as $colDimension) {
+                // col
+                $objWriter->startElement('col');
+                $objWriter->writeAttribute('min', (string) Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
+                $objWriter->writeAttribute('max', (string) Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
+
+                if ($colDimension->getWidth() < 0) {
+                    // No width set, apply default of 10
+                    $objWriter->writeAttribute('width', '9.10');
+                } else {
+                    // Width set
+                    $objWriter->writeAttribute('width', StringHelper::formatNumber($colDimension->getWidth()));
+                }
+
+                // Column visibility
+                if ($colDimension->getVisible() === false) {
+                    $objWriter->writeAttribute('hidden', 'true');
+                }
+
+                // Auto size?
+                if ($colDimension->getAutoSize()) {
+                    $objWriter->writeAttribute('bestFit', 'true');
+                }
+
+                // Custom width?
+                if ($colDimension->getWidth() != $worksheet->getDefaultColumnDimension()->getWidth()) {
+                    $objWriter->writeAttribute('customWidth', 'true');
+                }
+
+                // Collapsed
+                if ($colDimension->getCollapsed() === true) {
+                    $objWriter->writeAttribute('collapsed', 'true');
+                }
+
+                // Outline level
+                if ($colDimension->getOutlineLevel() > 0) {
+                    $objWriter->writeAttribute('outlineLevel', (string) $colDimension->getOutlineLevel());
+                }
+
+                // Style
+                $objWriter->writeAttribute('style', (string) $colDimension->getXfIndex());
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write SheetProtection.
+     */
+    private function writeSheetProtection(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        $protection = $worksheet->getProtection();
+        if (!$protection->isProtectionEnabled()) {
+            return;
+        }
+        // sheetProtection
+        $objWriter->startElement('sheetProtection');
+
+        if ($protection->getAlgorithm()) {
+            $objWriter->writeAttribute('algorithmName', $protection->getAlgorithm());
+            $objWriter->writeAttribute('hashValue', $protection->getPassword());
+            $objWriter->writeAttribute('saltValue', $protection->getSalt());
+            $objWriter->writeAttribute('spinCount', (string) $protection->getSpinCount());
+        } elseif ($protection->getPassword() !== '') {
+            $objWriter->writeAttribute('password', $protection->getPassword());
+        }
+
+        self::writeProtectionAttribute($objWriter, 'sheet', $protection->getSheet());
+        self::writeProtectionAttribute($objWriter, 'objects', $protection->getObjects());
+        self::writeProtectionAttribute($objWriter, 'scenarios', $protection->getScenarios());
+        self::writeProtectionAttribute($objWriter, 'formatCells', $protection->getFormatCells());
+        self::writeProtectionAttribute($objWriter, 'formatColumns', $protection->getFormatColumns());
+        self::writeProtectionAttribute($objWriter, 'formatRows', $protection->getFormatRows());
+        self::writeProtectionAttribute($objWriter, 'insertColumns', $protection->getInsertColumns());
+        self::writeProtectionAttribute($objWriter, 'insertRows', $protection->getInsertRows());
+        self::writeProtectionAttribute($objWriter, 'insertHyperlinks', $protection->getInsertHyperlinks());
+        self::writeProtectionAttribute($objWriter, 'deleteColumns', $protection->getDeleteColumns());
+        self::writeProtectionAttribute($objWriter, 'deleteRows', $protection->getDeleteRows());
+        self::writeProtectionAttribute($objWriter, 'sort', $protection->getSort());
+        self::writeProtectionAttribute($objWriter, 'autoFilter', $protection->getAutoFilter());
+        self::writeProtectionAttribute($objWriter, 'pivotTables', $protection->getPivotTables());
+        self::writeProtectionAttribute($objWriter, 'selectLockedCells', $protection->getSelectLockedCells());
+        self::writeProtectionAttribute($objWriter, 'selectUnlockedCells', $protection->getSelectUnlockedCells());
+        $objWriter->endElement();
+    }
+
+    private static function writeProtectionAttribute(XMLWriter $objWriter, string $name, ?bool $value): void
+    {
+        if ($value === true) {
+            $objWriter->writeAttribute($name, '1');
+        } elseif ($value === false) {
+            $objWriter->writeAttribute($name, '0');
+        }
+    }
+
+    private static function writeAttributeIf(XMLWriter $objWriter, ?bool $condition, string $attr, string $val): void
+    {
+        if ($condition) {
+            $objWriter->writeAttribute($attr, $val);
+        }
+    }
+
+    private static function writeAttributeNotNull(XMLWriter $objWriter, string $attr, ?string $val): void
+    {
+        if ($val !== null) {
+            $objWriter->writeAttribute($attr, $val);
+        }
+    }
+
+    private static function writeElementIf(XMLWriter $objWriter, bool $condition, string $attr, string $val): void
+    {
+        if ($condition) {
+            $objWriter->writeElement($attr, $val);
+        }
+    }
+
+    private static function writeOtherCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
+    {
+        $conditions = $conditional->getConditions();
+        if (
+            $conditional->getConditionType() == Conditional::CONDITION_CELLIS
+            || $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
+            || !empty($conditions)
+        ) {
+            foreach ($conditions as $formula) {
+                // Formula
+                if (is_bool($formula)) {
+                    $formula = $formula ? 'TRUE' : 'FALSE';
+                }
+                $objWriter->writeElement('formula', FunctionPrefix::addFunctionPrefix("$formula"));
+            }
+        } else {
+            if ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSBLANKS) {
+                // formula copied from ms xlsx xml source file
+                $objWriter->writeElement('formula', 'LEN(TRIM(' . $cellCoordinate . '))=0');
+            } elseif ($conditional->getConditionType() == Conditional::CONDITION_NOTCONTAINSBLANKS) {
+                // formula copied from ms xlsx xml source file
+                $objWriter->writeElement('formula', 'LEN(TRIM(' . $cellCoordinate . '))>0');
+            } elseif ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSERRORS) {
+                // formula copied from ms xlsx xml source file
+                $objWriter->writeElement('formula', 'ISERROR(' . $cellCoordinate . ')');
+            } elseif ($conditional->getConditionType() == Conditional::CONDITION_NOTCONTAINSERRORS) {
+                // formula copied from ms xlsx xml source file
+                $objWriter->writeElement('formula', 'NOT(ISERROR(' . $cellCoordinate . '))');
+            }
+        }
+    }
+
+    private static function writeTimePeriodCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
+    {
+        $txt = $conditional->getText();
+        if (!empty($txt)) {
+            $objWriter->writeAttribute('timePeriod', $txt);
+            if (empty($conditional->getConditions())) {
+                if ($conditional->getOperatorType() == Conditional::TIMEPERIOD_TODAY) {
+                    $objWriter->writeElement('formula', 'FLOOR(' . $cellCoordinate . ')=TODAY()');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_TOMORROW) {
+                    $objWriter->writeElement('formula', 'FLOOR(' . $cellCoordinate . ')=TODAY()+1');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_YESTERDAY) {
+                    $objWriter->writeElement('formula', 'FLOOR(' . $cellCoordinate . ')=TODAY()-1');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_LAST_7_DAYS) {
+                    $objWriter->writeElement('formula', 'AND(TODAY()-FLOOR(' . $cellCoordinate . ',1)<=6,FLOOR(' . $cellCoordinate . ',1)<=TODAY())');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_LAST_WEEK) {
+                    $objWriter->writeElement('formula', 'AND(TODAY()-ROUNDDOWN(' . $cellCoordinate . ',0)>=(WEEKDAY(TODAY())),TODAY()-ROUNDDOWN(' . $cellCoordinate . ',0)<(WEEKDAY(TODAY())+7))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_THIS_WEEK) {
+                    $objWriter->writeElement('formula', 'AND(TODAY()-ROUNDDOWN(' . $cellCoordinate . ',0)<=WEEKDAY(TODAY())-1,ROUNDDOWN(' . $cellCoordinate . ',0)-TODAY()<=7-WEEKDAY(TODAY()))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_NEXT_WEEK) {
+                    $objWriter->writeElement('formula', 'AND(ROUNDDOWN(' . $cellCoordinate . ',0)-TODAY()>(7-WEEKDAY(TODAY())),ROUNDDOWN(' . $cellCoordinate . ',0)-TODAY()<(15-WEEKDAY(TODAY())))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_LAST_MONTH) {
+                    $objWriter->writeElement('formula', 'AND(MONTH(' . $cellCoordinate . ')=MONTH(EDATE(TODAY(),0-1)),YEAR(' . $cellCoordinate . ')=YEAR(EDATE(TODAY(),0-1)))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_THIS_MONTH) {
+                    $objWriter->writeElement('formula', 'AND(MONTH(' . $cellCoordinate . ')=MONTH(TODAY()),YEAR(' . $cellCoordinate . ')=YEAR(TODAY()))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_NEXT_MONTH) {
+                    $objWriter->writeElement('formula', 'AND(MONTH(' . $cellCoordinate . ')=MONTH(EDATE(TODAY(),0+1)),YEAR(' . $cellCoordinate . ')=YEAR(EDATE(TODAY(),0+1)))');
+                }
+            } else {
+                $objWriter->writeElement('formula', (string) ($conditional->getConditions()[0]));
+            }
+        }
+    }
+
+    private static function writeTextCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
+    {
+        $txt = $conditional->getText();
+        if (!empty($txt)) {
+            $objWriter->writeAttribute('text', $txt);
+            if (empty($conditional->getConditions())) {
+                if ($conditional->getOperatorType() == Conditional::OPERATOR_CONTAINSTEXT) {
+                    $objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("' . $txt . '",' . $cellCoordinate . ')))');
+                } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_BEGINSWITH) {
+                    $objWriter->writeElement('formula', 'LEFT(' . $cellCoordinate . ',LEN("' . $txt . '"))="' . $txt . '"');
+                } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_ENDSWITH) {
+                    $objWriter->writeElement('formula', 'RIGHT(' . $cellCoordinate . ',LEN("' . $txt . '"))="' . $txt . '"');
+                } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_NOTCONTAINS) {
+                    $objWriter->writeElement('formula', 'ISERROR(SEARCH("' . $txt . '",' . $cellCoordinate . '))');
+                }
+            } else {
+                $objWriter->writeElement('formula', (string) ($conditional->getConditions()[0]));
+            }
+        }
+    }
+
+    private static function writeExtConditionalFormattingElements(XMLWriter $objWriter, ConditionalFormattingRuleExtension $ruleExtension): void
+    {
+        $prefix = 'x14';
+        $objWriter->startElementNs($prefix, 'conditionalFormatting', null);
+
+        $objWriter->startElementNs($prefix, 'cfRule', null);
+        $objWriter->writeAttribute('type', $ruleExtension->getCfRule());
+        $objWriter->writeAttribute('id', $ruleExtension->getId());
+        $objWriter->startElementNs($prefix, 'dataBar', null);
+        $dataBar = $ruleExtension->getDataBarExt();
+        foreach ($dataBar->getXmlAttributes() as $attrKey => $val) {
+            $objWriter->writeAttribute($attrKey, $val);
+        }
+        $minCfvo = $dataBar->getMinimumConditionalFormatValueObject();
+        if ($minCfvo !== null) {
+            $objWriter->startElementNs($prefix, 'cfvo', null);
+            $objWriter->writeAttribute('type', $minCfvo->getType());
+            if ($minCfvo->getCellFormula()) {
+                $objWriter->writeElement('xm:f', $minCfvo->getCellFormula());
+            }
+            $objWriter->endElement(); //end cfvo
+        }
+
+        $maxCfvo = $dataBar->getMaximumConditionalFormatValueObject();
+        if ($maxCfvo !== null) {
+            $objWriter->startElementNs($prefix, 'cfvo', null);
+            $objWriter->writeAttribute('type', $maxCfvo->getType());
+            if ($maxCfvo->getCellFormula()) {
+                $objWriter->writeElement('xm:f', $maxCfvo->getCellFormula());
+            }
+            $objWriter->endElement(); //end cfvo
+        }
+
+        foreach ($dataBar->getXmlElements() as $elmKey => $elmAttr) {
+            $objWriter->startElementNs($prefix, $elmKey, null);
+            foreach ($elmAttr as $attrKey => $attrVal) {
+                $objWriter->writeAttribute($attrKey, $attrVal);
+            }
+            $objWriter->endElement(); //end elmKey
+        }
+        $objWriter->endElement(); //end dataBar
+        $objWriter->endElement(); //end cfRule
+        $objWriter->writeElement('xm:sqref', $ruleExtension->getSqref());
+        $objWriter->endElement(); //end conditionalFormatting
+    }
+
+    private static function writeDataBarElements(XMLWriter $objWriter, ?ConditionalDataBar $dataBar): void
+    {
+        if ($dataBar) {
+            $objWriter->startElement('dataBar');
+            self::writeAttributeIf($objWriter, null !== $dataBar->getShowValue(), 'showValue', $dataBar->getShowValue() ? '1' : '0');
+
+            $minCfvo = $dataBar->getMinimumConditionalFormatValueObject();
+            if ($minCfvo) {
+                $objWriter->startElement('cfvo');
+                $objWriter->writeAttribute('type', $minCfvo->getType());
+                self::writeAttributeIf($objWriter, $minCfvo->getValue() !== null, 'val', (string) $minCfvo->getValue());
+                $objWriter->endElement();
+            }
+            $maxCfvo = $dataBar->getMaximumConditionalFormatValueObject();
+            if ($maxCfvo) {
+                $objWriter->startElement('cfvo');
+                $objWriter->writeAttribute('type', $maxCfvo->getType());
+                self::writeAttributeIf($objWriter, $maxCfvo->getValue() !== null, 'val', (string) $maxCfvo->getValue());
+                $objWriter->endElement();
+            }
+            if ($dataBar->getColor()) {
+                $objWriter->startElement('color');
+                $objWriter->writeAttribute('rgb', $dataBar->getColor());
+                $objWriter->endElement();
+            }
+            $objWriter->endElement(); // end dataBar
+
+            if ($dataBar->getConditionalFormattingRuleExt()) {
+                $objWriter->startElement('extLst');
+                $extension = $dataBar->getConditionalFormattingRuleExt();
+                $objWriter->startElement('ext');
+                $objWriter->writeAttribute('uri', '{B025F937-C7B1-47D3-B67F-A62EFF666E3E}');
+                $objWriter->startElementNs('x14', 'id', null);
+                $objWriter->text($extension->getId());
+                $objWriter->endElement();
+                $objWriter->endElement();
+                $objWriter->endElement(); //end extLst
+            }
+        }
+    }
+
+    private static function writeColorScaleElements(XMLWriter $objWriter, ?ConditionalColorScale $colorScale): void
+    {
+        if ($colorScale) {
+            $objWriter->startElement('colorScale');
+
+            $minCfvo = $colorScale->getMinimumConditionalFormatValueObject();
+            $minArgb = $colorScale->getMinimumColor()?->getARGB();
+            $useMin = $minCfvo !== null || $minArgb !== null;
+            if ($useMin) {
+                $objWriter->startElement('cfvo');
+                $type = 'min';
+                $value = null;
+                if ($minCfvo !== null) {
+                    $typex = $minCfvo->getType();
+                    if ($typex === 'formula') {
+                        $value = $minCfvo->getCellFormula();
+                        if ($value !== null) {
+                            $type = $typex;
+                        }
+                    } else {
+                        $type = $typex;
+                        $defaults = ['number' => '0', 'percent' => '0', 'percentile' => '10'];
+                        $value = $minCfvo->getValue() ?? $defaults[$type] ?? null;
+                    }
+                }
+                $objWriter->writeAttribute('type', $type);
+                self::writeAttributeIf($objWriter, $value !== null, 'val', (string) $value);
+                $objWriter->endElement();
+            }
+            $midCfvo = $colorScale->getMidpointConditionalFormatValueObject();
+            $midArgb = $colorScale->getMidpointColor()?->getARGB();
+            $useMid = $midCfvo !== null || $midArgb !== null;
+            if ($useMid) {
+                $objWriter->startElement('cfvo');
+                $type = 'percentile';
+                $value = '50';
+                if ($midCfvo !== null) {
+                    $type = $midCfvo->getType();
+                    if ($type === 'formula') {
+                        $value = $midCfvo->getCellFormula();
+                        if ($value === null) {
+                            $type = 'percentile';
+                            $value = '50';
+                        }
+                    } else {
+                        $defaults = ['number' => '0', 'percent' => '50', 'percentile' => '50'];
+                        $value = $midCfvo->getValue() ?? $defaults[$type] ?? null;
+                    }
+                }
+                $objWriter->writeAttribute('type', $type);
+                self::writeAttributeIf($objWriter, $value !== null, 'val', (string) $value);
+                $objWriter->endElement();
+            }
+            $maxCfvo = $colorScale->getMaximumConditionalFormatValueObject();
+            $maxArgb = $colorScale->getMaximumColor()?->getARGB();
+            $useMax = $maxCfvo !== null || $maxArgb !== null;
+            if ($useMax) {
+                $objWriter->startElement('cfvo');
+                $type = 'max';
+                $value = null;
+                if ($maxCfvo !== null) {
+                    $typex = $maxCfvo->getType();
+                    if ($typex === 'formula') {
+                        $value = $maxCfvo->getCellFormula();
+                        if ($value !== null) {
+                            $type = $typex;
+                        }
+                    } else {
+                        $type = $typex;
+                        $defaults = ['number' => '0', 'percent' => '100', 'percentile' => '90'];
+                        $value = $maxCfvo->getValue() ?? $defaults[$type] ?? null;
+                    }
+                }
+                $objWriter->writeAttribute('type', $type);
+                self::writeAttributeIf($objWriter, $value !== null, 'val', (string) $value);
+                $objWriter->endElement();
+            }
+            if ($useMin) {
+                $objWriter->startElement('color');
+                self::writeAttributeIf($objWriter, $minArgb !== null, 'rgb', "$minArgb");
+                $objWriter->endElement();
+            }
+            if ($useMid) {
+                $objWriter->startElement('color');
+                self::writeAttributeIf($objWriter, $midArgb !== null, 'rgb', "$midArgb");
+                $objWriter->endElement();
+            }
+            if ($useMax) {
+                $objWriter->startElement('color');
+                self::writeAttributeIf($objWriter, $maxArgb !== null, 'rgb', "$maxArgb");
+                $objWriter->endElement();
+            }
+            $objWriter->endElement(); // end colorScale
+        }
+    }
+
+    /**
+     * Write ConditionalFormatting.
+     */
+    private function writeConditionalFormatting(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // Conditional id
+        $id = 1;
+
+        // Loop through styles in the current worksheet
+        foreach ($worksheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+            $objWriter->startElement('conditionalFormatting');
+            // N.B. In Excel UI, intersection is space and union is comma.
+            // But in Xml, intersection is comma and union is space.
+            // Anyhow, I don't think Excel handles intersection correctly when reading.
+            $outCoordinate = Coordinate::resolveUnionAndIntersection(str_replace('$', '', $cellCoordinate), ' ');
+            $objWriter->writeAttribute('sqref', $outCoordinate);
+
+            foreach ($conditionalStyles as $conditional) {
+                // WHY was this again?
+                // if ($this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode()) == '') {
+                //    continue;
+                // }
+                // cfRule
+                $objWriter->startElement('cfRule');
+                $objWriter->writeAttribute('type', $conditional->getConditionType());
+                self::writeAttributeIf(
+                    $objWriter,
+                    ($conditional->getConditionType() !== Conditional::CONDITION_COLORSCALE
+                        && $conditional->getConditionType() !== Conditional::CONDITION_DATABAR
+                        && $conditional->getNoFormatSet() === false),
+                    'dxfId',
+                    (string) $this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode())
+                );
+                $objWriter->writeAttribute('priority', (string) $id++);
+
+                self::writeAttributeif(
+                    $objWriter,
+                    (
+                        $conditional->getConditionType() === Conditional::CONDITION_CELLIS
+                        || $conditional->getConditionType() === Conditional::CONDITION_CONTAINSTEXT
+                        || $conditional->getConditionType() === Conditional::CONDITION_NOTCONTAINSTEXT
+                        || $conditional->getConditionType() === Conditional::CONDITION_BEGINSWITH
+                        || $conditional->getConditionType() === Conditional::CONDITION_ENDSWITH
+                    ) && $conditional->getOperatorType() !== Conditional::OPERATOR_NONE,
+                    'operator',
+                    $conditional->getOperatorType()
+                );
+
+                self::writeAttributeIf($objWriter, $conditional->getStopIfTrue(), 'stopIfTrue', '1');
+
+                $cellRange = Coordinate::splitRange(str_replace('$', '', strtoupper($cellCoordinate)));
+                [$topLeftCell] = $cellRange[0];
+
+                if (
+                    $conditional->getConditionType() === Conditional::CONDITION_CONTAINSTEXT
+                    || $conditional->getConditionType() === Conditional::CONDITION_NOTCONTAINSTEXT
+                    || $conditional->getConditionType() === Conditional::CONDITION_BEGINSWITH
+                    || $conditional->getConditionType() === Conditional::CONDITION_ENDSWITH
+                ) {
+                    self::writeTextCondElements($objWriter, $conditional, $topLeftCell);
+                } elseif ($conditional->getConditionType() === Conditional::CONDITION_TIMEPERIOD) {
+                    self::writeTimePeriodCondElements($objWriter, $conditional, $topLeftCell);
+                } elseif ($conditional->getConditionType() === Conditional::CONDITION_COLORSCALE) {
+                    self::writeColorScaleElements($objWriter, $conditional->getColorScale());
+                } else {
+                    self::writeOtherCondElements($objWriter, $conditional, $topLeftCell);
+                }
+
+                //<dataBar>
+                self::writeDataBarElements($objWriter, $conditional->getDataBar());
+
+                $objWriter->endElement(); //end cfRule
+            }
+
+            $objWriter->endElement(); //end conditionalFormatting
+        }
+    }
+
+    /**
+     * Write DataValidations.
+     */
+    private function writeDataValidations(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // Datavalidation collection
+        $dataValidationCollection = $worksheet->getDataValidationCollection();
+
+        // Write data validations?
+        if (!empty($dataValidationCollection)) {
+            $dataValidationCollection = Coordinate::mergeRangesInCollection($dataValidationCollection);
+            $objWriter->startElement('dataValidations');
+            $objWriter->writeAttribute('count', (string) count($dataValidationCollection));
+
+            foreach ($dataValidationCollection as $coordinate => $dv) {
+                $objWriter->startElement('dataValidation');
+
+                if ($dv->getType() != '') {
+                    $objWriter->writeAttribute('type', $dv->getType());
+                }
+
+                if ($dv->getErrorStyle() != '') {
+                    $objWriter->writeAttribute('errorStyle', $dv->getErrorStyle());
+                }
+
+                if ($dv->getOperator() != '') {
+                    $objWriter->writeAttribute('operator', $dv->getOperator());
+                }
+
+                $objWriter->writeAttribute('allowBlank', ($dv->getAllowBlank() ? '1' : '0'));
+                $objWriter->writeAttribute('showDropDown', (!$dv->getShowDropDown() ? '1' : '0'));
+                $objWriter->writeAttribute('showInputMessage', ($dv->getShowInputMessage() ? '1' : '0'));
+                $objWriter->writeAttribute('showErrorMessage', ($dv->getShowErrorMessage() ? '1' : '0'));
+
+                if ($dv->getErrorTitle() !== '') {
+                    $objWriter->writeAttribute('errorTitle', $dv->getErrorTitle());
+                }
+                if ($dv->getError() !== '') {
+                    $objWriter->writeAttribute('error', $dv->getError());
+                }
+                if ($dv->getPromptTitle() !== '') {
+                    $objWriter->writeAttribute('promptTitle', $dv->getPromptTitle());
+                }
+                if ($dv->getPrompt() !== '') {
+                    $objWriter->writeAttribute('prompt', $dv->getPrompt());
+                }
+
+                $objWriter->writeAttribute('sqref', $dv->getSqref() ?? $coordinate);
+
+                if ($dv->getFormula1() !== '') {
+                    $objWriter->writeElement('formula1', $dv->getFormula1());
+                }
+                if ($dv->getFormula2() !== '') {
+                    $objWriter->writeElement('formula2', $dv->getFormula2());
+                }
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Hyperlinks.
+     */
+    private function writeHyperlinks(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // Hyperlink collection
+        $hyperlinkCollection = $worksheet->getHyperlinkCollection();
+
+        // Relation ID
+        $relationId = 1;
+
+        // Write hyperlinks?
+        if (!empty($hyperlinkCollection)) {
+            $objWriter->startElement('hyperlinks');
+
+            foreach ($hyperlinkCollection as $coordinate => $hyperlink) {
+                $objWriter->startElement('hyperlink');
+
+                $objWriter->writeAttribute('ref', $coordinate);
+                if (!$hyperlink->isInternal()) {
+                    $objWriter->writeAttribute('r:id', 'rId_hyperlink_' . $relationId);
+                    ++$relationId;
+                } else {
+                    $objWriter->writeAttribute('location', str_replace('sheet://', '', $hyperlink->getUrl()));
+                }
+
+                if ($hyperlink->getTooltip() !== '') {
+                    $objWriter->writeAttribute('tooltip', $hyperlink->getTooltip());
+                    $objWriter->writeAttribute('display', $hyperlink->getTooltip());
+                }
+
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write ProtectedRanges.
+     */
+    private function writeProtectedRanges(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        if (count($worksheet->getProtectedCellRanges()) > 0) {
+            // protectedRanges
+            $objWriter->startElement('protectedRanges');
+
+            // Loop protectedRanges
+            foreach ($worksheet->getProtectedCellRanges() as $protectedCell => $protectedRange) {
+                // protectedRange
+                $objWriter->startElement('protectedRange');
+                $objWriter->writeAttribute('name', $protectedRange->getName());
+                $objWriter->writeAttribute('sqref', $protectedCell);
+                $passwordHash = $protectedRange->getPassword();
+                $this->writeAttributeIf($objWriter, $passwordHash !== '', 'password', $passwordHash);
+                $securityDescriptor = $protectedRange->getSecurityDescriptor();
+                $this->writeAttributeIf($objWriter, $securityDescriptor !== '', 'securityDescriptor', $securityDescriptor);
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write MergeCells.
+     */
+    private function writeMergeCells(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        if (count($worksheet->getMergeCells()) > 0) {
+            // mergeCells
+            $objWriter->startElement('mergeCells');
+
+            // Loop mergeCells
+            foreach ($worksheet->getMergeCells() as $mergeCell) {
+                // mergeCell
+                $objWriter->startElement('mergeCell');
+                $objWriter->writeAttribute('ref', $mergeCell);
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write PrintOptions.
+     */
+    private function writePrintOptions(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // printOptions
+        $objWriter->startElement('printOptions');
+
+        $objWriter->writeAttribute('gridLines', ($worksheet->getPrintGridlines() ? 'true' : 'false'));
+        $objWriter->writeAttribute('gridLinesSet', 'true');
+
+        if ($worksheet->getPageSetup()->getHorizontalCentered()) {
+            $objWriter->writeAttribute('horizontalCentered', 'true');
+        }
+
+        if ($worksheet->getPageSetup()->getVerticalCentered()) {
+            $objWriter->writeAttribute('verticalCentered', 'true');
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write PageMargins.
+     */
+    private function writePageMargins(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // pageMargins
+        $objWriter->startElement('pageMargins');
+        $objWriter->writeAttribute('left', StringHelper::formatNumber($worksheet->getPageMargins()->getLeft()));
+        $objWriter->writeAttribute('right', StringHelper::formatNumber($worksheet->getPageMargins()->getRight()));
+        $objWriter->writeAttribute('top', StringHelper::formatNumber($worksheet->getPageMargins()->getTop()));
+        $objWriter->writeAttribute('bottom', StringHelper::formatNumber($worksheet->getPageMargins()->getBottom()));
+        $objWriter->writeAttribute('header', StringHelper::formatNumber($worksheet->getPageMargins()->getHeader()));
+        $objWriter->writeAttribute('footer', StringHelper::formatNumber($worksheet->getPageMargins()->getFooter()));
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write AutoFilter.
+     */
+    private function writeAutoFilter(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        AutoFilter::writeAutoFilter($objWriter, $worksheet);
+    }
+
+    /**
+     * Write Table.
+     */
+    private function writeTable(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        $tableCount = $worksheet->getTableCollection()->count();
+        if ($tableCount === 0) {
+            return;
+        }
+
+        $objWriter->startElement('tableParts');
+        $objWriter->writeAttribute('count', (string) $tableCount);
+
+        for ($t = 1; $t <= $tableCount; ++$t) {
+            $objWriter->startElement('tablePart');
+            $objWriter->writeAttribute('r:id', 'rId_table_' . $t);
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Background Image.
+     */
+    private function writeBackgroundImage(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        if ($worksheet->getBackgroundImage() !== '') {
+            $objWriter->startElement('picture');
+            $objWriter->writeAttribute('r:id', 'rIdBg');
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write PageSetup.
+     */
+    private function writePageSetup(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // pageSetup
+        $objWriter->startElement('pageSetup');
+        $objWriter->writeAttribute('paperSize', (string) $worksheet->getPageSetup()->getPaperSize());
+        $objWriter->writeAttribute('orientation', $worksheet->getPageSetup()->getOrientation());
+
+        if ($worksheet->getPageSetup()->getScale() !== null) {
+            $objWriter->writeAttribute('scale', (string) $worksheet->getPageSetup()->getScale());
+        }
+        if ($worksheet->getPageSetup()->getFitToHeight() !== null) {
+            $objWriter->writeAttribute('fitToHeight', (string) $worksheet->getPageSetup()->getFitToHeight());
+        } else {
+            $objWriter->writeAttribute('fitToHeight', '0');
+        }
+        if ($worksheet->getPageSetup()->getFitToWidth() !== null) {
+            $objWriter->writeAttribute('fitToWidth', (string) $worksheet->getPageSetup()->getFitToWidth());
+        } else {
+            $objWriter->writeAttribute('fitToWidth', '0');
+        }
+        if (!empty($worksheet->getPageSetup()->getFirstPageNumber())) {
+            $objWriter->writeAttribute('firstPageNumber', (string) $worksheet->getPageSetup()->getFirstPageNumber());
+            $objWriter->writeAttribute('useFirstPageNumber', '1');
+        }
+        $objWriter->writeAttribute('pageOrder', $worksheet->getPageSetup()->getPageOrder());
+
+        $getUnparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (isset($getUnparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId'])) {
+            $objWriter->writeAttribute('r:id', $getUnparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId']);
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Header / Footer.
+     */
+    private function writeHeaderFooter(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // headerFooter
+        $headerFooter = $worksheet->getHeaderFooter();
+        $oddHeader = $headerFooter->getOddHeader();
+        $oddFooter = $headerFooter->getOddFooter();
+        $evenHeader = $headerFooter->getEvenHeader();
+        $evenFooter = $headerFooter->getEvenFooter();
+        $firstHeader = $headerFooter->getFirstHeader();
+        $firstFooter = $headerFooter->getFirstFooter();
+        if ("$oddHeader$oddFooter$evenHeader$evenFooter$firstHeader$firstFooter" === '') {
+            return;
+        }
+
+        $objWriter->startElement('headerFooter');
+        $objWriter->writeAttribute('differentOddEven', ($worksheet->getHeaderFooter()->getDifferentOddEven() ? 'true' : 'false'));
+        $objWriter->writeAttribute('differentFirst', ($worksheet->getHeaderFooter()->getDifferentFirst() ? 'true' : 'false'));
+        $objWriter->writeAttribute('scaleWithDoc', ($worksheet->getHeaderFooter()->getScaleWithDocument() ? 'true' : 'false'));
+        $objWriter->writeAttribute('alignWithMargins', ($worksheet->getHeaderFooter()->getAlignWithMargins() ? 'true' : 'false'));
+
+        self::writeElementIf($objWriter, $oddHeader !== '', 'oddHeader', $oddHeader);
+        self::writeElementIf($objWriter, $oddFooter !== '', 'oddFooter', $oddFooter);
+        self::writeElementIf($objWriter, $evenHeader !== '', 'evenHeader', $evenHeader);
+        self::writeElementIf($objWriter, $evenFooter !== '', 'evenFooter', $evenFooter);
+        self::writeElementIf($objWriter, $firstHeader !== '', 'firstHeader', $firstHeader);
+        self::writeElementIf($objWriter, $firstFooter !== '', 'firstFooter', $firstFooter);
+
+        $objWriter->endElement(); // headerFooter
+    }
+
+    /**
+     * Write Breaks.
+     */
+    private function writeBreaks(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // Get row and column breaks
+        $aRowBreaks = [];
+        $aColumnBreaks = [];
+        foreach ($worksheet->getRowBreaks() as $cell => $break) {
+            $aRowBreaks[$cell] = $break;
+        }
+        foreach ($worksheet->getColumnBreaks() as $cell => $break) {
+            $aColumnBreaks[$cell] = $break;
+        }
+
+        // rowBreaks
+        if (!empty($aRowBreaks)) {
+            $objWriter->startElement('rowBreaks');
+            $objWriter->writeAttribute('count', (string) count($aRowBreaks));
+            $objWriter->writeAttribute('manualBreakCount', (string) count($aRowBreaks));
+
+            foreach ($aRowBreaks as $cell => $break) {
+                $coords = Coordinate::coordinateFromString($cell);
+
+                $objWriter->startElement('brk');
+                $objWriter->writeAttribute('id', $coords[1]);
+                $objWriter->writeAttribute('man', '1');
+                $rowBreakMax = $break->getMaxColOrRow();
+                if ($rowBreakMax >= 0) {
+                    $objWriter->writeAttribute('max', "$rowBreakMax");
+                }
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+
+        // Second, write column breaks
+        if (!empty($aColumnBreaks)) {
+            $objWriter->startElement('colBreaks');
+            $objWriter->writeAttribute('count', (string) count($aColumnBreaks));
+            $objWriter->writeAttribute('manualBreakCount', (string) count($aColumnBreaks));
+
+            foreach ($aColumnBreaks as $cell => $break) {
+                $coords = Coordinate::indexesFromString($cell);
+
+                $objWriter->startElement('brk');
+                $objWriter->writeAttribute('id', (string) ((int) $coords[0] - 1));
+                $objWriter->writeAttribute('man', '1');
+                $objWriter->endElement();
+            }
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write SheetData.
+     *
+     * @param string[] $stringTable String table
+     */
+    private function writeSheetData(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, array $stringTable): void
+    {
+        // Flipped stringtable, for faster index searching
+        $aFlippedStringTable = $this->getParentWriter()->getWriterPartstringtable()->flipStringTable($stringTable);
+
+        // sheetData
+        $objWriter->startElement('sheetData');
+
+        // Get column count
+        $colCount = Coordinate::columnIndexFromString($worksheet->getHighestColumn());
+
+        // Highest row number
+        $highestRow = $worksheet->getHighestRow();
+
+        // Loop through cells building a comma-separated list of the columns in each row
+        // This is a trade-off between the memory usage that is required for a full array of columns,
+        //      and execution speed
+        /** @var array<int, string> $cellsByRow */
+        $cellsByRow = [];
+        foreach ($worksheet->getCoordinates() as $coordinate) {
+            [$column, $row] = Coordinate::coordinateFromString($coordinate);
+            $cellsByRow[$row] = $cellsByRow[$row] ?? '';
+            $cellsByRow[$row] .= "{$column},";
+        }
+
+        $currentRow = 0;
+        $emptyDimension = new RowDimension();
+        while ($currentRow++ < $highestRow) {
+            $isRowSet = isset($cellsByRow[$currentRow]);
+            if ($isRowSet || $worksheet->rowDimensionExists($currentRow)) {
+                // Get row dimension
+                $rowDimension = $worksheet->rowDimensionExists($currentRow) ? $worksheet->getRowDimension($currentRow) : $emptyDimension;
+
+                // Write current row?
+                $writeCurrentRow = $isRowSet || $rowDimension->getRowHeight() >= 0 || $rowDimension->getVisible() === false || $rowDimension->getCollapsed() === true || $rowDimension->getOutlineLevel() > 0 || $rowDimension->getXfIndex() !== null;
+
+                if ($writeCurrentRow) {
+                    // Start a new row
+                    $objWriter->startElement('row');
+                    $objWriter->writeAttribute('r', "$currentRow");
+                    $objWriter->writeAttribute('spans', '1:' . $colCount);
+
+                    // Row dimensions
+                    if ($rowDimension->getRowHeight() >= 0) {
+                        $objWriter->writeAttribute('customHeight', '1');
+                        $objWriter->writeAttribute('ht', StringHelper::formatNumber($rowDimension->getRowHeight()));
+                    }
+
+                    // Row visibility
+                    if (!$rowDimension->getVisible() === true) {
+                        $objWriter->writeAttribute('hidden', 'true');
+                    }
+
+                    // Collapsed
+                    if ($rowDimension->getCollapsed() === true) {
+                        $objWriter->writeAttribute('collapsed', 'true');
+                    }
+
+                    // Outline level
+                    if ($rowDimension->getOutlineLevel() > 0) {
+                        $objWriter->writeAttribute('outlineLevel', (string) $rowDimension->getOutlineLevel());
+                    }
+
+                    // Style
+                    if ($rowDimension->getXfIndex() !== null) {
+                        $objWriter->writeAttribute('s', (string) $rowDimension->getXfIndex());
+                        $objWriter->writeAttribute('customFormat', '1');
+                    }
+
+                    // Write cells
+                    if (isset($cellsByRow[$currentRow])) {
+                        // We have a comma-separated list of column names (with a trailing entry); split to an array
+                        $columnsInRow = explode(',', $cellsByRow[$currentRow]);
+                        array_pop($columnsInRow);
+                        foreach ($columnsInRow as $column) {
+                            // Write cell
+                            $coord = "$column$currentRow";
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getNumberStoredAsText()) {
+                                $this->numberStoredAsText .= " $coord";
+                            }
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getFormula()) {
+                                $this->formula .= " $coord";
+                            }
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getTwoDigitTextYear()) {
+                                $this->twoDigitTextYear .= " $coord";
+                            }
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getEvalError()) {
+                                $this->evalError .= " $coord";
+                            }
+                            $this->writeCell($objWriter, $worksheet, $coord, $aFlippedStringTable);
+                        }
+                    }
+
+                    // End row
+                    $objWriter->endElement();
+                }
+            }
+        }
+
+        $objWriter->endElement();
+    }
+
+    private function writeCellInlineStr(XMLWriter $objWriter, string $mappedType, RichText|string $cellValue): void
+    {
+        $objWriter->writeAttribute('t', $mappedType);
+        if (!$cellValue instanceof RichText) {
+            $objWriter->startElement('is');
+            $objWriter->writeElement(
+                't',
+                StringHelper::controlCharacterPHP2OOXML(htmlspecialchars($cellValue, Settings::htmlEntityFlags()))
+            );
+            $objWriter->endElement();
+        } else {
+            $objWriter->startElement('is');
+            $this->getParentWriter()->getWriterPartstringtable()->writeRichText($objWriter, $cellValue);
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * @param string[] $flippedStringTable
+     */
+    private function writeCellString(XMLWriter $objWriter, string $mappedType, RichText|string $cellValue, array $flippedStringTable): void
+    {
+        $objWriter->writeAttribute('t', $mappedType);
+        if (!$cellValue instanceof RichText) {
+            self::writeElementIf($objWriter, isset($flippedStringTable[$cellValue]), 'v', $flippedStringTable[$cellValue] ?? '');
+        } else {
+            $objWriter->writeElement('v', $flippedStringTable[$cellValue->getHashCode()]);
+        }
+    }
+
+    private function writeCellNumeric(XMLWriter $objWriter, float|int $cellValue): void
+    {
+        //force a decimal to be written if the type is float
+        if (is_float($cellValue)) {
+            // force point as decimal separator in case current locale uses comma
+            $cellValue = str_replace(',', '.', (string) $cellValue);
+            if (!str_contains($cellValue, '.')) {
+                $cellValue = $cellValue . '.0';
+            }
+        }
+        $objWriter->writeElement('v', "$cellValue");
+    }
+
+    private function writeCellBoolean(XMLWriter $objWriter, string $mappedType, bool $cellValue): void
+    {
+        $objWriter->writeAttribute('t', $mappedType);
+        $objWriter->writeElement('v', $cellValue ? '1' : '0');
+    }
+
+    private function writeCellError(XMLWriter $objWriter, string $mappedType, string $cellValue, string $formulaerr = '#NULL!'): void
+    {
+        $objWriter->writeAttribute('t', $mappedType);
+        $cellIsFormula = str_starts_with($cellValue, '=');
+        self::writeElementIf($objWriter, $cellIsFormula, 'f', FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+        $objWriter->writeElement('v', $cellIsFormula ? $formulaerr : $cellValue);
+    }
+
+    private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell $cell): void
+    {
+        $calculatedValue = $this->getParentWriter()->getPreCalculateFormulas() ? $cell->getCalculatedValue() : $cellValue;
+        $calculatedValueString = $this->getParentWriter()->getPreCalculateFormulas() ? $cell->getCalculatedValueString() : $cellValue;
+        if (is_string($calculatedValue)) {
+            if (ErrorValue::isError($calculatedValue)) {
+                $this->writeCellError($objWriter, 'e', $cellValue, $calculatedValue);
+
+                return;
+            }
+            $objWriter->writeAttribute('t', 'str');
+            $calculatedValue = StringHelper::controlCharacterPHP2OOXML($calculatedValue);
+            $calculatedValueString = $calculatedValue;
+        } elseif (is_bool($calculatedValue)) {
+            $objWriter->writeAttribute('t', 'b');
+            $calculatedValue = (int) $calculatedValue;
+            $calculatedValueString = (string) $calculatedValue;
+        }
+
+        $attributes = $cell->getFormulaAttributes();
+        if (is_array($attributes) && ($attributes['t'] ?? null) === 'array') {
+            $objWriter->startElement('f');
+            $objWriter->writeAttribute('t', 'array');
+            $objWriter->writeAttribute('ref', $cell->getCoordinate());
+            $objWriter->writeAttribute('aca', '1');
+            $objWriter->writeAttribute('ca', '1');
+            $objWriter->text(FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+            $objWriter->endElement();
+        } else {
+            $objWriter->writeElement('f', FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+            self::writeElementIf(
+                $objWriter,
+                $this->getParentWriter()->getOffice2003Compatibility() === false
+                && $this->getParentWriter()->getPreCalculateFormulas()
+                && $calculatedValue !== null,
+                'v',
+                (!is_array($calculatedValue) && !str_starts_with($calculatedValueString, '#'))
+                    ? StringHelper::formatNumber($calculatedValueString) : '0'
+            );
+        }
+    }
+
+    /**
+     * Write Cell.
+     *
+     * @param string $cellAddress Cell Address
+     * @param string[] $flippedStringTable String table (flipped), for faster index searching
+     */
+    private function writeCell(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, string $cellAddress, array $flippedStringTable): void
+    {
+        // Cell
+        $pCell = $worksheet->getCell($cellAddress);
+        $xfi = $pCell->getXfIndex();
+        $cellValue = $pCell->getValue();
+        $cellValueString = $pCell->getValueString();
+        $writeValue = $cellValue !== '' && $cellValue !== null;
+        if (empty($xfi) && !$writeValue) {
+            return;
+        }
+        $objWriter->startElement('c');
+        $objWriter->writeAttribute('r', $cellAddress);
+
+        // Sheet styles
+        if ($xfi) {
+            $objWriter->writeAttribute('s', "$xfi");
+        } elseif ($this->explicitStyle0) {
+            $objWriter->writeAttribute('s', '0');
+        }
+
+        // If cell value is supplied, write cell value
+        if ($writeValue) {
+            // Map type
+            $mappedType = $pCell->getDataType();
+
+            // Write data depending on its type
+            switch (strtolower($mappedType)) {
+                case 'inlinestr':    // Inline string
+                    /** @var RichText|string */
+                    $richText = $cellValue;
+                    $this->writeCellInlineStr($objWriter, $mappedType, $richText);
+
+                    break;
+                case 's':            // String
+                    $this->writeCellString($objWriter, $mappedType, ($cellValue instanceof RichText) ? $cellValue : $cellValueString, $flippedStringTable);
+
+                    break;
+                case 'f':            // Formula
+                    $this->writeCellFormula($objWriter, $cellValueString, $pCell);
+
+                    break;
+                case 'n':            // Numeric
+                    $cellValueNumeric = is_numeric($cellValue) ? ($cellValue + 0) : 0;
+                    $this->writeCellNumeric($objWriter, $cellValueNumeric);
+
+                    break;
+                case 'b':            // Boolean
+                    $this->writeCellBoolean($objWriter, $mappedType, (bool) $cellValue);
+
+                    break;
+                case 'e':            // Error
+                    $this->writeCellError($objWriter, $mappedType, $cellValueString);
+            }
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Drawings.
+     *
+     * @param bool $includeCharts Flag indicating if we should include drawing details for charts
+     */
+    private function writeDrawings(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, bool $includeCharts = false): void
+    {
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        $hasUnparsedDrawing = isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds']);
+        $chartCount = ($includeCharts) ? $worksheet->getChartCollection()->count() : 0;
+        if ($chartCount == 0 && $worksheet->getDrawingCollection()->count() == 0 && !$hasUnparsedDrawing) {
+            return;
+        }
+
+        // If sheet contains drawings, add the relationships
+        $objWriter->startElement('drawing');
+
+        $rId = 'rId1';
+        if (isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds'])) {
+            $drawingOriginalIds = $unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds'];
+            // take first. In future can be overriten
+            // (! synchronize with \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Rels::writeWorksheetRelationships)
+            $rId = reset($drawingOriginalIds);
+        }
+
+        $objWriter->writeAttribute('r:id', $rId);
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write LegacyDrawing.
+     */
+    private function writeLegacyDrawing(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // If sheet contains comments, add the relationships
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (count($worksheet->getComments()) > 0 || isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['legacyDrawing'])) {
+            $objWriter->startElement('legacyDrawing');
+            $objWriter->writeAttribute('r:id', 'rId_comments_vml1');
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write LegacyDrawingHF.
+     */
+    private function writeLegacyDrawingHF(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        // If sheet contains images, add the relationships
+        if (count($worksheet->getHeaderFooter()->getImages()) > 0) {
+            $objWriter->startElement('legacyDrawingHF');
+            $objWriter->writeAttribute('r:id', 'rId_headerfooter_vml1');
+            $objWriter->endElement();
+        }
+    }
+
+    private function writeAlternateContent(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        if (empty($worksheet->getParentOrThrow()->getUnparsedLoadedData()['sheets'][$worksheet->getCodeName()]['AlternateContents'])) {
+            return;
+        }
+
+        foreach ($worksheet->getParentOrThrow()->getUnparsedLoadedData()['sheets'][$worksheet->getCodeName()]['AlternateContents'] as $alternateContent) {
+            $objWriter->writeRaw($alternateContent);
+        }
+    }
+
+    /**
+     * write <ExtLst>
+     * only implementation conditionalFormattings.
+     *
+     * @url https://docs.microsoft.com/en-us/openspecs/office_standards/ms-xlsx/07d607af-5618-4ca2-b683-6a78dc0d9627
+     */
+    private function writeExtLst(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        $conditionalFormattingRuleExtList = [];
+        foreach ($worksheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+            /** @var Conditional $conditional */
+            foreach ($conditionalStyles as $conditional) {
+                $dataBar = $conditional->getDataBar();
+                if ($dataBar && $dataBar->getConditionalFormattingRuleExt()) {
+                    $conditionalFormattingRuleExtList[] = $dataBar->getConditionalFormattingRuleExt();
+                }
+            }
+        }
+
+        if (count($conditionalFormattingRuleExtList) > 0) {
+            $conditionalFormattingRuleExtNsPrefix = 'x14';
+            $objWriter->startElement('extLst');
+            $objWriter->startElement('ext');
+            $objWriter->writeAttribute('uri', '{78C0D931-6437-407d-A8EE-F0AAD7539E65}');
+            $objWriter->startElementNs($conditionalFormattingRuleExtNsPrefix, 'conditionalFormattings', null);
+            foreach ($conditionalFormattingRuleExtList as $extension) {
+                self::writeExtConditionalFormattingElements($objWriter, $extension);
+            }
+            $objWriter->endElement(); //end conditionalFormattings
+            $objWriter->endElement(); //end ext
+            $objWriter->endElement(); //end extLst
+        }
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php
new file mode 100644
index 00000000..7715a299
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+abstract class WriterPart
+{
+    /**
+     * Parent Xlsx object.
+     */
+    private Xlsx $parentWriter;
+
+    /**
+     * Get parent Xlsx object.
+     */
+    public function getParentWriter(): Xlsx
+    {
+        return $this->parentWriter;
+    }
+
+    /**
+     * Set parent Xlsx object.
+     */
+    public function __construct(Xlsx $writer)
+    {
+        $this->parentWriter = $writer;
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php
new file mode 100644
index 00000000..886731ca
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use ZipStream\Option\Archive;
+use ZipStream\ZipStream;
+
+class ZipStream0
+{
+    /**
+     * @param resource $fileHandle
+     */
+    public static function newZipStream($fileHandle): ZipStream
+    {
+        return class_exists(Archive::class) ? ZipStream2::newZipStream($fileHandle) : ZipStream3::newZipStream($fileHandle);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php
new file mode 100644
index 00000000..ed21a7e3
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use ZipStream\Option\Archive;
+use ZipStream\ZipStream;
+
+class ZipStream2
+{
+    /**
+     * @param resource $fileHandle
+     */
+    public static function newZipStream($fileHandle): ZipStream
+    {
+        $options = new Archive();
+        $options->setEnableZip64(false);
+        $options->setOutputStream($fileHandle);
+
+        return new ZipStream(null, $options);
+    }
+}
diff --git a/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php
new file mode 100644
index 00000000..96e13ecf
--- /dev/null
+++ b/src/Common/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use ZipStream\ZipStream;
+
+class ZipStream3
+{
+    /**
+     * @param resource $fileHandle
+     */
+    public static function newZipStream($fileHandle): ZipStream
+    {
+        return new ZipStream(
+            enableZip64: false,
+            outputStream: $fileHandle,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: false,
+        );
+    }
+}
diff --git a/src/Common/vendor/psr/http-client/CHANGELOG.md b/src/Common/vendor/psr/http-client/CHANGELOG.md
new file mode 100644
index 00000000..babba7c7
--- /dev/null
+++ b/src/Common/vendor/psr/http-client/CHANGELOG.md
@@ -0,0 +1,31 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.3
+
+Add `source` link in composer.json. No code changes.
+
+## 1.0.2
+
+Allow PSR-7 (psr/http-message) 2.0. No code changes.
+
+## 1.0.1
+
+Allow installation with PHP 8. No code changes.
+
+## 1.0.0
+
+First stable release. No changes since 0.3.0.
+
+## 0.3.0
+
+Added Interface suffix on exceptions
+ 
+## 0.2.0 
+
+All exceptions are in `Psr\Http\Client` namespace
+
+## 0.1.0
+
+First release
diff --git a/src/Common/vendor/psr/http-client/LICENSE b/src/Common/vendor/psr/http-client/LICENSE
new file mode 100644
index 00000000..cd5e0020
--- /dev/null
+++ b/src/Common/vendor/psr/http-client/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2017 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Common/vendor/psr/http-client/README.md b/src/Common/vendor/psr/http-client/README.md
new file mode 100644
index 00000000..84af5c55
--- /dev/null
+++ b/src/Common/vendor/psr/http-client/README.md
@@ -0,0 +1,12 @@
+HTTP Client
+===========
+
+This repository holds all the common code related to [PSR-18 (HTTP Client)][psr-url].
+
+Note that this is not a HTTP Client implementation of its own. It is merely abstractions that describe the components of a HTTP Client.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-18
+[package-url]: https://packagist.org/packages/psr/http-client
+[implementation-url]: https://packagist.org/providers/psr/http-client-implementation
diff --git a/src/Common/vendor/psr/http-client/composer.json b/src/Common/vendor/psr/http-client/composer.json
new file mode 100644
index 00000000..6fed350b
--- /dev/null
+++ b/src/Common/vendor/psr/http-client/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "psr/http-client",
+    "description": "Common interface for HTTP clients",
+    "keywords": ["psr", "psr-18", "http", "http-client"],
+    "homepage": "https://github.com/php-fig/http-client",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "support": {
+        "source": "https://github.com/php-fig/http-client"
+    },
+    "require": {
+        "php": "^7.0 || ^8.0",
+        "psr/http-message": "^1.0 || ^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Client\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/src/Common/vendor/psr/http-client/src/ClientExceptionInterface.php b/src/Common/vendor/psr/http-client/src/ClientExceptionInterface.php
new file mode 100644
index 00000000..aa0b9cf1
--- /dev/null
+++ b/src/Common/vendor/psr/http-client/src/ClientExceptionInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Psr\Http\Client;
+
+/**
+ * Every HTTP client related exception MUST implement this interface.
+ */
+interface ClientExceptionInterface extends \Throwable
+{
+}
diff --git a/src/Common/vendor/psr/http-client/src/ClientInterface.php b/src/Common/vendor/psr/http-client/src/ClientInterface.php
new file mode 100644
index 00000000..ad99fd4b
--- /dev/null
+++ b/src/Common/vendor/psr/http-client/src/ClientInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Psr\Http\Client;
+
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+interface ClientInterface
+{
+    /**
+     * Sends a PSR-7 request and returns a PSR-7 response.
+     *
+     * @param RequestInterface $request
+     *
+     * @return ResponseInterface
+     *
+     * @throws \Psr\Http\Client\ClientExceptionInterface If an error happens while processing the request.
+     */
+    public function sendRequest(RequestInterface $request): ResponseInterface;
+}
diff --git a/src/Common/vendor/psr/http-client/src/NetworkExceptionInterface.php b/src/Common/vendor/psr/http-client/src/NetworkExceptionInterface.php
new file mode 100644
index 00000000..4a11627c
--- /dev/null
+++ b/src/Common/vendor/psr/http-client/src/NetworkExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Psr\Http\Client;
+
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Thrown when the request cannot be completed because of network issues.
+ *
+ * There is no response object as this exception is thrown when no response has been received.
+ *
+ * Example: the target host name can not be resolved or the connection failed.
+ */
+interface NetworkExceptionInterface extends ClientExceptionInterface
+{
+    /**
+     * Returns the request.
+     *
+     * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+     *
+     * @return RequestInterface
+     */
+    public function getRequest(): RequestInterface;
+}
diff --git a/src/Common/vendor/psr/http-client/src/RequestExceptionInterface.php b/src/Common/vendor/psr/http-client/src/RequestExceptionInterface.php
new file mode 100644
index 00000000..b17fc34f
--- /dev/null
+++ b/src/Common/vendor/psr/http-client/src/RequestExceptionInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Psr\Http\Client;
+
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Exception for when a request failed.
+ *
+ * Examples:
+ *      - Request is invalid (e.g. method is missing)
+ *      - Runtime request errors (e.g. the body stream is not seekable)
+ */
+interface RequestExceptionInterface extends ClientExceptionInterface
+{
+    /**
+     * Returns the request.
+     *
+     * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+     *
+     * @return RequestInterface
+     */
+    public function getRequest(): RequestInterface;
+}
diff --git a/src/Common/vendor/psr/http-factory/LICENSE b/src/Common/vendor/psr/http-factory/LICENSE
new file mode 100644
index 00000000..3f1559b2
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 PHP-FIG
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/Common/vendor/psr/http-factory/README.md b/src/Common/vendor/psr/http-factory/README.md
new file mode 100644
index 00000000..bf8913b5
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/README.md
@@ -0,0 +1,12 @@
+HTTP Factories
+==============
+
+This repository holds all interfaces related to [PSR-17 (HTTP Factories)][psr-url].
+
+Note that this is not a HTTP Factory implementation of its own. It is merely interfaces that describe the components of a HTTP Factory.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-17/
+[package-url]: https://packagist.org/packages/psr/http-factory
+[implementation-url]: https://packagist.org/providers/psr/http-factory-implementation
diff --git a/src/Common/vendor/psr/http-factory/composer.json b/src/Common/vendor/psr/http-factory/composer.json
new file mode 100644
index 00000000..82a1d326
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/composer.json
@@ -0,0 +1,38 @@
+{
+    "name": "psr/http-factory",
+    "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+    "keywords": [
+        "psr",
+        "psr-7",
+        "psr-17",
+        "http",
+        "factory",
+        "message",
+        "request",
+        "response"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "support": {
+        "source": "https://github.com/php-fig/http-factory"
+    },
+    "require": {
+        "php": ">=7.1",
+        "psr/http-message": "^1.0 || ^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Message\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/src/Common/vendor/psr/http-factory/src/RequestFactoryInterface.php b/src/Common/vendor/psr/http-factory/src/RequestFactoryInterface.php
new file mode 100644
index 00000000..cb39a08b
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/src/RequestFactoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface RequestFactoryInterface
+{
+    /**
+     * Create a new request.
+     *
+     * @param string $method The HTTP method associated with the request.
+     * @param UriInterface|string $uri The URI associated with the request. If
+     *     the value is a string, the factory MUST create a UriInterface
+     *     instance based on it.
+     *
+     * @return RequestInterface
+     */
+    public function createRequest(string $method, $uri): RequestInterface;
+}
diff --git a/src/Common/vendor/psr/http-factory/src/ResponseFactoryInterface.php b/src/Common/vendor/psr/http-factory/src/ResponseFactoryInterface.php
new file mode 100644
index 00000000..212562f0
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/src/ResponseFactoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface ResponseFactoryInterface
+{
+    /**
+     * Create a new response.
+     *
+     * @param int $code HTTP status code; defaults to 200
+     * @param string $reasonPhrase Reason phrase to associate with status code
+     *     in generated response; if none is provided implementations MAY use
+     *     the defaults as suggested in the HTTP specification.
+     *
+     * @return ResponseInterface
+     */
+    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface;
+}
diff --git a/src/Common/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php b/src/Common/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
new file mode 100644
index 00000000..9fe031a8
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface ServerRequestFactoryInterface
+{
+    /**
+     * Create a new server request.
+     *
+     * Note that server-params are taken precisely as given - no parsing/processing
+     * of the given values is performed, and, in particular, no attempt is made to
+     * determine the HTTP method or URI, which must be provided explicitly.
+     *
+     * @param string $method The HTTP method associated with the request.
+     * @param UriInterface|string $uri The URI associated with the request. If
+     *     the value is a string, the factory MUST create a UriInterface
+     *     instance based on it.
+     * @param array $serverParams Array of SAPI parameters with which to seed
+     *     the generated request instance.
+     *
+     * @return ServerRequestInterface
+     */
+    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface;
+}
diff --git a/src/Common/vendor/psr/http-factory/src/StreamFactoryInterface.php b/src/Common/vendor/psr/http-factory/src/StreamFactoryInterface.php
new file mode 100644
index 00000000..90e3240c
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/src/StreamFactoryInterface.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface StreamFactoryInterface
+{
+    /**
+     * Create a new stream from a string.
+     *
+     * The stream SHOULD be created with a temporary resource.
+     *
+     * @param string $content String content with which to populate the stream.
+     *
+     * @return StreamInterface
+     */
+    public function createStream(string $content = ''): StreamInterface;
+
+    /**
+     * Create a stream from an existing file.
+     *
+     * The file MUST be opened using the given mode, which may be any mode
+     * supported by the `fopen` function.
+     *
+     * The `$filename` MAY be any string supported by `fopen()`.
+     *
+     * @param string $filename Filename or stream URI to use as basis of stream.
+     * @param string $mode Mode with which to open the underlying filename/stream.
+     *
+     * @return StreamInterface
+     * @throws \RuntimeException If the file cannot be opened.
+     * @throws \InvalidArgumentException If the mode is invalid.
+     */
+    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface;
+
+    /**
+     * Create a new stream from an existing resource.
+     *
+     * The stream MUST be readable and may be writable.
+     *
+     * @param resource $resource PHP resource to use as basis of stream.
+     *
+     * @return StreamInterface
+     */
+    public function createStreamFromResource($resource): StreamInterface;
+}
diff --git a/src/Common/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php b/src/Common/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
new file mode 100644
index 00000000..d7adbf0e
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface UploadedFileFactoryInterface
+{
+    /**
+     * Create a new uploaded file.
+     *
+     * If a size is not provided it will be determined by checking the size of
+     * the file.
+     *
+     * @see http://php.net/manual/features.file-upload.post-method.php
+     * @see http://php.net/manual/features.file-upload.errors.php
+     *
+     * @param StreamInterface $stream Underlying stream representing the
+     *     uploaded file content.
+     * @param int|null $size in bytes
+     * @param int $error PHP file upload error
+     * @param string|null $clientFilename Filename as provided by the client, if any.
+     * @param string|null $clientMediaType Media type as provided by the client, if any.
+     *
+     * @return UploadedFileInterface
+     *
+     * @throws \InvalidArgumentException If the file resource is not readable.
+     */
+    public function createUploadedFile(
+        StreamInterface $stream,
+        ?int $size = null,
+        int $error = \UPLOAD_ERR_OK,
+        ?string $clientFilename = null,
+        ?string $clientMediaType = null
+    ): UploadedFileInterface;
+}
diff --git a/src/Common/vendor/psr/http-factory/src/UriFactoryInterface.php b/src/Common/vendor/psr/http-factory/src/UriFactoryInterface.php
new file mode 100644
index 00000000..06df0b46
--- /dev/null
+++ b/src/Common/vendor/psr/http-factory/src/UriFactoryInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface UriFactoryInterface
+{
+    /**
+     * Create a new URI.
+     *
+     * @param string $uri
+     *
+     * @return UriInterface
+     *
+     * @throws \InvalidArgumentException If the given URI cannot be parsed.
+     */
+    public function createUri(string $uri = ''): UriInterface;
+}
diff --git a/src/Common/vendor/psr/http-message/CHANGELOG.md b/src/Common/vendor/psr/http-message/CHANGELOG.md
new file mode 100644
index 00000000..74b1ef92
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/CHANGELOG.md
@@ -0,0 +1,36 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.1 - 2016-08-06
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Updated all `@return self` annotation references in interfaces to use
+  `@return static`, which more closelly follows the semantics of the
+  specification.
+- Updated the `MessageInterface::getHeaders()` return annotation to use the
+  value `string[][]`, indicating the format is a nested array of strings.
+- Updated the `@link` annotation for `RequestInterface::withRequestTarget()`
+  to point to the correct section of RFC 7230.
+- Updated the `ServerRequestInterface::withUploadedFiles()` parameter annotation
+  to add the parameter name (`$uploadedFiles`).
+- Updated a `@throws` annotation for the `UploadedFileInterface::moveTo()`
+  method to correctly reference the method parameter (it was referencing an
+  incorrect parameter name previously).
+
+## 1.0.0 - 2016-05-18
+
+Initial stable release; reflects accepted PSR-7 specification.
diff --git a/src/Common/vendor/psr/http-message/LICENSE b/src/Common/vendor/psr/http-message/LICENSE
new file mode 100644
index 00000000..c2d8e452
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Common/vendor/psr/http-message/README.md b/src/Common/vendor/psr/http-message/README.md
new file mode 100644
index 00000000..2668be6c
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/README.md
@@ -0,0 +1,16 @@
+PSR Http Message
+================
+
+This repository holds all interfaces/classes/traits related to
+[PSR-7](http://www.php-fig.org/psr/psr-7/).
+
+Note that this is not a HTTP message implementation of its own. It is merely an
+interface that describes a HTTP message. See the specification for more details.
+
+Usage
+-----
+
+Before reading the usage guide we recommend reading the PSR-7 interfaces method list:
+
+* [`PSR-7 Interfaces Method List`](docs/PSR7-Interfaces.md)
+* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md)
\ No newline at end of file
diff --git a/src/Common/vendor/psr/http-message/composer.json b/src/Common/vendor/psr/http-message/composer.json
new file mode 100644
index 00000000..c66e5aba
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "psr/http-message",
+    "description": "Common interface for HTTP messages",
+    "keywords": ["psr", "psr-7", "http", "http-message", "request", "response"],
+    "homepage": "https://github.com/php-fig/http-message",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": "^7.2 || ^8.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Message\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    }
+}
diff --git a/src/Common/vendor/psr/http-message/docs/PSR7-Interfaces.md b/src/Common/vendor/psr/http-message/docs/PSR7-Interfaces.md
new file mode 100644
index 00000000..3a7e7dda
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/docs/PSR7-Interfaces.md
@@ -0,0 +1,130 @@
+# Interfaces
+
+The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces.
+
+The interfaces defined in PSR-7 are the following:
+
+| Class Name | Description |
+|---|---|
+| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
+| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
+| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
+| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
+| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
+| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
+| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
+
+## `Psr\Http\Message\MessageInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getProtocolVersion()`             | Retrieve HTTP protocol version          |  1.0 or 1.1 |
+| `withProtocolVersion($version)`    | Returns new message instance with given HTTP protocol version          |      |
+| `getHeaders()`                     | Retrieve all HTTP Headers               | [Request Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), [Response Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields)      |
+| `hasHeader($name)`                 | Checks if HTTP Header with given name exists  | |
+| `getHeader($name)`                 | Retrieves a array with the values for a single header | |
+| `getHeaderLine($name)`             | Retrieves a comma-separated string of the values for a single header |  |
+| `withHeader($name, $value)`        | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. |
+| `withAddedHeader($name, $value)`   | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created |
+| `withoutHeader($name)`             | Removes HTTP Header with given name| |
+| `getBody()`                        | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`|
+| `withBody(StreamInterface $body)`  | Returns new message instance with given HTTP Message Body | |
+
+
+## `Psr\Http\Message\RequestInterface` Methods
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getRequestTarget()`                | Retrieves the message's request target              | origin-form, absolute-form, authority-form, asterisk-form ([RFC7230](https://www.rfc-editor.org/rfc/rfc7230.txt)) |
+| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target |      |
+| `getMethod()`                       | Retrieves the HTTP method of the request.  |  GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in [RFC7231](https://tools.ietf.org/html/rfc7231)), PATCH (defined in [RFC5789](https://tools.ietf.org/html/rfc5789)) |
+| `withMethod($method)`               | Returns a new message instance with the provided HTTP method  | |
+| `getUri()`                 | Retrieves the URI instance | |
+| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI |  |
+
+
+## `Psr\Http\Message\ServerRequestInterface` Methods
+
+Same methods as `Psr\Http\Message\RequestInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getServerParams() `               | Retrieve server parameters  | Typically derived from `$_SERVER`  |
+| `getCookieParams()`                | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` |
+| `withCookieParams(array $cookies)` |  Returns a new request instance with the specified cookies      |   | 
+| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments  |  |
+| `getUploadedFiles()` | Retrieve normalized file upload data  |  |
+| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files  |  |
+| `getParsedBody()` | Retrieve any parameters provided in the request body  |  |
+| `withParsedBody($data)` | Returns a new request instance with the specified body parameters  |  |
+| `getAttributes()` | Retrieve attributes derived from the request  |  |
+| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute  |  |
+| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute  |  |
+| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute  |  |
+
+## `Psr\Http\Message\ResponseInterface` Methods:
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStatusCode()` | Gets the response status code. | |
+| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | |
+| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | |
+
+##  `Psr\Http\Message\StreamInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | |
+| `close()` | Closes the stream and any underlying resources. | |
+| `detach()` | Separates any underlying resources from the stream. | |
+| `getSize()` | Get the size of the stream if known. | |
+| `eof()` | Returns true if the stream is at the end of the stream.| |
+| `isSeekable()` |  Returns whether or not the stream is seekable. | |
+| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | |
+| `rewind()` | Seek to the beginning of the stream. | |
+| `isWritable()` | Returns whether or not the stream is writable. | |
+| `write($string)` | Write data to the stream. | |
+| `isReadable()` | Returns whether or not the stream is readable. | |
+| `read($length)` | Read data from the stream. | |
+| `getContents()` | Returns the remaining contents in a string | |
+| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | |
+
+## `Psr\Http\Message\UriInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getScheme()` | Retrieve the scheme component of the URI. | |
+| `getAuthority()` | Retrieve the authority component of the URI. | |
+| `getUserInfo()` | Retrieve the user information component of the URI. | |
+| `getHost()` | Retrieve the host component of the URI. | |
+| `getPort()` | Retrieve the port component of the URI. | |
+| `getPath()` | Retrieve the path component of the URI. | |
+| `getQuery()` | Retrieve the query string of the URI. | |
+| `getFragment()` | Retrieve the fragment component of the URI. | |
+| `withScheme($scheme)` | Return an instance with the specified scheme. | |
+| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | |
+| `withHost($host)` | Return an instance with the specified host. | |
+| `withPort($port)` | Return an instance with the specified port. | |
+| `withPath($path)` | Return an instance with the specified path. | |
+| `withQuery($query)` | Return an instance with the specified query string. | |
+| `withFragment($fragment)` | Return an instance with the specified URI fragment. | |
+| `__toString()` | Return the string representation as a URI reference. | |
+
+## `Psr\Http\Message\UploadedFileInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStream()` | Retrieve a stream representing the uploaded file. | |
+| `moveTo($targetPath)` | Move the uploaded file to a new location. | |
+| `getSize()` | Retrieve the file size. | |
+| `getError()` | Retrieve the error associated with the uploaded file. | |
+| `getClientFilename()` | Retrieve the filename sent by the client. | |
+| `getClientMediaType()` | Retrieve the media type sent by the client. | |
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
diff --git a/src/Common/vendor/psr/http-message/docs/PSR7-Usage.md b/src/Common/vendor/psr/http-message/docs/PSR7-Usage.md
new file mode 100644
index 00000000..b6d048a3
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/docs/PSR7-Usage.md
@@ -0,0 +1,159 @@
+### PSR-7 Usage
+
+All PSR-7 applications comply with these interfaces 
+They were created to establish a standard between middleware implementations.
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
+
+The following examples will illustrate how basic operations are done in PSR-7.
+
+##### Examples
+
+
+For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc)
+All PSR-7 implementations should have the same behaviour.
+
+The following will be assumed: 
+`$request` is an object of `Psr\Http\Message\RequestInterface` and
+
+`$response` is an object implementing `Psr\Http\Message\RequestInterface`
+
+
+### Working with HTTP Headers
+
+#### Adding headers to response:
+
+```php
+$response->withHeader('My-Custom-Header', 'My Custom Message');
+```
+
+#### Appending values to headers
+
+```php
+$response->withAddedHeader('My-Custom-Header', 'The second message');
+```
+
+#### Checking if header exists:
+
+```php
+$request->hasHeader('My-Custom-Header'); // will return false
+$response->hasHeader('My-Custom-Header'); // will return true
+```
+
+> Note: My-Custom-Header was only added in the Response
+
+#### Getting comma-separated values from a header (also applies to request)
+
+```php
+// getting value from request headers
+$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8"
+// getting value from response headers
+$response->getHeaderLine('My-Custom-Header'); // will return:  "My Custom Message; The second message"
+```
+
+#### Getting array of value from a header (also applies to request)
+```php
+// getting value from request headers
+$request->getHeader('Content-Type'); // will return: ["text/html", "charset=UTF-8"]
+// getting value from response headers
+$response->getHeader('My-Custom-Header'); // will return:  ["My Custom Message",  "The second message"]
+```
+
+#### Removing headers from HTTP Messages
+```php
+// removing a header from Request, removing deprecated "Content-MD5" header
+$request->withoutHeader('Content-MD5'); 
+
+// removing a header from Response
+// effect: the browser won't know the size of the stream
+// the browser will download the stream till it ends
+$response->withoutHeader('Content-Length');
+```
+
+### Working with HTTP Message Body
+
+When working with the PSR-7 there are two methods of implementation:
+#### 1. Getting the body separately
+
+> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented.
+
+```php
+$body = $response->getBody();
+// operations on body, eg. read, write, seek
+// ...
+// replacing the old body
+$response->withBody($body); 
+// this last statement is optional as we working with objects
+// in this case the "new" body is same with the "old" one
+// the $body variable has the same value as the one in $request, only the reference is passed
+```
+
+#### 2. Working directly on response
+
+> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required
+
+```php
+$response->getBody()->write('hello');
+```
+
+### Getting the body contents
+
+The following snippet gets the contents of a stream contents.
+> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream.
+```php 
+$body = $response->getBody();
+$body->rewind(); // or $body->seek(0);
+$bodyText = $body->getContents();
+```
+> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended.
+
+### Append to body
+
+```php
+$response->getBody()->write('Hello'); // writing directly
+$body = $request->getBody(); // which is a `StreamInterface`
+$body->write('xxxxx');
+```
+
+### Prepend to body
+Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended.
+The following example will explain the behaviour of streams.
+
+```php
+// assuming our response is initially empty
+$body = $repsonse->getBody();
+// writing the string "abcd"
+$body->write('abcd');
+
+// seeking to start of stream
+$body->seek(0);
+// writing 'ef'
+$body->write('ef'); // at this point the stream contains "efcd"
+```
+
+#### Prepending by rewriting separately
+
+```php
+// assuming our response body stream only contains: "abcd"
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // abcd
+// seeking the stream to beginning
+$body->rewind();
+$body->write('ef'); // stream contains "efcd"
+$body->write($contents); // stream contains "efabcd"
+```
+
+> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`.
+
+#### Prepending by using contents as a string
+```php
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // efabcd
+$contents = 'ef'.$contents;
+$body->rewind();
+$body->write($contents);
+```
diff --git a/src/Common/vendor/psr/http-message/src/MessageInterface.php b/src/Common/vendor/psr/http-message/src/MessageInterface.php
new file mode 100644
index 00000000..a83c9851
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/src/MessageInterface.php
@@ -0,0 +1,187 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * HTTP messages consist of requests from a client to a server and responses
+ * from a server to a client. This interface defines the methods common to
+ * each.
+ *
+ * Messages are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ *
+ * @link http://www.ietf.org/rfc/rfc7230.txt
+ * @link http://www.ietf.org/rfc/rfc7231.txt
+ */
+interface MessageInterface
+{
+    /**
+     * Retrieves the HTTP protocol version as a string.
+     *
+     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
+     *
+     * @return string HTTP protocol version.
+     */
+    public function getProtocolVersion(): string;
+
+    /**
+     * Return an instance with the specified HTTP protocol version.
+     *
+     * The version string MUST contain only the HTTP version number (e.g.,
+     * "1.1", "1.0").
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new protocol version.
+     *
+     * @param string $version HTTP protocol version
+     * @return static
+     */
+    public function withProtocolVersion(string $version): MessageInterface;
+
+    /**
+     * Retrieves all message header values.
+     *
+     * The keys represent the header name as it will be sent over the wire, and
+     * each value is an array of strings associated with the header.
+     *
+     *     // Represent the headers as a string
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         echo $name . ": " . implode(", ", $values);
+     *     }
+     *
+     *     // Emit headers iteratively:
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         foreach ($values as $value) {
+     *             header(sprintf('%s: %s', $name, $value), false);
+     *         }
+     *     }
+     *
+     * While header names are not case-sensitive, getHeaders() will preserve the
+     * exact case in which headers were originally specified.
+     *
+     * @return string[][] Returns an associative array of the message's headers. Each
+     *     key MUST be a header name, and each value MUST be an array of strings
+     *     for that header.
+     */
+    public function getHeaders(): array;
+
+    /**
+     * Checks if a header exists by the given case-insensitive name.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return bool Returns true if any header names match the given header
+     *     name using a case-insensitive string comparison. Returns false if
+     *     no matching header name is found in the message.
+     */
+    public function hasHeader(string $name): bool;
+
+    /**
+     * Retrieves a message header value by the given case-insensitive name.
+     *
+     * This method returns an array of all the header values of the given
+     * case-insensitive header name.
+     *
+     * If the header does not appear in the message, this method MUST return an
+     * empty array.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string[] An array of string values as provided for the given
+     *    header. If the header does not appear in the message, this method MUST
+     *    return an empty array.
+     */
+    public function getHeader(string $name): array;
+
+    /**
+     * Retrieves a comma-separated string of the values for a single header.
+     *
+     * This method returns all of the header values of the given
+     * case-insensitive header name as a string concatenated together using
+     * a comma.
+     *
+     * NOTE: Not all header values may be appropriately represented using
+     * comma concatenation. For such headers, use getHeader() instead
+     * and supply your own delimiter when concatenating.
+     *
+     * If the header does not appear in the message, this method MUST return
+     * an empty string.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string A string of values as provided for the given header
+     *    concatenated together using a comma. If the header does not appear in
+     *    the message, this method MUST return an empty string.
+     */
+    public function getHeaderLine(string $name): string;
+
+    /**
+     * Return an instance with the provided value replacing the specified header.
+     *
+     * While header names are case-insensitive, the casing of the header will
+     * be preserved by this function, and returned from getHeaders().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new and/or updated header and value.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withHeader(string $name, $value): MessageInterface;
+
+    /**
+     * Return an instance with the specified header appended with the given value.
+     *
+     * Existing values for the specified header will be maintained. The new
+     * value(s) will be appended to the existing list. If the header did not
+     * exist previously, it will be added.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new header and/or value.
+     *
+     * @param string $name Case-insensitive header field name to add.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withAddedHeader(string $name, $value): MessageInterface;
+
+    /**
+     * Return an instance without the specified header.
+     *
+     * Header resolution MUST be done without case-sensitivity.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the named header.
+     *
+     * @param string $name Case-insensitive header field name to remove.
+     * @return static
+     */
+    public function withoutHeader(string $name): MessageInterface;
+
+    /**
+     * Gets the body of the message.
+     *
+     * @return StreamInterface Returns the body as a stream.
+     */
+    public function getBody(): StreamInterface;
+
+    /**
+     * Return an instance with the specified message body.
+     *
+     * The body MUST be a StreamInterface object.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return a new instance that has the
+     * new body stream.
+     *
+     * @param StreamInterface $body Body.
+     * @return static
+     * @throws \InvalidArgumentException When the body is not valid.
+     */
+    public function withBody(StreamInterface $body): MessageInterface;
+}
diff --git a/src/Common/vendor/psr/http-message/src/RequestInterface.php b/src/Common/vendor/psr/http-message/src/RequestInterface.php
new file mode 100644
index 00000000..33f85e55
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/src/RequestInterface.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an outgoing, client-side request.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - HTTP method
+ * - URI
+ * - Headers
+ * - Message body
+ *
+ * During construction, implementations MUST attempt to set the Host header from
+ * a provided URI if no Host header is provided.
+ *
+ * Requests are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface RequestInterface extends MessageInterface
+{
+    /**
+     * Retrieves the message's request target.
+     *
+     * Retrieves the message's request-target either as it will appear (for
+     * clients), as it appeared at request (for servers), or as it was
+     * specified for the instance (see withRequestTarget()).
+     *
+     * In most cases, this will be the origin-form of the composed URI,
+     * unless a value was provided to the concrete implementation (see
+     * withRequestTarget() below).
+     *
+     * If no URI is available, and no request-target has been specifically
+     * provided, this method MUST return the string "/".
+     *
+     * @return string
+     */
+    public function getRequestTarget(): string;
+
+    /**
+     * Return an instance with the specific request-target.
+     *
+     * If the request needs a non-origin-form request-target — e.g., for
+     * specifying an absolute-form, authority-form, or asterisk-form —
+     * this method may be used to create an instance with the specified
+     * request-target, verbatim.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request target.
+     *
+     * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
+     *     request-target forms allowed in request messages)
+     * @param string $requestTarget
+     * @return static
+     */
+    public function withRequestTarget(string $requestTarget): RequestInterface;
+
+
+    /**
+     * Retrieves the HTTP method of the request.
+     *
+     * @return string Returns the request method.
+     */
+    public function getMethod(): string;
+
+    /**
+     * Return an instance with the provided HTTP method.
+     *
+     * While HTTP method names are typically all uppercase characters, HTTP
+     * method names are case-sensitive and thus implementations SHOULD NOT
+     * modify the given string.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request method.
+     *
+     * @param string $method Case-sensitive method.
+     * @return static
+     * @throws \InvalidArgumentException for invalid HTTP methods.
+     */
+    public function withMethod(string $method): RequestInterface;
+
+    /**
+     * Retrieves the URI instance.
+     *
+     * This method MUST return a UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @return UriInterface Returns a UriInterface instance
+     *     representing the URI of the request.
+     */
+    public function getUri(): UriInterface;
+
+    /**
+     * Returns an instance with the provided URI.
+     *
+     * This method MUST update the Host header of the returned request by
+     * default if the URI contains a host component. If the URI does not
+     * contain a host component, any pre-existing Host header MUST be carried
+     * over to the returned request.
+     *
+     * You can opt-in to preserving the original state of the Host header by
+     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
+     * `true`, this method interacts with the Host header in the following ways:
+     *
+     * - If the Host header is missing or empty, and the new URI contains
+     *   a host component, this method MUST update the Host header in the returned
+     *   request.
+     * - If the Host header is missing or empty, and the new URI does not contain a
+     *   host component, this method MUST NOT update the Host header in the returned
+     *   request.
+     * - If a Host header is present and non-empty, this method MUST NOT update
+     *   the Host header in the returned request.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @param UriInterface $uri New request URI to use.
+     * @param bool $preserveHost Preserve the original state of the Host header.
+     * @return static
+     */
+    public function withUri(UriInterface $uri, bool $preserveHost = false): RequestInterface;
+}
diff --git a/src/Common/vendor/psr/http-message/src/ResponseInterface.php b/src/Common/vendor/psr/http-message/src/ResponseInterface.php
new file mode 100644
index 00000000..e9299a91
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/src/ResponseInterface.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an outgoing, server-side response.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - Status code and reason phrase
+ * - Headers
+ * - Message body
+ *
+ * Responses are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface ResponseInterface extends MessageInterface
+{
+    /**
+     * Gets the response status code.
+     *
+     * The status code is a 3-digit integer result code of the server's attempt
+     * to understand and satisfy the request.
+     *
+     * @return int Status code.
+     */
+    public function getStatusCode(): int;
+
+    /**
+     * Return an instance with the specified status code and, optionally, reason phrase.
+     *
+     * If no reason phrase is specified, implementations MAY choose to default
+     * to the RFC 7231 or IANA recommended reason phrase for the response's
+     * status code.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated status and reason phrase.
+     *
+     * @link http://tools.ietf.org/html/rfc7231#section-6
+     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @param int $code The 3-digit integer result code to set.
+     * @param string $reasonPhrase The reason phrase to use with the
+     *     provided status code; if none is provided, implementations MAY
+     *     use the defaults as suggested in the HTTP specification.
+     * @return static
+     * @throws \InvalidArgumentException For invalid status code arguments.
+     */
+    public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface;
+
+    /**
+     * Gets the response reason phrase associated with the status code.
+     *
+     * Because a reason phrase is not a required element in a response
+     * status line, the reason phrase value MAY be null. Implementations MAY
+     * choose to return the default RFC 7231 recommended reason phrase (or those
+     * listed in the IANA HTTP Status Code Registry) for the response's
+     * status code.
+     *
+     * @link http://tools.ietf.org/html/rfc7231#section-6
+     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @return string Reason phrase; must return an empty string if none present.
+     */
+    public function getReasonPhrase(): string;
+}
diff --git a/src/Common/vendor/psr/http-message/src/ServerRequestInterface.php b/src/Common/vendor/psr/http-message/src/ServerRequestInterface.php
new file mode 100644
index 00000000..8625d0e1
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -0,0 +1,261 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an incoming, server-side HTTP request.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - HTTP method
+ * - URI
+ * - Headers
+ * - Message body
+ *
+ * Additionally, it encapsulates all data as it has arrived to the
+ * application from the CGI and/or PHP environment, including:
+ *
+ * - The values represented in $_SERVER.
+ * - Any cookies provided (generally via $_COOKIE)
+ * - Query string arguments (generally via $_GET, or as parsed via parse_str())
+ * - Upload files, if any (as represented by $_FILES)
+ * - Deserialized body parameters (generally from $_POST)
+ *
+ * $_SERVER values MUST be treated as immutable, as they represent application
+ * state at the time of request; as such, no methods are provided to allow
+ * modification of those values. The other values provide such methods, as they
+ * can be restored from $_SERVER or the request body, and may need treatment
+ * during the application (e.g., body parameters may be deserialized based on
+ * content type).
+ *
+ * Additionally, this interface recognizes the utility of introspecting a
+ * request to derive and match additional parameters (e.g., via URI path
+ * matching, decrypting cookie values, deserializing non-form-encoded body
+ * content, matching authorization headers to users, etc). These parameters
+ * are stored in an "attributes" property.
+ *
+ * Requests are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface ServerRequestInterface extends RequestInterface
+{
+    /**
+     * Retrieve server parameters.
+     *
+     * Retrieves data related to the incoming request environment,
+     * typically derived from PHP's $_SERVER superglobal. The data IS NOT
+     * REQUIRED to originate from $_SERVER.
+     *
+     * @return array
+     */
+    public function getServerParams(): array;
+
+    /**
+     * Retrieve cookies.
+     *
+     * Retrieves cookies sent by the client to the server.
+     *
+     * The data MUST be compatible with the structure of the $_COOKIE
+     * superglobal.
+     *
+     * @return array
+     */
+    public function getCookieParams(): array;
+
+    /**
+     * Return an instance with the specified cookies.
+     *
+     * The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST
+     * be compatible with the structure of $_COOKIE. Typically, this data will
+     * be injected at instantiation.
+     *
+     * This method MUST NOT update the related Cookie header of the request
+     * instance, nor related values in the server params.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated cookie values.
+     *
+     * @param array $cookies Array of key/value pairs representing cookies.
+     * @return static
+     */
+    public function withCookieParams(array $cookies): ServerRequestInterface;
+
+    /**
+     * Retrieve query string arguments.
+     *
+     * Retrieves the deserialized query string arguments, if any.
+     *
+     * Note: the query params might not be in sync with the URI or server
+     * params. If you need to ensure you are only getting the original
+     * values, you may need to parse the query string from `getUri()->getQuery()`
+     * or from the `QUERY_STRING` server param.
+     *
+     * @return array
+     */
+    public function getQueryParams(): array;
+
+    /**
+     * Return an instance with the specified query string arguments.
+     *
+     * These values SHOULD remain immutable over the course of the incoming
+     * request. They MAY be injected during instantiation, such as from PHP's
+     * $_GET superglobal, or MAY be derived from some other value such as the
+     * URI. In cases where the arguments are parsed from the URI, the data
+     * MUST be compatible with what PHP's parse_str() would return for
+     * purposes of how duplicate query parameters are handled, and how nested
+     * sets are handled.
+     *
+     * Setting query string arguments MUST NOT change the URI stored by the
+     * request, nor the values in the server params.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated query string arguments.
+     *
+     * @param array $query Array of query string arguments, typically from
+     *     $_GET.
+     * @return static
+     */
+    public function withQueryParams(array $query): ServerRequestInterface;
+
+    /**
+     * Retrieve normalized file upload data.
+     *
+     * This method returns upload metadata in a normalized tree, with each leaf
+     * an instance of Psr\Http\Message\UploadedFileInterface.
+     *
+     * These values MAY be prepared from $_FILES or the message body during
+     * instantiation, or MAY be injected via withUploadedFiles().
+     *
+     * @return array An array tree of UploadedFileInterface instances; an empty
+     *     array MUST be returned if no data is present.
+     */
+    public function getUploadedFiles(): array;
+
+    /**
+     * Create a new instance with the specified uploaded files.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated body parameters.
+     *
+     * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
+     * @return static
+     * @throws \InvalidArgumentException if an invalid structure is provided.
+     */
+    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface;
+
+    /**
+     * Retrieve any parameters provided in the request body.
+     *
+     * If the request Content-Type is either application/x-www-form-urlencoded
+     * or multipart/form-data, and the request method is POST, this method MUST
+     * return the contents of $_POST.
+     *
+     * Otherwise, this method may return any results of deserializing
+     * the request body content; as parsing returns structured content, the
+     * potential types MUST be arrays or objects only. A null value indicates
+     * the absence of body content.
+     *
+     * @return null|array|object The deserialized body parameters, if any.
+     *     These will typically be an array or object.
+     */
+    public function getParsedBody();
+
+    /**
+     * Return an instance with the specified body parameters.
+     *
+     * These MAY be injected during instantiation.
+     *
+     * If the request Content-Type is either application/x-www-form-urlencoded
+     * or multipart/form-data, and the request method is POST, use this method
+     * ONLY to inject the contents of $_POST.
+     *
+     * The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
+     * deserializing the request body content. Deserialization/parsing returns
+     * structured data, and, as such, this method ONLY accepts arrays or objects,
+     * or a null value if nothing was available to parse.
+     *
+     * As an example, if content negotiation determines that the request data
+     * is a JSON payload, this method could be used to create a request
+     * instance with the deserialized parameters.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated body parameters.
+     *
+     * @param null|array|object $data The deserialized body data. This will
+     *     typically be in an array or object.
+     * @return static
+     * @throws \InvalidArgumentException if an unsupported argument type is
+     *     provided.
+     */
+    public function withParsedBody($data): ServerRequestInterface;
+
+    /**
+     * Retrieve attributes derived from the request.
+     *
+     * The request "attributes" may be used to allow injection of any
+     * parameters derived from the request: e.g., the results of path
+     * match operations; the results of decrypting cookies; the results of
+     * deserializing non-form-encoded message bodies; etc. Attributes
+     * will be application and request specific, and CAN be mutable.
+     *
+     * @return array Attributes derived from the request.
+     */
+    public function getAttributes(): array;
+
+    /**
+     * Retrieve a single derived request attribute.
+     *
+     * Retrieves a single derived request attribute as described in
+     * getAttributes(). If the attribute has not been previously set, returns
+     * the default value as provided.
+     *
+     * This method obviates the need for a hasAttribute() method, as it allows
+     * specifying a default value to return if the attribute is not found.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @param mixed $default Default value to return if the attribute does not exist.
+     * @return mixed
+     */
+    public function getAttribute(string $name, $default = null);
+
+    /**
+     * Return an instance with the specified derived request attribute.
+     *
+     * This method allows setting a single derived request attribute as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated attribute.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @param mixed $value The value of the attribute.
+     * @return static
+     */
+    public function withAttribute(string $name, $value): ServerRequestInterface;
+
+    /**
+     * Return an instance that removes the specified derived request attribute.
+     *
+     * This method allows removing a single derived request attribute as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the attribute.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @return static
+     */
+    public function withoutAttribute(string $name): ServerRequestInterface;
+}
diff --git a/src/Common/vendor/psr/http-message/src/StreamInterface.php b/src/Common/vendor/psr/http-message/src/StreamInterface.php
new file mode 100644
index 00000000..a62aabb8
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/src/StreamInterface.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Describes a data stream.
+ *
+ * Typically, an instance will wrap a PHP stream; this interface provides
+ * a wrapper around the most common operations, including serialization of
+ * the entire stream to a string.
+ */
+interface StreamInterface
+{
+    /**
+     * Reads all data from the stream into a string, from the beginning to end.
+     *
+     * This method MUST attempt to seek to the beginning of the stream before
+     * reading data and read the stream until the end is reached.
+     *
+     * Warning: This could attempt to load a large amount of data into memory.
+     *
+     * This method MUST NOT raise an exception in order to conform with PHP's
+     * string casting operations.
+     *
+     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
+     * @return string
+     */
+    public function __toString(): string;
+
+    /**
+     * Closes the stream and any underlying resources.
+     *
+     * @return void
+     */
+    public function close(): void;
+
+    /**
+     * Separates any underlying resources from the stream.
+     *
+     * After the stream has been detached, the stream is in an unusable state.
+     *
+     * @return resource|null Underlying PHP stream, if any
+     */
+    public function detach();
+
+    /**
+     * Get the size of the stream if known.
+     *
+     * @return int|null Returns the size in bytes if known, or null if unknown.
+     */
+    public function getSize(): ?int;
+
+    /**
+     * Returns the current position of the file read/write pointer
+     *
+     * @return int Position of the file pointer
+     * @throws \RuntimeException on error.
+     */
+    public function tell(): int;
+
+    /**
+     * Returns true if the stream is at the end of the stream.
+     *
+     * @return bool
+     */
+    public function eof(): bool;
+
+    /**
+     * Returns whether or not the stream is seekable.
+     *
+     * @return bool
+     */
+    public function isSeekable(): bool;
+
+    /**
+     * Seek to a position in the stream.
+     *
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @param int $offset Stream offset
+     * @param int $whence Specifies how the cursor position will be calculated
+     *     based on the seek offset. Valid values are identical to the built-in
+     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
+     *     offset bytes SEEK_CUR: Set position to current location plus offset
+     *     SEEK_END: Set position to end-of-stream plus offset.
+     * @throws \RuntimeException on failure.
+     */
+    public function seek(int $offset, int $whence = SEEK_SET): void;
+
+    /**
+     * Seek to the beginning of the stream.
+     *
+     * If the stream is not seekable, this method will raise an exception;
+     * otherwise, it will perform a seek(0).
+     *
+     * @see seek()
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @throws \RuntimeException on failure.
+     */
+    public function rewind(): void;
+
+    /**
+     * Returns whether or not the stream is writable.
+     *
+     * @return bool
+     */
+    public function isWritable(): bool;
+
+    /**
+     * Write data to the stream.
+     *
+     * @param string $string The string that is to be written.
+     * @return int Returns the number of bytes written to the stream.
+     * @throws \RuntimeException on failure.
+     */
+    public function write(string $string): int;
+
+    /**
+     * Returns whether or not the stream is readable.
+     *
+     * @return bool
+     */
+    public function isReadable(): bool;
+
+    /**
+     * Read data from the stream.
+     *
+     * @param int $length Read up to $length bytes from the object and return
+     *     them. Fewer than $length bytes may be returned if underlying stream
+     *     call returns fewer bytes.
+     * @return string Returns the data read from the stream, or an empty string
+     *     if no bytes are available.
+     * @throws \RuntimeException if an error occurs.
+     */
+    public function read(int $length): string;
+
+    /**
+     * Returns the remaining contents in a string
+     *
+     * @return string
+     * @throws \RuntimeException if unable to read or an error occurs while
+     *     reading.
+     */
+    public function getContents(): string;
+
+    /**
+     * Get stream metadata as an associative array or retrieve a specific key.
+     *
+     * The keys returned are identical to the keys returned from PHP's
+     * stream_get_meta_data() function.
+     *
+     * @link http://php.net/manual/en/function.stream-get-meta-data.php
+     * @param string|null $key Specific metadata to retrieve.
+     * @return array|mixed|null Returns an associative array if no key is
+     *     provided. Returns a specific key value if a key is provided and the
+     *     value is found, or null if the key is not found.
+     */
+    public function getMetadata(?string $key = null);
+}
diff --git a/src/Common/vendor/psr/http-message/src/UploadedFileInterface.php b/src/Common/vendor/psr/http-message/src/UploadedFileInterface.php
new file mode 100644
index 00000000..dd19d653
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Value object representing a file uploaded through an HTTP request.
+ *
+ * Instances of this interface are considered immutable; all methods that
+ * might change state MUST be implemented such that they retain the internal
+ * state of the current instance and return an instance that contains the
+ * changed state.
+ */
+interface UploadedFileInterface
+{
+    /**
+     * Retrieve a stream representing the uploaded file.
+     *
+     * This method MUST return a StreamInterface instance, representing the
+     * uploaded file. The purpose of this method is to allow utilizing native PHP
+     * stream functionality to manipulate the file upload, such as
+     * stream_copy_to_stream() (though the result will need to be decorated in a
+     * native PHP stream wrapper to work with such functions).
+     *
+     * If the moveTo() method has been called previously, this method MUST raise
+     * an exception.
+     *
+     * @return StreamInterface Stream representation of the uploaded file.
+     * @throws \RuntimeException in cases when no stream is available or can be
+     *     created.
+     */
+    public function getStream(): StreamInterface;
+
+    /**
+     * Move the uploaded file to a new location.
+     *
+     * Use this method as an alternative to move_uploaded_file(). This method is
+     * guaranteed to work in both SAPI and non-SAPI environments.
+     * Implementations must determine which environment they are in, and use the
+     * appropriate method (move_uploaded_file(), rename(), or a stream
+     * operation) to perform the operation.
+     *
+     * $targetPath may be an absolute path, or a relative path. If it is a
+     * relative path, resolution should be the same as used by PHP's rename()
+     * function.
+     *
+     * The original file or stream MUST be removed on completion.
+     *
+     * If this method is called more than once, any subsequent calls MUST raise
+     * an exception.
+     *
+     * When used in an SAPI environment where $_FILES is populated, when writing
+     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
+     * used to ensure permissions and upload status are verified correctly.
+     *
+     * If you wish to move to a stream, use getStream(), as SAPI operations
+     * cannot guarantee writing to stream destinations.
+     *
+     * @see http://php.net/is_uploaded_file
+     * @see http://php.net/move_uploaded_file
+     * @param string $targetPath Path to which to move the uploaded file.
+     * @throws \InvalidArgumentException if the $targetPath specified is invalid.
+     * @throws \RuntimeException on any error during the move operation, or on
+     *     the second or subsequent call to the method.
+     */
+    public function moveTo(string $targetPath): void;
+    
+    /**
+     * Retrieve the file size.
+     *
+     * Implementations SHOULD return the value stored in the "size" key of
+     * the file in the $_FILES array if available, as PHP calculates this based
+     * on the actual size transmitted.
+     *
+     * @return int|null The file size in bytes or null if unknown.
+     */
+    public function getSize(): ?int;
+    
+    /**
+     * Retrieve the error associated with the uploaded file.
+     *
+     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
+     *
+     * If the file was uploaded successfully, this method MUST return
+     * UPLOAD_ERR_OK.
+     *
+     * Implementations SHOULD return the value stored in the "error" key of
+     * the file in the $_FILES array.
+     *
+     * @see http://php.net/manual/en/features.file-upload.errors.php
+     * @return int One of PHP's UPLOAD_ERR_XXX constants.
+     */
+    public function getError(): int;
+    
+    /**
+     * Retrieve the filename sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious filename with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "name" key of
+     * the file in the $_FILES array.
+     *
+     * @return string|null The filename sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientFilename(): ?string;
+    
+    /**
+     * Retrieve the media type sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious media type with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "type" key of
+     * the file in the $_FILES array.
+     *
+     * @return string|null The media type sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientMediaType(): ?string;
+}
diff --git a/src/Common/vendor/psr/http-message/src/UriInterface.php b/src/Common/vendor/psr/http-message/src/UriInterface.php
new file mode 100644
index 00000000..15e2cf28
--- /dev/null
+++ b/src/Common/vendor/psr/http-message/src/UriInterface.php
@@ -0,0 +1,324 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Value object representing a URI.
+ *
+ * This interface is meant to represent URIs according to RFC 3986 and to
+ * provide methods for most common operations. Additional functionality for
+ * working with URIs can be provided on top of the interface or externally.
+ * Its primary use is for HTTP requests, but may also be used in other
+ * contexts.
+ *
+ * Instances of this interface are considered immutable; all methods that
+ * might change state MUST be implemented such that they retain the internal
+ * state of the current instance and return an instance that contains the
+ * changed state.
+ *
+ * Typically the Host header will be also be present in the request message.
+ * For server-side requests, the scheme will typically be discoverable in the
+ * server parameters.
+ *
+ * @link http://tools.ietf.org/html/rfc3986 (the URI specification)
+ */
+interface UriInterface
+{
+    /**
+     * Retrieve the scheme component of the URI.
+     *
+     * If no scheme is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.1.
+     *
+     * The trailing ":" character is not part of the scheme and MUST NOT be
+     * added.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.1
+     * @return string The URI scheme.
+     */
+    public function getScheme(): string;
+
+    /**
+     * Retrieve the authority component of the URI.
+     *
+     * If no authority information is present, this method MUST return an empty
+     * string.
+     *
+     * The authority syntax of the URI is:
+     *
+     * <pre>
+     * [user-info@]host[:port]
+     * </pre>
+     *
+     * If the port component is not set or is the standard port for the current
+     * scheme, it SHOULD NOT be included.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.2
+     * @return string The URI authority, in "[user-info@]host[:port]" format.
+     */
+    public function getAuthority(): string;
+
+    /**
+     * Retrieve the user information component of the URI.
+     *
+     * If no user information is present, this method MUST return an empty
+     * string.
+     *
+     * If a user is present in the URI, this will return that value;
+     * additionally, if the password is also present, it will be appended to the
+     * user value, with a colon (":") separating the values.
+     *
+     * The trailing "@" character is not part of the user information and MUST
+     * NOT be added.
+     *
+     * @return string The URI user information, in "username[:password]" format.
+     */
+    public function getUserInfo(): string;
+
+    /**
+     * Retrieve the host component of the URI.
+     *
+     * If no host is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.2.2.
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
+     * @return string The URI host.
+     */
+    public function getHost(): string;
+
+    /**
+     * Retrieve the port component of the URI.
+     *
+     * If a port is present, and it is non-standard for the current scheme,
+     * this method MUST return it as an integer. If the port is the standard port
+     * used with the current scheme, this method SHOULD return null.
+     *
+     * If no port is present, and no scheme is present, this method MUST return
+     * a null value.
+     *
+     * If no port is present, but a scheme is present, this method MAY return
+     * the standard port for that scheme, but SHOULD return null.
+     *
+     * @return null|int The URI port.
+     */
+    public function getPort(): ?int;
+
+    /**
+     * Retrieve the path component of the URI.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * Normally, the empty path "" and absolute path "/" are considered equal as
+     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
+     * do this normalization because in contexts with a trimmed base path, e.g.
+     * the front controller, this difference becomes significant. It's the task
+     * of the user to handle both "" and "/".
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.3.
+     *
+     * As an example, if the value should include a slash ("/") not intended as
+     * delimiter between path segments, that value MUST be passed in encoded
+     * form (e.g., "%2F") to the instance.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.3
+     * @return string The URI path.
+     */
+    public function getPath(): string;
+
+    /**
+     * Retrieve the query string of the URI.
+     *
+     * If no query string is present, this method MUST return an empty string.
+     *
+     * The leading "?" character is not part of the query and MUST NOT be
+     * added.
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.4.
+     *
+     * As an example, if a value in a key/value pair of the query string should
+     * include an ampersand ("&") not intended as a delimiter between values,
+     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.4
+     * @return string The URI query string.
+     */
+    public function getQuery(): string;
+
+    /**
+     * Retrieve the fragment component of the URI.
+     *
+     * If no fragment is present, this method MUST return an empty string.
+     *
+     * The leading "#" character is not part of the fragment and MUST NOT be
+     * added.
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.5.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.5
+     * @return string The URI fragment.
+     */
+    public function getFragment(): string;
+
+    /**
+     * Return an instance with the specified scheme.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified scheme.
+     *
+     * Implementations MUST support the schemes "http" and "https" case
+     * insensitively, and MAY accommodate other schemes if required.
+     *
+     * An empty scheme is equivalent to removing the scheme.
+     *
+     * @param string $scheme The scheme to use with the new instance.
+     * @return static A new instance with the specified scheme.
+     * @throws \InvalidArgumentException for invalid or unsupported schemes.
+     */
+    public function withScheme(string $scheme): UriInterface;
+
+    /**
+     * Return an instance with the specified user information.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified user information.
+     *
+     * Password is optional, but the user information MUST include the
+     * user; an empty string for the user is equivalent to removing user
+     * information.
+     *
+     * @param string $user The user name to use for authority.
+     * @param null|string $password The password associated with $user.
+     * @return static A new instance with the specified user information.
+     */
+    public function withUserInfo(string $user, ?string $password = null): UriInterface;
+
+    /**
+     * Return an instance with the specified host.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified host.
+     *
+     * An empty host value is equivalent to removing the host.
+     *
+     * @param string $host The hostname to use with the new instance.
+     * @return static A new instance with the specified host.
+     * @throws \InvalidArgumentException for invalid hostnames.
+     */
+    public function withHost(string $host): UriInterface;
+
+    /**
+     * Return an instance with the specified port.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified port.
+     *
+     * Implementations MUST raise an exception for ports outside the
+     * established TCP and UDP port ranges.
+     *
+     * A null value provided for the port is equivalent to removing the port
+     * information.
+     *
+     * @param null|int $port The port to use with the new instance; a null value
+     *     removes the port information.
+     * @return static A new instance with the specified port.
+     * @throws \InvalidArgumentException for invalid ports.
+     */
+    public function withPort(?int $port): UriInterface;
+
+    /**
+     * Return an instance with the specified path.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified path.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * If the path is intended to be domain-relative rather than path relative then
+     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
+     * are assumed to be relative to some base path known to the application or
+     * consumer.
+     *
+     * Users can provide both encoded and decoded path characters.
+     * Implementations ensure the correct encoding as outlined in getPath().
+     *
+     * @param string $path The path to use with the new instance.
+     * @return static A new instance with the specified path.
+     * @throws \InvalidArgumentException for invalid paths.
+     */
+    public function withPath(string $path): UriInterface;
+
+    /**
+     * Return an instance with the specified query string.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified query string.
+     *
+     * Users can provide both encoded and decoded query characters.
+     * Implementations ensure the correct encoding as outlined in getQuery().
+     *
+     * An empty query string value is equivalent to removing the query string.
+     *
+     * @param string $query The query string to use with the new instance.
+     * @return static A new instance with the specified query string.
+     * @throws \InvalidArgumentException for invalid query strings.
+     */
+    public function withQuery(string $query): UriInterface;
+
+    /**
+     * Return an instance with the specified URI fragment.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified URI fragment.
+     *
+     * Users can provide both encoded and decoded fragment characters.
+     * Implementations ensure the correct encoding as outlined in getFragment().
+     *
+     * An empty fragment value is equivalent to removing the fragment.
+     *
+     * @param string $fragment The fragment to use with the new instance.
+     * @return static A new instance with the specified fragment.
+     */
+    public function withFragment(string $fragment): UriInterface;
+
+    /**
+     * Return the string representation as a URI reference.
+     *
+     * Depending on which components of the URI are present, the resulting
+     * string is either a full URI or relative reference according to RFC 3986,
+     * Section 4.1. The method concatenates the various components of the URI,
+     * using the appropriate delimiters:
+     *
+     * - If a scheme is present, it MUST be suffixed by ":".
+     * - If an authority is present, it MUST be prefixed by "//".
+     * - The path can be concatenated without delimiters. But there are two
+     *   cases where the path has to be adjusted to make the URI reference
+     *   valid as PHP does not allow to throw an exception in __toString():
+     *     - If the path is rootless and an authority is present, the path MUST
+     *       be prefixed by "/".
+     *     - If the path is starting with more than one "/" and no authority is
+     *       present, the starting slashes MUST be reduced to one.
+     * - If a query is present, it MUST be prefixed by "?".
+     * - If a fragment is present, it MUST be prefixed by "#".
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-4.1
+     * @return string
+     */
+    public function __toString(): string;
+}
diff --git a/src/Common/vendor/psr/simple-cache/LICENSE.md b/src/Common/vendor/psr/simple-cache/LICENSE.md
new file mode 100644
index 00000000..e49a7c85
--- /dev/null
+++ b/src/Common/vendor/psr/simple-cache/LICENSE.md
@@ -0,0 +1,21 @@
+# The MIT License (MIT)
+
+Copyright (c) 2016 PHP Framework Interoperability Group
+
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.
diff --git a/src/Common/vendor/psr/simple-cache/README.md b/src/Common/vendor/psr/simple-cache/README.md
new file mode 100644
index 00000000..43641d17
--- /dev/null
+++ b/src/Common/vendor/psr/simple-cache/README.md
@@ -0,0 +1,8 @@
+PHP FIG Simple Cache PSR
+========================
+
+This repository holds all interfaces related to PSR-16.
+
+Note that this is not a cache implementation of its own. It is merely an interface that describes a cache implementation. See [the specification](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-16-simple-cache.md) for more details.
+
+You can find implementations of the specification by looking for packages providing the [psr/simple-cache-implementation](https://packagist.org/providers/psr/simple-cache-implementation) virtual package.
diff --git a/src/Common/vendor/psr/simple-cache/composer.json b/src/Common/vendor/psr/simple-cache/composer.json
new file mode 100644
index 00000000..f307a845
--- /dev/null
+++ b/src/Common/vendor/psr/simple-cache/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "psr/simple-cache",
+    "description": "Common interfaces for simple caching",
+    "keywords": ["psr", "psr-16", "cache", "simple-cache", "caching"],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": ">=8.0.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\SimpleCache\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.0.x-dev"
+        }
+    }
+}
diff --git a/src/Common/vendor/psr/simple-cache/src/CacheException.php b/src/Common/vendor/psr/simple-cache/src/CacheException.php
new file mode 100644
index 00000000..f61b24c2
--- /dev/null
+++ b/src/Common/vendor/psr/simple-cache/src/CacheException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Psr\SimpleCache;
+
+/**
+ * Interface used for all types of exceptions thrown by the implementing library.
+ */
+interface CacheException extends \Throwable
+{
+}
diff --git a/src/Common/vendor/psr/simple-cache/src/CacheInterface.php b/src/Common/vendor/psr/simple-cache/src/CacheInterface.php
new file mode 100644
index 00000000..671e340c
--- /dev/null
+++ b/src/Common/vendor/psr/simple-cache/src/CacheInterface.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Psr\SimpleCache;
+
+interface CacheInterface
+{
+    /**
+     * Fetches a value from the cache.
+     *
+     * @param string $key     The unique key of this item in the cache.
+     * @param mixed  $default Default value to return if the key does not exist.
+     *
+     * @return mixed The value of the item from the cache, or $default in case of cache miss.
+     *
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function get(string $key, mixed $default = null): mixed;
+
+    /**
+     * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
+     *
+     * @param string                 $key   The key of the item to store.
+     * @param mixed                  $value The value of the item to store, must be serializable.
+     * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
+     *                                      the driver supports TTL then the library may set a default value
+     *                                      for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function set(string $key, mixed $value, null|int|\DateInterval $ttl = null): bool;
+
+    /**
+     * Delete an item from the cache by its unique key.
+     *
+     * @param string $key The unique cache key of the item to delete.
+     *
+     * @return bool True if the item was successfully removed. False if there was an error.
+     *
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function delete(string $key): bool;
+
+    /**
+     * Wipes clean the entire cache's keys.
+     *
+     * @return bool True on success and false on failure.
+     */
+    public function clear(): bool;
+
+    /**
+     * Obtains multiple cache items by their unique keys.
+     *
+     * @param iterable<string> $keys    A list of keys that can be obtained in a single operation.
+     * @param mixed            $default Default value to return for keys that do not exist.
+     *
+     * @return iterable<string, mixed> A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
+     *
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     *   MUST be thrown if $keys is neither an array nor a Traversable,
+     *   or if any of the $keys are not a legal value.
+     */
+    public function getMultiple(iterable $keys, mixed $default = null): iterable;
+
+    /**
+     * Persists a set of key => value pairs in the cache, with an optional TTL.
+     *
+     * @param iterable               $values A list of key => value pairs for a multiple-set operation.
+     * @param null|int|\DateInterval $ttl    Optional. The TTL value of this item. If no value is sent and
+     *                                       the driver supports TTL then the library may set a default value
+     *                                       for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     *   MUST be thrown if $values is neither an array nor a Traversable,
+     *   or if any of the $values are not a legal value.
+     */
+    public function setMultiple(iterable $values, null|int|\DateInterval $ttl = null): bool;
+
+    /**
+     * Deletes multiple cache items in a single operation.
+     *
+     * @param iterable<string> $keys A list of string-based keys to be deleted.
+     *
+     * @return bool True if the items were successfully removed. False if there was an error.
+     *
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     *   MUST be thrown if $keys is neither an array nor a Traversable,
+     *   or if any of the $keys are not a legal value.
+     */
+    public function deleteMultiple(iterable $keys): bool;
+
+    /**
+     * Determines whether an item is present in the cache.
+     *
+     * NOTE: It is recommended that has() is only to be used for cache warming type purposes
+     * and not to be used within your live applications operations for get/set, as this method
+     * is subject to a race condition where your has() will return true and immediately after,
+     * another script can remove it making the state of your app out of date.
+     *
+     * @param string $key The cache item key.
+     *
+     * @return bool
+     *
+     * @throws \Psr\SimpleCache\InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function has(string $key): bool;
+}
diff --git a/src/Common/vendor/psr/simple-cache/src/InvalidArgumentException.php b/src/Common/vendor/psr/simple-cache/src/InvalidArgumentException.php
new file mode 100644
index 00000000..6a9524a2
--- /dev/null
+++ b/src/Common/vendor/psr/simple-cache/src/InvalidArgumentException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Psr\SimpleCache;
+
+/**
+ * Exception interface for invalid cache arguments.
+ *
+ * When an invalid argument is passed it must throw an exception which implements
+ * this interface
+ */
+interface InvalidArgumentException extends CacheException
+{
+}
diff --git a/src/Final/Fun_ChangePhase.inc.php b/src/Final/Fun_ChangePhase.inc.php
index b1a1be0c..b8aa2d1f 100644
--- a/src/Final/Fun_ChangePhase.inc.php
+++ b/src/Final/Fun_ChangePhase.inc.php
@@ -26,6 +26,7 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
 
 //Verifico la situazione tiebreak
 	$Confirmed=array();
+    $movedCoaches=array();
 	$Select = "SELECT f.FinEvent, EvMatchMode as MatchMode, 
             EvCheckGolds, EvCheckXNines, if(EvGoldsChars!='', EvGoldsChars, ToGoldsChars) as GoldChars, if(EvXNineChars!='', EvXNineChars, ToXNineChars) as XNineChars, 
             f.FinMatchNo as MatchNo, f2.FinMatchNo as OppMatchNo,  EvFinalFirstPhase,
@@ -83,14 +84,14 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
                     $SqlUpdate = "UPDATE Finals SET FinTie=2, FinWinLose=1, FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=" . StrSafe_DB($MyRow->MatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
                     safe_w_sql($SqlUpdate);
                 }
-            } elseif($MyRow->FollowBye) {
-                if($MyRow->Athlete!= 0 and $MyRow->OppAthlete==0 and $MyRow->Score == 0 and $MyRow->OppScore==0) {
+            } elseif($MyRow->FollowBye and $MyRow->Score == 0 and $MyRow->OppScore==0 and (($MyRow->Athlete!= 0 and $MyRow->OppAthlete==0) or ($MyRow->Athlete== 0 and $MyRow->OppAthlete!=0))) {
+                if($MyRow->Athlete!= 0 and $MyRow->OppAthlete==0) {
                     //Se uno dei due ATLETI è ZERO ed ENTRAMBI GLI SCORES sono a ZERO imposto il Bye
                     $SqlUpdate = "UPDATE Finals SET FinTie=0, FinWinLose=0, FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=". StrSafe_DB($MyRow->OppMatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
                     safe_w_sql($SqlUpdate);
                     $SqlUpdate = "UPDATE Finals SET FinTie=2, FinWinLose=1, FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=". StrSafe_DB($MyRow->MatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
                     safe_w_sql($SqlUpdate);
-                } elseif($MyRow->Athlete== 0 and $MyRow->OppAthlete!=0 and $MyRow->Score == 0 and $MyRow->OppScore==0) {
+                } elseif($MyRow->Athlete== 0 and $MyRow->OppAthlete!=0) {
                     $SqlUpdate = "UPDATE Finals SET FinTie=0, FinWinLose=0, FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=". StrSafe_DB($MyRow->MatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
                     safe_w_sql($SqlUpdate);
                     $SqlUpdate = "UPDATE Finals SET FinTie=2, FinWinLose=1, FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=". StrSafe_DB($MyRow->OppMatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
@@ -107,36 +108,35 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
                     $OppScore=0;
                     $AthWin=0;
                     $OppWin=0;
-                    if(count($AthSets) == count($OppSets)) {
-                        for($i=0;$i<count($AthSets);$i++) {
-                            if(intval($AthSets[$i])>intval($OppSets[$i])) {
-                                $AthScore += 2;
-                                $AthWin++;
-                                $AthSpBe[]=2;
-                                $OppSpBe[]=0;
-                            } elseif(intval($AthSets[$i])<intval($OppSets[$i])) {
-                                $OppScore += 2;
-                                $OppWin++;
-                                $AthSpBe[]=0;
-                                $OppSpBe[]=2;
-                            } elseif(intval($AthSets[$i])!=0 and intval($OppSets[$i])!=0) {
-                                $AthScore += 1;
-                                $OppScore += 1;
-                                $AthSpBe[]=1;
-                                $OppSpBe[]=1;
-                            }
-                        }
-                        if($AthScore > $MyRow->FinEnds+2 or $OppScore > $MyRow->FinEnds+2) {
-                            $AthScore=0;
-                            $OppScore=0;
+                    $NumSets=min(count($AthSets), count($OppSets));
+                    for($i=0;$i<$NumSets;$i++) {
+                        if(intval($AthSets[$i])>intval($OppSets[$i])) {
+                            $AthScore += 2;
+                            $AthWin++;
+                            $AthSpBe[]=2;
+                            $OppSpBe[]=0;
+                        } elseif(intval($AthSets[$i])<intval($OppSets[$i])) {
+                            $OppScore += 2;
+                            $OppWin++;
+                            $AthSpBe[]=0;
+                            $OppSpBe[]=2;
+                        } elseif(intval($AthSets[$i])!=0 and intval($OppSets[$i])!=0) {
+                            $AthScore += 1;
+                            $OppScore += 1;
+                            $AthSpBe[]=1;
+                            $OppSpBe[]=1;
                         }
-                        $SqlUpdate = "UPDATE Finals SET FinWinLose=".($AthScore>$MyRow->FinEnds ? 1 : 0).", FinSetPointsByEnd='".implode('|', $AthSpBe)."', FinSetScore=" . StrSafe_DB($AthScore) . ", FinWinnerSet=" . StrSafe_DB($AthWin) . ", FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=" . StrSafe_DB($MyRow->MatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
-                        safe_w_sql($SqlUpdate);
-                        $MyRow->Score=$AthScore;
-                        $SqlUpdate = "UPDATE Finals SET FinWinLose=".($OppScore>$MyRow->FinEnds ? 1 : 0).", FinSetPointsByEnd='".implode('|', $OppSpBe)."', FinSetScore=" . StrSafe_DB($OppScore) . ", FinWinnerSet=" . StrSafe_DB($OppWin) . ", FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=" . StrSafe_DB($MyRow->OppMatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
-                        safe_w_sql($SqlUpdate);
-                        $MyRow->OppScore=$OppScore;
                     }
+                    if($AthScore > $MyRow->FinEnds+2 or $OppScore > $MyRow->FinEnds+2) {
+                        $AthScore=0;
+                        $OppScore=0;
+                    }
+                    $SqlUpdate = "UPDATE Finals SET FinWinLose=".($AthScore>$MyRow->FinEnds ? 1 : 0).", FinSetPointsByEnd='".implode('|', $AthSpBe)."', FinSetScore=" . StrSafe_DB($AthScore) . ", FinWinnerSet=" . StrSafe_DB($AthWin) . ", FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=" . StrSafe_DB($MyRow->MatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
+                    safe_w_sql($SqlUpdate);
+                    $MyRow->Score=$AthScore;
+                    $SqlUpdate = "UPDATE Finals SET FinWinLose=".($OppScore>$MyRow->FinEnds ? 1 : 0).", FinSetPointsByEnd='".implode('|', $OppSpBe)."', FinSetScore=" . StrSafe_DB($OppScore) . ", FinWinnerSet=" . StrSafe_DB($OppWin) . ", FinDateTime=" . StrSafe_DB(date('Y-m-d H:i:s')) . " WHERE FinEvent=" . StrSafe_DB($MyRow->FinEvent) . " AND FinMatchNo=" . StrSafe_DB($MyRow->OppMatchNo) . " AND FinTournament=" . StrSafe_DB($TourId);
+                    safe_w_sql($SqlUpdate);
+                    $MyRow->OppScore=$OppScore;
                 }
             }
 
@@ -336,6 +336,9 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
 						// update FinOdfTiming data
 						if(safe_w_affected_rows()) {
 							updateOdfTiming('S', $TourId, $MyRow->Event, 0, $MyRow->NextMatchNo);
+                            if($MyRow->Coach!=0) {
+                                $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $MyRow->NextMatchNo);
+                            }
 						}
 
 						$AthProp=$MyRow->Athlete;
@@ -352,6 +355,9 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
 							// update FinOdfTiming data
 							if(safe_w_affected_rows()) {
 								updateOdfTiming('S', $TourId, $MyRow->Event, 0, $MyRow->NextMatchNo+2);
+                                if($MyRow->OppCoach!=0) {
+                                    $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $MyRow->NextMatchNo+2);
+                                }
 							}
 						}
 					}
@@ -378,6 +384,9 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
 						// update FinOdfTiming data
 						if(safe_w_affected_rows()) {
 							updateOdfTiming('S', $TourId, $MyRow->Event, 0, $ShowMatchWinner);
+                            if($MyRow->OppCoach!=0) {
+                                $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $ShowMatchWinner);
+                            }
 						}
 
 						$MyUpQuery = "UPDATE Finals SET
@@ -389,6 +398,9 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
 						// update FinOdfTiming data
 						if(safe_w_affected_rows()) {
 							updateOdfTiming('S', $TourId, $MyRow->Event, 0, $ShowMatchLoser);
+                            if($MyRow->Coach!=0) {
+                                $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $ShowMatchLoser);
+                            }
 						}
 					} else {
 						$MyUpQuery = "UPDATE Finals SET
@@ -400,6 +412,9 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
 						// update FinOdfTiming data
 						if(safe_w_affected_rows()) {
 							updateOdfTiming('S', $TourId, $MyRow->Event, 0, $MyRow->NextMatchNo);
+                            if($MyRow->OppCoach!=0) {
+                                $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $MyRow->NextMatchNo);
+                            }
 						}
 
 						$AthProp=$MyRow->OppAthlete;
@@ -415,6 +430,9 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
 							// update FinOdfTiming data
 							if(safe_w_affected_rows()) {
 								updateOdfTiming('S', $TourId, $MyRow->Event, 0, $MyRow->NextMatchNo+2);
+                                if($MyRow->Coach!=0) {
+                                    $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $MyRow->NextMatchNo+2);
+                                }
 							}
 						}
 					}
@@ -544,6 +562,9 @@ function move2NextPhase($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0, $NoR
 	foreach($Confirmed as $Item) {
 		runJack("MatchConfirmed", $TourId, array("Event"=>$Item['event'], "Team"=>0, "MatchNo"=>$Item['matchno'], "TourId"=>$TourId));
 	}
+    foreach ($movedCoaches as $Item) {
+        runJack("CoachAssigned", $TourId, array("Event"=>$Item['event'], "Team"=>0, "MatchNo"=>$Item['matchno'], "TourId"=>$TourId));
+    }
 
 	return $AthPropTs;
 }
@@ -560,6 +581,7 @@ function move2NextPhaseTeam($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0,
 
 //Verifico la situazione tiebreak
 	$Confirmed=array();
+    $movedCoaches=array();
 	$Select = "SELECT EvMatchMode as MatchMode, tf.TfEvent, tf.TfMatchNo as MatchNo, tf2.TfMatchNo as OppMatchNo, tf.TfTbClosest Closest, tf2.TfTbClosest OppClosest,
             EvCheckGolds, EvCheckXNines, if(EvGoldsChars!='', EvGoldsChars, ToGoldsChars) as GoldChars, if(EvXNineChars!='', EvXNineChars, ToXNineChars) as XNineChars, 
 			tf.TfTeam AS Team, tf.TfSubteam AS SubTeam, tf2.TfTeam AS OppTeam, tf2.TfSubTeam AS OppSubTeam, tf.TfConfirmed as IsConfirmed, 
@@ -788,6 +810,9 @@ function move2NextPhaseTeam($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0,
 					// update FinOdfTiming data
 					if(safe_w_affected_rows()) {
 						updateOdfTiming('S', $TourId, $MyRow->Event, 1, $MyRow->NextMatchNo);
+                        if($MyRow->Coach!=0) {
+                            $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $MyRow->NextMatchNo);
+                        }
 					}
 
 					$AthProp=$MyRow->Team;
@@ -807,6 +832,9 @@ function move2NextPhaseTeam($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0,
 						if(safe_w_affected_rows()) {
 							// update FinOdfTiming data
 							updateOdfTiming('S', $TourId, $MyRow->Event, 1, $MyRow->NextMatchNo+2);
+                            if($MyRow->OppCoach!=0) {
+                                $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $MyRow->NextMatchNo+2);
+                            }
 						}
 					}
 				}
@@ -823,6 +851,9 @@ function move2NextPhaseTeam($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0,
 					if(safe_w_affected_rows()) {
 						// update FinOdfTiming data
 						updateOdfTiming('S', $TourId, $MyRow->Event, 1, $MyRow->NextMatchNo);
+                        if($MyRow->OppCoach!=0) {
+                            $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $MyRow->NextMatchNo);
+                        }
 					}
 
 					$AthProp=$MyRow->OppTeam;
@@ -842,6 +873,9 @@ function move2NextPhaseTeam($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0,
 						if(safe_w_affected_rows()) {
 							// update FinOdfTiming data
 							updateOdfTiming('S', $TourId, $MyRow->Event, 1, $MyRow->NextMatchNo+2);
+                            if($MyRow->Coach!=0) {
+                                $movedCoaches[]=array('event' => $MyRow->Event, 'matchno' => $MyRow->NextMatchNo+2);
+                            }
 						}
 					}
 				}
@@ -920,6 +954,9 @@ function move2NextPhaseTeam($Phase=NULL, $Event=NULL, $MatchNo=NULL, $TourId=0,
 	foreach($Confirmed as $Item) {
 		runJack("MatchConfirmed", $TourId, array("Event"=>$Item['event'], "Team"=>1, "MatchNo"=>$Item['matchno'], "TourId"=>$TourId));
 	}
+    foreach ($movedCoaches as $Item) {
+        runJack("CoachAssigned", $TourId, array("Event"=>$Item['event'], "Team"=>1, "MatchNo"=>$Item['matchno'], "TourId"=>$TourId));
+    }
 
 	return $AthPropTs;
 }
diff --git a/src/Final/Fun_MatchTotal.inc.php b/src/Final/Fun_MatchTotal.inc.php
index 52f6fb28..f553ce06 100644
--- a/src/Final/Fun_MatchTotal.inc.php
+++ b/src/Final/Fun_MatchTotal.inc.php
@@ -115,6 +115,7 @@ function UpdateArrowPosition($MatchNo, $EvCode, $TeamEvent, $ArrowIndex, $Positi
     }
 
     $MatchUpdated=false; // server per aggiornare il timestamp
+    $origArrowIndex = $ArrowIndex;
     $isShootOff = boolval($ArrowIndex >= ($obj->ends*$obj->arrows));
     if($isShootOff){
         $ArrowIndex = $ArrowIndex - intval($obj->ends*$obj->arrows);
@@ -145,16 +146,30 @@ function UpdateArrowPosition($MatchNo, $EvCode, $TeamEvent, $ArrowIndex, $Positi
         }
         if(!is_null($Position)) {
             foreach($Position as $k=>$v) {
-                $ArrowData[$ArrowIndex][$k]=$v;
+                if (!array_key_exists($k, $ArrowData[$ArrowIndex]) OR $ArrowData[$ArrowIndex][$k] != round(floatval($v),1)) {
+                    $MatchUpdated = true;
+                    $ArrowData[$ArrowIndex][$k] = round(floatval($v),1);
+                }
             }
         }
         if(!is_null($Wind)) {
             foreach($Wind as $k=>$v) {
+                if ($k="Ws" AND (!array_key_exists("Ws", $ArrowData[$ArrowIndex]) OR  $ArrowData[$ArrowIndex][$k] != round(floatval($v),1))) {
+                    $MatchUpdated = true;
+                    $ArrowData[$ArrowIndex][$k] = round(floatval($v),1);
+                }
+                if ($k="Wd" AND (!array_key_exists("Wd", $ArrowData[$ArrowIndex]) OR $ArrowData[$ArrowIndex][$k] != intval($v))) {
+                    $MatchUpdated = true;
+                    $ArrowData[$ArrowIndex][$k] = intval($v);
+                }
                 $ArrowData[$ArrowIndex][$k]=$v;
             }
         }
         if(!is_null($Time)) {
-            $ArrowData[$ArrowIndex]['T']=$Time;
+            if (!array_key_exists("T", $ArrowData[$ArrowIndex]) OR $ArrowData[$ArrowIndex]['T'] != intval($Time)) {
+                $MatchUpdated = true;
+                $ArrowData[$ArrowIndex]['T'] = intval($Time);
+            }
         }
     }
 
@@ -217,6 +232,20 @@ function UpdateArrowPosition($MatchNo, $EvCode, $TeamEvent, $ArrowIndex, $Positi
     safe_w_sql($Sql);
 
     if(safe_w_affected_rows()) {
+        $t = microtime(true);
+        $micro = sprintf("%06d",($t - floor($t)) * 1000000);
+        $d = new DateTime( date('Y-m-d H:i:s.'.$micro, intval($t)));
+
+        $Sql = "UPDATE "
+            . ($TeamEvent==0 ? "Finals" : "TeamFinals") . " "
+            . "SET "
+            . "{$TablePrefix}DateTime='".$d->format('Y-m-d H:i:s.u')."' "
+            . "WHERE "
+            . " {$TablePrefix}Event = '{$MyRow->EvCode}' "
+            . "AND {$TablePrefix}MatchNo = {$MyRow->MatchNo} "
+            . "AND {$TablePrefix}Tournament={$CompId} "
+            . "AND {$TablePrefix}Live!=0";
+        safe_w_sql($Sql);
         // updates the timing
         $Sql = "Insert into FinOdfTiming
 			SET FinOdfArrows=".StrSafe_DB(json_encode($ArrowTiming)).",
@@ -250,6 +279,9 @@ function UpdateArrowPosition($MatchNo, $EvCode, $TeamEvent, $ArrowIndex, $Positi
             . "AND {$TablePrefix}Tournament={$CompId}";
         safe_w_sql($Sql);
     }
+    if($MatchUpdated) {
+        runJack("FinArrPosUpdate", $CompId, array("Event" => $MyRow->EvCode, "Team" => ($TeamEvent ? 1 : 0), "MatchNo" => $MyRow->MatchNo, "ArrowStart" => $origArrowIndex, "ArrowEnd" => $origArrowIndex + 1, "Side" => ($MyRow->MatchNo % 2), "TourId" => $CompId));
+    }
     return $retValue;
 }
 
@@ -343,6 +375,7 @@ function DeleteArrowPosition($MatchNo, $EvCode, $TeamEvent, $ArrowIndex, $ToId=0
 		$MyRow=safe_fetch($Rs);
 
 		$obj=getEventArrowsParams($MyRow->EvCode,$MyRow->GrPhase,$TeamEvent, $CompId);
+        $origArrowIndex = $ArrowIndex;
 		$isShootOff = boolval($ArrowIndex >= ($obj->ends*$obj->arrows));
 		if($isShootOff){
             $ArrowIndex = $ArrowIndex - intval($obj->ends*$obj->arrows);
@@ -357,6 +390,7 @@ function DeleteArrowPosition($MatchNo, $EvCode, $TeamEvent, $ArrowIndex, $ToId=0
 
         if(!empty($ArrowData[$ArrowIndex])) {
             unset($ArrowData[$ArrowIndex]);
+            $MatchUpdated = true;
         }
 
 		$Sql = "UPDATE "
@@ -385,6 +419,9 @@ function DeleteArrowPosition($MatchNo, $EvCode, $TeamEvent, $ArrowIndex, $ToId=0
 				. "AND {$TablePrefix}Tournament={$CompId}";
 			safe_w_sql($Sql);
 		}
+        if($MatchUpdated) {
+            runJack("FinArrPosUpdate", $CompId, array("Event" => $MyRow->EvCode, "Team" => ($TeamEvent ? 1 : 0), "MatchNo" => $MyRow->MatchNo, "ArrowStart" => $origArrowIndex, "ArrowEnd" => $origArrowIndex + 1, "Side" => ($MyRow->MatchNo % 2), "TourId" => $CompId));
+        }
 	}
 	return $retValue;
 }
@@ -484,6 +521,22 @@ function UpdateArrowString($MatchNo, $EvCode, $TeamEvent, $ArrowString, $ArrowSt
 
 		safe_w_sql($query);
 		if(safe_w_affected_rows() or $MatchChanged) {
+            $t = microtime(true);
+            $micro = sprintf("%06d",($t - floor($t)) * 1000000);
+            $d = new DateTime( date('Y-m-d H:i:s.'.$micro, intval($t)));
+
+            if(safe_w_affected_rows()) {
+                $Sql = "UPDATE "
+                    . ($TeamEvent==0 ? "Finals" : "TeamFinals") . " "
+                    . "SET "
+                    . "{$TablePrefix}DateTime='".$d->format('Y-m-d H:i:s.u')."' "
+                    . "WHERE "
+                    . " {$TablePrefix}Event = '{$MyRow->EvCode}' "
+                    . "AND {$TablePrefix}MatchNo = {$MyRow->MatchNo} "
+                    . "AND {$TablePrefix}Tournament={$CompId}";
+                safe_w_sql($Sql);
+            }
+
 			// update ODF
 			if($ArrowStart==0 and $Len==1) {
 				// sets the ODF live flag
@@ -578,7 +631,7 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 		'FinTbClosest' => "{$Prefix}TbClosest=$r->TbClosest1",
 		'FinTbDecoded' => "{$Prefix}TbDecoded=".StrSafe_DB($r->TbDecoded1),
 		'FinWinLose' => "{$Prefix}WinLose=$r->WinLose1",
-		'FinDateTime' => "{$Prefix}DateTime=now()",
+		'FinDateTime' => "{$Prefix}DateTime={$Prefix}DateTime",
 		'FinStatus' => "{$Prefix}Status=$r->Status1",
 		'FinConfirmed' => "{$Prefix}Confirmed=$r->Confirmed1",
 	];
@@ -592,7 +645,7 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 		'FinTbClosest' => "{$Prefix}TbClosest=$r->TbClosest2",
 		'FinTbDecoded' => "{$Prefix}TbDecoded=".StrSafe_DB($r->TbDecoded2),
 		'FinWinLose' => "{$Prefix}WinLose=$r->WinLose1",
-		'FinDateTime' => "{$Prefix}DateTime=now()",
+		'FinDateTime' => "{$Prefix}DateTime={$Prefix}DateTime",
 		'FinStatus' => "{$Prefix}Status=$r->Status2",
 		'FinConfirmed' => "{$Prefix}Confirmed=$r->Confirmed2",
 	];
@@ -676,10 +729,13 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 			// Recalculate single ends
 			$TbEnds1=[];
 			$TbEnds2=[];
+            $noUnsure = true;
+            $tmpRegExp="";
 
 			if($r->Tiebreak1) {
 				foreach(str_split(rtrim($r->Tiebreak1), $obj->so) as $bit) {
 					$TbEnds1[]=ValutaArrowString($bit);
+                    $noUnsure = ($noUnsure AND (RaiseStars($bit,$tmpRegExp, $Event,$Team,$CompId) == 0));
 					$LastSOBit1=$bit;
 				}
 			}
@@ -688,6 +744,7 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 			if($r->Tiebreak2) {
 				foreach(str_split(rtrim($r->Tiebreak2), $obj->so) as $bit) {
 					$TbEnds2[]=ValutaArrowString($bit);
+                    $noUnsure = ($noUnsure AND (RaiseStars($bit,$tmpRegExp, $Event,$Team,$CompId) == 0));
 					$LastSOBit2=$bit;
 				}
 			}
@@ -695,7 +752,7 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 
 			// if the values are the same and no closest is set, check if we have an implicit closest!
             // This is only valid for 1 X!!!
-			if(strlen($LastSOBit1)==strlen($LastSOBit2) and strlen($LastSOBit1)==$obj->so and count($TbEnds1)==count($TbEnds2) and end($TbEnds1)==end($TbEnds2) and !$r->TbClosest1 and !$r->TbClosest2) {
+			if($noUnsure and strlen($LastSOBit1)==strlen($LastSOBit2) and strlen($LastSOBit1)==$obj->so and count($TbEnds1)==count($TbEnds2) and end($TbEnds1)==end($TbEnds2) and !$r->TbClosest1 and !$r->TbClosest2) {
                 $XChar=($r->EvCheckGolds ? $r->Golds : ($r->EvCheckXNines? $r->XNines : null));
                 list($Tot1, $MaxWeight1, $TotStars1, $TotX1, $LettersSorted1, $Letters1)=ValutaArrowStringSO(strtoupper($LastSOBit1), $XChar, $XChar?'A':null);
 				list($Tot2, $MaxWeight2, $TotStars2, $TotX2, $LettersSorted2, $Letters2)=ValutaArrowStringSO(strtoupper($LastSOBit2), $XChar, $XChar?'A':null);
@@ -719,7 +776,10 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 						$r->TbDecoded1.='+';
 					}
 				}
-			}
+			} else if (!$noUnsure) {
+                $r->TbClosest1=0;
+                $r->TbClosest2=0;
+            }
 		}
 
 		// do we have single ends scores?
@@ -938,6 +998,7 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 	$UpdateSql1['FinSetPoints'] = "{$Prefix}SetPoints=".StrSafe_DB($r->SetPoints1);
 	$UpdateSql1['FinSetPointsByEnd'] = "{$Prefix}SetPointsByEnd=".StrSafe_DB($r->SetPointsByEnd1);
 	$UpdateSql1['FinWinnerSet'] = "{$Prefix}WinnerSet=$r->WinnerSet1";
+    $UpdateSql1['FinTbClosest'] = "{$Prefix}TbClosest=$r->TbClosest1";
 	$UpdateSql1['FinTbDecoded'] = "{$Prefix}TbDecoded=".StrSafe_DB($r->TbDecoded1);
 	$UpdateSql1['FinWinLose'] = "{$Prefix}WinLose=$r->WinLose1";
 	$UpdateSql1['FinTie'] = "{$Prefix}Tie=$r->Tie1";
@@ -949,6 +1010,7 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 	$UpdateSql2['FinSetPoints'] = "{$Prefix}SetPoints=".StrSafe_DB($r->SetPoints2);
 	$UpdateSql2['FinSetPointsByEnd'] = "{$Prefix}SetPointsByEnd=".StrSafe_DB($r->SetPointsByEnd2);
 	$UpdateSql2['FinWinnerSet'] = "{$Prefix}WinnerSet=$r->WinnerSet2";
+    $UpdateSql2['FinTbClosest'] = "{$Prefix}TbClosest=$r->TbClosest2";
 	$UpdateSql2['FinTbDecoded'] = "{$Prefix}TbDecoded=".StrSafe_DB($r->TbDecoded2);
 	$UpdateSql2['FinWinLose'] = "{$Prefix}WinLose=$r->WinLose2";
 	$UpdateSql2['FinTie'] = "{$Prefix}Tie=$r->Tie2";
@@ -997,406 +1059,6 @@ function EvaluateMatch($Event, $Team, $Matchno, $CompId=0, $Recalculate=true, $P
 		}
 	}
 
-	runJack("FinArrUpdate", $CompId, array("Event"=>$Event, "Team"=>$Team, "MatchNo"=>$r->MatchNo1, "ArrowStart"=>$ArrowStart, "ArrowEnd"=>$ArrowEnd, "Side"=>$ArrowSide, "TourId"=>$CompId));
+	runJack("FinArrUpdate", $CompId, array("Event"=>$Event, "Team"=>$Team, "MatchNo"=>$Matchno, "ArrowStart"=>$ArrowStart, "ArrowEnd"=>$ArrowEnd, "Side"=>$ArrowSide, "TourId"=>$CompId));
 	return $MatchFinished; // ALL GOOD!!!
 }
-
-// function MatchTotal($MatchNo, $EvCode, $TeamEvent=0, $ToId=0) {
-// 	$CompId = $ToId;
-// 	if(empty($CompId) && !empty($_SESSION['TourId']))
-// 		$CompId = $_SESSION['TourId'];
-//
-// 	if(is_null($MatchNo) || is_null($EvCode))	//Devono esistere sia il MatchNo che l'evento
-// 		return;
-//
-// 	$MatchFinished=false; // serve per vedere se il match è finito
-// 	$TablePrefix = "Fin";
-// 	$Select = "SELECT
-// 			f.FinEvent as EvCode, f.FinMatchNo as MatchNo, f2.FinMatchNo as OppMatchNo, EvMatchMode, EvMatchArrowsNo,
-// 			IF(f.FinDateTime>=f2.FinDateTime, f.FinDateTime, f2.FinDateTime) AS DateTime,
-// 			f.FinScore AS Score, f.FinSetScore AS SetScore, f.FinTie as Tie, IFNULL(f.FinArrowString,'') as ArString, IFNULL(f.FinTieBreak,'') as TbString, IFNULL(f.FinTbClosest,'') as TbClosest,
-// 			f2.FinScore AS OppScore, f2.FinSetScore AS OppSetScore, f2.FinTie as OppTie, IFNULL(f2.FinArrowString,'') as OppArString, IFNULL(f2.FinTieBreak,'') as OppTbString, IFNULL(f2.FinTbClosest,'') as OppTbClosest,
-// 			GrPhase
-// 		FROM Finals AS f
-// 		INNER JOIN Finals AS f2 ON f.FinEvent=f2.FinEvent AND f.FinMatchNo=IF((f.FinMatchNo % 2)=0,f2.FinMatchNo-1,f2.FinMatchNo+1) AND f.FinTournament=f2.FinTournament
-// 		INNER JOIN Events ON f.FinEvent=EvCode AND f.FinTournament=EvTournament AND EvTeamEvent=0
-// 		INNER JOIN Grids ON f.FinMatchNo=GrMatchNo
-// 		WHERE f.FinTournament=" . StrSafe_DB($CompId) . " AND (f.FinMatchNo % 2)=0 AND GrMatchNo=" . StrSafe_DB(($MatchNo % 2 == 0 ? $MatchNo:$MatchNo-1)) . " AND f.FinEvent=" . StrSafe_DB($EvCode) . "
-// 		ORDER BY f.FinEvent, f.FinMatchNo ";
-//
-// 	if($TeamEvent) {
-// 		$TablePrefix = "Tf";
-// 		$Select = "SELECT
-// 				f.TfEvent as EvCode, f.TfMatchNo as MatchNo, f2.TfMatchNo as OppMatchNo, EvMatchMode, EvMatchArrowsNo,
-// 				IF(f.TfDateTime>=f2.TfDateTime, f.TfDateTime, f2.TfDateTime) AS DateTime,
-// 				f.TfScore AS Score, f.TfSetScore AS SetScore, f.TfTie as Tie, IFNULL(f.TfArrowString,'') as ArString, IFNULL(f.TfTieBreak,'') as TbString, IFNULL(f.TfTbClosest,'') as TbClosest,
-// 				f2.TfScore AS OppScore, f2.TfSetScore AS OppSetScore, f2.TfTie as OppTie, IFNULL(f2.TfArrowString,'') as OppArString, IFNULL(f2.TfTieBreak,'') as OppTbString, IFNULL(f2.TfTbClosest,'') as OppTbClosest,
-// 				GrPhase
-// 			FROM TeamFinals AS f
-// 			INNER JOIN TeamFinals AS f2 ON f.TfEvent=f2.TfEvent AND f.TfMatchNo=IF((f.TfMatchNo % 2)=0,f2.TfMatchNo-1,f2.TfMatchNo+1) AND f.TfTournament=f2.TfTournament
-// 			INNER JOIN Events ON f.TfEvent=EvCode AND f.TfTournament=EvTournament AND EvTeamEvent=1
-// 			INNER JOIN Grids ON f.TfMatchNo=GrMatchNo
-// 			WHERE f.TfTournament=" . StrSafe_DB($CompId) . " AND (f.TfMatchNo % 2)=0 AND GrMatchNo=" . StrSafe_DB(($MatchNo % 2 == 0 ? $MatchNo:$MatchNo-1)) . " AND f.TfEvent=" . StrSafe_DB($EvCode) . "
-// 			ORDER BY f.TfEvent, f.TfMatchNo ";
-// 	}
-//
-// 	//print $Select . "<br>";exit;
-// 	$MatchUpdated=false; // serve per aggiornare il timestamp
-// 	$Rs=safe_r_sql($Select);
-// 	if (safe_num_rows($Rs)==1) {
-// 		$MyRow=safe_fetch($Rs);
-// 		$obj=getEventArrowsParams($MyRow->EvCode,$MyRow->GrPhase,$TeamEvent,$CompId);
-// 		$TotArrows=$obj->ends*$obj->arrows;
-// 		$Winner=-1;
-//
-// 		// set winner... of Ties
-// 		if($MyRow->Tie) {
-// 			$Winner=$MyRow->MatchNo;
-// 			$MatchFinished=true;
-// 		} elseif ($MyRow->OppTie) {
-// 			$Winner=$MyRow->OppMatchNo;
-// 			$MatchFinished=true;
-// 		}
-//
-// 		$Score=ValutaArrowString(substr($MyRow->ArString, 0, $TotArrows));
-// 		$OppScore=ValutaArrowString(substr($MyRow->OppArString, 0, $TotArrows));
-//
-// 		if($MyRow->EvMatchMode==0) {
-// 			$SetPointsAth=array();
-// 			$SetPointsOpp=array();
-// 			for($i=0; $i<$TotArrows; $i=$i+$obj->arrows) {
-// 				//Cicla per tutte le volee dell'incontro
-// 				$SetPointsAth[] = ValutaArrowString(substr($MyRow->ArString, $i, $obj->arrows));
-// 				$SetPointsOpp[] = ValutaArrowString(substr($MyRow->OppArString, $i, $obj->arrows));
-// 			}
-// 			//Sistema Cumulativo
-// 			if(($a1=strlen(str_replace(' ', '', $MyRow->ArString)))==$TotArrows
-// 				and ($a2=strlen(str_replace(' ', '', $MyRow->OppArString)))==$TotArrows
-// 				and ($t1=strlen(str_replace(' ', '', $MyRow->TbString))) == ($t2=strlen(str_replace(' ', '', $MyRow->OppTbString)))
-// 				) {
-// 				// all arrows have been shot from both sides...
-//
-//
-// 				// if match is over establish the winner
-// 				// only if not already decided by the tie
-// 				// and if there are no doubts
-// 				// and no SO are going on
-// 				if($Winner==-1) {
-// 					// No winner decided yet...
-// 					$Proceed=(ctype_upper($MyRow->ArString.$MyRow->OppArString));
-// 					//Da Remmare dopo ANKARA
-// 					$Proceed=true;
-// 					if(!$Proceed) {
-// 						// check if the stars would make any change
-// 						$Regexp='';
-// 						$RaisedScore=$Score+RaiseStars(substr($MyRow->ArString, 0, $TotArrows), $Regexp, $MyRow->EvCode, $TeamEvent, $ToId);
-// 						$RaisedOppScore=$OppScore+RaiseStars(substr($MyRow->OppArString, 0, $TotArrows), $Regexp, $MyRow->EvCode, $TeamEvent, $ToId);
-// 						if($RaisedScore < $OppScore or $RaisedOppScore < $Score) {
-// 							// Even with all stars "in" the ath will not make more than the opponent
-// 							$Proceed=true;
-// 						}
-// 					}
-// 					if($Proceed) {
-// 						if($Score>$OppScore) {
-// 							$Winner=$MyRow->MatchNo;
-// 							$MatchFinished=true;
-// 						} elseif($Score<$OppScore) {
-// 							$Winner=$MyRow->OppMatchNo;
-// 							$MatchFinished=true;
-// 						} else {
-// 							if( strlen(str_replace(' ', '', $MyRow->TbString))!=0
-// 							    and (strlen(str_replace(' ', '', $MyRow->TbString)) % $obj->so) == 0
-// 								and strlen(str_replace(' ', '', $MyRow->TbString))==strlen(str_replace(' ', '', $MyRow->OppTbString))
-// 								) {
-// 								// Verifico le stringhe CASE INSENSITIVE - in questo momento me ne frego degli "*"
-// 								list($AthTbValue, $AthWeight, $AthStars, $AthNumX, $AthArrows) = ValutaArrowStringSO($MyRow->TbString);
-// 								list($OppTbValue, $OppWeight, $OppStars, $OppNumX, $OppArrows) = ValutaArrowStringSO($MyRow->OppTbString);
-//
-// 								$MatchFinished=true;
-//
-// 								if($MyRow->TbClosest) {
-// 									// Athlete 1 has at a closest to center
-// 									$Winner = $MyRow->MatchNo;
-// 									$WinnerId = $MyRow->MatchNo;
-// 								} elseif($MyRow->OppTbClosest) {
-// 									// Athlete 2 has one arrow closer to center
-// 									$Winner = $MyRow->OppMatchNo;
-// 									$WinnerId = $MyRow->OppMatchNo;
-// 								} elseif($AthTbValue > $OppTbValue) {
-// 									//TbString è maggiore di OppTbString --> il primo vince
-// 									$Winner = $MyRow->MatchNo;
-// 									$WinnerId = $MyRow->MatchNo;
-// 								} elseif($AthTbValue < $OppTbValue) {
-// 									//OppTbString è maggiore di TbString --> il secondo vince
-// 									$Winner = $MyRow->OppMatchNo;
-// 									$WinnerId = $MyRow->OppMatchNo;
-// 								} elseif($AthNumX > $OppNumX) {
-// 									// Athlete 1 has more Xs than Athlete 2
-// 									$Winner = $MyRow->MatchNo;
-// 									$WinnerId = $MyRow->MatchNo;
-// 								} elseif($AthNumX < $OppNumX) {
-// 									// Athlete 2 has more Xs than Athlete 1
-// 									$Winner = $MyRow->OppMatchNo;
-// 									$WinnerId = $MyRow->OppMatchNo;
-// 								} else {
-// 									$MatchFinished=false;
-// 									if($AthArrows and $OppArrows) {
-// 										if($AthArrows[0] > $OppArrows[0]) {
-// 											$Winner = $MyRow->MatchNo;
-// 											$WinnerId = $MyRow->MatchNo;
-// 											$MatchFinished=true;
-// 										} elseif($AthArrows[0] < $OppArrows[0]) {
-// 											$Winner = $MyRow->OppMatchNo;
-// 											$WinnerId = $MyRow->OppMatchNo;
-// 											$MatchFinished=true;
-// 										}
-// 									}
-// 								}
-// 							}
-//
-// 						}
-// 					}
-// 				}
-// 			} else {
-// 				// match is not over, so if no byes reset the winner!
-// 				if($MyRow->Tie!=2 and $MyRow->OppTie!=2) {
-// 					$Winner=-1;
-// 				}
-// 			}
-//
-// 			$query="UPDATE "
-// 				. ($TeamEvent==0 ? "Finals" : "TeamFinals") . " "
-// 				. "SET "
-// 				. "{$TablePrefix}WinLose=" . ($Winner==$MyRow->MatchNo ? '1' : '0') . ", "
-// 				. "{$TablePrefix}Score=" . $Score . ", "
-// 				. "{$TablePrefix}SetScore=0, "
-// 				. "{$TablePrefix}SetPoints=" . StrSafe_DB(implode('|', $SetPointsAth)) . ", "
-// 				. "{$TablePrefix}Tie=" . (($Score==$OppScore and $Winner==$MyRow->MatchNo) ? '1' : '0') . ", "
-// 				. "{$TablePrefix}DateTime={$TablePrefix}DateTime "
-// 				. "WHERE "
-// 				. " {$TablePrefix}Event=". StrSafe_DB($MyRow->EvCode) . " "
-// 				. " AND {$TablePrefix}MatchNo=". StrSafe_DB($MyRow->MatchNo) . " "
-// 				. " AND {$TablePrefix}Tournament=". StrSafe_DB($CompId);
-//
-// 			safe_w_sql($query);
-// 			$MatchUpdated = ($MatchUpdated or safe_w_affected_rows());
-//
-// 			//print $query.'<br><br>';
-//
-// 			$query="UPDATE "
-// 				. ($TeamEvent==0 ? "Finals" : "TeamFinals") . " "
-// 				. "SET "
-// 				. "{$TablePrefix}WinLose=" . ($Winner==$MyRow->OppMatchNo ? '1' : '0') . ", "
-// 				. "{$TablePrefix}Score=" . $OppScore . ", "
-// 				. "{$TablePrefix}SetScore=0, "
-// 				. "{$TablePrefix}SetPoints=" . StrSafe_DB(implode('|', $SetPointsOpp)) . ", "
-// 				. "{$TablePrefix}Tie=" . (($Score==$OppScore and $Winner==$MyRow->OppMatchNo) ? '1' : '0') . ", "
-// 				. "{$TablePrefix}DateTime={$TablePrefix}DateTime "
-// 				. "WHERE "
-// 				. " {$TablePrefix}Event=". StrSafe_DB($MyRow->EvCode) . " "
-// 				. " AND {$TablePrefix}MatchNo=". StrSafe_DB($MyRow->OppMatchNo) . " "
-// 				. " AND {$TablePrefix}Tournament=". StrSafe_DB($CompId);
-//
-// 			safe_w_sql($query);
-// 			$MatchUpdated = ($MatchUpdated or safe_w_affected_rows());
-//
-// 			//print $query.'<br><br>';
-// 		} else {
-// 			//Sistema a Set
-// 			$SetPointsAth=array();
-// 			$SetPointsOpp=array();
-// 			$AthSpBe=array();
-// 			$OppSpBe=array();
-// 			$SetAth=0;
-// 			$SetOpp=0;
-// 			$SetAthWin=0;
-// 			$SetOppWin=0;
-// 			$WinnerId=-1;
-// 			for($i=0; $i<$TotArrows; $i=$i+$obj->arrows) {
-// 				//Cicla per tutte le volee dell'incontro
-// 				$AthEndString=rtrim(substr($MyRow->ArString, $i, $obj->arrows));
-// 				$OppEndString=rtrim(substr($MyRow->OppArString, $i, $obj->arrows));
-// 				$MatchString=$AthEndString.$OppEndString;
-// 				$AthSetPoints=ValutaArrowString($AthEndString);
-// 				$OppSetPoints=ValutaArrowString($OppEndString);
-// 				$SetPointsAth[] = $AthSetPoints;
-// 				$SetPointsOpp[] = $OppSetPoints;
-//
-//
-// 				if(strpos($MatchString, ' ')===false and strlen($AthEndString) and strlen($AthEndString)==strlen($OppEndString) and strlen($AthEndString)==$obj->arrows) {
-// 					// All arrows of the end have been shot
-// 					$Proceed=ctype_upper($MatchString); // check if there are stars
-// 					//Da Remmare dopo ANKARA
-// 					$Proceed=true;
-// 					if(!$Proceed) {
-// 						// check if stars can change result
-// 						$RegExp='';
-// 						$AthSetPointsUpper=$AthSetPoints+RaiseStars($AthEndString, $RegExp, $MyRow->EvCode, $TeamEvent, $ToId);
-// 						$OppSetPointsUpper=$OppSetPoints+RaiseStars($OppEndString, $RegExp, $MyRow->EvCode, $TeamEvent, $ToId);
-// 						if($AthSetPointsUpper < $OppSetPoints or $OppSetPointsUpper < $AthSetPoints) {
-// 							// even with all stars as higher points will the score beat the opponent's score
-// 							$Proceed=true;
-// 						}
-// 					}
-// 					if($Proceed) {
-// 						if($AthSetPoints>$OppSetPoints) {
-// 							$SetAth += 2;
-// 							$SetAthWin++;
-// 							$AthSpBe[]=2;
-// 							$OppSpBe[]=0;
-// 						} elseif($AthSetPoints<$OppSetPoints) {
-// 							$SetOpp += 2;
-// 							$SetOppWin++;
-// 							$AthSpBe[]=0;
-// 							$OppSpBe[]=2;
-// 						} else {
-// 							$SetAth++;
-// 							$SetOpp++;
-// 							$AthSpBe[]=1;
-// 							$OppSpBe[]=1;
-// 						}
-// 					}
-// 				} else if(strlen($AthEndString)!= 0 OR strlen($OppEndString) != 0) {
-//                     $AthSpBe[]=0;
-//                     $OppSpBe[]=0;
-//                 }
-// 			}
-//
-// 			if($SetAth > $obj->ends+2 or $SetOpp > $obj->ends+2) {
-// 				$SetAth=0;
-// 				$SetOpp=0;
-// 			}
-//
-// 			if($SetAth==$SetOpp
-//                 and strlen(str_replace(' ', '', $MyRow->TbString))!=0
-// 				and (strlen(str_replace(' ', '', $MyRow->TbString))%$obj->so)==0
-// 				and strlen(trim($MyRow->TbString))==strlen(trim($MyRow->OppTbString))
-// 				) {
-// 				// Verifico le stringhe CASE INSENSITIVE - in questo momento me ne frego degli "*"
-// 				list($AthTbValue, $AthWeight, $AthStars, $AthNumX, $AthArrows) = ValutaArrowStringSO($MyRow->TbString);
-// 				list($OppTbValue, $OppWeight, $OppStars, $OppNumX, $OppArrows) = ValutaArrowStringSO($MyRow->OppTbString);
-//
-//
-// 				if($MyRow->TbClosest) {
-// 					// Athlete 1 has at least one arrow set as closest to center
-// 					$Winner = $MyRow->MatchNo;
-// 					$WinnerId = $MyRow->MatchNo;
-// 					$SetAth++;
-// 				} elseif($MyRow->OppTbClosest) {
-// 					// Athlete 2 has one arrow closer to center
-// 					$Winner = $MyRow->OppMatchNo;
-// 					$WinnerId = $MyRow->OppMatchNo;
-// 					$SetOpp++;
-// 				} elseif($AthTbValue > $OppTbValue) {
-// 					//TbString è maggiore di OppTbString --> il primo vince
-// 					$Winner = $MyRow->MatchNo;
-// 					$WinnerId = $MyRow->MatchNo;
-// 					$SetAth++;
-// 				} elseif($AthTbValue < $OppTbValue) {
-// 					 //OppTbString è maggiore di TbString --> il secondo vince
-// 					 $Winner = $MyRow->OppMatchNo;
-// 					 $WinnerId = $MyRow->OppMatchNo;
-// 					 $SetOpp++;
-// 				} elseif($AthNumX > $OppNumX) {
-// 					// Athlete 1 has more Xs than Athlete 2
-// 					$Winner = $MyRow->MatchNo;
-// 					$WinnerId = $MyRow->MatchNo;
-// 					$SetAth++;
-// 				} elseif($AthNumX < $OppNumX) {
-// 					// Athlete 2 has more Xs than Athlete 1
-// 					$Winner = $MyRow->OppMatchNo;
-// 					$WinnerId = $MyRow->OppMatchNo;
-// 					$SetOpp++;
-// 				} else {
-// 					if($AthArrows and $OppArrows) {
-// 						if($AthArrows[0] > $OppArrows[0]) {
-// 							$Winner = $MyRow->MatchNo;
-// 							$WinnerId = $MyRow->MatchNo;
-// 							$SetAth++;
-// 						} elseif($AthArrows[0] < $OppArrows[0]) {
-// 							$Winner = $MyRow->OppMatchNo;
-// 							$WinnerId = $MyRow->OppMatchNo;
-// 							$SetOpp++;
-// 						}
-// 					}
-// 				}
-// 			} elseif($SetAth>=$obj->winAt) {
-// 				$Winner = $MyRow->MatchNo;
-// 			} elseif($SetOpp>=$obj->winAt) {
-// 				$Winner = $MyRow->OppMatchNo;
-// 			}
-//
-// 			$query="UPDATE "
-// 				. ($TeamEvent==0 ? "Finals" : "TeamFinals") . " "
-// 				. "SET "
-// 				. "{$TablePrefix}WinLose=" . ($Winner==$MyRow->MatchNo ? '1' : '0') . ", "
-// 				. "{$TablePrefix}Score=" . $Score . ", "
-// 				. "{$TablePrefix}SetScore=" . $SetAth . ", "
-// 				. "{$TablePrefix}SetPoints=" . StrSafe_DB(implode('|', $SetPointsAth)) . ", "
-// 				. "{$TablePrefix}SetPointsByEnd=" . StrSafe_DB(implode('|', $AthSpBe)) . ", "
-// 				. "{$TablePrefix}WinnerSet=" . $SetAthWin . ", "
-// 				. "{$TablePrefix}Tie=" . ($WinnerId == $MyRow->MatchNo ? '1':'0') . ", "
-// 				. "{$TablePrefix}DateTime={$TablePrefix}DateTime "
-// 				. "WHERE "
-// 				. "{$TablePrefix}Event=". StrSafe_DB($MyRow->EvCode) . " "
-// 				. "AND {$TablePrefix}MatchNo=". StrSafe_DB($MyRow->MatchNo) . " "
-// 				. "AND {$TablePrefix}Tournament=". StrSafe_DB($CompId);
-// 			safe_w_sql($query);
-// 			$MatchUpdated = ($MatchUpdated or safe_w_affected_rows());
-//
-// 			$query="UPDATE "
-// 				. ($TeamEvent==0 ? "Finals" : "TeamFinals") . " "
-// 				. "SET "
-// 				. "{$TablePrefix}WinLose=" . ($Winner==$MyRow->OppMatchNo ? '1' : '0') . ", "
-// 				. "{$TablePrefix}Score=" . $OppScore . ", "
-// 				. "{$TablePrefix}SetScore=" . $SetOpp . ", "
-// 				. "{$TablePrefix}SetPoints=" . StrSafe_DB(implode('|', $SetPointsOpp)) . ", "
-// 				. "{$TablePrefix}SetPointsByEnd=" . StrSafe_DB(implode('|', $OppSpBe)) . ", "
-// 				. "{$TablePrefix}WinnerSet=" . $SetOppWin . ", "
-// 				. "{$TablePrefix}Tie=" . ($WinnerId == $MyRow->OppMatchNo ? '1':'0') . ", "
-// 				. "{$TablePrefix}DateTime={$TablePrefix}DateTime "
-// 				. "WHERE "
-// 				. "{$TablePrefix}Event=". StrSafe_DB($MyRow->EvCode) . " "
-// 				. "AND {$TablePrefix}MatchNo=". StrSafe_DB($MyRow->OppMatchNo) . " "
-// 				. "AND {$TablePrefix}Tournament=". StrSafe_DB($CompId);
-// 			safe_w_sql($query);
-// 			$MatchUpdated = ($MatchUpdated or safe_w_affected_rows());
-// 			if($SetAth >= $obj->winAt or $SetOpp >= $obj->winAt) {
-// 				$MatchFinished=true;
-// 			}
-// 		}
-//
-// 		if($MatchUpdated) {
-// 			$query="UPDATE "
-// 				. ($TeamEvent==0 ? "Finals" : "TeamFinals") . " "
-// 				. "SET "
-// 				. "{$TablePrefix}DateTime='".date('Y-m-d H:i:s')."' "
-// 				. "WHERE "
-// 				. " {$TablePrefix}Event=". StrSafe_DB($MyRow->EvCode) . " "
-// 				. "AND {$TablePrefix}MatchNo in (". StrSafe_DB($MyRow->MatchNo) . ',' . StrSafe_DB($MyRow->OppMatchNo) . ") "
-// 				. "AND {$TablePrefix}Tournament=". StrSafe_DB($CompId);
-// 			safe_w_sql($query);
-// 		}
-// 		//Serve per ricalcolare le ranking, solo medaglie
-//
-// 		// run jack for finished match (DT_RESULT)
-// 		//if($MatchFinished) {
-// 			//runJack('MatchFinished', $CompId, array("Event"=>$EvCode ,"Team"=>$TeamEvent,"MatchNo"=>$MatchNo ,"TourId"=>$CompId));
-// 		//}
-//
-// 		if($MatchNo < 4 and $MatchFinished) {
-// 			if($TeamEvent) {
-// 				move2NextPhaseTeam(NULL, $EvCode, $MatchNo, $CompId);
-// 			} else {
-// 				move2NextPhase(NULL, $EvCode, $MatchNo, $CompId);
-// 			}
-// 		}
-//
-// 		if(!isset($_REQUEST['Changed']) or $_REQUEST['Changed']) {
-// 			// this should avoid launching ODF events if nothing changed
-// 			runJack("FinArrUpdate", $CompId, array("Event"=>$EvCode ,"Team"=>$TeamEvent,"MatchNo"=>$MatchNo ,"TourId"=>$CompId));
-// 		}
-//
-// 	}
-// 	return $MatchFinished;
-// }
diff --git a/src/Final/Individual/AbsIndividual.css b/src/Final/Individual/AbsIndividual.css
index 6f18b0b3..250b0a12 100644
--- a/src/Final/Individual/AbsIndividual.css
+++ b/src/Final/Individual/AbsIndividual.css
@@ -17,6 +17,10 @@
     background-color:red;
 }
 
+.so-status.notsolvable {
+    background-color:transparent;
+}
+
 .warningMsg {
     font-size: 1.5em;;
     padding: 0.5em;
diff --git a/src/Final/Individual/AbsIndividual.js b/src/Final/Individual/AbsIndividual.js
index 1b6b974d..db593bb0 100644
--- a/src/Final/Individual/AbsIndividual.js
+++ b/src/Final/Individual/AbsIndividual.js
@@ -8,7 +8,18 @@ $(document).ready(function() {
 
 function gotoShootOff(evCode, onlyPending) {
     var toBeSolved = $('#ev_'+evCode).attr('toBeSolved');
-    if(!onlyPending || toBeSolved==1) {
+    var canBeSolved = $('#ev_'+evCode).attr('canBeSolved');
+    if(canBeSolved == 0) {
+        $.alert({
+            content:MsgInitFinalGridsRunningError,
+            boxWidth: '50%',
+            type: 'red',
+            useBootstrap: false,
+            title:evCode,
+            escapeKey: true,
+            backgroundDismiss: true
+        });
+    } else if(!onlyPending || toBeSolved==1) {
         if(toBeSolved!=1) {
             $.confirm({
                 content:MsgInitFinalGridsError,
diff --git a/src/Final/Individual/AbsIndividual.php b/src/Final/Individual/AbsIndividual.php
index 18e87a84..4a97fdb4 100644
--- a/src/Final/Individual/AbsIndividual.php
+++ b/src/Final/Individual/AbsIndividual.php
@@ -46,6 +46,7 @@
 $JS_SCRIPT = array( phpVars2js(array(
         'ROOT_DIR'=>$CFG->ROOT_DIR,
         'MsgInitFinalGridsError'=>get_text('MsgInitFinalGridsError'),
+        'MsgInitFinalGridsRunningError'=>get_text('MsgInitFinalGridsRunningError'),
         'MsgAttentionFinReset'=>get_text('MsgAttentionFinReset'),
         'CmdCancel' => get_text('CmdCancel'),
         'CmdConfirm' => get_text('Confirm', 'Tournament'),
@@ -99,7 +100,7 @@
                     if (array_sum($existingRanks) < min(count($EnIds),$r->EvNumQualified)) {
                         $cantResolve = true;
                     }
-                } else {
+                } else if(!$advMode) {
                     $cantResolve = true;
                 }
             }
@@ -324,7 +325,7 @@
         }
     }
 } else {
-    $Sql = "SELECT EvCode, EvEventName, EvFinalFirstPhase, EvNumQualified, EvShootOff, EvE1ShootOff, EvE2ShootOff, EvElimType, EvElim1, EvElim2, GROUP_CONCAT(DISTINCT itemNo) as SoCt, GROUP_CONCAT(DISTINCT itemNo1) as SoCt1, GROUP_CONCAT(DISTINCT itemNo2) as SoCt2
+    $Sql = "SELECT EvCode, EvEventName, EvFinalFirstPhase, EvNumQualified, EvRunning, EvShootOff, EvE1ShootOff, EvE2ShootOff, EvElimType, EvElim1, EvElim2, GROUP_CONCAT(DISTINCT itemNo) as SoCt, GROUP_CONCAT(DISTINCT itemNo1) as SoCt1, GROUP_CONCAT(DISTINCT itemNo2) as SoCt2
     	FROM Events
     	LEFT JOIN (
             SELECT IndEvent, CONCAT_WS('|', COUNT(*), IndSO) as itemNo 
@@ -362,15 +363,19 @@
     echo '<tr><th colspan="3">'.get_text('Event').'</th><th colspan="2"></th><th>'.get_text('ShotOff', 'Tournament').'</th><th>'.get_text('CoinToss', 'Tournament').'</th><th></th></tr></thead><tbody>';
     while ($r=safe_fetch($q)) {
         $toBesolved = true;
+        $canBesolved = true;
         $status = '';
         if($r->EvShootOff==1) {
             $toBesolved = false;
         }
+        if($r->EvRunning==1) {
+            $canBesolved = false;
+        }
 
 
         $rowspan = ($r->EvElimType==2 ? 3:($r->EvElimType==1 ? 2:1)) - ($r->EvFinalFirstPhase==0 ? 1:0);
-        echo '<tr class="EventLine" grEvent="'.$r->EvCode.'"  id="ev_'.$r->EvCode.'" toBeSolved="'.intval($toBesolved).'" So0="'.intval($r->EvShootOff).'" So1="'.intval($r->EvE1ShootOff).'" So2="'.intval($r->EvE2ShootOff).'">'.
-            '<th rowspan="'.$rowspan.'" class="smallContainer" '. ($r->EvElimType==0 ? 'onclick="gotoShootOff(\''.$r->EvCode.'\',true)"':'').'><div class="so-status'.($toBesolved ? ' notsolved':'').'">&nbsp;</div></th>'.
+        echo '<tr class="EventLine" grEvent="'.$r->EvCode.'"  id="ev_'.$r->EvCode.'" toBeSolved="'.intval($toBesolved).'" canBeSolved="'.intval($canBesolved).'" So0="'.intval($r->EvShootOff).'" So1="'.intval($r->EvE1ShootOff).'" So2="'.intval($r->EvE2ShootOff).'">'.
+            '<th rowspan="'.$rowspan.'" class="smallContainer" '. ($r->EvElimType==0 ? 'onclick="gotoShootOff(\''.$r->EvCode.'\',true)"':'').'><div class="so-status'.($canBesolved ? ($toBesolved ? ' notsolved':''):' notsolvable').'">&nbsp;</div></th>'.
             '<td rowspan="'.$rowspan.'" class="evCodeContainer" '. ($r->EvElimType==0 ? 'onclick="gotoShootOff(\''.$r->EvCode.'\',true)"':'').'>'.$r->EvCode.'</td>'.
             '<td rowspan="'.$rowspan.'" class="evContainer" '. ($r->EvElimType==0 ? 'onclick="gotoShootOff(\''.$r->EvCode.'\',true)"':'').'>'.$r->EvEventName.'</td>';
 	    if($r->EvElimType==5) {
diff --git a/src/Final/Individual/InsertPoint_Bra.php b/src/Final/Individual/InsertPoint_Bra.php
index 248301c8..a7a60d9f 100644
--- a/src/Final/Individual/InsertPoint_Bra.php
+++ b/src/Final/Individual/InsertPoint_Bra.php
@@ -425,7 +425,7 @@
 							$MyGrid[$Row][$Col].= '<option value="'.($irm->IrmShowRank ? 'irm-'.$irm->IrmId : 'man').'"' . ($MyRow->FinIrmType==$irm->IrmId ? ' selected' : '') . '>' . $irm->IrmType . '</option>' . "\n";
 						}
 						$MyGrid[$Row][$Col].= '</select>';
-                        $MyGrid[$Row][$Col] .= '&nbsp;<input type="checkbox" class="'.($ActivePhase=='0' ? '' : 'disabled').'" name="d_cl_' . $Key . '" id="d_cl_' . $Key . '" '.($MyRow->FinTbClosest ? 'checked="checked"' : '').' '.($ActivePhase=='0' ? '' : 'disabled').'>&nbsp;'.get_text('ClosestShort', 'Tournament');
+                        $MyGrid[$Row][$Col] .= '&nbsp;<input type="checkbox" class="'.($ActivePhase=='0' ? '' : 'disabled').'" name="d_cl_' . $Key . '" id="d_cl_' . $Key . '" '.($MyRow->FinTbClosest ? 'checked="checked"' : '').' '.($ActivePhase=='0' ? '' : 'disabled').' onclick="SendToServer(this);">&nbsp;'.get_text('ClosestShort', 'Tournament');
 						$MyGrid[$Row][$Col].= '<br/>';
 
 						$TieBreak = str_pad($MyRow->FinTiebreak,$obj->so,' ',STR_PAD_RIGHT);
diff --git a/src/Final/Individual/PDFScoreMatch.php b/src/Final/Individual/PDFScoreMatch.php
index 6e23a276..46e80696 100644
--- a/src/Final/Individual/PDFScoreMatch.php
+++ b/src/Final/Individual/PDFScoreMatch.php
@@ -151,25 +151,36 @@
             $defArrowTotW = $ScoreWidth*(6/$NumUnits);
 
             if(empty($_REQUEST["Blank"]) AND  empty($_REQUEST["IncEmpty"]) && (empty($MyRow->EnId) || empty($MyRow->OppEnId))) {
-				// se è vuoto uno dei due arcieri e non è selezionata l'inclusione
-				$EnIds=array();
-				if(($MyRow->EnId or $MyRow->OppEnId) and $MyRow->EvElimType==4) {
-					// 3D and Field rounds, get the opponent(s) of previous matches
-					if(empty($MyRow->EnId)) {
-						$EnIds=get_winner($MyRow->MatchNo, $MyRow->Event);
-						$MyRow->EnId=$EnIds;
-					}
-					if(empty($MyRow->OppEnId)) {
-						$EnIds=get_winner($MyRow->OppMatchNo, $MyRow->Event);
-						$MyRow->OppEnId=$EnIds;
-					}
-				}
-				// salta al prossimo record
-				if(empty($EnIds)) {
-					continue;
-				}
-				$pdf->ScoreCellHeight=min(9, ($pdf->getPageHeight()-105-4.5*max(is_array($MyRow->EnId) ? count($MyRow->EnId) : 1, is_array($MyRow->OppEnId) ? count($MyRow->OppEnId) : 1))/(4+($MyRow->FinElimChooser ? $MyRow->EvElimEnds : $MyRow->EvFinEnds)));
-			}
+                // if at least one of the archer is missing and the include all names is set and not a blank scorecard and not include also empty scorecards
+                $EnIds=array();
+                if(!empty($_REQUEST["IncAllNames"])) {
+                    if(empty($MyRow->EnId)) {
+                        $EnIds=get_winner($MyRow->MatchNo, $MyRow->Event);
+                        $MyRow->EnId=$EnIds;
+                    }
+                    if(empty($MyRow->OppEnId)) {
+                        $EnIds=get_winner($MyRow->OppMatchNo, $MyRow->Event);
+                        $MyRow->OppEnId=$EnIds;
+                    }
+                }
+                // salta al prossimo record
+                if(empty($EnIds)) {
+                    continue;
+                }
+                if(is_array($MyRow->EnId) and is_array($MyRow->OppEnId)) {
+                    while(count($MyRow->EnId)<count($MyRow->OppEnId)) {
+                        $MyRow->EnId[]=' ';
+                    }
+                    while(count($MyRow->OppEnId)<count($MyRow->EnId)) {
+                        $MyRow->OppEnId[]=' ';
+                    }
+                }
+            }
+            if(!empty($_REQUEST["Blank"]) and !empty($_REQUEST['Rows'])) {
+                $pdf->ScoreCellHeight = min(9, intval(($pdf->getPageHeight() - 120 - 4.5) / (4 + intval($_REQUEST['Rows']??5))));
+            } else {
+                $pdf->ScoreCellHeight = min(9, intval(($pdf->getPageHeight() - 120 - 4.5 * (is_array($MyRow->EnId) ? count($MyRow->EnId) : 1)) / (4 + ($MyRow->FinElimChooser ?? 0 ? $MyRow->EvElimEnds ?? 5 : $MyRow->EvFinEnds ?? 5))));
+            }
 
 			// disegna lo score di sinistra
 			DrawScore($pdf, $MyRow, 'L');
@@ -308,7 +319,7 @@ function DrawScore(&$pdf, $MyRow, $Side='L') {
 	$pdf->SetFont($pdf->FontStd,'B',10);
 	$pdf->Cell($ScoreWidth-20-2*$TotalW,6, get_text($MyRow->EventDescr,'','',true), 'B', 0, 'L', 0);
 	$pdf->SetFont($pdf->FontStd,'B',10);
-	$pdf->Cell($TotalW,6, (get_text('Target')) . ' ' . ltrim($MyRow->{$Prefix.'Target'},'0'), '1', 1, 'C', 1);
+	$pdf->Cell($TotalW,6, (get_text('Target')) . ' ' . ltrim($MyRow->{$Prefix.'Target'}??'','0'), '1', 1, 'C', 1);
 
 	// Rank number
 	$pdf->SetXY($ScoreWidth-$TotalW+$WhereStartX[$WhichScore], 35);
@@ -538,10 +549,18 @@ function DrawScore(&$pdf, $MyRow, $Side='L') {
 
 function get_winner($MatchNo, $Event) {
 	$ret=array();
-	$q=safe_r_sql("select concat(ucase(EnFirstName), ' ', EnName, ' - ', CoCode) as Athlete, EnId, FinMatchNo, FinWinLose 
+    $Bronze=($MatchNo==2 or $MatchNo==3);
+    if($MatchNo<2) {
+        $MatchNo+=2;
+    }
+	$q=safe_r_sql("select concat('(#', IndRank, ') ', ucase(EnFirstName), ' ', EnName, ' - ', CoCode) as Athlete, EnId, FinMatchNo, FinWinLose 
 		from Finals 
-	    left join Entries on EnId=FinAthlete and FinEvent='$Event' and EnTournament=FinTournament
-		left join Countries on CoId=EnCountry and CoTournament=FinTournament
+	    left join (select EnId, EnTournament, EnFirstName, EnName, CoCode, IndRank
+            from Entries 
+            inner join Countries on CoId=EnCountry and CoTournament=EnTournament
+            inner join Individuals on IndTournament=EnTournament and IndEvent='$Event' and IndId=EnId
+            where EnTournament={$_SESSION['TourId']}
+            ) Entries on EnId=FinAthlete and EnTournament=FinTournament
 		where FinMatchNo in (".($MatchNo*2).", ".($MatchNo*2 + 1).") and FinEvent='$Event' and FinTournament={$_SESSION['TourId']} order by FinWinLose desc");
 	while($r=safe_fetch($q)) {
 		if($r->FinWinLose) {
@@ -553,6 +572,11 @@ function get_winner($MatchNo, $Event) {
 			$ret[]=$r->Athlete;
 		}
 	}
+    $ret=array_unique($ret);
+    if($Bronze and count($ret)==1) {
+        // if the semifinals are with only one contender, then no bronze are done!
+        $ret=[' '];
+    }
 	return $ret;
 }
 
diff --git a/src/Final/Individual/PrintScore.php b/src/Final/Individual/PrintScore.php
index 30692416..00f2486f 100644
--- a/src/Final/Individual/PrintScore.php
+++ b/src/Final/Individual/PrintScore.php
@@ -154,6 +154,7 @@
 echo '<td colspan="2" class="Left">';
 echo '<input name="ScoreFilled" type="checkbox" value="1">&nbsp;' . get_text('ScoreFilled') . '<br>';
 echo '<input name="IncEmpty" type="checkbox" value="1">&nbsp;' . get_text('ScoreIncEmpty') . '<br>';
+echo '<input name="IncAllNames" type="checkbox" value="1">&nbsp;' . get_text('ScoreIncAllNames') . '<br>';
 echo '<input name="ScoreFlags" type="checkbox" value="1">&nbsp;' . get_text('ScoreFlags','Tournament') . '<br>';
 if(module_exists("Barcodes"))
     echo '<input name="Barcode" type="checkbox" checked value="1">&nbsp;' . get_text('ScoreBarcode','Tournament') . '<br>';
diff --git a/src/Final/Individual/WriteDateTimeAll.php b/src/Final/Individual/WriteDateTimeAll.php
index f96b2d44..823bb65b 100644
--- a/src/Final/Individual/WriteDateTimeAll.php
+++ b/src/Final/Individual/WriteDateTimeAll.php
@@ -30,7 +30,7 @@
 			= "select"
 			. " FSScheduledDate,"
 			. " date_format(FSScheduledDate, '".get_text('DateFmtDB')."') DateFormatted,"
-			. " UNIX_TIMESTAMP(concat(FSScheduledDate, ' ', FSScheduledTime)) UnixTime "
+			. " concat(FSScheduledDate, ' ', FSScheduledTime) as PhaseDateTime "
 			. "FROM FinSchedule "
 			. " INNER JOIN Grids on FsMatchNo=GrMatchNo "
 			. "WHERE"
@@ -48,7 +48,7 @@
 			$_REQUEST['d_FSScheduledDateAll']=$r->DateFormatted;
 		}
 		if(substr($_REQUEST['d_FSScheduledTimeAll'],0,1)=='+') {
-			$time=date('H:i:s', strtotime($_REQUEST['d_FSScheduledTimeAll'].' minutes', $r->UnixTime));
+			$time=date('H:i:s', strtotime($_REQUEST['d_FSScheduledTimeAll'].' minutes', strtotime($r->PhaseDateTime)));
 			$_REQUEST['d_FSScheduledTimeAll']=substr($time,0,5);
 		}
 	}
diff --git a/src/Final/Individual/WriteScore_Bra.php b/src/Final/Individual/WriteScore_Bra.php
index 6abd5d73..0e2c27fb 100644
--- a/src/Final/Individual/WriteScore_Bra.php
+++ b/src/Final/Individual/WriteScore_Bra.php
@@ -258,9 +258,11 @@ function setTieWinner($ee, $winner, $loser, $SoArrows, $WinLose=1, $TieValue=1,
 		if($TbDecoded1==$TbDecoded2 and $WinLose) {
 			// the closest is the winner!
 			if($r->Closest1==$r->Closest2) {
-				if($winner==$r->Winner1) {
+				if($r->Winner1) {
 					$r->Closest1=1;
-				} else {
+					$r->Closest2=0;
+				} elseif($r->Winner2) {
+					$r->Closest1=0;
 					$r->Closest2=1;
 				}
 			}
diff --git a/src/Final/OrisCompleteBook.php b/src/Final/OrisCompleteBook.php
index ce934089..e1f2b8b1 100644
--- a/src/Final/OrisCompleteBook.php
+++ b/src/Final/OrisCompleteBook.php
@@ -44,6 +44,8 @@
 $pdf = new OrisBracketPDF('', 'Complete Result Book');
 $pdf->SetAutoPageBreak(true,OrisPDF::bottomMargin+$pdf->extraBottomMargin);
 
+$LastUpdate='';
+
 /********
  * ORIS ORDER of documents
  *
@@ -89,21 +91,26 @@
 //Medaglieri
 if($cbIndFinal || $cbTeamFinal) {
 	include 'OrisMedalList.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
 	$pdf->SetAutoPageBreak(true,OrisPDF::bottomMargin+$pdf->extraBottomMargin);
 	include 'OrisMedalStanding.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 }
 
 include 'Partecipants/OrisCountry.php';
+$LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
 $pdf->endPage();
 
 if($cbIndFinal || $cbIndElim) {
     include 'Final/Individual/OrisRanking.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 }
 
 if($cbIndFinal) {
 	include 'Final/Individual/OrisBracket.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
 	$BracketsInd = clone $PdfData;
 	$pdf->SetAutoPageBreak(true,OrisPDF::bottomMargin+$pdf->extraBottomMargin);
     $pdf->endPage();
@@ -111,20 +118,25 @@
 
 if($cbIndElim) {
     include 'Elimination/OrisIndividual.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 }
 
 if($cbIndFinal) {
     include 'Qualification/OrisIndividual.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 }
 
 if($cbTeamFinal) {
 	include 'Final/Team/OrisRanking.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
 	include 'Final/Team/OrisBracket.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
 	$BracketsTeam = clone $PdfData;
 	$pdf->SetAutoPageBreak(true,OrisPDF::bottomMargin+$pdf->extraBottomMargin);
 	include 'Qualification/OrisTeam.php';
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
 	$pdf->endPage();
 }
 
@@ -137,6 +149,7 @@
 			true,
 			true);
 
+        $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
 	} else {
 		$PdfData = clone $BracketsInd;
 	}
@@ -145,6 +158,7 @@
 	$pdf->SetAutoPageBreak(true,(OrisPDF::bottomMargin+$pdf->extraBottomMargin));
 
 	include(PdfChunkLoader('OrisScoreIndividual.inc.php'));
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 }
 if($cbTeamFinal) {
@@ -157,6 +171,7 @@
             true,
             null,
             true);
+        $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     } else {
         $PdfData = clone $BracketsTeam;
     }
@@ -164,9 +179,11 @@
 	$pdf->SetAutoPageBreak(true,(OrisPDF::bottomMargin+$pdf->extraBottomMargin));
 
 	include(PdfChunkLoader('OrisScoreTeam.inc.php'));
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 
     $PdfData=getTeamsComponentsLog();
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     include(PdfChunkLoader('OrisComponentLogTeam.inc.php'));
     $pdf->endPage();
 }
@@ -175,11 +192,13 @@
 $q=safe_r_sql("SELECT count(*) as Involved FROM TourRecords WHERE TrTournament={$_SESSION['TourId']}");
 if($r=safe_fetch($q) and $r->Involved) {
 	include('Partecipants/OrisStatRecStanding.php');
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 }
 $q=safe_r_sql("SELECT count(*) as Involved FROM RecBroken WHERE RecBroTournament={$_SESSION['TourId']}");
 if($r=safe_fetch($q) and $r->Involved) {
 	include('Partecipants/OrisStatRecBroken.php');
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 }
 
@@ -187,6 +206,7 @@
 $q=safe_r_sql("SELECT count(*) as Involved FROM TournamentInvolved WHERE TiTournament={$_SESSION['TourId']}");
 if($r=safe_fetch($q) and $r->Involved) {
 	include('Tournament/OrisStaffField.php');
+    $LastUpdate = max($LastUpdate, $PdfData->LastUpdate ?? $LastUpdate);
     $pdf->endPage();
 }
 
@@ -200,6 +220,7 @@
 $pdf->setComment('');
 $pdf->setOrisCode('SUMMARY', 'Complete Results Booklet');
 $pdf->setPhase('');
+$pdf->setDocUpdate($LastUpdate ?? '');
 
 $pdf->addTOCPage();
 
diff --git a/src/Final/RunningEvent.php b/src/Final/RunningEvent.php
index ec3cab52..4a39f43d 100644
--- a/src/Final/RunningEvent.php
+++ b/src/Final/RunningEvent.php
@@ -11,9 +11,13 @@
 			. "SET EvRunning=IF(EvRunning!=" . $tmpEventType . "," . $tmpEventType . ",0) "
 			. "WHERE EvTournament=" . StrSafe_DB($_SESSION['TourId']) . " AND EvCode=" . StrSafe_DB($tmpEvent) . " AND EvTeamEvent=" . StrSafe_DB($tmpTeam);
 		safe_w_sql($MyQuery);
-        $q=safe_r_sql("select ToElabTeam!=127 as MakeTeams from Tournament where ToId={$_SESSION['TourId']}");
-        if($r=safe_fetch($q) and $r->MakeTeams and $tmpTeam) {
-            MakeTeamsAbs(null, null, null);
+        if(safe_w_affected_rows()) {
+            if($tmpTeam) {
+                MakeTeamsAbs(null, null, null);
+            } else {
+                Obj_RankFactory::create('Abs', array('tournament' => $_SESSION['TourId'], 'events' => $tmpEvent, 'dist' => 0))->calculate();
+                runJack("QRRankUpdate", $_SESSION['TourId'], array("Event"=>$tmpEvent, "Team"=>0, "TourId"=>$_SESSION['TourId']));
+            }
         }
 	}
 
@@ -59,24 +63,24 @@
 if(safe_num_rows($ResultRs))
 {
 	echo '<tr>';
-	echo '<th width="35%">' . get_text('EvName') . '</th>';
-	echo '<th width="20%">' . get_text('PrintText','Tournament') . '</th>';
-	echo '<th width="15%" colspan="2">' . get_text('QualRound') . '</th>';
-	echo '<th width="15%" colspan="2">' . get_text('Eliminations_1') . '</th>';
-	echo '<th width="15%" colspan="2">' . get_text('Eliminations_2') . '</th>';
+	echo '<th class="w-35">' . get_text('EvName') . '</th>';
+	echo '<th class="w-20">' . get_text('PrintText','Tournament') . '</th>';
+	echo '<th class="w-15" colspan="2">' . get_text('QualRound') . '</th>';
+	echo '<th class="w-15" colspan="2">' . get_text('Eliminations_1') . '</th>';
+	echo '<th class="w-15" colspan="2">' . get_text('Eliminations_2') . '</th>';
 	echo '</tr>';
 	while($MyRow = safe_fetch($ResultRs))
 	{
-		echo '<tr>';
-		echo '<td width="35%"><b>' . $MyRow->EvCode . '</b> - ' . $MyRow->EvEventName .  ' (' . ($MyRow->EvTeamEvent==0 ? get_text('Individual') : get_text('Team'))  . ')</td>';
-		echo '<td width="20%">' . $MyRow->PrintHeader . '</td>';
-		echo '<td width="5%" class="Center' . ($MyRow->EvRunning == 1 ? ' yellow' : '') . '">';
+		echo '<tr class="rowHover">';
+		echo '<td class="w-35"><b>' . $MyRow->EvCode . '</b> - ' . $MyRow->EvEventName .  ' (' . ($MyRow->EvTeamEvent==0 ? get_text('Individual') : get_text('Team'))  . ')</td>';
+		echo '<td class="w-20">' . $MyRow->PrintHeader . '</td>';
+		echo '<td class="w-5 Center' . ($MyRow->EvRunning == 1 ? ' yellow' : '') . '">';
 		if(!empty($ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_1"]))
 			echo $ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_1"][0] . ($ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_1"][0]!=$ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_1"][1] ? " - ". $ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_1"][1]:"");
 		else
 			echo '&nbsp;';
 		echo '</td>';
-		echo '<td width="10%" class="Center' . ($MyRow->EvRunning == 1 ? ' yellow' : '') . '">';
+		echo '<td class="w-10 Center' . ($MyRow->EvRunning == 1 ? ' yellow' : '') . '">';
 		echo '<a href="' . $_SERVER['PHP_SELF']. '?Event=' . $MyRow->EvCode . '_' . $MyRow->EvTeamEvent . '_1">';
 		if($MyRow->EvRunning == 1)
 			echo get_text('RunningEv','Tournament');
@@ -84,13 +88,13 @@
 			echo get_text('StandardEv','Tournament');
  		echo '</a>';
 		echo '</td>';
-		echo '<td width="5%" class="Center' . ($MyRow->EvRunning == 2 ? ' yellow' : '') . '">';
+		echo '<td class="w-5 Center' . ($MyRow->EvRunning == 2 ? ' yellow' : '') . '">';
 		if(!empty($ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_2"]))
 			echo $ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_2"][0] . ($ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_2"][0]!=$ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_2"][1] ? " - ". $ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_2"][1]:"");
 		else
 			echo '&nbsp;';
 		echo '</td>';
-		echo '<td width="10%" class="Center' . ($MyRow->EvRunning == 2 ? ' yellow' : '') . '">';
+		echo '<td class="w-10 Center' . ($MyRow->EvRunning == 2 ? ' yellow' : '') . '">';
 		if($MyRow->EvElim1)
 		{
 			echo '<a href="' . $_SERVER['PHP_SELF']. '?Event=' . $MyRow->EvCode . '_' . $MyRow->EvTeamEvent . '_2">';
@@ -103,13 +107,13 @@
 		else
 			echo '&nbsp;';
 		echo '</td>';
-		echo '<td width="5%" class="Center' . ($MyRow->EvRunning == 3 ? ' yellow' : '') . '">';
+		echo '<td class="w-5 Center' . ($MyRow->EvRunning == 3 ? ' yellow' : '') . '">';
 		if(!empty($ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_3"]))
 			echo $ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_3"][0] . ($ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_3"][0]!=$ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_3"][1] ? " - ". $ArrowNoArray[$MyRow->EvCode . "_" . $MyRow->EvTeamEvent . "_3"][1]:"");
 		else
 			echo '&nbsp;';
 		echo '</td>';
-		echo '<td width="10%" class="Center' . ($MyRow->EvRunning == 3 ? ' yellow' : '') . '">';
+		echo '<td class="w-10 Center' . ($MyRow->EvRunning == 3 ? ' yellow' : '') . '">';
 		if($MyRow->EvElim2)
 		{
 			echo '<a href="' . $_SERVER['PHP_SELF']. '?Event=' . $MyRow->EvCode . '_' . $MyRow->EvTeamEvent . '_3">';
diff --git a/src/Final/ScoreCardChunk.php b/src/Final/ScoreCardChunk.php
index 1cb88d48..327f65a2 100644
--- a/src/Final/ScoreCardChunk.php
+++ b/src/Final/ScoreCardChunk.php
@@ -217,7 +217,7 @@
 			$myReview=safe_fetch($rs);
 
 			$out.='<tr><td colspan="' . (5+$cols). '" class="Center">' . get_text($m==1 ? 'RevMainLang' : 'RevSecLang') . '</td></tr>' . "\n";
-			$out.='<tr><td colspan="' . (5+$cols). '" class="Center"><textarea style="width:' . ($_SESSION["WINWIDTH"]*0.45). 'px; height:' . ($_SESSION["WINHEIGHT"]*0.45). 'px;"  id="Lang' . $m . '">' . ($myReview ? $myReview->{'RevLanguage'.$m} : '') . '</textarea></td></tr>' . "\n";
+			$out.='<tr><td colspan="' . (5+$cols). '" class="Center"><textarea style="width: 45%; height:45%" id="Lang' . $m . '">' . ($myReview ? $myReview->{'RevLanguage'.$m} : '') . '</textarea></td></tr>' . "\n";
 		}
 		$out.='</table>' . "\n";
 		$scores[$m]=$out;
diff --git a/src/Final/Spotting.css b/src/Final/Spotting.css
index 9ea5df74..cd6fba88 100644
--- a/src/Final/Spotting.css
+++ b/src/Final/Spotting.css
@@ -19,6 +19,7 @@
 .Scorecard input, .CmdRow input,
 .Scorecard select, .CmdRow select {font-size:2vmin;}
 .Scorecard input[onfocus] {width:4ch;}
+#Spotting input[type="text"]:read-only {background-color: lightgrey}
 
 .Target {text-align: center; border:1vmin solid white;cursor: crosshair;}
 .TargetL {border-color:#00e0e0;}
diff --git a/src/Final/Spotting.js b/src/Final/Spotting.js
index b90f6943..995f371d 100644
--- a/src/Final/Spotting.js
+++ b/src/Final/Spotting.js
@@ -2,6 +2,7 @@ var dwData;
 var keyPressedActive=false;
 var KeyListener=null;
 var Preparation=true;
+var ClickMovesPosition=false;
 
 $(document).ready(function() {
     getMatchesData();
@@ -119,18 +120,20 @@ function toggleAlternate() {
 var SvgCursor;
 
 function buildScorecard() {
-    $('#Spotting').hide();
-    $('.ActiveArrow').toggleClass('ActiveArrow', false);
-    $('#Target').toggleClass('TargetL', false).toggleClass('TargetR', false);
-
-	if($('#ActivateKeys').is(':checked')==false && $('#spotTarget').is(':checked')) {
-		$('#ActivateKeys').prop('checked', 'checked').click();
-	}
-
     var spTeam = ($('#spotType').val()=='Team' ? '1' : '0');
     var spEvent = $('#spotCode').val();
     var spMatch = $('#spotMatch').val();
     var spTarget = $('#spotTarget:checked').length>0;
+
+    if(spEvent=='' || spMatch=='') {
+        // still not ready to build the scorecard
+        return;
+    }
+
+    $('#Spotting').hide();
+    $('.ActiveArrow').toggleClass('ActiveArrow', false);
+    $('#Target').toggleClass('TargetL', false).toggleClass('TargetR', false);
+
 	Preparation=true;
     $.getJSON(WebDir+'Final/Spotting-getScorecards.php?Team='+spTeam+'&Event='+spEvent+'&MatchId='+spMatch+(spTarget ? '&ArrowPosition=1' : ''), function (data) {
         if(data.error!=0) {
@@ -207,7 +210,7 @@ function buildScorecard() {
                         var x = (parseInt(e.offsetX) * ratio - TgtOrgSize/2)*convert;
                         var y = (parseInt(e.offsetY) * ratio - TgtOrgSize/2)*convert;
                         var position={'x':x, 'y':y };
-                        if(e.which==3) {
+                        if(e.which==3 || ClickMovesPosition) {
                             position.noValue=1;
                         }
                         updateArrow(activeArrow[0], position);
@@ -275,17 +278,37 @@ function buildScorecard() {
                 $('.arrowcell').on('click', function() {
                     selectArrow($(this).find('input')[0]);
                 });
-                $('#Spotting input[type="text"]').prop('disabled', true);
+                $('#Spotting input[type="text"]').prop('readonly', true);
             }
 
             // simulate call on the first arrow of each match to check the stars if any on loading the scorecard
             updateArrow($('[id^="Arrow["]')[0], null);
         }
+        if($('#ActivateKeys').is(':checked')==false && $('#spotTarget').is(':checked')) {
+            $('#ActivateKeys').prop('checked', 'checked').click();
+        }
+        checkClickMovesPosition();
 	    Preparation=false;
     });
 }
 
+function checkClickMovesPosition() {
+    var check=($('#spotTarget').is(':checked') && $('#ActivateKeys').is(':checked') && !$('#MoveNext').is(':checked'));
+    $('#ClickMovesPositionDiv').toggleClass('d-none', !check);
+    if(!check) {
+        ClickMovesPosition=false;
+    }
+    $('#ClickMovesPosition').prop('checked', ClickMovesPosition);
+}
+
+function toggleClickMovesPosition(obj) {
+    ClickMovesPosition=$(obj)[0].checked;
+}
+
 function updateArrow(obj, position) {
+    // if(ClickMovesPosition && !(position && position.noValue)) {
+    //     return;
+    // }
     var spType = ($('#spotType').val()=='Team' ? '1' : '0');
     var spEvent = $('#spotCode').val();
     var spMatch = $('#spotMatch').val();
@@ -609,7 +632,7 @@ function toggleKeypressNew() {
 		$('.arrowcell').on('click', function() {
 			selectArrow($(this).find('input')[0]);
 		});
-		$('#Spotting input[type="text"]').prop('disabled', true);
+		$('#Spotting input[type="text"]').prop('readonly', true);
 
 		// creates the definitions
 
@@ -644,7 +667,7 @@ function toggleKeypressNew() {
 
 	} else {
 		// makes all inputs acive
-		$('#Spotting input[type="text"]').prop('disabled', false);
+		$('#Spotting input[type="text"]').prop('readonly', false);
 		$('.arrowcell').off('click');
 
 		$(document).off('keydown');
@@ -661,6 +684,7 @@ function toggleKeypress() {
     else {
         $('#keypadLegenda').hide();
     }
+    checkClickMovesPosition();
 
 	if(keyPressedActive) {
 		if(KeyListener) {
@@ -672,7 +696,7 @@ function toggleKeypress() {
 		$('.arrowcell').on('click', function() {
 				selectArrow($(this).find('input')[0]);
 			});
-		$('#Spotting input[type="text"]').prop('disabled', true);
+		$('#Spotting input[type="text"]').prop('readonly', true);
 
 		// creates the definitions
 
@@ -886,7 +910,7 @@ function toggleKeypress() {
 		// KeyListener = new window.keypress.Listener();
 
 		// makes all inputs acive
-		$('#Spotting input[type="text"]').prop('disabled', false);
+		$('#Spotting input[type="text"]').prop('readonly', false);
 		$('.arrowcell').off('click');
 
 		// focus on the active cell
@@ -904,6 +928,9 @@ function toggleKeypress() {
 }
 
 function setValue(num) {
+    // if(ClickMovesPosition) {
+    //     return;
+    // }
 	var activeCell=$('.ActiveArrow input');
 	activeCell[0].value=num;
 	updateArrow(activeCell[0]);
diff --git a/src/Final/Spotting.php b/src/Final/Spotting.php
index c10039d2..d845ce80 100644
--- a/src/Final/Spotting.php
+++ b/src/Final/Spotting.php
@@ -94,7 +94,8 @@
     echo '<div style="display:flex;justify-content: space-between">
 		<div><input type="checkbox" id="MatchAlternate" onclick="toggleAlternate(this)"/>'.get_text('AlternateMatch', 'Tournament').'</div>
 		<div><input type="checkbox" id="ActivateKeys" onclick="toggleKeypress()" />'.get_text('KeyPress', 'Tournament').'</div>
-		<div><input type="checkbox" id="MoveNext" checked="checked" />'.get_text('AutoMoveNext', 'Tournament').'</div>
+		<div class="d-none" id="ClickMovesPositionDiv"><input type="checkbox" id="ClickMovesPosition" onclick="toggleClickMovesPosition(this)"/>'.get_text('ClickMovesPosition', 'Tournament').'</div>
+		<div><input type="checkbox" id="MoveNext" checked="checked" onclick="checkClickMovesPosition()" />'.get_text('AutoMoveNext', 'Tournament').'</div>
 		<div><input type="button" id="liveButton" value="" onclick="setLive()"/></div>
 		<div id="buttonMove2Next"></div>
 		</div>';
diff --git a/src/Final/Team/AbsTeam.css b/src/Final/Team/AbsTeam.css
index 6b495cf7..09f85dfe 100644
--- a/src/Final/Team/AbsTeam.css
+++ b/src/Final/Team/AbsTeam.css
@@ -17,6 +17,10 @@
     background-color:red;
 }
 
+.so-status.notsolvable {
+    background-color:transparent;
+}
+
 .warningMsg {
     font-size: 1.5em;;
     padding: 0.5em;
diff --git a/src/Final/Team/AbsTeam.js b/src/Final/Team/AbsTeam.js
index 6e1916f9..649f1858 100644
--- a/src/Final/Team/AbsTeam.js
+++ b/src/Final/Team/AbsTeam.js
@@ -1,6 +1,17 @@
 function gotoShootOff(evCode, onlyPending) {
     var toBeSolved = $('#ev_'+evCode).attr('toBeSolved');
-    if(!onlyPending || toBeSolved==1) {
+    var canBeSolved = $('#ev_'+evCode).attr('canBeSolved');
+    if(canBeSolved == 0) {
+        $.alert({
+            content:MsgInitFinalGridsRunningError,
+            boxWidth: '50%',
+            type: 'red',
+            useBootstrap: false,
+            title:evCode,
+            escapeKey: true,
+            backgroundDismiss: true
+        });
+    } else if(!onlyPending || toBeSolved==1) {
         if(toBeSolved!=1) {
             $.confirm({
                 content:MsgInitFinalGridsError,
diff --git a/src/Final/Team/AbsTeam.php b/src/Final/Team/AbsTeam.php
index e6b090dd..a16b342c 100644
--- a/src/Final/Team/AbsTeam.php
+++ b/src/Final/Team/AbsTeam.php
@@ -49,6 +49,7 @@
 $JS_SCRIPT = array( phpVars2js(array(
         'ROOT_DIR'=>$CFG->ROOT_DIR,
         'MsgInitFinalGridsError'=>get_text('MsgInitFinalGridsError'),
+        'MsgInitFinalGridsRunningError'=>get_text('MsgInitFinalGridsRunningError'),
         'MsgAttentionFinReset'=>get_text('MsgAttentionFinReset'),
         'CmdCancel' => get_text('CmdCancel'),
         'CmdConfirm' => get_text('Confirm', 'Tournament'),
@@ -184,7 +185,7 @@
             }
 
             // Team Components
-            $now = date('Y-m-d H:i:s');
+            $now = getToday('now', 'Y-m-d H:i:s');
             safe_w_SQL("INSERT INTO TeamFinComponent (TfcCoId, TfcSubTeam, TfcTournament, TfcEvent, TfcId, TfcOrder, TfcTimeStamp) 
 				SELECT TcCoId, TcSubTeam, TcTournament, TcEvent, TcId, TcOrder, '{$now}'
 				FROM TeamComponent 
@@ -331,7 +332,7 @@
         }
     }
 } else {
-    $Sql = "SELECT EvCode, EvEventName, EvNumQualified, EvShootOff, GROUP_CONCAT(DISTINCT itemNo) as SoCt " .
+    $Sql = "SELECT EvCode, EvEventName, EvNumQualified, EvShootOff, EvRunning, GROUP_CONCAT(DISTINCT itemNo) as SoCt " .
         "FROM Events " .
         "LEFT JOIN (
             SELECT TeEvent, CONCAT_WS('|', COUNT(*), TeSO) as itemNo 
@@ -353,12 +354,16 @@
     echo '<tr><th colspan="3">'.get_text('Event').'</th><th></th><th>'.get_text('ShotOff', 'Tournament').'</th><th>'.get_text('CoinToss', 'Tournament').'</th><th></th></tr>';
     while ($r=safe_fetch($q)) {
         $toBesolved = false;
+        $canBesolved = true;
         $status = '';
         if($r->EvShootOff==0) {
             $toBesolved = true;
         }
-        echo '<tr class="rowHover"  id="ev_'.$r->EvCode.'" toBeSolved="'.intval($toBesolved).'">'.
-            '<th class="smallContainer" onclick="gotoShootOff(\''.$r->EvCode.'\',true)"><div class="so-status'.($toBesolved ? ' notsolved':'').'">&nbsp;</div></th>'.
+        if($r->EvRunning==1) {
+            $canBesolved = false;
+        }
+        echo '<tr class="rowHover"  id="ev_'.$r->EvCode.'" toBeSolved="'.intval($toBesolved).'" canBeSolved="'.intval($canBesolved).'" >'.
+            '<th class="smallContainer" onclick="gotoShootOff(\''.$r->EvCode.'\',true)"><div class="so-status'.($canBesolved ? ($toBesolved ? ' notsolved':''):' notsolvable').'">&nbsp;</div></th>'.
             '<td class="evCodeContainer" onclick="gotoShootOff(\''.$r->EvCode.'\',true)">'.$r->EvCode.'</td>'.
             '<td class="evContainer" onclick="gotoShootOff(\''.$r->EvCode.'\',true)">'.$r->EvEventName.'</td>';
         $so=array();
diff --git a/src/Final/Team/ChangeComponents-data.php b/src/Final/Team/ChangeComponents-data.php
index baf2cec4..d70255da 100644
--- a/src/Final/Team/ChangeComponents-data.php
+++ b/src/Final/Team/ChangeComponents-data.php
@@ -52,7 +52,7 @@
             }
         }
         if(count($toAdd)==count($toRemove) AND count($toAdd)!=0) {
-            $now = (!empty($_REQUEST["changeTs"]) ? str_replace('T',' ',$_REQUEST["changeTs"].':00') : date('Y-m-d H:i:s'));
+            $now = (!empty($_REQUEST["changeTs"]) ? str_replace('T',' ',$_REQUEST["changeTs"].':00') : getToday('now','Y-m-d H:i:s'));
             foreach ($toAdd as $k=>$v) {
                 $v->Order = array_shift($grpPositions[$v->Group]);
                 $toLog[$v->Order][1] = $v->Id;
@@ -96,6 +96,7 @@
             $JSON['error'] = 0;
         }
     }
+    $JSON['currentTimestamp']=getToday('now', 'Y-m-d H:i:00');
     JsonOut($JSON);
     die();
 }
diff --git a/src/Final/Team/ChangeComponents.js b/src/Final/Team/ChangeComponents.js
index 9dffa71c..249461ab 100644
--- a/src/Final/Team/ChangeComponents.js
+++ b/src/Final/Team/ChangeComponents.js
@@ -69,7 +69,7 @@ function editComponents(EvCode, TeamId, TeamSubId) {
                     $('#lstBody').append(Html);
                 });
                 let Html = '<tr class="editTeam"><th colspan="6">&nbsp;</th></tr>'+
-                    '<tr class="editTeam"><td colspan="4" class="Right">'+TeamComponentsTimestamp+'</td><td colspan="2"><input id="TeamComponentsTimestamp" type="datetime-local" value="'+ (new Date(Date.now() - (new Date()).getTimezoneOffset() * 60000)).toISOString().slice(0,16)+'"></td></tr>';
+                    '<tr class="editTeam"><td colspan="4" class="Right">'+TeamComponentsTimestamp+'</td><td colspan="2"><input id="TeamComponentsTimestamp" type="datetime-local" value="' + data.currentTimestamp + '"></td></tr>';
                 $('#lstBody').append(Html);
                 $('tfoot').show();
                 VerifyCheckbox();
diff --git a/src/Final/Team/PDFScoreMatch.php b/src/Final/Team/PDFScoreMatch.php
index d47b6b8a..ddfb76d0 100644
--- a/src/Final/Team/PDFScoreMatch.php
+++ b/src/Final/Team/PDFScoreMatch.php
@@ -150,10 +150,37 @@
     $FollowingRows=false;
 //DrawScore
     while($MyRow=safe_fetch($Rs)) {
+        $MyRow->EnId=[];
+        $MyRow->OppEnId=[];
+        $pdf->ScoreCellHeight=9;
         if(empty($_REQUEST["Blank"]) and empty($_REQUEST["IncEmpty"]) and (!$MyRow->CountryCode or !$MyRow->OppCountryCode)) {
             // se è vuoto uno dei due arcieri e non è selezionata l'inclusione
+            $EnIds=array();
+            if(!empty($_REQUEST["IncAllNames"])) {
+                // 3D and Field rounds, get the opponent(s) of previous matches
+                if(empty($MyRow->CountryCode)) {
+                    $EnIds=get_winner($MyRow->MatchNo, $MyRow->Event);
+                    $MyRow->EnId=$EnIds;
+                }
+                if(empty($MyRow->OppCountryCode)) {
+                    $EnIds=get_winner($MyRow->OppMatchNo, $MyRow->Event);
+                    $MyRow->OppEnId=$EnIds;
+                }
+            }
             // salta al prossimo record
-            continue;
+            if(empty($EnIds)) {
+                continue;
+            }
+            if(is_array($MyRow->EnId) and is_array($MyRow->OppEnId)) {
+
+                while(count($MyRow->EnId)<count($MyRow->OppEnId)) {
+                    $MyRow->EnId[]=' ';
+                }
+                while(count($MyRow->OppEnId)<count($MyRow->EnId)) {
+                    $MyRow->OppEnId[]=' ';
+                }
+            }
+            $pdf->ScoreCellHeight=min(9, ($pdf->getPageHeight()-105-4.5*max(is_array($MyRow->EnId??'') ? count($MyRow->EnId) : 1, is_array($MyRow->OppEnId??'') ? count($MyRow->OppEnId) : 1))/(4+($MyRow->FinElimChooser ? $MyRow->EvElimEnds : $MyRow->EvFinEnds)));
         }
         $NumUnits=15;
         if($MyRow->EvCheckGolds) {
@@ -238,7 +265,7 @@ function DrawScore(&$pdf, $MyRow, $Side='L', $Athletes=array()) {
 	$TotalW=$defTotalW;
 	$GoldW=$defGoldW;
     $margins = $pdf->getMargins();
-    $ScoreCellHeight= ($pdf->GetPageHeight()-$margins['bottom']-100)/($NumRow+6);
+    $ScoreCellHeight= min(($pdf->GetPageHeight()-$margins['bottom']-100)/($NumRow+6), $pdf->ScoreCellHeight);
 
 	$Prefix='Opp';
 	$Opponent='';
@@ -279,7 +306,7 @@ function DrawScore(&$pdf, $MyRow, $Side='L', $Athletes=array()) {
 
 	$AthCell=6;
 	$AthHeight=6;
-	$RankHeight=12;
+	$RankHeight=6;
 	if(($MyRow->Team and is_array($MyRow->Team)) or ($MyRow->OppTeam and is_array($MyRow->OppTeam))) {
 		$AthCell=4.5;
 		if($MyRow->Team and is_array($MyRow->Team)) {
@@ -290,11 +317,31 @@ function DrawScore(&$pdf, $MyRow, $Side='L', $Athletes=array()) {
 		$WhereY[$WhichScore]=$WhereY[$WhichScore]+$AthHeight-6;
 		$RankHeight=6+$AthHeight;
 	}
+    if(($MyRow->EnId and is_array($MyRow->EnId)) or ($MyRow->OppEnId and is_array($MyRow->OppEnId))) {
+        $AthCell=4.5;
+        if($MyRow->EnId and is_array($MyRow->EnId)) {
+            $AthHeight=$AthCell*count($MyRow->EnId);
+        } else {
+            $AthHeight=$AthCell*count($MyRow->OppEnId);
+        }
+        $WhereY[$WhichScore]=$WhereY[$WhichScore]+$AthHeight-6;
+        $RankHeight=$AthHeight;
+    }
 
 	$pdf->SetFont($pdf->FontStd,'',10);
-	$pdf->Cell(20, 6,(get_text('Team')) . ': ', 'LT', 0, 'L', 0);
+	$pdf->Cell(20, $AthHeight,(get_text('Team')) . ': ', 'LT', 0, 'L', 0);
 	$pdf->SetFont($pdf->FontStd,'B',10);
-	$pdf->Cell($ScoreWidth-20-2*$GoldW-($pdf->PrintFlags?18:0), 6, (($MyRow->{$Prefix.'CountryName'}??'') . (strlen($MyRow->{$Prefix.'CountryCode'}??'')>0 ?  ' (' . $MyRow->{$Prefix.'CountryCode'}  . ')' : '')), 'T', 1, 'L', 0);
+    if($MyRow->{$Prefix.'CountryName'}) {
+        $pdf->Cell($ScoreWidth-20-2*$GoldW-($pdf->PrintFlags?18:0), $RankHeight, (($MyRow->{$Prefix.'CountryName'}??'') . (strlen($MyRow->{$Prefix.'CountryCode'}??'')>0 ?  ' (' . $MyRow->{$Prefix.'CountryCode'}  . ')' : '')), 'T', 1, 'L', 0);
+    } elseif($MyRow->{$Prefix.'EnId'} and is_array($MyRow->{$Prefix.'EnId'})) {
+        $OrgX=$pdf->getX();
+        foreach($MyRow->{$Prefix.'EnId'} as $k=>$Athlete) {
+            $pdf->setX($OrgX);
+            $pdf->Cell($ScoreWidth-20-2*$GoldW-($pdf->PrintFlags?18:0),$AthCell,$Athlete, $k ? '' : 'T', 1, 'L', 0);
+        }
+    } else {
+        $pdf->Cell($ScoreWidth-20-2*$GoldW-($pdf->PrintFlags?18:0), 6, '', 'T', 1, 'L', 0);
+    }
 
     if(count($Athletes)) {
         $first = true;
@@ -324,7 +371,7 @@ function DrawScore(&$pdf, $MyRow, $Side='L', $Athletes=array()) {
 	$pdf->Cell(2*$GoldW,6, (get_text('Rank')),'TLR',1,'C',1);
 	$pdf->SetXY($ScoreWidth-2*$GoldW+$WhereStartX[$WhichScore],$pdf->GetY());
 	$pdf->SetFont($pdf->FontStd,'B',25);
-	$pdf->Cell(2*$GoldW,6+(count($Athletes)<=1 ? 6:4)*max(count($Athletes),1), ($MyRow->{$Prefix.'QualRank'} ?? $MyRow->{$Prefix.'GridPosition'}),'BLR',1,'C',1);
+	$pdf->Cell(2*$GoldW,$RankHeight+(count($Athletes)<=1 ? 6:4)*max(count($Athletes),1), ($MyRow->{$Prefix.'QualRank'} ?? ''),'BLR',1,'C',1);
 
     //Readjust start of score where needed
     if($WhereY[0] <= $pdf->getY()+5) {
@@ -574,4 +621,37 @@ function DrawScore(&$pdf, $MyRow, $Side='L', $Athletes=array()) {
 
 }
 
+function get_winner($MatchNo, $Event) {
+    $ret=array();
+    $Bronze=($MatchNo==2 or $MatchNo==3);
+    if($MatchNo<2) {
+        $MatchNo+=2;
+    }
+    $q=safe_r_sql("select concat('(#', TeRank, ') ', CoName, if(TfSubTeam>0, TfSubTeam, ''), ' (', CoCode, if(TfSubTeam>0, TfSubTeam, ''),')') as Athlete, CoCode, TfMatchNo, TfWinLose 
+		from TeamFinals
+	    left join (
+	        select TeCoId, TeSubTeam, TeTournament, CoCode, CoName, TeRank
+            from Teams
+            inner join Countries on CoId=TeCoId
+            where TeTournament={$_SESSION['TourId']} and TeEvent='$Event'
+	    ) Countries on TeCoId=TfTeam and TeSubTeam=TfSubTeam
+		where TfMatchNo in (".($MatchNo*2).", ".($MatchNo*2 + 1).") and TfEvent='$Event' and TfTournament={$_SESSION['TourId']} order by TfWinLose desc");
+    while($r=safe_fetch($q)) {
+        if($r->TfWinLose) {
+            $ret[]=$r->Athlete;
+            return $ret;
+        }
+        $ret=array_merge($ret, get_winner($r->TfMatchNo, $Event));
+        if($r->CoCode) {
+            $ret[]=$r->Athlete;
+        }
+    }
+    $ret=array_unique($ret);
+    if($Bronze and count($ret)==1) {
+        // if the semifinals are with only one contender, then no bronze are done!
+        $ret=[' '];
+    }
+    return $ret;
+}
+
 
diff --git a/src/Final/Team/PrintScore.php b/src/Final/Team/PrintScore.php
index ae51191d..83f30995 100644
--- a/src/Final/Team/PrintScore.php
+++ b/src/Final/Team/PrintScore.php
@@ -158,6 +158,7 @@
     echo '<td colspan="2" class="Left">';
     echo '<input name="ScoreFilled" type="checkbox" value="1">&nbsp;' . get_text('ScoreFilled') . '<br>';
     echo '<input name="IncEmpty" type="checkbox" value="1">&nbsp;' . get_text('ScoreIncEmpty') . '<br>';
+    echo '<input name="IncAllNames" type="checkbox" value="1">&nbsp;' . get_text('ScoreIncAllNames') . '<br>';
     echo '<input name="ScoreFlags" type="checkbox" value="1">&nbsp;' . get_text('ScoreFlags','Tournament') . '<br>';
     if(module_exists("Barcodes"))
         echo '<input name="Barcode" type="checkbox" checked value="1">&nbsp;' . get_text('ScoreBarcode','Tournament') . '<br>';
diff --git a/src/Final/Team/WriteDateTimeAll.php b/src/Final/Team/WriteDateTimeAll.php
index d325fc0c..4d317d70 100644
--- a/src/Final/Team/WriteDateTimeAll.php
+++ b/src/Final/Team/WriteDateTimeAll.php
@@ -31,7 +31,7 @@
 			= "select"
 			. " FSScheduledDate,"
 			. " date_format(FSScheduledDate, '".get_text('DateFmtDB')."') DateFormatted,"
-			. " UNIX_TIMESTAMP(concat(FSScheduledDate, ' ', FSScheduledTime)) UnixTime "
+			. " concat(FSScheduledDate, ' ', FSScheduledTime) as PhaseDateTime "
 			. "FROM FinSchedule "
 			. " INNER JOIN Grids on FsMatchNo=GrMatchNo "
 			. "WHERE"
@@ -49,7 +49,7 @@
 			$_REQUEST['d_FSScheduledDateAll']=$r->DateFormatted;
 		}
 		if(substr($_REQUEST['d_FSScheduledTimeAll'],0,1)=='+') {
-			$time=date('H:i:s', strtotime($_REQUEST['d_FSScheduledTimeAll'].' minutes', $r->UnixTime));
+			$time=date('H:i:s', strtotime($_REQUEST['d_FSScheduledTimeAll'].' minutes', strtotime($r->PhaseDateTime)));
 			$_REQUEST['d_FSScheduledTimeAll']=substr($time,0,5);
 		}
 	}
diff --git a/src/Final/Team/WriteScore_Bra.php b/src/Final/Team/WriteScore_Bra.php
index 95e1d2e7..320550e6 100644
--- a/src/Final/Team/WriteScore_Bra.php
+++ b/src/Final/Team/WriteScore_Bra.php
@@ -275,13 +275,15 @@ function setTieWinner($ee, $winner, $loser, $SoArrows, $WinLose=1, $TieValue=1,
 			if($r->Closest1==$r->Closest2) {
 				if($winner==$r->MatchNo1) {
 					$r->Closest1=1;
+					$r->Closest2=0;
 				} else {
 					$r->Closest2=1;
+					$r->Closest1=0;
 				}
 			}
 		}
 
-		safe_w_sql("update TeamFinals set TfTbDecoded='" . ($TbDecoded1 ? implode(",",$TbDecoded1).($r->Closest1 ? '+' : '') : '') . "' where TfTournament={$_SESSION['TourId']} AND TfEvent='$ee' AND TfMatchNo = $r->MatchNo1");
-		safe_w_sql("update TeamFinals set TfTbDecoded='" . ($TbDecoded2 ? implode(",",$TbDecoded2).($r->Closest2 ? '+' : '') : '') . "' where TfTournament={$_SESSION['TourId']} AND TfEvent='$ee' AND TfMatchNo = $r->MatchNo2");
+		safe_w_sql("update TeamFinals set TfTbClosest={$r->Closest1}, TfTbDecoded='" . ($TbDecoded1 ? implode(",",$TbDecoded1).($r->Closest1 ? '+' : '') : '') . "' where TfTournament={$_SESSION['TourId']} AND TfEvent='$ee' AND TfMatchNo = $r->MatchNo1");
+		safe_w_sql("update TeamFinals set TfTbClosest={$r->Closest2}, TfTbDecoded='" . ($TbDecoded2 ? implode(",",$TbDecoded2).($r->Closest2 ? '+' : '') : '') . "' where TfTournament={$_SESSION['TourId']} AND TfEvent='$ee' AND TfMatchNo = $r->MatchNo2");
 	}
 }
diff --git a/src/Final/Viewer/index-buildPage.php b/src/Final/Viewer/index-buildPage.php
index ac9449cd..a394eb76 100644
--- a/src/Final/Viewer/index-buildPage.php
+++ b/src/Final/Viewer/index-buildPage.php
@@ -117,8 +117,6 @@
 	JsonOut($JSON);
 }
 
-require_once("Common/Obj_Target.php");
-
 if($MatchNo>256) {
     $Section=end($rankData['sections']);
     $Level=end($Section['levels']);
@@ -163,104 +161,57 @@
 
 // check if we are running SO or normal match
 $IsSO=false;
-
-$SelectedEndNum=0;
-$SelectedEndType='';
-if(!empty($_REQUEST['SelectedEnd'])) {
-	list($dummy, $SelectedEndType, $SelectedEndNum)=explode('-', $_REQUEST['SelectedEnd']);
-}
-$JSON['SelectedEnd']=$SelectedEndNum;
-
-// actual ends number is not that important in case of SO!
-$JSON['NumEnds']=(integer) $NumEnds;
-$JSON['NumSO']=1;
-
-if($SelectedEndType!='End' and (trim($Match['tiebreak']) or trim($Match['oppTiebreak']))) {
-    $IsSO=true;
+$NumArrows=$NumArrowsMatch;
+$EndNo=ceil(max(strlen(rtrim($Match['arrowstring'])), strlen(rtrim($Match['oppArrowstring'])))/$NumArrows);
+if(trim($Match['tiebreak'])!='' or trim($Match['oppTiebreak'])!='') {
+    $IsSO = true;
     $NumArrows=$NumArrowsSO;
-    ${'Arrowstrin'.$Sx}=strlen(trim($Match['tiebreak']));
-    ${'Arrowstrin'.$Rx}=strlen(trim($Match['oppTiebreak']));
-    ${'Obj'.$Sx}='tiebreak';
-    ${'Obj'.$Rx}='oppTiebreak';
-    ${'Pos'.$Sx}='tiePosition';
-    ${'Pos'.$Rx}='oppTiePosition';
-} else {
-    $NumArrows=$NumArrowsMatch;
-    ${'Arrowstrin'.$Sx}=strlen(trim($Match['arrowstring']));
-    ${'Arrowstrin'.$Rx}=strlen(trim($Match['oppArrowstring']));
-    ${'Obj'.$Sx}='arrowstring';
-    ${'Obj'.$Rx}='oppArrowstring';
-    ${'Pos'.$Sx}='arrowPosition';
-    ${'Pos'.$Rx}='oppArrowPosition';
+    $EndNo = ceil(max(strlen(rtrim($Match['tiebreak'])), strlen(rtrim($Match['oppTiebreak']))) / $NumArrows);
 }
 
-$EndL=ceil(max($ArrowstrinL, $ArrowstrinR)/$NumArrows);
-$EndR=$EndL;
 if($Match['status']==3 and $Match['oppStatus']==3 and $Match['winner']==0 and $Match['oppWinner']==0) {
-    $EndL++;
-    $JSON['UpdateL'] = 1;
-    $JSON['UpdateR'] = 1;
-    $EndR++;
+    $EndNo++;
+    if(!$IsSO AND $EndNo>$NumEnds) {
+        $IsSO=true;
+        $NumArrows=$NumArrowsSO;
+        $EndNo=1;
+    }
     $JSON['UpdateL'] = 1;
     $JSON['UpdateR'] = 1;
 }
 
-if(!$EndL) $EndL++;
-if(!$EndR) $EndR++;
-
-if($EndL>$NumEnds and $EndR>$NumEnds) {
-    // double check we are in a SO situation...
-    $IsSO=true;
-    $NumArrows=$NumArrowsSO;
-    ${'Arrowstrin'.$Sx}=strlen(trim($Match['tiebreak']));
-    ${'Arrowstrin'.$Rx}=strlen(trim($Match['oppTiebreak']));
+if($IsSO) {
     ${'Obj'.$Sx}='tiebreak';
     ${'Obj'.$Rx}='oppTiebreak';
     ${'Pos'.$Sx}='tiePosition';
     ${'Pos'.$Rx}='oppTiePosition';
-
-    $EndL=ceil(max($ArrowstrinL, $ArrowstrinR)/$NumArrows);
-	$JSON['NumSO']=$EndL;
-
-    $EndR=$EndL;
-
-    if(!$EndL or $Match['status']==3) {
-        $EndL++;
-    }
-    if(!$EndR or $Match['oppStatus']==3) {
-        $EndR++;
-    }
-}
-
-if($IsSO) {
-    $EndL=-$EndL;
-    $EndR=-$EndR;
-}
-$JSON['isSO']=$IsSO;
-$JSON['Event']=$Event.'<br/>'.$MatchName;
-
-$JSON['CurEnd']=max($EndL, $EndR);
-if(!$JSON['SelectedEnd']) {
-    $JSON['SelectedEnd']=$JSON['CurEnd'];
+} else {
+    ${'Obj'.$Sx}='arrowstring';
+    ${'Obj'.$Rx}='oppArrowstring';
+    ${'Pos'.$Sx}='arrowPosition';
+    ${'Pos'.$Rx}='oppArrowPosition';
 }
+$JSON['CurEnd'] = $EndNo + ($IsSO ? $NumEnds : 0);
+$JSON['NumEnds'] = intval($NumEnds);
+$JSON['NumSO'] = ($IsSO ? $EndNo : 0);
 
 if($Team) {
 	$JSON['Opp'.$Left]=$Match['countryName'].get_flag_ianseo($Match['countryCode'], 0, '', $_SESSION['TourCode']);
 	$JSON['Opp'.$Right]=$Match['oppCountryName'].get_flag_ianseo($Match['oppCountryCode'], 0, '', $_SESSION['TourCode']);
 } else {
-	$JSON['Opp'.$Left]= $Match['fullName'] . ' - '.$Match['countryCode'].get_flag_ianseo($Match['countryCode'], 0, '', $_SESSION['TourCode']);
-	$JSON['Opp'.$Right]=$Match['oppFullName'] . ' - '.$Match['oppCountryCode'].get_flag_ianseo($Match['oppCountryCode'], 0, '', $_SESSION['TourCode']);
+	$JSON['Opp'.$Left]= $Match['fullName'] . ' - '.$Match['countryName'].get_flag_ianseo($Match['countryCode'], 0, '', $_SESSION['TourCode']);
+	$JSON['Opp'.$Right]=$Match['oppFullName'] . ' - '.$Match['oppCountryName'].get_flag_ianseo($Match['oppCountryCode'], 0, '', $_SESSION['TourCode']);
 }
+$JSON['Event']=$Event.'<br/>'.$MatchName;
 
-$ArrL=substr($Match[${'Obj'.$Sx}], $IndexL=$NumArrows*(abs($EndL)-1), $NumArrows);
-$ArrR=substr($Match[${'Obj'.$Rx}], $IndexR=$NumArrows*(abs($EndR)-1), $NumArrows);
+$ArrL=substr($Match[${'Obj'.$Sx}], $IndexL=$NumArrows*($EndNo-1), $NumArrows);
+$ArrR=substr($Match[${'Obj'.$Rx}], $IndexR=$NumArrows*($EndNo-1), $NumArrows);
 
-$JSON['Score'.$Left]='<div class="badge badge-danger" id="scoreLabelL" numArr="'.$NumArrows.'">'.($EndL<0 ? 'SO '.abs($EndL) : 'End '.$EndL).'</div>';
-$JSON['Score'.$Right]='<div class="badge badge-danger" id="scoreLabelR" numArr="'.$NumArrows.'">'.($EndR<0 ? 'SO '.abs($EndR) : 'End '.$EndR).'</div>';
+$JSON['Score'.$Left]='<div class="badge badge-danger" id="scoreLabelL" numArr="'.$NumArrows.'">'.($IsSO ? 'SO ' : 'End '). $EndNo .'</div>';
+$JSON['Score'.$Right]='<div class="badge badge-danger" id="scoreLabelR" numArr="'.$NumArrows.'">'.($IsSO ? 'SO ' : 'End '). $EndNo .'</div>';
 
 $TotL=ValutaArrowString($ArrL);
 $TotR=ValutaArrowString($ArrR);
-//$ShowDistance=($IsSO and strlen(trim($ArrL))==strlen(trim($ArrR)) and strlen(trim($ArrL))==$NumArrows and $TotL==$TotR);
 
 foreach(DecodeFromString(str_pad($ArrL, $NumArrows, ' ', STR_PAD_RIGHT), false, true) as $k => $Point) {
     $JSON['Score'.$Left].='<div class="badge badge-primary" id="'.$k.'-L" onclick="showSight(this)" onmouseover="showSight(this)" onmouseout="hideSight(this)">'.
@@ -301,7 +252,6 @@
 
 switch ($_REQUEST["View"]) {
     case 'Scorecard':
-
         $cols= $NumArrowsMatch;
         $rows  = $NumEnds;
         $so = $NumArrowsSO;
@@ -344,8 +294,8 @@
             $JSON['Tgt'.$Right] .= '<tr><th scope="row" class="table-dark text-center">'.($lenSo ? get_text('ShotOffShort', 'Tournament') . ' ' . ($r+1) : '&nbsp;').'</th>';
             if($lenSo) {
                 for ($c = 0; $c < $so; $c++) {
-                    $JSON['Tgt'.$Left] .= '<td class="text-center whiteBg">' . DecodeFromLetter($arrSo[($r * $so) + $c]) . '</td>';
-                    $JSON['Tgt'.$Right] .= '<td class="text-center whiteBg">' . DecodeFromLetter($oppSo[($r * $so) + $c]) . '</td>';
+                    $JSON['Tgt'.$Left] .= '<td class="text-center whiteBg">' . DecodeFromLetter($arrSo[($r * $so) + $c]??'') . '</td>';
+                    $JSON['Tgt'.$Right] .= '<td class="text-center whiteBg">' . DecodeFromLetter($oppSo[($r * $so) + $c]??'') . '</td>';
                 }
                 if ($so < $cols) {
                     $JSON['Tgt'.$Left] .= '<td class="text-center whiteBg closestText" colspan="' . ($cols - $so) . '">' . ($Match['closest']!=0 ? '+':'&nbsp;') . '</td>';
@@ -400,7 +350,6 @@
                 $Records .= '</div>';
             }
         }
-
         if($Team) {
             //Left Team
             $options['coid'] = $Match['teamId'];
@@ -770,17 +719,33 @@
         $JSON['Tgt'.$Left] = $Ceremonies[0];
         $JSON['Tgt'.$Right] = $Ceremonies[1];
         break;
-
-
-
     case 'Target':
+        require_once("Common/Obj_Target.php");
         $target = new Obj_Target();
+        $SelectedEnd=$EndNo;
+        $JSON['SelectedEnd'] = intval($_REQUEST["SelectedEnd"]);
+        if(!empty($_REQUEST["SelectedEnd"])) {
+            $SelectedEnd = intval($_REQUEST["SelectedEnd"]);
+            if($SelectedEnd <=  $NumEnds) {
+                $IsSO = false;
+                ${'Obj'.$Sx}='arrowstring';
+                ${'Obj'.$Rx}='oppArrowstring';
+                ${'Pos'.$Sx}='arrowPosition';
+                ${'Pos'.$Rx}='oppArrowPosition';
+                $NumArrows = $NumArrowsMatch;
+            } else {
+                $IsSO = true;
+                ${'Obj'.$Sx}='tiebreak';
+                ${'Obj'.$Rx}='oppTiebreak';
+                ${'Pos'.$Sx}='tiePosition';
+                ${'Pos'.$Rx}='oppTiePosition';
+                $NumArrows = $NumArrowsSO;
+                $SelectedEnd -= $NumEnds;
+            }
+        }
+        $IndexArrow = (($SelectedEnd - 1) * $NumArrows);
 
-        // the end to show is the selected end that defaults to the current end!
-        $IndexL=$NumArrows*(abs($JSON['SelectedEnd'])-1);
-        $IndexR=$IndexL;
-
-    // we already have most of the data needed for the target!
+        // we already have most of the data needed for the target!
         $target->initSVG($TourId, $Event, $MatchNo, $Team);
         $target->setSVGHeader('', '');
         $target->setTarget();
@@ -793,21 +758,21 @@
         $r=safe_fetch($q);
 
         if($Match['lastUpdated']>$r->CurrentDateTime) {
-	        $q=safe_r_sql("select * from FinOdfTiming where FinOdfEvent='$Event' and FinOdfTeamEvent=$Team and FinOdfMatchno in ($MatchNo, ".($MatchNo+1).") and FinOdfTournament={$_SESSION['TourId']} ");
-	        while($r=safe_fetch($q)) {
-	            if($r->FinOdfArrows) {
-	                $ar=json_decode($r->FinOdfArrows, true);
-	                if(!is_array($ar)) {
-	                    $ar=array($ar);
-	                }
-	                $ar=end($ar);
-	                if($ar['Ts']>$lastTime) {
-				        $lastTime=$ar['Ts'];
-				        $LastArrow=($r->FinOdfMatchno==$MatchNo ? 'L' : 'R');
-			        }
-
-		        }
-	        }
+            $q=safe_r_sql("select * from FinOdfTiming where FinOdfEvent='$Event' and FinOdfTeamEvent=$Team and FinOdfMatchno in ($MatchNo, ".($MatchNo+1).") and FinOdfTournament={$_SESSION['TourId']} ");
+            while($r=safe_fetch($q)) {
+                if($r->FinOdfArrows) {
+                    $ar=json_decode($r->FinOdfArrows, true);
+                    if(!is_array($ar)) {
+                        $ar=array($ar);
+                    }
+                    $ar=end($ar);
+                    if($ar['Ts']>$lastTime) {
+                        $lastTime=$ar['Ts'];
+                        $LastArrow=($r->FinOdfMatchno==$MatchNo ? 'L' : 'R');
+                    }
+
+                }
+            }
         }
 
         $JSON['TgtSize'] = $target->Diameter;
@@ -815,7 +780,7 @@
 
         $arrowsL=array();
         $arrowsR=array();
-        foreach(range($IndexL, $IndexL+$NumArrows-1) as $k => $i) {
+        foreach(range($IndexArrow, $IndexArrow+$NumArrows-1) as $k => $i) {
         	if(isset($Match[${'Pos'.$Sx}][$i])) {
 	            $arrowsL[$k]=$Match[${'Pos'.$Sx}][$i];
 	        }
@@ -835,6 +800,36 @@
         $target2->DrawSVGSighter($ar, false, 'SighterR');
         $JSON['Tgt'.$Right] = $target2->OutputStringSVG();
         $JSON['LastArrow'] = $LastArrow;
+
+        if($JSON['SelectedEnd']!=0 AND $JSON['SelectedEnd']!=$JSON['CurEnd']) {
+            $tmp = array('L'=>'','R'=>'');
+            $ArrL=substr($Match[${'Obj'.$Sx}], $IndexL=$NumArrows*($SelectedEnd-1), $NumArrows);
+            $ArrR=substr($Match[${'Obj'.$Rx}], $IndexR=$NumArrows*($SelectedEnd-1), $NumArrows);
+            $tmp[$Left]='<div class="badge badge-dark" id="scoreLabelL" numArr="'.$NumArrows.'">'.($IsSO ? 'SO ' : 'End '). $SelectedEnd .'</div>';
+            $tmp[$Right]='<div class="badge badge-dark" id="scoreLabelR" numArr="'.$NumArrows.'">'.($IsSO ? 'SO ' : 'End '). $SelectedEnd .'</div>';
+
+            $TotL=ValutaArrowString($ArrL);
+            $TotR=ValutaArrowString($ArrR);
+
+            foreach(DecodeFromString(str_pad($ArrL, $NumArrows, ' ', STR_PAD_RIGHT), false, true) as $k => $Point) {
+                $tmp[$Left].='<div class="badge badge-primary" id="'.$k.'-L" onclick="showSight(this)" onmouseover="showSight(this)" onmouseout="hideSight(this)">'.
+                    $Point.
+                    ((!empty($Match[${'Pos'.$Sx}][$IndexL+$k]) and isset($Match[${'Pos'.$Sx}][$IndexL+$k]['D'])) ? '<span class="arrowDist ml-2'.($IsSO ? '': ' hidden d-grid').'">'.($Match[${'Pos'.$Sx}][$IndexL+$k]['D']??'').'</span>' : '').
+                    '</div>';
+            }
+            $tmp[$Left].='<div class="badge badge-info">'.$TotL.(($IsSO AND $Match['closest']!=0 AND $k==($NumArrows-1)) ? '+':'').'</div>';
+
+            foreach(DecodeFromString(str_pad($ArrR, $NumArrows, ' ', STR_PAD_RIGHT), false, true) as $k => $Point) {
+                $tmp[$Right].='<div class="badge badge-primary" id="'.$k.'-R" onclick="showSight(this)" onmouseover="showSight(this)" onmouseout="hideSight(this)">'.
+                    $Point.
+                    ((!empty($Match[${'Pos'.$Rx}][$IndexR+$k]) and isset($Match[${'Pos'.$Rx}][$IndexR+$k]['D'])) ? '<span class="arrowDist ml-2'.($IsSO ? '': ' hidden').'">'.$Match[${'Pos'.$Rx}][$IndexR+$k]['D'].'</span>' : '').
+                    '</div>';
+            }
+            $tmp[$Right].='<div class="badge badge-info">'.$TotR.(($IsSO AND $Match['oppClosest']!=0 AND $k==($NumArrows-1)) ? '+':'').'</div>';
+            $JSON['Tgt'.$Left] = '<div class="p-0">' . $JSON['Tgt'.$Left] . '</div><div class="previous-end">' . $tmp[$Left] . '</div>';
+            $JSON['Tgt'.$Right] = '<div class="p-0">' . $JSON['Tgt'.$Right] . '</div><div class="previous-end">' . $tmp[$Right] . '</div>';
+        }
+
 }
 
 JsonOut($JSON);
diff --git a/src/Final/Viewer/index.css b/src/Final/Viewer/index.css
index 8cc0f81a..3b688d96 100644
--- a/src/Final/Viewer/index.css
+++ b/src/Final/Viewer/index.css
@@ -26,13 +26,11 @@ body {padding:0 !important;}
     font-size: 1vw;
     white-space: nowrap;
 }
-#OppLeftContainer {
+#OppLeftContainer, #OppRightContainer,
+#ScoreLeftContainer, #ScoreRightContainer{
     flex: 0 0 44vw;
 }
-#OppRightContainer {
-    flex: 0 0 44vw;
-}
-#EventContainer {
+#EventContainer, #VoidContainer {
     flex: 0 0 10vw;
 }
 
@@ -76,6 +74,16 @@ body {padding:0 !important;}
     min-width:2em;
 }
 
+.previous-end {
+    font-size:1.70vw;
+    padding: 0 0 0.25em 0;
+}
+.previous-end div {
+    border-radius: 0.5em;
+    margin-left:0.15em;
+    min-width:1em;
+}
+
 #TgtLeft,
 #TgtRight {
     padding:0;
diff --git a/src/Final/Viewer/index.js b/src/Final/Viewer/index.js
index 95cc715f..6a3f94b9 100644
--- a/src/Final/Viewer/index.js
+++ b/src/Final/Viewer/index.js
@@ -1,6 +1,7 @@
 var TimeStamp = '';
 var TimeCheck = 1000;
 var Zoom = 1;
+var Lock = 0;
 var View = 'Auto';
 var toReference = 0;
 var oldEvent='';
@@ -15,17 +16,19 @@ var Athletes = [[],[]];
 var bioLoaded = false;
 var Ids=[];
 var evListData;
-var oldSelectedEnd='';
+var curSelectedEnd=0;
 
 $(document).ready(init);
 
 var TgtSize=0;
 var TgtOrgSize=0;
 function init() {
-    TgtSize=Math.min($('.card').width()*0.45, $(window).height()-parseInt($('.card-header').css("height"))-parseInt($('#ScoreLeft').css("height"))-12);
+    $('.card-body').height($(document).outerHeight()-$('.card-header').outerHeight()-$('.card-footer').outerHeight());
+    TgtSize=Math.min($('.card').outerWidth()*0.44, $('.card-body').height());
     $('.SVGTarget').width(TgtSize).height(TgtSize);
-    $('#MainTable').height($('.card-body').height());
-    setView('Presentation');
+    $('#MainTable').height($('.card-body').innerHeight());
+    let tmpView = sessionStorage.getItem("finalViewerView") ?? 'Presentation';
+    setView(tmpView);
 }
 
 function resetInit(Event, MatchNo, Team, Phase) {
@@ -40,10 +43,12 @@ function resetInit(Event, MatchNo, Team, Phase) {
     Athletes = [[],[]];
     bioLoaded = false;
     Ids=[];
+    curSelectedEnd = 0;
 }
 
 function setView(newView) {
     View = newView;
+    sessionStorage.setItem("finalViewerView", newView);
     $('.btnViewMenu').addClass('btn-info').removeClass('active btn-success');
     $('#btn'+View).addClass('active btn-success').removeClass('btn-info');
     TimeStamp='';
@@ -142,18 +147,8 @@ function BuildPage() {
 	    Team: oldTeam,
 	    Lock: Lock,
 	    View: View,
-	    SelectedEnd:'',
+	    SelectedEnd:curSelectedEnd,
     };
-    if($('#followLive').hasClass('btn-secondary')) {
-    	// we are not following live anymore so select which end we are following
-	    tmpEnd = $('#EndSelector .EndSelector.btn-success');
-	    if(!tmpEnd.hasClass('disabled')) {
-	    	form.SelectedEnd = tmpEnd.attr('id');
-	    	Lock=1;
-	    	form.Lock=1;
-	    }
-    }
-
     $.getJSON('index-buildPage.php', form, function (data) {
         if (data.error == 0) {
             if (data.time != '') {
@@ -162,9 +157,8 @@ function BuildPage() {
 	            } else {
 		            $('#bntGoToLive').hide();
 	            }
-            	if(data.time!=TimeStamp || form.SelectedEnd!=oldSelectedEnd) {
+            	if(data.time!=TimeStamp) {
 	                TimeStamp = data.time;
-		            oldSelectedEnd=form.SelectedEnd;
 	                $('#Event').html(data.Event);
 
 	                if (oldEvent != data.EvCode || oldMatchNo != data.MatchNo || oldTeam != data.EvTeam) {
@@ -207,27 +201,34 @@ function BuildPage() {
 	                    $('#TgtLeft').html(data.TgtLeft);
 	                    $('#TgtRight').html(data.TgtRight);
 
-	                    // End Selector only if we did not ask for a specific end
-		                if(oldSelectedEnd=='') {
-			                EndSelector='';
-			                for(n=0;n<data.NumEnds;n++) {
-			                    EndSelector+='<button type="button" id="EndSelector-End-'+(n+1)+'" class="EndSelector btnViewMenu btn '+((n==data.SelectedEnd-1 && data.isSO==false) ? 'btn-success' : 'btn-warning')+((n>=data.CurEnd && data.isSO==false) ? ' disabled' : '')+'" onclick="selectEnd(this)">End '+(n+1)+'</button>'
-			                }
-			                for(n=0;n<data.NumSO;n++) {
-			                    EndSelector+='<button type="button" id="EndSelector-SO-'+(n+1)+'" class="EndSelector btnViewMenu btn '+(n==0 ? ' mt-1' : '')+((n==data.SelectedEnd-1 && data.isSO==true) ? ' btn-success' : ' btn-warning')+(data.isSO==false ? ' disabled' : '')+'" onclick="selectEnd(this)">SO '+(n+1)+'</button>'
-			                }
-			                if(EndSelector!='') {
-                                EndSelector += '<button id="followLive" class="mt-1 btn btn-info btnViewMenu" onclick="toggleFollow()">Current</button>';
-                                EndSelector += '<button id="followLive" class="mt-1 btn btn-light border-info btnViewMenu" onclick="toggleDistance()">Distance</button>';
-                            }
-							$('#EndSelector').html(EndSelector);
-		                }
+                        EndSelector='';
+                        for(n=1;n<=data.NumEnds;n++) {
+                            EndSelector+='<button type="button" id="EndSelector-End-'+n+'" class="EndSelector btnViewMenu btn '+(n==(data.SelectedEnd==0 ? data.CurEnd : data.SelectedEnd) ? 'btn-success' : 'btn-warning')+'" '+((n>data.CurEnd) ? 'disabled' : '')+' onclick="selectEnd('+n+')">End '+n+'</button>';
+                        }
+                        for(n;n<=data.NumEnds+data.NumSO;n++) {
+                            EndSelector+='<button type="button" id="EndSelector-End-'+n+'" class="EndSelector btnViewMenu btn '+(n==data.NumEnds+1 ? ' mt-1' : '')+(n==(data.SelectedEnd==0 ? data.CurEnd : data.SelectedEnd) ? ' btn-success' : ' btn-warning')+'" onclick="selectEnd('+n+')">SO '+(n-data.NumEnds)+'</button>';
+                        }
+                        if(EndSelector!='') {
+                            EndSelector += '<button id="followLive" class="mt-1 btn '+((data.SelectedEnd == 0 || data.SelectedEnd == data.CurEnd) ? 'btn-info' : 'btn-secondary')+' btnViewMenu" onclick="selectEnd(0)">Current</button>';
+                            EndSelector += '<button id="followLive" class="mt-1 btn btn-light border-info btnViewMenu" onclick="toggleDistance()">Distance</button>';
+                        }
+                        $('#EndSelector').html(EndSelector);
+                        if(curSelectedEnd != 0 && curSelectedEnd != data.CurEnd) {
+                            Lock = 1;
+                        } else {
+                            curSelectedEnd = 0;
+                        }
+                        $('.arrowDist').toggleClass('hidden', $('#ScoreLeft .arrowDist').hasClass('hidden'));
 
 	                    Zoom = data.TgtZoom;
 	                    TgtOrgSize = data.TgtSize;
+                        reducedSize = ($('.previous-end').outerHeight() ?? 0);
+                        if($('.card-body').innerHeight() > (TgtSize+reducedSize)) {
+                            reducedSize = 0;
+                        }
 	                    $('.SVGTarget')
 	                        .width(TgtSize)
-	                        .height(TgtSize)
+	                        .height(TgtSize - reducedSize)
 	                        .mouseleave(function (e) {
 	                            $(this).attr('viewBox', '0 0 ' + TgtOrgSize + ' ' + TgtOrgSize);
 	                        })
@@ -390,8 +391,7 @@ function goToMatch() {
 function goToLive() {
     TimeStamp=0;
     Lock = 0;
-	oldSelectedEnd='';
-	toggleFollow(true);
+    curSelectedEnd=0;
     BuildPage();
 }
 
@@ -405,25 +405,11 @@ function setMatchInfo(Event, MaNo, Team) {
     $('#SelectMatch').modal('hide');
 }
 
-function toggleFollow(status) {
-	if(typeof status == 'undefined') {
-		status = $('#followLive').hasClass('btn-secondary');
-	}
-	if(status==true) {
-		$('#followLive').removeClass('btn-secondary').addClass('btn-info');
-		oldSelectedEnd='';
-		TimeStamp=0;
-		BuildPage();
-	} else {
-		$('#followLive').addClass('btn-secondary').removeClass('btn-info');
-	}
-}
-
-function selectEnd(obj) {
-    // remove the follow status and stop refreshing
-    toggleFollow(false);
-    $('#EndSelector .EndSelector.btn-success').removeClass('btn-success').addClass('btn-warning');
-    $(obj).removeClass('btn-warning').addClass('btn-success');
+function selectEnd(endNo) {
+    if(curSelectedEnd != endNo) {
+        curSelectedEnd = endNo;
+        TimeStamp = 0;
+    }
     BuildPage();
 }
 
@@ -456,8 +442,9 @@ function hideSight(obj) {
 }
 
 function toggleDistance() {
-    $('.arrowDist').toggleClass('hidden');
-    if(!$('.arrowDist').hasClass('hidden') && (parseInt($('#scoreLabelL').attr('numArr'))>4 || parseInt($('#scoreLabelR').attr('numArr'))>4)) {
+    let tmpActualHidden = ($('#ScoreLeft .arrowDist').hasClass('hidden'));
+    $('.arrowDist').toggleClass('hidden', !tmpActualHidden);
+    if(!tmpActualHidden && (parseInt($('#scoreLabelL').attr('numArr'))>4 || parseInt($('#scoreLabelR').attr('numArr'))>4)) {
         $('#ScoreLeft').addClass('reduced');
         $('#ScoreRight').addClass('reduced');
     } else {
diff --git a/src/Final/Viewer/index.php b/src/Final/Viewer/index.php
index baec3175..bc29cbfe 100644
--- a/src/Final/Viewer/index.php
+++ b/src/Final/Viewer/index.php
@@ -50,8 +50,8 @@
 	<div class="card-body p-0">
 		<table id="MainTable" class="w-100">
 			<tr class="text-center align-top" >
-                <td id="TgtLeft" class="w-45"><svg class="SVGTarget"></svg></td>
-                <td rowspan="2" class="w-10" id="spotMenu">
+                <td id="TgtLeft" class="w-45"></td>
+                <td class="w-10" id="spotMenu">
                     <div class="btn-group-vertical btn-group mt-2" role="group">
                         <button type="button" class="btn btn-info btnViewMenu" id="btnPresentation" onclick="setView('Presentation')">[Presentation]</button>
                         <button type="button" class="btn btn-info btnViewMenu" id="btnBiography" onclick="setView('Biography')">[Biography]</button>
@@ -65,18 +65,23 @@
                         <button type="button" class="btn btn-info btnViewMenu" id="bntSelectMatch" onclick="selectMatch()">[Select Match]</button>
                         <button type="button" class="btn btn-danger btnViewMenu" id="bntGoToLive" onclick="goToLive()">[Live Match]</button>
                     </div>
-
                     <div class="btn-group-vertical btn-group mt-3" role="group" id="EndSelector"></div>
-
                 </td>
-				<td id="TgtRight" class="w-45"><svg class="SVGTarget"></svg></td>
-			</tr>
-			<tr class="text-center">
-				<td id="ScoreLeft"><div class="badge badge-info">ScoreLeft</div></td>
-				<td id="ScoreRight"><div class="badge badge-info">ScoreRight</div></td>
+				<td id="TgtRight" class="w-45"></td>
 			</tr>
 		</table>
 	</div>
+    <div class="card-footer p-0 bg-white">
+        <div class="d-flex justify-content-center align-items-center">
+            <div id="ScoreLeftContainer" class="text-center">
+                <div id="ScoreLeft"><div class="badge badge-info">Score Left</div></div>
+            </div>
+            <div id="VoidContainer">&nbsp;</div>
+            <div id="ScoreRightContainer" class="text-center">
+                <div id="ScoreRight"><div class="badge badge-info">Score Right</div></div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <?php
diff --git a/src/Main.php b/src/Main.php
index 4eb22143..d08b40fe 100644
--- a/src/Main.php
+++ b/src/Main.php
@@ -1,180 +1,175 @@
 <?php
-	require_once('./config.php');
-	require_once('Common/Fun_FormatText.inc.php');
-	require_once('Common/Fun_Sessions.inc.php');
-	require_once('Common/Lib/CommonLib.php');
-
-    // Check if the new UUID has been called
-    if(!GetParameter('UUID2')) {
-        require_once('Common/Lib/UpdateTournament.inc.php');
-        GetNewUuidOnce();
+require_once('./config.php');
+require_once('Common/Fun_FormatText.inc.php');
+require_once('Common/Fun_Sessions.inc.php');
+require_once('Common/Lib/CommonLib.php');
+
+// Check if the new UUID has been called
+if(!GetParameter('UUID2')) {
+    require_once('Common/Lib/UpdateTournament.inc.php');
+    GetNewUuidOnce();
+}
+
+CheckTourSession(true);
+$aclLevel = checkACL(AclCompetition,AclNoAccess);
+
+if(!empty($_REQUEST['redraw'])) {
+    include_once('Common/CheckPictures.php');
+    CheckPictures('', true, false, !empty($_REQUEST['force'])); // cancella le foto più vecchie di 1 giorno
+}
+$IncludeFA=true;
+$PAGE_TITLE=get_text('TourMainInfo', 'Tournament');
+
+include('Common/Templates/head.php');
+
+$Countries=get_Countries();
+
+$MyRow=NULL;
+$Select = "SELECT *, 
+    DATE_FORMAT(ToWhenFrom,'" . get_text('DateFmtDB') . "') AS DtFrom,
+    DATE_FORMAT(ToWhenTo,'" . get_text('DateFmtDB') . "') AS DtTo, 
+    DATE_FORMAT(ToWhenFrom,'%d') AS DtFromDay,
+    DATE_FORMAT(ToWhenFrom,'%m') AS DtFromMonth,
+    DATE_FORMAT(ToWhenFrom,'%Y') AS DtFromYear,
+    DATE_FORMAT(ToWhenTo,'%d') AS DtToDay,
+    DATE_FORMAT(ToWhenTo,'%m') AS DtToMonth,
+    DATE_FORMAT(ToWhenTo,'%Y') AS DtToYear, 
+    ToTypeName AS TtName,
+    ToNumDist AS TtNumDist
+    FROM Tournament
+    WHERE ToId=" . StrSafe_DB($_SESSION['TourId']) . " ";
+
+$Rs=safe_r_sql($Select);
+
+if (safe_num_rows($Rs)==1)
+{
+    $MyRow=safe_fetch($Rs);
+    echo '<table class="Tabella">
+        <tr><th class="Title" colspan="2">'.(isset($_REQUEST['New']) ? get_text('NewTour', 'Tournament') : $MyRow->ToName).'</th></tr>
+        <tr class="Divider"><td colspan="2"></td></tr>
+        <tr><td class="Title" colspan="2">'.get_text('TourMainInfo', 'Tournament').'</td></tr>
+        <tr>
+            <th class="TitleLeft w-15">'.get_text('TourCode','Tournament').'</th>
+            <td class="Bold">'.$MyRow->ToCode.'</td>
+        </tr>
+        <tr>
+            <th class="TitleLeft w-15">'.get_text('TourName','Tournament').'</th>
+            <td class="Bold">'.$MyRow->ToName.'</td>
+        </tr>
+        <tr>
+            <th class="TitleLeft w-15">'.get_text('TourShortName','Tournament').'</th>
+            <td class="Bold">'.$MyRow->ToNameShort.'</td>
+        </tr>
+        <tr>
+            <th class="TitleLeft w-15">'.get_text('TourCommitee','Tournament').'</th>
+            <td>'. $MyRow->ToCommitee . ' - ' . $MyRow->ToComDescr. '</td>
+        </tr>';
+
+        echo '<tr>
+            <th class="TitleLeft w-15">'.get_text('TourType','Tournament').'</th>
+            <td>'.get_text($MyRow->TtName, 'Tournament') . ', ' . $MyRow->TtNumDist . ' ' . get_text($MyRow->TtNumDist==1?'Distance':'Distances','Tournament').'</td>
+            </tr>';
+        echo '<tr>
+            <th class="TitleLeft w-15">'.get_text('TourIsOris','Tournament').'</th>
+            <td>'.get_text($_SESSION['ISORIS'] ? 'Yes' : 'No').'</td>
+            </tr>';
+        
+    if(empty($_REQUEST['New']) and ($Anomalies=checkCompetitionAnomalies())) {
+        echo '<tr class="Divider"><td colspan="2"></td></tr>';
+        echo '<tr class="Dsq text-white"><td class="Center Bold" colspan="2">'.get_text('Anomalies', 'Errors').'</td></tr>';
+        foreach($Anomalies as $v) {
+            echo '<tr class="Dsq text-white">
+                    <td class="Bold">'.$v['Msg'].'</td>
+                    <td class="TargetKo"><i class="fa fa-link mr-2" onclick="location.href=\''.$v['Lnk'].'\'"></i>'.implode(', ', $v['Cats']).'</td>
+                    </tr>';
+        }
+        echo '<tr class="Divider"><td colspan="2"></td></tr>';
     }
 
-	CheckTourSession(true);
-    $aclLevel = checkACL(AclCompetition,AclNoAccess);
-
-	if(!empty($_REQUEST['redraw'])) {
-		include_once('Common/CheckPictures.php');
-		CheckPictures('', true, false, !empty($_REQUEST['force'])); // cancella le foto più vecchie di 1 giorno
-	}
-
-	$PAGE_TITLE=get_text('TourMainInfo', 'Tournament');
-
-	include('Common/Templates/head.php');
-
-	$Countries=get_Countries();
-
-	$MyRow=NULL;
-	$Select = "SELECT *, 
-	    DATE_FORMAT(ToWhenFrom,'" . get_text('DateFmtDB') . "') AS DtFrom,
-	    DATE_FORMAT(ToWhenTo,'" . get_text('DateFmtDB') . "') AS DtTo, 
-	    DATE_FORMAT(ToWhenFrom,'%d') AS DtFromDay,
-	    DATE_FORMAT(ToWhenFrom,'%m') AS DtFromMonth,
-	    DATE_FORMAT(ToWhenFrom,'%Y') AS DtFromYear,
-	    DATE_FORMAT(ToWhenTo,'%d') AS DtToDay,
-	    DATE_FORMAT(ToWhenTo,'%m') AS DtToMonth,
-	    DATE_FORMAT(ToWhenTo,'%Y') AS DtToYear, 
-	    ToTypeName AS TtName,
-	    ToNumDist AS TtNumDist
-	    FROM Tournament
-	    WHERE ToId=" . StrSafe_DB($_SESSION['TourId']) . " ";
-
-	$Rs=safe_r_sql($Select);
-
-	if (safe_num_rows($Rs)==1)
-	{
-		$MyRow=safe_fetch($Rs);
-?>
-<table class="Tabella">
-<tr><th class="Title" colspan="2"><?php print (isset($_REQUEST['New']) ? get_text('NewTour', 'Tournament') : $MyRow->ToName); ?></th></tr>
-<tr class="Divider"><td colspan="2"></td></tr>
-<tr><td class="Title" colspan="2"><?php echo get_text('TourMainInfo', 'Tournament') ?></td></tr>
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('TourCode','Tournament');?></th>
-<td class="Bold"><?php print $MyRow->ToCode; ?></td>
-</tr>
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('TourName','Tournament');?></th>
-<td class="Bold"><?php print $MyRow->ToName; ?></td>
-</tr>
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('TourShortName','Tournament');?></th>
-<td class="Bold"><?php print $MyRow->ToNameShort; ?></td>
-</tr>
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('TourCommitee','Tournament');?></th>
-<td>
-<?php
-	print $MyRow->ToCommitee . ' - ' . $MyRow->ToComDescr;
-?>
-</td>
-</tr>
-
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('TourType','Tournament');?></th>
-<td>
-<?php
-		print get_text($MyRow->TtName, 'Tournament') . ', ' . $MyRow->TtNumDist . ' ' . get_text($MyRow->TtNumDist==1?'Distance':'Distances','Tournament');
-?>
-
-</td>
-</tr>
-
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('TourIsOris','Tournament');?></th>
-<td>
-<?php
-	print get_text($_SESSION['ISORIS'] ? 'Yes' : 'No');
-?>
-</td>
-</tr>
-
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('TourWhere','Tournament');?></th>
-<td><?php print $MyRow->ToWhere;?></td>
-</tr>
-
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('CompVenue','Tournament');?></th>
-<td><?php print $MyRow->ToVenue;?></td>
-</tr>
-
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('Nation');?></th>
-<td><?php print $MyRow->ToCountry ? $MyRow->ToCountry.' - '.$Countries[$MyRow->ToCountry] : $MyRow->ToCountry;?></td>
-</tr>
-
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('TourWhen','Tournament');?></th>
-<td><?php print get_text('From','Tournament') . ' ' . $MyRow->DtFrom . '<br>' . get_text('To','Tournament') . '&nbsp;&nbsp;&nbsp;' . $MyRow->DtTo; ?>
-</td>
-</tr>
-
-<tr>
-<th class="TitleLeft" width="15%"><?php echo get_text('NumSession', 'Tournament') ?></th>
-<td><?php print $MyRow->ToNumSession; ?></td>
-</tr>
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('SessionDescr', 'Tournament');?></th>
-<td>
-<?php
-		if ($MyRow->ToNumSession>0) {
-		// info sessioni
-			$sessions=GetSessions('Q');
-
-			foreach ($sessions as $s)
-			{
-				print get_text('Session') . ' ' . $s->SesOrder . ': ' . $s->SesName . ' --> ' . $s->SesTar4Session . ' ' . get_text('Targets', 'Tournament') . ', ' . $s->SesAth4Target . ' ' . get_text('Ath4Target', 'Tournament')  . '<br>';
-			}
-		} else {
-			print get_text('NoSession','Tournament');
-		}
-?>
-</td>
-</tr>
-<tr>
-<th class="TitleLeft" width="15%"><?php print get_text('StaffOnField','Tournament');?></th>
-<td>
-<?php
-		$Select = "SELECT TiCode, TiName, TiGivenName, CoCode, ItDescription
+    echo '<tr>
+            <th class="TitleLeft w-15">'.get_text('TourWhere','Tournament').'</th>
+            <td>'.$MyRow->ToWhere.'</td>
+            </tr>';
+    
+    echo '<tr>
+        <th class="TitleLeft w-15">'.get_text('CompVenue','Tournament').'</th>
+        <td>'.$MyRow->ToVenue.'</td>
+        </tr>';
+
+    echo '<tr>
+        <th class="TitleLeft w-15">'.get_text('Natl-Nation','Tournament').'</th>
+        <td>'.($MyRow->ToCountry ? $MyRow->ToCountry.' - '.$Countries[$MyRow->ToCountry] : $MyRow->ToCountry).'</td>
+        </tr>';
+
+    echo '<tr>
+        <th class="TitleLeft w-15">'.get_text('TourWhen','Tournament').'</th>
+        <td>'.get_text('From','Tournament') . ' ' . $MyRow->DtFrom . '<br>' . get_text('To','Tournament') . '&nbsp;&nbsp;&nbsp;' . $MyRow->DtTo.'</td>
+        </tr>';
+
+    echo '<tr>
+        <th class="TitleLeft w-15">'.get_text('NumSession', 'Tournament').'</th>
+        <td>'.$MyRow->ToNumSession.'</td>
+        </tr>';
+
+    echo '<tr>
+        <th class="TitleLeft w-15">'.get_text('SessionDescr', 'Tournament').'</th>
+        <td>';
+    if ($MyRow->ToNumSession>0) {
+        // info sessioni
+        $sessions=GetSessions('Q');
+
+        foreach ($sessions as $s)
+        {
+            echo get_text('Session') . ' ' . $s->SesOrder . ': ' . $s->SesName . ' --> ' . $s->SesTar4Session . ' ' . get_text('Targets', 'Tournament') . ', ' . $s->SesAth4Target . ' ' . get_text('Ath4Target', 'Tournament')  . '<br>';
+        }
+    } else {
+        echo get_text('NoSession','Tournament');
+    }
+    echo '</td>
+        </tr>';
+        
+    echo '<tr>
+        <th class="TitleLeft w-15">'.get_text('StaffOnField','Tournament').'</th>
+        <td>';
+    $Select = "SELECT TiCode, TiName, TiGivenName, CoCode, ItDescription
 		    FROM TournamentInvolved AS ti 
 			LEFT JOIN InvolvedType AS it ON ti.TiType=it.ItId 
             left join Countries on CoId=TiCountry and CoTournament=TiTournament
 			WHERE ti.TiTournament=" . StrSafe_DB($_SESSION['TourId']) . " 
 			ORDER BY ti.TiType ASC,ti.TiName ASC ";
-		$RsS = safe_r_sql($Select);
-		if (safe_num_rows($RsS)>0) {
-			while ($Row=safe_fetch($RsS)) {
-				echo (empty($Row->TiCode) ? '' : $Row->TiCode . '&nbsp;-&nbsp;') .
-                    $Row->TiName . ' ' . $Row->TiGivenName . (is_null($Row->CoCode) ? '' : ' (' . $Row->CoCode . ')') .
-                    (empty($Row->ItDescription) ? '' : ', ' . get_text($Row->ItDescription,'Tournament')) . '<br>';
-			}
-		}
-		else
-		{
-			print get_text('NoStaffOnField','Tournament');
-		}
-?>
-</td>
-</tr>
-<?php
+    $RsS = safe_r_sql($Select);
+    if (safe_num_rows($RsS)>0) {
+        while ($Row=safe_fetch($RsS)) {
+            echo (empty($Row->TiCode) ? '' : $Row->TiCode . '&nbsp;-&nbsp;') .
+                $Row->TiName . ' ' . $Row->TiGivenName . (is_null($Row->CoCode) ? '' : ' (' . $Row->CoCode . ')') .
+                (empty($Row->ItDescription) ? '' : ', ' . get_text($Row->ItDescription,'Tournament')) . '<br>';
+        }
+    }
+    else
+    {
+        print get_text('NoStaffOnField','Tournament');
+    }
+    echo '</td>
+        </tr>';
+
     if($aclLevel == AclReadWrite) {
         echo '<tr>';
-        echo '<th class="TitleLeft" width="15%">' . get_text('Photo', 'Tournament') . '</th>';
+        echo '<th class="TitleLeft w-15">' . get_text('Photo', 'Tournament') . '</th>';
         echo '<td><a href="?redraw=1" class="Link">' . get_text('RedrawPictures', 'Tournament') . '</a><br/><a href="?redraw=1&force=1" class="Link">' . get_text('RecreatePictures', 'Tournament') . '</a></td>';
         echo '</tr>';
     }
     if($INFO->ACLEnabled and ($_SERVER["REMOTE_ADDR"]!='::1' AND $_SERVER["REMOTE_ADDR"]!='127.0.0.1')) {
         echo '<tr class="Divider"><td colspan="2"></td></tr>';
         echo '<tr>';
-        echo '<th class="TitleLeft" width="15%">'.get_text('Block_IP','Tournament').'</th>';
+        echo '<th class="TitleLeft w-15">'.get_text('Block_IP','Tournament').'</th>';
         echo '<td style="font-size: 200%;">'.$_SERVER["REMOTE_ADDR"].'</td>';
         echo '</tr>';
     }
-?>
-        </table>
-<?php
-	}
 
-	include('Common/Templates/tail.php');
-?>
+    echo '</table>';
+    echo '';
+    echo '';
+}
+
+include('Common/Templates/tail.php');
+
diff --git a/src/Modules/RoundRobin/Setup.php b/src/Modules/RoundRobin/Setup.php
index c47404a8..87e6281e 100644
--- a/src/Modules/RoundRobin/Setup.php
+++ b/src/Modules/RoundRobin/Setup.php
@@ -27,9 +27,9 @@
 $q=safe_r_SQL("select distinct EvTeamEvent from Events where EvElimType=5 and EvTournament={$_SESSION['TourId']} order by EvTeamEvent");
 while($r=safe_fetch($q)) {
 	if($r->EvTeamEvent) {
-		$Teams='<option value="1"'.($Team==1 ? ' selected="selected"' : '').'>'.get_text('Team').'</option>';
+		$Teams.='<option value="1"'.($Team==1 ? ' selected="selected"' : '').'>'.get_text('Team').'</option>';
 	} else {
-		$Teams='<option value="0"'.($Team==0 ? ' selected="selected"' : '').'>'.get_text('Individual').'</option>';
+		$Teams.='<option value="0"'.($Team==0 ? ' selected="selected"' : '').'>'.get_text('Individual').'</option>';
 	}
 }
 if($Teams) {
diff --git a/src/Modules/Sets/AT/Setup_D3.php b/src/Modules/Sets/AT/Setup_D3.php
index e6cd1bfb..574a0334 100644
--- a/src/Modules/Sets/AT/Setup_D3.php
+++ b/src/Modules/Sets/AT/Setup_D3.php
@@ -23,10 +23,10 @@
 // default Distances
 switch($TourType) {
 	case 11:
-		CreateDistanceNew($TourId, $TourType, '%', array(array('Kurs',0)));
+		CreateDistanceNew($TourId, $TourType, '%', array(array('Runde',0)));
 		break;
 	case 13:
-		CreateDistanceNew($TourId, $TourType, '%', array(array('Kurs 1',0), array('Kurs 2',0)));
+		CreateDistanceNew($TourId, $TourType, '%', array(array('Runde 1',0), array('Runde 2',0)));
 		break;
 }
 
@@ -50,8 +50,8 @@
             case 3:
                 CreateTargetFace($TourId, 1, 'Weiß', 'REG-^BU13|^BU15|^LU13|^LU15|^TU13|^TU15', '1', TGT_3D, 0);
                 CreateTargetFace($TourId, 2, 'Blau', 'REG-^RU13|^RU15|^CU13|^CU15', '1', TGT_3D, 0);
-                CreateTargetFace($TourId, 3, 'Blau', 'REG-^BU18|^BU21|^B50|^B65|^B[M|W]$|^LU18|^LU21|^L50|^L65|^L[M|W]$|^TU18|^TU21|^T50|^T65|^T[M|W]$', '1', TGT_3D, 0);
-                CreateTargetFace($TourId, 4, 'Rot', 'REG-^RU18|^RU21|^R50|^R65|^R[M|W]$|^CU18|^CU21|^C50|^C65|^C[M|W]$', '1', TGT_3D, 0);
+                CreateTargetFace($TourId, 3, 'Blau', 'REG-^BU18|^BU21|^B60|^B[M|W]$|^LU18|^LU21|^L60|^L[M|W]$|^TU18|^TU21|^T60|^T[M|W]$', '1', TGT_3D, 0);
+                CreateTargetFace($TourId, 4, 'Rot', 'REG-^RU18|^RU21|^R60|^R[M|W]$|^CU18|^CU21|^C60|^C[M|W]$', '1', TGT_3D, 0);
                 break;
             case 2:
             case 4:
@@ -66,8 +66,8 @@
             case 3:
                 CreateTargetFace($TourId, 1, 'Weiß', 'REG-^BU13|^BU15|^LU13|^LU15|^TU13|^TU15', '1', TGT_3D, 0, TGT_3D, 0);
                 CreateTargetFace($TourId, 2, 'Blau', 'REG-^RU13|^RU15|^CU13|^CU15', '1', TGT_3D, 0, TGT_3D, 0);
-                CreateTargetFace($TourId, 3, 'Blau', 'REG-^BU18|^BU21|^B50|^B65|^B[M|W]$|^LU18|^LU21|^L50|^L65|^L[M|W]$|^TU18|^TU21|^T50|^T65|^T[M|W]$', '1', TGT_3D, 0, TGT_3D, 0);
-                CreateTargetFace($TourId, 4, 'Rot', 'REG-^RU18|^RU21|^R50|^R65|^R[M|W]$|^CU18|^CU21|^C50|^C65|^C[M|W]$', '1', TGT_3D, 0, TGT_3D, 0);
+                CreateTargetFace($TourId, 3, 'Blau', 'REG-^BU18|^BU21|^B60|^B[M|W]$|^LU18|^LU21|^L60|^L[M|W]$|^TU18|^TU21|^T60|^T[M|W]$', '1', TGT_3D, 0, TGT_3D, 0);
+                CreateTargetFace($TourId, 4, 'Rot', 'REG-^RU18|^RU21|^R60|^R[M|W]$|^CU18|^CU21|^C60|^C[M|W]$', '1', TGT_3D, 0, TGT_3D, 0);
                 break;
             case 2:
             case 4:
diff --git a/src/Modules/Sets/AT/Setup_Field.php b/src/Modules/Sets/AT/Setup_Field.php
index 3975c63d..b8107531 100644
--- a/src/Modules/Sets/AT/Setup_Field.php
+++ b/src/Modules/Sets/AT/Setup_Field.php
@@ -17,11 +17,11 @@
 // default Distances
 switch($TourType) {
 	case 9:
-		CreateDistanceNew($TourId, $TourType, '%', array(array('Kurs',0)));
+		CreateDistanceNew($TourId, $TourType, '%', array(array('12+12',0)));
 		break;
 	case 10:
 	case 12:
-		CreateDistanceNew($TourId, $TourType, '%', array(array('Unbekannte',0), array('Bekannte',0)));
+		CreateDistanceNew($TourId, $TourType, '%', array(array('Unbekannt',0), array('Bekannt',0)));
 		break;
 }
 
@@ -64,9 +64,9 @@
             case 1:
             case 3:
                 CreateTargetFace($TourId, 1, 'Weiß', 'REG-^RU13|^RU15|^CU13|^CU15|^BU13|^BU15|^LU13|^LU15|^TU13|^TU15', '1', TGT_FIELD, 0);
-                CreateTargetFace($TourId, 2, 'Gelb', 'REG-^BU18|^LU18|^TU18|^LU21|^L50|^L65|^L[M|W]$', '1', TGT_FIELD, 0);
-                CreateTargetFace($TourId, 3, 'Blau', 'REG-^RU18|^CU18|^BU21|^B50|^B65|^B[M|W]$|^TU21|^T50|^T65|^T[M|W]$', '1', TGT_FIELD, 0);
-                CreateTargetFace($TourId, 4, 'Rot', 'REG-^RU21|^R50|^R65|^R[M|W]$|^CU21|^C50|^C65|^C[M|W]$', '1', TGT_FIELD, 0);
+                CreateTargetFace($TourId, 2, 'Gelb', 'REG-^BU18|^LU18|^TU18|^LU21|^L60|^L[M|W]$', '1', TGT_FIELD, 0);
+                CreateTargetFace($TourId, 3, 'Blau', 'REG-^RU18|^CU18|^BU21|^B60|^B[M|W]$|^TU21|^T60|^T[M|W]$', '1', TGT_FIELD, 0);
+                CreateTargetFace($TourId, 4, 'Rot', 'REG-^RU21|^R60|^R[M|W]$|^CU21|^C60|^C[M|W]$', '1', TGT_FIELD, 0);
                 break;
             case 2:
             case 4:
@@ -82,9 +82,9 @@
             case 1:
             case 3:
                 CreateTargetFace($TourId, 1, 'Weiß', 'REG-^RU13|^RU15|^CU13|^CU15|^BU13|^BU15|^LU13|^LU15|^TU13|^TU15', '1', TGT_FIELD, 0, TGT_FIELD, 0);
-                CreateTargetFace($TourId, 2, 'Gelb', 'REG-^BU18|^LU18|^TU18|^LU21|^L50|^L65|^L[M|W]$', '1', TGT_FIELD, 0, TGT_FIELD, 0);
-                CreateTargetFace($TourId, 3, 'Blau', 'REG-^RU18|^CU18|^BU21|^B50|^B65|^B[M|W]$|^TU21|^T50|^T65|^T[M|W]$', '1', TGT_FIELD, 0, TGT_FIELD, 0);
-                CreateTargetFace($TourId, 4, 'Rot', 'REG-^RU21|^R50|^R65|^R[M|W]$|^CU21|^C50|^C65|^C[M|W]$', '1', TGT_FIELD, 0, TGT_FIELD, 0);
+                CreateTargetFace($TourId, 2, 'Gelb', 'REG-^BU18|^LU18|^TU18|^LU21|^L60|^L[M|W]$', '1', TGT_FIELD, 0, TGT_FIELD, 0);
+                CreateTargetFace($TourId, 3, 'Blau', 'REG-^RU18|^CU18|^BU21|^B60|^B[M|W]$|^TU21|^T60|^T[M|W]$', '1', TGT_FIELD, 0, TGT_FIELD, 0);
+                CreateTargetFace($TourId, 4, 'Rot', 'REG-^RU21|^R60|^R[M|W]$|^CU21|^C60|^C[M|W]$', '1', TGT_FIELD, 0, TGT_FIELD, 0);
                 break;
             case 2:
             case 4:
diff --git a/src/Modules/Sets/AT/Setup_Target.php b/src/Modules/Sets/AT/Setup_Target.php
index 05b94664..bb71ca28 100644
--- a/src/Modules/Sets/AT/Setup_Target.php
+++ b/src/Modules/Sets/AT/Setup_Target.php
@@ -27,10 +27,9 @@
         CreateDistanceNew($TourId, $TourType, 'RU21M',  array(array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'RW',   array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'RM',   array(array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'R50W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'R50M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'R50',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'R65%',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'R60W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'R60M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'R60',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
 
         CreateDistanceNew($TourId, $TourType, 'CU13%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'CU15%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
@@ -40,17 +39,15 @@
         CreateDistanceNew($TourId, $TourType, 'CU21M',  array(array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'CW',   array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'CM',   array(array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'C50W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'C50M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'C50',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'C65%',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'C60W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'C60M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'C60',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
 
         CreateDistanceNew($TourId, $TourType, 'BU13%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'BU15%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'BU18%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'BU21%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
-        CreateDistanceNew($TourId, $TourType, 'B50%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
-        CreateDistanceNew($TourId, $TourType, 'B65%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
+        CreateDistanceNew($TourId, $TourType, 'B60%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'B_',   array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
 
         CreateDistanceNew($TourId, $TourType, 'ROU13%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
@@ -61,10 +58,9 @@
         CreateDistanceNew($TourId, $TourType, 'ROU21M',  array(array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'ROW',   array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'ROM',   array(array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'RO50W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'RO50M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'RO50',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'RO65%',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'RO60W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'RO60M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'RO60',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
 
         CreateDistanceNew($TourId, $TourType, 'COU13%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'COU15%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
@@ -74,17 +70,15 @@
         CreateDistanceNew($TourId, $TourType, 'COU21M',  array(array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'COW',   array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'COM',   array(array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'CO50W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'CO50M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'CO50',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'CO65%',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'CO60W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'CO60M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'CO60',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
 
         CreateDistanceNew($TourId, $TourType, 'W1U13%', array(array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'W1U15%', array(array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'W1U18%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'W1U21%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
-        CreateDistanceNew($TourId, $TourType, 'W150%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
-        CreateDistanceNew($TourId, $TourType, 'W165%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
+        CreateDistanceNew($TourId, $TourType, 'W160%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'W1_',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
 
         CreateDistanceNew($TourId, $TourType, 'T%',   array(array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
@@ -99,10 +93,9 @@
         CreateDistanceNew($TourId, $TourType, 'RU21M', array(array('90m',90), array('70m',70), array('50m',50), array('30m',30), array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'RW',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'RM',  array(array('90m',90), array('70m',70), array('50m',50), array('30m',30), array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'R50W', array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'R50M', array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'R50', array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'R65%', array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'R60W', array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'R60M', array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'R60', array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
 
         CreateDistanceNew($TourId, $TourType, 'CU13%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10), array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'CU15%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
@@ -112,17 +105,15 @@
         CreateDistanceNew($TourId, $TourType, 'CU21M',  array(array('90m',90), array('70m',70), array('50m',50), array('30m',30), array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'CW',   array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'CM',   array(array('90m',90), array('70m',70), array('50m',50), array('30m',30), array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'C50W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'C50M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'C50',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'C65%',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'C60W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'C60M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'C60',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
 
         CreateDistanceNew($TourId, $TourType, 'BU13%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10), array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'BU15%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10), array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'BU18%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'BU21%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
-        CreateDistanceNew($TourId, $TourType, 'B50%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
-        CreateDistanceNew($TourId, $TourType, 'B65%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
+        CreateDistanceNew($TourId, $TourType, 'B60%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'B_',   array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
 
         CreateDistanceNew($TourId, $TourType, 'ROU13%', array(array('40m',40), array('30m',30), array('20m',20), array('10m',10), array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
@@ -133,10 +124,9 @@
         CreateDistanceNew($TourId, $TourType, 'ROU21M', array(array('90m',90), array('70m',70), array('50m',50), array('30m',30), array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'ROW',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'ROM',  array(array('90m',90), array('70m',70), array('50m',50), array('30m',30), array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'RO50W', array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'RO50M', array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'RO50', array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'RO65%', array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'RO60W', array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'RO60M', array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'RO60', array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
 
         CreateDistanceNew($TourId, $TourType, 'COU13%',  array(array('40m',40), array('30m',30), array('20m',20), array('10m',10), array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'COU15%',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
@@ -146,17 +136,15 @@
         CreateDistanceNew($TourId, $TourType, 'COU21M',  array(array('90m',90), array('70m',70), array('50m',50), array('30m',30), array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'COW',   array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'COM',   array(array('90m',90), array('70m',70), array('50m',50), array('30m',30), array('90m',90), array('70m',70), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'CO50W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'CO50M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'CO50',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'CO65%',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'CO60W',  array(array('60m',60), array('50m',50), array('40m',40), array('30m',30), array('60m',60), array('50m',50), array('40m',40), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'CO60M',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'CO60',  array(array('70m',70), array('60m',60), array('50m',50), array('30m',30), array('70m',70), array('60m',60), array('50m',50), array('30m',30)));
 
         CreateDistanceNew($TourId, $TourType, 'W1U13%', array(array('40m',40), array('30m',30), array('20m',20), array('10m',10), array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'W1U15%', array(array('40m',40), array('30m',30), array('20m',20), array('10m',10), array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
         CreateDistanceNew($TourId, $TourType, 'W1U18%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'W1U21%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
-        CreateDistanceNew($TourId, $TourType, 'W150%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
-        CreateDistanceNew($TourId, $TourType, 'W165%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
+        CreateDistanceNew($TourId, $TourType, 'W160%', array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'W1_',  array(array('50m',50), array('40m',40), array('30m',30), array('20m',20), array('50m',50), array('40m',40), array('30m',30), array('20m',20)));
 
         CreateDistanceNew($TourId, $TourType, 'T%',   array(array('40m',40), array('30m',30), array('20m',20), array('10m',10), array('40m',40), array('30m',30), array('20m',20), array('10m',10)));
@@ -169,56 +157,49 @@
                 CreateDistanceNew($TourId, $TourType, 'RU15%',  array(array('40m-1', 40), array('40m-2', 40)));
                 CreateDistanceNew($TourId, $TourType, 'RU18%',  array(array('60m-1', 60), array('60m-2', 60)));
                 CreateDistanceNew($TourId, $TourType, 'RU21%',  array(array('70m-1', 70), array('70m-2', 70)));
-                CreateDistanceNew($TourId, $TourType, 'R50%',  array(array('60m-1', 60), array('60m-2', 60)));
-                CreateDistanceNew($TourId, $TourType, 'R65%',  array(array('60m-1', 60), array('60m-2', 60)));
+                CreateDistanceNew($TourId, $TourType, 'R60%',  array(array('60m-1', 60), array('60m-2', 60)));
                 CreateDistanceNew($TourId, $TourType, 'R_',   array(array('70m-1', 70), array('70m-2', 70)));
 
                 CreateDistanceNew($TourId, $TourType, 'ROU13%',  array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'ROU15%',  array(array('40m-1', 40), array('40m-2', 40)));
                 CreateDistanceNew($TourId, $TourType, 'ROU18%',  array(array('60m-1', 60), array('60m-2', 60)));
                 CreateDistanceNew($TourId, $TourType, 'ROU21%',  array(array('70m-1', 70), array('70m-2', 70)));
-                CreateDistanceNew($TourId, $TourType, 'RO50%',  array(array('60m-1', 60), array('60m-2', 60)));
-                CreateDistanceNew($TourId, $TourType, 'RO65%',  array(array('60m-1', 60), array('60m-2', 60)));
+                CreateDistanceNew($TourId, $TourType, 'RO60%',  array(array('60m-1', 60), array('60m-2', 60)));
                 CreateDistanceNew($TourId, $TourType, 'RO_',   array(array('70m-1', 70), array('70m-2', 70)));
 
                 CreateDistanceNew($TourId, $TourType, 'CU13%',  array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'CU15%',  array(array('40m-1', 40), array('40m-2', 40)));
                 CreateDistanceNew($TourId, $TourType, 'CU18%',  array(array('50m-1', 50), array('50m-2', 50)));
                 CreateDistanceNew($TourId, $TourType, 'CU21%',  array(array('50m-1', 50), array('50m-2', 50)));
-                CreateDistanceNew($TourId, $TourType, 'C50%',  array(array('50m-1', 50), array('50m-2', 50)));
-                CreateDistanceNew($TourId, $TourType, 'C65%',  array(array('50m-1', 50), array('50m-2', 50)));
+                CreateDistanceNew($TourId, $TourType, 'C60%',  array(array('50m-1', 50), array('50m-2', 50)));
                 CreateDistanceNew($TourId, $TourType, 'C_',  array(array('50m-1', 50), array('50m-2', 50)));
 
                 CreateDistanceNew($TourId, $TourType, 'COU13%',  array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'COU15%',  array(array('40m-1', 40), array('40m-2', 40)));
                 CreateDistanceNew($TourId, $TourType, 'COU18%',  array(array('50m-1', 50), array('50m-2', 50)));
                 CreateDistanceNew($TourId, $TourType, 'COU21%',  array(array('50m-1', 50), array('50m-2', 50)));
-                CreateDistanceNew($TourId, $TourType, 'CO50%',  array(array('50m-1', 50), array('50m-2', 50)));
-                CreateDistanceNew($TourId, $TourType, 'CO65%',  array(array('50m-1', 50), array('50m-2', 50)));
+                CreateDistanceNew($TourId, $TourType, 'CO60%',  array(array('50m-1', 50), array('50m-2', 50)));
                 CreateDistanceNew($TourId, $TourType, 'CO_',  array(array('50m-1', 50), array('50m-2', 50)));
 
                 CreateDistanceNew($TourId, $TourType, 'W1U13%', array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'W1U15%', array(array('40m-1', 40), array('40m-2', 40)));
                 CreateDistanceNew($TourId, $TourType, 'W1U18%', array(array('50m-1', 50), array('50m-2', 50)));
                 CreateDistanceNew($TourId, $TourType, 'W1U21%', array(array('50m-1', 50), array('50m-2', 50)));
-                CreateDistanceNew($TourId, $TourType, 'W150%', array(array('50m-1', 50), array('50m-2', 50)));
-                CreateDistanceNew($TourId, $TourType, 'W165%', array(array('50m-1', 50), array('50m-2', 50)));
+                CreateDistanceNew($TourId, $TourType, 'W160%', array(array('50m-1', 50), array('50m-2', 50)));
                 CreateDistanceNew($TourId, $TourType, 'W1_', array(array('50m-1', 50), array('50m-2', 50)));
 
                 CreateDistanceNew($TourId, $TourType, 'BU13%',  array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'BU15%',  array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'BU18%',  array(array('50m-1', 50), array('50m-2', 50)));
                 CreateDistanceNew($TourId, $TourType, 'BU21%',  array(array('50m-1', 50), array('50m-2', 50)));
-                CreateDistanceNew($TourId, $TourType, 'B50%',  array(array('50m-1', 50), array('50m-2', 50)));
-                CreateDistanceNew($TourId, $TourType, 'B65%',  array(array('50m-1', 50), array('50m-2', 50)));
+                CreateDistanceNew($TourId, $TourType, 'B60%',  array(array('50m-1', 50), array('50m-2', 50)));
                 CreateDistanceNew($TourId, $TourType, 'B_',  array(array('50m-1', 50), array('50m-2', 50)));
 
                 CreateDistanceNew($TourId, $TourType, 'TU13%',   array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'TU15%',   array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'TU18%',   array(array('30m-1', 30), array('30m-2', 30)));
                 CreateDistanceNew($TourId, $TourType, 'TU21%',   array(array('40m-1', 40), array('40m-2', 40)));
-                CreateDistanceNew($TourId, $TourType, 'T50%',   array(array('40m-1', 40), array('40m-2', 40)));
-                CreateDistanceNew($TourId, $TourType, 'T65%',   array(array('40m-1', 40), array('40m-2', 40)));
+                CreateDistanceNew($TourId, $TourType, 'T60%',   array(array('40m-1', 40), array('40m-2', 40)));
                 CreateDistanceNew($TourId, $TourType, 'T_',   array(array('40m-1', 40), array('40m-2', 40)));
 
                 CreateDistanceNew($TourId, $TourType, 'L%',   array(array('30m-1', 30), array('30m-2', 30)));
@@ -231,48 +212,46 @@
 		}
 		break;
     case 5:
-        CreateDistanceNew($TourId, $TourType, '%U13%', array(array('30m',30), array('25m',25),array('20m',20)));
-
+        CreateDistanceNew($TourId, $TourType, 'BU13%', array(array('30m',30), array('25m',25),array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'BU15%', array(array('30m',30), array('25m',25),array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'BU18%', array(array('40m',40), array('35m',35),array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'BU21%', array(array('40m',40), array('35m',35),array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'B50%', array(array('40m',40), array('35m',35),array('30m',30)));
-        CreateDistanceNew($TourId, $TourType, 'B65%', array(array('40m',40), array('35m',35),array('30m',30)));
+        CreateDistanceNew($TourId, $TourType, 'B60%', array(array('40m',40), array('35m',35),array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'B_', array(array('40m',40), array('35m',35),array('30m',30)));
 
+        CreateDistanceNew($TourId, $TourType, 'RU13%', array(array('30m',30), array('25m',25),array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'RU15%', array(array('40m',40), array('35m',35),array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'RU18%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'RU21%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'R50%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'R65%', array(array('60m',60), array('50m',50),array('40m',40)));
+        CreateDistanceNew($TourId, $TourType, 'R60%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'R_', array(array('60m',60), array('50m',50),array('40m',40)));
 
+        CreateDistanceNew($TourId, $TourType, 'ROU13%', array(array('30m',30), array('25m',25),array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'ROU15%', array(array('40m',40), array('35m',35),array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'ROU18%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'ROU21%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'RO50%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'RO65%', array(array('60m',60), array('50m',50),array('40m',40)));
+        CreateDistanceNew($TourId, $TourType, 'RO60%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'RO_', array(array('60m',60), array('50m',50),array('40m',40)));
 
+        CreateDistanceNew($TourId, $TourType, 'CU13%', array(array('30m',30), array('25m',25),array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'CU15%', array(array('40m',40), array('35m',35),array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'CU18%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'CU21%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'C50%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'C65%', array(array('60m',60), array('50m',50),array('40m',40)));
+        CreateDistanceNew($TourId, $TourType, 'C60%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'C_', array(array('60m',60), array('50m',50),array('40m',40)));
 
+        CreateDistanceNew($TourId, $TourType, 'COU13%', array(array('30m',30), array('25m',25),array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'COU15%', array(array('40m',40), array('35m',35),array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'COU18%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'COU21%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'CO50%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'CO65%', array(array('60m',60), array('50m',50),array('40m',40)));
+        CreateDistanceNew($TourId, $TourType, 'CO60%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'CO_', array(array('60m',60), array('50m',50),array('40m',40)));
 
+        CreateDistanceNew($TourId, $TourType, 'W1U13%', array(array('30m',30), array('25m',25),array('20m',20)));
         CreateDistanceNew($TourId, $TourType, 'W1U15%', array(array('40m',40), array('35m',35),array('30m',30)));
         CreateDistanceNew($TourId, $TourType, 'W1U18%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'W1U21%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'W150%', array(array('60m',60), array('50m',50),array('40m',40)));
-        CreateDistanceNew($TourId, $TourType, 'W165%', array(array('60m',60), array('50m',50),array('40m',40)));
+        CreateDistanceNew($TourId, $TourType, 'W160%', array(array('60m',60), array('50m',50),array('40m',40)));
         CreateDistanceNew($TourId, $TourType, 'W1_', array(array('60m',60), array('50m',50),array('40m',40)));
 
         CreateDistanceNew($TourId, $TourType, 'T%', array(array('30m',30), array('25m',25),array('20m',20)));
@@ -290,8 +269,7 @@
 	        CreateDistanceNew($TourId, $TourType, 'W1U15%', array(array('10m-1',10), array('10m-2',10)));
 	        CreateDistanceNew($TourId, $TourType, 'W1U18%', array(array('18m-1',18), array('18m-2',18)));
 	        CreateDistanceNew($TourId, $TourType, 'W1U21%', array(array('18m-1',18), array('18m-2',18)));
-	        CreateDistanceNew($TourId, $TourType, 'W165%', array(array('18m-1',18), array('18m-2',18)));
-	        CreateDistanceNew($TourId, $TourType, 'W150%', array(array('18m-1',18), array('18m-2',18)));
+	        CreateDistanceNew($TourId, $TourType, 'W160%', array(array('18m-1',18), array('18m-2',18)));
         }
 		break;
 	case 7:
@@ -306,8 +284,7 @@
             CreateDistanceNew($TourId, $TourType, 'W1U15%', array(array('20m-1',20), array('20m-2',20)));
             CreateDistanceNew($TourId, $TourType, 'W1U18%', array(array('25m-1',25), array('25m-2',25)));
             CreateDistanceNew($TourId, $TourType, 'W1U21%', array(array('25m-1',25), array('25m-2',25)));
-            CreateDistanceNew($TourId, $TourType, 'W165%', array(array('25m-1',25), array('25m-2',25)));
-            CreateDistanceNew($TourId, $TourType, 'W150%', array(array('25m-1',25), array('25m-2',25)));
+            CreateDistanceNew($TourId, $TourType, 'W160%', array(array('25m-1',25), array('25m-2',25)));
         }
 		break;
 	case 8:
@@ -322,8 +299,7 @@
             CreateDistanceNew($TourId, $TourType, 'W1U15%', array(array('20m-1',20), array('20m-2',20), array('10m-1',10), array('10m-2',10)));
             CreateDistanceNew($TourId, $TourType, 'W1U18%', array(array('25m-1',25), array('25m-2',25), array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'W1U21%', array(array('25m-1',25), array('25m-2',25), array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'W165%', array(array('25m-1',25), array('25m-2',25), array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'W150%', array(array('25m-1',25), array('25m-2',25), array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'W160%', array(array('25m-1',25), array('25m-2',25), array('18m-1',18), array('18m-2',18)));
         }
 		break;
     case 37:
@@ -333,55 +309,49 @@
                 CreateDistanceNew($TourId, $TourType, 'RU15%',  array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
                 CreateDistanceNew($TourId, $TourType, 'RU18%',  array(array('60m-1',60), array('60m-2',60), array('60m-3',60), array('60m-4',60)));
                 CreateDistanceNew($TourId, $TourType, 'RU21%',  array(array('70m-1',70), array('70m-2',70), array('70m-3',70), array('70m-4',70)));
-                CreateDistanceNew($TourId, $TourType, 'R50%',  array(array('60m-1',60), array('60m-2',60), array('60m-3',60), array('60m-4',60)));
-                CreateDistanceNew($TourId, $TourType, 'R65%',  array(array('60m-1',60), array('60m-2',60), array('60m-3',60), array('60m-4',60)));
+                CreateDistanceNew($TourId, $TourType, 'R60%',  array(array('60m-1',60), array('60m-2',60), array('60m-3',60), array('60m-4',60)));
                 CreateDistanceNew($TourId, $TourType, 'R_',   array(array('70m-1',70), array('70m-2',70), array('70m-3',70), array('70m-4',70)));
 
                 CreateDistanceNew($TourId, $TourType, 'ROU13%',  array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'ROU15%',  array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
                 CreateDistanceNew($TourId, $TourType, 'ROU18%',  array(array('60m-1',60), array('60m-2',60), array('60m-3',60), array('60m-4',60)));
                 CreateDistanceNew($TourId, $TourType, 'ROU21%',  array(array('70m-1',70), array('70m-2',70), array('70m-3',70), array('70m-4',70)));
-                CreateDistanceNew($TourId, $TourType, 'RO50%',  array(array('60m-1',60), array('60m-2',60), array('60m-3',60), array('60m-4',60)));
-                CreateDistanceNew($TourId, $TourType, 'RO65%',  array(array('60m-1',60), array('60m-2',60), array('60m-3',60), array('60m-4',60)));
+                CreateDistanceNew($TourId, $TourType, 'RO60%',  array(array('60m-1',60), array('60m-2',60), array('60m-3',60), array('60m-4',60)));
                 CreateDistanceNew($TourId, $TourType, 'RO_',   array(array('70m-1',70), array('70m-2',70), array('70m-3',70), array('70m-4',70)));
 
                 CreateDistanceNew($TourId, $TourType, 'CU13%',  array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'CU15%',  array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
                 CreateDistanceNew($TourId, $TourType, 'CU18%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
                 CreateDistanceNew($TourId, $TourType, 'CU21%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                CreateDistanceNew($TourId, $TourType, 'C50%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                CreateDistanceNew($TourId, $TourType, 'C65%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
+                CreateDistanceNew($TourId, $TourType, 'C60%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
                 CreateDistanceNew($TourId, $TourType, 'C_',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
 
                 CreateDistanceNew($TourId, $TourType, 'COU13%',  array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'COU15%',  array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
                 CreateDistanceNew($TourId, $TourType, 'COU18%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
                 CreateDistanceNew($TourId, $TourType, 'COU21%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                CreateDistanceNew($TourId, $TourType, 'CO50%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                CreateDistanceNew($TourId, $TourType, 'CO65%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
+                CreateDistanceNew($TourId, $TourType, 'CO60%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
                 CreateDistanceNew($TourId, $TourType, 'CO_',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
 
                 CreateDistanceNew($TourId, $TourType, 'W1U13%', array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'W1U15%', array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
                 CreateDistanceNew($TourId, $TourType, 'W1U18%', array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
                 CreateDistanceNew($TourId, $TourType, 'W1U21%', array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                CreateDistanceNew($TourId, $TourType, 'W150%', array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                CreateDistanceNew($TourId, $TourType, 'W165%', array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
+                CreateDistanceNew($TourId, $TourType, 'W160%', array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
                 CreateDistanceNew($TourId, $TourType, 'W1_', array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
 
                 CreateDistanceNew($TourId, $TourType, 'BU13%',  array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'BU15%',  array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'BU18%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
                 CreateDistanceNew($TourId, $TourType, 'BU21%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                CreateDistanceNew($TourId, $TourType, 'B50%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                CreateDistanceNew($TourId, $TourType, 'B65%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
-                
+                CreateDistanceNew($TourId, $TourType, 'B60%',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
+                CreateDistanceNew($TourId, $TourType, 'B_',  array(array('50m-1',50), array('50m-2',50), array('50m-3',50), array('50m-4',50)));
+
                 CreateDistanceNew($TourId, $TourType, 'TU13%', array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'TU15%', array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'TU18%', array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
                 CreateDistanceNew($TourId, $TourType, 'TU21%', array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
-                CreateDistanceNew($TourId, $TourType, 'T50%',  array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
-                CreateDistanceNew($TourId, $TourType, 'T65%',  array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
+                CreateDistanceNew($TourId, $TourType, 'T60%',  array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
                 CreateDistanceNew($TourId, $TourType, 'T_',   array(array('40m-1',40), array('40m-2',40), array('40m-3',40), array('40m-4',40)));
 
                 CreateDistanceNew($TourId, $TourType, 'L%',   array(array('30m-1',30), array('30m-2',30), array('30m-3',30), array('30m-4',30)));
@@ -421,9 +391,9 @@
 	case 3:
 	    if ($SubRule==1) {
             CreateTargetFace($TourId, 1, '~Default', 'REG-^R|^B|^T|^L|^CU13|^COU13|^W1U13|^W1U15', '1', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
-            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C50|^C65|^C[M|W]$', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
-            CreateTargetFace($TourId, 3, '~DefaultCO', 'REG-^COU18|^COU21|^CO50|^CO65|^CO[M|W]$', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
-            CreateTargetFace($TourId, 4, '~Default', 'REG-^W1U18|^W1U21|^W150|^W165|^CU15|^COU15|^W1[M|W]$', '1', TGT_OUT_FULL, 80, TGT_OUT_FULL, 80);
+            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C60|^C[M|W]$', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
+            CreateTargetFace($TourId, 3, '~DefaultCO', 'REG-^COU18|^COU21|^CO60|^CO[M|W]$', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
+            CreateTargetFace($TourId, 4, '~Default', 'REG-^W1U18|^W1U21|^W160|^CU15|^COU15|^W1[M|W]$', '1', TGT_OUT_FULL, 80, TGT_OUT_FULL, 80);
         } else {
             CreateTargetFace($TourId, 1, '~Default', 'REG-^R|^B|^T|^L|', '1', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
             CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^C', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
@@ -435,12 +405,12 @@
         break;
 	case 6:
         if($SubRule==1) {
-            CreateTargetFace($TourId, 1, '~Default', 'REG-^RU18|^RU21|^R50|^R65|^R[M|W]$|^ROU18|^ROU21|^RO50|^RO65|^RO[M|W]$', '1', TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
-            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C50|^C65|^C[M|W]$|^COU18|^COU21|^CO50|^CO65|^CO[M|W]$|^W1U21|^W150|^W165|^W1[M|W]$', '1', TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
+            CreateTargetFace($TourId, 1, '~Default', 'REG-^RU18|^RU21|^R60|^R[M|W]$|^ROU18|^ROU21|^RO60|^RO[M|W]$', '1', TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
+            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C60|^C[M|W]$|^COU18|^COU21|^CO60|^CO[M|W]$|^W1U21|^W160|^W1[M|W]$', '1', TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
             CreateTargetFace($TourId, 3, '~Default', 'REG-^RU13|^RU15|^CU13|^CU15|^ROU13|^ROU15|^COU13|^COU15', '1', TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
             CreateTargetFace($TourId, 4, '~Default', 'REG-^B', '1', TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
             CreateTargetFace($TourId, 5, '~Default', 'REG-^TU13|^TU15|^TU18|^L', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60);
-            CreateTargetFace($TourId, 6, '~Default', 'REG-^TU21|^T50|^T65|^T[M|W]$', '1', TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
+            CreateTargetFace($TourId, 6, '~Default', 'REG-^TU21|^T60|^T[M|W]$', '1', TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
             CreateTargetFace($TourId, 7, '~Default', 'REG-^W1U13|^W1U15', '1', TGT_IND_1_big10, 80, TGT_IND_1_big10, 80);
             CreateTargetFace($TourId, 8, '~Default', 'REG-^W1U18', '1', TGT_IND_1_small10, 60, TGT_IND_1_small10, 60);
         } else {
@@ -452,8 +422,8 @@
 		break;
     case 7:
         if($SubRule==1) {
-            CreateTargetFace($TourId, 1, '~Default', 'REG-^RU18|^RU21|^R50|^R65|^R[M|W]$|^ROU18|^ROU21|^RO50|^RO65|^RO[M|W]$', '1', TGT_IND_6_big10, 60, TGT_IND_6_big10, 60);
-            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C50|^C65|^C[M|W]$|^COU18|^COU21|^CO50|^CO65|^CO[M|W]$|^W1U21|^W150|^W165|^W1[M|W]$', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
+            CreateTargetFace($TourId, 1, '~Default', 'REG-^RU18|^RU21|^R60|^R[M|W]$|^ROU18|^ROU21|^RO60|^RO[M|W]$', '1', TGT_IND_6_big10, 60, TGT_IND_6_big10, 60);
+            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C60|^C[M|W]$|^COU18|^COU21|^CO60|^CO[M|W]$|^W1U21|^W160|^W1[M|W]$', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
             CreateTargetFace($TourId, 3, '~Default', 'REG-^RU13|^RU15|^CU13|^CU15|^ROU13|^ROU15|^COU13|^COU15', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60);
             CreateTargetFace($TourId, 4, '~Default', 'REG-^B', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60);
             CreateTargetFace($TourId, 5, '~Default', 'REG-^T|^L', '1', TGT_IND_1_big10, 80, TGT_IND_1_big10, 80);
@@ -468,8 +438,8 @@
         break;
 	case 8:
         if($SubRule==1) {
-            CreateTargetFace($TourId, 1, '~Default', 'REG-^RU18|^RU21|^R50|^R65|^R[M|W]$|^ROU18|^ROU21|^RO50|^RO65|^RO[M|W]$', '1', TGT_IND_6_big10, 60, TGT_IND_6_big10, 60, TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
-            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C50|^C65|^C[M|W]$|^COU18|^COU21|^CO50|^CO65|^CO[M|W]$|^W1U21|^W150|^W165|^W1[M|W]$', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60, TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
+            CreateTargetFace($TourId, 1, '~Default', 'REG-^RU18|^RU21|^R60|^R[M|W]$|^ROU18|^ROU21|^RO60|^RO[M|W]$', '1', TGT_IND_6_big10, 60, TGT_IND_6_big10, 60, TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
+            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C60|^C[M|W]$|^COU18|^COU21|^CO60|^CO[M|W]$|^W1U21|^W160|^W1[M|W]$', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60, TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
             CreateTargetFace($TourId, 3, '~Default', 'REG-^RU13|^RU15|^CU13|^CU15|^ROU13|^ROU15|^COU13|^COU15', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60, TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
             CreateTargetFace($TourId, 4, '~Default', 'REG-^B', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60, TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
             CreateTargetFace($TourId, 5, '~Default', 'REG-^T|^L', '1', TGT_IND_1_big10, 80, TGT_IND_1_big10, 80, TGT_IND_1_big10, 60, TGT_IND_1_big10, 60);
@@ -486,9 +456,9 @@
     case 37:
         if ($SubRule==1) {
             CreateTargetFace($TourId, 1, '~Default', 'REG-^R|^B|^T|^L|^CU13|^COU13|^W1U13|^W1U15', '1', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122,TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
-            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C50|^C65|^C[M|W]$', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80,TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
-            CreateTargetFace($TourId, 3, '~DefaultCO', 'REG-^COU18|^COU21|^CO50|^CO65|^CO[M|W]$', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80,TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
-            CreateTargetFace($TourId, 4, '~Default', 'REG-^W1U18|^W1U21|^W150|^W165|^W1[M|W]$|^CU15|^COU15', '1', TGT_OUT_FULL, 80, TGT_OUT_FULL, 80,TGT_OUT_FULL, 80, TGT_OUT_FULL, 80);
+            CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^CU18|^CU21|^C60|^C[M|W]$', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80,TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
+            CreateTargetFace($TourId, 3, '~DefaultCO', 'REG-^COU18|^COU21|^CO60|^CO[M|W]$', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80,TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
+            CreateTargetFace($TourId, 4, '~Default', 'REG-^W1U18|^W1U21|^W160|^W1[M|W]$|^CU15|^COU15', '1', TGT_OUT_FULL, 80, TGT_OUT_FULL, 80,TGT_OUT_FULL, 80, TGT_OUT_FULL, 80);
         } else {
             CreateTargetFace($TourId, 1, '~Default', 'REG-^R|^B|^T|^L', '1',  TGT_OUT_FULL, 122, TGT_OUT_FULL, 122,TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
             CreateTargetFace($TourId, 2, '~DefaultCO', 'REG-^C', '1', TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80,TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
diff --git a/src/Modules/Sets/AT/lib-3D.php b/src/Modules/Sets/AT/lib-3D.php
index 5c259af8..93554ef8 100644
--- a/src/Modules/Sets/AT/lib-3D.php
+++ b/src/Modules/Sets/AT/lib-3D.php
@@ -152,7 +152,7 @@ function CreateStandard3DEvents($TourId, $SubRule) {
 
 function InsertStandard3DEvents($TourId, $SubRule) {
     foreach (array('C'=>'C','B'=>'B','L'=>'L','T'=>'T','R'=>'R') as $kDiv=>$vDiv) {
-        $clsTmpArr = array('W','U18W','U21W','50W','65W');
+        $clsTmpArr = array('W','U18W','U21W','60W');
         if($SubRule==2 OR $SubRule==4) {
             $clsTmpArr = array('W');
         }
@@ -163,7 +163,7 @@ function InsertStandard3DEvents($TourId, $SubRule) {
             }
             InsertClassEvent($TourId, 1, 1, $vDiv.'X', $kDiv, $vClass);
         }
-        $clsTmpArr = array('M','U18M','U21M','50','50M','65','65M');
+        $clsTmpArr = array('M','U18M','U21M','60','60M');
         if($SubRule==2 OR $SubRule==4) {
             $clsTmpArr = array('M');
         }
diff --git a/src/Modules/Sets/AT/lib-Field.php b/src/Modules/Sets/AT/lib-Field.php
index 4e899936..fb215d78 100644
--- a/src/Modules/Sets/AT/lib-Field.php
+++ b/src/Modules/Sets/AT/lib-Field.php
@@ -149,7 +149,7 @@ function CreateStandardFieldEvents($TourId, $SubRule) {
 
 function InsertStandardFieldEvents($TourId, $SubRule) {
     foreach (array('R'=>'R','C'=>'C','B'=>'B','L'=>'L','T'=>'T') as $kDiv=>$vDiv) {
-        $clsTmpArr = array('W','U18W','U21W','50W','65W');
+        $clsTmpArr = array('W','U21W','60W');
         foreach($clsTmpArr as $kClass=>$vClass) {
             if($vClass=='CW' and $kDiv!='L') {
                 continue;
@@ -160,7 +160,7 @@ function InsertStandardFieldEvents($TourId, $SubRule) {
             }
             InsertClassEvent($TourId, 1, 1, $vDiv.'X', $kDiv, $vClass);
         }
-        $clsTmpArr = array('M','U18M','U21M','50','50M','65','65M');
+        $clsTmpArr = array('M','U21M','60','60M');
         foreach($clsTmpArr as $kClass=>$vClass) {
             if($vClass=='CM' and $kDiv!='L') {
                 continue;
diff --git a/src/Modules/Sets/AT/lib.php b/src/Modules/Sets/AT/lib.php
index 247c71f8..00bc4d34 100644
--- a/src/Modules/Sets/AT/lib.php
+++ b/src/Modules/Sets/AT/lib.php
@@ -51,16 +51,12 @@ function CreateStandardClasses($TourId, $SubRule, $Type='FITA') {
             CreateClass($TourId, 9, 18, 20, 1, 'U21W', 'U21W,W', 'U21 weiblich');
             CreateClass($TourId, 10, 18, 20, 0, 'U21M', 'U21M,M', 'U21 männlich');
 
-            CreateClass($TourId, 11, 65, 99, 1, '65W', '65W,50W,W', '65+ weiblich');
-            CreateClass($TourId, 12, 65, 99, 0, '65M', '65M,50M,M', '65+ männlich');
-            CreateClass($TourId, 13, 65, 99, -1, '65', '65', '65+');
+            CreateClass($TourId, 11, 60, 99, 1, '60W', '60W,W', '60+ weiblich');
+            CreateClass($TourId, 12, 60, 99, 0, '60M', '60M,M', '60+ männlich');
+            CreateClass($TourId, 13, 60, 99, -1, '60', '60', '60+');
 
-            CreateClass($TourId, 14, 50, 64, 1, '50W', '50W,W', '50+ weiblich');
-            CreateClass($TourId, 15, 50, 64, 0, '50M', '50M,M', '50+ männlich');
-            CreateClass($TourId, 16, 50, 64, -1, '50', '50', '50+');
-
-            CreateClass($TourId, 17, 21, 49, 1, 'W', 'W', 'Damen');
-            CreateClass($TourId, 18, 21, 49, 0, 'M', 'M', 'Herren');
+            CreateClass($TourId, 14, 21, 59, 1, 'W', 'W', 'Damen');
+            CreateClass($TourId, 15, 21, 59, 0, 'M', 'M', 'Herren');
 
             break;
 		case '2':
@@ -121,22 +117,22 @@ function CreateStandardEvents($TourId, $SubRule, $Outdoor=true, $allowBB=true) {
 
 function InsertStandardEvents($TourId, $SubRule, $Outdoor=true) {
     foreach (array('R'=>'R_','C'=>'C_','B'=>'B_','L'=>'L_','T'=>'T_') as $kDiv=>$vDiv) {
-        $clsTmpArr = array('W','U21W','U18W','50W','65W');
+        $clsTmpArr = array('W','U21W','U18W','60W');
         if($kDiv == 'R' AND $Outdoor) {
             $clsTmpArr = array('W','U21W');
         } else if($kDiv == 'T') {
-            $clsTmpArr = array('W','U21W','50W','65W');
+            $clsTmpArr = array('W','U21W','60W');
         }
         foreach($clsTmpArr as $kClass=>$vClass) {
             InsertClassEvent($TourId, 0, 1, str_replace('_','W',$vDiv), $kDiv,  $vClass);
             InsertClassEvent($TourId, 1, 3, str_replace('_','W',$vDiv),  $kDiv,  $vClass);
             InsertClassEvent($TourId, 1, 1, str_replace('_','X',$vDiv),  $kDiv,  $vClass);
         }
-        $clsTmpArr = array('M','U21M','U18M','50','50M','65','65M');
+        $clsTmpArr = array('M','U21M','U18M','60','60M');
         if($kDiv == 'R' AND $Outdoor) {
             $clsTmpArr = array('M','U21M');
         } else if($kDiv == 'T') {
-            $clsTmpArr = array('M','U21M','50','50M','65','65M');
+            $clsTmpArr = array('M','U21M','60','60M');
         }
         foreach($clsTmpArr as $kClass=>$vClass) {
             InsertClassEvent($TourId, 0, 1, str_replace('_','M',$vDiv), $kDiv,  $vClass);
diff --git a/src/Modules/Sets/AU/Setup_3_AU.php b/src/Modules/Sets/AU/Setup_3_AU.php
index 994ffc36..b3a164df 100644
--- a/src/Modules/Sets/AU/Setup_3_AU.php
+++ b/src/Modules/Sets/AU/Setup_3_AU.php
@@ -18,7 +18,7 @@
 $tourDetMaxFinTeamScore	= '240';
 $tourDetCategory		= '1'; // 0: Other, 1: Outdoor, 2: Indoor, 4:Field, 8:3D
 $tourDetElabTeam		= '0'; // 0:Standard, 1:Field, 2:3DI
-$tourDetElimination		= '0'; // 0: No Eliminations, 1: Elimination Allowed
+$tourDetElimination		= '1'; // 0: No Eliminations, 1: Elimination Allowed
 $tourDetGolds			= '10+X';
 $tourDetXNine			= 'X';
 $tourDetGoldsChars		= 'KL';
diff --git a/src/Modules/Sets/AU/Setup_Target.php b/src/Modules/Sets/AU/Setup_Target.php
index c6407ad6..6b753b20 100644
--- a/src/Modules/Sets/AU/Setup_Target.php
+++ b/src/Modules/Sets/AU/Setup_Target.php
@@ -123,14 +123,15 @@
 
             break;
             case '2':
-                CreateDistanceNew($TourId, $TourType, 'R_', array(array('70m-1',70), array('70m-2',70)));
-                CreateDistanceNew($TourId, $TourType, 'C_', array(array('50m-1',50), array('50m-2',50)));
-                CreateDistanceNew($TourId, $TourType, 'B%', array(array('50m-1',50), array('50m-2',50)));
-            break;
             case '3':
                 CreateDistanceNew($TourId, $TourType, 'R_', array(array('70m-1',70), array('70m-2',70)));
                 CreateDistanceNew($TourId, $TourType, 'C_', array(array('50m-1',50), array('50m-2',50)));
+                CreateDistanceNew($TourId, $TourType, 'B%', array(array('50m-1',50), array('50m-2',50)));
             break;
+            // case '3':
+            //     CreateDistanceNew($TourId, $TourType, 'R_', array(array('70m-1',70), array('70m-2',70)));
+            //     CreateDistanceNew($TourId, $TourType, 'C_', array(array('50m-1',50), array('50m-2',50)));
+            // break;
         }
     break;
     case 5: // WA900
@@ -184,7 +185,9 @@
 	InsertStandardEvents($TourId, $SubRule, $TourType!=6);
 
 	// Finals & TeamFinals
-	// CreateFinals($TourId);
+    if($SubRule==3) { // only create finals for Australian Open format
+	    CreateFinals($TourId);
+    }
 }
 
 
@@ -194,11 +197,11 @@
         CreateTargetFace($TourId, 1, 'Full Face Default-Recurve, Barebow, Longbow', 'REG-^[RLB].*$', '1', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122, TGT_OUT_FULL, 80, TGT_OUT_FULL, 80);
         CreateTargetFace($TourId, 2, 'Full Face Option', 'REG-^(?![RLB]).*$', '', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122, TGT_OUT_FULL, 80, TGT_OUT_FULL, 80);
         CreateTargetFace($TourId, 3, '10 Ring / 6 Ring', 'REG-^(?!C).*$', '',TGT_OUT_FULL, 122, TGT_OUT_FULL, 122,TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
-        CreateTargetFace($TourId, 4, '5-X Default-Compound', 'C%', '1',TGT_OUT_FULL, 122, TGT_OUT_FULL, 122,TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
+        CreateTargetFace($TourId, 4, '5-X Default-Compound', 'REG-^[C].*$', '1',TGT_OUT_FULL, 122, TGT_OUT_FULL, 122,TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
     break;
     case 3: // 720 rounds
-        CreateTargetFace($TourId, 1, 'Full Face Default', 'REG-^(?!C).*$', '1', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
-        CreateTargetFace($TourId, 2, '5-X Default-Compound', 'C%', '1',TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
+        CreateTargetFace($TourId, 1, 'Full Face Default', 'REG-^[^!C].*$', '1', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
+        CreateTargetFace($TourId, 2, '5-X Default-Compound', 'REG-^[C].*$', '1',TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
     break;
     case 5:
         CreateTargetFace($TourId, 1, 'Default', '%', '1', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
diff --git a/src/Modules/Sets/AU/lib.php b/src/Modules/Sets/AU/lib.php
index 033437b9..918bccd4 100644
--- a/src/Modules/Sets/AU/lib.php
+++ b/src/Modules/Sets/AU/lib.php
@@ -29,6 +29,7 @@ function CreateStandardDivisions($TourId, $Type, $SubRule) {
         case '3':
             $optionDivs = array(
                 'R' => 'Recurve',
+                'BR' => 'Barebow Recurve',
                 'C' => 'Compound'
             );
             break;
@@ -45,22 +46,22 @@ function CreateStandardClasses($TourId, $Type, $SubRule) {
     $i=1;
 	switch($SubRule) {
 		case '1': // All AU Classes
-            CreateClass($TourId, $i++, 1, 13, 0, 'U14M', 'U14M, U16M, U18M, U21M, M', 'U14 Men');
-            CreateClass($TourId, $i++, 14, 15, 0, 'U16M', 'U16M, U18M, U21M, M', 'U16 Men');
-            CreateClass($TourId, $i++, 16, 17, 0, 'U18M', 'U18M, U21M, M', 'U18 Men');
-            CreateClass($TourId, $i++, 18, 20, 0, 'U21M', 'U21M, M', 'U21 Men');
+            CreateClass($TourId, $i++, 1, 13, 0, 'U14M', 'U14M,U16M,U18M,U21M,M', 'U14 Men');
+            CreateClass($TourId, $i++, 14, 15, 0, 'U16M', 'U16M,U18M,U21M,M', 'U16 Men');
+            CreateClass($TourId, $i++, 16, 17, 0, 'U18M', 'U18M,U21M,M', 'U18 Men');
+            CreateClass($TourId, $i++, 18, 20, 0, 'U21M', 'U21M,M', 'U21 Men');
             CreateClass($TourId, $i++, 21, 49, 0, 'M', 'M', 'Men');
-            CreateClass($TourId, $i++, 50, 59, 0, '50M', '50M, M', '50+ Men');
-            CreateClass($TourId, $i++, 60, 69, 0, '60M', '60M, 50M, M', '60+ Men');
-            CreateClass($TourId, $i++, 70, 100, 0, '70M', '70M, 60M, 50M, M', '70+ Men');
-            CreateClass($TourId, $i++, 1, 13, 0, 'U14W', 'U14W, U16W, U18W, U21W, W', 'U14 Women');
-            CreateClass($TourId, $i++, 14, 15, 0, 'U16W', 'U16W, U18W, U21W, W', 'U16 Women');
-            CreateClass($TourId, $i++, 1, 17, 1, 'U18W', 'U18W, U21W, W', 'U18 Women');
-            CreateClass($TourId, $i++, 18, 20, 1, 'U21W', 'U21W, W', 'U21 Women');
+            CreateClass($TourId, $i++, 50, 59, 0, '50M', '50M,M', '50+ Men');
+            CreateClass($TourId, $i++, 60, 69, 0, '60M', '60M,50M,M', '60+ Men');
+            CreateClass($TourId, $i++, 70, 100, 0, '70M', '70M,60M,50M,M', '70+ Men');
+            CreateClass($TourId, $i++, 1, 13, 0, 'U14W', 'U14W,U16W,U18W,U21W,W', 'U14 Women');
+            CreateClass($TourId, $i++, 14, 15, 0, 'U16W', 'U16W,U18W,U21W,W', 'U16 Women');
+            CreateClass($TourId, $i++, 1, 17, 1, 'U18W', 'U18W,U21W,W', 'U18 Women');
+            CreateClass($TourId, $i++, 18, 20, 1, 'U21W', 'U21W,W', 'U21 Women');
             CreateClass($TourId, $i++, 21, 49, 1, 'W', 'W', 'Women');
             CreateClass($TourId, $i++, 50, 59, 1, '50W', '50W, W', '50+ Women');
-            CreateClass($TourId, $i++, 60, 69, 1, '60W', '60W, 50W, W', '60+ Women');
-            CreateClass($TourId, $i++, 70, 100, 1, '70W', '70W, 60W, 50W, W', '70+ Women');
+            CreateClass($TourId, $i++, 60, 69, 1, '60W', '60W,50W,W', '60+ Women');
+            CreateClass($TourId, $i++, 70, 100, 1, '70W', '70W,60W,50W,W', '70+ Women');
             break;
         case '2': // M/F open classes
         case '3': // M/F open classes for AUS Open style event
diff --git a/src/Modules/Sets/FITA/Setup_10.php b/src/Modules/Sets/FITA/Setup_10.php
index 55a911fd..cd32a2ae 100644
--- a/src/Modules/Sets/FITA/Setup_10.php
+++ b/src/Modules/Sets/FITA/Setup_10.php
@@ -18,7 +18,7 @@
 $tourDetMaxFinTeamScore	= '144';
 $tourDetCategory		= '4'; // 0: Other, 1: Outdoor, 2: Indoor, 4:Field, 8:3D
 $tourDetElabTeam		= '1'; // 0:Standard, 1:Field, 2:3DI
-$tourDetElimination		= '1'; // 0: No Eliminations, 1: Elimination Allowed
+$tourDetElimination		= '0'; // 0: No Eliminations, 1: Elimination Allowed
 $tourDetGolds			= '6';
 $tourDetXNine			= '5';
 $tourDetGoldsChars		= 'G';
diff --git a/src/Modules/Sets/FITA/Setup_11.php b/src/Modules/Sets/FITA/Setup_11.php
index a8993345..d1f0c68d 100644
--- a/src/Modules/Sets/FITA/Setup_11.php
+++ b/src/Modules/Sets/FITA/Setup_11.php
@@ -18,7 +18,7 @@
 $tourDetMaxFinTeamScore	= '132';
 $tourDetCategory		= '8'; // 0: Other, 1: Outdoor, 2: Indoor, 4:Field, 8:3D
 $tourDetElabTeam		= '2'; // 0:Standard, 1:Field, 2:3DI
-$tourDetElimination		= '1'; // 0: No Eliminations, 1: Elimination Allowed
+$tourDetElimination		= '0'; // 0: No Eliminations, 1: Elimination Allowed
 $tourDetGolds			= '11';
 $tourDetXNine			= '10';
 $tourDetGoldsChars		= 'M';
diff --git a/src/Modules/Sets/FITA/Setup_12.php b/src/Modules/Sets/FITA/Setup_12.php
index 459426e7..2b531019 100644
--- a/src/Modules/Sets/FITA/Setup_12.php
+++ b/src/Modules/Sets/FITA/Setup_12.php
@@ -18,7 +18,7 @@
 $tourDetMaxFinTeamScore	= '144';
 $tourDetCategory		= '4'; // 0: Other, 1: Outdoor, 2: Indoor, 4:Field, 8:3D
 $tourDetElabTeam		= '1'; // 0:Standard, 1:Field, 2:3DI
-$tourDetElimination		= '1'; // 0: No Eliminations, 1: Elimination Allowed
+$tourDetElimination		= '0'; // 0: No Eliminations, 1: Elimination Allowed
 $tourDetGolds			= '6';
 $tourDetXNine			= '5';
 $tourDetGoldsChars		= 'G';
diff --git a/src/Modules/Sets/FITA/Setup_13.php b/src/Modules/Sets/FITA/Setup_13.php
index d3f6126f..938fe1c3 100644
--- a/src/Modules/Sets/FITA/Setup_13.php
+++ b/src/Modules/Sets/FITA/Setup_13.php
@@ -18,7 +18,7 @@
 $tourDetMaxFinTeamScore	= '132';
 $tourDetCategory		= '8'; // 0: Other, 1: Outdoor, 2: Indoor, 4:Field, 8:3D
 $tourDetElabTeam		= '2'; // 0:Standard, 1:Field, 2:3DI
-$tourDetElimination		= '1'; // 0: No Eliminations, 1: Elimination Allowed
+$tourDetElimination		= '0'; // 0: No Eliminations, 1: Elimination Allowed
 $tourDetGolds			= '11';
 $tourDetXNine			= '10';
 $tourDetGoldsChars		= 'M';
diff --git a/src/Modules/Sets/FITA/Setup_9.php b/src/Modules/Sets/FITA/Setup_9.php
index 5e8f7387..edfa2948 100644
--- a/src/Modules/Sets/FITA/Setup_9.php
+++ b/src/Modules/Sets/FITA/Setup_9.php
@@ -18,7 +18,7 @@
 $tourDetMaxFinTeamScore	= '144';
 $tourDetCategory		= '4'; // 0: Other, 1: Outdoor, 2: Indoor, 4:Field, 8:3D
 $tourDetElabTeam		= '1'; // 0:Standard, 1:Field, 2:3DI
-$tourDetElimination		= '1'; // 0: No Eliminations, 1: Elimination Allowed
+$tourDetElimination		= '0'; // 0: No Eliminations, 1: Elimination Allowed
 $tourDetGolds			= '6';
 $tourDetXNine			= '5';
 $tourDetGoldsChars		= 'G';
diff --git a/src/Modules/Sets/FR/Manage/AbsTae-action.php b/src/Modules/Sets/FR/Manage/AbsTae-action.php
new file mode 100644
index 00000000..49ffe626
--- /dev/null
+++ b/src/Modules/Sets/FR/Manage/AbsTae-action.php
@@ -0,0 +1,64 @@
+<?php
+$JSON=[
+    'error'=>1,
+];
+require_once(dirname(__FILE__, 5) . '/config.php');
+
+if(!CheckTourSession() or !hasACL(AclIndividuals, AclReadWrite)) {
+    JsonOut($JSON);
+}
+
+switch($_REQUEST['act'] ?? '') {
+    case 'setValue':
+        require_once('Common/Lib/ArrTargets.inc.php');
+        require_once('Common/Lib/CommonLib.php');
+        $EvCode=($_REQUEST['event'] ?? '');
+        $EnId=intval($_REQUEST['entry'] ?? 0);
+        $Field=($_REQUEST['fld'] ?? '');
+        $Value=($_REQUEST['val'] ?? '');
+        $Target=intval($_REQUEST['tgt'] ?? 0);
+        if(!$EvCode or !$EnId or !$Field or !$Target) {
+            JsonOut($JSON);
+        }
+
+        $JSON['error']=0;
+        switch($Field) {
+            case 'IndTbClosest':
+                $Value=intval($Value);
+                $q=safe_r_sql("select IndTieBreak, IndTbClosest from Individuals where IndTournament={$_SESSION['TourId']} and IndId={$EnId} and IndEvent=".StrSafe_DB($EvCode));
+                if($r=safe_fetch($q)) {
+                    safe_w_sql("update Individuals set IndTbClosest='$Value', IndTbDecoded=".StrSafe_DB(decodeTie($r->IndTieBreak, 1, $Value))." where IndTournament={$_SESSION['TourId']} and IndId={$EnId} and IndEvent=".StrSafe_DB($EvCode));
+                } else {
+                    $JSON['error']=1;
+                }
+                break;
+            case 'IndTieBreak_0':
+            case 'IndTieBreak_1':
+            case 'IndTieBreak_2':
+                $idx=substr($Field,-1);
+                $q=safe_r_sql("select IndTieBreak, IndTbClosest from Individuals where IndTournament={$_SESSION['TourId']} and IndId={$EnId} and IndEvent=".StrSafe_DB($EvCode));
+                if($r=safe_fetch($q)) {
+                    $TargetLetters=[];
+                    foreach(GetTargetNgInfo($Target) as $L) {
+                        $TargetLetters[$L['letter']]=$L['point'];
+                    }
+                    $r->IndTieBreak=str_pad($r->IndTieBreak, 3, ' ', STR_PAD_RIGHT);
+                    $r->IndTieBreak[$idx]=GetLetterFromPrint($Value, $TargetLetters);
+                    $r->IndTieBreak=rtrim($r->IndTieBreak);
+                    safe_w_sql("update Individuals set IndSO=1, IndTieBreak='{$r->IndTieBreak}', IndTbDecoded=".StrSafe_DB(decodeTie($r->IndTieBreak, 1, $r->IndTbClosest))." where IndTournament={$_SESSION['TourId']} and IndId={$EnId} and IndEvent=".StrSafe_DB($EvCode));
+                    $JSON['value']=strtoupper($Value);
+                } else {
+                    $JSON['error']=1;
+                }
+            break;
+            case 'IndRank':
+                safe_w_sql("update Individuals set IndRank=$Value, IndRankFinal=$Value where IndTournament={$_SESSION['TourId']} and IndId={$EnId} and IndEvent=".StrSafe_DB($EvCode));
+                break;
+            default:
+                $JSON['error']=1;
+        }
+        break;
+}
+
+JsonOut($JSON);
+
diff --git a/src/Modules/Sets/FR/Manage/AbsTae.css b/src/Modules/Sets/FR/Manage/AbsTae.css
new file mode 100644
index 00000000..75ad4703
--- /dev/null
+++ b/src/Modules/Sets/FR/Manage/AbsTae.css
@@ -0,0 +1,35 @@
+.w-3ch {width:3ch;}
+.w-5ch {width:5ch;}
+.w-7ch {width:7ch;}
+.w-10ch {width:10ch;}
+.w-15ch {width:15ch;}
+
+input[type="text"] {width:100%}
+
+.updated {
+    background-color: transparent;
+    animation-name: updated;
+    animation-duration: 3s;
+}
+.error {
+    background-color: transparent;
+    animation-name: error;
+    animation-duration: 3s;
+}
+
+.px-2 {padding:0 0.5em !important;}
+
+@keyframes updated {
+    0%   {background-color: #00bb00;}
+    70%   {background-color: #00aa00;}
+    80%   {background-color: #00ff00;}
+    90%   {background-color: #00aa00;}
+    100% {background-color: transparent;}
+}
+@keyframes error {
+    0%   {background-color: #cc0000;}
+    70%   {background-color: #bb0000;}
+    80%   {background-color: #ff0000;}
+    90%   {background-color: #cc0000;}
+    100% {background-color: transparent;}
+}
diff --git a/src/Modules/Sets/FR/Manage/AbsTae.js b/src/Modules/Sets/FR/Manage/AbsTae.js
new file mode 100644
index 00000000..0d71ea69
--- /dev/null
+++ b/src/Modules/Sets/FR/Manage/AbsTae.js
@@ -0,0 +1,51 @@
+
+function setValue(obj) {
+    let row=$(obj).closest('tr');
+    let form={
+        act:'setValue',
+        event:row.attr('event'),
+        entry:row.attr('id'),
+        tgt:row.attr('tgt'),
+        fld:obj.name,
+        val:obj.type=='checkbox' ? (obj.checked ? 1 : 0) : obj.value,
+    }
+
+    $(obj).closest('td').removeClass('updated error');
+    $.getJSON('./AbsTae-action.php', form, function(data) {
+        $(obj).closest('td').addClass(data.error==0 ? 'updated' : 'error');
+        if(data.value) {
+            $(obj).val(data.value);
+        }
+    })
+}
+
+function ResetDataToQR() {
+    var events = '';
+    var cntEvents = 0;
+    $('input[name="EventCodes[]"]').each(function (i,item) {
+        events += '&EventCodes[]='+$(item).val();
+        cntEvents++;
+    });
+    $.confirm({
+        content: MsgAttentionFinReset,
+        boxWidth: '50%',
+        useBootstrap: false,
+        title: Advanced,
+        buttons: {
+            cancel: {
+                text: CmdCancel,
+                btnClass: 'btn-blue', // class for the button
+            },
+            unset: {
+                text: CmdConfirm,
+                btnClass: 'btn-red', // class for the button
+                action: function () {
+                    document.location.href = ROOT_DIR + 'Final/Individual/AbsIndividual.php?RESET=' + (cntEvents*42) + events;
+                }
+            }
+        },
+        escapeKey: true,
+        backgroundDismiss: true,
+    });
+
+}
\ No newline at end of file
diff --git a/src/Modules/Sets/FR/Manage/AbsTae.php b/src/Modules/Sets/FR/Manage/AbsTae.php
new file mode 100644
index 00000000..f0243491
--- /dev/null
+++ b/src/Modules/Sets/FR/Manage/AbsTae.php
@@ -0,0 +1,131 @@
+<?php
+
+require_once(dirname(__FILE__, 5) . '/config.php');
+require_once('Common/Fun_FormatText.inc.php');
+require_once('Common/Lib/ArrTargets.inc.php');
+require_once('Common/Lib/Obj_RankFactory.php');
+require_once('Common/Fun_Phases.inc.php');
+require_once('Common/Fun_Sessions.inc.php');
+require_once('Final/Fun_ChangePhase.inc.php');
+
+CheckTourSession(true);
+checkACL(AclIndividuals, AclReadWrite);
+
+$Error=false;
+
+$advMode = (!empty($_REQUEST["Advanced"]));
+
+$EventCodes=array();
+if(isset($_REQUEST['EventCodes'])) {
+    $EventCodes=$_REQUEST['EventCodes'];
+}
+
+if(!empty($_REQUEST["RESET"]) AND intval($_REQUEST["RESET"])==(count($EventCodes)*42)) {
+    foreach ($EventCodes as $evCodeParent) {
+        $allEvents = getChildrenEvents($evCodeParent, $Team=0, $_SESSION['TourId']);
+        foreach ($allEvents as $evCode) {
+            ResetShootoff($evCode, 0, 0);
+            Obj_RankFactory::create('Abs', array('tournament' => $_SESSION['TourId'], 'events' => $evCode, 'dist' => 0))->calculate();
+
+            // destroys the grid of all the events that need "handling"
+            safe_w_sql("DELETE FROM Finals WHERE FinTournament=" . StrSafe_DB($_SESSION['TourId']) . " AND FinEvent = " . StrSafe_DB($evCode));
+
+            // Recreate Empty Grids
+            safe_w_SQL("INSERT INTO Finals (FinEvent, FinMatchNo, FinTournament, FinDateTime) " .
+                "SELECT EvCode, GrMatchNo," . StrSafe_DB($_SESSION['TourId']) . ", NOW() " .
+                "FROM Events " .
+                "INNER JOIN Phases on PhId=EvFinalFirstPhase and (PhIndTeam & pow(2,EvTeamEvent))>0 " .
+                "INNER JOIN Grids ON GrPhase<=greatest(PhId, PhLevel) AND EvTeamEvent='0' AND EvTournament=" . StrSafe_DB($_SESSION['TourId']) . " 
+            WHERE EvCode=" . StrSafe_DB($evCode));
+        }
+    }
+    header('location: ' . $_SERVER["PHP_SELF"]);
+    die();
+}
+
+$JS_SCRIPT = array('<script type="text/javascript" src="./AbsTae.js"></script>',
+    '<link href="./AbsTae.css" rel="stylesheet" type="text/css">',
+    );
+$IncludeJquery = true;
+include('Common/Templates/head.php');
+
+$q=safe_r_sql("select ToGolds, ToXNine from Tournament where ToId={$_SESSION['TourId']}");
+$TOUR=safe_fetch($q);
+$Sql = "select EvCode, IndId, QuScore, QuGold, QuXnine, IndRank, IndTieBreak, IndTbDecoded, IndTbClosest, EnFirstName, EnName, if(TfT2>0, TfT2, TfT1) as TargetId
+            from Individuals
+            inner join Qualifications on QuId=IndId
+            inner join Entries on EnId=IndId
+            inner join Events on EvTournament=IndTournament and EvCode=IndEvent and EvTeamEvent=0 and EvFinalFirstPhase=0
+            inner join (select EvCode TieCode, count(*) as ExAequo, QuScore as TieScore
+                from Individuals
+                inner join Events on EvTournament=IndTournament and EvCode=IndEvent and EvTeamEvent=0 and EvFinalFirstPhase=0
+                inner join Qualifications on QuId=IndId
+                where IndTournament={$_SESSION['TourId']} and IndRank between 1 and 4
+                group by EvCode, QuScore
+                having ExAequo>1) Ties on TieCode=IndEvent and QuScore=TieScore
+            inner join TargetFaces on TfTournament=IndTournament and TfId=EnTargetFace
+            where IndTournament={$_SESSION['TourId']}
+            order by EvProgr, QuScore desc, IndRank asc";
+$q=safe_r_SQL($Sql);
+$OldEvent='';
+$OldScore=0;
+$Cats=[];
+while ($r=safe_fetch($q)) {
+    if(empty($Cats[$r->EvCode][$r->QuScore])) {
+        $Cats[$r->EvCode][$r->QuScore]=[
+            'Min'=>$r->IndRank,
+            'Max'=>$r->IndRank,
+            'Items'=>[],
+        ];
+        $OldScore=$r->QuScore;
+    }
+    if($OldEvent==$r->EvCode and $OldScore==$r->QuScore) {
+        $Cats[$r->EvCode][$r->QuScore]['Max']=$r->IndRank;
+    }
+    $Cats[$r->EvCode][$r->QuScore]['Items'][]=$r;
+
+    $OldScore=$r->QuScore;
+    $OldEvent=$r->EvCode;
+}
+echo '<table class="Tabella2">';
+echo '<thead><tr><th colspan="11" class="Title">'.(get_text('ShootOff4Rank') . ' - ' . get_text('Individual')).'</th></tr>';
+echo '<tr>
+    <th>'.get_text('Event').'</th>
+    <th colspan="2"></th>
+    <th>'.get_text('Score', 'Tournament').'</th>
+    <th>'.$TOUR->ToGolds.'</th>
+    <th>'.$TOUR->ToXNine.'</th>
+    <th colspan="3">'.get_text('ShootOffArrows', 'Tournament').'</th>
+    <th>'.get_text('ClosestShort', 'Tournament').'</th>
+    <th>'.get_text('Rank').'</th>
+    </tr></thead><tbody>';
+$First=true;
+foreach($Cats as $EvCode => $Items) {
+
+    if(!$First) {
+        echo '<tr class="Divider"><th colspan="11" class="Divider">&nbsp;</th></tr>';
+    }
+    $First=false;
+
+    foreach($Items as $Scores) {
+        foreach($Scores['Items'] as $r) {
+            echo '<tr class="EventLine" event="'.$r->EvCode.'"  id="'.$r->IndId.'" tgt="'.$r->TargetId.'">'.
+                '<th class="w-10ch">'.$r->EvCode.'</th>'.
+                '<td>'.$r->EnFirstName.'</td>'.
+                '<td>'.$r->EnName.'</td>'.
+                '<td class="Right w-7ch">'.$r->QuScore .'</td>'.
+                '<td class="Right w-7ch">'.$r->QuGold.'</td>'.
+                '<td class="Right w-7ch">'.$r->QuXnine.'</td>'.
+                '<td class="Center w-7ch px-2"><input type="text" name="IndTieBreak_0" value="'.DecodeFromLetter($r->IndTieBreak[0]??'').'" onchange="setValue(this)"></td>'.
+                '<td class="Center w-7ch px-2"><input type="text" name="IndTieBreak_1" value="'.DecodeFromLetter($r->IndTieBreak[1]??'').'" onchange="setValue(this)"></td>'.
+                '<td class="Center w-7ch px-2"><input type="text" name="IndTieBreak_2" value="'.DecodeFromLetter($r->IndTieBreak[2]??'').'" onchange="setValue(this)"></td>'.
+                '<td class="Center w-7ch px-2"><input type="checkbox" name="IndTbClosest" '.($r->IndTbClosest ? ' checked="checked"' : '').' onchange="setValue(this)"></td>'.
+                '<td class="Center w-7ch px-2"><input type="number" name="IndRank" min="'.$Scores['Min'].'" max="'.$Scores['Max'].'" value="'.$r->IndRank.'" onchange="setValue(this)"></td>'.
+                '</tr>';
+        }
+    }
+}
+
+echo '</tbody></table>';
+
+include('Common/Templates/tail.php');
diff --git a/src/Modules/Sets/FR/Manage/AbsTeam.php b/src/Modules/Sets/FR/Manage/AbsTeam.php
index 0253ff07..aeaa54eb 100644
--- a/src/Modules/Sets/FR/Manage/AbsTeam.php
+++ b/src/Modules/Sets/FR/Manage/AbsTeam.php
@@ -186,7 +186,7 @@
             }
 
             // Team Components
-            $now = date('Y-m-d H:i:s');
+            $now = getToday('now', 'Y-m-d H:i:s');
             safe_w_SQL("INSERT INTO TeamFinComponent (TfcCoId, TfcSubTeam, TfcTournament, TfcEvent, TfcId, TfcOrder, TfcTimeStamp) 
 				SELECT TcCoId, TcSubTeam, TcTournament, TcEvent, TcId, TcOrder, '{$now}'
 				FROM TeamComponent 
diff --git a/src/Modules/Sets/FR/Rank/Obj_Rank_Abs_50_calc.php b/src/Modules/Sets/FR/Rank/Obj_Rank_Abs_50_calc.php
index c7e60534..43c4d6eb 100644
--- a/src/Modules/Sets/FR/Rank/Obj_Rank_Abs_50_calc.php
+++ b/src/Modules/Sets/FR/Rank/Obj_Rank_Abs_50_calc.php
@@ -118,7 +118,7 @@ public function calculate() {
 					where IndTournament={$this->tournament}");
 
 			$q="SELECT
-					IndId AS `athId`,IndEvent AS `EventCode`,
+					IndId AS `athId`,IndEvent AS `EventCode`, QuArrow,
 					Qu{$dd}Score AS Score,Qu{$dd}Gold AS Gold,Qu{$dd}Xnine AS XNine, Qu{$dd}Hits AS Hits, IndRank as actualRank,
 					EvFinalFirstPhase, EvElim1, EvElim2, EvElimType,
 					IF(EvFinalFirstPhase=0,999999,coalesce(RrQualified, IF(EvElimType=0, EvNumQualified, IF(EvElim1=0,EvElim2,EvElim1)))) as QualifiedNo, EvFirstQualified
@@ -132,7 +132,7 @@ public function calculate() {
 			        AND (QuScore != 0 OR QuHits !=0) 
 					{$filter}
 				ORDER BY
-					IndEvent, Qu{$dd}Hits DESC, Qu{$dd}Score DESC, Qu{$dd}Gold DESC, Qu{$dd}Xnine DESC
+					IndEvent, QuArrow DESC, Qu{$dd}Score DESC, Qu{$dd}Gold DESC, Qu{$dd}Xnine DESC
 			";
 				//print $q.'<br><br>';
 			$r=safe_r_sql($q);
@@ -142,6 +142,7 @@ public function calculate() {
 				$myRank = 1;
 				$myPos = 0;
 
+				$myArrowsOld = 0;
 				$myScoreOld = 0;
 				$myGoldOld = 0;
 				$myXNineOld = 0;
@@ -157,6 +158,7 @@ public function calculate() {
 
 						$myRank = 1;
 						$myPos = 0;
+                        $myArrowsOld = 0;
 						$myScoreOld = 0;
 						$myGoldOld = 0;
 						$myXNineOld = 0;
@@ -214,7 +216,7 @@ public function calculate() {
     					$so=1;
 					} else {
                         // all the other are tie only in case of Full Tie
-						if (!($myRow->Score==$myScoreOld AND $myRow->Gold==$myGoldOld AND $myRow->XNine==$myXNineOld)) {
+						if (!($myRow->QuArrow==$myArrowsOld AND $myRow->Score==$myScoreOld AND $myRow->Gold==$myGoldOld AND $myRow->XNine==$myXNineOld)) {
                             $myRank = $myPos;
                         }
 					}
@@ -227,6 +229,7 @@ public function calculate() {
                         $so = 0;
                     }
 
+					$myArrowsOld = $myRow->QuArrow;
 					$myScoreOld = $myRow->Score;
 					$myGoldOld = $myRow->Gold;
 					$myXNineOld = $myRow->XNine;
diff --git a/src/Modules/Sets/FR/Rank/Obj_Rank_DivClass_50_calc.php b/src/Modules/Sets/FR/Rank/Obj_Rank_DivClass_50_calc.php
index e922992f..4dc3d4d2 100644
--- a/src/Modules/Sets/FR/Rank/Obj_Rank_DivClass_50_calc.php
+++ b/src/Modules/Sets/FR/Rank/Obj_Rank_DivClass_50_calc.php
@@ -105,7 +105,7 @@ public function calculate()
 
 			$filter=$this->safeFilter();
 
-			$orderBy="CONCAT(EnDivision,EnClass), Qu{$dd}Hits DESC, Qu{$dd}Score DESC, Qu{$dd}Gold DESC, Qu{$dd}Xnine DESC ";
+			$orderBy="CONCAT(EnDivision,EnClass), QuArrow DESC, Qu{$dd}Score DESC, Qu{$dd}Gold DESC, Qu{$dd}Xnine DESC ";
 
 			$q="
 				SELECT
diff --git a/src/Modules/Sets/FR/Setup_Target.php b/src/Modules/Sets/FR/Setup_Target.php
index 1d73b5d3..36ef741e 100644
--- a/src/Modules/Sets/FR/Setup_Target.php
+++ b/src/Modules/Sets/FR/Setup_Target.php
@@ -176,26 +176,25 @@
 	case 6:
         if($SubRule==4) {
             // PARA
-            CreateDistanceNew($TourId, $TourType, 'CL%', array(array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'CLU%', array(array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'CLS%', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'CO%', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'BB%', array(array('18m-1',18), array('18m-2',18)));
+			CreateDistanceNew($TourId, $TourType, 'CLD%', array(array('dist-1',18), array('dist-2',18)));
             CreateDistanceNew($TourId, $TourType, 'OP%', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'FE%', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'W1%', array(array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'CHC_S%', array(array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'CHC_U21%', array(array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'HV%S%', array(array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'HL%S%', array(array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'H%U21%', array(array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'CHC%', array(array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'H%', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'SU%', array(array('15m-1',15), array('15m-2',15)));
-            CreateDistanceNew($TourId, $TourType, 'H%U18%', array(array('10m-1',10), array('10m-2',10)));
-            CreateDistanceNew($TourId, $TourType, 'CHC_U18%', array(array('10m-1',10), array('10m-2',10)));
             CreateDistanceNew($TourId, $TourType, 'CRCL%', array(array('10m-1',10), array('10m-2',10)));
-            CreateDistanceNew($TourId, $TourType, 'CRCOU18%', array(array('10m-1',10), array('10m-2',10)));
-            CreateDistanceNew($TourId, $TourType, 'CRCOU21%', array(array('15m-1',15), array('15m-2',15)));
-            CreateDistanceNew($TourId, $TourType, 'CRCOS%', array(array('15m-1',15), array('15m-2',15)));
+            CreateDistanceNew($TourId, $TourType, 'CRCO%', array(array('15m-1',15), array('15m-2',15)));
         } else {
-            CreateDistanceNew($TourId, $TourType, '%', array(array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'CLU%', array(array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'CLS%', array(array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'CO%', array(array('18m-1',18), array('18m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'BB%', array(array('18m-1',18), array('18m-2',18)));
+			CreateDistanceNew($TourId, $TourType, 'CLD%', array(array('dist-1',18), array('dist-2',18)));
         }
 		break;
 	case 7:
@@ -284,13 +283,13 @@
 				// All classes
 				CreateTargetFace($TourId, $TgtId++, 'Blason Unique 40cm', 'REG-(^CLU18)|(^CLU21)|(^CLS)|(^BBS)|(^BBU2)'.($SubRule==4 ? '|(^OPCLS)|(^OPCLU2)|(^FECLS)|(^FECLU2)|(^W1)' : ''), '1', 1, 40, 1, 40);
 				CreateTargetFace($TourId, $TgtId++, 'Blason Unique 60cm', 'REG-(^CLU1[35])|(^BBU1)'.($SubRule==4 ? '|(^CH)|(^CR)|(^H)|(^OPC.U1)|(^FEC.U1)' : ''), '1', 1, 60, 1, 60);
-				CreateTargetFace($TourId, $TgtId++, 'Blason Unique 80cm', $SubRule==4 ? 'REG-(^CLU11)|(^S)' : 'CLU11%', '1', 1, 80, 1, 80);
+				CreateTargetFace($TourId, $TgtId++, 'Blason Unique 80cm', $SubRule==4 ? 'REG-(^CLU11)|(^SU)' : 'CLU11%', '1', 1, 80, 1, 80);
 				CreateTargetFace($TourId, $TgtId++, 'Trispot Poulie 6-10 40cm', $SubRule==4 ? 'REG-(^CO)|(^OPCOU2)|(^OPCOS)|(^FECOU2)|(^FECOS)' : 'CO%', '1', 4, 40, 4, 40);
-                if($SubRule==4) {
-                    // para faces
-                }
+				CreateTargetFace($TourId, $TgtId++, 'Blason Débutant/Découverte', 'CLD%', '1',  1, 80, 1, 80);
+
 				// optional target faces
-				CreateTargetFace($TourId, $TgtId++, 'Trispot Classique 6-10 40cm', 'REG-^(CL|BB)([^YU]|(U18)|(U21))', '',  2, 40, 2, 40);
+				CreateTargetFace($TourId, $TgtId++, 'Trispot Classique 6-10 40cm', 'REG-(^CLU18)|(^CLU21)|(^CLS)|(^BBS)|(^BBU2)'.($SubRule==4 ? '|(^OPCLS)|(^OPCLU2)|(^FECLS)|(^FECLU2)|(^W1)' : ''), '',  2, 40, 2, 40);
+				CreateTargetFace($TourId, $TgtId++, 'Trispot Classique 6-10 60cm', 'REG-(^CLU1(3|5))|(^BBU1)', '',  2, 60, 2, 60);
 				break;
 			case '2':
 				// Championships Adults
diff --git a/src/Modules/Sets/FR/exports/index.php b/src/Modules/Sets/FR/exports/index.php
index 347fdf02..d072c180 100644
--- a/src/Modules/Sets/FR/exports/index.php
+++ b/src/Modules/Sets/FR/exports/index.php
@@ -16,7 +16,7 @@
 	$File=array();
 
 	// Version
-	$File[]="VERSION : \t9.01\t";
+	$File[]=sprintf("VERSION : \t%s.%s\t", defined('ProgramRelease') ? ProgramRelease : 'unknown', defined('ProgramBuild') ? preg_replace('/\D/', '', ProgramBuild) : 'unknown');
 
 	// get the judges
 	$Select="SELECT TiCode Judges 
@@ -52,11 +52,11 @@
 				$Discipline='E';
 			}
 			if($COMP->ToWhenFrom>='2019-01-01') {
-				$Discipline='T';
+                $_REQUEST['lev']=='SP' ? 'H' : 'T';
 			}
 			break;
 		case 2:
-			$Discipline='S';
+            $Discipline= $_REQUEST['lev']=='SP' ? 'I' : 'S';
 			break;
 		case 4:
 			$Discipline='C';
@@ -84,19 +84,19 @@
 	$q=safe_r_sql("select EnIocCode, EnCode, ucase(EnFirstName) as EnFirstName, ucase(EnName) as EnName, EnDivision, EnAgeClass, EnClass, EnSex, 
 			ifnull(IndEvent,'-') as IndEvent, EnId, 
 			ucase(CoName) as CoName, CoCode, 
-			QuScore, QuSession, QuD1Score, QuD2Score, QuD3Score, QuD4Score, QuHits, QuGold, QuXnine, 
+			QuScore, QuSession, QuD1Score, QuD2Score, QuD3Score, QuD4Score, QuHits, QuGold, QuXnine, QuD1Arrowstring,
 			MaxArrows, MaxDistance, MaxTargetFace, 
 			IndRank, QuClRank, IndRankFinal 
 		from Qualifications
 		inner join Entries on EnId=QuId
-        inner join Divisions on DivId=EnDivision $Filter
+        inner join Divisions on DivId=EnDivision and DivTournament=EnTournament $Filter
 		inner join Countries on CoId=EnCountry and CoTournament=EnTournament
 		inner join (select TfId, greatest(TfW1, TfW2, TfW3, TfW4, TfW5, TfW6, TfW7, TfW8) as MaxTargetFace from TargetFaces where TfTournament={$_SESSION['TourId']}) TargetFaces on TfId=EnTargetFace
 		inner join (select DiSession, sum(DiEnds*DiArrows) as MaxArrows from DistanceInformation where DiTournament={$_SESSION['TourId']} group by DiSession) DistanceArrows on DiSession=QuSession
 		inner join (select TdClasses, greatest(Td1+0, Td2+0, Td3+0, Td4+0, Td5+0, Td6+0, Td7+0, Td8+0) as MaxDistance from TournamentDistances where TdTournament={$_SESSION['TourId']}) Distances on concat(EnDivision,EnClass) like TdClasses
 		left join Individuals on IndId=EnId
 		where EnTournament={$_SESSION['TourId']}
-		order by QuSession");
+		order by EnFirstName, QuSession");
 	$EnCodes=array();
 	while($r=safe_fetch($q)) {
         if($r->EnClass[0]=='D') {
@@ -104,10 +104,11 @@
             continue;
         }
 
-		if(empty($EnCodes["{$r->EnCode}-{$r->EnDivision}"])) {
-            $EnCodes["{$r->EnCode}-{$r->EnDivision}"]=0;
-        }
-		$EnCodes["{$r->EnCode}-{$r->EnDivision}"]++;
+        if (0 == $r->QuScore && '' == trim($r->QuD1Arrowstring)) {
+			// Do not send archer in the txt file if score is 0 and no arrows recorded
+			continue;
+		}
+
 
 		// check the age class
         $AgeClass=substr($r->EnAgeClass,0,-1);
@@ -160,12 +161,23 @@
                 break;
             case 'SU1':
             case 'SU2':
-                $r->EnDivision='CL';
                 $Class=$r->EnDivision;
+                $r->EnDivision='CL';
                 break;
         }
 
-		$Archers[$r->IndEvent][$r->EnId]=array_fill(0, 51, '');
+        if(empty($EnCodes["{$r->EnCode}-{$r->EnDivision}"])) {
+            $EnCodes["{$r->EnCode}-{$r->EnDivision}"]=0;
+        }
+        $EnCodes["{$r->EnCode}-{$r->EnDivision}"]++;
+
+		// Remove rank from archers shooting more than one session
+		if ($EnCodes["{$r->EnCode}-{$r->EnDivision}"] > 1) {
+			$r->QuClRank = null;
+			$r->IndRankFinal = null;
+		}
+
+        $Archers[$r->IndEvent][$r->EnId]=array_fill(0, 51, '');
 		$Archers[$r->IndEvent][$r->EnId][0] = $Discipline;
 		$Archers[$r->IndEvent][$r->EnId][1] = $_REQUEST['lev'];
 		$Archers[$r->IndEvent][$r->EnId][2] = 'I'; // E if team
@@ -185,7 +197,7 @@
 		$Archers[$r->IndEvent][$r->EnId][17] = $r->MaxDistance;
 		$Archers[$r->IndEvent][$r->EnId][18] = $r->MaxTargetFace;
 		$Archers[$r->IndEvent][$r->EnId][19] = date('d/m/Y', strtotime($COMP->ToWhenFrom));
-		$Archers[$r->IndEvent][$r->EnId][20] = str_replace(["\n","\r"], ' / ', trim($COMP->ToWhere));
+		$Archers[$r->IndEvent][$r->EnId][20] = str_replace(["\n","\r"], ' / ', trim($COMP->ToVenue));
 		$Archers[$r->IndEvent][$r->EnId][21] = $r->QuClRank;
 		$Archers[$r->IndEvent][$r->EnId][22] = $r->QuD1Score ? $r->QuD1Score : '';
 		$Archers[$r->IndEvent][$r->EnId][23] = $r->QuD2Score ? $r->QuD2Score : '';
diff --git a/src/Modules/Sets/FR/lib.php b/src/Modules/Sets/FR/lib.php
index 1d751e55..956678ac 100644
--- a/src/Modules/Sets/FR/lib.php
+++ b/src/Modules/Sets/FR/lib.php
@@ -73,32 +73,34 @@ function CreateStandardClasses($TourId, $TourType, $SubRule) {
 				case '4':
 					// All classes...
                     if($TourType==6) {
-                        CreateClass($TourId, $i++,  1, 10, 1, 'U11F', 'U11F,U13F', 'U11 Femme', '1', 'CL', '', '');
-                        CreateClass($TourId, $i++,  1, 10, 0, 'U11H', 'U11H,U13H', 'U11 Homme', '1', 'CL', '', '');
+                        CreateClass($TourId, $i++,  1, 10+$NextYearClass, 1, 'U11F', 'U11F,U13F', 'U11 Femme', '1', 'CL', '', '');
+                        CreateClass($TourId, $i++,  1, 10+$NextYearClass, 0, 'U11H', 'U11H,U13H', 'U11 Homme', '1', 'CL', '', '');
                     }
-					CreateClass($TourId, $i++, 11+$NextYearClass, 12, 1, 'U13F', 'U13F,U15F', 'U13 Femme', '1', 'CL', '', '');
-					CreateClass($TourId, $i++, 11+$NextYearClass, 12, 0, 'U13H', 'U13H,U15H', 'U13 Homme', '1', 'CL', '', '');
-					CreateClass($TourId, $i++, 13+$NextYearClass, 14, 1, 'U15F', 'U15F,U18F', 'U15 Femme', '1', 'BB,CL,CO', '', '');
-					CreateClass($TourId, $i++, 13+$NextYearClass, 14, 0, 'U15H', 'U15H,U18H', 'U15 Homme', '1', 'BB,CL,CO', '', '');
-					CreateClass($TourId, $i++, 15+$NextYearClass, 17, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'U18W', 'U18W');
-					CreateClass($TourId, $i++, 15+$NextYearClass, 17, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Homme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'U18M', 'U18M');
-					CreateClass($TourId, $i++, 18+$NextYearClass, 20, 1, 'U21F', 'U21F,S1F', 'U21 Femme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'U21W', 'U21W');
-					CreateClass($TourId, $i++, 18+$NextYearClass, 20, 0, 'U21H', 'U21H,S1H', 'U21 Homme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'U21M', 'U21M');
-					CreateClass($TourId, $i++, 21+$NextYearClass, 39, 1, 'S1F', 'S1F', 'Senior 1 Femme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'W', 'W');
-					CreateClass($TourId, $i++, 21+$NextYearClass, 39, 0, 'S1H', 'S1H', 'Senior 1 Homme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'M', 'M');
-					CreateClass($TourId, $i++, 40+$NextYearClass, 59, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '', '');
-					CreateClass($TourId, $i++, 40+$NextYearClass, 59, 0, 'S2H', 'S2H,S1H', 'Senior 2 Homme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '', '');
+					CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 1, 'U13F', 'U13F,U15F', 'U13 Femme', '1', 'CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '', '');
+					CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 0, 'U13H', 'U13H,U15H', 'U13 Homme', '1', 'CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '', '');
+					CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 1, 'U15F', 'U15F,U18F', 'U15 Femme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '', '');
+					CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 0, 'U15H', 'U15H,U18H', 'U15 Homme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '', '');
+					CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'U18W', 'U18W');
+					CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Homme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'U18M', 'U18M');
+					CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 1, 'U21F', 'U21F,S1F', 'U21 Femme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'U21W', 'U21W');
+					CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 0, 'U21H', 'U21H,S1H', 'U21 Homme', '1', 'BB,CL,CO'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'U21M', 'U21M');
+					CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 1, 'S1F', 'S1F', 'Senior 1 Femme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'W', 'W');
+					CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 0, 'S1H', 'S1H', 'Senior 1 Homme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), 'M', 'M');
+					CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '', '');
+					CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 0, 'S2H', 'S2H,S1H', 'Senior 2 Homme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '', '');
 					CreateClass($TourId, $i++, 60+$NextYearClass,100, 1, 'S3F', 'S3F,S2F,S1F', 'Senior 3 Femme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '50W', '50W');
 					CreateClass($TourId, $i++, 60+$NextYearClass,100, 0, 'S3H', 'S3H,S2H,S1H', 'Senior 3 Homme', '1', 'BB,CO,CL'.($isTAEPara?',OPCL,FECL,OPCO,FECO,W1,CHCL,CRCL,CHCO,CRCO,HV1,HV2,HLCL,HLCO,SU1,SU2':''), '50M', '50M');
+                    CreateClass($TourId, $i++, 1,127, -1, 'DEC', 'DEC', 'Découverte', '1', 'CL', '', '');
+                    CreateClass($TourId, $i++, 1,127, -1, 'DEB', 'DEB', 'Débutant', '1', 'CL', '', '');
 					break;
 				case '2':
 					// Championships Adults and Elite...
-					CreateClass($TourId, $i++, 18+$NextYearClass, 20, 1, 'U21F', 'U21F,S1F', 'U21 Femme', '1', 'BB', 'U21W', 'U21W');
-					CreateClass($TourId, $i++, 18+$NextYearClass, 20, 0, 'U21H', 'U21H,S1H', 'U21 Homme', '1', 'BB', 'U21M', 'U21M');
-					CreateClass($TourId, $i++, 21+$NextYearClass, 39, 1, 'S1F', 'S1F', 'Senior 1 Femme', '1', 'BB,CL,CO', 'M', 'W');
-					CreateClass($TourId, $i++, 21+$NextYearClass, 39, 0, 'S1H', 'S1H', 'Senior 1 Homme', '1', 'BB,CL,CO', 'W', 'M');
-					CreateClass($TourId, $i++, 40+$NextYearClass, 59, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femme', '1', 'BB,CL,CO', '', '');
-					CreateClass($TourId, $i++, 40+$NextYearClass, 59, 0, 'S2H', 'S2H,S1H', 'Senior 2 Homme', '1', 'BB,CL,CO', '', '');
+					CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 1, 'U21F', 'U21F,S1F', 'U21 Femme', '1', 'BB', 'U21W', 'U21W');
+					CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 0, 'U21H', 'U21H,S1H', 'U21 Homme', '1', 'BB', 'U21M', 'U21M');
+					CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 1, 'S1F', 'S1F', 'Senior 1 Femme', '1', 'BB,CL,CO', 'M', 'W');
+					CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 0, 'S1H', 'S1H', 'Senior 1 Homme', '1', 'BB,CL,CO', 'W', 'M');
+					CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femme', '1', 'BB,CL,CO', '', '');
+					CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 0, 'S2H', 'S2H,S1H', 'Senior 2 Homme', '1', 'BB,CL,CO', '', '');
 					CreateClass($TourId, $i++, 60+$NextYearClass,100, 1, 'S3F', 'S3F,S2F,S1F', 'Senior 3 Femme', '1', 'BB,CL,CO', '50W', '50W');
 					CreateClass($TourId, $i++, 60+$NextYearClass,100, 0, 'S3H', 'S3H,S2H,S1H', 'Senior 3 Homme', '1', 'BB,CL,CO', '50M', '50M');
 
@@ -107,30 +109,30 @@ function CreateStandardClasses($TourId, $TourType, $SubRule) {
                     break;
 				case '3':
 					// Championships Youth...
-					CreateClass($TourId, $i++, 11+$NextYearClass, 12, 1, 'U13F', 'U13F,U15F', 'U13 Femme', '1', 'CL', '', '');
-					CreateClass($TourId, $i++, 11+$NextYearClass, 12, 0, 'U13H', 'U13H,U15H', 'U13 Homme', '1', 'CL', '', '');
-					CreateClass($TourId, $i++, 13+$NextYearClass, 14, 1, 'U15F', 'U15F,U18F', 'U15 Femme', '1', 'BB,CL', '', '');
-					CreateClass($TourId, $i++, 13+$NextYearClass, 14, 0, 'U15H', 'U15H,U18H', 'U15 Homme', '1', 'BB,CL', '', '');
-					CreateClass($TourId, $i++, 15+$NextYearClass, 17, 1, 'U18F', 'U18F,U21F', 'U18 Femme', '1', 'BB,CL,CO', 'U18W', 'U18W');
-					CreateClass($TourId, $i++, 15+$NextYearClass, 17, 0, 'U18H', 'U18H,U21H', 'U18 Homme', '1', 'BB,CL,CO', 'U18M', 'U18M');
-					CreateClass($TourId, $i++, 18+$NextYearClass, 20, 1, 'U21F', 'U21F,1F', 'U21 Femme', '1', 'CL,CO', 'U21W', 'U21W');
-					CreateClass($TourId, $i++, 18+$NextYearClass, 20, 0, 'U21H', 'U21H,1H', 'U21 Homme', '1', 'CL,CO', 'U21M', 'U21M');
+					CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 1, 'U13F', 'U13F,U15F', 'U13 Femme', '1', 'CL', '', '');
+					CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 0, 'U13H', 'U13H,U15H', 'U13 Homme', '1', 'CL', '', '');
+					CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 1, 'U15F', 'U15F,U18F', 'U15 Femme', '1', 'BB,CL', '', '');
+					CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 0, 'U15H', 'U15H,U18H', 'U15 Homme', '1', 'BB,CL', '', '');
+					CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 1, 'U18F', 'U18F,U21F', 'U18 Femme', '1', 'BB,CL,CO', 'U18W', 'U18W');
+					CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 0, 'U18H', 'U18H,U21H', 'U18 Homme', '1', 'BB,CL,CO', 'U18M', 'U18M');
+					CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 1, 'U21F', 'U21F,1F', 'U21 Femme', '1', 'CL,CO', 'U21W', 'U21W');
+					CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 0, 'U21H', 'U21H,1H', 'U21 Homme', '1', 'CL,CO', 'U21M', 'U21M');
 					break;
 			}
 			break;
 		case '50': // Beursault
-            CreateClass($TourId, $i++, 11+$NextYearClass, 12, 1, 'U13F', 'U13F,U15F', 'U13 Femme', '1', '', '', '');
-            CreateClass($TourId, $i++, 11+$NextYearClass, 12, 0, 'U13H', 'U13H,U15H', 'U13 Homme', '1', '', '', '');
-            CreateClass($TourId, $i++, 13+$NextYearClass, 14, 1, 'U15F', 'U15F,U18F', 'U15 Femme', '1', '', '', '');
-            CreateClass($TourId, $i++, 13+$NextYearClass, 14, 0, 'U15H', 'U15H,U18H', 'U15 Homme', '1', '', '', '');
-            CreateClass($TourId, $i++, 15+$NextYearClass, 17, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femme', '1', '', '', '');
-            CreateClass($TourId, $i++, 15+$NextYearClass, 17, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Homme', '1', '', '', '');
-            CreateClass($TourId, $i++, 18+$NextYearClass, 20, 1, 'U21F', 'U21F,S1F', 'U21 Femme', '1', '', '', '');
-            CreateClass($TourId, $i++, 18+$NextYearClass, 20, 0, 'U21H', 'U21H,S1H', 'U21 Homme', '1', '', '', '');
-            CreateClass($TourId, $i++, 21+$NextYearClass, 39, 1, 'S1F', 'S1F', 'Senior 1 Femme', '1', '', '', '');
-            CreateClass($TourId, $i++, 21+$NextYearClass, 39, 0, 'S1H', 'S1H', 'Senior 1 Homme', '1', '', '', '');
-            CreateClass($TourId, $i++, 40+$NextYearClass, 59, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femme', '1', '', '', '');
-            CreateClass($TourId, $i++, 40+$NextYearClass, 59, 0, 'S2H', 'S2H,S1H', 'Senior 2 Homme', '1', '', '', '');
+            CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 1, 'U13F', 'U13F,U15F', 'U13 Femme', '1', '', '', '');
+            CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 0, 'U13H', 'U13H,U15H', 'U13 Homme', '1', '', '', '');
+            CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 1, 'U15F', 'U15F,U18F', 'U15 Femme', '1', '', '', '');
+            CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 0, 'U15H', 'U15H,U18H', 'U15 Homme', '1', '', '', '');
+            CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femme', '1', '', '', '');
+            CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Homme', '1', '', '', '');
+            CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 1, 'U21F', 'U21F,S1F', 'U21 Femme', '1', '', '', '');
+            CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 0, 'U21H', 'U21H,S1H', 'U21 Homme', '1', '', '', '');
+            CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 1, 'S1F', 'S1F', 'Senior 1 Femme', '1', '', '', '');
+            CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 0, 'S1H', 'S1H', 'Senior 1 Homme', '1', '', '', '');
+            CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femme', '1', '', '', '');
+            CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 0, 'S2H', 'S2H,S1H', 'Senior 2 Homme', '1', '', '', '');
             CreateClass($TourId, $i++, 60+$NextYearClass,100, 1, 'S3F', 'S3F,S2F,S1F', 'Senior 3 Femme', '1', '', '', '');
             CreateClass($TourId, $i++, 60+$NextYearClass,100, 0, 'S3H', 'S3H,S2H,S1H', 'Senior 3 Homme', '1', '', '', '');
 			break;
@@ -139,75 +141,75 @@ function CreateStandardClasses($TourId, $TourType, $SubRule) {
                 case 2: // TNJ Tournoi National Jeune
                 case 3: // Championnat de France Jeune
                 case 15: // Championnat de France Jeune Equipes
-                    CreateClass($TourId, $i++, 11+$NextYearClass, 12, 1, 'U13F', 'U13F,U15F', 'U13 Femmes', '1', 'CL', '', '');
-                    CreateClass($TourId, $i++, 11+$NextYearClass, 12, 0, 'U13H', 'U13H,U15H', 'U13 Hommes', '1', 'CL', '', '');
-                    CreateClass($TourId, $i++, 13+$NextYearClass, 14, 1, 'U15F', 'U15F,U18F', 'U15 Femmes', '1', 'CL', '', '');
-                    CreateClass($TourId, $i++, 13+$NextYearClass, 14, 0, 'U15H', 'U15H,U18H', 'U15 Hommes', '1', 'CL', '', '');
-                    CreateClass($TourId, $i++, 15+$NextYearClass, 17, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femmes', '1', 'CL,CO', 'U18W', 'U18W');
-                    CreateClass($TourId, $i++, 15+$NextYearClass, 17, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Hommes', '1', 'CL,CO', 'U18M', 'U18M');
-                    CreateClass($TourId, $i++, 18+$NextYearClass, 20, 1, 'U21F', 'U21F,S1F', 'U21 Femmes', '1', 'CL,CO', 'U21W', 'U21W');
-                    CreateClass($TourId, $i++, 18+$NextYearClass, 20, 0, 'U21H', 'U21H,S1H', 'U21 Hommes', '1', 'CL,CO', 'U21M', 'U21M');
+                    CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 1, 'U13F', 'U13F,U15F', 'U13 Femmes', '1', 'CL', '', '');
+                    CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 0, 'U13H', 'U13H,U15H', 'U13 Hommes', '1', 'CL', '', '');
+                    CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 1, 'U15F', 'U15F,U18F', 'U15 Femmes', '1', 'CL', '', '');
+                    CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 0, 'U15H', 'U15H,U18H', 'U15 Hommes', '1', 'CL', '', '');
+                    CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femmes', '1', 'CL,CO', 'U18W', 'U18W');
+                    CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Hommes', '1', 'CL,CO', 'U18M', 'U18M');
+                    CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 1, 'U21F', 'U21F,S1F', 'U21 Femmes', '1', 'CL,CO', 'U21W', 'U21W');
+                    CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 0, 'U21H', 'U21H,S1H', 'U21 Hommes', '1', 'CL,CO', 'U21M', 'U21M');
                     break;
                 case 9: // Finales DR
                 case 10: // Championnats France Elite
                 case 16: // Finales D2
-                    CreateClass($TourId, $i++, 15+$NextYearClass, 17, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femmes', '1', 'CL,CO', 'U18W', 'U18W');
-                    CreateClass($TourId, $i++, 15+$NextYearClass, 17, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Hommes', '1', 'CL,CO', 'U18M', 'U18M');
-                    CreateClass($TourId, $i++, 18+$NextYearClass, 20, 1, 'U21F', 'U21F,S1F', 'U21 Femmes', '1', 'CL,CO', 'U21W', 'U21W');
-                    CreateClass($TourId, $i++, 18+$NextYearClass, 20, 0, 'U21H', 'U21H,S1H', 'U21 Hommes', '1', 'CL,CO', 'U21M', 'U21M');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 1, 'S1F', 'S1F', 'Senior 1 Femmes', '1', 'CL,CO', 'W', 'W');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 0, 'S1H', 'S1H', 'Senior 1 Hommes', '1', 'CL,CO', 'M', 'M');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femmes', '1', 'CL,CO', '', '');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 0, 'S2H', 'S2H,S1H', 'Senior 2 Hommes', '1', 'CL,CO', '', '');
+                    CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femmes', '1', 'CL,CO', 'U18W', 'U18W');
+                    CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Hommes', '1', 'CL,CO', 'U18M', 'U18M');
+                    CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 1, 'U21F', 'U21F,S1F', 'U21 Femmes', '1', 'CL,CO', 'U21W', 'U21W');
+                    CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 0, 'U21H', 'U21H,S1H', 'U21 Hommes', '1', 'CL,CO', 'U21M', 'U21M');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 1, 'S1F', 'S1F', 'Senior 1 Femmes', '1', 'CL,CO', 'W', 'W');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 0, 'S1H', 'S1H', 'Senior 1 Hommes', '1', 'CL,CO', 'M', 'M');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femmes', '1', 'CL,CO', '', '');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 0, 'S2H', 'S2H,S1H', 'Senior 2 Hommes', '1', 'CL,CO', '', '');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 1, 'S3F', 'S3F,S2F,S1F', 'Senior 3 Femmes', '1', 'CL,CO', '50W', '50W');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 0, 'S3H', 'S3H,S2H,S1H', 'Senior 3 Hommes', '1', 'CL,CO', '50M', '50M');
                     break;
                 case 11: // Championnat de France Adulte
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 1, 'S1F', 'S1F', 'Senior 1 Femmes', '1', 'CL,CO', 'W', 'W');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 0, 'S1H', 'S1H', 'Senior 1 Hommes', '1', 'CL,CO', 'M', 'M');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femmes', '1', 'CL,CO', '', '');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 0, 'S2H', 'S2H,S1H', 'Senior 2 Hommes', '1', 'CL,CO', '', '');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 1, 'S1F', 'S1F', 'Senior 1 Femmes', '1', 'CL,CO', 'W', 'W');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 0, 'S1H', 'S1H', 'Senior 1 Hommes', '1', 'CL,CO', 'M', 'M');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femmes', '1', 'CL,CO', '', '');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 0, 'S2H', 'S2H,S1H', 'Senior 2 Hommes', '1', 'CL,CO', '', '');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 1, 'S3F', 'S3F,S2F,S1F', 'Senior 3 Femmes', '1', 'CL,CO', '50W', '50W');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 0, 'S3H', 'S3H,S2H,S1H', 'Senior 3 Hommes', '1', 'CL,CO', '50M', '50M');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 1, 'S1W', 'S1W', 'Senior 1 Femmes National', '1', 'CL,CO,BB', '', '');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 0, 'S1M', 'S1M', 'Senior 1 Hommes National', '1', 'CL,CO,BB', '', '');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 1, 'S2W', 'S2W,S1W', 'Senior 2 Femmes National', '1', 'CL,CO,BB', '', '');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 0, 'S2M', 'S2M,S1M', 'Senior 2 Hommes National', '1', 'CL,CO,BB', '', '');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 1, 'S1W', 'S1W', 'Senior 1 Femmes National', '1', 'CL,CO,BB', '', '');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 0, 'S1M', 'S1M', 'Senior 1 Hommes National', '1', 'CL,CO,BB', '', '');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 1, 'S2W', 'S2W,S1W', 'Senior 2 Femmes National', '1', 'CL,CO,BB', '', '');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 0, 'S2M', 'S2M,S1M', 'Senior 2 Hommes National', '1', 'CL,CO,BB', '', '');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 1, 'S3W', 'S3W,S2W,S1W', 'Senior 3 Femmes National', '1', 'CL,CO,BB', '', '');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 0, 'S3M', 'S3M,S2M,S1M', 'Senior 3 Hommes National', '1', 'CL,CO,BB', '', '');
                     break;
                 case 13:
                 case 14:
-                    CreateClass($TourId, $i++,  1, 10, 1, 'U11F', 'U11F,U13F', 'U11 Femmes', '1', 'CL', '', '');
-                    CreateClass($TourId, $i++,  1, 10, 0, 'U11H', 'U11H,U13H', 'U11 Hommes', '1', 'CL', '', '');
-                    CreateClass($TourId, $i++, 11+$NextYearClass, 12, 1, 'U13F', 'U13F,U15F', 'U13 Femmes', '1', 'CL'.($isTAEPara?',HV1,HV2,W1':''), '', '');
-                    CreateClass($TourId, $i++, 11+$NextYearClass, 12, 0, 'U13H', 'U13H,U15H', 'U13 Hommes', '1', 'CL'.($isTAEPara?',HV1,HV2,W1':''), '', '');
-                    CreateClass($TourId, $i++, 13+$NextYearClass, 14, 1, 'U15F', 'U15F,U18F', 'U15 Femmes', '1', 'CL'.($isTAEPara?',HV1,HV2,W1':''), '', '');
-                    CreateClass($TourId, $i++, 13+$NextYearClass, 14, 0, 'U15H', 'U15H,U18H', 'U15 Hommes', '1', 'CL'.($isTAEPara?',HV1,HV2,W1':''), '', '');
-                    CreateClass($TourId, $i++, 15+$NextYearClass, 17, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femmes', '1', 'CL,CO'.(($isTAEPara)?',HV1,HV2,W1':''), 'U18W', 'U18W');
-                    CreateClass($TourId, $i++, 15+$NextYearClass, 17, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Hommes', '1', 'CL,CO'.($isTAEPara?',HV1,HV2,W1':''), 'U18M', 'U18M');
-                    CreateClass($TourId, $i++, 18+$NextYearClass, 20, 1, 'U21F', 'U21F,S1F', 'U21 Femmes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), 'U21W', 'U21W');
-                    CreateClass($TourId, $i++, 18+$NextYearClass, 20, 0, 'U21H', 'U21H,S1H', 'U21 Hommes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), 'U21M', 'U21M');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 1, 'S1F', 'S1F', 'Senior 1 Femmes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), 'W', 'W');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 0, 'S1H', 'S1H', 'Senior 1 Hommes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), 'M', 'M');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femmes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), '', '');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 0, 'S2H', 'S2H,S1H', 'Senior 2 Hommes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), '', '');
+                    CreateClass($TourId, $i++,  1, 10+$NextYearClass, 1, 'U11F', 'U11F,U13F', 'U11 Femmes', '1', 'CL', '', '');
+                    CreateClass($TourId, $i++,  1, 10+$NextYearClass, 0, 'U11H', 'U11H,U13H', 'U11 Hommes', '1', 'CL', '', '');
+                    CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 1, 'U13F', 'U13F,U15F', 'U13 Femmes', '1', 'CL'.($isTAEPara?',HV1,HV2,W1':''), '', '');
+                    CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 0, 'U13H', 'U13H,U15H', 'U13 Hommes', '1', 'CL'.($isTAEPara?',HV1,HV2,W1':''), '', '');
+                    CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 1, 'U15F', 'U15F,U18F', 'U15 Femmes', '1', 'CL'.($isTAEPara?',HV1,HV2,W1':''), '', '');
+                    CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 0, 'U15H', 'U15H,U18H', 'U15 Hommes', '1', 'CL'.($isTAEPara?',HV1,HV2,W1':''), '', '');
+                    CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 1, 'U18F', 'U18F,U21F,S1F', 'U18 Femmes', '1', 'CL,CO'.(($isTAEPara)?',HV1,HV2,W1':''), 'U18W', 'U18W');
+                    CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 0, 'U18H', 'U18H,U21H,S1H', 'U18 Hommes', '1', 'CL,CO'.($isTAEPara?',HV1,HV2,W1':''), 'U18M', 'U18M');
+                    CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 1, 'U21F', 'U21F,S1F', 'U21 Femmes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), 'U21W', 'U21W');
+                    CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 0, 'U21H', 'U21H,S1H', 'U21 Hommes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), 'U21M', 'U21M');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 1, 'S1F', 'S1F', 'Senior 1 Femmes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), 'W', 'W');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 0, 'S1H', 'S1H', 'Senior 1 Hommes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), 'M', 'M');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 1, 'S2F', 'S2F,S1F', 'Senior 2 Femmes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), '', '');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 0, 'S2H', 'S2H,S1H', 'Senior 2 Hommes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), '', '');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 1, 'S3F', 'S3F,S2F,S1F', 'Senior 3 Femmes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), '50W', '50W');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 0, 'S3H', 'S3H,S2H,S1H', 'Senior 3 Hommes', '1', 'CL,CO'.($isTAEPara?',FECL,FECO,OPCL,OPCO,HV1,HV2,W1':''), '50M', '50M');
                     CreateClass($TourId, $i++, 1,127, -1, 'DEC', 'DEC', 'Découverte', '1', 'CL', '', '');
                     CreateClass($TourId, $i++, 1,127, -1, 'DEB', 'DEB', 'Débutant', '1', 'CL', '', '');
-                    CreateClass($TourId, $i++, 11+$NextYearClass, 12, 1, 'U13W', 'U13W,U15W', 'U13 Femmes National', '1', 'CL,CO'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 11+$NextYearClass, 12, 0, 'U13M', 'U13M,U15M', 'U13 Hommes National', '1', 'CL,CO'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 13+$NextYearClass, 14, 1, 'U15W', 'U15W,U18W', 'U15 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 13+$NextYearClass, 14, 0, 'U15M', 'U15M,U18M', 'U15 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 15+$NextYearClass, 17, 1, 'U18W', 'U18W,U21W,S1W', 'U18 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 15+$NextYearClass, 17, 0, 'U18M', 'U18M,U21M,S1M', 'U18 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 18+$NextYearClass, 20, 1, 'U21W', 'U21W,S1W', 'U21 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 18+$NextYearClass, 20, 0, 'U21M', 'U21M,S1M', 'U21 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 1, 'S1W', 'S1W', 'Senior 1 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 21+$NextYearClass, 39, 0, 'S1M', 'S1M', 'Senior 1 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 1, 'S2W', 'S2W,S1W', 'Senior 2 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
-                    CreateClass($TourId, $i++, 40+$NextYearClass, 59, 0, 'S2M', 'S2M,S1M', 'Senior 2 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 1, 'U13W', 'U13W,U15W', 'U13 Femmes National', '1', 'CL,CO'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 11+$NextYearClass, 12+$NextYearClass, 0, 'U13M', 'U13M,U15M', 'U13 Hommes National', '1', 'CL,CO'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 1, 'U15W', 'U15W,U18W', 'U15 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 13+$NextYearClass, 14+$NextYearClass, 0, 'U15M', 'U15M,U18M', 'U15 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 1, 'U18W', 'U18W,U21W,S1W', 'U18 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 15+$NextYearClass, 17+$NextYearClass, 0, 'U18M', 'U18M,U21M,S1M', 'U18 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,OPCL,OPCO,FECL,FECO,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 1, 'U21W', 'U21W,S1W', 'U21 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 18+$NextYearClass, 20+$NextYearClass, 0, 'U21M', 'U21M,S1M', 'U21 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 1, 'S1W', 'S1W', 'Senior 1 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 21+$NextYearClass, 39+$NextYearClass, 0, 'S1M', 'S1M', 'Senior 1 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 1, 'S2W', 'S2W,S1W', 'Senior 2 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
+                    CreateClass($TourId, $i++, 40+$NextYearClass, 59+$NextYearClass, 0, 'S2M', 'S2M,S1M', 'Senior 2 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 1, 'S3W', 'S3W,S2W,S1W', 'Senior 3 Femmes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
                     CreateClass($TourId, $i++, 60+$NextYearClass,127, 0, 'S3M', 'S3M,S2M,S1M', 'Senior 3 Hommes National', '1', 'CL,CO,BB'.($isTAEPara?',OPCL,OPCO,FECL,FECO,CHCL,CHCO,CRCL,CRCO,HLCL,HLCO,W1,SU1,SU2':''), '', '');
                 break;
@@ -694,33 +696,66 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=false) {
                         'EvWaCategory'=>'',
                     ];
                     $Events=[
-                        'U18FBB'=>['U18 Femme Arc Nu', 0, 2, $TargetSize6, $Distance, 1, 0],
-                        'U18HBB'=>['U18 Homme Arc Nu', 0, 2, $TargetSize6, $Distance, 1, 0],
-                        'U15FCL'=>['U13-U15 Femme Arc Classique', 0, 2, $TargetSize6, $Distance, 1, 0],
-                        'U15HCL'=>['U13-U15 Homme Arc Classique', 0, 2, $TargetSize6, $Distance, 1, 0],
-                        'U15FCO'=>['U13-U15 Femme Arc à Poulies', 0, 4, $TargetSize4, $Distance, 0, 0],
-                        'U15HCO'=>['U13-U15 Homme Arc à Poulies', 0, 4, $TargetSize4, $Distance, 0, 0],
-                        'SFBB'=>['Senior Femme Arc Nu', 0, 2, $TargetSize4, $Distance, 1, 0],
-                        'SHBB'=>['Senior Homme Arc Nu', 0, 2, $TargetSize4, $Distance, 1, 0],
-                        'SFCL'=>['Senior Femme Arc Classique', 0, 2, $TargetSize4, $Distance, 1, 0],
-                        'SHCL'=>['Senior Homme Arc Classique', 0, 2, $TargetSize4, $Distance, 1, 0],
-                        'SFCO'=>['Senior Femme Arc à Poulies', 0, 4, $TargetSize4, $Distance, 0, 0],
-                        'SHCO'=>['Senior Homme Arc à Poulies', 0, 4, $TargetSize4, $Distance, 0, 0],
+                        'U11FCL'=>['U11 Femme Arc Classique', 0, 1, 80, 18, 1],
+                        'U11HCL'=>['U11 Homme Arc Classique', 0, 1, 80, 18, 1],
+                        'U13FCL'=>['U13 Femme Arc Classique', 0, 2, 60, 18, 1],
+                        'U13HCL'=>['U13 Homme Arc Classique', 0, 2, 60, 18, 1],
+                        'U15FCL'=>['U15 Femme Arc Classique', 0, 2, 60, 18, 1],
+                        'U15HCL'=>['U15 Homme Arc Classique', 0, 2, 60, 18, 1],
+                        'U18FCL'=>['U18 Femme Arc Classique', 0, 2, 40, 18, 1],
+                        'U18HCL'=>['U18 Homme Arc Classique', 0, 2, 40, 18, 1],
+                        'U21FCL'=>['U21 Femme Arc Classique', 0, 2, 40, 18, 1],
+                        'U21HCL'=>['U21 Homme Arc Classique', 0, 2, 40, 18, 1],
+                        'S1FCL'=>['S1 Femme Arc Classique', 0, 2, 40, 18, 1],
+                        'S1HCL'=>['S1 Homme Arc Classique', 0, 2, 40, 18, 1],
+                        'S2FCL'=>['S2 Femme Arc Classique', 0, 2, 40, 18, 1],
+                        'S2HCL'=>['S2 Homme Arc Classique', 0, 2, 40, 18, 1],
+                        'S3FCL'=>['S3 Femme Arc Classique', 0, 2, 40, 18, 1],
+                        'S3HCL'=>['S3 Homme Arc Classique', 0, 2, 40, 18, 1],
+                        'U15FCO'=>['U15 Femme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'U15HCO'=>['U15 Homme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'U18FCO'=>['U18 Femme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'U18HCO'=>['U18 Homme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'U21FCO'=>['U21 Femme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'U21HCO'=>['U21 Homme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'S1FCO'=>['S1 Femme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'S1HCO'=>['S1 Homme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'S2FCO'=>['S2 Femme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'S2HCO'=>['S2 Homme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'S3FCO'=>['S3 Femme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'S3HCO'=>['S3 Homme Arc à Poulies', 0, 4, 40, 18, 0],
+                        'U18FBB'=>['U18 Femme Arc Nu', 0, 2, 60, 18, 1],
+                        'U18HBB'=>['U18 Homme Arc Nu', 0, 2, 60, 18, 1],
+                        'SFBB'=>['Scratch Femme Arc Nu', 0, 2, 40, 18, 1],
+                        'SHBB'=>['Scratch Homme Arc Nu', 0, 2, 40, 18, 1],
+                        'DEC'=>['Découverte', 0, 1, 80, 18, 1],
+                        'DEB'=>['Débutant', 0, 1, 80, 18, 1],
                     ];
                     if($SubRule==4) {
                         // Para Events
-                        $Events['U18FBB'] = ['U18 Femme Arc Nu', 0, 2, $TargetSize6, $Distance, 1, 1];
-                        $Events['U18HBB'] = ['U18 Homme Arc Nu', 0, 2, $TargetSize6, $Distance, 1, 1];
-                        $Events['U15FCL'] = ['U13-U15 Femme Arc Classique', 0, 2, $TargetSize6, $Distance, 1, 1];
-                        $Events['U15HCL'] = ['U13-U15 Homme Arc Classique', 0, 2, $TargetSize6, $Distance, 1, 1];
-                        $Events['U15FCO'] = ['U13-U15 Femme Arc à Poulies', 0, 4, $TargetSize4, $Distance, 0, 1];
-                        $Events['U15HCO'] = ['U13-U15 Homme Arc à Poulies', 0, 4, $TargetSize4, $Distance, 0, 1];
-                        $Events['SFBB'] = ['Senior Femme Arc Nu', 0, 2, $TargetSize4, $Distance, 1, 1];
-                        $Events['SHBB'] = ['Senior Homme Arc Nu', 0, 2, $TargetSize4, $Distance, 1, 1];
-                        $Events['SFCL'] = ['Senior Femme Arc Classique', 0, 2, $TargetSize4, $Distance, 1, 1];
-                        $Events['SHCL'] = ['Senior Homme Arc Classique', 0, 2, $TargetSize4, $Distance, 1, 1];
-                        $Events['SFCO'] = ['Senior Femme Arc à Poulies', 0, 4, $TargetSize4, $Distance, 0, 1];
-                        $Events['SHCO'] = ['Senior Homme Arc à Poulies', 0, 4, $TargetSize4, $Distance, 0, 1];
+                        $Events['OPFCL']=['Open Femme Arc Classique', 0, 2, 40, 18, 1, 1];
+                        $Events['OPHCL']=['Open Homme Arc Classique', 0, 2, 40, 18, 1, 1];
+                        $Events['OPFCO']=['Open Femme Arc à Poulies', 0, 4, 40, 18, 0, 1];
+                        $Events['OPHCO']=['Open Homme Arc à Poulies', 0, 4, 40, 18, 0, 1];
+                        $Events['FEFCL']=['Fédéral Femme Arc Classique', 0, 2, 40, 18, 1, 1];
+                        $Events['FEHCL']=['Fédéral Homme Arc Classique', 0, 2, 40, 18, 1, 1];
+                        $Events['FEFCO']=['Fédéral Femme Arc à Poulies', 0, 4, 40, 18, 0, 1];
+                        $Events['FEHCO']=['Fédéral Homme Arc à Poulies', 0, 4, 40, 18, 0, 1];
+                        $Events['CHFCL']=['Challenge Femme Arc Classique', 0, 1, 60, 18, 1, 1];
+                        $Events['CHHCL']=['Challenge Homme Arc Classique', 0, 1, 60, 18, 1, 1];
+                        $Events['CHCO']=['Challenge Arc à Poulies', 0, 1, 60, 18, 1, 1];
+                        $Events['CRFCL']=['Critérium Femme Arc Classique', 0, 1, 60, 10, 1, 1];
+                        $Events['CRHCL']=['Critérium Homme Arc Classique', 0, 1, 60, 10, 1, 1];
+                        $Events['CRCO']=['Critérium Arc à Poulies', 0, 1, 60, 15, 1, 1];
+                        $Events['HV1']=['HV1', 0, 1, 60, 18, 1, 1];
+                        $Events['HV2']=['HV2-3', 0, 1, 60, 18, 1, 1];
+                        $Events['HLCL']=['HV Libre Arc Classique', 0, 1, 60, 18, 1, 1];
+                        $Events['HLCO']=['HV Libre Arc à Poulies', 0, 1, 60, 18, 1, 1];
+                        $Events['W1']=['W1', 0, 2, 40, 18, 1, 1];
+                        $Events['OPJ']=['Open Jeune', 0, 1, 60, 18, 1, 1];
+                        $Events['OFEJ']=['Fédéral Jeune', 0, 1, 60, 18, 1, 1];
+                        $Events['SU1']=['Support 1 Arc Classique', 0, 1, 80, 15, 1, 1];
+                        $Events['SU2']=['Support 2 Arc Classique', 0, 1, 80, 15, 1, 1];
                     }
 
                     foreach($Events as $EvCode=>$EvName) {
@@ -862,7 +897,7 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=false) {
                     break;
             }
             break;
-        case 50: // INDOOR 25m + 18 (eventually matches at 18m)
+        case 50: // Beursault
             // NEVER as Team
             $Options=[
                 'EvFinalFirstPhase' => 0,
@@ -1227,6 +1262,113 @@ function InsertStandardEvents($TourId, $TourType, $SubRule) {
             break;
 		case 6:
 			switch($SubRule) {
+                case 1: // Selectif
+                case 4: // Selectif + Para
+                    // International
+                    $Events=[
+                        'U11FCL'=>['CL'=>['U11F']],
+                        'U11HCL'=>['CL'=>['U11H']],
+                        'U13FCL'=>['CL'=>['U13F']],
+                        'U13HCL'=>['CL'=>['U13H']],
+                        'U15FCL'=>['CL'=>['U15F']],
+                        'U15HCL'=>['CL'=>['U15H']],
+                        'U18FCL'=>['CL'=>['U18F']],
+                        'U18HCL'=>['CL'=>['U18H']],
+                        'U21FCL'=>['CL'=>['U21F']],
+                        'U21HCL'=>['CL'=>['U21H']],
+                        'S1FCL'=>['CL'=>['S1F']],
+                        'S1HCL'=>['CL'=>['S1H']],
+                        'S2FCL'=>['CL'=>['S2F']],
+                        'S2HCL'=>['CL'=>['S2H']],
+                        'S3FCL'=>['CL'=>['S3F']],
+                        'S3HCL'=>['CL'=>['S3H']],
+                        'U15FCO'=>['CO'=>['U13F','U15F']],
+                        'U15HCO'=>['CO'=>['U13H','U15H']],
+                        'U18FCO'=>['CO'=>['U18F']],
+                        'U18HCO'=>['CO'=>['U18H']],
+                        'U21FCO'=>['CO'=>['U21F']],
+                        'U21HCO'=>['CO'=>['U21H']],
+                        'S1FCO'=>['CO'=>['S1F']],
+                        'S1HCO'=>['CO'=>['S1H']],
+                        'S2FCO'=>['CO'=>['S2F']],
+                        'S2HCO'=>['CO'=>['S2H']],
+                        'S3FCO'=>['CO'=>['S3F']],
+                        'S3HCO'=>['CO'=>['S3H']],
+                        'NU13FCL'=>['CL'=>['U13W']],
+                        'NU13HCL'=>['CL'=>['U13M']],
+                        'NU15FCL'=>['CL'=>['U15W']],
+                        'NU15HCL'=>['CL'=>['U15M']],
+                        'NU18FCL'=>['CL'=>['U18W']],
+                        'NU18HCL'=>['CL'=>['U18M']],
+                        'NU21FCL'=>['CL'=>['U21W']],
+                        'NU21HCL'=>['CL'=>['U21M']],
+                        'NS1FCL'=>['CL'=>['S1W']],
+                        'NS1HCL'=>['CL'=>['S1M']],
+                        'NS2FCL'=>['CL'=>['S2W']],
+                        'NS2HCL'=>['CL'=>['S2M']],
+                        'NS3FCL'=>['CL'=>['S3W']],
+                        'NS3HCL'=>['CL'=>['S3M']],
+                        'NU15FCO'=>['CO'=>['U13W','U15W']],
+                        'NU15HCO'=>['CO'=>['U13M','U15M']],
+                        'NU18FCO'=>['CO'=>['U18W']],
+                        'NU18HCO'=>['CO'=>['U18M']],
+                        'NU21FCO'=>['CO'=>['U21W']],
+                        'NU21HCO'=>['CO'=>['U21M']],
+                        'NS1FCO'=>['CO'=>['S1W']],
+                        'NS1HCO'=>['CO'=>['S1M']],
+                        'NS2FCO'=>['CO'=>['S2W']],
+                        'NS2HCO'=>['CO'=>['S2M']],
+                        'NS3FCO'=>['CO'=>['S3W']],
+                        'NS3HCO'=>['CO'=>['S3M']],
+                        'U18FBB'=>['BB'=>['U15F','U18F']],
+                        'U18HBB'=>['BB'=>['U15H','U18H']],
+                        'SFBB'=>['BB'=>['U21F','S1F','S2F','S3F']],
+                        'SHBB'=>['BB'=>['U21H','S1H','S2H','S3H']],
+                        'DEC'=>['CL'=>['DEC']],
+                        'DEB'=>['CL'=>['DEB']],
+                    ];
+
+                    if($SubRule==4) {
+                        // Para
+                        $Events['OPFCL']=['OPCL'=>['U21F','S1F','S2F','S3F']];
+                        $Events['OPHCL']=['OPCL'=>['U21H','S1H','S2H','S3H']];
+                        $Events['OPFCO']=['OPCO'=>['U21F','S1F','S2F','S3F']];
+                        $Events['OPHCO']=['OPCO'=>['U21H','S1H','S2H','S3H']];
+                        $Events['FEFCL']=['FECL'=>['U21F','S1F','S2F','S3F']];
+                        $Events['FEHCL']=['FECL'=>['U21H','S1H','S2H','S3H']];
+                        $Events['FEFCO']=['FECO'=>['U21F','S1F','S2F','S3F']];
+                        $Events['FEHCO']=['FECO'=>['U21H','S1H','S2H','S3H']];
+                        $Events['CHFCL']=['CHCL'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F']];
+                        $Events['CHHCL']=['CHCL'=>['U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['CHCO']=['CHCL'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['CRFCL']=['CRCL'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F']];
+                        $Events['CRHCL']=['CRCL'=>['U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['CRCO']=['CHCO'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['HV1']=['HV1'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['HV2']=['HV2'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['HLCL']=['HLCL'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['HLCO']=['HLCO'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['W1']=['W1'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['OPJ']=[
+                            'OPCL'=>['U13F','U15F','U18F','U13H','U15H','U18H'],
+                            'OPCO'=>['U13F','U15F','U18F','U13H','U15H','U18H'],
+                        ];
+                        $Events['OFEJ']=[
+                            'FECL'=>['U13F','U15F','U18F','U13H','U15H','U18H'],
+                            'FECO'=>['U13F','U15F','U18F','U13H','U15H','U18H'],
+                        ];
+                        $Events['SU1']=['SU1'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                        $Events['SU2']=['SU2'=>['U13F','U15F','U18F','U21F','S1F','S2F','S3F','U13H','U15H','U18H','U21H','S1H','S2H','S3H']];
+                    }
+                    // inserts all the events!!!
+                    foreach($Events as $EvCode => $Divs) {
+                        foreach($Divs as $Div=>$Classes) {
+                            foreach($Classes as $Class) {
+                                InsertClassEvent($TourId, 0, 1, $EvCode, $Div,$Class);
+                            }
+                        }
+                    }
+                    break;
 				case '2':
                     $Events=[
                         'EFBB'=>['BB'=>['SC'=>'E','CL'=>['U21F','S1F','S2F','S3F']]],
diff --git a/src/Modules/Sets/FR/menu.php b/src/Modules/Sets/FR/menu.php
index 7cf13d5e..1af5cb90 100644
--- a/src/Modules/Sets/FR/menu.php
+++ b/src/Modules/Sets/FR/menu.php
@@ -15,6 +15,34 @@
     }
 
 	switch($_SESSION['TourLocSubRule']) {
+		case 'SetFRCoupeFrance':
+            $q=safe_r_sql("select EvCode, count(*) as ExAequo
+                from Individuals
+                inner join Events on EvTournament=IndTournament and EvCode=IndEvent and EvTeamEvent=0 and EvFinalFirstPhase=0
+                inner join Qualifications on QuId=IndId
+                inner join (select EvCode TieCode, count(*) as ExAequo, QuScore as TieScore
+                    from Individuals
+                    inner join Events on EvTournament=IndTournament and EvCode=IndEvent and EvTeamEvent=0 and EvFinalFirstPhase=0
+                    inner join Qualifications on QuId=IndId
+                    where IndTournament={$_SESSION['TourId']} and IndRank between 1 and 4
+                    group by EvCode, QuScore
+                    having ExAequo>1) Ties on TieCode=IndEvent and QuScore=TieScore
+                where IndTournament={$_SESSION['TourId']}
+                group by EvCode, QuScore
+                having ExAequo>1
+                order by EvProgr, QuScore desc");
+            if(safe_num_rows($q)>0) {
+                $tmp = get_text('MenuLM_Check shoot-off before Rank');
+                $ev=[];
+                while($r=safe_fetch($q)) {
+                    $ev[]=$r->EvCode;
+                }
+                $tmp .= ' <b class="ShootOffMenu">(' . implode('-', $ev) . ')</b>';
+                $tmp .= '|' . $CFG->ROOT_DIR . 'Modules/Sets/FR/Manage/AbsTae.php';
+                $ret['FINI'][]=MENU_DIVIDER;
+                $ret['FINI'][]=$tmp;
+            }
+            break;
 		case 'SetFRChampsD1DNAP':
 		case 'SetFRD12023':
 			$AllInOne=getModuleParameter('FFTA', 'D1AllInOne', 0);
diff --git a/src/Modules/Sets/FR/pdf/chunks/DivClasIndividual_50.inc.php b/src/Modules/Sets/FR/pdf/chunks/DivClasIndividual_50.inc.php
new file mode 100644
index 00000000..5d0e3584
--- /dev/null
+++ b/src/Modules/Sets/FR/pdf/chunks/DivClasIndividual_50.inc.php
@@ -0,0 +1,266 @@
+<?php
+//error_reporting(E_ALL);
+
+$pdf->HideCols=$PdfData->HideCols;
+$pdf->NumberThousandsSeparator=$PdfData->NumberThousandsSeparator;
+$pdf->Continue=$PdfData->Continue;
+$pdf->TotalShort=$PdfData->TotalShort;
+
+$rankData=$PdfData->rankData;
+if(count($rankData['sections']))
+{
+	$hideGolds = $PdfData->hideGolds;
+	$DistSize = 12;
+	$AddSize=0;
+	$pdf->setDocUpdate($rankData['meta']['lastUpdate']);
+	foreach($rankData['sections'] as $section)
+	{
+		if(!empty($_REQUEST['OnlySubClass']) && empty($section['meta']['subClass'])) continue;
+
+		//Calcolo Le Misure per i Campi
+		if($section['meta']['numDist']>=4) {
+			$AddSize=0;
+			if(!$rankData['meta']['double']) {
+				$DistSize = (40 + ($hideGolds ? 10 : 0))/$section['meta']['numDist'];
+			} else {
+				$DistSize = (40 + ($hideGolds ? 10 : 0))/(($section['meta']['numDist']/2)+1);
+			}
+		} else {
+			$AddSize = ((40 + ($hideGolds ? 10 : 0))-($section['meta']['numDist']*(48 + ($hideGolds ? 10 : 0))/4))/2;
+		}
+		//Verifico se l'header e qualche riga ci stanno nella stessa pagina altrimenti salto alla prosisma
+		if(!$pdf->SamePage(($rankData['meta']['double'] ? 2 : 1)*9 + 6.5 + ($section['meta']['sesArrows'] ? 7.5 : 0)))
+			$pdf->AddPage();
+
+		writeGroupHeaderPrnIndividual($pdf, $section['meta'], $DistSize, $AddSize, $section['meta']['numDist'], $rankData['meta']['double'], false, $hideGolds);
+
+		foreach($section['items'] as $item)
+		{
+			// goes here as to print the header on a new page it MUST be at least one line of results to print!
+			if (!$pdf->SamePage(5* ($rankData['meta']['double'] ? 2 : 1)))
+			{
+				$pdf->AddPage();
+// 				if($k < count($section['items'])) writeGroupHeaderPrnIndividual($pdf, $section['meta'], $DistSize, $AddSize, $section['meta']['numDist'], $rankData['meta']['double'], true, $hideGolds);
+				writeGroupHeaderPrnIndividual($pdf, $section['meta'], $DistSize, $AddSize, $section['meta']['numDist'], $rankData['meta']['double'], true, $hideGolds);
+			}
+			writeDataRowPrnIndividual($pdf, $item, $DistSize, $AddSize, $section['meta']['numDist'], $rankData['meta']['double'], ($PdfData->family=='Snapshot' ? $section['meta']['snapDistance']: 0), $hideGolds);
+
+			if(!isset($PdfData->HTML)) continue;
+
+
+		}
+		$pdf->SetY($pdf->GetY()+5);
+	}
+}
+
+function writeDataRowPrnIndividual($pdf, $item, $distSize, $addSize, $distances, $double, $snapDistance, $HideGolds=false)
+{
+	$pdf->SetFont($pdf->FontStd,'B',8);
+	$pdf->Cell(8, 4 * ($double ? 2 : 1),  $item['rank'], 1, 0, 'R', 0);
+	$pdf->SetFont($pdf->FontStd,'',7);
+	$pdf->Cell(7, 4 * ($double ? 2 : 1),  ($item['session'] . "- " . $item['target']), 'TLB', 0, 'R', 0);
+	$pdf->SetFont($pdf->FontStd,'',7);
+	//Per gare tipo "internazionali" mette qui le colonne "nascoste"
+	$pdf->Cell(37+ $addSize + ($pdf->HideCols ? 8:0) , 4 * ($double ? 2 : 1),  $item['athlete'], 'TRB', 0, 'L', 0);
+   	if(!$pdf->HideCols)
+   	{
+		$pdf->SetFont($pdf->FontStd,'',6);
+		$pdf->Cell(4, 4 * ($double ? 2 : 1), ($item['class']!=$item['ageclass'] ?  $item['ageclass'] : ''), 'TLB', 0, 'C', 0);
+		$pdf->Cell(4, 4 * ($double ? 2 : 1),  ($item['subclass']), 'TBR', 0, 'C', 0);
+   	}
+	$pdf->SetFont($pdf->FontStd,'',7);
+	$pdf->Cell(8, 4 * ($double ? 2 : 1),  $item['countryCode'], 'LTB', 0, 'L', 0);
+	$pdf->Cell(42 + $addSize, 4 * ($double ? 2 : 1),  $item['countryName'], 'RTB', 0, 'L', 0);
+	$pdf->SetFont($pdf->FontFix,'',7);
+	if(!$double)
+	{
+		for($i=1; $i<=$distances;$i++)
+		{
+			list($rank,$score)=explode('|',$item['dist_' . $i]);
+			if($snapDistance==0)
+			{
+				$cellContent=str_pad($score,3," ",STR_PAD_LEFT);
+				if($rank) $cellContent.="/" . str_pad($rank,2," ",STR_PAD_LEFT);
+				$pdf->Cell($distSize, 4,  $cellContent, 1, 0, 'R', 0);
+			}
+			elseif($i<$snapDistance)
+			{
+				$pdf->Cell($distSize/2, 4, str_pad($score,3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, "", 'TBR', 0, 'R', 0);
+			}
+			else if($i==$snapDistance)
+			{
+				list($rankS,$scoreS)=explode('|',$item['dist_Snap']);
+				$pdf->Cell($distSize/2, 4, str_pad($scoreS,3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, ($scoreS != $score ? "(" . str_pad($score,3," ",STR_PAD_LEFT) . ")" : "     "), 'TBR', 0, 'R', 0);
+			}
+			else
+			{
+				$pdf->Cell($distSize/2, 4, str_pad("0",3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, ($score!=0 ? "(" . str_pad($score,3," ",STR_PAD_LEFT) . ")" : "     "), 'TBR', 0, 'R', 0);
+			}
+		}
+	}
+	else
+	{
+		$TmpX=$pdf->GetX();
+		$TmpY=$pdf->GetY();
+		$RunningTotal=0;
+		for($i=1; $i<=$distances/2;$i++)
+		{
+			list($rank,$score)=explode('|',$item['dist_' . $i]);
+			if($snapDistance==0)
+			{
+				$cellContent=str_pad($score,3," ",STR_PAD_LEFT);
+				if($rank) $cellContent.="/" . str_pad($rank,2," ",STR_PAD_LEFT);
+				$pdf->Cell($distSize, 4,  $cellContent, 1, 0, 'R', 0);
+			}
+			elseif($i<$snapDistance)
+			{
+				$pdf->Cell($distSize/2, 4, str_pad($score,3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, "", 'TBR', 0, 'R', 0);
+			}
+			else if($i==$snapDistance)
+			{
+				list($rankS,$scoreS)=explode('|',$item['dist_Snap']);
+				$pdf->Cell($distSize/2, 4, str_pad($scoreS,3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, ($scoreS != $score ? "(" . str_pad($score,3," ",STR_PAD_LEFT) . ")" : "     "), 'TBR', 0, 'R', 0);
+			}
+			else
+			{
+				$pdf->Cell($distSize/2, 4, str_pad("0",3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, ($score!=0 ? "(" . str_pad($score,3," ",STR_PAD_LEFT) . ")" : "     "), 'TBR', 0, 'R', 0);
+			}
+			if(is_numeric($score)) $RunningTotal += $score;
+		}
+		$pdf->Cell($distSize, 4, is_numeric($RunningTotal) ? number_format($RunningTotal,0,'',$pdf->NumberThousandsSeparator) : '', 1, 0, 'R', 0);
+		$pdf->setXY($TmpX,$TmpY+4);
+		$RunningTotal=0;
+		for($i; $i<=$distances;$i++)
+		{
+			list($rank,$score)=explode('|',$item['dist_' . $i]);
+			if($snapDistance==0)
+			{
+				$cellContent=str_pad($score,3," ",STR_PAD_LEFT);
+				if($rank) $cellContent.="/" . str_pad($rank,2," ",STR_PAD_LEFT);
+				$pdf->Cell($distSize, 4,  $cellContent, 1, 0, 'R', 0);
+			}
+			elseif($i<$snapDistance)
+			{
+				$pdf->Cell($distSize/2, 4, str_pad($score,3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, "", 'TBR', 0, 'R', 0);
+			}
+			else if($i==$snapDistance)
+			{
+				list($rankS,$scoreS)=explode('|',$item['dist_Snap']);
+				$pdf->Cell($distSize/2, 4, str_pad($scoreS,3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, ($scoreS != $score ? "(" . str_pad($score,3," ",STR_PAD_LEFT) . ")" : "     "), 'TBR', 0, 'R', 0);
+			}
+			else
+			{
+				$pdf->Cell($distSize/2, 4, str_pad("0",3," ",STR_PAD_LEFT), 'TBL', 0, 'R', 0);
+				$pdf->Cell($distSize/2, 4, ($score!=0 ? "(" . str_pad($score,3," ",STR_PAD_LEFT) . ")" : "     "), 'TBR', 0, 'R', 0);
+			}
+			if(is_numeric($score)) $RunningTotal += $score;
+		}
+		$pdf->Cell($distSize, 4, is_numeric($RunningTotal) ? number_format($RunningTotal,0,'',$pdf->NumberThousandsSeparator) : '', 1, 0, 'R', 0);
+		$pdf->setXY($pdf->GetX(),$TmpY);
+	}
+  	$pdf->SetFont($pdf->FontFix,'B',8);
+  	if($snapDistance==0) {
+		$pdf->Cell(8, 4 * ($double ? 2 : 1), is_numeric($item['score']) ? number_format($item['hits'] - $item['miss'], 0, '', $pdf->NumberThousandsSeparator) : '', 1, 0, 'R', 0);
+		$pdf->Cell(12, 4 * ($double ? 2 : 1), is_numeric($item['score']) ? number_format($item['score'], 0, '', $pdf->NumberThousandsSeparator) : '', 1, 0, 'R', 0);
+	} else {
+		$pdf->Cell(6, 4 * ($double ? 2 : 1), number_format($item['scoreSnap'],0,'',$pdf->NumberThousandsSeparator), 'TBL', 0, 'R', 0);
+		$pdf->SetFont($pdf->FontFix,'',7);
+		$pdf->Cell(6, 4 * ($double ? 2 : 1), ($item['score']==$item['scoreSnap'] ? '' : '(' . number_format($item['score'],0,'',$pdf->NumberThousandsSeparator) . ')'), 'TBR', 0, 'R', 0);
+	}
+	$pdf->SetFont($pdf->FontFix,'',8);
+  	if(!$HideGolds)
+  	{
+		if($snapDistance==0)
+			$pdf->Cell(10, 4 * ($double ? 2 : 1), $item['gold'], 1, 0, 'R', 0);
+		else
+		{
+			$pdf->Cell(5, 4 * ($double ? 2 : 1), number_format($item['goldSnap'],0,'',$pdf->NumberThousandsSeparator), 'TBL', 0, 'R', 0);
+			$pdf->SetFont($pdf->FontFix,'',7);
+			$pdf->Cell(5, 4 * ($double ? 2 : 1), ($item['gold']==$item['goldSnap'] ? '' : '(' . number_format($item['gold'],0,'',$pdf->NumberThousandsSeparator) . ')'), 'TBR', 0, 'R', 0);
+		}
+  	}
+	$pdf->SetFont($pdf->FontFix,'',8);
+	if($snapDistance==0)
+		$pdf->Cell(10, 4 * ($double ? 2 : 1), $item['xnine'], 1, 1, 'R', 0);
+	else
+	{
+		$pdf->Cell(5, 4 * ($double ? 2 : 1), number_format($item['xnineSnap'],0,'',$pdf->NumberThousandsSeparator), 'TBL', 0, 'R', 0);
+		$pdf->SetFont($pdf->FontFix,'',7);
+		$pdf->Cell(5, 4 * ($double ? 2 : 1), ($item['xnine']==$item['xnineSnap'] ? '' : '(' . number_format($item['xnine'],0,'',$pdf->NumberThousandsSeparator) . ')'), 'TBR', 1, 'R', 0);
+	}
+
+}
+
+function writeGroupHeaderPrnIndividual($pdf, $section, $distSize, $addSize, $distances, $double, $follows=false, $HideGolds=false)
+{
+	if (!empty($section['sesArrows']))
+	{
+		$pdf->SetFont($pdf->FontStd,'B',10);
+		$tmpHeader="";
+		foreach($section['sesArrows'] as $k=>$v)
+		{
+			if($v)
+			{
+				if(strlen($tmpHeader)!=0)
+					$tmpHeader .= " - ";
+				$tmpHeader .= $v;
+				if(count($section['sesArrows'])!=1)
+					$tmpHeader .= " (" . $section['fields']['session'] . ": " . $k  . ")";
+			}
+
+		}
+		if(strlen($tmpHeader)!=0)
+			$pdf->Cell(190, 7.5, str_replace("<br/>"," ",$tmpHeader), 0, 1, 'R', 0);
+	}
+	$pdf->SetFont($pdf->FontStd,'B',10);
+	$pdf->Cell(190, 6,  $section['descr'], 1, 1, 'C', 1);
+	if($follows)
+	{
+		$pdf->SetXY(170,$pdf->GetY()-6);
+	   	$pdf->SetFont($pdf->FontStd,'',6);
+		$pdf->Cell(30, 6,  $pdf->Continue, 0, 1, 'R', 0);
+	}
+   	$pdf->SetFont($pdf->FontStd,'B',7);
+	$pdf->Cell(8, 4 * ($double ? 2 : 1),  $section['fields']['rank'], 1, 0, 'C', 1);
+
+	$pdf->Cell(44 + $addSize + ($pdf->HideCols ? 8:0), 4 * ($double ? 2 : 1),  $section['fields']['athlete'], 1, 0, 'L', 1);
+	if(!$pdf->HideCols)
+		$pdf->Cell(8, 4 * ($double ? 2 : 1),  $section['fields']['subclass'], 1, 0, 'C', 1);
+	$pdf->Cell(50 + $addSize, 4 * ($double ? 2 : 1),  $section['fields']['countryName'], 1, 0, 'L', 1);
+	if(!$double)
+	{
+		for($i=1; $i<=$distances;$i++)
+		$pdf->Cell($distSize, 4,  $section['fields']['dist_'. $i], 1, 0, 'C', 1);
+	}
+	else
+	{
+		$TmpX=$pdf->GetX();
+		$TmpY=$pdf->GetY();
+		for($i=1; $i<=$distances/2;$i++)
+			$pdf->Cell($distSize, 4, $section['fields']['dist_'. $i], 1, 0, 'C', 1);
+		$pdf->Cell($distSize, 4, $pdf->TotalShort, 1, 0, 'C', 1);
+		$pdf->setXY($TmpX,$TmpY+4);
+		for($i; $i<=$distances;$i++)
+			$pdf->Cell($distSize, 4, $section['fields']['dist_'. $i], 1, 0, 'C', 1);
+		$pdf->Cell($distSize, 4, $pdf->TotalShort, 1, 0, 'C', 1);
+		$pdf->setXY($pdf->GetX(),$TmpY);
+	}
+	$pdf->Cell(8, 4 * ($double ? 2 : 1),  'Hon.', 1, 0, 'C', 1);
+	$pdf->Cell(12, 4 * ($double ? 2 : 1),  $section['fields']['score'], 1, 0, 'C', 1);
+
+	if(!$HideGolds)
+		$pdf->Cell(10, 4 * ($double ? 2 : 1),  $section['fields']['gold'], 1, 0, 'C', 1);
+	$pdf->Cell(10, 4 * ($double ? 2 : 1),  $section['fields']['xnine'], 1, 1, 'C', 1);
+	$pdf->SetFont($pdf->FontStd,'',1);
+	$pdf->Cell(190, 0.5,  '', 1, 1, 'C', 0);
+}
+
+?>
diff --git a/src/Modules/Sets/FR/pdf/chunks/QualIndividual_50.inc.php b/src/Modules/Sets/FR/pdf/chunks/QualIndividual_50.inc.php
new file mode 100644
index 00000000..ad86be4d
--- /dev/null
+++ b/src/Modules/Sets/FR/pdf/chunks/QualIndividual_50.inc.php
@@ -0,0 +1,64 @@
+<?php
+
+//error_reporting(E_ALL);
+
+require_once(dirname(__FILE__).'/chunk-lib.php');
+
+//$pdf->HideCols=$PdfData->HideCols;
+$pdf->NumberThousandsSeparator=$PdfData->NumberThousandsSeparator;
+$pdf->NumberDecimalSeparator=$PdfData->NumberDecimalSeparator;
+$pdf->Continue=$PdfData->Continue;
+$pdf->TotalShort=$PdfData->TotalShort;
+$pdf->ShotOffShort=$PdfData->ShotOffShort;
+$pdf->CoinTossShort=$PdfData->CoinTossShort;
+$pdf->Beursault=1;
+
+if(count($rankData['sections']))
+{
+	$DistSize = 11;
+	$AddSize=0;
+	$pdf->setDocUpdate($rankData['meta']['lastUpdate']);
+	foreach($rankData['sections'] as $section)
+	{
+		//Calcolo Le Misure per i Campi
+		if($section['meta']['numDist']>=4 && !$rankData['meta']['double'])
+			$DistSize = 36/$section['meta']['numDist'];
+		elseif($section['meta']['numDist']>=4 && $rankData['meta']['double'])
+			$DistSize = 36/(($section['meta']['numDist']/2)+1);
+		else
+			$AddSize = (36-($section['meta']['numDist']*11))/2;
+
+		//Verifico se l'header e qualche riga ci stanno nella stessa pagina altrimenti salto alla prosisma
+		if(!$pdf->SamePage(15+(strlen($section['meta']['printHeader']) ? 8:0)+($section['meta']['sesArrows'] ? 8:0)))
+			$pdf->AddPage();
+		writeGroupHeaderPrnIndividualAbs($pdf, $section['meta'], $DistSize, $AddSize, $section['meta']['running'], $section['meta']['numDist'], $rankData['meta']['double'], false);
+		$EndQualified = ($section['meta']['qualifiedNo']==0);
+		foreach($section['items'] as $item)
+		{
+			if($EndQualified===false && $item['rank']>$section['meta']['qualifiedNo'])
+			{
+				$pdf->SetFont($pdf->FontStd,'',1);
+				$pdf->Cell(190, 1,  '', 1, 1, 'C', 1);
+				if (!$pdf->SamePage(4* ($rankData['meta']['double'] ? 2 : 1)))
+				{
+					$pdf->AddPage();
+					writeGroupHeaderPrnIndividualAbs($pdf, $section['meta'], $DistSize, $AddSize, $section['meta']['running'], $section['meta']['numDist'], $rankData['meta']['double'], true);
+				}
+				$EndQualified = true;
+			}
+
+			if (!$pdf->SamePage(4* ($rankData['meta']['double'] ? 2 : 1)))
+			{
+				$pdf->AddPage();
+				writeGroupHeaderPrnIndividualAbs($pdf, $section['meta'], $DistSize, $AddSize, $section['meta']['running'], $section['meta']['numDist'], $rankData['meta']['double'], true);
+			}
+			writeDataRowPrnIndividualAbs($pdf, $item, $DistSize, $AddSize, $section['meta']['running'],$section['meta']['numDist'], $rankData['meta']['double'], ($PdfData->family=='Snapshot' ? $section['meta']['snapDistance']: 0));
+
+		}
+		$pdf->SetY($pdf->GetY()+5);
+	}
+	if(!isset($isCompleteResultBook))
+		$pdf->DrawShootOffLegend();
+}
+
+?>
diff --git a/src/Modules/Sets/FR/pdf/chunks/chunk-lib.php b/src/Modules/Sets/FR/pdf/chunks/chunk-lib.php
index ce81381e..a505d516 100644
--- a/src/Modules/Sets/FR/pdf/chunks/chunk-lib.php
+++ b/src/Modules/Sets/FR/pdf/chunks/chunk-lib.php
@@ -58,8 +58,10 @@ function writeGroupHeaderPrnIndividualAbs(&$pdf, $section, $distSize, $addSize,
 		$pdf->Cell($distSize, 4, $pdf->TotalShort, 1, 0, 'C', 1);
 		$pdf->setXY($pdf->GetX(),$TmpY);
 	}
-	if(!$running)
-		$pdf->Cell(12, 4 * ($double ? 2 : 1),  $section['fields']['score'], 1, 0, 'C', 1);
+	if(!$running) {
+        $pdf->Cell(8, 4 * ($double ? 2 : 1),  'Hon.', 1, 0, 'C', 1);
+        $pdf->Cell(12, 4 * ($double ? 2 : 1),  $section['fields']['score'], 1, 0, 'C', 1);
+    }
 	if($pdf->ShowTens)
 		$pdf->Cell(6, 4 * ($double ? 2 : 1),  $section['fields']['gold'], 1, 0, 'C', 1);
 	$pdf->Cell(6 * ($pdf->ShowTens?1:2), 4 * ($double ? 2 : 1),  $section['fields']['xnine'], 1, 0, 'C', 1);
@@ -190,10 +192,10 @@ function writeDataRowPrnIndividualAbs(&$pdf, $item, $distSize, $addSize, $runnin
 	$pdf->SetFont($pdf->FontFix,'B',$pdf->FontSizeLines);
 	if(!$running)
 	{
-		if($snapDistance==0)
-			$pdf->Cell(12, 4 * ($double ? 2 : 1), number_format($item['score'],0,'',$pdf->NumberThousandsSeparator), $border.'LR', 0, 'R', 0);
-		else
-		{
+		if($snapDistance==0) {
+            $pdf->Cell(8, 4 * ($double ? 2 : 1), number_format($item['hits']-$item['miss'], 0, '', $pdf->NumberThousandsSeparator), $border . 'LR', 0, 'R', 0);
+            $pdf->Cell(12, 4 * ($double ? 2 : 1), number_format($item['score'], 0, '', $pdf->NumberThousandsSeparator), $border . 'LR', 0, 'R', 0);
+        } else {
 			$pdf->Cell(6, 4 * ($double ? 2 : 1), number_format($item['scoreSnap'],0,'',$pdf->NumberThousandsSeparator), $border.'L', 0, 'R', 0);
 			$pdf->SetFont($pdf->FontFix,'',$pdf->FontSizeHead);
 			$pdf->Cell(6, 4 * ($double ? 2 : 1), ($item['score']==$item['scoreSnap'] ? '' : '(' . number_format($item['score'],0,'',$pdf->NumberThousandsSeparator) . ')'), $border.'R', 0, 'R', 0);
@@ -237,6 +239,8 @@ function writeDataRowPrnIndividualAbs(&$pdf, $item, $distSize, $addSize, $runnin
 
 				}
 				$pdf->Cell(8, 4 * ($double ? 2 : 1),  ($pdf->ShotOffShort . $tmpArr), $border.'LR', 1, 'L', 1);
+			} elseif(!empty($item['tiebreakDecoded'])) {
+				$pdf->Cell(8, 4 * ($double ? 2 : 1),  'T.'.$item['tiebreakDecoded'], $border.'LR', 1, 'L', 1);
 			} elseif(!empty($item['ct']) &&  $item['ct']>1) {
 				$pdf->Cell(8, 4 * ($double ? 2 : 1),  $pdf->CoinTossShort, $border.'LR', 1, 'L', 0);
 			} else {
diff --git a/src/Modules/Sets/IS/Setup_Target.php b/src/Modules/Sets/IS/Setup_Target.php
index b8377a7b..e1843fb0 100644
--- a/src/Modules/Sets/IS/Setup_Target.php
+++ b/src/Modules/Sets/IS/Setup_Target.php
@@ -22,20 +22,20 @@
 	//Sveigbogi
 	CreateDistanceNew($TourId, $TourType, 'RU14_', array(array('20m-1',20), array('20m-2',20)));
 	CreateDistanceNew($TourId, $TourType, 'RU16_', array(array('40m-1',40), array('40m-2',40)));
-	CreateDistanceNew($TourId, $TourType, 'RU18_', array(array('50m-1',50), array('50m-2',50)));
-	CreateDistanceNew($TourId, $TourType, 'RU21_', array(array('60m-1',60), array('60m-2',60)));
+	CreateDistanceNew($TourId, $TourType, 'RU18_', array(array('60m-1',60), array('60m-2',60)));
+	CreateDistanceNew($TourId, $TourType, 'RU21_', array(array('70m-1',70), array('70m-2',70)));
 	CreateDistanceNew($TourId, $TourType, 'R3_', array(array('70m-1',70), array('70m-2',70)));
 	CreateDistanceNew($TourId, $TourType, 'R4_', array(array('70m-1',70), array('70m-2',70)));
 	CreateDistanceNew($TourId, $TourType, 'R5_', array(array('60m-1',60), array('60m-2',60)));
 	CreateDistanceNew($TourId, $TourType, 'R6_', array(array('60m-1',60), array('60m-2',60)));
 	CreateDistanceNew($TourId, $TourType, 'R7_', array(array('60m-1',60), array('60m-2',60)));
 	CreateDistanceNew($TourId, $TourType, 'R_', array(array('70m-1',70), array('70m-2',70)));
-	CreateDistanceNew($TourId, $TourType, 'RA_', array(array('40m-1',40), array('40m-2',40)));
+	CreateDistanceNew($TourId, $TourType, 'RA_', array(array('50m-1',50), array('50m-2',50)));
 	
 	//Trissubogi
 	CreateDistanceNew($TourId, $TourType, 'CU14_', array(array('20m-1',20), array('20m-2',20)));
-	CreateDistanceNew($TourId, $TourType, 'CU16_', array(array('30m-1',30), array('30m-2',30)));
-	CreateDistanceNew($TourId, $TourType, 'CU18_', array(array('40m-1',50), array('40m-2',50)));
+	CreateDistanceNew($TourId, $TourType, 'CU16_', array(array('40m-1',40), array('40m-2',40)));
+	CreateDistanceNew($TourId, $TourType, 'CU18_', array(array('50m-1',50), array('50m-2',50)));
 	CreateDistanceNew($TourId, $TourType, 'CU21_', array(array('50m-1',50), array('50m-2',50)));
 	CreateDistanceNew($TourId, $TourType, 'C3_', array(array('50m-1',50), array('50m-2',50)));
 	CreateDistanceNew($TourId, $TourType, 'C4_', array(array('50m-1',50), array('50m-2',50)));
@@ -160,7 +160,7 @@
         CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R5_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R6_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R7_', '1', 1, 40, 1, 40);
-		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'RA_', '1', 1, 40, 1, 40);		
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'RA_', '1', 1, 60, 1, 60);		
 		
 		// optional Compound - valmöguleika skífur fyrir trissuboga
         CreateTargetFace($TourId, $i++, '~40cm (6-10 small-ten)', 'C_', '', 4, 40, 4, 40);
@@ -178,7 +178,7 @@
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C5_', '1', 3, 40, 3, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C6_', '1', 3, 40, 3, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C7_', '1', 3, 40, 3, 40);
-		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'CA_', '1', 3, 40, 3, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10 small-ten)', 'CA_', '1', 3, 60, 3, 60);
 		
         // optional Barebow - valmöguleika skífur fyrir berboga
 		CreateTargetFace($TourId, $i++, '~40cm (6-10)', 'B_', '', 2, 40, 2, 40);
@@ -196,7 +196,7 @@
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B5_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B6_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B7_', '1', 1, 40, 1, 40);
-		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'BA_', '1', 1, 40, 1, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'BA_', '1', 1, 60, 1, 60);
 		
 		// optional Longbow - valmöguleika skífur fyrir langboga
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'L_', '', 2, 60, 2, 60);
@@ -222,16 +222,19 @@
         CreateTargetFace($TourId, $i++, '~40cm (6-10)', 'R%', '', 2, 40, 2, 40);
 		// Recurve - Sveigboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R%', '1', 1, 40, 1, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'RA_', '1', 1, 60, 1, 60);
 		
 		// optional Compound - valmöguleika skífur fyrir trissuboga
 		CreateTargetFace($TourId, $i++, '~40cm (6-10 small-ten)', 'C%', '', 4, 40, 4, 40);
 		// Compound - Trissuboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C%', '1', 3, 40, 3, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10 small-ten)', 'CA_', '1', 3, 60, 3, 60);
 		
 		// optional Barebow - valmöguleika skífur fyrir berboga
         CreateTargetFace($TourId, $i++, '~40cm (6-10)', 'B%', '', 2, 40, 2, 40);
         // Barebow - Berboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B%', '1', 1, 40, 1, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'BA_', '1', 1, 60, 1, 60);
 		
 		// optional Longbow - valmöguleika skífur fyrir langboga
         CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'L%', '', 2, 60, 2, 60);
@@ -243,16 +246,19 @@
         CreateTargetFace($TourId, $i++, '~40cm (6-10)', 'R%', '', 2, 40, 2, 40);
 		// Recurve - Sveigboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R%', '1', 1, 40, 1, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'RA_', '1', 1, 60, 1, 60);
 		
 		// optional Compound - valmöguleika skífur fyrir trissuboga
 		CreateTargetFace($TourId, $i++, '~40cm (6-10 small-ten)', 'C%', '', 4, 40, 4, 40);
 		// Compound - Trissuboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C%', '1', 3, 40, 3, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10 small-ten)', 'CA_', '1', 3, 60, 3, 60);
 		
 		// optional Barebow - valmöguleika skífur fyrir berboga
 		CreateTargetFace($TourId, $i++, '~40cm (6-10)', 'B%', '', 2, 40, 2, 40);
         // Barebow - Berboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B%', '1', 1, 40, 1, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'BA_', '1', 1, 60, 1, 60);
 		
 		// optional Longbow - valmöguleika skífur fyrir langboga
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'L%', '', 2, 60, 2, 60);
@@ -271,6 +277,7 @@
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'RU18_', '', 2, 60, 2, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'RU16_', '', 2, 60, 2, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'RU14_', '', 2, 60, 2, 60);
+		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'RA_', '', 2, 60, 2, 60);
 		
 		// Compound - Trissuboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'CU21_', '1', 3, 40, 3, 40);
@@ -282,6 +289,7 @@
 		CreateTargetFace($TourId, $i++, '~60cm (6-10 small-ten)', 'CU18_', '', 4, 60, 4, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (6-10 small-ten)', 'CU16_', '', 4, 60, 4, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (6-10 small-ten)', 'CU14_', '', 4, 60, 4, 60);
+		CreateTargetFace($TourId, $i++, '~60cm (6-10 small-ten)', 'CA_', '', 4, 60, 4, 60);
 		
 		// Barebow - Berboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'BU21_', '1', 1, 40, 1, 40);
@@ -293,6 +301,7 @@
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'BU18_', '', 2, 60, 2, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'BU16_', '', 2, 60, 2, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'BU14_', '', 2, 60, 2, 60);
+		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'BA_', '', 2, 60, 2, 60);
 		
 		// Longbow - Langboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'LU21_', '1', 1, 60, 1, 60);
@@ -304,6 +313,7 @@
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'LU18_', '', 2, 60, 2, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'LU16_', '', 2, 60, 2, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'LU14_', '', 2, 60, 2, 60);
+		CreateTargetFace($TourId, $i++, '~60cm (6-10)', 'LA_', '', 2, 60, 2, 60);
 		}
 		if ($SubRule==5) {
 		// Recurve - Sveigboga skífur standard undankeppni
@@ -312,6 +322,7 @@
         CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R5_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R6_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R7_', '1', 1, 40, 1, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'RA_', '1', 1, 60, 1, 60);
 		
 		// Compound - Trissuboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C3_', '1', 3, 40, 3, 40);
@@ -319,6 +330,7 @@
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C5_', '1', 3, 40, 3, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C6_', '1', 3, 40, 3, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C7_', '1', 3, 40, 3, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10 small-ten)', 'CA_', '1', 3, 60, 3, 60);
 		
 		// Barebow - Berboga skífur standard undankeppni
         CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B3_', '1', 1, 40, 1, 40);
@@ -326,6 +338,7 @@
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B5_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B6_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B7_', '1', 1, 40, 1, 40);	
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'BA_', '1', 1, 60, 1, 60);	
 		
 		// Longbow - Langboga skífur standard undankeppni
         CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'L3_', '1', 1, 60, 1, 60);
@@ -333,6 +346,7 @@
 		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'L5_', '1', 1, 60, 1, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'L6_', '1', 1, 60, 1, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'L7_', '1', 1, 60, 1, 60);	
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'LA_', '1', 1, 60, 1, 60);	
 		}
         if ($SubRule==6) { //Allir flokkar Unisex
 
@@ -347,7 +361,7 @@
         CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R5_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R6_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'R7_', '1', 1, 40, 1, 40);
-		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'RA_', '1', 1, 40, 1, 40);		
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'RA_', '1', 1, 60, 1, 60);		
 		
 		// Compound - Trissuboga skífur standard undankeppni
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C_', '1', 3, 40, 3, 40);
@@ -360,7 +374,7 @@
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C5_', '1', 3, 40, 3, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C6_', '1', 3, 40, 3, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'C7_', '1', 3, 40, 3, 40);
-		CreateTargetFace($TourId, $i++, '~40cm (1-10 small-ten)', 'CA_', '1', 3, 40, 3, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10 small-ten)', 'CA_', '1', 3, 60, 3, 60);
 		
 		// Barebow - Berboga skífur standard undankeppni
         CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B_', '1', 1, 40, 1, 40);
@@ -373,7 +387,7 @@
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B5_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B6_', '1', 1, 40, 1, 40);
 		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'B7_', '1', 1, 40, 1, 40);
-		CreateTargetFace($TourId, $i++, '~40cm (1-10)', 'BA_', '1', 1, 40, 1, 40);
+		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'BA_', '1', 1, 60, 1, 60);
 		
 		// Longbow - Langboga skífur standard undankeppni
         CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'L_', '1', 1, 60, 1, 60);
@@ -387,7 +401,6 @@
 		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'L6_', '1', 1, 60, 1, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'L7_', '1', 1, 60, 1, 60);
 		CreateTargetFace($TourId, $i++, '~60cm (1-10)', 'LA_', '1', 1, 60, 1, 60);
-		
 		}
 
 		
diff --git a/src/Modules/Sets/IS/lib.php b/src/Modules/Sets/IS/lib.php
index b6ab2318..73ff58f7 100644
--- a/src/Modules/Sets/IS/lib.php
+++ b/src/Modules/Sets/IS/lib.php
@@ -49,9 +49,9 @@ function CreateStandardClasses($TourId, $SubRule, $Type) { //Aldursflokkar og ky
 		CreateClass($TourId, $i++, 70, 99, 0, '7M', '3M,4W,5M,6M,7M,M,AM,3U,4U,5U,6U,7U,U,AU', '70+ Karla/ 70+ Men', 1, '');
         CreateClass($TourId, $i++, 70, 99, 1, '7W', '3W,4W,5W,6W,7W,W,AW,3U,4U,5U,6U,7U,U,AU', '70+ Kvenna/ 70+ Women', 1, '');
 		CreateClass($TourId, $i++, 70, 99, -1, '7U', '3U,4U,5U,6U,7U,U,AU', '70+  Allir/ 70+ Unisex');
-		CreateClass($TourId, $i++, 99, 100, 0, 'AM', 'AM,AU', 'Áhugamannaflokkur Karla', 1, '');
-        CreateClass($TourId, $i++, 99, 100, 1, 'AW', 'AW,AU', 'Áhugamannaflokkur Kvenna', 1, '');
-		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamannaflokkur Unisex');
+		CreateClass($TourId, $i++, 99, 100, 0, 'AM', 'AM,AU', 'Áhugamenn/Byrjendur Karla', 1, '');
+        CreateClass($TourId, $i++, 99, 100, 1, 'AW', 'AW,AU', 'Áhugamenn/Byrjendur Kvenna', 1, '');
+		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamenn/Byrjendur Unisex');
 		}
 
 	if ($SubRule==2) { // "Only Adult Classes" Bara opinn flokkur en skilgreindir aldursflokkar fyrir úrlistakerfi, COMPLETE með kynsegin - Breytt úr JM í U21M
@@ -85,75 +85,84 @@ function CreateStandardClasses($TourId, $SubRule, $Type) { //Aldursflokkar og ky
 		CreateClass($TourId, $i++, 70, 99, 0, '7M', 'M,AM,U,AU', '70+ Karla/ 70+ Men', 1, '');
         CreateClass($TourId, $i++, 70, 99, 1, '7W', 'W,AW,U,AU', '70+ Kvenna/ 70+ Women', 1, '');
 		CreateClass($TourId, $i++, 70, 99, -1, '7U', 'U,AU', '70+ Allir/ 70+ Unisex');
-		CreateClass($TourId, $i++, 99, 100, 0, 'AM', 'AM,AU', 'Áhugamannaflokkur Karla', 1, '');
-        CreateClass($TourId, $i++, 99, 100, 1, 'AW', 'AW,AU', 'Áhugamannaflokkur Kvenna', 1, '');
-		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamannaflokkur Unisex');
+		CreateClass($TourId, $i++, 99, 100, 0, 'AM', 'AM,AU', 'Áhugamenn/Byrjendur Karla', 1, '');
+        CreateClass($TourId, $i++, 99, 100, 1, 'AW', 'AW,AU', 'Áhugamenn/Byrjendur Kvenna', 1, '');
+		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamenn/Byrjendur Unisex');
 		}
 
     if ($SubRule==3) { // "All-in-one class" UNISEX/Bikarmót bara opinn flokkur en skilgreindir aldursflokkar fyrir úrslitakerfi, COMPLETE - Breytt úr JM í U21M
-        CreateClass($TourId, $i++, 21, 29, 0, 'M', 'U', 'Meistaraflokkur Karla/ Men', 1, '');
-		CreateClass($TourId, $i++, 21, 29, 1, 'W', 'U', 'Meistaraflokkur Kvenna/ Women', 1, '');
-		CreateClass($TourId, $i++, 21, 29, -1, 'U', 'U', 'Meistaraflokkur Allir/ Unisex');
-        CreateClass($TourId, $i++, 18, 20, 0, 'U21M', 'U', 'U21 Karla/ U21 Men', 1, '');
-        CreateClass($TourId, $i++, 18, 20, 1, 'U21W', 'U', 'U21 Kvenna/ U21 Women', 1, '');
-		CreateClass($TourId, $i++, 18, 20, -1, 'U21U', 'U', 'U21 Allir/ U21 Unisex');
-        CreateClass($TourId, $i++, 16, 17, 0, 'U18M', 'U', 'U18 Karla/ U18 Men', 1, '');
-        CreateClass($TourId, $i++, 16, 17, 1, 'U18W', 'U', 'U18 Kvenna/ U18 Women', 1, '');
-		CreateClass($TourId, $i++, 16, 17, -1, 'U18U', 'U', 'U18 Allir/ U18 Unisex');
-        CreateClass($TourId, $i++, 14, 15, 0, 'U16M', 'U', 'U16 Karla/ U16 Men', 1, '');
-        CreateClass($TourId, $i++, 14, 15, 1, 'U16W', 'U', 'U16 Kvenna/ U16 Women', 1, '');
-		CreateClass($TourId, $i++, 14, 15, -1, 'U16U', 'U', 'U16 Allir/ U16 Unisex');
-		CreateClass($TourId, $i++, 1, 13, 0, 'U14M', 'U', 'U14 Karla/ U14 Men', 1, '');
-        CreateClass($TourId, $i++, 1, 13, 1, 'U14W', 'U', 'U14 Kvenna/ U14 Women', 1, '');
-		CreateClass($TourId, $i++, 1, 13, -1, 'U14U', 'U', 'U14 Allir/ U14 Unisex');
-		CreateClass($TourId, $i++, 30, 39, 0, '3M', 'U', '30+ Karla/ 30+ Men', 1, '');
-        CreateClass($TourId, $i++, 30, 39, 1, '3W', 'U', '30+ Kvenna/ 30+ Women', 1, '');
-		CreateClass($TourId, $i++, 30, 39, -1, '3U', 'U', '30+ Allir/ 30+ Unisex');
-        CreateClass($TourId, $i++, 40, 49, 0, '4M', 'U', '40+ Karla/ 40+ Men', 1, '');
-        CreateClass($TourId, $i++, 40, 49, 1, '4W', 'U', '40+ Kvenna/ 40+ Women', 1, '');
-		CreateClass($TourId, $i++, 40, 49, -1, '4U', 'U', '40+ Allir/ 40+ Unisex');
-        CreateClass($TourId, $i++, 50, 59, 0, '5M', 'U', '50+ Karla/ 50+ Men-Masters', 1, '');
-        CreateClass($TourId, $i++, 50, 59, 1, '5W', 'U', '50+ Kvenna/ 50+ Women-Masters', 1, '');
-		CreateClass($TourId, $i++, 50, 59, -1, '5U', 'U', '50+ Allir/ 50+ Unisex');
-		CreateClass($TourId, $i++, 60, 69, 0, '6M', 'U', '60+ Karla/ 60+ Men-Veteran', 1, '');
-        CreateClass($TourId, $i++, 60, 69, 1, '6W', 'U', '60+ Kvenna/ 60+ Women-Veteran', 1, '');
-		CreateClass($TourId, $i++, 60, 69, -1, '6U', 'U', '60+ Allir/ 60+ Unisex');
-		CreateClass($TourId, $i++, 70, 99, 0, '7M', 'U', '70+ Karla/ 70+ Men', 1, '');
-        CreateClass($TourId, $i++, 70, 99, 1, '7W', 'U', '70+ Kvenna/ 70+ Women', 1, '');
-		CreateClass($TourId, $i++, 70, 99, -1, '7U', 'U', '70+ Allir/ 70+ Unisex');
+        CreateClass($TourId, $i++, 21, 29, 0, 'M', 'U,AU', 'Meistaraflokkur Karla/ Men', 1, '');
+		CreateClass($TourId, $i++, 21, 29, 1, 'W', 'U,AU', 'Meistaraflokkur Kvenna/ Women', 1, '');
+		CreateClass($TourId, $i++, 21, 29, -1, 'U', 'U,AU', 'Meistaraflokkur Allir/ Unisex');
+        CreateClass($TourId, $i++, 18, 20, 0, 'U21M', 'U,AU', 'U21 Karla/ U21 Men', 1, '');
+        CreateClass($TourId, $i++, 18, 20, 1, 'U21W', 'U,AU', 'U21 Kvenna/ U21 Women', 1, '');
+		CreateClass($TourId, $i++, 18, 20, -1, 'U21U', 'U,AU', 'U21 Allir/ U21 Unisex');
+        CreateClass($TourId, $i++, 16, 17, 0, 'U18M', 'U,AU', 'U18 Karla/ U18 Men', 1, '');
+        CreateClass($TourId, $i++, 16, 17, 1, 'U18W', 'U,AU', 'U18 Kvenna/ U18 Women', 1, '');
+		CreateClass($TourId, $i++, 16, 17, -1, 'U18U', 'U,AU', 'U18 Allir/ U18 Unisex');
+        CreateClass($TourId, $i++, 14, 15, 0, 'U16M', 'U,AU', 'U16 Karla/ U16 Men', 1, '');
+        CreateClass($TourId, $i++, 14, 15, 1, 'U16W', 'U,AU', 'U16 Kvenna/ U16 Women', 1, '');
+		CreateClass($TourId, $i++, 14, 15, -1, 'U16U', 'U,AU', 'U16 Allir/ U16 Unisex');
+		CreateClass($TourId, $i++, 1, 13, 0, 'U14M', 'U,AU', 'U14 Karla/ U14 Men', 1, '');
+        CreateClass($TourId, $i++, 1, 13, 1, 'U14W', 'U,AU', 'U14 Kvenna/ U14 Women', 1, '');
+		CreateClass($TourId, $i++, 1, 13, -1, 'U14U', 'U,AU', 'U14 Allir/ U14 Unisex');
+		CreateClass($TourId, $i++, 30, 39, 0, '3M', 'U,AU', '30+ Karla/ 30+ Men', 1, '');
+        CreateClass($TourId, $i++, 30, 39, 1, '3W', 'U,AU', '30+ Kvenna/ 30+ Women', 1, '');
+		CreateClass($TourId, $i++, 30, 39, -1, '3U', 'U,AU', '30+ Allir/ 30+ Unisex');
+        CreateClass($TourId, $i++, 40, 49, 0, '4M', 'U,AU', '40+ Karla/ 40+ Men', 1, '');
+        CreateClass($TourId, $i++, 40, 49, 1, '4W', 'U,AU', '40+ Kvenna/ 40+ Women', 1, '');
+		CreateClass($TourId, $i++, 40, 49, -1, '4U', 'U,AU', '40+ Allir/ 40+ Unisex');
+        CreateClass($TourId, $i++, 50, 59, 0, '5M', 'U,AU', '50+ Karla/ 50+ Men-Masters', 1, '');
+        CreateClass($TourId, $i++, 50, 59, 1, '5W', 'U,AU', '50+ Kvenna/ 50+ Women-Masters', 1, '');
+		CreateClass($TourId, $i++, 50, 59, -1, '5U', 'U,AU', '50+ Allir/ 50+ Unisex');
+		CreateClass($TourId, $i++, 60, 69, 0, '6M', 'U,AU', '60+ Karla/ 60+ Men-Veteran', 1, '');
+        CreateClass($TourId, $i++, 60, 69, 1, '6W', 'U,AU', '60+ Kvenna/ 60+ Women-Veteran', 1, '');
+		CreateClass($TourId, $i++, 60, 69, -1, '6U', 'U,AU', '60+ Allir/ 60+ Unisex');
+		CreateClass($TourId, $i++, 70, 99, 0, '7M', 'U,AU', '70+ Karla/ 70+ Men', 1, '');
+        CreateClass($TourId, $i++, 70, 99, 1, '7W', 'U,AU', '70+ Kvenna/ 70+ Women', 1, '');
+		CreateClass($TourId, $i++, 70, 99, -1, '7U', 'U,AU', '70+ Allir/ 70+ Unisex');
+		CreateClass($TourId, $i++, 99, 100, 0, 'AM', 'AU', 'Áhugamenn/Byrjendur Karla', 1, '');
+        CreateClass($TourId, $i++, 99, 100, 1, 'AW', 'AU', 'Áhugamenn/Byrjendur Kvenna', 1, '');
+		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamenn/Byrjendur Unisex');
 		}
 	
 	if ($SubRule==4) { // "EVERY CLASSES" Allir aldurflokkar ungmenna UNGMENNADEILDIN COMPLETE með kynsegin - Breytt úr JM í U21M
-		CreateClass($TourId, $i++, 18, 20, 0, 'U21M', 'U21M,U21U', 'U21 Karla/ U21 Men', 1, '');
-        CreateClass($TourId, $i++, 18, 20, 1, 'U21W', 'U21W,U21U', 'U21 Kvenna/ U21 Women', 1, '');
-		CreateClass($TourId, $i++, 18, 20, -1, 'U21U', 'U21U', 'U21 Allir/ U18 Unisex');
-		CreateClass($TourId, $i++, 16, 17, 0, 'U18M', 'U18M,U21M,U18U,U21U', 'U18 Karla/ U18 Men', 1, '');
-        CreateClass($TourId, $i++, 16, 17, 1, 'U18W', 'U18W,U21W,U18U,U21U', 'U18 Kvenna/ U18 Women', 1, '');
-		CreateClass($TourId, $i++, 16, 17, -1, 'U18U', 'U18U,U21U', 'U18 Allir/ U18 Unisex');
-        CreateClass($TourId, $i++, 14, 15, 0, 'U16M', 'U16M,U18M,U21M,U16U,U18U,U21U', 'U16 Karla/ U16 Men', 1, '');
-        CreateClass($TourId, $i++, 14, 15, 1, 'U16W', 'U16W,U18W,U21W,U16U,U18U,U21U', 'U16 Kvenna/ U16 Women', 1, '');
-		CreateClass($TourId, $i++, 14, 15, -1, 'U16U', 'U16U,U18U,U21U', 'U16 Allir/ U16 Unisex');
-		CreateClass($TourId, $i++, 1, 13, 0, 'U14M', 'U14M,U16M,U18M,U21M,U14U,U16U,U18U,U21U', 'U14 Karla/ U14 Men', 1, '');
-        CreateClass($TourId, $i++, 1, 13, 1, 'U14W', 'U14W,U16W,U18W,U21W,U14U,U16U,U18U,U21U', 'U14 Kvenna/ U14 Women', 1, '');
-		CreateClass($TourId, $i++, 1, 13, -1, 'U14U', 'U14U,U16U,U18U,U21U', 'U14 Allir/ U14 Unisex');
+		CreateClass($TourId, $i++, 18, 20, 0, 'U21M', 'U21M,AM,U21U,AU', 'U21 Karla/ U21 Men', 1, '');
+        CreateClass($TourId, $i++, 18, 20, 1, 'U21W', 'U21W,AW,U21U,AU', 'U21 Kvenna/ U21 Women', 1, '');
+		CreateClass($TourId, $i++, 18, 20, -1, 'U21U', 'U21U,AU', 'U21 Allir/ U21 Unisex');
+		CreateClass($TourId, $i++, 16, 17, 0, 'U18M', 'U18M,U21M,AM,U18U,U21U,AU', 'U18 Karla/ U18 Men', 1, '');
+        CreateClass($TourId, $i++, 16, 17, 1, 'U18W', 'U18W,U21W,AW,U18U,U21U,AU', 'U18 Kvenna/ U18 Women', 1, '');
+		CreateClass($TourId, $i++, 16, 17, -1, 'U18U', 'U18U,U21U,AU', 'U18 Allir/ U18 Unisex');
+        CreateClass($TourId, $i++, 14, 15, 0, 'U16M', 'U16M,U18M,U21M,AM,U16U,U18U,U21U,AU', 'U16 Karla/ U16 Men', 1, '');
+        CreateClass($TourId, $i++, 14, 15, 1, 'U16W', 'U16W,U18W,U21W,AW,U16U,U18U,U21U,AU', 'U16 Kvenna/ U16 Women', 1, '');
+		CreateClass($TourId, $i++, 14, 15, -1, 'U16U', 'U16U,U18U,U21U,AU', 'U16 Allir/ U16 Unisex');
+		CreateClass($TourId, $i++, 1, 13, 0, 'U14M', 'U14M,U16M,U18M,U21M,AM,U14U,U16U,U18U,U21U,AU', 'U14 Karla/ U14 Men', 1, '');
+        CreateClass($TourId, $i++, 1, 13, 1, 'U14W', 'U14W,U16W,U18W,U21W,AW,U14U,U16U,U18U,U21U,AU', 'U14 Kvenna/ U14 Women', 1, '');
+		CreateClass($TourId, $i++, 1, 13, -1, 'U14U', 'U14U,U16U,U18U,U21U,AU', 'U14 Allir/ U14 Unisex');
+		CreateClass($TourId, $i++, 99, 100, 0, 'AM', 'AM,AU', 'Áhugamenn/Byrjendur Karla', 1, '');
+        CreateClass($TourId, $i++, 99, 100, 1, 'AW', 'AW,AU', 'Áhugamenn/Byrjendur Kvenna', 1, '');
+		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamenn/Byrjendur Unisex');
 		}
 		
 	if ($SubRule==5) { // "Set Kids classes" Allir aldursflokkar öldunga ÍSLANDSMÓT ÖLDUNGA COMPLETE með kynsegin
-		CreateClass($TourId, $i++, 30, 39, 0, '3M', '3M,3U', '30+ Karla/ 30+ Men', 1, '');
-        CreateClass($TourId, $i++, 30, 39, 1, '3W', '3W,3U', '30+ Kvenna/ 30+ Women', 1, '');
-		CreateClass($TourId, $i++, 30, 39, -1, '3U', '3U', '30+ Allir/ 30+ Unisex');
-        CreateClass($TourId, $i++, 40, 49, 0, '4M', '3M,4M,3U,4U', '40+ Karla/ 40+ Men', 1, '');
-        CreateClass($TourId, $i++, 40, 49, 1, '4W', '3W,4W,3U,4U', '40+ Kvenna/ 40+ Women', 1, '');
-		CreateClass($TourId, $i++, 40, 49, -1, '4U', '3U,4U', '40+ Allir/ 40+ Unisex');
-        CreateClass($TourId, $i++, 50, 59, 0, '5M', '3M,4M,5M,3U,4U,5U', '50+ Karla/ 50+ Men-Masters', 1, '');
-        CreateClass($TourId, $i++, 50, 59, 1, '5W', '3W,4W,5W,3U,4U,5U', '50+ Kvenna/ 50+ Women-Masters', 1, '');
-		CreateClass($TourId, $i++, 50, 59, -1, '5U', '3U,4U,5U', '50+ Allir/ 50+ Unisex');
-		CreateClass($TourId, $i++, 60, 69, 0, '6M', '3M,4M,5M,6M,3U,4U,5U,6U', '60+ Karla/ 60+ Men-Veteran', 1, '');
-        CreateClass($TourId, $i++, 60, 69, 1, '6W', '3W,4W,5W,6W,3U,4U,5U,6U', '60+ Kvenna/ 60+ Women-Veteran', 1, '');
-		CreateClass($TourId, $i++, 60, 69, -1, '6U', '3U,4U,5U,6U', '60+ Allir/ 60+ Unisex');
-		CreateClass($TourId, $i++, 70, 99, 0, '7M', '3M,4M,5M,6M,7M,3U,4U,5U,6U,7U', '70+ Karla/ 70+ Men', 1, '');
-        CreateClass($TourId, $i++, 70, 99, 1, '7W', '3W,4W,5W,6W,7W,3U,4U,5U,6U,7U', '70+ Kvenna/ 70+ Women', 1, '');
-		CreateClass($TourId, $i++, 70, 99, -1, '7U', '3U,4U,5U,6U,7U', '70+ Allir/ 70+ Unisex');
+		CreateClass($TourId, $i++, 30, 39, 0, '3M', '3M,AM,3U,AU', '30+ Karla/ 30+ Men', 1, '');
+        CreateClass($TourId, $i++, 30, 39, 1, '3W', '3W,AW,3U,AU', '30+ Kvenna/ 30+ Women', 1, '');
+		CreateClass($TourId, $i++, 30, 39, -1, '3U', '3U,AU', '30+ Allir/ 30+ Unisex');
+        CreateClass($TourId, $i++, 40, 49, 0, '4M', '3M,4M,AM,3U,4U,AU', '40+ Karla/ 40+ Men', 1, '');
+        CreateClass($TourId, $i++, 40, 49, 1, '4W', '3W,4W,AW,3U,4U,AM', '40+ Kvenna/ 40+ Women', 1, '');
+		CreateClass($TourId, $i++, 40, 49, -1, '4U', '3U,4U,AU', '40+ Allir/ 40+ Unisex');
+        CreateClass($TourId, $i++, 50, 59, 0, '5M', '3M,4M,5M,AM,3U,4U,5U,AU', '50+ Karla/ 50+ Men-Masters', 1, '');
+        CreateClass($TourId, $i++, 50, 59, 1, '5W', '3W,4W,5W,AW,3U,4U,5U,AU', '50+ Kvenna/ 50+ Women-Masters', 1, '');
+		CreateClass($TourId, $i++, 50, 59, -1, '5U', '3U,4U,5U,AU', '50+ Allir/ 50+ Unisex');
+		CreateClass($TourId, $i++, 60, 69, 0, '6M', '3M,4M,5M,6M,AM,3U,4U,5U,6U,AU', '60+ Karla/ 60+ Men-Veteran', 1, '');
+        CreateClass($TourId, $i++, 60, 69, 1, '6W', '3W,4W,5W,6W,AW,3U,4U,5U,6U,AU', '60+ Kvenna/ 60+ Women-Veteran', 1, '');
+		CreateClass($TourId, $i++, 60, 69, -1, '6U', '3U,4U,5U,6U,AU', '60+ Allir/ 60+ Unisex');
+		CreateClass($TourId, $i++, 70, 99, 0, '7M', '3M,4M,5M,6M,7M,AM,3U,4U,5U,6U,7U,AU', '70+ Karla/ 70+ Men', 1, '');
+        CreateClass($TourId, $i++, 70, 99, 1, '7W', '3W,4W,5W,6W,7W,AW,3U,4U,5U,6U,7U,AU', '70+ Kvenna/ 70+ Women', 1, '');
+		CreateClass($TourId, $i++, 70, 99, -1, '7U', '3U,4U,5U,6U,7U,AU', '70+ Allir/ 70+ Unisex');
+		CreateClass($TourId, $i++, 99, 100, 0, 'AM', 'AM,AU', 'Áhugamenn/Byrjendur Karla', 1, '');
+        CreateClass($TourId, $i++, 99, 100, 1, 'AW', 'AW,AU', 'Áhugamenn/Byrjendur Kvenna', 1, '');
+		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamenn/Byrjendur Unisex');
 		}
 
     if ($SubRule==6) { // "All Classes WA 4 Pools" UNISEX allir aldursflokkar og skilgreindir aldursflokkar fyrir úrslitakerfi, COMPLETE - Breytt úr JM í U21M
@@ -167,7 +176,7 @@ function CreateStandardClasses($TourId, $SubRule, $Type) { //Aldursflokkar og ky
 		CreateClass($TourId, $i++, 16, 17, -1, 'U18U', 'U18U,U21U,U,AU', 'U18 Allir/ U18 Unisex');
 		CreateClass($TourId, $i++, 14, 15, -1, 'U16U', 'U16U,U18U,U21U,U,AU', 'U16 Allir/ U16 Unisex');
 		CreateClass($TourId, $i++, 1, 13, -1, 'U14U', 'U14U,U16U,U18U,U21U,U,AU', 'U14 Allir/ U14 Unisex');
-		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamannaflokkur Unisex');
+		CreateClass($TourId, $i++, 99, 100, -1, 'AU', 'AU', 'Áhugamenn/Byrjendur Unisex');
 		}		
 		
 }
@@ -203,7 +212,7 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //
     $TargetSizeCU21=($Outdoor ? 80 : 40);
 	$TargetSizeBU21=($Outdoor ? 122 : 40);
 	$TargetSizeLU21=($Outdoor ? 122 : 60);
-    $DistanceRU21=($Outdoor ? 60 : 18);
+    $DistanceRU21=($Outdoor ? 70 : 18);
     $DistanceCU21=($Outdoor ? 50 : 18);
 	$DistanceBU21=($Outdoor ? 50 : 18);
 	$DistanceLU21=($Outdoor ? 30 : 12);
@@ -217,8 +226,8 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //
     $TargetSizeCU18=($Outdoor ? 80 : 60);
 	$TargetSizeBU18=($Outdoor ? 122 : 60);
 	$TargetSizeLU18=($Outdoor ? 122 : 60);
-    $DistanceRU18=($Outdoor ? 50 : 18);
-    $DistanceCU18=($Outdoor ? 40 : 18);
+    $DistanceRU18=($Outdoor ? 60 : 18);
+    $DistanceCU18=($Outdoor ? 50 : 18);
 	$DistanceBU18=($Outdoor ? 40 : 18);
 	$DistanceLU18=($Outdoor ? 30 : 12);
 
@@ -232,7 +241,7 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //
 	$TargetSizeBU16=($Outdoor ? 122 : 60);
 	$TargetSizeLU16=($Outdoor ? 122 : 60);
     $DistanceRU16=($Outdoor ? 40 : 12);
-    $DistanceCU16=($Outdoor ? 30 : 12);
+    $DistanceCU16=($Outdoor ? 40 : 12);
 	$DistanceBU16=($Outdoor ? 30 : 12);
 	$DistanceLU16=($Outdoor ? 30 : 12);
 	
@@ -325,11 +334,11 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //
     $TargetCA=($Outdoor ? TGT_OUT_5_big10 : TGT_IND_1_small10);
     $TargetBA=($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
 	$TargetLA=($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
-    $TargetSizeRA=($Outdoor ? 122 : 40);
-    $TargetSizeCA=($Outdoor ? 80 : 40);
-    $TargetSizeBA=($Outdoor ? 122 : 40);
-	$TargetSizeLA=($Outdoor ? 122 : 40);
-    $DistanceRA=($Outdoor ? 40 : 12);
+    $TargetSizeRA=($Outdoor ? 122 : 60);
+    $TargetSizeCA=($Outdoor ? 80 : 60);
+    $TargetSizeBA=($Outdoor ? 122 : 60);
+	$TargetSizeLA=($Outdoor ? 122 : 60);
+    $DistanceRA=($Outdoor ? 50 : 12);
     $DistanceCA=($Outdoor ? 30 : 12);
     $DistanceBA=($Outdoor ? 30 : 12);
 	$DistanceLA=($Outdoor ? 30 : 12);
@@ -343,224 +352,289 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //
 	// Einstaklinga útslættir
 	if ($SubRule==1) { // "Championship" Allir aldursflokkar útsláttarkeppni EINSTAKLINGA COMPLETE með kynsegin - Breytt úr RJM í RU21M
 		// Sveigbogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR,  5, 3, 1, 5, 3, 1, 'RM',  'Sveigbogi Karla Meistaraflokkur/ Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR,  5, 3, 1, 5, 3, 1, 'RW',  'Sveigbogi Kvenna Meistaraflokkur/ Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR,  5, 3, 1, 5, 3, 1, 'RU',  'Sveigbogi Allir Meistaraflokkur/ Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21M', 'Sveigbogi U21 Karla/ Recurve U21 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21W', 'Sveigbogi U21 Kvenna/ Recurve U21 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21,  5, 3, 1, 5, 3, 1, 'RU21U', 'Sveigbogi U21 Allir/ Recurve U21 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18M', 'Sveigbogi U18 Karla/ Recurve U18 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18W', 'Sveigbogi U18 Kvenna/ Recurve U18 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18U', 'Sveigbogi U18 Allir/ Recurve U18 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16M', 'Sveigbogi U16 Karla/ Recurve U16 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16W', 'Sveigbogi U16 Kvenna/ Recurve U16 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16U', 'Sveigbogi U16 Allir/ Recurve U16 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14M', 'Sveigbogi U14 Karla/ Recurve U14 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14W', 'Sveigbogi U14 Kvenna/ Recurve U14 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14U', 'Sveigbogi U14 Allir/ Recurve U14 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5M', 'Sveigbogi 50+ Karla/ Recurve 50+ Men', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5W', 'Sveigbogi 50+ Kvenna/ Recurve 50+ Women', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5U', 'Sveigbogi 50+ Allir/ Recurve 50+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);	
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR,  5, 3, 1, 5, 3, 1, 'RM',  'Sveigbogi Karla M.fl/ Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR,  5, 3, 1, 5, 3, 1, 'RW',  'Sveigbogi Kvenna M.fl/ Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR,  5, 3, 1, 5, 3, 1, 'RU',  'Sveigbogi Allir M.fl/ Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21M', 'Sveigbogi Karla U21 Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21W', 'Sveigbogi Kvenna U21 Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21U', 'Sveigbogi Allir U21 Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18M', 'Sveigbogi Karla U18 Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18W', 'Sveigbogi Kvenna U18 Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18U', 'Sveigbogi Allir U18 Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16M', 'Sveigbogi Karla U16 Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16W', 'Sveigbogi Kvenna U16 Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16U', 'Sveigbogi Allir U16 Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14M', 'Sveigbogi Karla U16 Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14W', 'Sveigbogi Kvenna U14 Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14U', 'Sveigbogi Allir U14 Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5M', 'Sveigbogi Karla 50+ Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5W', 'Sveigbogi Kvenna 50+ Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5U', 'Sveigbogi Allir 50+ Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAM', 'Sveigbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAW', 'Sveigbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAU', 'Sveigbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
 	    // Trissubogi
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC,  5, 3, 1, 5, 3, 1, 'CM',  'Trissubogi Karla Meistaraflokkur/ Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC,  5, 3, 1, 5, 3, 1, 'CW',  'Trissubogi Kvenna Meistaraflokkur/ Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC,  5, 3, 1, 5, 3, 1, 'CU',  'Trissubogi Allir Meistaraflokkur/ Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21M', 'Trissubogi U21 Karla/ Compound U21 Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21W', 'Trissubogi U21 Kvenna/ Compound U21 Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21,  5, 3, 1, 5, 3, 1, 'CU21U', 'Trissubogi U21 Allir/ Compound U21 Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18M', 'Trissubogi U18 Karla/ Compound U18 Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18W', 'Trissubogi U18 Kvenna/ Compound U18 Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18U', 'Trissubogi U18 Allir/ Compound U18 Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16M', 'Trissubogi U16 Karla/ Compound U16 Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16W', 'Trissubogi U16 Kvenna/ Compound U16 Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16U', 'Trissubogi U16 Allir/ Compound U16 Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14M', 'Trissubogi U14 Karla/ Compound U14 Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14W', 'Trissubogi U14 Kvenna/ Compound U14 Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14U', 'Trissubogi U14 Allir/ Compound U14 Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5M', 'Trissubogi 50+ Karla/ Compound 50+ Men', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5W', 'Trissubogi 50+ Kvenna/ Compound 50+ Women', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5U', 'Trissubogi 50+ Allir/ Compound 50+ Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);	
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC,  5, 3, 1, 5, 3, 1, 'CM',  'Trissubogi Karla M.fl/ Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC,  5, 3, 1, 5, 3, 1, 'CW',  'Trissubogi Kvenna M.fl/ Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC,  5, 3, 1, 5, 3, 1, 'CU',  'Trissubogi Allir M.fl/ Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21M', 'Trissubogi Karla U21 Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21W', 'Trissubogi Kvenna U21 Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21U', 'Trissubogi Allir U21 Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18M', 'Trissubogi Karla U18 Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18W', 'Trissubogi Kvenna U18 Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18U', 'Trissubogi Allir U18 Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16M', 'Trissubogi Karla U16 Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16W', 'Trissubogi Kvenna U16 Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16U', 'Trissubogi Allir U16 Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14M', 'Trissubogi Karla U14 Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14W', 'Trissubogi Kvenna U14 Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14U', 'Trissubogi Allir U14 Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5M', 'Trissubogi Karla 50+ Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5W', 'Trissubogi Kvenna 50+ Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5U', 'Trissubogi Allir 50+ Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);	
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAM', 'Trissubogi Áhugamenn/Byrjendur Karla', 0, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAW', 'Trissubogi Áhugamenn/Byrjendur Kvenna', 0, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAU', 'Trissubogi Áhugamenn/Byrjendur Allir', 0, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);	
 	    // Berbogi
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB,  5, 3, 1, 5, 3, 1, 'BM',  'Berbogi Karla Meistaraflokkur/ Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB,  5, 3, 1, 5, 3, 1, 'BW',  'Berbogi Kvenna Meistaraflokkur/ Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB,  5, 3, 1, 5, 3, 1, 'Bu',  'Berbogi Allir Meistaraflokkur/ Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21M', 'Berbogi U21 Karla/ Barebow U21 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21W', 'Berbogi U21 Kvenna/ Barebow U21 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21U', 'Berbogi U21 Allir/ Barebow U21 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18M', 'Berbogi U18 Karla/ Barebow U18 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18W', 'Berbogi U18 Kvenna/ Barebow U18 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18U', 'Berbogi U18 Allir/ Barebow U18 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16M', 'Berbogi U16 Karla/ Barebow U16 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16W', 'Berbogi U16 Kvenna/ Barebow U16 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16U', 'Berbogi U16 Allir/ Barebow U16 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14M', 'Berbogi U14 Karla/ Barebow U14 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14W', 'Berbogi U14 Kvenna/ Barebow U14 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14U', 'Berbogi U14 Allir/ Barebow U14 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);		
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5M', 'Berbogi 50+ Karla/ Barebow 50+ Men', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5W', 'Berbogi 50+ Kvenna/ Barebow 50+ Women', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5U', 'Berbogi 50+ Allir/ Barebow 50+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
-        // Langbogi 
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL,  5, 3, 1, 5, 3, 1, 'LM',  'Langbogi Karla Meistaraflokkur/ Longbow & Traditional Men', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL,  5, 3, 1, 5, 3, 1, 'LW',  'Langbogi Kvenna Meistaraflokkur/ Longbow & Traditional Women', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL,  5, 3, 1, 5, 3, 1, 'LU',  'Langbogi Allir Meistarflokkur/ Longbow & Traditional Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21M', 'Langbogi U21 Karla/ Longbow & Traditional U21 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21W', 'Langbogi U21 Kvenna/ Longbow & Traditional U21 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21U', 'Langbogi U21 Allir/ Longbow & Tratitional U21 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18M', 'Langbogi U18 Karla/ Longbow & Traditional U18 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18W', 'Langbogi U18 Kvenna/ Longbow & Traditional U18 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18U', 'Langbogi U18 Allir/ Longbow & Traditional U18 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16M', 'Langbogi U16 Karla/ Longbow & Traditional U16 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16W', 'Langbogi U16 Kvenna/ Longbow & Traditional U16 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16U', 'Langbogi U16 Allir/ Longbow & Traditional U16 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14M', 'Langbogi U14 Karla/ Longbow & Traditional U14 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14W', 'Langbogi U14 Kvenna/ Longbow & Traditional U14 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14U', 'Langbogi U14 Allir/ Longbow & Traditional U14 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);		
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5M', 'Langbogi 50+ Karla/ Longbow & Traditional 50+ Men', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5W', 'Langbogi 50+ Kvenna/ Longbow & Traditional 50+ Women', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5U', 'Langbogi 50+ Allir/ Longbow & Traditional 50+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB,  5, 3, 1, 5, 3, 1, 'BM',  'Berbogi Karla M.fl/ Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB,  5, 3, 1, 5, 3, 1, 'BW',  'Berbogi Kvenna M.fl/ Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB,  5, 3, 1, 5, 3, 1, 'BU',  'Berbogi Allir M.fl/ Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21M', 'Berbogi Karla U21 Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21W', 'Berbogi Kvenna U21 Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21U', 'Berbogi Allir U21 Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18M', 'Berbogi Karla U18 Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18W', 'Berbogi Kvenna U18 Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18U', 'Berbogi Allir U18 Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16M', 'Berbogi Karla U16 Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16W', 'Berbogi Kvenna U16 Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16U', 'Berbogi Allir U16 Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14M', 'Berbogi Karla U14 Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14W', 'Berbogi Kvenna U14 Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14U', 'Berbogi U14 Allir/ Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);		
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5M', 'Berbogi Karla 50+ Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5W', 'Berbogi Kvenna 50+ Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5U', 'Berbogi Allir 50+ Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAM', 'Berbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAW', 'Berbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAU', 'Berbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
+		// Langbogi 
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL,  5, 3, 1, 5, 3, 1, 'LM',  'Longbow & Traditional Men', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL,  5, 3, 1, 5, 3, 1, 'LW',  'Longbow & Traditional Women', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL,  5, 3, 1, 5, 3, 1, 'LU',  'Longbow & Traditional Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21M', 'Longbow & Traditional U21 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21W', 'Longbow & Traditional U21 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21U', 'Longbow & Tratitional U21 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18M', 'Longbow & Traditional U18 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18W', 'Longbow & Traditional U18 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18U', 'Longbow & Traditional U18 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16M', 'Longbow & Traditional U16 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16W', 'Longbow & Traditional U16 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16U', 'Longbow & Traditional U16 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14M', 'Longbow & Traditional U14 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14W', 'Longbow & Traditional U14 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14U', 'Longbow & Traditional U14 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);		
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5M', 'Longbow & Traditional 50+ Men', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5W', 'Longbow & Traditional 50+ Women', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5U', 'Longbow & Traditional 50+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAM', 'Langbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAW', 'Langbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAU', 'Langbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
         }
 
 	if ($SubRule==2) { //"Only Adult Classes" Bara opinn flokkur útsláttarkeppni EINSTAKLINGA COMPLETE með kynsegin
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RM',  'Sveigbogi Karla Meistaraflokkur/ Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RW',  'Sveigbogi Kvenna Meistaraflokkur/ Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RU',  'Sveigbogi Allir Mristaraflokkur/ Recurve Unisex', 1, 240, 255, 0, 0, '', '',$TargetSizeR, $DistanceR);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CM',  'Trissubogi Karla Meistaraflokkur/ Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CW',  'Trissubogi Kvenna Meistaraflokkur/ Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CU',  'Trissubogi Allir Meistaraflokkur/ Compound Unisex', 0, 240, 255, 0, 0, '', '',$TargetSizeC, $DistanceC);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BM',  'Berbogi Karla Meistaraflokkur/ Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BW',  'Berbogi Kvenna Meistaraflokkur/ Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BU',  'Berbogi Allir Meistaraflokkur/ Barebow Unisex', 1, 240, 255, 0, 0, '', '',$TargetSizeB, $DistanceB);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL, 5, 3, 1, 5, 3, 1, 'LM',  'Langbogi Karla Meistaraflokkur/ Longbow & Traditional Men', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL, 5, 3, 1, 5, 3, 1, 'LW',  'Langbogi Kvenna Meistaraflokkur/ Longbow & Traditional Women', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL, 5, 3, 1, 5, 3, 1, 'LU',  'Langbogi Allir Meistaraflokkur/ Longbow & Traditional Unisex', 1, 240, 255, 0, 0, '', '',$TargetSizeL, $DistanceL);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RM',  'Sveigbogi Karla M.fl/ Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RW',  'Sveigbogi Kvenna M.fl/ Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RU',  'Sveigbogi Allir M.fl/ Recurve Unisex', 1, 240, 255, 0, 0, '', '',$TargetSizeR, $DistanceR);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CM',  'Trissubogi Karla M.fl/ Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CW',  'Trissubogi Kvenna M.fl/ Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CU',  'Trissubogi Allir M.fl/ Compound Unisex', 0, 240, 255, 0, 0, '', '',$TargetSizeC, $DistanceC);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BM',  'Berbogi Karla M.fl/ Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BW',  'Berbogi Kvenna M.fl/ Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BU',  'Berbogi Allir M.fl/ Barebow Unisex', 1, 240, 255, 0, 0, '', '',$TargetSizeB, $DistanceB);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL, 5, 3, 1, 5, 3, 1, 'LM',  'Longbow & Traditional Men', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL, 5, 3, 1, 5, 3, 1, 'LW',  'Longbow & Traditional Women', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL, 5, 3, 1, 5, 3, 1, 'LU',  'Longbow & Traditional Unisex', 1, 240, 255, 0, 0, '', '',$TargetSizeL, $DistanceL);
+		//Áhugamenn/Byrjendur
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAM',  'Sveigbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAW',  'Sveigbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAU',  'Sveigbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '',$TargetSizeRA, $DistanceRA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAM',  'Trissubogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '',$TargetSizeCA, $DistanceCA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAW',  'Trissubogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAU',  'Trissubogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAM',  'Berbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '',$TargetSizeBA, $DistanceBA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAW',  'Berbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '',$TargetSizeBA, $DistanceBA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAU',  'Berbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAM',  'Langbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAW',  'Langbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '',$TargetSizeLA, $DistanceLA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAU',  'Langbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '',$TargetSizeLA, $DistanceLA);
 		}
 
     if ($SubRule==3) { // "All-in-one class" Bara opinn flokkur UNISEX ÚTSLÁTTARKEPPNI EINSTAKLINGA COMPLETE
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'R',  'Sveigbogi Meistaraflokkur/ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);    
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'C',  'Trissubogi Meistaraflokkur/ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'B',  'Berbogi Meistaraflokkur/ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL, 5, 3, 1, 5, 3, 1, 'L',  'Langbogi Meistaraflokkur/ Longbow & Traditional', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'R',  'Sveigbogi M.fl/ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);    
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'C',  'Trissubogi M.fl/ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'B',  'Berbogi M.fl/ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL, 5, 3, 1, 5, 3, 1, 'L',  'Longbow & Traditional', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RA',  'Sveigbogi Áhugamenn/Byrjendur', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);    
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CA',  'Trissubogi Áhugamenn/Byrjendur', 0, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BA',  'Berbogi Áhugamenn/Byrjendur', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LA',  'Langbogi Áhugamenn/Byrjendur', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
 		}
 		
 	if ($SubRule==4) { // "Every Classes" Allir aldurflokkar ÚTSLÁTTARKEPPNI UNGMENNAMÓT COMPLETE með kynsegin - Breytt úr RJM í RU21M
 		// Sveigbogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21M', 'Sveigbogi U21 Karla/ Recurve U21 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21W', 'Sveigbogi U21 Kvenna/ Recurve U21 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21U', 'Sveigbogi U21 Allir/ Recurve U21 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18M', 'Sveigbogi U18 Karla/ Recurve U18 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18W', 'Sveigbogi U18 Kvenna/ Recurve U18 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18U', 'Sveigbogi U18 Allir/ Recurve U18 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16M', 'Sveigbogi U16 Karla/ Recurve U16 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16W', 'Sveigbogi U16 Kvenna/ Recurve U16 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16U', 'Sveigbogi U16 Allir/ Recurve U16 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14M', 'Sveigbogi U14 Karla/ Recurve U14 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14W', 'Sveigbogi U14 Kvenna/ Recurve U14 Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14U', 'Sveigbogi U14 Allir/ Recurve U14 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);	
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21M', 'Sveigbogi Karla U21 Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21W', 'Sveigbogi Kvenna U21 Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21U', 'Sveigbogi Allir U21 Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18M', 'Sveigbogi Karla U18 Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18W', 'Sveigbogi Kvenna U18 Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18U', 'Sveigbogi Allir U18 Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16M', 'Sveigbogi Karla U16 Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16W', 'Sveigbogi Kvenna U16 Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16U', 'Sveigbogi Allir U16 Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14M', 'Sveigbogi Karla U14 Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14W', 'Sveigbogi Kvenna U14 Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14U', 'Sveigbogi Allir U14 Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);	
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAM', 'Sveigbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAW', 'Sveigbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAU', 'Sveigbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);	
 		// Trissubogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21M', 'Trissubogi U21 Karla/ Compound U21 Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21W', 'Trissubogi U21 Kvenna/ Compound U21 Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21U', 'Trissubogi U21 Allir/ Compound U21 Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18M', 'Trissubogi U18 Karla/ Compound U18 Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18W', 'Trissubogi U18 Kvenna/ Compound U18 Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18U', 'Trissubogi U18 Allir/ Compound U18 Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16M', 'Trissubogi U16 Karla/ Compound U16 Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16W', 'Trissubogi U16 Kvenna/ Compound U16 Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16U', 'Trissubogi U16 Allir/ Compound U16 Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14M', 'Trissubogi U14 Karla/ Compound U14 Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14W', 'Trissubogi U14 Kvenna/ Compound U14 Kvenna', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14U', 'Trissubogi U14 Allir/ Compound U14 Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21M', 'Trissubogi Karla U21 Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21W', 'Trissubogi Kvenna U21 Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21U', 'Trissubogi Allir U21 Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18M', 'Trissubogi Karla U18 Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18W', 'Trissubogi Kvenna U18 Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18U', 'Trissubogi Allir U18 Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16M', 'Trissubogi Karla U16 Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16W', 'Trissubogi Kvenna U16 Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16U', 'Trissubogi Allir U16 Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14M', 'Trissubogi Karla U14 Compound Men', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14W', 'Trissubogi Kvenna U14 Compound Women', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14U', 'Trissubogi Allir U14 Compound Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAM', 'Trissubogi Áhugamenn/Byrjendur Karla', 0, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAW', 'Trissubogi Áhugamenn/Byrjendur Kvenna', 0, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAU', 'Trissubogi Áhugamenn/Byrjendur Allir', 0, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
 		// Berbogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21M', 'Berbogi U21 Karla/ Barebow U21 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21W', 'Berbogi U21 Kvenna/ Barebow U21 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21U', 'Berbogi U21 Allir/ Barebow U21 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18M', 'Berbogi U18 Karla/ Barebow U18 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18W', 'Berbogi U18 Kvenna/ Barebow U18 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18U', 'Berbogi U18 Allir/ Barebow U18 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16M', 'Berbogi U16 Karla/ Barebow U16 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16W', 'Berbogi U16 Kvenna/ Barebow U16 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16U', 'Berbogi U16 Allir/ Barebow U16 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14M', 'Berbogi U14 Karla/ Barebow U14 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14W', 'Berbogi U14 Kvenna/ Barebow U14 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14U', 'Berbogi U14 Allir/ Barebow U14 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21M', 'Berbogi Karla U21 Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21W', 'Berbogi Kvenna U21 Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21U', 'Berbogi Allir U21 Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18M', 'Berbogi Karla U18 Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18W', 'Berbogi Kvenna U18 Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18U', 'Berbogi Allir U18 Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16M', 'Berbogi Karla U16 Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16W', 'Berbogi Kvenna U16 Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16U', 'Berbogi Allir U16 Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14M', 'Berbogi Karla U14 Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14W', 'Berbogi Kvenna U14 Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14U', 'Berbogi Allir U14 Barebow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAM', 'Berbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAW', 'Berbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAU', 'Berbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
 		// Langbogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21M', 'Langbogi U21 Karla/ Longbow & Traditional U21 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21W', 'Langbogi U21 Kvenna/ Longbow & Traditional U21 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21U', 'Langbogi U21 Allir/ Longbow & Traditional U21 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18M', 'Langbogi U18 Karla/ Longbow & Traditional U18 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18W', 'Langbogi U18 Kvenna/ Longbow & Traditional U18 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18U', 'Langbogi U18 Allir/ Longbow & Traditional U18 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16M', 'Langbogi U16 Karla/ Longbow & Traditional U16 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16W', 'Langbogi U16 Kvenna/ Longbow & Traditional U16 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16U', 'Langbogi U16 Allir/ Longbow & Traditional U16 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14M', 'Langbogi U14 Karla/ Longbow & Traditional U14 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14W', 'Langbogi U14 Kvenna/ Longbow & Traditional U14 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14U', 'Langbogi U14 Allir/ Longbow & Traditional U14 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21M', 'Longbow & Traditional U21 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21W', 'Longbow & Traditional U21 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21U', 'Longbow & Traditional U21 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18M', 'Longbow & Traditional U18 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18W', 'Longbow & Traditional U18 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18U', 'Longbow & Traditional U18 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16M', 'Longbow & Traditional U16 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16W', 'Longbow & Traditional U16 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16U', 'Longbow & Traditional U16 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14M', 'Longbow & Traditional U14 Men', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14W', 'Longbow & Traditional U14 Women', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14U', 'Longbow & Traditional U14 Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAM', 'Langbogi Áhugamenn/Byrjendur Karla', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAW', 'Langbogi Áhugamenn/Byrjendur Kvenna', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAU', 'Langbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
 		}
 
 	if ($SubRule==5) { // "Set Kids classes" ÖLDUNGAMÓT ÚTSLÆTTIR COMPLETE með kynsegin
 		// Sveigbogi
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5M', 'Sveigbogi 50+ Karla/ Recurve 50+ Men', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5W', 'Sveigbogi 50+ Kvenna/ Recurve 50+ Women', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5U', 'Sveigbogi 50+ Allir/ Recurve 50+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR3, 5, 3, 1, 5, 3, 1, 'R3U', 'Sveigbogi Allir 30+ Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR3, $DistanceR3);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR4, 5, 3, 1, 5, 3, 1, 'R4U', 'Sveigbogi Allir 40+ Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR4, $DistanceR4);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5M', 'Sveigbogi Karla 50+ Recurve Men', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5W', 'Sveigbogi Kvenna 50+ Recurve Women', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5U', 'Sveigbogi Allir 50+ Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR6, 5, 3, 1, 5, 3, 1, 'R6U', 'Sveigbogi Allir 60+ Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR6, $DistanceR6);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR7, 5, 3, 1, 5, 3, 1, 'R7U', 'Sveigbogi Allir 70+ Recurve Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeR7, $DistanceR7);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAU', 'Sveigbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
  		// Trissubogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5M', 'Trissubogi 50+ Karla/ Compound 50+ Men', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5W', 'Trissubogi 50+ Kvenna/ Compound 50+ Women', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5U', 'Trissubogi 50+ Allir/ Compound 50+ Unisex', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
-        // Berbogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5M', 'Berbogi 50+ Karla/ Barebow 50+ Men', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5W', 'Berbogi 50+ Kvenna/ Barebow 50+ Women', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5U', 'Berbogi 50+ Allir/ Barbow 50+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC3, 5, 3, 1, 5, 3, 1, 'C3U', 'Trissubogi Allir 30+ Compound Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeC3, $DistanceC3);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC4, 5, 3, 1, 5, 3, 1, 'C4U', 'Trissubogi Allir 40+ Compound Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeC4, $DistanceC4);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5M', 'Trissubogi Karla 50+ Compound Men', 1, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5W', 'Trissubogi Kvenna 50+ Compound Women', 1, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5U', 'Trissubogi Allir 50+ Compound Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC6, 5, 3, 1, 5, 3, 1, 'C6U', 'Trissubogi Allir 60+ Compound Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeC6, $DistanceC6);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC7, 5, 3, 1, 5, 3, 1, 'C7U', 'Trissubogi Allir 70+ Compound Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeC7, $DistanceC7);
+ 		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAU', 'Trissubogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
+ 		// Berbogi
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB3, 5, 3, 1, 5, 3, 1, 'B3U', 'Berbogi Allir 30+ Barbow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB3, $DistanceB3);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB4, 5, 3, 1, 5, 3, 1, 'B4U', 'Berbogi Allir 40+ Barbow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB4, $DistanceB4);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5M', 'Berbogi Karla 50+ Barebow Men', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5W', 'Berbogi Kvenna 50+ Barebow Women', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5U', 'Berbogi Allir 50+ Barbow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB6, 5, 3, 1, 5, 3, 1, 'B6U', 'Berbogi Allir 60+ Barbow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB6, $DistanceB6);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB7, 5, 3, 1, 5, 3, 1, 'B7U', 'Berbogi Allir 70+ Barbow Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeB7, $DistanceB7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAU', 'Berbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
 		// Langbogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5M', 'Langbogi 50+ Karla/ Longbow & Traditional 50+ Men', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5W', 'Langbogi 50+ Kvenna/ Longbow & Traditional 50+ Women', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5U', 'Langbogi 50+ Allir/ Longbow & Traditional 50+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL3, 5, 3, 1, 5, 3, 1, 'L3U', 'Longbow & Traditional 30+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL3, $DistanceL3);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL4, 5, 3, 1, 5, 3, 1, 'L4U', 'Longbow & Traditional 40+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL4, $DistanceL4);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5M', 'Longbow & Traditional 50+ Men', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5W', 'Longbow & Traditional 50+ Women', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5U', 'Longbow & Traditional 50+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL6, 5, 3, 1, 5, 3, 1, 'L6U', 'Longbow & Traditional 60+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL6, $DistanceL6);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL7, 5, 3, 1, 5, 3, 1, 'L7U', 'Longbow & Traditional 60+ Unisex', 1, 240, 255, 0, 0, '', '', $TargetSizeL7, $DistanceL7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAU', 'Langbogi Áhugamenn/Byrjendur Allir', 1, 240, 255, 0, 0, '', '', $TargetSizeLA, $DistanceLA);
 		}
 		
 	if ($SubRule==6) { // "All Classes WA 4 Pools" UNISEX allir aldursflokkar útsláttarkeppni EINSTAKLINGA COMPLETE - Breytt úr RJU í RU21U
 		// Sveigbogi
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR,  5, 3, 1, 5, 3, 1, 'RU',  'Sveigbogi Meistaraflokkur/ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21U', 'Sveigbogi U21/ Recurve U21', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18U', 'Sveigbogi U18/ Recurve U18', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16U', 'Sveigbogi U16/ Recurve U16', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14U', 'Sveigbogi U14/ Recurve U14', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR3, 5, 3, 1, 5, 3, 1, 'R3U', 'Sveigbogi 30+/ Recurve 30+', 1, 240, 255, 0, 0, '', '', $TargetSizeR3, $DistanceR3);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR4, 5, 3, 1, 5, 3, 1, 'R4U', 'Sveigbogi 40+/ Recurve 40+', 1, 240, 255, 0, 0, '', '', $TargetSizeR4, $DistanceR4);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5U', 'Sveigbogi 50+/ Recurve 50+', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR6, 5, 3, 1, 5, 3, 1, 'R6U', 'Sveigbogi 60+/ Recurve 60+', 1, 240, 255, 0, 0, '', '', $TargetSizeR6, $DistanceR6);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR7, 5, 3, 1, 5, 3, 1, 'R7U', 'Sveigbogi 70+/ Recurve 70+', 1, 240, 255, 0, 0, '', '', $TargetSizeR7, $DistanceR7);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR,  5, 3, 1, 5, 3, 1, 'RU',  'Sveigbogi M.fl/ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU21, 5, 3, 1, 5, 3, 1, 'RU21U', 'Sveigbogi U21 Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU18, 5, 3, 1, 5, 3, 1, 'RU18U', 'Sveigbogi U18 Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU16, 5, 3, 1, 5, 3, 1, 'RU16U', 'Sveigbogi U16 Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRU14, 5, 3, 1, 5, 3, 1, 'RU14U', 'Sveigbogi U14 Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR3, 5, 3, 1, 5, 3, 1, 'R3U', 'Sveigbogi 30+ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR3, $DistanceR3);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR4, 5, 3, 1, 5, 3, 1, 'R4U', 'Sveigbogi 40+ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR4, $DistanceR4);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR5, 5, 3, 1, 5, 3, 1, 'R5U', 'Sveigbogi 50+ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR6, 5, 3, 1, 5, 3, 1, 'R6U', 'Sveigbogi 60+ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR6, $DistanceR6);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR7, 5, 3, 1, 5, 3, 1, 'R7U', 'Sveigbogi 70+ Recurve', 1, 240, 255, 0, 0, '', '', $TargetSizeR7, $DistanceR7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetRA, 5, 3, 1, 5, 3, 1, 'RAU', 'Sveigbogi Áhugamenn/Byrjendur', 1, 240, 255, 0, 0, '', '', $TargetSizeRA, $DistanceRA);
 		// Trissubogi
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC,  5, 3, 1, 5, 3, 1, 'CU',  'Trissubogi Meistaraflokkur/ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21U', 'Trissubogi U21/ Compound U21', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18U', 'Trissubogi U18/ Compound U18', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16U', 'Trissubogi U16/ Compound U16', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14U', 'Trissubogi U14/ Compound U14', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC3, 5, 3, 1, 5, 3, 1, 'C3U', 'Trissubogi 30+/ Compound 30+', 0, 240, 255, 0, 0, '', '', $TargetSizeC3, $DistanceC3);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC4, 5, 3, 1, 5, 3, 1, 'C4U', 'Trissubogi 40+/ Compound 40+', 0, 240, 255, 0, 0, '', '', $TargetSizeC4, $DistanceC4);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5U', 'Trissubogi 50+/ Compound 50+', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC6, 5, 3, 1, 5, 3, 1, 'C6U', 'Trissubogi 60+/ Compound 60+', 0, 240, 255, 0, 0, '', '', $TargetSizeC6, $DistanceC6);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC7, 5, 3, 1, 5, 3, 1, 'C7U', 'Trissubogi 70+/ Compound 70+', 0, 240, 255, 0, 0, '', '', $TargetSizeC7, $DistanceC7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC,  5, 3, 1, 5, 3, 1, 'CU',  'Trissubogi M.fl/ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU21, 5, 3, 1, 5, 3, 1, 'CU21U', 'Trissubogi U21 Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU18, 5, 3, 1, 5, 3, 1, 'CU18U', 'Trissubogi U18 Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU16, 5, 3, 1, 5, 3, 1, 'CU16U', 'Trissubogi U16 Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCU14, 5, 3, 1, 5, 3, 1, 'CU14U', 'Trissubogi U14 Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC3, 5, 3, 1, 5, 3, 1, 'C3U', 'Trissubogi 30+ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC3, $DistanceC3);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC4, 5, 3, 1, 5, 3, 1, 'C4U', 'Trissubogi 40+ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC4, $DistanceC4);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC5, 5, 3, 1, 5, 3, 1, 'C5U', 'Trissubogi 50+ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC6, 5, 3, 1, 5, 3, 1, 'C6U', 'Trissubogi 60+ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC6, $DistanceC6);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC7, 5, 3, 1, 5, 3, 1, 'C7U', 'Trissubogi 70+ Compound', 0, 240, 255, 0, 0, '', '', $TargetSizeC7, $DistanceC7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetCA, 5, 3, 1, 5, 3, 1, 'CAU', 'Trissubogi Áhugamenn/Byrjendur', 0, 240, 255, 0, 0, '', '', $TargetSizeCA, $DistanceCA);
 		// Berbogi
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB,  5, 3, 1, 5, 3, 1, 'BU',  'Berbogi Meistaraflokkur/ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21U', 'Berbogi U21/ Barebow U21', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18U', 'Berbogi U18/ Barebow U18', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16U', 'Berbogi U16/ Barebow U16', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14U', 'Berbogi U14/ Barebow U14', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB3, 5, 3, 1, 5, 3, 1, 'B3U', 'Berbogi 30+/ Barebow 30+', 1, 240, 255, 0, 0, '', '', $TargetSizeB3, $DistanceB3);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB4, 5, 3, 1, 5, 3, 1, 'B4U', 'Berbogi 40+/ Barebow 40+', 1, 240, 255, 0, 0, '', '', $TargetSizeB4, $DistanceB4);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5U', 'Berbogi 50+/ Barebow 50+', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB6, 5, 3, 1, 5, 3, 1, 'B6U', 'Berbogi 60+/ Barebow 60+', 1, 240, 255, 0, 0, '', '', $TargetSizeB6, $DistanceB6);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB7, 5, 3, 1, 5, 3, 1, 'B7U', 'Berbogi 70+/ Barebow 70+', 1, 240, 255, 0, 0, '', '', $TargetSizeB7, $DistanceB7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB,  5, 3, 1, 5, 3, 1, 'BU',  'Berbogi M.fl/ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU21, 5, 3, 1, 5, 3, 1, 'BU21U', 'Berbogi U21 Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU18, 5, 3, 1, 5, 3, 1, 'BU18U', 'Berbogi U18 Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU16, 5, 3, 1, 5, 3, 1, 'BU16U', 'Berbogi U16 Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBU14, 5, 3, 1, 5, 3, 1, 'BU14U', 'Berbogi U14 Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB3, 5, 3, 1, 5, 3, 1, 'B3U', 'Berbogi 30+ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB3, $DistanceB3);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB4, 5, 3, 1, 5, 3, 1, 'B4U', 'Berbogi 40+ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB4, $DistanceB4);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB5, 5, 3, 1, 5, 3, 1, 'B5U', 'Berbogi 50+ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB6, 5, 3, 1, 5, 3, 1, 'B6U', 'Berbogi 60+ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB6, $DistanceB6);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB7, 5, 3, 1, 5, 3, 1, 'B7U', 'Berbogi 70+ Barebow', 1, 240, 255, 0, 0, '', '', $TargetSizeB7, $DistanceB7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetBA, 5, 3, 1, 5, 3, 1, 'BAU', 'Berbogi Áhugamenn/Byrjendur', 1, 240, 255, 0, 0, '', '', $TargetSizeBA, $DistanceBA);
 		// Langbogi
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL,  5, 3, 1, 5, 3, 1, 'LU',  'Langbogi Meistaraflokkur/ Longbow & Traditional', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21U', 'Langbogi U21/ Longbow & Traditional U21', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18U', 'Langbogi U18/ Longbow & Traditional U18', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16U', 'Langbogi U16/ Longbow & Traditional U16', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
-	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14U', 'Langbogi U14/ Longbow & Traditional U14', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL3, 5, 3, 1, 5, 3, 1, 'L3U', 'Langbogi 30+/ Longbow & Tradtional 30+', 1, 240, 255, 0, 0, '', '', $TargetSizeL3, $DistanceL3);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL4, 5, 3, 1, 5, 3, 1, 'L4U', 'Langbogi 40+/ Longbow & Traditonal 40+', 1, 240, 255, 0, 0, '', '', $TargetSizeL4, $DistanceL4);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5U', 'Langbogi 50+/ Longbow & Tradtional 50+', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL6, 5, 3, 1, 5, 3, 1, 'L6U', 'Langbogi 60+/ Longbow & Tradtional 60+', 1, 240, 255, 0, 0, '', '', $TargetSizeL6, $DistanceL6);
-		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL7, 5, 3, 1, 5, 3, 1, 'L7U', 'Langbogi 70+/ Longbow & Tradtional 70+', 1, 240, 255, 0, 0, '', '', $TargetSizeL7, $DistanceL7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL,  5, 3, 1, 5, 3, 1, 'LU',  'Longbow & Traditional', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU21, 5, 3, 1, 5, 3, 1, 'LU21U', 'Longbow & Traditional U21', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU18, 5, 3, 1, 5, 3, 1, 'LU18U', 'Longbow & Traditional U18', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU16, 5, 3, 1, 5, 3, 1, 'LU16U', 'Longbow & Traditional U16', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16);
+	    CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLU14, 5, 3, 1, 5, 3, 1, 'LU14U', 'Longbow & Traditional U14', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL3, 5, 3, 1, 5, 3, 1, 'L3U', 'Longbow & Tradtional 30+', 1, 240, 255, 0, 0, '', '', $TargetSizeL3, $DistanceL3);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL4, 5, 3, 1, 5, 3, 1, 'L4U', 'Longbow & Traditonal 40+', 1, 240, 255, 0, 0, '', '', $TargetSizeL4, $DistanceL4);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL5, 5, 3, 1, 5, 3, 1, 'L5U', 'Longbow & Tradtional 50+', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL6, 5, 3, 1, 5, 3, 1, 'L6U', 'Longbow & Tradtional 60+', 1, 240, 255, 0, 0, '', '', $TargetSizeL6, $DistanceL6);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetL7, 5, 3, 1, 5, 3, 1, 'L7U', 'Longbow & Tradtional 70+', 1, 240, 255, 0, 0, '', '', $TargetSizeL7, $DistanceL7);
+		CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLA, 5, 3, 1, 5, 3, 1, 'LAU', 'Langbogi Áhugamenn/Byrjendur', 1, 240, 255, 0, 0, '', '', $TargetSizeL7, $DistanceL7);
 		}
 
 	// LIÐA útslættir
@@ -568,92 +642,92 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //
 		// Til upplýsinga tölurnar á eftir $Targetx standa fyrir "fjöldi umferða","fjöldi örva","fjöldi örva bráðabani" og svo sömu tölur enduteknar. Tölurnar á eftir $i++ eru ? og mixed team 1 er Yes 2 er No
 		// Tölurnar á efir distance tengjast því að búa til mörg lið eða 1 lið
 		// Sveigbogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR,  4, 6, 3, 4, 6, 3, 'RU',  'Sveigbogi Meistaraflokkur Lið/ Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU21, 4, 4, 2, 4, 4, 2, 'RU21U', 'Sveigbogi U21 Lið/ Recurve U21 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU18, 4, 4, 2, 4, 4, 2, 'RU18U', 'Sveigbogi U18 Lið/ Recurve U18 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18, '', 1);
-	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU16, 4, 4, 2, 4, 4, 2, 'RU16U', 'Sveigbogi U16 Lið/ Recurve U16 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16, '', 1);
-	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU14, 4, 4, 2, 4, 4, 2, 'RU14U', 'Sveigbogi U14 Lið/ Recurve U14 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR5, 4, 4, 2, 4, 4, 2, 'R5U', 'Sveigbogi 50+ Lið/ Recurve Master Team', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5, '', 1);		
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR,  4, 6, 3, 4, 6, 3, 'RU',  'Sveigbogi Lið M.fl/ Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU21, 4, 4, 2, 4, 4, 2, 'RU21U', 'Sveigbogi Lið U21 Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU18, 4, 4, 2, 4, 4, 2, 'RU18U', 'Sveigbogi Lið U18 Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18, '', 1);
+	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU16, 4, 4, 2, 4, 4, 2, 'RU16U', 'Sveigbogi Lið U16 Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16, '', 1);
+	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU14, 4, 4, 2, 4, 4, 2, 'RU14U', 'Sveigbogi Lið U14 Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR5, 4, 4, 2, 4, 4, 2, 'R5U', 'Sveigbogi Lið 50+ Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5, '', 1);		
 		// Trissubogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC,  4, 6, 3, 4, 6, 3, 'CU',  'Trissubogi Meistaraflokkur Lið/ Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU21, 4, 4, 2, 4, 4, 2, 'CU21U', 'Trissubogi U21 Lið/ Compound U21 Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU18, 4, 4, 2, 4, 4, 2, 'CU18U', 'Trissubogi U18 Lið/ Compound U18 Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU16, 4, 4, 2, 4, 4, 2, 'CU16U', 'Trissubogi U16 Lið/ Compound U16 Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16, '', 1);
-	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU14, 4, 4, 2, 4, 4, 2, 'CU14U', 'Trissubogi U14 Lið/ Compound U14 Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC5, 4, 4, 2, 4, 4, 2, 'C5U', 'Trissubogi 50+ Lið/ Compound Master Team', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC,  4, 6, 3, 4, 6, 3, 'CU',  'Trissubogi Lið M.fl/ Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU21, 4, 4, 2, 4, 4, 2, 'CU21U', 'Trissubogi Lið U21 Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU18, 4, 4, 2, 4, 4, 2, 'CU18U', 'Trissubogi Lið U18 Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU16, 4, 4, 2, 4, 4, 2, 'CU16U', 'Trissubogi Lið U16 Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16, '', 1);
+	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU14, 4, 4, 2, 4, 4, 2, 'CU14U', 'Trissubogi Lið U14 Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC5, 4, 4, 2, 4, 4, 2, 'C5U', 'Trissubogi Lið 50+ Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5, '', 1);
         // Berbogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB,  4, 6, 3, 4, 6, 3, 'BU',  'Berbogi Meistaraflokkur Lið/ Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU21, 4, 4, 2, 4, 4, 2, 'BU21U', 'Berbogi U21 Lið/ Barebow U21 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU18, 4, 4, 2, 4, 4, 2, 'BU18U', 'Berbogi U18 Lið/ Barebow U18 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU16, 4, 4, 2, 4, 4, 2, 'BU16U', 'Berbogi U16 Lið/ Barebow U16 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU14, 4, 4, 2, 4, 4, 2, 'BU14U', 'Berbogi U14 Lið/ Barebow U14 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB5, 4, 4, 2, 4, 4, 2, 'B5U', 'Berbogi 50+ Lið/ Barebow Master Team', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5, '', 1);		
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB,  4, 6, 3, 4, 6, 3, 'BU',  'Berbogi Lið M.fl/ Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU21, 4, 4, 2, 4, 4, 2, 'BU21U', 'Berbogi Lið U21 Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU18, 4, 4, 2, 4, 4, 2, 'BU18U', 'Berbogi Lið U18 Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU16, 4, 4, 2, 4, 4, 2, 'BU16U', 'Berbogi Lið U16 Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU14, 4, 4, 2, 4, 4, 2, 'BU14U', 'Berbogi Lið U14 Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB5, 4, 4, 2, 4, 4, 2, 'B5U', 'Berbogi Lið 50+ Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5, '', 1);		
 		// Langbogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL,  4, 6, 3, 4, 6, 3, 'LU',  'Langbogi Meistaraflokkur Lið/ Longbow & Traditional Team', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU21, 4, 4, 2, 4, 4, 2, 'LU21U', 'Langbogi U21 Lið/ Longbow & Traditional U21 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU18, 4, 4, 2, 4, 4, 2, 'LU18U', 'Langbogi U18 Lið/ Longbow & Traditional U18 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU16, 4, 4, 2, 4, 4, 2, 'LU16U', 'Langbogi U16 Lið/ Longbow & Traditional U16 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU14, 4, 4, 2, 4, 4, 2, 'LU14U', 'Langbogi U14 Lið/ Longbow & Traditional U14 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL5, 4, 4, 2, 4, 4, 2, 'L5U', 'Langbogi 50+ Lið/ Longbow & Traditional Master Team', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5, '', 1);		
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL,  4, 6, 3, 4, 6, 3, 'LU',  'Longbow & Traditional Team', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU21, 4, 4, 2, 4, 4, 2, 'LU21U', 'Longbow & Traditional U21 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU18, 4, 4, 2, 4, 4, 2, 'LU18U', 'Longbow & Traditional U18 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU16, 4, 4, 2, 4, 4, 2, 'LU16U', 'Longbow & Traditional U16 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU14, 4, 4, 2, 4, 4, 2, 'LU14U', 'Longbow & Traditional U14 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL5, 4, 4, 2, 4, 4, 2, 'L5U', 'Longbow & Traditional 50+ Team', 1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5, '', 1);		
 		}
 		
 	if ($SubRule==2) { //"Only Adult Classes" Bara opinn flokkur útsláttarkeppni LIÐA COMPLETE
 		// Sveigbogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'RU', 'Sveigbogi Meistaraflokkur Lið/ Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'RU', 'Sveigbogi Lið M.fl/ Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR, '', 1);
 		// Trissubogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC, 4, 6, 3, 4, 6, 3, 'CU', 'Trissubogi Meistaraflokkur Lið/ Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC, 4, 6, 3, 4, 6, 3, 'CU', 'Trissubogi Lið M.fl/ Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC, '', 1);
 		// Berbogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'BU', 'Berbogi Meistaraflokkur Lið/ Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'BU', 'Berbogi Lið M.fl/ Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB, '', 1);
 		// Langbogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL, 4, 6, 3, 4, 6, 3, 'LU', 'Langbogi Meistaraflokkur Lið/ Longbow & Traditional Team', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL, 4, 6, 3, 4, 6, 3, 'LU', 'Longbow & Traditional Team', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL, '', 1);
 		}
 
     if ($SubRule==3) { //"All-in-one class" Bara opinn flokkur útsláttarkeppni LIÐA COMPLETE
 		// Sveigbogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'RU', 'Sveigbogi Meistaraflokkir Lið/ Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'RU', 'Sveigbogi Lið M.fl/ Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR, '', 1);
 		// Trissubogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC, 4, 6, 3, 4, 6, 3, 'CU', 'Trissubogi Meistaraflokkur Lið/ Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC, 4, 6, 3, 4, 6, 3, 'CU', 'Trissubogi Lið M.fl/ Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceC, '', 1);
 		// Berbogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'BU', 'Berbogi Meistaraflokkur Lið/ Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'BU', 'Berbogi Lið M.fl/ Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB, '', 1);
 		// Langbogi
-		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL, 4, 6, 3, 4, 6, 3, 'LU', 'Langbogi Meistaraflokkur Lið/ Longbow & Traditional Team', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL, '', 1);
+		CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL, 4, 6, 3, 4, 6, 3, 'LU', 'Longbow & Traditional Team', 1, 240, 255, 0, 0, '', '', $TargetSizeL, $DistanceL, '', 1);
 		}
 
 
 	if ($SubRule==4) { // "EVERY CLASSES" YOUTH SERIES útsláttarkeppni LIÐA COMPLETE - Breytt úr RJM í RU21M
 		// Til upplýsinga tölurnar á eftir $Targetx standa fyrir "fjöldi umferða","fjöldi örva","fjöldi örva bráðabani" og svo sömu tölur enduteknar.
 		// Sveigbogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU21, 4, 4, 2, 4, 4, 2, 'RU21U', 'Sveigbogi U21 Lið/ Recurve U21 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU18, 4, 4, 2, 4, 4, 2, 'RU18U', 'Sveigbogi U18 Lið/ Recurve U18 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18, '', 1);
-	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU16, 4, 4, 2, 4, 4, 2, 'RU16U', 'Sveigbogi U16 Lið/ Recurve U16 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16, '', 1);
-	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU14, 4, 4, 2, 4, 4, 2, 'RU14U', 'Sveigbogi U14 Lið/ Recurve U14 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU21, 4, 4, 2, 4, 4, 2, 'RU21U', 'Sveigbogi Lið U21 Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU21, $DistanceRU21, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU18, 4, 4, 2, 4, 4, 2, 'RU18U', 'Sveigbogi Lið U18 Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU18, $DistanceRU18, '', 1);
+	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU16, 4, 4, 2, 4, 4, 2, 'RU16U', 'Sveigbogi Lið U16 Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU16, $DistanceRU16, '', 1);
+	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetRU14, 4, 4, 2, 4, 4, 2, 'RU14U', 'Sveigbogi Lið U14 Recurve Team', 1, 240, 255, 0, 0, '', '', $TargetSizeRU14, $DistanceRU14, '', 1);
 		// Trissubogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU21, 4, 4, 2, 4, 4, 2, 'CU21U', 'Trissubogi U21 Lið/ Compound U21 Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU18, 4, 4, 2, 4, 4, 2, 'CU18U', 'Trissubogi U18 Lið/ Compound U18 Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU16, 4, 4, 2, 4, 4, 2, 'CU16U', 'Trissubogi U16 Lið/ Compound U16 Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16, '', 1);
-	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU14, 4, 4, 2, 4, 4, 2, 'CU14U', 'Trissubogi U14 Lið/ Compound U14 Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU21, 4, 4, 2, 4, 4, 2, 'CU21U', 'Trissubogi Lið U21 Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU21, $DistanceCU21, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU18, 4, 4, 2, 4, 4, 2, 'CU18U', 'Trissubogi Lið U18 Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU18, $DistanceCU18, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU16, 4, 4, 2, 4, 4, 2, 'CU16U', 'Trissubogi Lið U16 Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU16, $DistanceCU16, '', 1);
+	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetCU14, 4, 4, 2, 4, 4, 2, 'CU14U', 'Trissubogi Lið U14 Compound Team', 0, 240, 255, 0, 0, '', '', $TargetSizeCU14, $DistanceCU14, '', 1);
         // Berbogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU21, 4, 4, 2, 4, 4, 2, 'BU21U', 'Berbogi U21 Lið/ Barebow U21 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU18, 4, 4, 2, 4, 4, 2, 'BU18U', 'Berbogi U18 Lið/ Barebow U18 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU16, 4, 4, 2, 4, 4, 2, 'BU16U', 'Berbogi U16 Lið/ Barebow U16 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU14, 4, 4, 2, 4, 4, 2, 'BU14U', 'Berbogi U14 Lið/ Barebow U14 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU21, 4, 4, 2, 4, 4, 2, 'BU21U', 'Berbogi Lið U21 Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU21, $DistanceBU21, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU18, 4, 4, 2, 4, 4, 2, 'BU18U', 'Berbogi Lið U18 Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU18, $DistanceBU18, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU16, 4, 4, 2, 4, 4, 2, 'BU16U', 'Berbogi Lið U16 Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU16, $DistanceBU16, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetBU14, 4, 4, 2, 4, 4, 2, 'BU14U', 'Berbogi Lið U14 Barebow Team', 1, 240, 255, 0, 0, '', '', $TargetSizeBU14, $DistanceBU14, '', 1);
 		// Langbogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU21, 4, 4, 2, 4, 4, 2, 'LU21U', 'Langbogi U21 Lið/ Longbow & Traditional U21 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU18, 4, 4, 2, 4, 4, 2, 'LU18U', 'Langbogi U18 Lið/ Longbow & Traditional U18 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18, '', 1);
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU16, 4, 4, 2, 4, 4, 2, 'LU16U', 'Langbogi U16 Lið/ Longbow & Traditional U16 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16, '', 1);
-	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU14, 4, 4, 2, 4, 4, 2, 'LU14U', 'Langbogi U14 Lið/ Longbow & Traditional U14 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU21, 4, 4, 2, 4, 4, 2, 'LU21U', 'Longbow & Traditional U21 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU21, $DistanceLU21, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU18, 4, 4, 2, 4, 4, 2, 'LU18U', 'Longbow & Traditional U18 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU18, $DistanceLU18, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU16, 4, 4, 2, 4, 4, 2, 'LU16U', 'Longbow & Traditional U16 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU16, $DistanceLU16, '', 1);
+	    CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetLU14, 4, 4, 2, 4, 4, 2, 'LU14U', 'Longbow & Traditional U14 Team', 1, 240, 255, 0, 0, '', '', $TargetSizeLU14, $DistanceLU14, '', 1);
         }
 		
 	if ($SubRule==5) { // "ONLY YOUTH CLASSES" ÖLDUNGAFLOKKA útsláttarkeppni LIÐA ÓKLÁRAÐ COMPLETE FOR NOW ÞARF AÐ ÁKVEÐA HVAÐ Á AÐ GERA MEÐ MASTERS LIÐAKEPPNI
 		// Til upplýsinga tölurnar á eftir $Targetx standa fyrir "fjöldi umferða","fjöldi örva","fjöldi örva bráðabani" og svo sömu tölur enduteknar.
 		// Sveigbogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR5, 4, 4, 2, 4, 4, 2, 'R5U', 'Sveigbogi 50+ Lið/ Recurve Masters Team', 		1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5, '', 1);		
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetR5, 4, 4, 2, 4, 4, 2, 'R5U', 'Sveigbogi Lið 50+ Recurve Team', 		1, 240, 255, 0, 0, '', '', $TargetSizeR5, $DistanceR5, '', 1);		
 		// Trissubogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC5, 4, 4, 2, 4, 4, 2, 'C5U', 'Trissubogi 50+ Lið/ Compound Masters Team', 		0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5, '', 1);		
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetC5, 4, 4, 2, 4, 4, 2, 'C5U', 'Trissubogi Lið 50+ Compound Team', 		0, 240, 255, 0, 0, '', '', $TargetSizeC5, $DistanceC5, '', 1);		
 		// Berbogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB5, 4, 4, 2, 4, 4, 2, 'B5U', 'Berbogi 50+ Lið/ Barebow Masters Team', 			1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetB5, 4, 4, 2, 4, 4, 2, 'B5U', 'Berbogi Lið 50+ Barebow Team', 			1, 240, 255, 0, 0, '', '', $TargetSizeB5, $DistanceB5, '', 1);
         // Langbogi
-        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL5, 4, 4, 2, 4, 4, 2, 'L5U', 'Langbogi 50+ Lið/ Longbow & Traditional Masters Team', 			1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5, '', 1);
+        CreateEvent($TourId, $i++, 1, 1, $Phase, $TargetL5, 4, 4, 2, 4, 4, 2, 'L5U', 'Longbow & Traditional 50+ Team', 			1, 240, 255, 0, 0, '', '', $TargetSizeL5, $DistanceL5, '', 1);
         }		
 		
 	//}
@@ -707,6 +781,11 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'R5U',  'R', '7M');
 		InsertClassEvent($TourId, 0, 1, 'R5U',  'R', '7W');
 		InsertClassEvent($TourId, 0, 1, 'R5U',  'R', '7U');
+		InsertClassEvent($TourId, 0, 1, 'RAM',  'R', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'RAW',  'R', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AU');
 		// Compound Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'CM',  'C', 'M');
 		InsertClassEvent($TourId, 0, 1, 'CW',  'C', 'W');
@@ -748,6 +827,11 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'C5U',  'C', '7M');
 		InsertClassEvent($TourId, 0, 1, 'C5U',  'C', '7W');
 		InsertClassEvent($TourId, 0, 1, 'C5U',  'C', '7U');
+		InsertClassEvent($TourId, 0, 1, 'CAM',  'C', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'CAW',  'C', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AU');
 		// Barebow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'BM',  'B', 'M');
 		InsertClassEvent($TourId, 0, 1, 'BW',  'B', 'W');
@@ -789,6 +873,11 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'B5U',  'B', '7M');
 		InsertClassEvent($TourId, 0, 1, 'B5U',  'B', '7W');
 		InsertClassEvent($TourId, 0, 1, 'B5U',  'B', '7U');
+		InsertClassEvent($TourId, 0, 1, 'BAM',  'B', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'BAW',  'B', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AU');
 		// Longbow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'LM',  'L', 'M');
 		InsertClassEvent($TourId, 0, 1, 'LW',  'L', 'W');
@@ -830,6 +919,11 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'L5U',  'L', '7M');
 		InsertClassEvent($TourId, 0, 1, 'L5U',  'L', '7W');
 		InsertClassEvent($TourId, 0, 1, 'L5U',  'L', '7U');
+		InsertClassEvent($TourId, 0, 1, 'LAM',  'L', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'LAW',  'L', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AU');
 		}
 
 	if ($SubRule==2) { // "Only Adult Classes" Bara opinn flokkur útsláttarkeppni EINSTAKLINGA tenging COMPLETE með kynsegin
@@ -839,24 +933,44 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'RU',  'R', 'M');
 		InsertClassEvent($TourId, 0, 1, 'RU',  'R', 'W');
 		InsertClassEvent($TourId, 0, 1, 'RU',  'R', 'U');
+		InsertClassEvent($TourId, 0, 1, 'RAM',  'R', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'RAW',  'R', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AU');
 		// Compound Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'CM',  'C', 'M');
 		InsertClassEvent($TourId, 0, 1, 'CW',  'C', 'W');
 		InsertClassEvent($TourId, 0, 1, 'CU',  'C', 'M');
 		InsertClassEvent($TourId, 0, 1, 'CU',  'C', 'W');
 		InsertClassEvent($TourId, 0, 1, 'CU',  'C', 'U');
+		InsertClassEvent($TourId, 0, 1, 'CAM',  'C', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'CAW',  'C', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AU');
 		// Barebow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'BM',  'B', 'M');
 		InsertClassEvent($TourId, 0, 1, 'BW',  'B', 'W');
         InsertClassEvent($TourId, 0, 1, 'BU',  'B', 'M');
 		InsertClassEvent($TourId, 0, 1, 'BU',  'B', 'W');
 		InsertClassEvent($TourId, 0, 1, 'BU',  'B', 'U');
+		InsertClassEvent($TourId, 0, 1, 'BAM',  'B', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'BAW',  'B', 'AW');
+        InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AU');
 		// Longbow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'LM',  'L', 'M');
 		InsertClassEvent($TourId, 0, 1, 'LW',  'L', 'W');
         InsertClassEvent($TourId, 0, 1, 'LU',  'L', 'M');
 		InsertClassEvent($TourId, 0, 1, 'LU',  'L', 'W');
 		InsertClassEvent($TourId, 0, 1, 'LU',  'L', 'U');
+		InsertClassEvent($TourId, 0, 1, 'LAM',  'L', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'LAW',  'L', 'AW');
+        InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AU');
 		}
 	
     if ($SubRule==3) {	// "All-in-one class" Bara opinn flokkur UNISEX ÚTSLÁTTARKEPPNI EINSTAKLINGA TENGING COMPLETE
@@ -872,6 +986,19 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'L',  'L', 'M');
 		InsertClassEvent($TourId, 0, 1, 'L',  'L', 'W');
 		InsertClassEvent($TourId, 0, 1, 'L',  'L', 'U');
+		//Áhugamenn/Byrjendur Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
+		InsertClassEvent($TourId, 0, 1, 'RA',  'R', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'RA',  'R', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'RA',  'R', 'AU');
+		InsertClassEvent($TourId, 0, 1, 'CA',  'C', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'CA',  'C', 'AW');
+        InsertClassEvent($TourId, 0, 1, 'CA',  'C', 'AU');
+		InsertClassEvent($TourId, 0, 1, 'BA',  'B', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'BA',  'B', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'BA',  'B', 'AU');
+		InsertClassEvent($TourId, 0, 1, 'LA',  'L', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'LA',  'L', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'LA',  'L', 'AU');
 		}
 		
 	if ($SubRule==4) {	// "EVERY CLASSES" Ungmenna ÚTSLÁTTARKEPPNI EINSTAKLINGA TENGING COMPLETE með kynsegin - Breytt úr RJM í RU21M
@@ -896,6 +1023,11 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'RU14U',  'R', 'U14M');
 		InsertClassEvent($TourId, 0, 1, 'RU14U',  'R', 'U14W');
 		InsertClassEvent($TourId, 0, 1, 'RU14U',  'R', 'U14U');
+		InsertClassEvent($TourId, 0, 1, 'RAM',  'R', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'RAW',  'R', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AU');
 		// Compound Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'CU21M',  'C', 'U21M');
 		InsertClassEvent($TourId, 0, 1, 'CU21W',  'C', 'U21W');
@@ -917,6 +1049,11 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'CU14U',  'C', 'U14M');
 		InsertClassEvent($TourId, 0, 1, 'CU14U',  'C', 'U14W');
 		InsertClassEvent($TourId, 0, 1, 'CU14U',  'C', 'U14U');
+		InsertClassEvent($TourId, 0, 1, 'CAM',  'C', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'CAW',  'C', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AU');
 		// Barebow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'BU21M',  'B', 'U21M');
 		InsertClassEvent($TourId, 0, 1, 'BU21W',  'B', 'U21W');
@@ -938,6 +1075,11 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'BU14U',  'B', 'U14M');
 		InsertClassEvent($TourId, 0, 1, 'BU14U',  'B', 'U14W');
 		InsertClassEvent($TourId, 0, 1, 'BU14U',  'B', 'U14U');
+		InsertClassEvent($TourId, 0, 1, 'BAM',  'B', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'BAW',  'B', 'AW');	
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AU');
 		// Longbow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'LU21M',  'L', 'U21M');
 		InsertClassEvent($TourId, 0, 1, 'LU21W',  'L', 'U21W');
@@ -959,12 +1101,23 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'LU14U',  'L', 'U14M');
 		InsertClassEvent($TourId, 0, 1, 'LU14U',  'L', 'U14W');
 		InsertClassEvent($TourId, 0, 1, 'LU14U',  'L', 'U14U');
+		InsertClassEvent($TourId, 0, 1, 'LAM',  'L', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'LAW',  'L', 'AW');	
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AU');
 		}
 		
 	if ($SubRule==5) { // "SET KIDS CLASSES" ÖLDUNGAMÓT ALDURFLOKKAR 30+,40+,50+,ETC EINSTAKLINGA tenging COMPLETE með kynsegin
 	// Til upplýsinga fyrsta talan er fjöldi lína í tenginguni sem á að búa til 0=disabled/einstaklingskeppni og önnur talan er fjöldi keppenda. 
 	// Þess vegna stendur 1,1 og 2,1 í mixed team "lína 1 = 1 RM, lína 2 = 1 RW" og 1,3 í liða "lína 1 = 3 RM"
 		// Recurve Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
+		InsertClassEvent($TourId, 0, 1, 'R3U',  'R', '3M');
+		InsertClassEvent($TourId, 0, 1, 'R3U',  'R', '3W');
+		InsertClassEvent($TourId, 0, 1, 'R3U',  'R', '3U');
+		InsertClassEvent($TourId, 0, 1, 'R4U',  'R', '4M');
+		InsertClassEvent($TourId, 0, 1, 'R4U',  'R', '4W');
+		InsertClassEvent($TourId, 0, 1, 'R4U',  'R', '4U');
 		InsertClassEvent($TourId, 0, 1, 'R5M',  'R', '5M');
 		InsertClassEvent($TourId, 0, 1, 'R5W',  'R', '5W');
 		InsertClassEvent($TourId, 0, 1, 'R5U',  'R', '5M');
@@ -980,7 +1133,22 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'R5U',  'R', '7M');
 		InsertClassEvent($TourId, 0, 1, 'R5U',  'R', '7W');
 		InsertClassEvent($TourId, 0, 1, 'R5U',  'R', '7U');
+		InsertClassEvent($TourId, 0, 1, 'R6U',  'R', '6M');
+		InsertClassEvent($TourId, 0, 1, 'R6U',  'R', '6W');
+		InsertClassEvent($TourId, 0, 1, 'R6U',  'R', '6U');
+		InsertClassEvent($TourId, 0, 1, 'R7U',  'R', '7M');
+		InsertClassEvent($TourId, 0, 1, 'R7U',  'R', '7W');
+		InsertClassEvent($TourId, 0, 1, 'R7U',  'R', '7U');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AU');
 		// Compound Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
+		InsertClassEvent($TourId, 0, 1, 'C3U',  'C', '3M');
+		InsertClassEvent($TourId, 0, 1, 'C3U',  'C', '3W');
+		InsertClassEvent($TourId, 0, 1, 'C3U',  'C', '3U');
+		InsertClassEvent($TourId, 0, 1, 'C4U',  'C', '4M');
+		InsertClassEvent($TourId, 0, 1, 'C4U',  'C', '4W');
+		InsertClassEvent($TourId, 0, 1, 'C4U',  'C', '4U');
 		InsertClassEvent($TourId, 0, 1, 'C5M',  'C', '5M');
 		InsertClassEvent($TourId, 0, 1, 'C5W',  'C', '5W');
 		InsertClassEvent($TourId, 0, 1, 'C5U',  'C', '5M');
@@ -996,7 +1164,22 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'C5U',  'C', '7M');
 		InsertClassEvent($TourId, 0, 1, 'C5U',  'C', '7W');
 		InsertClassEvent($TourId, 0, 1, 'C5U',  'C', '7U');
+		InsertClassEvent($TourId, 0, 1, 'C6U',  'C', '6M');
+		InsertClassEvent($TourId, 0, 1, 'C6U',  'C', '6W');
+		InsertClassEvent($TourId, 0, 1, 'C6U',  'C', '6U');
+		InsertClassEvent($TourId, 0, 1, 'C7U',  'C', '7M');
+		InsertClassEvent($TourId, 0, 1, 'C7U',  'C', '7W');
+		InsertClassEvent($TourId, 0, 1, 'C7U',  'C', '7U');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AU');
 		// Barebow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
+		InsertClassEvent($TourId, 0, 1, 'B3U',  'B', '3M');
+		InsertClassEvent($TourId, 0, 1, 'B3U',  'B', '3W');
+		InsertClassEvent($TourId, 0, 1, 'B3U',  'B', '3U');
+		InsertClassEvent($TourId, 0, 1, 'B4U',  'B', '4M');
+		InsertClassEvent($TourId, 0, 1, 'B4U',  'B', '4W');
+		InsertClassEvent($TourId, 0, 1, 'B4U',  'B', '4U');
 		InsertClassEvent($TourId, 0, 1, 'B5M',  'B', '5M');
 		InsertClassEvent($TourId, 0, 1, 'B5W',  'B', '5W');
 		InsertClassEvent($TourId, 0, 1, 'B5U',  'B', '5M');
@@ -1012,7 +1195,22 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'B5U',  'B', '7M');
 		InsertClassEvent($TourId, 0, 1, 'B5U',  'B', '7W');
 		InsertClassEvent($TourId, 0, 1, 'B5U',  'B', '7U');
+		InsertClassEvent($TourId, 0, 1, 'B6U',  'B', '6M');
+		InsertClassEvent($TourId, 0, 1, 'B6U',  'B', '6W');
+		InsertClassEvent($TourId, 0, 1, 'B6U',  'B', '6U');
+		InsertClassEvent($TourId, 0, 1, 'B7U',  'B', '7M');
+		InsertClassEvent($TourId, 0, 1, 'B7U',  'B', '7W');
+		InsertClassEvent($TourId, 0, 1, 'B7U',  'B', '7U');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AU');
 		// Longbow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
+		InsertClassEvent($TourId, 0, 1, 'L3U',  'L', '3M');
+		InsertClassEvent($TourId, 0, 1, 'L3U',  'L', '3W');
+		InsertClassEvent($TourId, 0, 1, 'L3U',  'L', '3U');
+		InsertClassEvent($TourId, 0, 1, 'L4U',  'L', '4M');
+		InsertClassEvent($TourId, 0, 1, 'L4U',  'L', '4W');
+		InsertClassEvent($TourId, 0, 1, 'L4U',  'L', '4U');
 		InsertClassEvent($TourId, 0, 1, 'L5M',  'L', '5M');
 		InsertClassEvent($TourId, 0, 1, 'L5W',  'L', '5W');
 		InsertClassEvent($TourId, 0, 1, 'L5U',  'L', '5M');
@@ -1028,6 +1226,15 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'L5U',  'L', '7M');
 		InsertClassEvent($TourId, 0, 1, 'L5U',  'L', '7W');
 		InsertClassEvent($TourId, 0, 1, 'L5U',  'L', '7U');
+		InsertClassEvent($TourId, 0, 1, 'L6U',  'L', '6M');
+		InsertClassEvent($TourId, 0, 1, 'L6U',  'L', '6W');
+		InsertClassEvent($TourId, 0, 1, 'L6U',  'L', '6U');
+		InsertClassEvent($TourId, 0, 1, 'L7U',  'L', '7M');
+		InsertClassEvent($TourId, 0, 1, 'L7U',  'L', '7W');
+		InsertClassEvent($TourId, 0, 1, 'L7U',  'L', '7U');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AM');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AW');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AU');
 		}
 		
 		if ($SubRule==6) { // "All Classes WA 4 Pools" UNISEX allir aldursflokkar, útsláttarkeppni EINSTAKLINGA tenging COMPLETE - Breytt úr RJU í RU21U
@@ -1041,6 +1248,7 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'R5U',  'R', '5U');
 		InsertClassEvent($TourId, 0, 1, 'R6U',  'R', '6U');
 		InsertClassEvent($TourId, 0, 1, 'R7U',  'R', '7U');
+		InsertClassEvent($TourId, 0, 1, 'RAU',  'R', 'AU');
 		// Compound Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'CU',  'C', 'U');
 		InsertClassEvent($TourId, 0, 1, 'CU21U',  'C', 'U21U');
@@ -1052,6 +1260,7 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'C5U',  'C', '5U');
 		InsertClassEvent($TourId, 0, 1, 'C6U',  'C', '6U');
 		InsertClassEvent($TourId, 0, 1, 'C7U',  'C', '7U');
+		InsertClassEvent($TourId, 0, 1, 'CAU',  'C', 'AU');
 		// Barebow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'BU',  'B', 'U');
 		InsertClassEvent($TourId, 0, 1, 'BU21U',  'B', 'U21U');
@@ -1063,6 +1272,7 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'B5U',  'B', '5U');
 		InsertClassEvent($TourId, 0, 1, 'B6U',  'B', '6U');
 		InsertClassEvent($TourId, 0, 1, 'B7U',  'B', '7U');
+		InsertClassEvent($TourId, 0, 1, 'BAU',  'B', 'AU');
 		// Longbow Einstaklinga tenging, þeas hver má keppa í hvaða útslætti
 		InsertClassEvent($TourId, 0, 1, 'LU',  'L', 'U');
 		InsertClassEvent($TourId, 0, 1, 'LU21U',  'L', 'U21U');
@@ -1074,6 +1284,7 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) { //T
 		InsertClassEvent($TourId, 0, 1, 'L5U',  'L', '5U');
 		InsertClassEvent($TourId, 0, 1, 'L6U',  'L', '6U');
 		InsertClassEvent($TourId, 0, 1, 'L7U',  'L', '7U');
+		InsertClassEvent($TourId, 0, 1, 'LAU',  'L', 'AU');
 		}	
   
 	//TENGINGAR Í LIÐAÚTSLÆTTI
diff --git a/src/Modules/Sets/IT/Setup_Target.php b/src/Modules/Sets/IT/Setup_Target.php
index ddc23b74..fa90fb4a 100644
--- a/src/Modules/Sets/IT/Setup_Target.php
+++ b/src/Modules/Sets/IT/Setup_Target.php
@@ -293,6 +293,10 @@
 				CreateDistanceNew($TourId, $TourType, 'OLA_', array(array('60m-1',60)));
 				CreateDistanceNew($TourId, $TourType, 'OLR_', array(array('40m-1',40)));
 				CreateDistanceNew($TourId, $TourType, 'OLG_', array(array('25m-1',25)));
+				CreateDistanceNew($TourId, $TourType, 'COJ_', array(array('50m-1',50)));
+				CreateDistanceNew($TourId, $TourType, 'COA_', array(array('50m-1',50)));
+				CreateDistanceNew($TourId, $TourType, 'COR_', array(array('40m-1',40)));
+				CreateDistanceNew($TourId, $TourType, 'COG_', array(array('25m-1',25)));
 				CreateDistanceNew($TourId, $TourType, 'ANJ_', array(array('50m-1',50)));
 				CreateDistanceNew($TourId, $TourType, 'ANA_', array(array('40m-1',40)));
 				CreateDistanceNew($TourId, $TourType, 'ANR_', array(array('25m-1',25)));
diff --git a/src/Modules/Sets/NO/Setup_Field.php b/src/Modules/Sets/NO/Setup_Field.php
index 39512a38..c08c7270 100644
--- a/src/Modules/Sets/NO/Setup_Field.php
+++ b/src/Modules/Sets/NO/Setup_Field.php
@@ -43,7 +43,7 @@
 		CreateDistanceNew($TourId, $TourType, 'BR', array(array('Gul',0)));
 		CreateDistanceNew($TourId, $TourType, 'LB%', array(array('Gul',0)));
 		CreateDistanceNew($TourId, $TourType, 'T%', array(array('Gul',0)));
-		CreateDistanceNew($TourId, $TourType, 'PU%', array(array('Sort/Hvit',0)));
+		CreateDistanceNew($TourId, $TourType, 'OC%', array(array('Sort/Hvit',0)));
 	} else {
 		CreateDistanceNew($TourId, $TourType, '%', array(array('Bane',0)));
 	}
diff --git a/src/Modules/Sets/NO/Setup_Target.php b/src/Modules/Sets/NO/Setup_Target.php
index 35184959..e81ab8b1 100644
--- a/src/Modules/Sets/NO/Setup_Target.php
+++ b/src/Modules/Sets/NO/Setup_Target.php
@@ -34,7 +34,7 @@
         CreateDistanceNew($TourId, $TourType, 'C4', array(array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20)));
         CreateDistanceNew($TourId, $TourType, 'C5', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
         CreateDistanceNew($TourId, $TourType, 'B1', array(array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20)));
-        CreateDistanceNew($TourId, $TourType, 'B2', array(array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20)));
+        CreateDistanceNew($TourId, $TourType, 'B2', array(array('40 m',40), array('30 m',30), array('25 m',25), array('20 m',20)));
         CreateDistanceNew($TourId, $TourType, 'B3', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
         CreateDistanceNew($TourId, $TourType, 'B4', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
         CreateDistanceNew($TourId, $TourType, 'B5', array(array('25 m',25), array('20 m',20), array('15 m',15), array('10 m',10)));
@@ -48,7 +48,7 @@
         CreateDistanceNew($TourId, $TourType, 'LB3', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
         CreateDistanceNew($TourId, $TourType, 'LB4', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
         CreateDistanceNew($TourId, $TourType, 'LB5', array(array('25 m',25), array('20 m',20), array('15 m',15), array('10 m',10)));
-        CreateDistanceNew($TourId, $TourType, 'PU1', array(array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20)));
+        CreateDistanceNew($TourId, $TourType, 'OC1', array(array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20)));
 		break;
 	case 2: // 2xFITA
 		// only ordinary tournaments
@@ -64,7 +64,7 @@
 		CreateDistanceNew($TourId, $TourType,  'C4', array(array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20), array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20)));
         CreateDistanceNew($TourId, $TourType,  'C5', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15), array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
         CreateDistanceNew($TourId, $TourType,  'B1', array(array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20), array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20)));
-		CreateDistanceNew($TourId, $TourType,  'B2', array(array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20), array('50 m',50), array('40 m',40), array('30 m',30), array('20 m',20)));
+		CreateDistanceNew($TourId, $TourType,  'B2', array(array('40 m',40), array('30 m',30), array('25 m',25), array('20 m',20), array('40 m',40), array('30 m',30), array('25 m',25), array('20 m',20)));
 		CreateDistanceNew($TourId, $TourType,  'B3', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15), array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
 		CreateDistanceNew($TourId, $TourType,  'B4', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15), array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
         CreateDistanceNew($TourId, $TourType,  'B5', array(array('25 m',25), array('20 m',20), array('15 m',15), array('10 m',10), array('25 m',25), array('20 m',20), array('15 m',15), array('10 m',10)));
@@ -78,7 +78,7 @@
         CreateDistanceNew($TourId, $TourType, 'LB3', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15), array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
         CreateDistanceNew($TourId, $TourType, 'LB4', array(array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15), array('30 m',30), array('25 m',25), array('20 m',20), array('15 m',15)));
 		CreateDistanceNew($TourId, $TourType, 'LB5', array(array('25 m',25), array('20 m',20), array('15 m',15), array('10 m',10), array('25 m',25), array('20 m',20), array('15 m',15), array('10 m',10)));
-        CreateDistanceNew($TourId, $TourType, 'PU1', array(array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20)));
+        CreateDistanceNew($TourId, $TourType, 'OC1', array(array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20), array('20 m',20)));
 		break;
 	case 3: // 72 Round
 		switch($SubRule) {
@@ -111,7 +111,7 @@
                 CreateDistanceNew($TourId, $TourType, 'LB3', array(array('25 m',25), array('25 m',25)));
 				CreateDistanceNew($TourId, $TourType, 'LB4', array(array('25 m',25), array('25 m',25)));
                 CreateDistanceNew($TourId, $TourType, 'LB5', array(array('20 m',20), array('20 m',20)));
-                CreateDistanceNew($TourId, $TourType, 'PU1', array(array('20 m',20), array('20 m',20)));
+                CreateDistanceNew($TourId, $TourType, 'OC1', array(array('20 m',20), array('20 m',20)));
 				break;
 			case 3:
 				// Norges Runden
@@ -141,26 +141,43 @@
                 CreateDistanceNew($TourId, $TourType,  'T3', array(array('20 m',20), array('20 m',20)));
                 CreateDistanceNew($TourId, $TourType,  'T4', array(array('20 m',20), array('20 m',20)));
                 CreateDistanceNew($TourId, $TourType,  'T5', array(array('15 m',15), array('15 m',15)));
-				CreateDistanceNew($TourId, $TourType, 'PU1', array(array('20 m',20), array('20 m',20)));
+				CreateDistanceNew($TourId, $TourType, 'OC1', array(array('20 m',20), array('20 m',20)));
 				break;
 			case 4:
 				// Champs
-				CreateDistanceNew($TourId, $TourType, '%R', array(array('25 m',25), array('25 m',25)));
-				CreateDistanceNew($TourId, $TourType, 'R_', array(array('70 m',70), array('70 m',70)));
-				CreateDistanceNew($TourId, $TourType, 'R_U21',array(array('70 m',70), array('70 m',70)));
+                CreateDistanceNew($TourId, $TourType, 'R_U16',array(array('40 m',40), array('40 m',40)));
+                CreateDistanceNew($TourId, $TourType, 'C_U16',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'T_U16',array(array('25 m',25), array('25 m',25)));
+                CreateDistanceNew($TourId, $TourType, 'LB_U16',array(array('25 m',25), array('25 m',25)));
+                CreateDistanceNew($TourId, $TourType, 'B_U16',array(array('25 m',25), array('25 m',25)));
+
+                CreateDistanceNew($TourId, $TourType, 'R_U18',array(array('60 m',60), array('60 m',60)));
+                CreateDistanceNew($TourId, $TourType, 'C_U18',array(array('50 m',50), array('50 m',50)));
+                CreateDistanceNew($TourId, $TourType, 'T_U18',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'LB_U18',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'B_U18',array(array('40 m',40), array('40 m',40)));
+
+                CreateDistanceNew($TourId, $TourType, 'R_U21',array(array('70 m',70), array('70 m',70)));
+                CreateDistanceNew($TourId, $TourType, 'C_U21',array(array('50 m',50), array('50 m',50)));
+                CreateDistanceNew($TourId, $TourType, 'T_U21',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'LB_U21',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'B_U21',array(array('50 m',50), array('50 m',50)));
+
 				CreateDistanceNew($TourId, $TourType, 'R_5',array(array('60 m',60), array('60 m',60)));
-				CreateDistanceNew($TourId, $TourType, 'R_U18',array(array('60 m',60), array('60 m',60)));
-				CreateDistanceNew($TourId, $TourType, 'RR_',array(array('40 m',40), array('40 m',40)));
-				CreateDistanceNew($TourId, $TourType, 'CH%', array(array('50 m',50), array('50 m',50)));
-                CreateDistanceNew($TourId, $TourType, 'CD%', array(array('50 m',50), array('50 m',50)));
-				CreateDistanceNew($TourId, $TourType, 'CR_',array(array('30 m',30), array('30 m',30)));
-				CreateDistanceNew($TourId, $TourType, 'T_i', array(array('30 m',30), array('30 m',30)));
-				CreateDistanceNew($TourId, $TourType, 'LB_i', array(array('30 m',30), array('30 m',30)));
-                CreateDistanceNew($TourId, $TourType, 'B_i', array(array('50 m',50), array('50 m',50)));
-                CreateDistanceNew($TourId, $TourType, 'BU18',array(array('50 m',50), array('50 m',50)));
-                CreateDistanceNew($TourId, $TourType, 'LBU18', array(array('30 m',30), array('30 m',30)));
-                CreateDistanceNew($TourId, $TourType, 'TU18', array(array('30 m',30), array('30 m',30)));
-                CreateDistanceNew($TourId, $TourType, '%F', array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'C_5',array(array('50 m',50), array('50 m',50)));
+                CreateDistanceNew($TourId, $TourType, 'T_5',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'LB_5',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'B_5',array(array('50 m',50), array('50 m',50)));
+
+                CreateDistanceNew($TourId, $TourType, 'R_',array(array('70 m',70), array('70 m',70)));
+                CreateDistanceNew($TourId, $TourType, 'C_',array(array('50 m',50), array('50 m',50)));
+                CreateDistanceNew($TourId, $TourType, 'T_',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'LB_',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'B_',array(array('50 m',50), array('50 m',50)));
+
+                CreateDistanceNew($TourId, $TourType, 'VI%',array(array('30 m',30), array('30 m',30)));
+                CreateDistanceNew($TourId, $TourType, 'OC%',array(array('20 m',20), array('20 m',20)));
+
 				break;
 		}
 		break;
@@ -192,7 +209,7 @@
             CreateDistanceNew($TourId, $TourType,'LB3', array(array('25 m',25), array('20 m',20), array('15 m',15)));
             CreateDistanceNew($TourId, $TourType,'LB4', array(array('25 m',25), array('20 m',20), array('15 m',15)));
             CreateDistanceNew($TourId, $TourType,'LB5', array(array('20 m',20), array('15 m',15), array('10 m',10)));
-            CreateDistanceNew($TourId, $TourType,'PU1', array(array('20 m',20), array('20 m',20), array('20 m',20)));
+            CreateDistanceNew($TourId, $TourType,'OC1', array(array('20 m',20), array('20 m',20), array('20 m',20)));
 			CreateDistanceNew($TourId, $TourType, 'F6', array(array('20 m',20), array('15 m',15), array('10 m',10)));
 		} else {
 			// Norsk kortrunde
@@ -222,7 +239,7 @@
             CreateDistanceNew($TourId, $TourType, 'T3', array(array('25 m',25), array('20 m',20), array('15 m',15)));
             CreateDistanceNew($TourId, $TourType, 'T2', array(array('25 m',25), array('20 m',20), array('15 m',15)));
             CreateDistanceNew($TourId, $TourType, 'T1', array(array('30 m',30), array('25 m',25), array('20 m',20)));
-            CreateDistanceNew($TourId, $TourType,'PU1', array(array('20 m',20), array('20 m',20), array('20 m',20)));
+            CreateDistanceNew($TourId, $TourType,'OC1', array(array('20 m',20), array('20 m',20), array('20 m',20)));
 		}
 		break;
 	case 6:
@@ -236,7 +253,7 @@
 			CreateDistanceNew($TourId, $TourType, '_1', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'LB1', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'VI1', array(array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'PU1', array(array('12m-1',12), array('12m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'OC1', array(array('12m-1',12), array('12m-2',18)));
 		} else {
 			// Champs
 			CreateDistanceNew($TourId, $TourType, 'T%', array(array('18m-1',18), array('18m-2',18)));
@@ -245,7 +262,7 @@
             CreateDistanceNew($TourId, $TourType, 'R%', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'C%', array(array('18m-1',18), array('18m-2',18)));
             CreateDistanceNew($TourId, $TourType, 'VI%', array(array('18m-1',18), array('18m-2',18)));
-            CreateDistanceNew($TourId, $TourType, 'PU%', array(array('12m-1',12), array('12m-2',18)));
+            CreateDistanceNew($TourId, $TourType, 'OC%', array(array('12m-1',12), array('12m-2',18)));
 		}
 		break;
 	case 7:
@@ -258,7 +275,7 @@
         CreateDistanceNew($TourId, $TourType, '_1', array(array('25m-1',25), array('25m-2',25)));
         CreateDistanceNew($TourId, $TourType, 'LB1', array(array('25m-1',25), array('25m-2',25)));
         CreateDistanceNew($TourId, $TourType, 'VI1', array(array('25m-1',25), array('25m-2',25)));
-        CreateDistanceNew($TourId, $TourType, 'PU1', array(array('16m-1',16), array('16m-2',16)));
+        CreateDistanceNew($TourId, $TourType, 'OC1', array(array('16m-1',16), array('16m-2',16)));
         break;
 	case 8:
 		// ordinary tournaments
@@ -270,7 +287,7 @@
         CreateDistanceNew($TourId, $TourType, '_1', array(array('25m-1',25), array('25m-2',25), array('18m-1',18), array('18m-2',18)));
         CreateDistanceNew($TourId, $TourType, 'LB1', array(array('25m-1',25), array('25m-2',25), array('18m-1',18), array('18m-2',18)));
         CreateDistanceNew($TourId, $TourType, 'VI1', array(array('25m-1',25), array('25m-2',25), array('18m-1',18), array('18m-2',18)));
-        CreateDistanceNew($TourId, $TourType, 'PU1', array(array('16m-1',16), array('16m-2',16), array('12m-1',12), array('12m-2',12)));
+        CreateDistanceNew($TourId, $TourType, 'OC1', array(array('16m-1',16), array('16m-2',16), array('12m-1',12), array('12m-2',12)));
         break;
 	case 18:
 		// only with Finals
@@ -299,7 +316,7 @@
             CreateDistanceNew($TourId, $TourType, '_1', array(array('18m-1',18)));
             CreateDistanceNew($TourId, $TourType, 'LB1', array(array('18m-1',18)));
             CreateDistanceNew($TourId, $TourType, 'VI1', array(array('18m-1',18)));
-            CreateDistanceNew($TourId, $TourType, 'PU2', array(array('12m-1',12)));
+            CreateDistanceNew($TourId, $TourType, 'OC2', array(array('12m-1',12)));
 
 		} else {
 			// Champs
@@ -348,6 +365,7 @@
 			// Championship
 			CreateTargetFace($TourId, $i++, '~Default', '%', '1', TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
 			CreateTargetFace($TourId, $i++, '~5-X', 'C%', '1',  TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
+            CreateTargetFace($TourId, $i++, '80cm', 'VI%', '1',  TGT_OUT_FULL, 80, TGT_OUT_FULL, 80);
 //			CreateTargetFace($TourId, $i++, '~5-X', 'CKJ', '1',  9, 80, 9, 80);
 //			CreateTargetFace($TourId, $i++, '~5-X', 'CKG', '1',  9, 80, 9, 80);
 		} else {
@@ -361,7 +379,7 @@
 		if($SubRule==2) {
 			// Norsk Kortrunde
             CreateTargetFace($TourId, $i++, '~5-X', 'REG-^C[12]|^R[1]', '1',  TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80, TGT_OUT_5_big10, 80);
-            CreateTargetFace($TourId, $i++, '~5-X', 'REG-^PU', '1',  TGT_OUT_FULL, 122, TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
+            CreateTargetFace($TourId, $i++, '~5-X', 'REG-^OC', '1',  TGT_OUT_FULL, 122, TGT_OUT_FULL, 122, TGT_OUT_FULL, 122);
             CreateTargetFace($TourId, $i++, '~Default', '%', '1',  TGT_OUT_FULL, 80, TGT_OUT_FULL, 80, TGT_OUT_FULL, 80);
 //			// optional target faces
 
@@ -373,34 +391,35 @@
 	case 22:
 		if($SubRule==3) {
 			// Champs
-			CreateTargetFace($TourId, $i++, '~Standard 40', 'REG-(^R[DH]|^B[DH])', '1', TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
-			CreateTargetFace($TourId, $i++, '~Standard 40 CO', 'REG-^C[KDH]', '1', TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
-			CreateTargetFace($TourId, $i++, '~Standard 60', 'REG-^T|^LB|^[^C]R|^VI|^PU', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60);
-			CreateTargetFace($TourId, $i++, '~Standard 60 CO', 'REG-^CR', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
-//			// optional target faces
-			CreateTargetFace($TourId, $i++, 'Vegas', 'REG-(^R[DH]|^B[HD]i$)', '',  TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
-            CreateTargetFace($TourId, $i++, 'Trippel 60', 'REG-(^T[HD]i$|^LB[HD]i$)', '',  TGT_IND_6_big10, 60, TGT_IND_6_big10, 60);
+			CreateTargetFace($TourId, $i++, 'Tripple 40cm', 'REG-(^R[D|H](?!U16)|^B[D|H]$)', '1', TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
+            CreateTargetFace($TourId, $i++, 'Tripple 40cm CO', 'REG-(^C[D|H](|5|U21|U18)$)', '1', TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
+            CreateTargetFace($TourId, $i++, '40cm (1-10)', 'REG-(^B[D|H](U21|U18|5)$)|((^T|^LB)[D|H](5){0,1})$', '1', TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
+            CreateTargetFace($TourId, $i++, '40cm (1-10)', 'REG-(^R[D|H](|5|U21|U18)$|^B[D|H]$)', '', TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
+			CreateTargetFace($TourId, $i++, '60cm (1-10)', 'REG-((^R|^T|^B|^LB)[D|H]U16)$|((^T|^LB)[D|H](U21|U18))$|^VI|^OC', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60);
+            CreateTargetFace($TourId, $i++, 'Tripple 60cm', 'REG-^C[D|H]U16$', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
 		} else {
 			CreateTargetFace($TourId, $i++, '~Standard 60', '%', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60); // most of the "small" class use big targets!
 			CreateTargetFace($TourId, $i++, '~Standard 40', 'REG-^(R2|T1|LB1)', '1', TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
-			CreateTargetFace($TourId, $i++, '~Trippel 40 CO', 'REG-C[12]', '1', TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
-			CreateTargetFace($TourId, $i++, '~Trippel 60 CO', 'REG-C[345]', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
+			CreateTargetFace($TourId, $i++, '~Trippel 40 CO', 'REG-^C[12]', '1', TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
+			CreateTargetFace($TourId, $i++, '~Trippel 60 CO', 'REG-^C[345]', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
             //CreateTargetFace($TourId, $i++, '~Trippel 60', 'REG-^(LB1|IN1)', '1',  2, 60, 2, 60);
-			CreateTargetFace($TourId, $i++, '~Trippel 40', 'REG-^(R1|B1)', '1',  TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
+            CreateTargetFace($TourId, $i++, '~Trippel 40', 'REG-^R1', '1',  TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
+            CreateTargetFace($TourId, $i++, '~Standard 40', 'REG-(^B1|^B2)', '1',  TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
+            CreateTargetFace($TourId, $i++, '~Trippel 40', 'REG-^B1', '0',  TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
 		}
 		break;
 	case 7:
 		CreateTargetFace($TourId, $i++, '~Standard 80', '%', '1', TGT_IND_1_big10, 80, TGT_IND_1_big10, 80); // most of the "small" class use big targets!
 		CreateTargetFace($TourId, $i++, '~Standard 60', 'REG-^(R2|B1|T1|LB1)', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60);
-		CreateTargetFace($TourId, $i++, '~Trippel 60 CO', 'REG-C[12]', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
-		CreateTargetFace($TourId, $i++, '~80 6-10', 'REG-C[345]', '1', TGT_IND_6_small10, 80, TGT_IND_6_small10, 80);
-		CreateTargetFace($TourId, $i++, '~Trippel 60', 'REG-R1', '1',  TGT_IND_6_big10, 60, TGT_IND_6_big10, 60);
+		CreateTargetFace($TourId, $i++, '~Trippel 60 CO', 'REG-^C[12]', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
+		CreateTargetFace($TourId, $i++, '~80 6-10', 'REG-^C[345]', '1', TGT_IND_6_small10, 80, TGT_IND_6_small10, 80);
+		CreateTargetFace($TourId, $i++, '~Trippel 60', 'REG-^R1', '1',  TGT_IND_6_big10, 60, TGT_IND_6_big10, 60);
 		break;
 	case 8:
 		CreateTargetFace($TourId, $i++, '~Standard 80/60', '%', '1', TGT_IND_1_big10, 80, TGT_IND_1_big10, 80, TGT_IND_1_big10, 60, TGT_IND_1_big10, 60); // most of the "small" class use big targets!
 		CreateTargetFace($TourId, $i++, '~Standard 60/40', 'REG-^(R2|B1|T1|LB1)', '1', TGT_IND_1_big10, 60, TGT_IND_1_big10, 60, TGT_IND_1_big10, 40, TGT_IND_1_big10, 40);
-		CreateTargetFace($TourId, $i++, '~Trippel 60/40 CO', 'REG-C[12]', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60, TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
-		CreateTargetFace($TourId, $i++, '~80 6-10/Trippel 60 CO', 'REG-C[345]', '1', TGT_IND_6_small10, 80, TGT_IND_6_small10, 80, TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
+		CreateTargetFace($TourId, $i++, '~Trippel 60/40 CO', 'REG-^C[12]', '1', TGT_IND_6_small10, 60, TGT_IND_6_small10, 60, TGT_IND_6_small10, 40, TGT_IND_6_small10, 40);
+		CreateTargetFace($TourId, $i++, '~80 6-10/Trippel 60 CO', 'REG-^C[345]', '1', TGT_IND_6_small10, 80, TGT_IND_6_small10, 80, TGT_IND_6_small10, 60, TGT_IND_6_small10, 60);
         CreateTargetFace($TourId, $i++, '~Trippel 60/40', 'REG-^R1', '1',  TGT_IND_6_big10, 60, TGT_IND_6_big10, 60,  TGT_IND_6_big10, 40, TGT_IND_6_big10, 40);
 		break;
 }
diff --git a/src/Modules/Sets/NO/lib.php b/src/Modules/Sets/NO/lib.php
index 69fc9d4f..aa6376d9 100644
--- a/src/Modules/Sets/NO/lib.php
+++ b/src/Modules/Sets/NO/lib.php
@@ -36,7 +36,7 @@ function CreateStandardDivisions($TourId, $Type=1, $SubRule=0) {
 	if($Type==11 or $Type==17) {
         CreateDivision($TourId, $i++, 'BU', 'Buejeger');
     } else {
-        CreateDivision($TourId, $i++, 'PU', 'Psykisk Utviklingshemmet');
+        CreateDivision($TourId, $i++, 'OC', 'Open Class');
     }
     if(($Type==3 AND $SubRule==4) OR $Type==6 OR $Type==7 OR $Type==8 OR $Type==22) {
         CreateDivision($TourId, $i++, 'VI', 'Visual Impaired', 1, 'VI','VI', true);
@@ -66,8 +66,8 @@ function CreateStandardClasses($TourId, $SubRule, $Type) {
 		if($Field) {
 			// 3D champs
 			CreateClass($TourId, $i++, 13, 15, -1, 'R', 'R,K,Di,Hi', 'Rekrutt', 1, 'B,T,LB');
-			CreateClass($TourId, $i++, 13, 15, 1, 'RJ', 'RJ,DU18,DU21,D', 'Rekrutt Jenter', 1, 'C,R');
-			CreateClass($TourId, $i++, 13, 15, 0, 'RG', 'RG,HU18,HU21,H', 'Rekrutt Gutter', 1, 'C,R');
+			CreateClass($TourId, $i++, 13, 15, 1, 'RJ', 'RJ,DU18,DU21,D', 'Damer U16', 1, 'C,R');
+			CreateClass($TourId, $i++, 13, 15, 0, 'RG', 'RG,HU18,HU21,H', 'Herrer U16', 1, 'C,R');
 			CreateClass($TourId, $i++, 16, 17, -1, 'U18', 'U18,Di,Hi', 'Under 18', 1, 'B,T,LB');
 			CreateClass($TourId, $i++, 16, 17, 1, 'DU18', 'DU18,DU21,D', 'Damer Under 18', 1, 'C,R');
 			CreateClass($TourId, $i++, 16, 17, 0, 'HU18', 'HU18,HU21,H', 'Herrer Under 18', 1, 'C,R');
@@ -80,32 +80,24 @@ function CreateStandardClasses($TourId, $SubRule, $Type) {
 			if($Type==11 or $Type==17) {
                 CreateClass($TourId, $i++, 13, 99, -1, 'BU', 'BU', 'Buejeger', 1, 'BU');
             } else {
-                CreateClass($TourId, $i++, 13, 99, 0, 'F', 'F', 'Felles', 1, 'PU');
+                CreateClass($TourId, $i++, 13, 99, 0, 'F', 'F', 'Felles', 1, 'OC');
             }
 		} else {
 			// Outdoor and Indoor champs
             $Indoor = ($Type==6 OR $Type==7 OR $Type==8 OR $Type==22);
-            if(!$Indoor) {
-                CreateClass($TourId, $i++, 13, 15, -1, 'R', 'R,K,Di,Hi', 'Rekrutt', 1, 'B,T,LB');
-            }
-            CreateClass($TourId, $i++, 13, 15, 1, 'RJ', 'RJ,HU18,DU21,D', 'Rekrutt Jenter', 1, 'C,R'.($Indoor ? ',B,LB,T':''));
-            CreateClass($TourId, $i++, 13, 15, 0, 'RG', 'RG,DU18,HU21,H', 'Rekrutt Gutter', 1, 'C,R'.($Indoor ? ',B,LB,T':''));
-            if(!$Indoor) {
-                CreateClass($TourId, $i++, 16, 17, -1, 'U18', 'U18,Di,Hi', 'Under 18', 1, 'B,T,LB');
-            }
-            CreateClass($TourId, $i++, 16, 17, 1, 'DU18', 'DU18,HU21,H', 'Damer Under 18', 1, 'C,R'.($Indoor ? ',B,LB,T':''));
-            CreateClass($TourId, $i++, 16, 17, 0, 'HU18', 'HU18,DU21,D', 'Herrer Under 18', 1, 'C,R'.($Indoor ? ',B,LB,T':''));
-            CreateClass($TourId, $i++, 18, 20, 1, 'DU21', 'DU21,D', 'Damer Under 21', 1, 'C,R'.($Indoor ? ',B,LB,T':''));
-            CreateClass($TourId, $i++, 18, 20, 0, 'HU21', 'HU21,H', 'Herrer Under 21', 1, 'C,R'.($Indoor ? ',B,LB,T':''));
-            CreateClass($TourId, $i++, 50, 99, 1, 'D5', 'D5,D', 'Damer 50', 1, 'C,R');
-            CreateClass($TourId, $i++, 50, 99, 0, 'H5', 'H5,H', 'Herrer 50', 1, 'C,R');
-            CreateClass($TourId, $i++, 21, 99, 1, 'Di', 'Di', 'Damer', 1, 'B,T,LB');
-            CreateClass($TourId, $i++, 21, 99, 0, 'Hi', 'Hi', 'Herrer', 1, 'B,T,LB');
-            CreateClass($TourId, $i++, 21, 49, 1, 'D', 'D', 'Damer', 1, 'C,R');
-            CreateClass($TourId, $i++, 21, 49, 0, 'H', 'H', 'Herrer', 1, 'C,R');
-            if($Indoor OR ($Type==3  and $SubRule==4)) {
-                CreateClass($TourId, $i++, 13, 99, 0, 'F', 'F', 'Felles', 1, 'VI,PU');
-            }
+            CreateClass($TourId, $i++, 1, 15, 1, 'DU16', 'DU16,DU18,DU21,D', 'Damer Under 16', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 1, 15, 0, 'HU16', 'HU16,HU18,HU21,H', 'Herrer Under 16', 1, 'C,R,B,LB,T');
+
+            CreateClass($TourId, $i++, 16, 17, 1, 'DU18', 'DU18,DU21,D', 'Damer Under 18', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 16, 17, 0, 'HU18', 'HU18,HU21,H', 'Herrer Under 18', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 18, 20, 1, 'DU21', 'DU21,D', 'Damer Under 21', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 18, 20, 0, 'HU21', 'HU21,H', 'Herrer Under 21', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 50, 99, 1, 'D5', 'D5,D', 'Damer 50', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 50, 99, 0, 'H5', 'H5,H', 'Herrer 50', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 21, 49, 1, 'D', 'D', 'Damer', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 21, 49, 0, 'H', 'H', 'Herrer', 1, 'C,R,B,LB,T');
+            CreateClass($TourId, $i++, 1, 99, -1, 'VI', 'VI', 'Visually Impaired', 1, 'VI','','',true);
+            CreateClass($TourId, $i++, 1, 99, -1, 'OC', 'OC', 'Open Class', 1, 'OC','','',true);
 		}
 
 		// non competing classes
@@ -138,26 +130,24 @@ function CreateStandardClasses($TourId, $SubRule, $Type) {
 			CreateClass($TourId, $i++, 14, 15, -1, '4', '1,2,3,4', '4', 1, 'B,C,T,LB,R');
 			CreateClass($TourId, $i++, 16, 100, -1, '3', '1,2,3', '3', 1, 'B,C,T,LB,R');
 			CreateClass($TourId, $i++, 16, 100, -1, '2', '1,2', '2', 1, 'B,C,T,LB,R');
-			CreateClass($TourId, $i++, 16, 100, -1, '1', '1', '1', 1, 'B,C,T,LB,R,PU' . ($Indoor ? ',VI' : '' ));
+			CreateClass($TourId, $i++, 16, 100, -1, '1', '1', '1', 1, 'B,C,T,LB,R,OC' . ($Indoor ? ',VI' : '' ));
 		}
 	}
 }
 
 function CreateStandardSubClasses($TourId) {
 	$i=1;
-	CreateSubClass($TourId, $i++, 'R', 'R');
-	CreateSubClass($TourId, $i++, 'K', 'K');
-	CreateSubClass($TourId, $i++, 'Jr', 'Jr');
+	CreateSubClass($TourId, $i++, '16', 'U16');
+	CreateSubClass($TourId, $i++, '18', 'U18');
+	CreateSubClass($TourId, $i++, '21', 'U21');
 	CreateSubClass($TourId, $i++, 'Sr', 'Sr');
 	CreateSubClass($TourId, $i++, '50', '50');
 }
 
 function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
-    $TargetF=($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
-    $TargetR=($Outdoor ? TGT_OUT_FULL : TGT_IND_6_big10);
-    $TargetB=($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
+    $TargetF= ($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
 	$TargetRY=($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
-	$TargetC=($Outdoor ? TGT_OUT_5_big10 : TGT_IND_6_small10);
+
 	$SetC=($Outdoor?0:1);
 	$Phase=16;
 	$Champs=(($SubRule==3 and $TourType==6)
@@ -166,106 +156,133 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
 // 			or ($SubRule==7 and $Type==11)
 // 			or ($SubRule==9 and $Type==17)
 			);
-	$TargetSizeC=($Outdoor ? 80 : 40);
-	$TargetSizeR=($Outdoor ? 122 : 40);
-    $TargetSizeB=($Outdoor ? 122 : 60);
-	$DistanceR=($Outdoor ? 70 : 18);
+
+
 	$DistanceRW=($Outdoor ? 60 : 18);
-	$DistanceT=($Outdoor ? 30 : 18);
+
 	$DistanceB=($Outdoor ? 40 : 18);
-	$DistanceC=($Outdoor ? 50 : 18);
+    $DistanceB50=($Outdoor ? 50 : 18);
 	$DistanceF=($Outdoor ? 25 : 18);
-    $DistancePUF=($Outdoor ? 20 : 12);
+    $DistanceOCF=($Outdoor ? 20 : 12);
+
+
+    $TargetR=($Outdoor ? TGT_OUT_FULL : TGT_IND_6_big10);
+    $TargetSizeR=($Outdoor ? 122 : 40);
+    $TargetSizeR16=($Outdoor ? 122 : 60);
+    $DistanceR=($Outdoor ? 70 : 18);
+    $DistanceR50=($Outdoor ? 60 : 18);
+    $DistanceR16=($Outdoor ? 40 : 18);
+    $TargetC=($Outdoor ? TGT_OUT_5_big10 : TGT_IND_6_small10);
+    $TargetSizeC=($Outdoor ? 80 : 40);
+    $TargetSizeC16=($Outdoor ? 80 : 60);
+    $DistanceC=($Outdoor ? 50 : 18);
+    $DistanceC16=($Outdoor ? 30 : 18);
+    $TargetB=($Outdoor ? TGT_OUT_FULL : TGT_IND_6_big10);
+    $TargetLBT=($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
+    $TargetSizeBLBT=($Outdoor ? 122 : 40);
+    $TargetSizeBLBT16=($Outdoor ? 122 : 60);
+    $DistanceB=($Outdoor ? 50 : 18);
+    $DistanceB18=($Outdoor ? 40 : 18);
+    $DistanceLBT=($Outdoor ? 30 : 18);
+    $DistanceBLBT16=($Outdoor ? 25 : 18);
+
+    $TargetVI=($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
+    $TargetSizeVI=($Outdoor ? 80 : 60);
+    $DistanceVI=($Outdoor ? 30 : 18);
+    $TargetOC=($Outdoor ? TGT_OUT_FULL : TGT_IND_1_big10);
+    $TargetSizeOC=($Outdoor ? 122 : 60);
+    $DistanceOC=($Outdoor ? 20 : 12);
 
 	if($Champs) {
         // only Indoor and 70m Round
         $i=1;
-        if($Outdoor) {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'LBR', 'Langbue Rekrutt', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceF);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'TR', 'Tradisjonell Rekrutt', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceF);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BR', 'Barebow Rekrutt', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceF);
-        } else {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'LBRJ', 'Langbue Rekrutt Jenter', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceF);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'TRJ', 'Tradisjonell Rekrutt Jenter', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceF);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BRJ', 'Barebow Rekrutt Jenter', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceF);
-        }
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CRJ',  'Compound Rekrutt Jenter', 0, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceT);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'RRJ',  'Recurve Rekrutt Jenter', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-        if(!$Outdoor) {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'LBRG',  'Langbue Rekrutt Gutter', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'TRG',  'Tradisjonell Rekrutt Gutter', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BRG',  'Barebow Rekrutt Gutter', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-        }
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CRG',  'Compound Rekrutt Gutter', 0, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceT);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'RRG',  'Recurve Rekrutt Gutter', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-        if($Outdoor) {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'LBU18',  'Langbue Under 18', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'TU18',  'Tradisjonell Under 18', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'BU18',  'Barebow Under 18', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceB);
-        } else {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'LBDU18',  'Langbue Damer Under 18 ', 1, 240, 255, 0, 0, '', 'LU18W', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'TDU18',  'Tradisjonell Damer Under 18 ', 1, 240, 255, 0, 0, '', 'TU18W', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'BDU18',  'Barebow Damer Under 18 ', 1, 240, 255, 0, 0, 'BU18W', 'BU18W', $TargetSizeR, $DistanceB);
-        }
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CDU18',  'Compound Damer Under 18 ', 0, 240, 255, 0, 0, 'CU18W', 'CU18W', $TargetSizeC, $DistanceC);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RDU18',  'Recurve Damer Under 18 ', 1, 240, 255, 0, 0, 'RU18W', 'RU18W', $TargetSizeR, $DistanceRW);
-        if(!$Outdoor) {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'LBHU18',  'Langbue Herrer Under 18 ', 1, 240, 255, 0, 0, '', 'LU18M', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'THU18',  'Tradisjonell Herrer Under 18 ', 1, 240, 255, 0, 0, '', 'TU18M', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'BHU18',  'Barebow Herrer Under 18 ', 1, 240, 255, 0, 0, 'BU18M', 'BU18M', $TargetSizeR, $DistanceB);
-        }
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CHU18',  'Compound Herrer Under 18 ', 0, 240, 255, 0, 0, 'CU18M', 'CU18M', $TargetSizeC, $DistanceC);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RHU18',  'Recurve Herrer Under 18 ', 1, 240, 255, 0, 0, 'RU18M', 'RU18M', $TargetSizeR, $DistanceRW);
-        if(!$Outdoor) {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'LBDU21',  'Langbue Damer Under 21', 1, 240, 255, 0, 0, '', 'LU21W', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'TDU21',  'Tradisjonell Damer Under 21', 1, 240, 255, 0, 0, '', 'TU21W', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'BDU21',  'Barebow Damer Under 21', 1, 240, 255, 0, 0, 'BU21W', 'BU21W', $TargetSizeR, $DistanceB);
-        }
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CDU21',  'Compound Damer Under 21', 0, 240, 255, 0, 0, 'CU21W', 'CU21W', $TargetSizeC, $DistanceC);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RDU21',  'Recurve Damer Under 21', 1, 240, 255, 0, 0, 'RU21W', 'RU21W', $TargetSizeR, $DistanceR);
-        if(!$Outdoor) {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'LBHU21',  'Langbue Herrer Under 21', 1, 240, 255, 0, 0, '', 'LU21M', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'THU21',  'Tradisjonell Herrer Under 21', 1, 240, 255, 0, 0, '', 'TU21M', $TargetSizeB, $DistanceT);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'BHU21',  'Barebow Herrer Under 21', 1, 240, 255, 0, 0, 'BU21M', 'BU21M', $TargetSizeR, $DistanceB);
-        }
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CHU21',  'Compound Herrer Under 21', 0, 240, 255, 0, 0, 'CU21M', 'CU21M', $TargetSizeC, $DistanceC);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RHU21',  'Recurve Herrer Under 21', 1, 240, 255, 0, 0, 'RU21M', 'RU21M', $TargetSizeR, $DistanceR);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CD5',  'Compound Damer 50', 0, 240, 255, 0, 0, 'C50W', 'C50W', $TargetSizeC, $DistanceC);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RD5',  'Recurve Damer 50', 1, 240, 255, 0, 0, 'R50W', 'R50W', $TargetSizeR, $DistanceRW);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CH5',  'Compound Herrer 50', 0, 240, 255, 0, 0, 'C50M', 'C50M', $TargetSizeC, $DistanceC);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RH5',  'Recurve Herrer 50', 1, 240, 255, 0, 0, 'R50M', 'R50M', $TargetSizeR, $DistanceRW);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'LBDi',  'Langbue Damer', 1, 240, 255, 0, 0, '', 'LW', $TargetSizeR, $DistanceT);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'TDi',  'Tradisjonell Damer', 1, 240, 255, 0, 0, '', 'TW', $TargetSizeR, $DistanceT);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'BDi',  'Barebow Damer', 1, 240, 255, 0, 0, 'BW', 'BW', $TargetSizeR, $DistanceRW);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LD',  'Langbue Damer', 1, 240, 255, 0, 0, '', 'LW', $TargetSizeBLBT, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TD',  'Tradisjonell Damer', 1, 240, 255, 0, 0, '', 'TW', $TargetSizeBLBT, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BD',  'Barebow Damer', 1, 240, 255, 0, 0, 'BW', 'BW', $TargetSizeBLBT, $DistanceB);
         CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CD',  'Compound Damer', 0, 240, 255, 0, 0, 'CW', 'CW', $TargetSizeC, $DistanceC);
         CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RD',  'Recurve Damer', 1, 240, 255, 0, 0, 'RW', 'RW', $TargetSizeR, $DistanceR);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'LBHi',  'Langbue Herrer', 1, 240, 255, 0, 0, '', 'LM', $TargetSizeR, $DistanceT);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'THi',  'Tradisjonell Herrer', 1, 240, 255, 0, 0, '', 'TM', $TargetSizeR, $DistanceT);
-        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'BHi',  'Barebow Herrer', 1, 240, 255, 0, 0, 'BM', 'BM', $TargetSizeR, $DistanceRW);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LH',  'Langbue Herrer', 1, 240, 255, 0, 0, '', 'LM', $TargetSizeBLBT, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TH',  'Tradisjonell Herrer', 1, 240, 255, 0, 0, '', 'TM', $TargetSizeBLBT, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BH',  'Barebow Herrer', 1, 240, 255, 0, 0, 'BM', 'BM', $TargetSizeBLBT, $DistanceB);
         CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CH',  'Compound Herrer', 0, 240, 255, 0, 0, 'CM', 'CM', $TargetSizeC, $DistanceC);
         CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RH',  'Recurve Herrer', 1, 240, 255, 0, 0, 'RM', 'RM', $TargetSizeR, $DistanceR);
-        if(!$Outdoor) {
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetF, 5, 3, 1, 5, 3, 1, 'PUF', 'Psykisk Utviklingshemmet', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistancePUF);
-            CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetF, 5, 3, 1, 5, 3, 1, 'VIF', 'Visually Impaired', 1, 240, 255, 0, 0, '', '', $TargetSizeB, $DistanceT);
-        }
+
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LD21',  'Langbue Damer Under 21', 1, 240, 255, 0, 0, '', 'LU21W', $TargetSizeBLBT16, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TD21',  'Tradisjonell Damer Under 21', 1, 240, 255, 0, 0, '', 'U21', $TargetSizeBLBT16, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BD21',  'Barebow Damer Under 21', 1, 240, 255, 0, 0, 'BU21W', 'BU21W', $TargetSizeBLBT, $DistanceB);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CD21',  'Compound Damer Under 21', 0, 240, 255, 0, 0, 'CU21W', 'CU21W', $TargetSizeC, $DistanceC);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RD21',  'Recurve Damer Under 21', 1, 240, 255, 0, 0, 'RU21W', 'RU21W', $TargetSizeR, $DistanceR);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LH21',  'Langbue Herrer Under 21', 1, 240, 255, 0, 0, '', 'LU21M', $TargetSizeBLBT16, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TH21',  'Tradisjonell Herrer Under 21', 1, 240, 255, 0, 0, '', 'TU21M', $TargetSizeBLBT16, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BH21',  'Barebow Herrer Under 21', 1, 240, 255, 0, 0, 'BU21M', 'BU21M', $TargetSizeBLBT, $DistanceB);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CH21',  'Compound Herrer Under 21', 0, 240, 255, 0, 0, 'CU21M', 'CU21M', $TargetSizeC, $DistanceC);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RH21',  'Recurve Herrer Under 21', 1, 240, 255, 0, 0, 'RU21M', 'RU21M', $TargetSizeR, $DistanceR);
+
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LD18',  'Langbue Damer Under 18', 1, 240, 255, 0, 0, '', 'LU18W', $TargetSizeBLBT16, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TD18',  'Tradisjonell Damer Under 18', 1, 240, 255, 0, 0, '', 'TU18W', $TargetSizeBLBT16, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BD18',  'Barebow Damer Under 18', 1, 240, 255, 0, 0, 'BU18W', 'BU18W', $TargetSizeBLBT, $DistanceB18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CD18',  'Compound Damer Under 18', 0, 240, 255, 0, 0, 'CU18W', 'CU18W', $TargetSizeC, $DistanceC);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RD18',  'Recurve Damer Under 18', 1, 240, 255, 0, 0, 'RU18W', 'RU18W', $TargetSizeR, $DistanceR50);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LH18',  'Langbue Herrer Under 18', 1, 240, 255, 0, 0, '', 'LU18M', $TargetSizeBLBT16, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TH18',  'Tradisjonell Herrer Under 18', 1, 240, 255, 0, 0, '', 'TU18M', $TargetSizeBLBT16, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BH18',  'Barebow Herrer Under 18', 1, 240, 255, 0, 0, 'BU18M', 'BU18M', $TargetSizeBLBT, $DistanceB18);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CH18',  'Compound Herrer Under 18', 0, 240, 255, 0, 0, 'CU18M', 'CU18M', $TargetSizeC, $DistanceC);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RH18',  'Recurve Herrer Under 18', 1, 240, 255, 0, 0, 'RU18M', 'RU18M', $TargetSizeR, $DistanceR50);
+
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LD16',  'Langbue Damer Under 16', 1, 240, 255, 0, 0, '', '', $TargetSizeBLBT16, $DistanceBLBT16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TD16',  'Tradisjonell Damer Under 16', 1, 240, 255, 0, 0, '', '', $TargetSizeBLBT16, $DistanceBLBT16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BD16',  'Barebow Damer Under 16', 1, 240, 255, 0, 0, '', '', $TargetSizeBLBT16, $DistanceBLBT16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CD16',  'Compound Damer Under 16', 0, 240, 255, 0, 0, '', '', $TargetSizeC16, $DistanceC16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RD16',  'Recurve Damer Under 16', 1, 240, 255, 0, 0, '', '', $TargetSizeR16, $DistanceR16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LH16',  'Langbue Herrer Under 16', 1, 240, 255, 0, 0, '', '', $TargetSizeBLBT16, $DistanceBLBT16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TH16',  'Tradisjonell Herrer Under 16', 1, 240, 255, 0, 0, '', '', $TargetSizeBLBT16, $DistanceBLBT16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BH16',  'Barebow Herrer Under 16', 1, 240, 255, 0, 0, '', '', $TargetSizeBLBT16, $DistanceBLBT16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CH16',  'Compound Herrer Under 16', 0, 240, 255, 0, 0, '', '', $TargetSizeC16, $DistanceC16);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RH16',  'Recurve Herrer Under 16', 1, 240, 255, 0, 0, '', '', $TargetSizeR16, $DistanceR16);
+
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LD5',  'Langbue Damer 50', 1, 240, 255, 0, 0, '', 'L50W', $TargetSizeBLBT, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TD5',  'Tradisjonell Damer 50', 1, 240, 255, 0, 0, '', 'T50W', $TargetSizeBLBT, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BD5',  'Barebow Damer 50', 1, 240, 255, 0, 0, 'B50W', 'B50W', $TargetSizeBLBT, $DistanceB);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CD5',  'Compound Damer 50', 0, 240, 255, 0, 0, 'C50W', 'C50W', $TargetSizeC, $DistanceC);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RD5',  'Recurve Damer 50', 1, 240, 255, 0, 0, 'R50W', 'R50W', $TargetSizeR, $DistanceR50);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'LH5',  'Langbue Herrer 50', 1, 240, 255, 0, 0, '', '50LM', $TargetSizeBLBT, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetLBT, 5, 3, 1, 5, 3, 1, 'TH5',  'Tradisjonell Herrer 50', 1, 240, 255, 0, 0, '', 'T50M', $TargetSizeBLBT, $DistanceLBT);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetB, 5, 3, 1, 5, 3, 1, 'BH5',  'Barebow Herrer 50', 1, 240, 255, 0, 0, 'B50M', 'B50M', $TargetSizeBLBT, $DistanceB);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetC, 5, 3, 1, 5, 3, 1, 'CH5',  'Compound Herrer 50', 0, 240, 255, 0, 0, 'C50M', 'C50M', $TargetSizeC, $DistanceC);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetR, 5, 3, 1, 5, 3, 1, 'RH5',  'Recurve Herrer 50', 1, 240, 255, 0, 0, 'R50M', 'R50M', $TargetSizeR, $DistanceR50);
+
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetVI, 5, 3, 1, 5, 3, 1, 'VI', 'Visually Impaired', 1, 240, 255, 0, 0, '', '', $TargetSizeVI, $DistanceVI);
+        CreateEvent($TourId, $i++, 0, 0, $Phase, $TargetOC, 5, 3, 1, 5, 3, 1, 'OC', 'Open Class', 1, 240, 255, 0, 0, '', '', $TargetSizeOC, $DistanceOC);
+
         //teams
         $Phase=4;
-        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'LBR',  'Langbue Rekrutt', 1, 0, 0, 0, 0, '', '', $TargetSizeB, $DistanceF, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'TR',  'Tradisjonell Rekrutt', 1, 0, 0, 0, 0, '', '', $TargetSizeB, $DistanceF, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'BR',  'Barebow Rekrutt', 1, 0, 0, 0, 0, '', '', $TargetSizeB, $DistanceF, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetC, 4, 6, 3, 4, 6, 3, 'CR',  'Compound Rekrutt', 0, 0, 0, 0, 0, '', '', $TargetSizeB, $DistanceT, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'RR',  'Recurve Rekrutt',1, 0, 0, 0, 0, '', '', $TargetSizeB, $DistanceB, '', 1);
-        if($Outdoor) {
-            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'R60M',  'Recurve II',1, 0, 0, 0, 0, '', '', $TargetSizeR, $DistanceRW, '', 1);
-        }
-        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'LB',  'Langbue', 1, 0, 0, 0, 0, '', '', $TargetSizeB, $DistanceT, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'T',  'Tradisjonell', 1, 0, 0, 0, 0, '', '', $TargetSizeB, $DistanceT, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'B',  'Barebow', 1, 0, 0, 0, 0, '', '', $TargetSizeR, $DistanceB, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetLBT, 4, 6, 3, 4, 6, 3, 'L',  'Langbue', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT, $DistanceLBT, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetLBT, 4, 6, 3, 4, 6, 3, 'T',  'Tradisjonell', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT, $DistanceLBT, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'B',  'Barebow', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT, $DistanceB, '', 1);
         CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetC, 4, 6, 3, 4, 6, 3, 'C',  'Compound',0, 0, 0, 0, 0, '', '', $TargetSizeC, $DistanceC, '', 1);
         CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'R',  'Recurve',1, 0, 0, 0, 0, '', '', $TargetSizeR, $DistanceR, '', 1);
+
+        if($Outdoor) {
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'R60M', 'Recurve 60m', 1, 0, 0, 0, 0, '', '', $TargetSizeR, $DistanceR50, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'BU18', 'Barebow Under 18', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT, $DistanceB18, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetLBT, 4, 6, 3, 4, 6, 3, 'LU16', 'Langbue Under 16', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT, $DistanceBLBT16, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetLBT, 4, 6, 3, 4, 6, 3, 'TU16', 'Tradisjonell Under 16', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT, $DistanceBLBT16, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'BU16', 'Barebow Under 16', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT, $DistanceBLBT16, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetC, 4, 6, 3, 4, 6, 3, 'CU16', 'Compound Under 16', 0, 0, 0, 0, 0, '', '', $TargetSizeC, $DistanceC16, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'RU16', 'Recurve Under 16', 1, 0, 0, 0, 0, '', '', $TargetSizeR, $DistanceR16, '', 1);
+        } else {
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetLBT, 4, 6, 3, 4, 6, 3, 'L60',  'Langbue 60cm', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT16, $DistanceLBT, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetLBT, 4, 6, 3, 4, 6, 3, 'T60',  'Tradisjonell 60cm', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT16, $DistanceLBT, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetB, 4, 6, 3, 4, 6, 3, 'B60',  'Barebow 60cm', 1, 0, 0, 0, 0, '', '', $TargetSizeBLBT16, $DistanceB, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetC, 4, 6, 3, 4, 6, 3, 'C60',  'Compound 60cm',0, 0, 0, 0, 0, '', '', $TargetSizeC16, $DistanceC, '', 1);
+            CreateEvent($TourId, $i++, 1, 0, $Phase, $TargetR, 4, 6, 3, 4, 6, 3, 'R60',  'Recurve 60cm',1, 0, 0, 0, 0, '', '', $TargetSizeR16, $DistanceR, '', 1);
+
+        }
+
 	} elseif($SubRule=='2' or $SubRule=='4') {
 		// always individual finals if subrule==2, but NO teams
 		$i=1;
+        $TargetSizeB=($Outdoor ? 122 : 60);
         if($Outdoor) {
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'B5', 'Barebow 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, 20);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'T5', 'Tradisjonell 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, 20);
@@ -297,43 +314,44 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C1', 'Compound 1', 0, 240, 255, 0, 0, '', '', $TargetSizeC, 50);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'R1', 'Recurve 1', 1, 240, 255, 0, 0, '', '', $TargetSizeR, 70);
 
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'PU1', 'Psykisk Utviklingshemmet 1', 1, 240, 255, 0, 0, '', '', $TargetSizeR, 20);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'OC1', 'Open Class', 1, 240, 255, 0, 0, '', '', $TargetSizeR, 20);
         } else {
             $TargetSizeC = ($TourType == 7 ? 60 : 40);
             $TargetSizeB2 = ($TourType == 7 ? 80 : 40);
             $TargetSizeR = ($TourType == 7 ? 80 : 60);
             $DistanceF   = ($TourType == 7 ? 16 : 12);
             $DistanceR   = ($TourType == 7 ? 25 : 18);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C5', 'Compound 5', 0, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'R5', 'Recurve 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'B5', 'Barebow 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'T5', 'Tradisjonell 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB5', 'Langbue 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
-
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'B4', 'Barebow 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'T4', 'Tradisjonell 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB4', 'Langbue 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C4', 'Compound 4', 0, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'R4', 'Recurve 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'B3', 'Barebow 3', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'T3', 'Tradisjonell 3', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB3', 'Langbue 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C3', 'Compound 3', 0, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'R3', 'Recurve 3', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'B2', 'Barebow 2', 1, 240, 255, 0, 0, '', '', $TargetSizeB2, $DistanceR);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'T2', 'Tradisjonell 2', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'T1', 'Tradisjonell 1', 1, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
+
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB5', 'Langbue 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB4', 'Langbue 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB3', 'Langbue 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB2', 'Langbue 2', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C2', 'Compound 2', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'R2', 'Recurve 2', 1, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB1', 'Langbue 1', 1, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
+
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'B5', 'Barebow 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'B4', 'Barebow 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'B3', 'Barebow 3', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'B2', 'Barebow 2', 1, 240, 255, 0, 0, '', '', $TargetSizeB2, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'B1', 'Barebow 1', 1, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
 
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetF, 5, 3, 1, 5, 3, 1, 'PU1', 'Psykisk Utviklingshemmet 1', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'B1', 'Barebow 1', 1, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'T1', 'Tradisjonell 1', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
-            CreateEvent($TourId, $i++, 0, 0, 8, $TargetRY, 5, 3, 1, 5, 3, 1, 'LB1', 'Langbue 1', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C5', 'Compound 5', 0, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C4', 'Compound 4', 0, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C3', 'Compound 3', 0, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C2', 'Compound 2', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetC, 5, 3, 1, 5, 3, 1, 'C1', 'Compound 1', 0, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
+
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'R5', 'Recurve 5', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'R4', 'Recurve 4', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'R3', 'Recurve 3', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceR);
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'R2', 'Recurve 2', 1, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
             CreateEvent($TourId, $i++, 0, 0, 8, $TargetR, 5, 3, 1, 5, 3, 1, 'R1', 'Recurve 1', 1, 240, 255, 0, 0, '', '', $TargetSizeC, $DistanceR);
+
+            CreateEvent($TourId, $i++, 0, 0, 8, $TargetF, 5, 3, 1, 5, 3, 1, 'OC1', 'Open Class', 1, 240, 255, 0, 0, '', '', $TargetSizeR, $DistanceF);
         }
 	}
 }
@@ -344,90 +362,56 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
 	$Champs=(($SubRule==3 and $TourType==6) or ($SubRule==4 and $TourType==3));
 
 	if($Champs) {
-		// 70m Round and Indoor Champs
-		InsertClassEvent($TourId, 0, 1, 'LBR',  'LB', 'R');
-		InsertClassEvent($TourId, 0, 1, 'TR',  'T', 'R');
-		InsertClassEvent($TourId, 0, 1, 'BR',  'B', 'R');
-		InsertClassEvent($TourId, 0, 1, 'RRJ', 'R', 'RJ');
-		InsertClassEvent($TourId, 0, 1, 'CRJ', 'C', 'RJ');
-		InsertClassEvent($TourId, 0, 1, 'RRG', 'R', 'RG');
-		InsertClassEvent($TourId, 0, 1, 'CRG', 'C', 'RG');
-		InsertClassEvent($TourId, 0, 1, 'LBK',  'LB', 'K');
-		InsertClassEvent($TourId, 0, 1, 'TK',  'T', 'K');
-		InsertClassEvent($TourId, 0, 1, 'BK',  'B', 'K');
-		InsertClassEvent($TourId, 0, 1, 'RDU18', 'R', 'DU18');
-		InsertClassEvent($TourId, 0, 1, 'CDU18', 'C', 'DU18');
-		InsertClassEvent($TourId, 0, 1, 'RHU18', 'R', 'HU18');
-		InsertClassEvent($TourId, 0, 1, 'CHU18', 'C', 'HU18');
-		InsertClassEvent($TourId, 0, 1, 'RDU21', 'R', 'DU21');
-		InsertClassEvent($TourId, 0, 1, 'CDU21', 'C', 'DU21');
-		InsertClassEvent($TourId, 0, 1, 'RHU21', 'R', 'HU21');
-		InsertClassEvent($TourId, 0, 1, 'CHU21', 'C', 'HU21');
-		InsertClassEvent($TourId, 0, 1, 'RD5', 'R', 'D5');
-		InsertClassEvent($TourId, 0, 1, 'CD5', 'C', 'D5');
-		InsertClassEvent($TourId, 0, 1, 'RH5', 'R', 'H5');
-		InsertClassEvent($TourId, 0, 1, 'CH5', 'C', 'H5');
-        InsertClassEvent($TourId, 0, 1, 'LBDi', 'LB', 'Di');
-        InsertClassEvent($TourId, 0, 1, 'TDi', 'T', 'Di');
-        InsertClassEvent($TourId, 0, 1, 'BDi', 'B', 'Di');
-        if(!$Outdoor) {
-            InsertClassEvent($TourId, 0, 1, 'LBRJ', 'LB', 'RJ');
-            InsertClassEvent($TourId, 0, 1, 'TRJ', 'T', 'RJ');
-            InsertClassEvent($TourId, 0, 1, 'BRJ', 'B', 'RJ');
-            InsertClassEvent($TourId, 0, 1, 'LBRG', 'LB', 'RG');
-            InsertClassEvent($TourId, 0, 1, 'TRG', 'T', 'RG');
-            InsertClassEvent($TourId, 0, 1, 'BRG', 'B', 'RG');
-            InsertClassEvent($TourId, 0, 1, 'LBDU18', 'LB', 'DU18');
-            InsertClassEvent($TourId, 0, 1, 'TDU18', 'T', 'DU18');
-            InsertClassEvent($TourId, 0, 1, 'BDU18', 'B', 'DU18');
-            InsertClassEvent($TourId, 0, 1, 'LBHU18', 'LB', 'HU18');
-            InsertClassEvent($TourId, 0, 1, 'THU18', 'T', 'HU18');
-            InsertClassEvent($TourId, 0, 1, 'BHU18', 'B', 'HU18');
-            InsertClassEvent($TourId, 0, 1, 'LBDU21', 'LB', 'DU21');
-            InsertClassEvent($TourId, 0, 1, 'TDU21', 'T', 'DU21');
-            InsertClassEvent($TourId, 0, 1, 'BDU21', 'B', 'DU21');
-            InsertClassEvent($TourId, 0, 1, 'LBHU21', 'LB', 'HU21');
-            InsertClassEvent($TourId, 0, 1, 'THU21', 'T', 'HU21');
-            InsertClassEvent($TourId, 0, 1, 'BHU21', 'B', 'HU21');
-            InsertClassEvent($TourId, 0, 1, 'PUF', 'PU', 'F');
-            InsertClassEvent($TourId, 0, 1, 'VIF', 'VI', 'F');
+        // 70m Round and Indoor Champs
+        foreach (array('R'=>'R','C'=>'C','B'=>'B','L'=>'LB','T'=>'T') as $kDiv=>$vDiv) {
+            $clsTmpArr = array(
+                'D'=>'D','D21'=>'DU21','D18'=>'DU18','D16'=>'DU16','D5'=>'D5',
+                'H'=>'H','H21'=>'HU21','H18'=>'HU18','H16'=>'HU16','H5'=>'H5'
+            );
+            foreach($clsTmpArr as $kClass=>$vClass) {
+                InsertClassEvent($TourId, 0, 1, $kDiv.$kClass, $vDiv, $vClass);
+            }
+        }
+        InsertClassEvent($TourId, 0, 1, 'VI', 'VI', 'VI');
+        InsertClassEvent($TourId, 0, 1, 'OC', 'OC', 'OC');
+
+        $team=array();
+        if($Outdoor) {
+            $team = array(
+                'R' => array('R' => array('D', 'DU21', 'H', 'HU21')),
+                'C' => array('C' => array('D', 'D5', 'DU21', 'DU18', 'H', 'H5', 'HU21', 'HU18')),
+                'B' => array('B' => array('D', 'D5', 'DU21', 'H', 'H5', 'HU21')),
+                'T' => array('T' => array('D', 'D5', 'DU21', 'DU18', 'H', 'H5', 'HU21', 'HU18')),
+                'L' => array('LB' => array('D', 'D5', 'DU21', 'DU18', 'H', 'H5', 'HU21', 'HU18')),
+                'R60M' => array('C' => array('D5', 'DU18', 'H5', 'HU18')),
+                'BU18' => array('B' => array('DU18', 'HU18')),
+                'LU16' => array('LB' => array('DU16', 'HU16')),
+                'TU16' => array('T' => array('DU16', 'HU16')),
+                'BU16' => array('B' => array('DU16', 'HU16')),
+                'CU16' => array('C' => array('DU16', 'HU16')),
+                'RU16' => array('R' => array('DU16', 'HU16')),
+            );
+        } else {
+            $team = array(
+                'R' => array('R' => array('D', 'DU21', 'H', 'HU21', 'D5', 'DU18', 'H5', 'HU18')),
+                'R60' => array('R' => array('DU16', 'HU16')),
+                'C' => array('C' => array('D', 'D5', 'DU21', 'DU18', 'H', 'H5', 'HU21', 'HU18')),
+                'C60' => array('C' => array('DU16', 'HU16')),
+                'B' => array('B' => array('D', 'D5', 'DU21', 'DU18', 'H', 'H5', 'HU21', 'HU18')),
+                'B60' => array('B' => array('DU16', 'HU16')),
+                'T' => array('T' => array('D', 'D5', 'H', 'H5')),
+                'T60' => array('T' => array('DU21', 'DU18', 'HU21', 'HU18', 'DU16', 'HU16')),
+                'L' => array('LB' => array('D', 'D5', 'H', 'H5')),
+                'L60' => array('LB' => array('DU21', 'DU18', 'HU21', 'HU18', 'DU16', 'HU16')),
+            );
+        }
+        foreach($team as $n => $divs) {
+            foreach($divs as $d => $cs) {
+                foreach($cs as $c) {
+                    InsertClassEvent($TourId, 1, 3, $n, $d, $c);
+                }
+            }
         }
-		InsertClassEvent($TourId, 0, 1, 'CD',  'C', 'D');
-		InsertClassEvent($TourId, 0, 1, 'RD',  'R', 'D');
-		InsertClassEvent($TourId, 0, 1, 'LBHi',  'LB', 'Hi');
-		InsertClassEvent($TourId, 0, 1, 'THi',  'T', 'Hi');
-		InsertClassEvent($TourId, 0, 1, 'BHi',  'B', 'Hi');
-		InsertClassEvent($TourId, 0, 1, 'CH',  'C', 'H');
-		InsertClassEvent($TourId, 0, 1, 'RH',  'R', 'H');
-
-		$team=array(
-			'CR' => array('C' => array('RJ','RG')),
-			'RR' => array('R' => array('RJ','RG')),
-			'C' => array('C' => array('D','D5','DU21','H','H5','HU21','HU18','DU18')),
-			);
-		if($Outdoor) {
-			$team=array(
-				'LBR' => array('LB' => array('R')),
-				'TR' => array('T' => array('R')),
-				'BR' => array('B' => array('R')),
-				'CR' => array('C' => array('RJ','RG')),
-				'RR' => array('R' => array('RJ','RG')),
-				'R60M' => array('R' => array('D5','H5','HU18','DU18')),
-				'LB' => array('LB' => array('Hi','Di','K')),
-				'T' => array('T' => array('Hi','Di','K')),
-                'B' => array('B' => array('Hi','Di','K')),
-				'C' => array('C' => array('D','D5','DU21','H','H5','HU21','HU18','DU18')),
-				'R' => array('R' => array('D','DU21','H','HU21')),
-				);
-		} else {
-            $team['LBR']= array('LB' => array('RJ','RG'));
-            $team['TR']= array('T' => array('RJ','RG'));
-			$team['BR']= array('B' => array('RJ','RG'));
-            $team['LB'] = array('LB' => array('DU18','HU18','DU21','HU21','D','H'));
-            $team['T'] = array('LB' => array('DU18','HU18','DU21','HU21','D','H'));
-            $team['B'] = array('LB' => array('DU18','HU18','DU21','HU21','D','H'));
-			$team['R'] = array('R' => array('D','D5','DU21','H','H5','HU21','HU18','DU18'));
-		}
 	} else {
 // 		InsertClassEvent($TourId, 0, 1, $d.$c, $d, $c);
 		InsertClassEvent($TourId, 0, 1, 'C5', 'C', '5');
@@ -450,21 +434,13 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
         InsertClassEvent($TourId, 0, 1, 'LB2', 'LB', '2');
 		InsertClassEvent($TourId, 0, 1, 'C2', 'C', '2');
 		InsertClassEvent($TourId, 0, 1, 'R2', 'R', '2');
-        InsertClassEvent($TourId, 0, 1, 'PU1', 'PU', '1');
+        InsertClassEvent($TourId, 0, 1, 'OC1', 'OC', '1');
         InsertClassEvent($TourId, 0, 1, 'B1', 'B', '1');
         InsertClassEvent($TourId, 0, 1, 'T1', 'T', '1');
         InsertClassEvent($TourId, 0, 1, 'LB1', 'LB', '1');
 		InsertClassEvent($TourId, 0, 1, 'C1', 'C', '1');
 		InsertClassEvent($TourId, 0, 1, 'R1', 'R', '1');
 	}
-
-	foreach($team as $n => $divs) {
-		foreach($divs as $d => $cs) {
-			foreach($cs as $c) {
-				InsertClassEvent($TourId, 1, 3, $n, $d, $c);
-			}
-		}
-	}
 }
 
 /*
@@ -492,10 +468,10 @@ function CreateStandardFieldEvents($TourId, $SubRule, $TourType=9) {
 	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'BR',  'Barebow Rekrutt',            0, 240, 255);
 	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'IR',  'Tradisjonell Rekrutt',       0, 240, 255);
 	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'LR',  'Langbue Rekrutt',            0, 240, 255);
-	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'RRJ',  'Recurve Rekrutt Jenter',    0, 240, 255);
-	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'CRJ',  'Compound Rekrutt Jenter',   0, 240, 255);
-	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'RRG',  'Recurve Rekrutt Gutter',    0, 240, 255);
-	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'CRG',  'Compound Rekrutt Gutter',   0, 240, 255);
+	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'RRJ',  'Recurve Damer U16',    0, 240, 255);
+	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'CRJ',  'Compound Damer U16',   0, 240, 255);
+	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'RRG',  'Recurve Herrer U16',    0, 240, 255);
+	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'CRG',  'Compound Herrer U16',   0, 240, 255);
 	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'BU18',  'Barebow Under 18',         0, 240, 255);
 	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'TU18',  'Tradisjonell Under 18',    0, 240, 255);
 	CreateEvent($TourId, $i++, 0, 0, 0, $Target, 5, 3, 1, 5, 3, 1, 'LBU18',  'Langbue Under 18',        0, 240, 255);
@@ -584,10 +560,10 @@ function CreateStandard3DEvents($TourId, $SubRule, $TourType=11) {
 	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'BR',  'Barebow Rekrutt',            0, 240, 255, 0, $Elim2);
 	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'IR',  'Tradisjonell Rekrutt',         0, 240, 255, 0, $Elim2);
 	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'LR',  'Langbue Rekrutt',            0, 240, 255, 0, $Elim2);
-	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'RRJ',  'Recurve Rekrutt Jenter',    0, 240, 255, 0, $Elim2);
-	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'CRJ',  'Compound Rekrutt Jenter',   0, 240, 255, 0, $Elim2);
-	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'RRG',  'Recurve Rekrutt Gutter',    0, 240, 255, 0, $Elim2);
-	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'CRG',  'Compound Rekrutt Gutter',   0, 240, 255, 0, $Elim2);
+	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'RRJ',  'Recurve Damer U16',    0, 240, 255, 0, $Elim2);
+	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'CRJ',  'Compound Damer U16',   0, 240, 255, 0, $Elim2);
+	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'RRG',  'Recurve Herrer U16',    0, 240, 255, 0, $Elim2);
+	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'CRG',  'Compound Herrer U16',   0, 240, 255, 0, $Elim2);
 	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'BU18',  'Barebow Under 18',             0, 240, 255, 0, $Elim2);
 	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'TU18',  'Tradisjonell Under 18',          0, 240, 255, 0, $Elim2);
 	CreateEvent($TourId, $i++, 0, 0, 2, $Target, 5, 3, 1, 5, 3, 1, 'LBU18',  'Langbue Under 18',             0, 240, 255, 0, $Elim2);
diff --git a/src/Modules/Sets/PAR/lib.php b/src/Modules/Sets/PAR/lib.php
index c88142dd..b1e12475 100644
--- a/src/Modules/Sets/PAR/lib.php
+++ b/src/Modules/Sets/PAR/lib.php
@@ -272,8 +272,8 @@ function InsertStandardEvents($TourId, $SubRule, $Outdoor=true) {
         InsertClassEvent($TourId, 1, 3, 'CU21M', 'C', 'U21M');
         InsertClassEvent($TourId, 1, 3, 'CU21W', 'C', 'U21W');
     }
-	InsertClassEvent($TourId, 1, 2, 'MW1', 'W1', 'U21M');
-	InsertClassEvent($TourId, 1, 2, 'WW1', 'W1', 'U21W');
+	InsertClassEvent($TourId, 1, 2, 'MW1', 'W1', 'M');
+	InsertClassEvent($TourId, 1, 2, 'WW1', 'W1', 'W');
 	InsertClassEvent($TourId, 1, 2, 'U21MW1', 'W1', 'U21M');
 	InsertClassEvent($TourId, 1, 2, 'U21WW1', 'W1', 'U21W');
 	if($Outdoor) {
diff --git a/src/Modules/Sets/SE/Setup_Field.php b/src/Modules/Sets/SE/Setup_Field.php
index 18951e03..a0846a87 100644
--- a/src/Modules/Sets/SE/Setup_Field.php
+++ b/src/Modules/Sets/SE/Setup_Field.php
@@ -30,7 +30,9 @@
         CreateTargetFace($TourId, $i++, 'Blå påle',       'REG-^[B](U21)?[MW]{1,1}', '1', 6, 0, 6, 0);
         CreateTargetFace($TourId, $i++, 'Blå påle',       'REG-^[C](21|60)[MW]{1,1}', '1', 6, 0, 6, 0);
         CreateTargetFace($TourId, $i++, 'Blå påle',       'REG-^[R](21|50|60)[MW]{1,1}', '1', 6, 0, 6, 0);
-        CreateTargetFace($TourId, $i++, 'Svart påle',     'REG-^[LT](U21)?[MW]{1,1}', '1', 6, 0, 6, 0);
+        CreateTargetFace($TourId, $i++, 'Blå påle',       'REG-^[T][MW]{1,1}', '1', 6, 0, 6, 0);
+        CreateTargetFace($TourId, $i++, 'Svart påle',     'REG-^[L][MW]{1,1}', '1', 6, 0, 6, 0);
+        CreateTargetFace($TourId, $i++, 'Svart påle',     'REG-^[LT](U21)[MW]{1,1}', '1', 6, 0, 6, 0);
         CreateTargetFace($TourId, $i++, 'Svart påle',     'REG-^[RC](U16)[MW]{1,1}', '1', 6, 0, 6, 0);
         CreateTargetFace($TourId, $i++, 'Svart påle',     'REG-^[B](21|50|60)[MW]{1,1}', '1', 6, 0, 6, 0);
         CreateTargetFace($TourId, $i++, 'Svart/vit påle', 'REG-^[LT](U16|21|50|60)[MW]{1,1}', '1', 6, 0, 6, 0);
diff --git a/src/Modules/Sets/SE/lib.php b/src/Modules/Sets/SE/lib.php
index 360f0943..f59478a9 100644
--- a/src/Modules/Sets/SE/lib.php
+++ b/src/Modules/Sets/SE/lib.php
@@ -83,7 +83,7 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
 
 function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
 	$dv = array('R','B','C','L','T');
-	$cl = array('U13'=>array('U13M','U13W'), 'U16'=>array('U16M','U16W'), 'U21'=>array('U21M','U21W'), '21'=>array('21M','50M','60M','M','21W','50W','60W','W'));
+	$cl = array('U13'=>array('U13M','U13W'), 'U16'=>array('U16M','U16W'), 'U21'=>array('U21M','U21W'), 'S'=>array('21M','50M','60M','M','21W','50W','60W','W'));
 
 	if($TourType==6 || $TourType==3 || $TourType==37 || $TourType==1) {
 		foreach($dv as $v_dv) {
diff --git a/src/Modules/Sets/UK/Setup_Target.php b/src/Modules/Sets/UK/Setup_Target.php
index 49994b36..31e3c957 100644
--- a/src/Modules/Sets/UK/Setup_Target.php
+++ b/src/Modules/Sets/UK/Setup_Target.php
@@ -320,7 +320,7 @@
 
          case 11:
          case 15:
-             CreateDistanceNew($TourId, $TourType, '_%', array(array('20y',20), array('20y',20)));
+             CreateDistanceNew($TourId, $TourType, '_%', array(array('20y-1',20), array('20y-2',20)));
              break;
          case 12:
              CreateDistanceNew($TourId, $TourType, '_%', array(array('20y',20)));
@@ -329,7 +329,7 @@
              CreateDistanceNew($TourId, $TourType, '_%', array(array('25y',25)));
              break;
          case 14:
-             CreateDistanceNew($TourId, $TourType, '_%', array(array('30m',30), array('30m',30)));
+             CreateDistanceNew($TourId, $TourType, '_%', array(array('30m-1',30), array('30m-2',30)));
              break;
      }
         break;
diff --git a/src/Modules/Sets/WAN/Setup_Target.php b/src/Modules/Sets/WAN/Setup_Target.php
index fc19248e..5fc38659 100644
--- a/src/Modules/Sets/WAN/Setup_Target.php
+++ b/src/Modules/Sets/WAN/Setup_Target.php
@@ -16,21 +16,23 @@
 switch($TourType)
 {
     case 3:
-        CreateDistanceNew($TourId, $TourType, 'RN_', array(array('40m-1',40), array('40m-2',40)));
-        CreateDistanceNew($TourId, $TourType, 'CN_', array(array('30m-1',30), array('30m-2',30)));
-        CreateDistanceNew($TourId, $TourType, 'BN_', array(array('30m-1',30), array('30m-2',30)));
-        CreateDistanceNew($TourId, $TourType, 'LN_', array(array('30m-1',30), array('30m-2',30)));
-        CreateDistanceNew($TourId, $TourType, 'IN_', array(array('30m-1',30), array('30m-2',30)));
-        CreateDistanceNew($TourId, $TourType, 'RW_', array(array('60m-1',60), array('60m-2',60)));
-        CreateDistanceNew($TourId, $TourType, 'CW_', array(array('50m-1',50), array('50m-2',50)));
-        CreateDistanceNew($TourId, $TourType, 'BW_', array(array('40m-1',40), array('40m-2',40)));
-        CreateDistanceNew($TourId, $TourType, 'LW_', array(array('30m-1',30), array('30m-2',30)));
-        CreateDistanceNew($TourId, $TourType, 'IW_', array(array('30m-1',30), array('30m-2',30)));
-        CreateDistanceNew($TourId, $TourType, 'RJ_', array(array('70m-1',70), array('70m-2',70)));
-        CreateDistanceNew($TourId, $TourType, 'CJ_', array(array('50m-1',50), array('50m-2',50)));
-        CreateDistanceNew($TourId, $TourType, 'BJ_', array(array('50m-1',50), array('50m-2',50)));
-        CreateDistanceNew($TourId, $TourType, 'LJ_', array(array('30m-1',30), array('30m-2',30)));
-        CreateDistanceNew($TourId, $TourType, 'IJ_', array(array('30m-1',30), array('30m-2',30)));
+        CreateDistanceNew($TourId, $TourType, 'RU16_', array(array('40m-1',40), array('40m-2',40)));
+        CreateDistanceNew($TourId, $TourType, 'CU16_', array(array('30m-1',30), array('30m-2',30)));
+        CreateDistanceNew($TourId, $TourType, 'BU16_', array(array('30m-1',30), array('30m-2',30)));
+        CreateDistanceNew($TourId, $TourType, 'LU16_', array(array('30m-1',30), array('30m-2',30)));
+        CreateDistanceNew($TourId, $TourType, 'TU16_', array(array('30m-1',30), array('30m-2',30)));
+        CreateDistanceNew($TourId, $TourType, 'RU18_', array(array('60m-1',60), array('60m-2',60)));
+        CreateDistanceNew($TourId, $TourType, 'CU18_', array(array('50m-1',50), array('50m-2',50)));
+        CreateDistanceNew($TourId, $TourType, 'BU18_', array(array('40m-1',40), array('40m-2',40)));
+        CreateDistanceNew($TourId, $TourType, 'LU18_', array(array('30m-1',30), array('30m-2',30)));
+        CreateDistanceNew($TourId, $TourType, 'TU18_', array(array('30m-1',30), array('30m-2',30)));
+        CreateDistanceNew($TourId, $TourType, 'RU21O', array(array('50m-1',70), array('50m-2',70)));
+        CreateDistanceNew($TourId, $TourType, 'RU21M', array(array('70m-1',70), array('70m-2',70)));
+        CreateDistanceNew($TourId, $TourType, 'RU21W', array(array('70m-1',70), array('70m-2',70)));
+        CreateDistanceNew($TourId, $TourType, 'CU21_', array(array('50m-1',50), array('50m-2',50)));
+        CreateDistanceNew($TourId, $TourType, 'BU21_', array(array('50m-1',50), array('50m-2',50)));
+        CreateDistanceNew($TourId, $TourType, 'LU21_', array(array('30m-1',30), array('30m-2',30)));
+        CreateDistanceNew($TourId, $TourType, 'TU21_', array(array('30m-1',30), array('30m-2',30)));
 
         break;
 }
diff --git a/src/Modules/Sets/WAN/lib.php b/src/Modules/Sets/WAN/lib.php
index 53a945a8..4d36c627 100644
--- a/src/Modules/Sets/WAN/lib.php
+++ b/src/Modules/Sets/WAN/lib.php
@@ -16,18 +16,19 @@ function CreateStandardDivisions($TourId, $Type=1, $SubRule=0) {
     CreateDivision($TourId,$i++,'B','Barebow');
     CreateDivision($TourId,$i++,'C','Compound');
     CreateDivision($TourId,$i++,'L','Longbow');
-    CreateDivision($TourId,$i++,'I','Instinctive');
+    CreateDivision($TourId,$i++,'T','Traditional');
     CreateDivision($TourId,$i++,'OF','Official', 0);
 }
 
 function CreateStandardClasses($TourId, $SubRule=0, $Field='', $TourType=0) {
     $i=1;
-    CreateClass($TourId, $i++, 13,  15, 0, 'NM', 'NM', 'Nordic Cadet (13-15) Men',1, 'R,B,C,L,I');
-    CreateClass($TourId, $i++, 13,  15, 1, 'NW', 'NW', 'Nordic Cadet (13-15) Women',1, 'R,B,C,L,I');
-    CreateClass($TourId, $i++, 16,  17, 0, 'WM', 'WM', 'WA Cadet (16-17) Men',1, 'R,B,C,L,I');
-    CreateClass($TourId, $i++, 16,  17, 1, 'WW', 'WW', 'WA Cadet (16-17) Women',1, 'R,B,C,L,I');
-    CreateClass($TourId, $i++, 18,  20, 0, 'JM', 'JM', 'Junior (18-20) Men',1, 'R,B,C,L,I');
-    CreateClass($TourId, $i++, 18,  20, 1, 'JW', 'JW', 'Junior (18-20) Women',1, 'R,B,C,L,I');
+    CreateClass($TourId, $i++, 13,  15, 0, 'U16M', 'U16M', 'Under 16 (age 13-15) Men',1, 'R,B,C,L,I');
+    CreateClass($TourId, $i++, 13,  15, 1, 'U16W', 'U16W', 'Under 16 (age 13-15) Women',1, 'R,B,C,L,I');
+    CreateClass($TourId, $i++, 16,  17, 0, 'U18M', 'U18M', 'Under 18 (16-17) Men',1, 'R,B,C,L,I');
+    CreateClass($TourId, $i++, 16,  17, 1, 'U18W', 'U18W', 'Under 18 (16-17) Women',1, 'R,B,C,L,I');
+    CreateClass($TourId, $i++, 18,  20, 0, 'U21M', 'U21M', 'Under 21 (18-20) Men',1, 'R,B,C,L,I');
+    CreateClass($TourId, $i++, 18,  20, 1, 'U21W', 'U21W', 'Under 21 (18-20) Women',1, 'R,B,C,L,I');
+    CreateClass($TourId, $i++, 13,  20, -1, 'U21O', 'U21O', 'Under 21 Open (13-20)',1, 'R');
     CreateClass($TourId, $i++, 1,  99, -1, 'Jg', 'Jg', 'Judge',0, 'OF');
     CreateClass($TourId, $i++, 1,  99, -1, 'Tm', 'Tm', 'Team Manager',0, 'OF');
     CreateClass($TourId, $i++, 1,  99, -1, 'Co', 'Co', 'Coach',0, 'OF');
@@ -54,12 +55,16 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
 	$AthTarget=254;  // This is a bit container corresponding to the finals and 1 or 2 archers per target. Each bit represents a phase (1=gold final, 2=semi, etc),  An active bit means 2 archers
 
     if($TourType==3) {
-        $dv = array('R'=>'Recurve','B'=>'Barebow','C'=>'Compound','L'=>'Longbow','I'=>'Instinctive');
+        $dv = array('R'=>'Recurve','B'=>'Barebow','C'=>'Compound','L'=>'Longbow','T'=>'Traditional');
 
         // Finals created for all classes
-        $cl = array('N'=>'Nordic Cadet (13-15)','W'=>'WA Cadet (16-17)','J'=>'Junior (18-20)');
+        $cl = array('U16'=>'Under 16 (age 13-15)','U18'=>'Under 18 (age 16-17)','U21'=>'Under 21 (age 18-20)');
         $ge = array('M'=>'Men','W'=>'Women');
 
+        // Special for Recurve Open
+        $dvOpen = array('R'=>'Recurve');
+        $clOpen = array('U21O'=>'Under 21 Open (13-20)');
+
         $i=1;
         foreach($dv as $k_dv => $v_dv) {
             foreach($cl as $k_cl => $v_cl) {
@@ -70,29 +75,39 @@ function CreateStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
                 }
             }
         }
+        foreach($dvOpen as $k_dv => $v_dv) {
+            foreach($clOpen as $k_cl => $v_cl) {
+                $CurrTarget = ($k_dv=='C' ? $TargetC : ($k_dv=='R' ? $TargetR : $TargetOther));
+                $CurrTargetSize = ($k_dv=='C' ? $TargetSizeC : $TargetSizeR);
+                CreateEvent($TourId, $i++, 0, 0, ($Outdoor ? 32 : 16), $CurrTarget, 5, 3, 1, 5, 3, 1, $k_dv . $k_cl,  $v_dv . ' ' . $v_cl, ($k_dv=='C' ? 0 : 1), 240, $AthTarget, array(), array(), '', '', $CurrTargetSize);
+            }
+        }
 
         $i=1;
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetR, 4, 6, 3, 4, 6, 3, 'RNT',  'Recurve Nordic Cadet (13-15) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetR, 4, 6, 3, 4, 6, 3, 'RWT',  'Recurve WA Cadet (16-17) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetR, 4, 6, 3, 4, 6, 3, 'RJT',  'Recurve Junior (18-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'BNT',  'Barebow Nordic Cadet (13-15) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'BWT',  'Barebow WA Cadet (16-17) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'BJT',  'Barebow Junior (18-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetC, 4, 6, 3, 4, 6, 3, 'CNT',  'Compound Nordic Cadet (13-15) Team', 0,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetC, 4, 6, 3, 4, 6, 3, 'CWT',  'Compound WA Cadet (16-17) Team', 0,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetC, 4, 6, 3, 4, 6, 3, 'CJT',  'Compound Junior (18-20) Team', 0,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'LNT',  'Longbow Nordic Cadet (13-15) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'LWT',  'Longbow WA Cadet (16-17) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'LJT',  'Longbow Junior (18-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'INT',  'Instinctive Nordic Cadet (13-15) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'IWT',  'Instinctive WA Cadet (16-17) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
-        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'IJT',  'Instinctive Junior (18-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetR, 4, 6, 3, 4, 6, 3, 'RU16T',  'Recurve Under 16 (13-15) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetR, 4, 6, 3, 4, 6, 3, 'RU18T',  'Recurve Under 18 (16-17) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetR, 4, 6, 3, 4, 6, 3, 'RU21T',  'Recurve Under 21 (18-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetR, 4, 6, 3, 4, 6, 3, 'RU21OT',  'Recurve Under 21 Open (13-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'BU16T',  'Barebow Under 16 (13-15) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'BU18T',  'Barebow Under 18 (16-17) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'BU21T',  'Barebow Under 21 (18-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetC, 4, 6, 3, 4, 6, 3, 'CU16T',  'Compound Under 16 (13-15) Team', 0,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetC, 4, 6, 3, 4, 6, 3, 'CU18T',  'Compound Under 18 (16-17) Team', 0,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetC, 4, 6, 3, 4, 6, 3, 'CU21T',  'Compound Under 21 (18-20) Team', 0,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'LU16T',  'Longbow Under 16 (13-15) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'LU18T',  'Longbow Under 18 (16-17) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'LU21T',  'Longbow Under 21 (18-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'TU16T',  'Traditional Under 16 (13-15) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'TU18T',  'Traditional Under 18 (16-17) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
+        CreateEvent($TourId, $i++, 1, 0, 8, $TargetOther, 4, 6, 3, 4, 6, 3, 'TU21T',  'Traditional Under 21 (18-20) Team', 1,0, 0, null, null, '', '', 0, 0, '', 1);
     }
 }
 
 function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
-    $dv = array('R','B','C','L','I');
-    $cl = array('N'=>array('NM','NW'), 'W'=>array('WM','WW'), 'J'=>array('JM','JW'));
+    $dv = array('R','B','C','L','T');
+    $cl = array('U16'=>array('U16M','U16W'), 'U18'=>array('U18M','U18W'), 'U21'=>array('U21M','U21W'));
+    $dvOpen = array('R');
+    $clOpen = array('U21O'=>array('U21O'));
 
     if($TourType==3) {
         foreach($dv as $v_dv) {
@@ -105,5 +120,18 @@ function InsertStandardEvents($TourId, $TourType, $SubRule, $Outdoor=true) {
                 }
             }
         }
+
+        // Open class
+        foreach($dvOpen as $v_dv) {
+            foreach($clOpen as $k_cl => $v_cl) {
+                foreach($v_cl as $dett_cl) {
+                    echo 'InsertStandardEvent - '.$v_dv.', '.$k_cl.', '.$v_cl.', '.$dett_cl;
+                    //Indvidual event
+                    InsertClassEvent($TourId, 0, 1, $v_dv.$k_cl, $v_dv, $dett_cl);
+                    //Team composition
+                    InsertClassEvent($TourId, 1, 3, $v_dv.$k_cl.'T', $v_dv, $dett_cl);
+                }
+            }
+        }
     }
 }
diff --git a/src/Modules/Speaker/GetSchedule.php b/src/Modules/Speaker/GetSchedule.php
index 6c8e919f..8a27acd2 100644
--- a/src/Modules/Speaker/GetSchedule.php
+++ b/src/Modules/Speaker/GetSchedule.php
@@ -10,7 +10,7 @@
 }
 checkACL(array(AclSpeaker, AclQualification, AclEliminations, AclIndividuals, AclTeams), AclReadOnly);
 
-$Today=date('Y-m-d');
+$Today=getToday();
 $UseHHT='';
 $OnlyToday='';
 $SelectedEvent="''";
diff --git a/src/Modules/Speaker/robin-action.php b/src/Modules/Speaker/robin-action.php
index 8a74d497..374f4816 100644
--- a/src/Modules/Speaker/robin-action.php
+++ b/src/Modules/Speaker/robin-action.php
@@ -16,7 +16,7 @@
 
 switch($act) {
 	case 'getSchedule':
-		$Today=date('Y-m-d');
+        $Today=getToday();
 		$OnlyToday='';
 		$SelectedEvent="''";
 		$JSON['onlytoday']=0;
@@ -30,8 +30,18 @@
 
 		if($IskSequence=getModuleParameter('ISK', 'Sequence') OR $IskSequence=getModuleParameter('ISK-NG', 'Sequence')) {
 			if(!isset($IskSequence['session'])) {
-				$IskSequence=current($IskSequence);
-			}
+                //  cycle through the sequences and fetches the most recent
+                $ToKeep=current($IskSequence);
+                $OldSession='';
+                foreach($IskSequence as $k => $i) {
+                    if($k) {
+                        if($i['session']>$OldSession);
+                        $ToKeep=$i;
+                    }
+                    $OldSession=$i['session'];
+                }
+                $IskSequence=$ToKeep;
+            }
 			// get the running sequence
 			$SelectedEvent="concat(RrMatchScheduledDate,RrMatchScheduledTime) = '{$IskSequence['session']}'";
 			$JSON['running']=$IskSequence['session'];
@@ -95,9 +105,19 @@
 		$time=$tmp[1];
 
 		if($IskSequence=getModuleParameter('ISK', 'Sequence') OR $IskSequence=getModuleParameter('ISK-NG', 'Sequence')) {
-			if(!isset($IskSequence['session'])) {
-				$IskSequence=current($IskSequence);
-			}
+            if(!isset($IskSequence['session'])) {
+                //  cycle through the sequences and fetches the most recent
+                $ToKeep=current($IskSequence);
+                $OldSession='';
+                foreach($IskSequence as $k => $i) {
+                    if($k) {
+                        if($i['session']>$OldSession);
+                        $ToKeep=$i;
+                    }
+                    $OldSession=$i['session'];
+                }
+                $IskSequence=$ToKeep;
+            }
 			// get the running sequence
 			$JSON['newdata']=($IskSequence['session']==$tmp[0].$tmp[1] ? '' : 'newdata');
 		}
@@ -147,9 +167,19 @@
 		$row=safe_fetch($rs);
 		$JSON['serverdate']=$row->serverDate;
 		if($IskSequence=getModuleParameter('ISK', 'Sequence') OR $IskSequence=getModuleParameter('ISK-NG', 'Sequence')) {
-			if(!isset($IskSequence['session'])) {
-				$IskSequence=current($IskSequence);
-			}
+            if(!isset($IskSequence['session'])) {
+                //  cycle through the sequences and fetches the most recent
+                $ToKeep=current($IskSequence);
+                $OldSession='';
+                foreach($IskSequence as $k => $i) {
+                    if($k) {
+                        if($i['session']>$OldSession);
+                        $ToKeep=$i;
+                    }
+                    $OldSession=$i['session'];
+                }
+                $IskSequence=$ToKeep;
+            }
 			$tmp=str_replace(' ', '', $schedule);
 			// get the running sequence
 			$JSON['newdata']=($IskSequence['session']==$tmp ? '' : 'newdata');
diff --git a/src/Partecipants-exp/actions/xmlGetRows.php b/src/Partecipants-exp/actions/xmlGetRows.php
index 5c9f5576..f33bb770 100644
--- a/src/Partecipants-exp/actions/xmlGetRows.php
+++ b/src/Partecipants-exp/actions/xmlGetRows.php
@@ -181,7 +181,7 @@
 					{
 						$node=$xmlDoc->createElement($k);
 						$xmlAth->appendChild($node);
-							$cdata=$xmlDoc->createCDATASection($v);
+							$cdata=$xmlDoc->createCDATASection($v??'');
 							$node->appendChild($cdata);
 					}
 			}
diff --git a/src/Partecipants-exp/common/photo.php b/src/Partecipants-exp/common/photo.php
index 2458d941..a627f8c5 100644
--- a/src/Partecipants-exp/common/photo.php
+++ b/src/Partecipants-exp/common/photo.php
@@ -52,24 +52,24 @@
 						if ($oldW>=$oldH)
 						{
 							$newW=$val;
-							$newH=$newW*($oldH/$oldW);
+							$newH=intval($newW*($oldH/$oldW));
 						}
 						else
 						{
 							$newH=$val;
-							$newW=$newH*($oldW/$oldH);
+							$newW=intval($newH*($oldW/$oldH));
 						}
 						break;
 
 					case 'x':
 						$newW=$val;
-						$newH=$newW*($oldH/$oldW);
+						$newH=intval($newW*($oldH/$oldW));
 						break;
 
 					case 'y':
 					//	print 'qui';exit;
 						$newH=$val;
-						$newW=$newH*($oldW/$oldH);
+						$newW=intval($newH*($oldW/$oldH));
 						break;
 				}
 
diff --git a/src/Partecipants-exp/functions/rows.inc.php b/src/Partecipants-exp/functions/rows.inc.php
index fceaad08..1a15ddb4 100644
--- a/src/Partecipants-exp/functions/rows.inc.php
+++ b/src/Partecipants-exp/functions/rows.inc.php
@@ -212,10 +212,10 @@ function getAthletes($id=null)
 				'country_name'=>stripslashes(trim($myRow->CoName)),
 				'country_id2'=>$myRow->EnCountry2,
 				'country_code2'=>$myRow->CoCode2,
-				'country_name2'=>stripslashes(trim($myRow->CoName2)),
+				'country_name2'=>stripslashes(trim($myRow->CoName2 ?? '')),
 				'country_id3'=>$myRow->EnCountry3,
 				'country_code3'=>$myRow->CoCode3,
-				'country_name3'=>stripslashes(trim($myRow->CoName3)),
+				'country_name3'=>stripslashes(trim($myRow->CoName3 ?? '')),
 				'sub_team'=>$myRow->EnSubTeam,
 				'division'=>($myRow->EnDivision),
 				'age_class'=>($ageClass),
diff --git a/src/Partecipants/ListLoad.php b/src/Partecipants/ListLoad.php
index b2d3eca0..8c6357c9 100644
--- a/src/Partecipants/ListLoad.php
+++ b/src/Partecipants/ListLoad.php
@@ -310,7 +310,7 @@
 					INNER JOIN `TargetFaces` ON EnTournament=TfTournament
 					WHERE EnCode=".StrSafe_DB($tmpString[1])." AND EnTournament={$_SESSION['TourId']}
 					AND EnClass=".StrSafe_DB($tmpString[3])." AND EnDivision=".StrSafe_DB($tmpString[2])."
-					AND (CONCAT(EnDivision,EnClass) like TfClasses OR if(TfRegExp!='', CONCAT(EnDivision,EnClass) REGEXP TfRegExp, true))
+					AND (CONCAT(EnDivision,EnClass) like TfClasses OR if(TfRegExp!='', CONCAT(EnDivision,EnClass) REGEXP TfRegExp, false))
 					ORDER BY TfId
 					LIMIT " . $tmpString[4] . ",1";
 				$q=safe_r_SQL($Sql);
diff --git a/src/Partecipants/LookupTableLoad.php b/src/Partecipants/LookupTableLoad.php
index 85de1d51..6d335a45 100644
--- a/src/Partecipants/LookupTableLoad.php
+++ b/src/Partecipants/LookupTableLoad.php
@@ -549,12 +549,17 @@ function DoLookupPhoto($u, $OnlyMissing=false, $ForceOld=false) {
 
 function DoLookupFlags($u) {
 	require_once('Common/CheckPictures.php');
-    $q=safe_r_sql("select CoCode, CoName 
-        from Countries 
-        inner join Entries on CoId in (EnCountry, EnCountry2,EnCountry3) and CoTournament=EnTournament 
+    $q=safe_r_sql("SELECT DISTINCT CoCode, CoName 
+        from Countries  
         left join Flags ON FlTournament=CoTournament AND FlCode=CoCode 
-        where EnTournament={$_SESSION['TourId']} and EnIocCode='$u->LupIocCode' 
-        group by CoCode
+        where CoTournament={$_SESSION['TourId']} AND CoId IN (
+            SELECT EnCountry from Entries WHERE EnTournament={$_SESSION['TourId']} AND EnIocCode='$u->LupIocCode'
+            UNION 
+            SELECT EnCountry2 from Entries WHERE EnTournament={$_SESSION['TourId']} AND EnIocCode='$u->LupIocCode'
+            UNION 
+            SELECT EnCountry3 from Entries WHERE EnTournament={$_SESSION['TourId']} AND EnIocCode='$u->LupIocCode'
+            UNION
+            SELECT TiCountry from TournamentInvolved WHERE TiTournament={$_SESSION['TourId']})
         order by CoCode");
 
     $Opt='';
diff --git a/src/Partecipants/OrisAlphabetical.php b/src/Partecipants/OrisAlphabetical.php
index c0425e82..469a2ed8 100644
--- a/src/Partecipants/OrisAlphabetical.php
+++ b/src/Partecipants/OrisAlphabetical.php
@@ -8,7 +8,7 @@
 
 // ATTENTION!
 // MUST BE called $PdfData
-$PdfData=getStartListAlphabetical('ORIS');
+$PdfData=getStartListAlphabetical('ORIS', true);
 
 if(!isset($isCompleteResultBook))
 	$pdf = new OrisPDF($PdfData->Code, $PdfData->Description);
diff --git a/src/Partecipants/index.php b/src/Partecipants/index.php
index cf2773eb..bffb918f 100644
--- a/src/Partecipants/index.php
+++ b/src/Partecipants/index.php
@@ -47,6 +47,8 @@
 	);
 
 	$OrderCol[$OrderCrit]=($OrderDir=='ASC'?'DESC':'ASC');
+//    $Collation = ($_SESSION['TourCollation'] ? "COLLATE utf8_{$_SESSION['TourCollation']}_ci" : '');
+    $Collation = '';
 
 	switch ($OrderCrit)
 	{
@@ -67,7 +69,7 @@
 			$GroupType=GROUP_TYPE_NOGROUP;
 			break;
 		case 'ordName':
-			$OrderBy = "EnFirstName collate {$_SESSION['COLLATION']} {$OrderDir},EnName collate {$_SESSION['COLLATION']} {$OrderDir} ";
+			$OrderBy = "EnFirstName {$Collation} {$OrderDir},EnName {$Collation} {$OrderDir} ";
 			$GroupType=GROUP_TYPE_LETTER;
 			break;
 		case 'ordEmail':
@@ -79,39 +81,39 @@
 			$GroupType=GROUP_TYPE_NOGROUP;
 			break;
 		case 'ordCtrl':
-			$OrderBy = "EnDob {$OrderDir}, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "EnDob {$OrderDir}, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_NOGROUP;
 			break;
 		case 'ordSex':
-			$OrderBy = "EnSex {$OrderDir}, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "EnSex {$OrderDir}, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_NOGROUP;
 			break;
 		case 'ordCountryCode':
-			$OrderBy = "CoCode {$OrderDir}, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "CoCode {$OrderDir}, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_COUNTRY;
 			break;
 		case 'ordCountry':
-			$OrderBy = "CoName {$OrderDir}, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "CoName {$OrderDir}, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_COUNTRY;
 			break;
 		case 'ordDiv':
-			$OrderBy = "EnDivision {$OrderDir}, EnClass ASC, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "EnDivision {$OrderDir}, EnClass ASC, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_CATEGORY;
 			break;
 		case 'ordWc':
-			$OrderBy = "EnWChair {$OrderDir}, EnDivision, EnClass ASC, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "EnWChair {$OrderDir}, EnDivision, EnClass ASC, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_CATEGORY;
 			break;
 		case 'ordAgeCl':
-			$OrderBy = "EnAgeClass {$OrderDir}, EnDivision ASC, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "EnAgeClass {$OrderDir}, EnDivision ASC, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_CATEGORY;
 			break;
 		case 'ordCl':
-			$OrderBy = "EnClass {$OrderDir}, EnDivision ASC, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "EnClass {$OrderDir}, EnDivision ASC, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_CATEGORY;
 			break;
 		case 'ordSubCl':
-			$OrderBy = "EnSubClass {$OrderDir}, EnDivision ASC, EnClass ASC, EnFirstName collate {$_SESSION['COLLATION']} ASC,EnName collate {$_SESSION['COLLATION']} ASC ";
+			$OrderBy = "EnSubClass {$OrderDir}, EnDivision ASC, EnClass ASC, EnFirstName {$Collation} ASC,EnName {$Collation} ASC ";
 			$GroupType=GROUP_TYPE_NOGROUP;
 			break;
 	}
diff --git a/src/Qualification/CalcRank.php b/src/Qualification/CalcRank.php
index be5151ba..c0a0c0c6 100644
--- a/src/Qualification/CalcRank.php
+++ b/src/Qualification/CalcRank.php
@@ -4,32 +4,26 @@
 	Calcola la rank (anche l'abs).
 	Se riceve Dist=1,2,.... calcola la rank sulla distanza Dist; se non lo riceve, calcola la rank sul totale
 */
-	require_once(dirname(dirname(__FILE__)) . '/config.php');
-	require_once('Fun_Qualification.local.inc.php');
-	require_once('Common/Fun_Sessions.inc.php');
-	require_once('Common/Fun_FormatText.inc.php');
-	require_once('Common/Lib/Obj_RankFactory.php');
-    checkACL(AclQualification, AclReadWrite, false);
 
-	if (!CheckTourSession()) {
-		print get_text('CrackError');
-		exit;
-	}
+require_once(dirname(dirname(__FILE__)) . '/config.php');
+require_once('Fun_Qualification.local.inc.php');
+require_once('Common/Fun_Sessions.inc.php');
+require_once('Common/Fun_FormatText.inc.php');
+require_once('Common/Lib/Obj_RankFactory.php');
 
-	$Errore=0;
+$JSON=[
+    'error'=>1,
+    'msg'=>get_text('CalcRankError','Tournament'),
+];
 
-	if (!IsBlocked(BIT_BLOCK_QUAL)) {
-		$Dist=(isset($_REQUEST['Dist']) ? $_REQUEST['Dist'] : 0);
+if(!hasACL(AclQualification, AclReadWrite) or !CheckTourSession() or IsBlocked(BIT_BLOCK_QUAL)) {
+    JsonOut($JSON);
+}
 
-		$Errore=CalcRank($Dist);
-	} else {
-		$Errore=1;
-	}
+$Dist=intval($_REQUEST['Dist'] ?? 0);
+$JSON['error']=CalcRank($Dist);
+if($JSON['error']==0) {
+    $JSON['msg']=get_text('CalcRankOk','Tournament');
+}
 
-	// produco l'xml di ritorno
-		header('Content-Type: text/xml');
-
-	print '<response>';
-	print '<error>' . $Errore . '</error>';
-	print '<msg>' . ($Errore==1 ? get_text('CalcRankError','Tournament') : get_text('CalcRankOk','Tournament')) . '</msg>';
-	print '</response>';
+JsonOut($JSON);
\ No newline at end of file
diff --git a/src/Qualification/ExportIWS.css b/src/Qualification/ExportIWS.css
deleted file mode 100644
index d4c20cdd..00000000
--- a/src/Qualification/ExportIWS.css
+++ /dev/null
@@ -1,48 +0,0 @@
-.divStatus {
-    font-size: 10px;
-    display:inline-block;
-    width:2em;
-    height:2em;
-    border-radius: 1.1em;
-    border:solid 1px darkred;
-    text-align:center;
-    color:#bbb;
-    background-color:grey;
-    line-height: 2em;
-    font-weight: bold;
-    margin:0 0.25em;
-}
-
-.divStatus.notValid {
-    background-color:red;
-}
-
-.divStatus.isValid {
-    background-color:darkgreen;
-}
-
-.smallContainer {
-    width: 2vw;
-    padding: 0.5em;
-}
-
-.divCodeContainer {
-    width: 5vw;
-    font-weight: bold;
-    text-align: center;
-}
-
-.divContainer {
-    min-width: 20vw;
-}
-
-.exportButton {
-    background-color:darkblue;
-    border:1px solid darkblue;
-    color: white;
-    border-radius:0.25em;
-    font-size: 1.5em;
-    padding: 0.5em 3em;
-    font-weight: bold;
-
-}
\ No newline at end of file
diff --git a/src/Qualification/ExportIWS.js b/src/Qualification/ExportIWS.js
deleted file mode 100644
index 3dd70111..00000000
--- a/src/Qualification/ExportIWS.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function saveWaDivision(divCode) {
-    $.getJSON('ExportIWS.php?updateDiv=' + encodeURIComponent(divCode) + '&Value=' + encodeURIComponent($('#sel_'+divCode).val()), function(data) {
-        if(data.error===0) {
-            $('#div_'+divCode).removeClass('notValid').addClass('isValid');
-        } else {
-            $('#div_'+divCode).removeClass('isValid').addClass('notValid');
-        }
-    });
-    console.log(divCode);
-}
\ No newline at end of file
diff --git a/src/Qualification/ExportIWS.php b/src/Qualification/ExportIWS.php
deleted file mode 100644
index ab0aa12c..00000000
--- a/src/Qualification/ExportIWS.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-define('debug',false);	// settare a true per l'output di debug
-
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once('Common/Fun_FormatText.inc.php');
-
-CheckTourSession(true);
-checkACL(AclQualification, AclReadOnly);
-$validWaDivs = array('R'=>'Recurve', 'C'=>'Compound', 'B'=>'Barebow',);
-
-if(!empty($_REQUEST["updateDiv"])) {
-    $JSON=array('error' => 1, 'div' => $_REQUEST["updateDiv"]);
-    if(array_key_exists($_REQUEST["Value"],$validWaDivs)) {
-        safe_w_SQL("UPDATE `Divisions` SET `DivWaDivision` = '".$_REQUEST["Value"]."' WHERE `DivId` = '".$_REQUEST["updateDiv"]."' AND `DivTournament` = ".$_SESSION['TourId']);
-        $JSON['error']=0;
-    } else {
-        safe_w_SQL("UPDATE `Divisions` SET `DivWaDivision` = '' WHERE `DivId` = '".$_REQUEST["updateDiv"]."' AND `DivTournament` = ".$_SESSION['TourId']);
-    }
-    JsonOut($JSON);
-} else if (empty($_REQUEST['DoExport'])) {
-    $PAGE_TITLE=get_text('MenuLM_ExportIndoorWorldSeries', 'Common');
-    $IncludeJquery = true;
-    $JS_SCRIPT = array(
-        '<script type="text/javascript" src="./ExportIWS.js"></script>',
-        '<link href="./ExportIWS.css" rel="stylesheet" type="text/css">',
-    );
-    include('Common/Templates/head.php');
-    echo '<table class="Tabella">';
-    echo '<tr><th class="Title" colspan="4">' . get_text('MenuLM_ExportIndoorWorldSeries') . '</th></tr>';
-    echo '<tr><th>&nbsp;</th><th colspan="2">' . get_text('Division'). '</th><th>' . get_text('WADivision'). '</th></tr>';
-
-    $q = safe_r_SQL("SELECT `DivId`,`DivDescription`,`DivWaDivision`,`DivAthlete` FROM `Divisions` WHERE `DivTournament`=".$_SESSION['TourId']." ORDER BY `DivAthlete` DESC, `DivViewOrder`,`DivId`");
-    while($r=safe_fetch($q)) {
-        echo '<tr>'.
-            '<th class="smallContainer"><div id="div_'.$r->DivId.'" class="divStatus ' . ($r->DivAthlete=="1" ? (array_key_exists($r->DivWaDivision,$validWaDivs) ? 'isValid':'notValid') : '').'">&nbsp;</div></th>'.
-            '<td class="divCodeContainer">'.$r->DivId.'</td>'.
-            '<td class="divContainer">'.$r->DivDescription.'</td>'.
-            '<td class="divContainer">';
-        if($r->DivAthlete) {
-            echo '<select id="sel_' . $r->DivId . '" onchange="saveWaDivision(\''.$r->DivId.'\')"><option value="">---</option>';
-            foreach ($validWaDivs as $k => $v) {
-                echo '<option value="' . $k . '" ' . ($r->DivWaDivision == $k ? 'selected="selected"' : '') . '>' . $k . ' - ' . $v . '</option>';
-            }
-            echo '</select>';
-        } else {
-            echo '&nbsp;';
-        }
-            echo '</td>'.
-        '</tr>';
-    }
-    echo '<tr class="divider"><td colspan="4"></td></tr>';
-    echo '<tr><td colspan="4" class="Center"><input class="exportButton" type="button" value="'.get_text('CmdExport', 'Tournament').'" onclick="window.open(\''.$_SERVER['PHP_SELF'].'?DoExport=1\',\'_blank\')"></td></tr>';
-    echo '</table>';
-
-    include('Common/Templates/tail.php');
-} else {
-    $DistQuery = '';
-
-    $Sql = "SELECT EnCode as Bib, IFNULL(bib.EdExtra,'') as WaBib, EnFirstName AS FamilyName, EnName AS GivenName, EnDob as DoB, EnSex as Gender, CoCode AS NOC, CoMaCode as MaNoc, ToCountry as ToNoc, DivDescription, EnDivision, DivWaDivision, EnClass, QuScore, QuGold, QuXnine,
-       TfT1, TfW1, TfT2, TfW2, TfT3, TfW3, TfT4, TfW4, TfT5, TfW5, TfT6, TfW6, TfT7, TfW7, TfT8, TfW8,
-       TdDist1, TdDist2, TdDist3, TdDist4, TdDist5, TdDist6, TdDist7, TdDist8, IFNULL(NumArrows,0) as totArrows
-	FROM Qualifications
-	INNER JOIN Entries ON QuId=EnId
-	INNER JOIN Countries ON EnCountry=CoId AND EnTournament=CoTournament
-    INNER JOIN Divisions ON EnDivision=DivId and EnTournament=DivTournament
-    INNER JOIN Tournament ON EnTournament=ToId
-	LEFT JOIN ExtraData bib on bib.EdId=EnId and bib.EdType='Z'
-    LEFT JOIN TargetFaces ON EnTournament=TfTournament AND EnTargetFace=TfId 
-    LEFT JOIN TournamentDistances ON TdType=ToType AND TdTournament=EnTournament AND CONCAT(TRIM(EnDivision),TRIM(EnClass)) LIKE TdClasses
-    LEFT JOIN (SELECT DiSession, sum(DiEnds*DiArrows) as NumArrows FROM `DistanceInformation` where DiType='Q' and DiTournament=" . StrSafe_DB($_SESSION['TourId']) . " GROUP BY DiSession) as sqy ON QuSession=DiSession 
-	WHERE EnTournament = " . StrSafe_DB($_SESSION['TourId']) . " AND EnAthlete=1
-	ORDER BY QuTargetNo, CoCode, EnName ";
-    $q = safe_r_sql($Sql);
-    //echo $MyQuery;exit;
-
-    $header = array('National ID', 'World Archery ID', 'Family Name', 'Given Name', 'Date of Birth', 'Gender', 'NOC Code', 'Division', 'Score', '10s', '9s');
-    $ClDivDetails = array();
-    $DivDetails = array();
-    $data = array();
-    $invalidData = array();
-    while ($r = safe_fetch($q)) {
-        $isValid = true;
-        $ClDivDetails[] = $r->EnDivision .':'. $r->EnClass . '|' . $r->totArrows . '|' .
-            $r->TdDist1 . '-' . $r->TfT1 . '-' . $r->TfW1 . '|' . $r->TdDist2 . '-' . $r->TfT2 . '-' . $r->TfW2 . '|' . $r->TdDist3 . '-' . $r->TfT3 . '-' . $r->TfW3 . '|' . $r->TdDist4 . '-' . $r->TfT4 . '-' . $r->TfW4 . '|' .
-            $r->TdDist5 . '-' . $r->TfT5 . '-' . $r->TfW5 . '|' . $r->TdDist6 . '-' . $r->TfT6 . '-' . $r->TfW6 . '|' . $r->TdDist7 . '-' . $r->TfT7 . '-' . $r->TfW7 . '|' . $r->TdDist8 . '-' . $r->TfT8 . '-' . $r->TfW8;
-        $DivDetails[] = $r->EnDivision . '|' . $r->DivWaDivision . '|' . $r->DivDescription;
-
-        for ($i = 1; $i <= 8; $i++) {
-            $isValid = ($isValid and array_key_exists((empty($r->DivWaDivision) ? $r->EnDivision : $r->DivWaDivision),$validWaDivs) AND ($r->{"TdDist" . $i} == 0 or $r->{"TdDist" . $i} == 18) and ($r->{"TfW" . $i} == 0 or $r->{"TfW" . $i} == 40));
-        }
-        if (($r->totArrows == 0 or $r->totArrows == 60) and $isValid) {
-            $data[] = array('"' . $r->Bib . '"', $r->WaBib,
-                '"' . $r->FamilyName . '"', '"' . $r->GivenName . '"', $r->DoB, ($r->Gender ? 'W' : 'M'),
-                '"' . (!empty($r->MaNoc) ? $r->MaNoc : (!empty($r->ToNoc) ? $r->ToNoc : $r->NOC)) . '"',
-                '"' . (empty($r->DivWaDivision) ? $r->EnDivision : $r->DivWaDivision) . '"',
-                $r->QuScore, $r->QuGold, $r->QuXnine);
-        } else {
-            $invalidData[] = array('"' . $r->Bib . '"', $r->WaBib,
-                '"' . $r->FamilyName . '"', '"' . $r->GivenName . '"', $r->DoB, ($r->Gender ? 'W' : 'M'),
-                '"' . $r->NOC . ':' . (!empty($r->MaNoc) ? $r->MaNoc : (!empty($r->ToNoc) ? $r->ToNoc : $r->NOC)) . '"',
-                '"' . $r->EnDivision . ':' . $r->EnClass . '"',
-                $r->QuScore, $r->QuGold, $r->QuXnine);
-        }
-    }
-    header('Cache-Control: no-store, no-cache, must-revalidate');
-    header('Content-Disposition: attachment; filename=' . $_SESSION["TourCode"] . '.csv');
-    header('Content-type: text/comma-separated-values; charset=' . PageEncode);
-    echo '# ' . implode(';', $header) . "\n";
-    foreach ($data as $row) {
-        echo implode(';', $row) . "\n";
-    }
-    echo str_repeat('#', 40) . "\n";
-    foreach ($invalidData as $row) {
-        echo '#' . implode(';', $row) . "\n";
-    }
-    echo str_repeat('#', 40) . "\n";
-    echo "# " . $_SESSION["TourCode"] . " - " . $_SESSION["TourName"] . "\n";
-    echo "# " . $_SESSION["TourWhere"] . "\n";
-    echo "# " . $_SESSION["TourRealWhenFrom"] . " - " . $_SESSION["TourRealWhenTo"] . "\n";
-    echo str_repeat('#', 40) . "\n";
-    $DivDetails = array_unique($DivDetails, SORT_REGULAR);
-    sort($DivDetails, SORT_REGULAR);
-    foreach ($DivDetails as $row) {
-        echo '# ' . $row . "\n";
-    }
-    echo str_repeat('#', 40) . "\n";
-    $ClDivDetails = array_unique($ClDivDetails, SORT_REGULAR);
-    sort($ClDivDetails, SORT_REGULAR);
-    foreach ($ClDivDetails as $row) {
-        echo '# ' . $row . "\n";
-    }
-    echo str_repeat('#', 40) . "\n";
-}
\ No newline at end of file
diff --git a/src/Qualification/Fun_AJAX_index.js b/src/Qualification/Fun_AJAX_index.js
index f5d9858d..24074b27 100644
--- a/src/Qualification/Fun_AJAX_index.js
+++ b/src/Qualification/Fun_AJAX_index.js
@@ -13,30 +13,30 @@ var Cache = new Array();	// cache per l'update
 var PostUpdate=false;		// true se è partito il postupdate. verrà rimesso a false dopo che la coda si è svuotata
 var PostUpdateCnt=0;		// Contatore degli aggiornamenti in postupdate, per decidere se ricalcolare o no
 
-function ManagePostUpdate(chk)
-{
-	if (!chk)
-	{
-		UpdateQuals();
-	}
-	else
-	{
+function ManagePostUpdate(chk) {
+	if (!chk) {
+		if(PostUpdate && !$('#chk_PostUpdate').is(':checked')) {
+			PostUpdateMessage();
+			if (PostUpdateCnt != 0) {
+				CalcRank(true);
+				CalcRank(false);
+				MakeTeams();
+			}
+			ResetPostUpdate();
+		}
+	} else {
 		PostUpdate=true;
 		PostUpdateCnt=0;
 	}
 }
 
-function PostUpdateMessage()
-{
-	//document.getElementById('idPostUpdateMessage').innerHTML=PostUpdating;
-	document.getElementById('PostUpdateMask').style.visibility="visible";
+function PostUpdateMessage() {
+	$('#PostUpdateMask').css('visibility',"visible");
 }
 
-function ResetPostUpdate()
-{
+function ResetPostUpdate() {
 	PostUpdate=false;
-	//document.getElementById('idPostUpdateMessage').innerHTML='';
-	document.getElementById('PostUpdateMask').style.visibility="hidden";
+	$('#PostUpdateMask').css('visibility',"hidden");
 	alert(PostUpdateEnd);
 }
 
@@ -45,256 +45,48 @@ function ResetPostUpdate()
 	Invia la GET a UpdateQuals.php
 */
 function UpdateQuals(Field) {
-	if (XMLHttp)
-	{
-		if (Field)
-		{
-			var FieldName = encodeURIComponent(Field);
-			var FieldValue= encodeURIComponent(document.getElementById(Field).value);
-			Cache.push(FieldName + "=" + FieldValue);
-			PostUpdateCnt++;
-		}
-
-
-		try {
-
-			if ((XMLHttp.readyState==XHS_COMPLETE || XMLHttp.readyState==XHS_UNINIT))
-			{
-				if (Cache.length>0)
-				{
-					var FromCache = Cache.shift();
-					XMLHttp.open("POST",RootDir+"UpdateQuals.php",true);
-					XMLHttp.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
-					XMLHttp.onreadystatechange=UpdateQuals_StateChange;
-					if (PostUpdate)
-						FromCache += "&NoRecalc=1";
-					XMLHttp.send(FromCache);
-				}
-				else
-				{
-					if (!document.getElementById('chk_PostUpdate').checked)
-					{
-						if (PostUpdate)
-						{
-							PostUpdateMessage();
-							if(PostUpdateCnt != 0)
-							{
-								CalcRank(true);
-								XMLHttp = CreateXMLHttpRequestObject();
-								CalcRank(false);
-								XMLHttp = CreateXMLHttpRequestObject();
-								MakeTeams();
-							}
-							ResetPostUpdate();
-						}
-					}
-				}
-			}
-		}
-		catch (e) {}
-
-	}
-}
-
-function UpdateQuals_StateChange()
-{
-	// se lo stato � Complete vado avanti
-	if (XMLHttp.readyState==XHS_COMPLETE)
-	{
-	// se lo status di HTTP � ok vado avanti
-		if (XMLHttp.status==200)
-		{
-			try
-			{
-				UpdateQuals_Response();
-			}
-			catch(e)
-			{
-			}
-		}
-		else
-		{
-		}
+	let form={};
+	form[Field]=$('#'+Field).val();
+	if(PostUpdate) {
+		form.NoRecalc=1;
+		PostUpdateCnt++;
 	}
-}
-
-function UpdateQuals_Response()
-{
-
-	// leggo l'xml
-	var XMLResp=XMLHttp.responseXML;
-// intercetto gli errori di IE e Opera
-	if (!XMLResp || !XMLResp.documentElement)
-		throw(XMLResp.responseText);
 
-// Intercetto gli errori di Firefox
-	var XMLRoot;
-	if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror")
-		throw("");
+	$.getJSON(RootDir+"UpdateQuals.php", form, function(data) {
+		if(data.error==0) {
+			$('#idScore_' + data.id).html(data.score);
+			$('#idGold_' + data.id).html(data.gold);
+			$('#idXNine_' + data.id).html(data.xnine);
 
-	XMLRoot = XMLResp.documentElement;
-
-	var Error = XMLRoot.getElementsByTagName('error').item(0).firstChild.data;
-	var Which = XMLRoot.getElementsByTagName('which').item(0).firstChild.data;
-
-	if (Error==0)
-	{
-		var Id = XMLRoot.getElementsByTagName('id').item(0).firstChild.data;
-		var Score = XMLRoot.getElementsByTagName('score').item(0).firstChild.data;
-		var Gold = XMLRoot.getElementsByTagName('gold').item(0).firstChild.data;
-		var XNine = XMLRoot.getElementsByTagName('xnine').item(0).firstChild.data;
-
-		document.getElementById('idScore_' + Id).innerHTML=Score;
-		document.getElementById('idGold_' + Id).innerHTML=Gold;
-		document.getElementById('idXNine_' + Id).innerHTML=XNine;
-
-		SetStyle(Which,'');
-	}
-	else
-	{
-		SetStyle(Which,'error');
-	}
-
-	// per scaricare la cache degli update
-	setTimeout("UpdateQuals()",250);
-}
-
-/*
-	- MakeTeams()
-	Invia la GET a MakeTeams.php
-*/
-function MakeTeams()
-{
-	if (XMLHttp)
-	{
-		try {
-			if (XMLHttp.readyState==XHS_COMPLETE || XMLHttp.readyState==XHS_UNINIT)
-			{
-				XMLHttp.open("GET",RootDir+"MakeTeams.php",true);
-				XMLHttp.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
-				XMLHttp.onreadystatechange=MakeTeams_StateChange;
-				XMLHttp.send(null);
-			}
-		} catch (e) {}
-	}
+			SetStyle(data.which,'');
+		} else {
+			SetStyle(data.which,'error');
+		}
+	});
 }
 
-function MakeTeams_StateChange()
-{
-	// se lo stato � Complete vado avanti
-	if (XMLHttp.readyState==XHS_COMPLETE)
-	{
-	// se lo status di HTTP � ok vado avanti
-		if (XMLHttp.status==200)
-		{
-			try
-			{
-				MakeTeams_Response();
-			}
-			catch(e)
-			{
-			}
-		}
-		else
-		{
+/**
+	Recreates the DivClass teams
+**/
+function MakeTeams() {
+	$.getJSON(RootDir+"MakeTeams.php", function(data) {
+		alert(data.msg);
+		if(data.error==0) {
+			MakeTeamsAbs();
 		}
-	}
+	});
 }
 
-function MakeTeams_Response()
-{
-
-	// leggo l'xml
-	var XMLResp=XMLHttp.responseXML;
-// intercetto gli errori di IE e Opera
-	if (!XMLResp || !XMLResp.documentElement)
-		throw(XMLResp.responseText);
-
-// Intercetto gli errori di Firefox
-	var XMLRoot;
-	if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror")
-		throw("");
-
-	XMLRoot = XMLResp.documentElement;
-
-	var Error = XMLRoot.getElementsByTagName('error').item(0).firstChild.data;
-	var Msg = XMLRoot.getElementsByTagName('msg').item(0).firstChild.data;
-
-	alert(Msg);
 
-	XMLHttp = CreateXMLHttpRequestObject();
-	MakeTeamsAbs();
-}
-
-/*
-	- MakeTeamsAbs()
-	Invia la GET a MakeTeamsAbss.php
+/**
+	Recreates the Event teams
 */
 function MakeTeamsAbs(){
-	if (XMLHttp) {
-		try {
-			if (XMLHttp.readyState==XHS_COMPLETE || XMLHttp.readyState==XHS_UNINIT)
-			{
-				XMLHttp.open("GET",RootDir+"MakeTeamsAbs.php",true);
-				XMLHttp.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
-				XMLHttp.onreadystatechange=MakeTeamsAbs_StateChange;
-				XMLHttp.send(null);
-			}
-		} catch (e) {
-			document.getElementById('idOutput').innerHTML='Errore: ' + e.toString();
-		}
-	}
-}
-
-function MakeTeamsAbs_StateChange()
-{
-	// se lo stato � Complete vado avanti
-	if (XMLHttp.readyState==XHS_COMPLETE)
-	{
-	// se lo status di HTTP � ok vado avanti
-		if (XMLHttp.status==200)
-		{
-			try
-			{
-				MakeTeamsAbs_Response();
-			}
-			catch(e)
-			{
-				document.getElementById('idOutput').innerHTML='Errore: ' + e.toString();
-			}
-		}
-		else
-		{
-			document.getElementById('idOutput').innerHTML='Errore: ' +XMLHttp.statusText;
-		}
-	}
-}
-
-function MakeTeamsAbs_Response()
-{
-
-	// leggo l'xml
-	var XMLResp=XMLHttp.responseXML;
-// intercetto gli errori di IE e Opera
-	if (!XMLResp || !XMLResp.documentElement)
-		throw(XMLResp.responseText);
-
-// Intercetto gli errori di Firefox
-	var XMLRoot;
-	if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror")
-		throw("");
-
-	XMLRoot = XMLResp.documentElement;
-
-	var Error = XMLRoot.getElementsByTagName('error').item(0).firstChild.data;
-	var Msg = XMLRoot.getElementsByTagName('msg').item(0).firstChild.data;
-
-	alert(Msg);
+	$.getJSON(RootDir+"MakeTeamsAbs.php", function(data) {
+		alert(data.msg);
+	});
 }
 
-
-
-
 /*
 	- CalcRank(Dist=false)
 	Invia la GET a CalcRank.php
@@ -303,66 +95,17 @@ function MakeTeamsAbs_Response()
 */
 
 function CalcRank(Dist) {
-	if (XMLHttp) {
-		try {
-			if (!Dist || (Dist && document.getElementById('x_Dist').value!=-1))
-			{
-				if (XMLHttp.readyState==XHS_COMPLETE || XMLHttp.readyState==XHS_UNINIT)
-				{
-					XMLHttp.open("GET","CalcRank.php" + (Dist ? "?Dist=" + document.getElementById('x_Dist').value : ""),true);
-					XMLHttp.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
-					XMLHttp.onreadystatechange=CalcRank_StateChange;
-					XMLHttp.send(null);
-				}
-			}
-		} catch (e) { }
+	let form={}
+	if(Dist) {
+		form.Dist=$('#x_Dist').val()
 	}
-}
-
-function CalcRank_StateChange()
-{
-	// se lo stato � Complete vado avanti
-	if (XMLHttp.readyState==XHS_COMPLETE)
-	{
-	// se lo status di HTTP � ok vado avanti
-		if (XMLHttp.status==200)
-		{
-			try
-			{
-				CalcRank_Response();
-			}
-			catch(e)
-			{
-			}
-		}
-		else
-		{
-		}
+	if(!Dist || form.Dist!=-1) {
+		$.getJSON(RootDir+"CalcRank.php", form, function(data) {
+			alert(data.msg);
+		});
 	}
 }
 
-function CalcRank_Response()
-{
-
-	// leggo l'xml
-	var XMLResp=XMLHttp.responseXML;
-// intercetto gli errori di IE e Opera
-	if (!XMLResp || !XMLResp.documentElement)
-		throw(XMLResp.responseText);
-
-// Intercetto gli errori di Firefox
-	var XMLRoot;
-	if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror")
-		throw("");
-
-	XMLRoot = XMLResp.documentElement;
-
-	var Error = XMLRoot.getElementsByTagName('error').item(0).firstChild.data;
-	var Msg = XMLRoot.getElementsByTagName('msg').item(0).firstChild.data;
-
-	alert(Msg);
-}
-
 function SelectSession() {
 	SelectSession_JSON(document.getElementById('x_Session'));
 	return;
@@ -422,77 +165,17 @@ function Went2Home(Id) {
 	}
 }
 
-function saveSnapshotImage()
-{
-	if (XMLHttp)
-	{
-		try
-		{
-			if (XMLHttp.readyState==XHS_COMPLETE || XMLHttp.readyState==XHS_UNINIT)
-			{
-				var ses=document.getElementById('x_Session').value;
-				var from=document.getElementById('x_From').value;
-				var to=document.getElementById('x_To').value;
-				var dist=document.getElementById('x_Dist').value;
-				var qs
-					= '?Session=' + ses
-					+ '&Distance=' + dist
-					+ '&fromTarget=' + from
-					+ '&toTarget=' + to;
-				XMLHttp.open("GET",RootDir+"MakeSnapshot.php" + qs,true);
-				XMLHttp.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
-				XMLHttp.onreadystatechange=saveSnapshotImage_StateChange;
-				XMLHttp.send(null);
-			}
-		}
-		catch (e)
-		{
-		}
+function saveSnapshotImage() {
+	let form={
+		Session: $('#x_Session').val(),
+		Distance: $('#x_Dist').val(),
+		fromTarget: $('#x_From').val(),
+		toTarget: $('#x_To').val(),
 	}
-}
 
-function saveSnapshotImage_StateChange()
-{
-	// se lo stato � Complete vado avanti
-	if (XMLHttp.readyState==XHS_COMPLETE)
-	{
-	// se lo status di HTTP � ok vado avanti
-		if (XMLHttp.status==200)
-		{
-			try
-			{
-				saveSnapshotImage_Response();
-			}
-			catch(e)
-			{
-			}
-		}
-		else
-		{
-		}
-	}
-}
-
-function saveSnapshotImage_Response()
-{
-
-	// leggo l'xml
-	var XMLResp=XMLHttp.responseXML;
-// intercetto gli errori di IE e Opera
-	if (!XMLResp || !XMLResp.documentElement)
-		throw(XMLResp.responseText);
-
-// Intercetto gli errori di Firefox
-	var XMLRoot;
-	if ((XMLRoot = XMLResp.documentElement.nodeName)=="parsererror")
-		throw("");
-
-	XMLRoot = XMLResp.documentElement;
-
-	var Error = XMLRoot.getElementsByTagName('error').item(0).firstChild.data;
-	var Msg = XMLRoot.getElementsByTagName('msg').item(0).firstChild.data;
-
-	alert(Msg);
+	$.getJSON(RootDir+"MakeSnapshot.php", form, function(data) {
+		alert(data.msg);
+	});
 }
 
 function Disqualify(Id) {
diff --git a/src/Qualification/Fun_Qualification.local.inc.php b/src/Qualification/Fun_Qualification.local.inc.php
index 6e45d37d..8193c379 100644
--- a/src/Qualification/Fun_Qualification.local.inc.php
+++ b/src/Qualification/Fun_Qualification.local.inc.php
@@ -1437,7 +1437,7 @@ function MakeTeamsRun($Event, $ToId=0)/*,$MoreTeam=true*/ {
 	DropTmpTeams();
 
 	// creates the team final components
-	$now = date('Y-m-d H:i:s');
+	$now = getToday('now', 'Y-m-d H:i:s');
 	safe_w_SQL("INSERT INTO TeamFinComponent (TfcCoId, TfcSubTeam, TfcTournament, TfcEvent, TfcId, TfcOrder, TfcTimeStamp) 
 		SELECT TcCoId, TcSubTeam, TcTournament, TcEvent, TcId, TcOrder, '{$now}'
 		FROM TeamComponent 
diff --git a/src/Qualification/MakeSnapshot.php b/src/Qualification/MakeSnapshot.php
index 97a97a0b..e2f09504 100644
--- a/src/Qualification/MakeSnapshot.php
+++ b/src/Qualification/MakeSnapshot.php
@@ -6,54 +6,43 @@
 
 require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once('Qualification/Fun_Qualification.local.inc.php');
-checkACL(AclQualification, AclReadWrite, false);
-
-$Errore=1;
-$xmlReturn='';
-$JSON=array('Error' => 1, 'msg' => '');
-if (!IsBlocked(BIT_BLOCK_QUAL)) {
-	$Session = (isset($_REQUEST["Session"]) ? intval($_REQUEST["Session"]) : 0);
-	$Distance = (isset($_REQUEST["Distance"]) ? intval($_REQUEST["Distance"]) : 0);
-	$FromTarget = ($_REQUEST["fromTarget"] ? intval($_REQUEST["fromTarget"]) : 0);
-	$ToTarget = ($_REQUEST["toTarget"] ? intval($_REQUEST["toTarget"]) : 0);
-
-	if ($Session and $Distance and $FromTarget and $ToTarget) {
-		$Errore=0;
-		$JSON['Error']=0;
-		$num=array();
-		if(isset($_REQUEST["numArrows"]) && preg_match("/^[0-9]{1,2}$/",$_REQUEST["numArrows"])) {
-			if($_REQUEST["numArrows"]==0) {
-				// get num of ends for that session and distance
-				$obj=getArrowEnds($Session, $Distance);
-				for($i=$obj[$Distance]['arrows']; $i<=$obj[$Distance]['arrows']*$obj[$Distance]['ends']; $i+=$obj[$Distance]['arrows'] ) {
-					$tmp=useArrowsSnapshot($Session, $Distance, $FromTarget, $ToTarget,$i);
-					$xmlReturn .= '<numArrows>'  . $tmp . '</numArrows>' . "\n";
-					$num[]=$tmp;
-				}
-			} else {
-				$tmp=useArrowsSnapshot($Session, $Distance, $FromTarget, $ToTarget, $_REQUEST["numArrows"]);
-				$xmlReturn .= '<numArrows>'  . $tmp . '</numArrows>' . "\n";
-				$num[]=$tmp;
-			}
-		} else {
-			$xmlReturn .= '<numArrows>'  . recalSnapshot($Session, $Distance, $FromTarget, $ToTarget) . '</numArrows>' . "\n";
-			$num[]='current';
-		}
-		$JSON['msg']=get_text('SnapshotRecalculated', 'Tournament', implode(', ', $num));
-	}
-}
 
-if(isset($_REQUEST['json'])) {
-	JsonOut($JSON);
-}
+$JSON=[
+    'error'=>1,
+    'msg'=>get_text('MakeSnapshotError','Tournament'),
+];
+
+if(!hasACL(AclQualification, AclReadWrite) or IsBlocked(BIT_BLOCK_QUAL)) {
+    JsonOut($JSON);
+};
 
-// produco l'xml di ritorno
-header('Content-Type: text/xml');
 
-print '<response>' . "\n";
-print '<error>' . $Errore . '</error>' . "\n";
-print '<msg><![CDATA[' . ($Errore==1 ? get_text('MakeSnapshotError','Tournament') : get_text('MakeSnapshotOk','Tournament')) . ']]></msg>';
-print $xmlReturn;
-print '</response>' . "\n";
+$Session = (isset($_REQUEST["Session"]) ? intval($_REQUEST["Session"]) : 0);
+$Distance = (isset($_REQUEST["Distance"]) ? intval($_REQUEST["Distance"]) : 0);
+$FromTarget = ($_REQUEST["fromTarget"] ? intval($_REQUEST["fromTarget"]) : 0);
+$ToTarget = ($_REQUEST["toTarget"] ? intval($_REQUEST["toTarget"]) : 0);
 
+if (!($Session and $Distance and $FromTarget and $ToTarget)) {
+    JsonOut($JSON);
+}
+
+$JSON['error']=0;
+$num=array();
+if(isset($_REQUEST["numArrows"]) && preg_match("/^[0-9]{1,2}$/",$_REQUEST["numArrows"])) {
+    if($_REQUEST["numArrows"]==0) {
+        // get num of ends for that session and distance
+        $obj=getArrowEnds($Session, $Distance);
+        for($i=$obj[$Distance]['arrows']; $i<=$obj[$Distance]['arrows']*$obj[$Distance]['ends']; $i+=$obj[$Distance]['arrows'] ) {
+            $tmp=useArrowsSnapshot($Session, $Distance, $FromTarget, $ToTarget,$i);
+            $num[]=$tmp;
+        }
+    } else {
+        $tmp=useArrowsSnapshot($Session, $Distance, $FromTarget, $ToTarget, $_REQUEST["numArrows"]);
+        $num[]=$tmp;
+    }
+} else {
+    $num[]='current';
+}
+$JSON['msg']=get_text('SnapshotRecalculated', 'Tournament', implode(', ', $num));
 
+JsonOut($JSON);
diff --git a/src/Qualification/MakeTeams.php b/src/Qualification/MakeTeams.php
index 43793498..18ed4d3d 100644
--- a/src/Qualification/MakeTeams.php
+++ b/src/Qualification/MakeTeams.php
@@ -3,29 +3,19 @@
 															- MakeTeams.php -
 	Genera le squadre
 */
+require_once(dirname(dirname(__FILE__)) . '/config.php');
+require_once('Qualification/Fun_Qualification.local.inc.php');
 
-	define('debug',false);	// settare a true per l'output di debug
-	require_once(dirname(dirname(__FILE__)) . '/config.php');
-	require_once('Qualification/Fun_Qualification.local.inc.php');
-    checkACL(AclQualification, AclReadWrite, false);
+$JSON=[
+    'error'=>1,
+    'msg'=>get_text('Error','Errors'),
+];
 
-	$Errore=0;
+if(!hasACL(AclQualification, AclReadWrite) or IsBlocked(BIT_BLOCK_QUAL)) {
+    JsonOut($JSON);
+}
 
-	if (!IsBlocked(BIT_BLOCK_QUAL))	{
-		$Errore	= MakeTeams(NULL, NULL);
-	}
-	else
-		$Errore=1;
+$JSON['error'] = MakeTeams(NULL, NULL);
+$JSON['msg'] = get_text('ResultSqClass','Tournament') . ($JSON['error'] ? get_text('MakeTeamsError','Tournament') : get_text('MakeTeamsOk','Tournament')) ;
 
-	// produco l'xml di ritorno
-
-	if (!debug)
-		header('Content-Type: text/xml');
-
-	print '<response>';
-	print '<error>' . $Errore . '</error>';
-	print '<msg><![CDATA[' . get_text('ResultSqClass','Tournament') . ($Errore==1 ? get_text('MakeTeamsError','Tournament') : get_text('MakeTeamsOk','Tournament')) . ']]></msg>';
-	print '</response>';
-
-
-?>
\ No newline at end of file
+JsonOut($JSON);
\ No newline at end of file
diff --git a/src/Qualification/MakeTeamsAbs.php b/src/Qualification/MakeTeamsAbs.php
index 6745fcd6..b127ddc2 100644
--- a/src/Qualification/MakeTeamsAbs.php
+++ b/src/Qualification/MakeTeamsAbs.php
@@ -4,25 +4,19 @@
 	Genera le squadre Assolute
 */
 
-	define('debug',false);	// settare a true per l'output di debug
-	require_once(dirname(dirname(__FILE__)) . '/config.php');
-	require_once('Qualification/Fun_Qualification.local.inc.php');
-    checkACL(AclQualification, AclReadWrite, false);
+require_once(dirname(dirname(__FILE__)) . '/config.php');
+require_once('Qualification/Fun_Qualification.local.inc.php');
 
-	$Errore=0;
-	
-	if(!IsBlocked(BIT_BLOCK_QUAL)) {
-		$Errore	= MakeTeamsAbs(NULL,null,null);
-	}
-	else
-		$Errore=1;
-	// produco l'xml di ritorno
+$JSON=[
+    'error'=>1,
+    'msg'=>get_text('Error','Errors'),
+];
 
-	if (!debug)
-		header('Content-Type: text/xml');
-		
-	print '<response>';
-	print '<error>' . $Errore . '</error>';
-	print '<msg><![CDATA[' . get_text('ResultSqAbs','Tournament') . ($Errore==1 ? get_text('MakeTeamsError','Tournament') : get_text('MakeTeamsOk','Tournament')) . ']]></msg>';
-	print '</response>';
-?>
\ No newline at end of file
+if(!hasACL(AclQualification, AclReadWrite) or IsBlocked(BIT_BLOCK_QUAL)) {
+    JsonOut($JSON);
+}
+
+$JSON['error'] = MakeTeamsAbs(NULL, NULL, NULL);
+$JSON['msg'] = get_text('ResultSqAbs','Tournament') . ($JSON['error'] ? get_text('MakeTeamsError','Tournament') : get_text('MakeTeamsOk','Tournament')) ;
+
+JsonOut($JSON);
\ No newline at end of file
diff --git a/src/Qualification/PrnGetScore.php b/src/Qualification/PrnGetScore.php
index b4a5841b..37cca781 100644
--- a/src/Qualification/PrnGetScore.php
+++ b/src/Qualification/PrnGetScore.php
@@ -27,7 +27,7 @@
 	$From=intval($_REQUEST['x_From'] ?? 0);
 	$To=intval($_REQUEST['x_To'] ?? 0);
 
-	$MyQuery = "SELECT ToCategory&12 as IsField3D, ToNumEnds, EnName AS Name, EnFirstName AS FirstName, AtSession AS Session, AtTarget AS TargetNo,  AtLetter AS BackNo
+	$MyQuery = "SELECT ToCategory&12 as IsField3D, ToNumEnds, EnName AS Name, EnFirstName AS FirstName, AtSession AS Session, AtTarget AS TargetNo,  AtLetter AS BackNo,  IF(TfGolds='',ToGolds,TfGolds) as Golds, IF(TfXNine='',ToXNine,TfXNine) as XNine
 		FROM AvailableTarget
 		INNER JOIN Tournament AS t ON t.ToId=AtTournament";
 	if(!empty($_REQUEST["noEmpty"])) {
@@ -39,68 +39,70 @@
 				) as Tgt ON AtTournament=Tgt.EnTournament AND AtTarget=QuTarget and AtSession=QuSession	";
 	}
 	$MyQuery.= "LEFT JOIN (
-					SELECT EnName, EnFirstName, EnTournament, QuTargetNo 
-					FROM Entries AS e INNER JOIN Qualifications AS q ON e.EnId=q.QuId AND e.EnTournament=" . StrSafe_DB($_SESSION['TourId']) . " AND EnAthlete=1
+					SELECT EnName, EnFirstName, EnTournament, QuTargetNo, TfGolds, TfXNine
+					FROM Entries AS e 
+					INNER JOIN Qualifications AS q ON e.EnId=q.QuId AND e.EnTournament=" . StrSafe_DB($_SESSION['TourId']) . " AND EnAthlete=1
+					left join TargetFaces ON TfTournament=EnTournament and EnTargetFace=TfId
 					) sq ON AtTournament=sq.EnTournament AND AtTargetNo=sq.QuTargetNo 
 				WHERE AtTournament = {$_SESSION['TourId']} ".($Session ? " AND AtSession=$Session" : "").($To>0 ? " and AtTarget between $From and $To" : "");
 
 	$MyQuery.= " ORDER BY if(ToCategory&12, (substr(AtTargetNo,2 , 3)-1)%ToNumEnds, 1), AtTargetNo, Name, FirstName ";
 
 	$Rs=safe_r_sql($MyQuery);
-	if($Rs)
-	{
-		$Etichetta=-1;
-		$CurrentTarget=0;
-		$NewTarget=true;
-		$CurHeight=0;
-
-		$BlockHeight=($pdf->getPageHeight()-30)/$RowsPerPage;
-		$CellHeight=$BlockHeight/($ath4target+1);
-		$BlocksPerPage=$RowsPerPage*3;
-
-		while($MyRow=safe_fetch($Rs)) {
-
-			if($CurrentTarget != $MyRow->Session . $MyRow->TargetNo)
-			{
-				$Etichetta = ++$Etichetta % $BlocksPerPage;
-				$NewTarget=true;
-			}
-			$CurrentTarget = $MyRow->Session . $MyRow->TargetNo;
-
-			if($Etichetta==0 && $NewTarget)
-				$pdf->AddPage();
-
-			if($NewTarget)
-			{
-				$aths=$ath4target;
-
-				$CurHeight = $CellHeight;
-
-				$pdf->SetXY((($Etichetta % 3) * 70)+5,(intval($Etichetta / 3) * ($BlockHeight+5) +5));
-				$pdf->SetFont($pdf->FontStd,'B',25);
-				$tgt=(int)$MyRow->TargetNo;
-				if($MyRow->IsField3D) {
-					if($MyRow->TargetNo > $MyRow->ToNumEnds) {
-						$tgt = CheckBisTargets($MyRow->TargetNo, $MyRow->ToNumEnds);
-					}
-				}
-				$pdf->Cell(60,$CurHeight, $tgt,1,0,'C',1);
-
-
-				$pdf->SetFont($pdf->FontStd,'B',20);
-				//for($i=1; $i<=$MyRow->{"ToAth4Target" . $MyRow->Session}; $i++)
-				for($i=1; $i<=$aths; $i++) {
-					$pdf->SetXY((($Etichetta % 3) * 70)+5,(intval($Etichetta / 3) * ($BlockHeight+5)+5)+($i*$CurHeight));
-					$pdf->Cell(20, $CurHeight, chr(ord("A")-1+$i), '1', 0, 'C', 0, '', 1, '', '', 'T' );
-					$pdf->Cell(40, $CurHeight, '', '1', 0, 'C');
-				}
-				$NewTarget=false;
-			}
-			$pdf->SetXY((($Etichetta % 3) * 70)+5,(intval($Etichetta / 3) * ($BlockHeight+5)+5)+((ord($MyRow->BackNo)-ord("A")+1)*$CurHeight)+0.6*$CurHeight);
-			$pdf->SetFont($pdf->FontStd,'',10);
-			$pdf->Cell(20,0.4*$CurHeight,$MyRow->FirstName??'',0,0,'C',0);
-		}
-		safe_free_result($Rs);
-	}
+    $Etichetta=-1;
+    $CurrentTarget=0;
+    $NewTarget=true;
+    $CurHeight=0;
+
+    $BlockHeight=($pdf->getPageHeight()-30)/$RowsPerPage;
+    $CellHeight=$BlockHeight/($ath4target+1);
+    $BlocksPerPage=$RowsPerPage*3;
+
+    while($MyRow=safe_fetch($Rs)) {
+        if($CurrentTarget != $MyRow->Session . $MyRow->TargetNo) {
+            $Etichetta = ++$Etichetta % $BlocksPerPage;
+            $NewTarget=true;
+        }
+        $CurrentTarget = $MyRow->Session . $MyRow->TargetNo;
+
+        if($Etichetta==0 && $NewTarget)
+            $pdf->AddPage();
+
+        if($NewTarget) {
+            $aths=$ath4target;
+
+            $CurHeight = $CellHeight;
+
+            $pdf->SetXY((($Etichetta % 3) * 70)+5,(intval($Etichetta / 3) * ($BlockHeight+5) +5));
+            $pdf->SetFont($pdf->FontStd,'B',25);
+            $tgt=(int)$MyRow->TargetNo;
+            if($MyRow->IsField3D) {
+                if($MyRow->TargetNo > $MyRow->ToNumEnds) {
+                    $tgt = CheckBisTargets($MyRow->TargetNo, $MyRow->ToNumEnds);
+                }
+            }
+            $pdf->Cell(60,$CurHeight, $tgt,1,0,'C',1);
+
+
+            $pdf->SetFont($pdf->FontStd,'B',20);
+            //for($i=1; $i<=$MyRow->{"ToAth4Target" . $MyRow->Session}; $i++)
+            for($i=1; $i<=$aths; $i++) {
+                $pdf->SetXY((($Etichetta % 3) * 70)+5,(intval($Etichetta / 3) * ($BlockHeight+5)+5)+($i*$CurHeight));
+                $pdf->Cell(18, $CurHeight, chr(ord("A")-1+$i), '1', 0, 'C', 0, '', 1, '', '', 'T' );
+                $pdf->Cell(28, $CurHeight, '', 1, 0, 'C');
+                $pdf->Cell(14, $CurHeight, '', 1, 0, 'C');
+            }
+            $NewTarget=false;
+        }
+        $pdf->SetXY((($Etichetta % 3) * 70)+5,(intval($Etichetta / 3) * ($BlockHeight+5)+5)+((ord($MyRow->BackNo)-ord("A")+1)*$CurHeight)+0.6*$CurHeight);
+        $pdf->SetFont($pdf->FontStd,'',10);
+        $pdf->Cell(18,0.4*$CurHeight,$MyRow->FirstName ?? '',0,0,'C',0);
+        $pdf->SetXY((($Etichetta % 3) * 70)+23,(intval($Etichetta / 3) * ($BlockHeight+5)+5)+((ord($MyRow->BackNo)-ord("A")+1)*$CurHeight));
+        $pdf->SetFont($pdf->FontStd,'',8);
+        $pdf->Cell(28,0.1*$CurHeight,get_text('Score','Tournament'),0,0,'C',0);
+        $pdf->Cell(8,0.1*$CurHeight,$MyRow->Golds  ?? '',0,0,'L',0);
+        $pdf->Cell(6,0.1*$CurHeight,$MyRow->XNine  ?? '',0,0,'R',0);
+    }
+    safe_free_result($Rs);
 	$pdf->Output();
 }
diff --git a/src/Qualification/SnapshotConf.js b/src/Qualification/SnapshotConf.js
index 7255e9a8..61c2445d 100644
--- a/src/Qualification/SnapshotConf.js
+++ b/src/Qualification/SnapshotConf.js
@@ -14,7 +14,7 @@ function toggleSnapshot(obj) {
 
 function rebuildSnapshot(ses, dist, from, to) {
     $.getJSON('MakeSnapshot.php?json=&numArrows=0&Session=' + ses + '&Distance=' + dist + '&fromTarget=' + from + '&toTarget=' + to, function (data) {
-        if (data.Error==0) {
+        if (data.error==0) {
             alert(data.msg);
         }
     });
diff --git a/src/Qualification/UpdateArrow.php b/src/Qualification/UpdateArrow.php
index 3f5dd029..8bb93ab7 100644
--- a/src/Qualification/UpdateArrow.php
+++ b/src/Qualification/UpdateArrow.php
@@ -139,12 +139,13 @@
                             QuGold=QuD1Gold+QuD2Gold+QuD3Gold+QuD4Gold+QuD5Gold+QuD6Gold+QuD7Gold+QuD8Gold,
                             QuXnine=QuD1Xnine+QuD2Xnine+QuD3Xnine+QuD4Xnine+QuD5Xnine+QuD6Xnine+QuD7Xnine+QuD8Xnine,
                             QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits,
-                            QuTimestamp=" . StrSafe_DB(date('Y-m-d H:i:s')) . "
+                            QuTimestamp=QuTimestamp,
+                            QuArrow=length(replace(concat(trim(QuD1ArrowString),trim(QuD2ArrowString),trim(QuD3ArrowString),trim(QuD4ArrowString),trim(QuD5ArrowString),trim(QuD6ArrowString),trim(QuD7ArrowString),trim(QuD8ArrowString)), 'A', ''))
                             WHERE QuId={$QuId}";
                         $RsUp=safe_w_sql($Update);
-                        $Updated=safe_w_affected_rows();
+                        if($Updated=safe_w_affected_rows()) {
+                            safe_w_SQL("UPDATE Qualifications SET QuTimestamp=" . StrSafe_DB(date('Y-m-d H:i:s')) . " where QuId={$QuId}");
 
-                        if(!$MustUpdateZeroValue) {
                             runJack("QualArrUpdate", $_SESSION['TourId'], array("Dist"=>$Dist ,"Index"=>$_REQUEST['Index'] ,"Id"=>$QuId ,"Point"=>$_REQUEST['Point'] ,"TourId"=>$_SESSION['TourId']));
 
                             if ($Updated AND $OldValue != $CurScore) {
diff --git a/src/Qualification/UpdateQuals.php b/src/Qualification/UpdateQuals.php
index 130906c5..613bd81c 100644
--- a/src/Qualification/UpdateQuals.php
+++ b/src/Qualification/UpdateQuals.php
@@ -4,347 +4,303 @@
 	Aggiorna la tabella Qualifications
 */
 
-	define('debug',false);
-
-	require_once(dirname(dirname(__FILE__)) . '/config.php');
-	require_once('Qualification/Fun_Qualification.local.inc.php');
-	require_once('Common/Fun_Sessions.inc.php');
-	require_once('Common/Lib/ArrTargets.inc.php');
-	require_once('Common/Lib/Obj_RankFactory.php');	// nuovo by simo
-
-	if (!CheckTourSession()) {
-		print get_text('CrackError');
-		exit;
-	}
-    checkACL(AclQualification, AclReadWrite, false);
-
-	$Errore=0;
-	$Cosa = "";
-	$Atleta = "";
-	$Societa = "";
-	$Category = "";
-
-	$OldValue=null;
-
-	$Evento = '*#*#';
-	$Div="";
-	$Cl="";
-
-	$MyRow=NULL;
-
-	foreach ($_REQUEST as $Key => $Value) {
-		if (substr($Key,0,2)=='d_') {
-			if (!IsBlocked(BIT_BLOCK_QUAL)) {
-				list(,$Cosa,$Atleta)=explode('_',$Key);
-
-			/*
-				Devo estrarre il vecchio valore dal db perchè solo se cambia qualcosa devo azzerare
-				il flag di shootoff. Dato che in ogni caso ho un update del timestamp, l'affected_rows ritornerebbe sempre 1.
-
-			*/
-				$Sel
-					= "SELECT " . $Cosa . " AS OldValue "
-					. "FROM Qualifications "
-					. "WHERE QuId=" . StrSafe_DB($Atleta) . " ";
-				$RsSel =safe_r_sql($Sel);
-
-				$OldValue='';
-
-				if (safe_num_rows($RsSel)==1) {
-					$rr=safe_fetch($RsSel);
-					$OldValue=$rr->OldValue;
-				}
-
-			// Controllo errori
-				if (strpos($Key,'Score')!==false) 	{
-					$MaxScore=0;
-					$Select
-						= "SELECT ToMaxDistScore AS TtMaxDistScore "
-						. "FROM Tournament "
-						. "WHERE ToId=" . StrSafe_DB($_SESSION['TourId']) . " ";
-
-					$RsMax=safe_r_sql($Select);
-
-					if (safe_num_rows($RsMax)==1) {
-						$rr=safe_fetch($RsMax);
-						$MaxScore=$rr->TtMaxDistScore;
-						if ($Value>$MaxScore) {
-                            $Errore = 1;
-                        }
-					} else {
-                        $Errore = 1;
-                    }
-				} else {
-					if ($Value!=0) {
-					// distanza trattata
-						$Dist=substr($Cosa,3,1);
-						$Select
-							= "SELECT QuD" . $Dist . "Score AS Score,QuD" . $Dist . "Gold AS Gold,QuD" . $Dist . "Xnine AS Xnine,"
-							. "IF(TfGoldsChars".$Dist."='',IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars),TfGoldsChars".$Dist.") AS TtGolds, IF(TfXNineChars".$Dist."='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars".$Dist.") AS TtXNine "
-							. "FROM Qualifications "
-							. "INNER JOIN Entries ON QuId=EnId  "
-							. "INNER JOIN Tournament ON EnTournament=ToId "
-							. "LEFT JOIN TargetFaces ON EnTournament=TfTournament and EnTargetFace=TfId "
-							. "WHERE QuId=" . StrSafe_DB($Atleta) . " AND ToId=" . StrSafe_DB($_SESSION['TourId']) . " ";
-
-						$RsGX=safe_r_sql($Select);
-
-						if (safe_num_rows($RsGX)==1) {
-							$Row=safe_fetch($RsGX);
-
-						/*
-						 * Il giochino funziona così:
-						 * siano #G il numero di ori inserito nella casella, min($G) il valore del simbolo con meno valore negli ori,
-						 * #X il numero di X inserito nella casella e min($X) il valore del simbolo con meno valore negli X allora
-						 *
-						 * il numero di ori è buono se
-						 * 			[score - (#G x min($G))] > =0
-						 *
-						 * il numero delle X è buono se
-						 * 			#X < #G,
-						 * 			nel caso in cui i simboli delle X sono inclusi in quelli degli ori
-						 *
-						 * 			[score - (#G x min($G)) - (#X x min($X))] >= 0
-						 * 			nel caso in cui i simboli non siano inclusi
-						 *
-						 */
-
-							$arrG=str_split($Row->TtGolds);
-							$arrX=str_split($Row->TtXNine);
-
-							$minG=100;
-							$minX=100;
-
-						// minimo dei gold
-							for($i=0;$i<count($arrG);++$i) {
-								$tmp=ValutaArrowString($arrG[$i]);
-								if ($tmp<$minG)
-									$minG=$tmp;
-							}
-
-						// minimo delle x
-							for($i=0;$i<count($arrX);++$i) {
-								$tmp=ValutaArrowString($arrX[$i]);
-								if ($tmp<$minX)
-									$minX=$tmp;
-							}
-
-							if (strpos($Key,'Gold')!==false) {
-								if (($Row->Score - ($Value*$minG))<0)
-									$Errore=1;
-							} elseif(strpos($Key,'Xnine')!==false) {
-							/*
-							 * Se l'intersezione delle colonne P delle x e degli ori non è vuota oppure non lo è
-							 * quella delle colonne N, allora le x sono incluse negli ori
-							 *
-							 */
-								$arrG_P=array();
-								$arrG_N=array();
-								for ($i=0;$i<count($arrG);++$i) {
-									$arrG_P[]=DecodeFromLetter($arrG[$i]);
-									$arrG_N[]=ValutaArrowString($arrG[$i]);
-								}
-
-								$arrX_P=array();
-								$arrX_N=array();
-								for ($i=0;$i<count($arrX);++$i) {
-									$arrX_P[]=DecodeFromLetter($arrX[$i]);
-									//$arrX_N[]=$LetterPoint[$arrX[$i]]['N'];
-									$arrX_N[]=ValutaArrowString($arrX[$i]);
-								}
-
-							// inclusione
-								if (array_intersect($arrX_P,$arrG_P)!==array() || array_intersect($arrX_N,$arrG_N)!==array()) {
-									if ($Value>$Row->Gold) {
-                                        $Errore = 1;
-                                    }
-								} else {
-									if (($Row->Score - ($Row->Gold*$minG) - ($Value*$minX))<0) {
-                                        $Errore = 1;
-                                    }
-								}
-							}
-						} else {
-                            $Errore = 1;
-                        }
-					}
-
-				}
-			} else {
-                $Errore = 1;
+$JSON=[
+	'error' => 1 ,
+	'id' => 'null' ,
+	'score' => 'null' ,
+	'gold' => 'null' ,
+	'xnine' =>  'null' ,
+	'which' =>  '' ,
+];
+
+require_once(dirname(dirname(__FILE__)) . '/config.php');
+require_once('Qualification/Fun_Qualification.local.inc.php');
+require_once('Common/Fun_Sessions.inc.php');
+require_once('Common/Lib/ArrTargets.inc.php');
+require_once('Common/Lib/Obj_RankFactory.php');	// nuovo by simo
+
+if (!CheckTourSession() or !hasACL(AclQualification, AclReadWrite) or IsBlocked(BIT_BLOCK_QUAL)) {
+    JsonOut($JSON);
+}
+
+$Errore=0;
+$Cosa = "";
+$Atleta = "";
+$Societa = "";
+$Category = "";
+
+$OldValue=null;
+
+$Evento = '*#*#';
+$Div="";
+$Cl="";
+
+$MyRow=NULL;
+
+foreach ($_REQUEST as $Key => $Value) {
+	if (substr($Key,0,2)!='d_') {
+        continue;
+    }
+    list(,$Cosa,$Atleta)=explode('_',$Key);
+    $Atleta=intval($Atleta);
+
+    /*
+        Fetch the old data to establish a SO reset
+    */
+    $Dist=substr($Cosa,3,1);
+    $OldValue='';
+    $Sel = "SELECT *
+        FROM Qualifications
+        WHERE QuId={$Atleta}";
+    $RsSel =safe_r_sql($Sel);
+    if ($rr=safe_fetch($RsSel)) {
+        $OldValue=$rr->{$Cosa};
+    }
+
+    // Check common errors
+    if (strpos($Key,'Score')!==false) {
+        $MaxScore=0;
+        $Select = "SELECT ToMaxDistScore AS TtMaxDistScore
+            FROM Tournament
+            WHERE ToId={$_SESSION['TourId']}";
+
+        $RsMax=safe_r_sql($Select);
+
+        if (safe_num_rows($RsMax)!=1) {
+            jsonOut($JSON);
+        }
+        $rr=safe_fetch($RsMax);
+        if ($Value > $rr->TtMaxDistScore) {
+            jsonOut($JSON);
+        }
+    } elseif ($Cosa=='QuArrow') {
+        $Dist=0;
+        $q=safe_r_sql("select sum(DiArrows*DiEnds) TotArrows 
+            from Entries
+            inner join Qualifications on QuId=EnId
+            inner join DistanceInformation on DiSession=QuSession and DiTournament=EnTournament
+            where EnId={$Atleta} and EnTournament={$_SESSION['TourId']}
+            group by EnId");
+        $r=safe_fetch($q);
+        $TotArrows=intval($r->TotArrows??0);
+        if($Value>$TotArrows or $Value<0) {
+            jsonOut($JSON);
+        }
+    } else {
+        if ($Value != 0) {
+            // distanza trattata
+            $Select = "SELECT QuD" . $Dist . "Score AS Score,QuD" . $Dist . "Gold AS Gold,QuD" . $Dist . "Xnine AS Xnine,
+                    IF(TfGoldsChars" . $Dist . "='',IF(TfGoldsChars='',ToGoldsChars,TfGoldsChars),TfGoldsChars" . $Dist . ") AS TtGolds, IF(TfXNineChars" . $Dist . "='',IF(TfXNineChars='',ToXNineChars,TfXNineChars),TfXNineChars" . $Dist . ") AS TtXNine
+                FROM Qualifications
+                INNER JOIN Entries ON QuId=EnId
+                INNER JOIN Tournament ON EnTournament=ToId
+                LEFT JOIN TargetFaces ON EnTournament=TfTournament and EnTargetFace=TfId
+                WHERE QuId={$Atleta} AND ToId={$_SESSION['TourId']}";
+
+            $RsGX = safe_r_sql($Select);
+
+            if (safe_num_rows($RsGX) != 1) {
+                jsonout($JSON);
+            }
+            $Row = safe_fetch($RsGX);
+
+            /*
+             * Il giochino funziona così:
+             * siano #G il numero di ori inserito nella casella, min($G) il valore del simbolo con meno valore negli ori,
+             * #X il numero di X inserito nella casella e min($X) il valore del simbolo con meno valore negli X allora
+             *
+             * il numero di ori è buono se
+             * 			[score - (#G x min($G))] > =0
+             *
+             * il numero delle X è buono se
+             * 			#X < #G,
+             * 			nel caso in cui i simboli delle X sono inclusi in quelli degli ori
+             *
+             * 			[score - (#G x min($G)) - (#X x min($X))] >= 0
+             * 			nel caso in cui i simboli non siano inclusi
+             *
+             */
+
+            $arrG = str_split($Row->TtGolds);
+            $arrX = str_split($Row->TtXNine);
+
+            $minG = 100;
+            $minX = 100;
+
+            // minimo dei gold
+            for ($i = 0; $i < count($arrG); ++$i) {
+                $tmp = ValutaArrowString($arrG[$i]);
+                if ($tmp < $minG) {
+                    $minG = $tmp;
+                }
             }
 
-
-			if ($Errore==0) {
-			    if($OldValue!=$Value) {
-                    // scrivo il dato e aggiorno i totali
-                    $Update
-                        = "UPDATE Qualifications SET "
-                        . $Cosa . "=" . StrSafe_DB($Value) . ", "
-                        . "QuConfirm = QuConfirm & (255-" . pow(2, intval(substr($Cosa, 3, 1))) . "), "
-                        . "QuScore=QuD1Score+QuD2Score+QuD3Score+QuD4Score+QuD5Score+QuD6Score+QuD7Score+QuD8Score,"
-                        . "QuGold=QuD1Gold+QuD2Gold+QuD3Gold+QuD4Gold+QuD5Gold+QuD6Gold+QuD7Gold+QuD8Gold,"
-                        . "QuXnine=QuD1Xnine+QuD2Xnine+QuD3Xnine+QuD4Xnine+QuD5Xnine+QuD6Xnine+QuD7Xnine+QuD8Xnine, "
-                        . "QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits, "
-                        . "QuTimestamp=" . StrSafe_DB(date('Y-m-d H:i:s')) . " "
-                        . "WHERE QuId=" . StrSafe_DB($Atleta);
-                    $RsUp = safe_w_sql($Update);
-                    //print $Update;exit;
-                    if (safe_w_affected_rows() == 1 AND $OldValue != $Value) {
-
-                        // distruggo e ricreo le eliminatorie
-                        // scopro in che evento elim si trova la divcl del tipo
-                        $q = "SELECT EvCode
-                            FROM Individuals 
-                            INNER JOIN Events on EvCode=IndEvent and EvTournament=IndTournament and EvTeamEvent=0 AND (EvElim1+EvElim2)>0
-                            WHERE IndId={$Atleta}";
-                        $r = safe_r_sql($q);
-                        //print $q;exit;
-                        if ($r && safe_num_rows($r) > 0) {
-                            while ($row = safe_fetch($r)) {
-                                $ev = $row->EvCode;
-                                for ($j = 1; $j <= 2; ++$j) {
-                                    ResetElimRows($ev, $j);
-                                }
-                            }
-                        }
-
-                        // azzero gli shootoff
-                        $q = " SELECT DISTINCT EvCode,EvTeamEvent
-                            FROM Events
-                            INNER JOIN EventClass ON EvCode=EcCode AND if(EvTeamEvent=0, EcTeamEvent=0, EcTeamEvent>0) AND EcTournament={$_SESSION['TourId']}
-                            INNER JOIN Entries ON EcDivision=EnDivision AND EcClass=EnClass and if(EcSubClass='', true, EcSubClass=EnSubClass) AND EnId={$Atleta}
-                            WHERE (EvTeamEvent='0' AND EnIndFEvent='1') OR (EvTeamEvent='1' AND EnTeamFEvent+EnTeamMixEvent>0) AND EvTournament={$_SESSION['TourId']}";
-                        //print $q;
-                        $Rs = safe_r_sql($q);
-                        if ($Rs && safe_num_rows($Rs) > 0) {
-                            while ($row = safe_fetch($Rs)) {
-                                ResetShootoff($row->EvCode, $row->EvTeamEvent, 0);
-                            }
-                        }
-                    }
+            // minimo delle x
+            for ($i = 0; $i < count($arrX); ++$i) {
+                $tmp = ValutaArrowString($arrX[$i]);
+                if ($tmp < $minX) {
+                    $minX = $tmp;
                 }
+            }
 
-			// estraggo i totali
-				$Select = "SELECT QuId,QuScore,QuGold,QuXnine, {$Cosa} 
-					FROM Qualifications WHERE QuId=" . StrSafe_DB($Atleta);
-				$Rs=safe_r_sql($Select);
-				//print $Select;exit;
-				$Errore = 0;	// no error
-				$MyRow=NULL;
-				if (safe_num_rows($Rs)==1) {
-					$MyRow=safe_fetch($Rs);
-
-				// se il valore del campo passato � uguale a quello in db ok, altrimenti errore
-					if ($Value!=$MyRow->{$Cosa}) {
-						$Errore=1;
-					}
-				} else {
-					$Errore=1;
-				}
-			}
-
-			if ($OldValue!=$Value AND !isset($_REQUEST["NoRecalc"])) {
-				if ($Errore==0) {
-
-				// Se non ho errori, calcolo la rank della distanza per l'evento
-					$Distanza = array();
-					preg_match("/[1-8]/", $Cosa, $Distanza);
-
-					$Select = "SELECT CONCAT(EnDivision,EnClass) AS MyEvent, EnCountry as MyTeam, EnDivision, EnClass "
-						. "FROM Entries "
-						. "WHERE EnId=" . StrSafe_DB($Atleta) . " AND EnTournament=" . StrSafe_DB($_SESSION['TourId']) . " ";
-					$Rs=safe_r_sql($Select);
-
-					if (safe_num_rows($Rs)==1) {
-						$rr=safe_fetch($Rs);
-						$Evento=$rr->MyEvent;
-						$Category = $rr->MyEvent;
-						$Societa = $rr->MyTeam;
-						$Div = $rr->EnDivision;
-						$Cl = $rr->EnClass;
-
-						if (CalcQualRank($Distanza[0],$Evento)) {
-							$Errore=1;
-							//print 'errore CalcQualRank distanza';exit;
-						}
-					} else {
-                        $Errore = 1;
-                    }
-				}
-
-				if ($Errore==0) {
-				// se non ho errori calcolo la rank globale per l'evento
-					if (CalcQualRank(0,$Evento)) {
-						$Errore=1;
-					}
-				}
-
-			// eventi di cui calcolare le rank assolute
-				$events4abs=array();
-				$q="SELECT distinct IndEvent from Individuals where IndId='$Atleta' and IndTournament={$_SESSION['TourId']}";
-
-				$r=safe_r_sql($q);
-
-				if ($r) {
-					while ($tmp=safe_fetch($r)) {
-						$events4abs[]=$tmp->IndEvent;
-					}
-				} else {
-                    $Errore = 1;
+            if (strpos($Key, 'Gold') !== false) {
+                if (($Row->Score - ($Value * $minG)) < 0) {
+                    jsonOut($JSON);
+                }
+            } elseif (strpos($Key, 'Xnine') !== false) {
+                /*
+                 * Se l'intersezione delle colonne P delle x e degli ori non è vuota oppure non lo è
+                 * quella delle colonne N, allora le x sono incluse negli ori
+                 *
+                 */
+                $arrG_P = array();
+                $arrG_N = array();
+                for ($i = 0; $i < count($arrG); ++$i) {
+                    $arrG_P[] = DecodeFromLetter($arrG[$i]);
+                    $arrG_N[] = ValutaArrowString($arrG[$i]);
                 }
 
+                $arrX_P = array();
+                $arrX_N = array();
+                for ($i = 0; $i < count($arrX); ++$i) {
+                    $arrX_P[] = DecodeFromLetter($arrX[$i]);
+                    //$arrX_N[]=$LetterPoint[$arrX[$i]]['N'];
+                    $arrX_N[] = ValutaArrowString($arrX[$i]);
+                }
 
-			// rank abs di distanza
-				if ($Errore==0) {
-					if (count($events4abs)>0) {
-						if (!Obj_RankFactory::create('Abs',array('events'=>$events4abs,'dist'=>$Distanza[0]))->calculate()) {
-							$Errore=1;
-						}
-					}
-				}
-
-				if ($Errore==0) {
-					if (count($events4abs)>0) {
-						if (!Obj_RankFactory::create('Abs',array('events'=>$events4abs,'dist'=>0))->calculate()) {
-							$Errore=1;
-						} else {
-							foreach ($events4abs as $eventAbs) {
-								runJack("QRRankUpdate", $_SESSION['TourId'], array("Event" => $eventAbs, "Team" => 0, "TourId" => $_SESSION['TourId']));
-							}
-						}
-					}
-				}
-
-				if ($Errore==0) {
-				// se non ho errori calcolo la rank globale per l'evento
-					if (MakeTeams($Societa, $Evento)) {
-                        $Errore = 1;
+                // inclusione
+                if (array_intersect($arrX_P, $arrG_P) !== array() || array_intersect($arrX_N, $arrG_N) !== array()) {
+                    if ($Value > $Row->Gold) {
+                        jsonOut($JSON);
                     }
-				}
-
-				if ($Errore==0) {
-				// se non ho errori calcolo la rank globale per l'evento
-					if (MakeTeamsAbs($Societa,$Div,$Cl)) {
-                        $Errore = 1;
+                } else {
+                    if (($Row->Score - ($Row->Gold * $minG) - ($Value * $minX)) < 0) {
+                        jsonout($JSON);
                     }
-				}
-			}
-
-
-
-		// produco l'xml di ritorno
-			if (!debug)
-				header('Content-Type: text/xml');
-
-			print '<response>' . "\n";
-			print '<error>' . $Errore . '</error>' . "\n";
-			print '<id>' . ($MyRow!=NULL ? $MyRow->QuId : 'null') . '</id>' . "\n";
-			print '<score>' . ($MyRow!=NULL ? $MyRow->QuScore : 'null') . '</score>' . "\n";
-			print '<gold>' . ($MyRow!=NULL ? $MyRow->QuGold : 'null') . '</gold>' . "\n";
-			print '<xnine>' .  ($MyRow!=NULL ? $MyRow->QuXnine : 'null') . '</xnine>' . "\n";
-			print '<which>' .  $Key . '</which>' . "\n";
-			print '</response>' . "\n";
-		}
-	}
-?>
+                }
+            }
+        }
+    }
+
+    if($OldValue!=$Value) {
+        // scrivo il dato e aggiorno i totali
+        $Update = "UPDATE Qualifications SET "
+            . $Cosa . "=" . StrSafe_DB($Value) . ", "
+            . "QuConfirm = QuConfirm & (255-" . pow(2, intval($Dist)) . "), "
+            . "QuScore=QuD1Score+QuD2Score+QuD3Score+QuD4Score+QuD5Score+QuD6Score+QuD7Score+QuD8Score,"
+            . "QuGold=QuD1Gold+QuD2Gold+QuD3Gold+QuD4Gold+QuD5Gold+QuD6Gold+QuD7Gold+QuD8Gold,"
+            . "QuXnine=QuD1Xnine+QuD2Xnine+QuD3Xnine+QuD4Xnine+QuD5Xnine+QuD6Xnine+QuD7Xnine+QuD8Xnine, "
+            . "QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits, "
+            . "QuTimestamp=" . StrSafe_DB(date('Y-m-d H:i:s')) . " "
+            . "WHERE QuId=" . StrSafe_DB($Atleta);
+        $RsUp = safe_w_sql($Update);
+        if (safe_w_affected_rows() == 1 AND $OldValue != $Value) {
+            // distruggo e ricreo le eliminatorie
+            // scopro in che evento elim si trova la divcl del tipo
+            $q = "SELECT EvCode
+                FROM Individuals 
+                INNER JOIN Events on EvCode=IndEvent and EvTournament=IndTournament and EvTeamEvent=0 AND (EvElim1+EvElim2)>0
+                WHERE IndId={$Atleta}";
+            $r = safe_r_sql($q);
+            //print $q;exit;
+            if ($r && safe_num_rows($r) > 0) {
+                while ($row = safe_fetch($r)) {
+                    $ev = $row->EvCode;
+                    for ($j = 1; $j <= 2; ++$j) {
+                        ResetElimRows($ev, $j);
+                    }
+                }
+            }
+
+            // azzero gli shootoff
+            $q = " SELECT DISTINCT EvCode,EvTeamEvent
+                FROM Events
+                INNER JOIN EventClass ON EvCode=EcCode AND if(EvTeamEvent=0, EcTeamEvent=0, EcTeamEvent>0) AND EcTournament={$_SESSION['TourId']}
+                INNER JOIN Entries ON EcDivision=EnDivision AND EcClass=EnClass and if(EcSubClass='', true, EcSubClass=EnSubClass) AND EnId={$Atleta}
+                WHERE (EvTeamEvent='0' AND EnIndFEvent='1') OR (EvTeamEvent='1' AND EnTeamFEvent+EnTeamMixEvent>0) AND EvTournament={$_SESSION['TourId']}";
+            //print $q;
+            $Rs = safe_r_sql($q);
+            if ($Rs && safe_num_rows($Rs) > 0) {
+                while ($row = safe_fetch($Rs)) {
+                    ResetShootoff($row->EvCode, $row->EvTeamEvent, 0);
+                }
+            }
+        }
+    }
+
+    // estraggo i totali
+    $Select = "SELECT QuId,QuScore,QuGold,QuXnine, {$Cosa} 
+        FROM Qualifications WHERE QuId={$Atleta}";
+    $Rs=safe_r_sql($Select);
+    $MyRow=safe_fetch($Rs);
+    if ($Value!=$MyRow->{$Cosa}) {
+        jsonout($JSON);
+    }
+
+    if ($OldValue!=$Value AND !isset($_REQUEST["NoRecalc"])) {
+        $Select = "SELECT CONCAT(EnDivision,EnClass) AS MyEvent, EnCountry as MyTeam, EnDivision, EnClass
+                FROM Entries
+                WHERE EnId={$Atleta} AND EnTournament={$_SESSION['TourId']}";
+
+        $Rs = safe_r_sql($Select);
+        $rr = safe_fetch($Rs);
+        $Evento = $rr->MyEvent;
+        $Category = $rr->MyEvent;
+        $Societa = $rr->MyTeam;
+        $Div = $rr->EnDivision;
+        $Cl = $rr->EnClass;
+
+        if ($Dist) {
+            if (CalcQualRank($Dist, $Evento)) {
+                jsonout($JSON);
+            }
+        }
+        if (CalcQualRank(0, $Evento)) {
+            jsonout($JSON);
+        }
+
+        // eventi di cui calcolare le rank assolute
+        $events4abs = array();
+        $q = "SELECT distinct IndEvent from Individuals where IndId={$Atleta} and IndTournament={$_SESSION['TourId']}";
+        $r = safe_r_sql($q);
+        while ($tmp = safe_fetch($r)) {
+            $events4abs[] = $tmp->IndEvent;
+        }
+
+        // rank abs di distanza
+        if (count($events4abs) > 0) {
+            if ($Dist and !Obj_RankFactory::create('Abs', array('events' => $events4abs, 'dist' => $Dist))->calculate()) {
+                jsonout($JSON);
+            }
+
+            if (!Obj_RankFactory::create('Abs', array('events' => $events4abs, 'dist' => 0))->calculate()) {
+                jsonout($JSON);
+            } else {
+                foreach ($events4abs as $eventAbs) {
+                    runJack("QRRankUpdate", $_SESSION['TourId'], array("Event" => $eventAbs, "Team" => 0, "TourId" => $_SESSION['TourId']));
+                }
+            }
+        }
+
+        if (MakeTeams($Societa, $Evento)) {
+            jsonout($JSON);
+        }
+
+        if (MakeTeamsAbs($Societa, $Div, $Cl)) {
+            jsonout($JSON);
+        }
+    }
+
+    $JSON['error']=0;
+    $JSON['which']=$Key;
+    if($MyRow) {
+		$JSON['id'] = $MyRow->QuId;
+		$JSON['score'] = $MyRow->QuScore;
+		$JSON['gold'] = $MyRow->QuGold;
+		$JSON['xnine'] = $MyRow->QuXnine;
+    }
+
+    JsonOut($JSON);
+}
+
+JsonOut($JSON);
diff --git a/src/Qualification/index-action.php b/src/Qualification/index-action.php
index c4bc2b7a..364b9ea4 100644
--- a/src/Qualification/index-action.php
+++ b/src/Qualification/index-action.php
@@ -20,10 +20,24 @@
 
 switch($_REQUEST['act']) {
     case 'dnf':
+        $QuDistHits = 0;
+        $Dist = intval($_REQUEST['d'] ?? 0);
+        if($Dist>0) {
+            $q = safe_r_sql("select DiEnds*DiArrows as MaxArrows 
+            from Qualifications
+            inner join Entries on EnId=QuId
+            inner join DistanceInformation on DiTournament=EnTournament and DiSession=QuSession and DiDistance={$Dist}
+            where QuId={$EnId}");
+            if ($r = safe_fetch($q)) {
+                $QuDistHits = $r->MaxArrows;
+            }
+            safe_w_sql("update Qualifications set QuIrmType=5, QuD{$Dist}Hits=$QuDistHits, QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits where QuId={$EnId}");
+        } else {
+            safe_w_sql("update Qualifications set QuIrmType=5 where QuId={$EnId}");
+        }
+        safe_w_sql("update Individuals set IndIrmType=5 where IndId={$EnId}");
         $JSON['class']='Irm-5';
         $JSON['btn']=get_text('CmdUnset', 'Tournament', 'DNF');
-        safe_w_sql("update Qualifications set QuIrmType=5 where QuId=$EnId");
-        safe_w_sql("update Individuals set IndIrmType=5 where IndId=$EnId");
         break;
     case 'dnfnr':
         $JSON['class']='Irm-7';
@@ -40,8 +54,14 @@
     case 'unset':
         $JSON['class']='Irm-0';
         $JSON['btn']=get_text('CmdSet', 'Tournament');
-        safe_w_sql("update Qualifications set QuIrmType=0 where QuId=$EnId");
+        $Dist = intval($_REQUEST['d'] ?? 0);
+        if($Dist>0) {
+            safe_w_sql("update Qualifications set QuIrmType=0, QuConfirm=QuConfirm & (255-" . pow(2, $Dist) . "), QuD{$Dist}Hits=length(trim(QuD{$Dist}Arrowstring)), QuHits=QuD1Hits+QuD2Hits+QuD3Hits+QuD4Hits+QuD5Hits+QuD6Hits+QuD7Hits+QuD8Hits where QuId=$EnId");
+        } else {
+            safe_w_sql("update Qualifications set QuIrmType=0, QuConfirm=QuConfirm & (255-" . pow(2, $Dist) . ") where QuId=$EnId");
+        }
         safe_w_sql("update Individuals set IndIrmType=0 where IndId=$EnId");
+
         break;
     default:
         JsonOut($JSON);
diff --git a/src/Qualification/index.js b/src/Qualification/index.js
index 15bcef6e..19f94ef0 100644
--- a/src/Qualification/index.js
+++ b/src/Qualification/index.js
@@ -32,7 +32,7 @@ function IrmSet(obj) {
 				text: TxtIrmDnf,
 				btnClass: 'btn-green', // class for the button
 				action: function () {
-					$.getJSON('index-action.php?act=dnf&id='+$(obj).closest('tr').attr('id').substr(4), function(data) {
+					$.getJSON('index-action.php?act=dnf&d='+$('#x_Dist').val()+'&id='+$(obj).closest('tr').attr('id').substr(4), function(data) {
 						if(data.error==0) {
 							$(obj).closest('tr').removeClass('Irm-0 Irm-5 Irm-7 Irm-10 Irm-15 Irm-20').addClass(data.class);
 							$(obj).html(data.btn);
@@ -46,7 +46,7 @@ function IrmSet(obj) {
 				text: TxtIrmDnfNoRank,
 				btnClass: 'btn-green', // class for the button
 				action: function () {
-					$.getJSON('index-action.php?act=dnfnr&id='+$(obj).closest('tr').attr('id').substr(4), function(data) {
+					$.getJSON('index-action.php?act=dnfnr&d='+$('#x_Dist').val()+'&id='+$(obj).closest('tr').attr('id').substr(4), function(data) {
 						if(data.error==0) {
 							$(obj).closest('tr').removeClass('Irm-0 Irm-5 Irm-7 Irm-10 Irm-15 Irm-20').addClass(data.class);
 							$(obj).html(data.btn);
@@ -67,7 +67,7 @@ function IrmSet(obj) {
 				text: TxtIrmUnset,
 				btnClass: 'btn-dark', // class for the button
 				action: function () {
-					$.getJSON('index-action.php?act=unset&id='+$(obj).closest('tr').attr('id').substr(4), function(data) {
+					$.getJSON('index-action.php?act=unset&d='+$('#x_Dist').val()+'&id='+$(obj).closest('tr').attr('id').substr(4), function(data) {
 						if(data.error==0) {
 							$(obj).closest('tr').removeClass('Irm-0 Irm-5 Irm-7 Irm-10 Irm-15 Irm-20').addClass(data.class);
 							$(obj).html(data.btn);
diff --git a/src/Qualification/index.php b/src/Qualification/index.php
index 985107b8..a96169e8 100644
--- a/src/Qualification/index.php
+++ b/src/Qualification/index.php
@@ -169,106 +169,104 @@
 </form>
 <br>
 <?php
-		if (isset($_REQUEST['Command']) && $_REQUEST['Command']=='OK' && $_REQUEST['x_Session']!=-1 && $_REQUEST['x_Dist']!=-1)
-		{
-			if(!empty($_REQUEST['x_Target'])) {
-				$TargetFilter = "AND QuTargetNo ='" . $_REQUEST['x_Target'] . "' ";
-			} else {
-				$TargetFilter = "AND QuTargetNo >='" . $_REQUEST['x_Session'] . str_pad($_REQUEST['x_From'],TargetNoPadding,'0',STR_PAD_LEFT) . "A' AND QuTargetNo<='" . $_REQUEST['x_Session'] . str_pad($_REQUEST['x_To'],TargetNoPadding,'0',STR_PAD_LEFT) . "Z' ";
-			}
-
-			/*$Select
-				= "SELECT EnId,EnCode,EnName,EnFirstName,EnTournament,EnDivision,EnClass,EnCountry,CoCode, (EnStatus <=1) AS EnValid,EnStatus, "
-				. "QuTargetNo, SUBSTRING(QuTargetNo,2) AS Target,"
-				. "QuD" . $_REQUEST['x_Dist'] . "Score AS SelScore,QuD" . $_REQUEST['x_Dist'] . "Hits AS SelHits,QuD" . $_REQUEST['x_Dist'] . "Gold AS SelGold,QuD" . $_REQUEST['x_Dist'] . "Xnine AS SelXNine, "
-				. "QuScore, QuHits,	QuGold,	QuXnine, "
-				. "ToId,ToType,TtNumDist "
-				. "FROM Entries INNER JOIN Countries ON EnCountry=CoId "
-				. "INNER JOIN Qualifications ON EnId=QuId "
-				. "RIGHT JOIN AvailableTarget ON QuTargetNo=AtTargetNo AND AtTournament=" . StrSafe_DB($_SESSION['TourId']) . " "
-				. "INNER JOIN Tournament ON EnTournament=ToId AND ToId=" . StrSafe_DB($_SESSION['TourId']) . " "
-				. "INNER JOIN Tournament*Type ON ToType=TtId "
-				. "WHERE EnAthlete=1 AND QuSession<>0 AND QuTargetNo<>'' AND QuSession=" . StrSafe_DB($_REQUEST['x_Session']) . " "
-				. $TargetFilter . " "
-				. "ORDER BY QuTargetNo ASC ";*/
-
-			$Select = "SELECT EnId,EnCode,EnName,EnFirstName,EnTournament,EnDivision,EnClass,EnCountry,CoCode, (EnStatus <=1) AS EnValid,EnStatus,
-                    QuTargetNo, SUBSTRING(QuTargetNo,2) AS Target,
-                    QuD" . $_REQUEST['x_Dist'] . "Score AS SelScore,QuD" . $_REQUEST['x_Dist'] . "Hits AS SelHits,QuD" . $_REQUEST['x_Dist'] . "Gold AS SelGold,QuD" . $_REQUEST['x_Dist'] . "Xnine AS SelXNine,
-                    QuScore, QuHits,	QuGold,	QuXnine, QuClRank, QuIrmType, IrmType,
-                    ToId,ToType,ToNumDist AS TtNumDist
-			    FROM Entries
-			    INNER JOIN Countries ON EnCountry=CoId
-			    INNER JOIN Qualifications ON EnId=QuId
-			    INNER JOIN IrmTypes ON IrmId=QuIrmType
-			    RIGHT JOIN AvailableTarget ON QuTargetNo=AtTargetNo AND AtTournament=" . StrSafe_DB($_SESSION['TourId']) . "
-			    INNER JOIN Tournament ON EnTournament=ToId AND ToId=" . StrSafe_DB($_SESSION['TourId']) . "
-			    WHERE EnAthlete=1 AND QuSession<>0 AND QuTargetNo<>'' AND QuSession=" . StrSafe_DB($_REQUEST['x_Session']) . " "
-				. $TargetFilter . "
-				ORDER BY QuTargetNo ASC ";
-
-			$Rs=safe_r_sql($Select);
-			//print $Select;
-		// form elenco persone
-			if (safe_num_rows($Rs)>0)
-			{
-?>
-<form name="Frm" method="POST" action="">
-<table class="Tabella">
-<tr>
-<td class="Title w-5" nowrap="nowrap"><?php echo get_text('IrmStatus', 'Tournament') ?></td>
-<td class="Title w-5"><?php print get_text('Target');?></td>
-<td class="Title w-5"><?php print get_text('Code','Tournament');?></td>
-<td class="Title w-20"><?php print get_text('Archer');?></td>
-<td class="Title w-5"><?php print get_text('Div');?></td>
-<td class="Title w-5"><?php print get_text('Cl');?></td>
-<td class="Title w-5"><?php print get_text('Country');?></td>
-<td class="Title w-5">Score (<?php print $_REQUEST['x_Dist']; ?>)</td>
-<td class="Title w-5"><a class="LinkRevert" href="javascript:ChangeGoldXNine('OK');"><?php print $RowTour->TtGolds . ' (' . $_REQUEST['x_Dist'] . ')'; ?></a></td>
-<td class="Title w-5"><a class="LinkRevert" href="javascript:ChangeGoldXNine('OK');"><?php print $RowTour->TtXNine . ' (' . $_REQUEST['x_Dist'] . ')'; ?></a></td>
-<td class="Title w-5"><a class="LinkRevert" href="javascript:ChangeArrows('OK');"><?php print get_text('Arrows','Tournament') . ' (' . $_REQUEST['x_Dist'] . ')'; ?></a></td>
-<td class="Title w-5">Score</td>
-<td class="Title w-5"><?php print $RowTour->TtGolds; ?></td>
-<td class="Title w-5"><?php print $RowTour->TtXNine; ?></td>
-</tr>
-<?php
-$CurTarget = 'xx';
-$TarStyle='';	// niene oppure warning se $RowStyle==''
-// elenco persone
-while ($MyRow=safe_fetch($Rs)) {
-    $RowStyle='';	// NoShoot oppure niente
-    if(!$MyRow->EnValid) {
-        $RowStyle='NoShoot';
+if (isset($_REQUEST['Command']) && $_REQUEST['Command']=='OK' && $_REQUEST['x_Session']!=-1 && $_REQUEST['x_Dist']!=-1) {
+    if(!empty($_REQUEST['x_Target'])) {
+        $TargetFilter = "AND QuTargetNo ='" . $_REQUEST['x_Target'] . "' ";
+    } else {
+        $TargetFilter = "AND QuTargetNo >='" . $_REQUEST['x_Session'] . str_pad($_REQUEST['x_From'],TargetNoPadding,'0',STR_PAD_LEFT) . "A' AND QuTargetNo<='" . $_REQUEST['x_Session'] . str_pad($_REQUEST['x_To'],TargetNoPadding,'0',STR_PAD_LEFT) . "Z' ";
     }
 
-    if ($CurTarget!='xx') {
-        if ($CurTarget!=substr($MyRow->Target,0,-1) ) {
-            if ($TarStyle=='') {
-                $TarStyle='warning';
-            } elseif($TarStyle=='warning') {
-                $TarStyle='';
-            }
+
+    $Select = "SELECT QuArrow, EnId,EnCode,EnName,EnFirstName,EnTournament,EnDivision,EnClass,EnCountry,CoCode, (EnStatus <=1) AS EnValid,EnStatus,
+            QuTargetNo, SUBSTRING(QuTargetNo,2) AS Target,
+            QuD" . $_REQUEST['x_Dist'] . "Score AS SelScore,QuD" . $_REQUEST['x_Dist'] . "Hits AS SelHits,QuD" . $_REQUEST['x_Dist'] . "Gold AS SelGold,QuD" . $_REQUEST['x_Dist'] . "Xnine AS SelXNine,
+            QuScore, QuHits,	QuGold,	QuXnine, QuClRank, QuIrmType, IrmType,
+            ToId,ToType,ToNumDist AS TtNumDist
+        FROM Entries
+        INNER JOIN Countries ON EnCountry=CoId
+        INNER JOIN Qualifications ON EnId=QuId
+        INNER JOIN IrmTypes ON IrmId=QuIrmType
+        RIGHT JOIN AvailableTarget ON QuTargetNo=AtTargetNo AND AtTournament=" . StrSafe_DB($_SESSION['TourId']) . "
+        INNER JOIN Tournament ON EnTournament=ToId AND ToId=" . StrSafe_DB($_SESSION['TourId']) . "
+        WHERE EnAthlete=1 AND QuSession<>0 AND QuTargetNo<>'' AND QuSession=" . StrSafe_DB($_REQUEST['x_Session']) . " "
+        . $TargetFilter . "
+        ORDER BY QuTargetNo ASC ";
+
+    $Rs=safe_r_sql($Select);
+    // form elenco persone
+    if (safe_num_rows($Rs)>0) {
+        echo '<form name="Frm" method="POST" action="">';
+        echo '<table class="Tabella">';
+        echo '<tr>';
+        echo '<td class="Title w-5" nowrap="nowrap">'.get_text('IrmStatus', 'Tournament').'</td>';
+        echo '<td class="Title w-5">'.get_text('Target').'</td>';
+        echo '<td class="Title w-5">'.get_text('Code','Tournament').'</td>';
+        echo '<td class="Title w-20">'.get_text('Archer').'</td>';
+        echo '<td class="Title w-5">'.get_text('Div').'</td>';
+        echo '<td class="Title w-5">'.get_text('Cl').'</td>';
+        echo '<td class="Title w-5">'.get_text('Country').'</td>';
+        echo '<td class="Title w-5">Score ('.$_REQUEST['x_Dist'].')</td>';
+        if($_SESSION['TourType']=='50') {
+            echo '<td class="Title w-5">'.get_text('TargetsHit', 'RunArchery').'</td>';
         }
-    }
+        echo '<td class="Title w-5"><a class="LinkRevert" href="javascript:ChangeGoldXNine(\'OK\');">'.$RowTour->TtGolds . ' (' . $_REQUEST['x_Dist'] . ')'.'</a></td>';
+        echo '<td class="Title w-5"><a class="LinkRevert" href="javascript:ChangeGoldXNine(\'OK\');">'.$RowTour->TtXNine . ' (' . $_REQUEST['x_Dist'] . ')'.'</a></td>';
+        echo '<td class="Title w-5"><a class="LinkRevert" href="javascript:ChangeArrows(\'OK\');">'.get_text('Arrows','Tournament') . ' (' . $_REQUEST['x_Dist'] . ')'.'</a></td>';
+        echo '<td class="Title w-5">Score</td>';
+        echo '<td class="Title w-5">'.$RowTour->TtGolds.'</td>';
+        echo '<td class="Title w-5">'.$RowTour->TtXNine.'</td>';
+        echo '</tr>';
 
-    echo '<tr id="Row_'.$MyRow->EnId.'" class="'.$TarStyle.' '.$RowStyle.' Irm-'.$MyRow->QuIrmType.'">';
-    echo '<td class="Center" nowrap="nowrap" id="TD_'.$MyRow->EnId.'">';
-    if($MyRow->QuIrmType) {
-        echo '<div class="btn" onclick="IrmSet(this)" ref="'.$MyRow->QuIrmType.'">'.get_text('CmdUnset', 'Tournament', $MyRow->IrmType).'</div>';
-    } else {
-        echo '<div class="btn" onclick="IrmSet(this)" ref="'.$MyRow->QuIrmType.'">'.get_text('CmdSet', 'Tournament').'</div>';
-    }
+        $CurTarget = 'xx';
+        $TarStyle='';	// niene oppure warning se $RowStyle==''
+        // elenco persone
+        while ($MyRow=safe_fetch($Rs)) {
+            $RowStyle='';	// NoShoot oppure niente
+            if(!$MyRow->EnValid) {
+                $RowStyle='NoShoot';
+            }
 
+            if ($CurTarget!='xx') {
+                if ($CurTarget!=substr($MyRow->Target,0,-1) ) {
+                    if ($TarStyle=='') {
+                        $TarStyle='warning';
+                    } elseif($TarStyle=='warning') {
+                        $TarStyle='';
+                    }
+                }
+            }
+
+            echo '<tr id="Row_'.$MyRow->EnId.'" class="'.$TarStyle.' '.$RowStyle.' Irm-'.$MyRow->QuIrmType.'">';
+            echo '<td class="Center" nowrap="nowrap" id="TD_'.$MyRow->EnId.'">';
+            if($MyRow->QuIrmType) {
+                echo '<div class="btn" onclick="IrmSet(this)" ref="'.$MyRow->QuIrmType.'">'.get_text('CmdUnset', 'Tournament', $MyRow->IrmType).'</div>';
+            } else {
+                echo '<div class="btn" onclick="IrmSet(this)" ref="'.$MyRow->QuIrmType.'">'.get_text('CmdSet', 'Tournament').'</div>';
+            }
+
+            echo '</td>';
+            echo '<td>'.$MyRow->Target.'</td>';
+            echo '<td>'.$MyRow->EnCode.'</td>';
+            echo '<td>'.$MyRow->EnFirstName . ' ' . $MyRow->EnName.'</td>';
+            echo '<td class="Center">'.$MyRow->EnDivision.'</td>';
+            echo '<td class="Center">'.$MyRow->EnClass.'</td>';
+            echo '<td>'.$MyRow->CoCode.'</td>';
+            echo '<td class="Center"><input type="text" size="4" maxlength="5" name="d_QuD' . $_REQUEST['x_Dist'] . 'Score_' . $MyRow->EnId . '" id="d_QuD' . $_REQUEST['x_Dist'] . 'Score_' . $MyRow->EnId . '" value="' . $MyRow->SelScore . '" onBlur="javascript:UpdateQuals(\'d_QuD' . $_REQUEST['x_Dist'] . 'Score_' . $MyRow->EnId . '\');"' . ($MyRow->EnValid ? '' : 'disabled') .'></td>';
+            if($_SESSION['TourType']=='50') {
+                echo '<td class="Center"><input type="text" size="4" maxlength="5" name="d_QuArrow_' . $MyRow->EnId . '" id="d_QuArrow_' . $MyRow->EnId . '" value="' . $MyRow->QuArrow . '" onBlur="javascript:UpdateQuals(\'d_QuArrow_' . $MyRow->EnId . '\');"' . ($MyRow->EnValid ? '' : 'disabled') .'></td>';
+            }
+            echo '<td class="Center">';
+            echo '';
 ?>
-</td>
-<td><?php print $MyRow->Target; ?></td>
-<td><?php print $MyRow->EnCode; ?></td>
-<td><?php print $MyRow->EnFirstName . ' ' . $MyRow->EnName;?></td>
-<td class="Center"><?php print $MyRow->EnDivision; ?></td>
-<td class="Center"><?php print $MyRow->EnClass; ?></td>
-<td><?php print $MyRow->CoCode; ?></td>
-<td class="Center"><?php print '<input type="text" size="4" maxlength="5" name="d_QuD' . $_REQUEST['x_Dist'] . 'Score_' . $MyRow->EnId . '" id="d_QuD' . $_REQUEST['x_Dist'] . 'Score_' . $MyRow->EnId . '" value="' . $MyRow->SelScore . '" onBlur="javascript:UpdateQuals(\'d_QuD' . $_REQUEST['x_Dist'] . 'Score_' . $MyRow->EnId . '\');"' . ($MyRow->EnValid ? '' : 'disabled') .'>';?></td>
-<td class="Center">
+
+
+
+
+
+
+
+
+
 <?php
 	if (isset($_REQUEST['x_Gold']) && $_REQUEST['x_Gold']==1)
 		print '<input type="text" size="4" maxlength="5" name="d_QuD' . $_REQUEST['x_Dist'] . 'Gold_' . $MyRow->EnId . '" id="d_QuD' . $_REQUEST['x_Dist'] . 'Gold_' . $MyRow->EnId . '" value="' . $MyRow->SelGold . '" onBlur="javascript:UpdateQuals(\'d_QuD' . $_REQUEST['x_Dist'] . 'Gold_' . $MyRow->EnId . '\');"' . ($MyRow->EnValid ? '' : 'disabled') .'>';
diff --git a/src/Qualification/index_all.php b/src/Qualification/index_all.php
index 37624ed2..9287e315 100644
--- a/src/Qualification/index_all.php
+++ b/src/Qualification/index_all.php
@@ -27,10 +27,12 @@
             'MsgBackFromHome' => get_text('BackFromHome', 'Tournament'),
             'MsgSetDSQ' => get_text('Set-DSQ', 'Tournament'),
             'MsgUnsetDSQ' => get_text('Unset-DSQ', 'Tournament'),
-			'TxtIrmDns' => get_text('DNS', 'Tournament'),
-			'TxtIrmDnf' => get_text('DNF', 'Tournament'),
-			'TxtIrmUnset' => get_text('CmdUnset', 'Tournament', ''),
-			'TxtCancel' => get_text('CmdCancel'),
+            'TxtIrmTitle' => get_text('IrmStatus', 'Tournament'),
+            'TxtIrmDns' => get_text('IRM-10', 'Tournament'),
+            'TxtIrmDnf' => get_text('IRM-5', 'Tournament'),
+            'TxtIrmDnfNoRank' => get_text('IRM-7', 'Tournament'),
+            'TxtIrmUnset' => get_text('CmdUnset', 'Tournament', ''),
+            'TxtCancel' => get_text('CmdCancel'),
 			)),
 	);
 
diff --git a/src/RunArchery/PDFResult.php b/src/RunArchery/PDFResult.php
index d885cbc2..549e0f63 100644
--- a/src/RunArchery/PDFResult.php
+++ b/src/RunArchery/PDFResult.php
@@ -16,7 +16,7 @@
 	CreateTourSession($_REQUEST['TourId']);
 }
 
-checkACL(AclRunArchery, AclReadOnly);
+checkACL(AclQualification, AclReadOnly);
 
 $Events=[];
 foreach(($_REQUEST['events']??[]) as $v) {
diff --git a/src/Scheduler/OrisSchedule.php b/src/Scheduler/OrisSchedule.php
index 1db93bab..bd5bccaa 100644
--- a/src/Scheduler/OrisSchedule.php
+++ b/src/Scheduler/OrisSchedule.php
@@ -27,7 +27,7 @@
 		coalesce(SesOrder, 0) SesNumber, coalesce(SesName, '') as SesName
 	FROM FinSchedule
 	left join Session on SesTournament=FsTournament and (CONCAT(FsScheduledDate, ' ', FsScheduledTime) >= SesDtStart AND CONCAT(FsScheduledDate, ' ', FsScheduledTime) < SesDtEnd)
-	WHERE FsTournament=".$_SESSION['TourId'] ." AND (FsMatchNo%2=0)".(empty($_REQUEST['OnlyMedals']) ? '' : ' and FsMatchno in (0,2) ').($Date ? " AND FsScheduledDate='$Date'" : '')." and FSScheduledDate>0
+	WHERE FsTournament=".$_SESSION['TourId'] ." AND (FsMatchNo%2=0)".(empty($_REQUEST['OnlyMedals']) ? '' : ($_REQUEST['OnlyMedals']==1 ? ' and FsMatchno in (0,2) ' : ' and FsMatchno = 0 ' )).($Date ? " AND FsScheduledDate='$Date'" : '')." and FSScheduledDate>0
 	ORDER BY FsScheduledDate, FsScheduledTime, FsOdfMatchName";
 
 $q=safe_r_SQL($Sql);
diff --git a/src/Scheduler/PrnScheduler.php b/src/Scheduler/PrnScheduler.php
index f95a4c99..3315c4be 100644
--- a/src/Scheduler/PrnScheduler.php
+++ b/src/Scheduler/PrnScheduler.php
@@ -34,7 +34,7 @@
 }
 
 if(isset($_REQUEST['Today'])) {
-	$Schedule->SingleDay=date('Y-m-d');
+	$Schedule->SingleDay=getToday();
 	if(!empty($_REQUEST['FromDayDay'])) {
 		if(strtolower(substr($_REQUEST['FromDayDay'], 0, 1))=='d') {
 			$Date=date('Y-m-d', strtotime(sprintf('%+d days', substr($_REQUEST['FromDayDay'], 1) -1), $_SESSION['ToWhenFromUTS']));
@@ -46,7 +46,7 @@
 }
 
 if(isset($_REQUEST['FromDay'])) {
-	$Schedule->FromDay=date('Y-m-d');
+	$Schedule->FromDay=getToday();
 	if(!empty($_REQUEST['FromDayDay'])) {
 		if(strtolower(substr($_REQUEST['FromDayDay'], 0, 1))=='d') {
 			$Date=date('Y-m-d', strtotime(sprintf('%+d days', substr($_REQUEST['FromDayDay'], 1) -1), $_SESSION['ToWhenFromUTS']));
diff --git a/src/TV/GetComboSchedule.php b/src/TV/GetComboSchedule.php
index ca2f2a4c..3d5c6f3f 100644
--- a/src/TV/GetComboSchedule.php
+++ b/src/TV/GetComboSchedule.php
@@ -7,7 +7,9 @@
 
 	$teamEvent = (!empty($_REQUEST["teamEvent"]) && $_REQUEST["teamEvent"]==1 ? 1 : 0);
 
-	$xml='';
+    $Today=getToday();
+
+    $xml='';
 	$error=0;
 
 	$Select
@@ -15,13 +17,13 @@
 		. "FROM Tournament INNER JOIN FinSchedule ON ToId=FSTournament "
 		. (isset($_REQUEST["useHHT"]) && $_REQUEST["useHHT"] ? "INNER JOIN HhtEvents on HeTournament=ToId and HeFinSchedule=concat(FSScheduledDate, ' ', FSScheduledTime) and HeTeamEvent=FsTeamEvent " : "")
 		. "WHERE ToId=" . StrSafe_DB($_SESSION['TourId']) . " and FSScheduledDate>0 and FSTeamEvent=0 "
-		. (isset($_REQUEST["onlyToday"]) && $_REQUEST["onlyToday"] ? "AND date(convert_tz(FSScheduledDate, ToTimeZone, '+00:00'))=UTC_DATE()" : "")
+		. (isset($_REQUEST["onlyToday"]) && $_REQUEST["onlyToday"] ? "AND FSScheduledDate='$Today'" : "")
 		.") UNION ALL "
 		. "(SELECT DISTINCT CONCAT(FSScheduledDate,' ',FSScheduledTime) AS MyDate,FSTeamEvent "
 		. "FROM Tournament INNER JOIN FinSchedule ON ToId=FSTournament "
 		. (isset($_REQUEST["useHHT"]) && $_REQUEST["useHHT"] ? "inner join HhtEvents on HeTournament=ToId and HeFinSchedule=concat(FSScheduledDate, ' ', FSScheduledTime) and HeTeamEvent=FsTeamEvent  " : "")
 		. "WHERE ToId=" . StrSafe_DB($_SESSION['TourId']) . " and FSScheduledDate>0 and FSTeamEvent!=0 "
-		. (isset($_REQUEST["onlyToday"]) && $_REQUEST["onlyToday"] ? "AND date(convert_tz(FSScheduledDate, ToTimeZone, '+00:00'))=UTC_DATE()" : "")
+		. (isset($_REQUEST["onlyToday"]) && $_REQUEST["onlyToday"] ? "AND FSScheduledDate='$Today'" : "")
 		. ") ORDER BY MyDate ASC ";
 
 	$Rs=safe_r_sql($Select);
diff --git a/src/TV/GetRuleSel.php b/src/TV/GetRuleSel.php
index f7694ba3..779dbc5f 100644
--- a/src/TV/GetRuleSel.php
+++ b/src/TV/GetRuleSel.php
@@ -250,6 +250,7 @@
 			require_once('Common/Lib/Fun_Phases.inc.php');
 			$Cols[]='BYE';
 			$Cols[]='ENDS';
+			$Cols[]='SCHED';
 
 			$Select
 				= "SELECT MAX(greatest(PhId, PhLevel)) AS Phase FROM Events INNER JOIN Phases on PhId=EvFinalFirstPhase and (PhIndTeam & pow(2,EvTeamEvent))=1 where EvTeamEvent=0 and EvTournament={$_SESSION['TourId']}";
@@ -483,6 +484,7 @@
 			$Cols[]='BYE';
 			$Cols[]='X9';
 			$Cols[]='ENDS';
+            $Cols[]='SCHED';
 		case 'BLABS':
 			$Select =  "SELECT MAX(EvFinalFirstPhase) AS Phase FROM Events where EvTeamEvent=1 and EvTournament={$_SESSION['TourId']}";
 			$Rs=safe_r_sql($Select);
diff --git a/src/TV/Photos/updating.json b/src/TV/Photos/updating.json
index 2a065835..ef359150 100644
--- a/src/TV/Photos/updating.json
+++ b/src/TV/Photos/updating.json
@@ -1 +1 @@
-{"error":0,"msg":"error","start":"2024-05-29 05:49:34","status":"<div>Preparing data for the update:... done!<\/div><div>Sending request to Ianseo.net:... done!<\/div><div>Retrieving data from Ianseo.net (approx. 448 kB):... <br\/>done!<\/div><div>Updating local installation of Ianseo:... <br\/>Common\/Languages\/ca\/Tournament.php (85529 bytes): 84ef7d4f5f6b09e49c6de7da5bbc124d<br\/>Common\/Languages\/cs\/Tournament.php (39225 bytes): 695b78acc6709530b53ee08558ed55e2<br\/>Common\/Languages\/de\/Tournament.php (44451 bytes): faa489b74894915dd57a05f61dd92a3c<br\/>Common\/Languages\/dk\/Tournament.php (77831 bytes): 418736f6b988e229704ca2266f77bd4c<br\/>Common\/Languages\/es-ar\/Tournament.php (48456 bytes): 92d6e5d44cb6f65716a12b3c64d4f057<br\/>Common\/Languages\/es\/Tournament.php (78948 bytes): c842eda8b0e2f152a74d953e13756ee4<br\/>Common\/Languages\/fi\/Tournament.php (38355 bytes): 12612084aaaf9b4ea402f4d4a07caa9e<br\/>Common\/Languages\/fr\/Common.php (26711 bytes): 1f888203455084399f5d69b43cce2550<br\/>Common\/Languages\/fr\/Tournament.php (67939 bytes): ed8e79149db97b41e078ec938edbc211<br\/>Common\/Languages\/he\/Tournament.php (77584 bytes): 4ddbc7abe208cc826f126fd7b99c01bd<br\/>Common\/Languages\/hr\/Tournament.php (44549 bytes): 3221d9adcd91aca7bcb9b734b1115dec<br\/>Common\/Languages\/hu\/Tournament.php (63311 bytes): 57d65b5b35ce00902d7412eec15059e8<br\/>Common\/Languages\/id\/Tournament.php (79586 bytes): 47888d03763801d292e40c2093c5682e<br\/>Common\/Languages\/it-rm\/Tournament.php (26315 bytes): 06a536d789e7f9ef19c76d0d186398d2<br\/>Common\/Languages\/it\/Common.php (29672 bytes): 5c41543e11da72b930b90f33a1a20085<br\/>Common\/Languages\/it\/Tournament.php (84997 bytes): 80e31d3c44417e03bc0354b973698436<br\/>Common\/Languages\/ja\/Tournament.php (25183 bytes): e5417dac7a69c8f7d8540a3c0ef44468<br\/>Common\/Languages\/lv\/Tournament.php (42266 bytes): c58e606955fea0e21de115cdc47ae7bd<br\/>Common\/Languages\/ms\/Common.php (27380 bytes): d403de9f8bebe2c76b70b48f942e7784<br\/>Common\/Languages\/ms\/ISK.php (14688 bytes): cd8c252080840183ca6da06ca7d9bf9a<br\/>Common\/Languages\/ms\/Install.php (17128 bytes): e74b2f27c724d80a0d919029425e44ea<br\/>Common\/Languages\/ms\/Tournament.php (28652 bytes): a5da3a3d7c10445d304edb7db033185b<br\/>Common\/Languages\/nl\/Tournament.php (43664 bytes): 3afa6e37a7c4fa9160ebce28d5a8e43e<br\/>Common\/Languages\/no\/Tournament.php (62502 bytes): 774299ba64d64e40a6629a9fe2e3d745<br\/>Common\/Languages\/pl\/Tournament.php (54639 bytes): 9254edc99546193eff577fba419d90cf<br\/>Common\/Languages\/pt-br\/Tournament.php (60986 bytes): 098562ace2300ed192e5d3de41d76c87<br\/>Common\/Languages\/ro\/Tournament.php (5685 bytes): 19230456e8ccb7ab2fe43e1dc58f10dc<br\/>Common\/Languages\/ru\/Tournament.php (76005 bytes): a269b23f62f42446d1a5dec235d6d907<br\/>Common\/Languages\/sl\/Tournament.php (21803 bytes): d4bb4ee3eb8fdf27f3b063c7bedcbf33<br\/>Common\/Languages\/sr\/Tournament.php (25619 bytes): 6efa5e1c2a202e29c4f5c28a0e49f5cc<br\/>Common\/Languages\/sv\/Tournament.php (58611 bytes): 186dbfe1bb13f9cbc6c80991ad196634<br\/>Common\/Languages\/tlh\/Tournament.php (86944 bytes): 0bae78b84441668b482853bc85e08aa1<br\/>Common\/Languages\/zh-cn\/Tournament.php (8594 bytes): 6416a903386ef25da1d970f8229aa5d7<br\/>Common\/distro.inc.php (288 bytes): c2c356d51b5336a284dc80f703ec9e04<br\/>done!<\/div><div>Deleting unused\/spurious files:... <br\/>Common\/Languages\/credits.php.old<br>done!<\/div><div>Updating installed languages:...  ar bg ca cs de dk ee el en en-ca en-us es es-ar fa fi fr fr-ca he hr hu id is it it-rm ja ko lt lv mn ms nl no pl pt pt-br ro ru sk sl sr sv th tlh tr uk zh-cn zh-tw<br>done!<\/div><div><b style=\"font-size:larger\">The upgrade process is finished.<\/b><\/div>","finished":1}
\ No newline at end of file
+{"error":1,"msg":"Your installation of Ianseo is up to date. Check from time to time as we constantly add new fefatures and bug corrections.","start":"2024-12-09 12:23:39","status":"<div>Preparing data for the update:... done!<\/div><div>Sending request to Ianseo.net:... done!<\/div><div>Retrieving data from Ianseo.net (approx. 0 kB):... done!<\/div><div><br\/>Your installation of Ianseo is up to date. Check from time to time as we constantly add new fefatures and bug corrections.<\/div>","finished":1}
\ No newline at end of file
diff --git a/src/TV/Rot/index.php b/src/TV/Rot/index.php
index a9e60a4b..5b58580b 100644
--- a/src/TV/Rot/index.php
+++ b/src/TV/Rot/index.php
@@ -12,6 +12,10 @@
 $JS_SCRIPT[]=phpVars2js(array('Rule' => $Rule, 'TourCode' => $IsCode, 'DirRoot'=>$CFG->ROOT_DIR));
 $JS_SCRIPT[]='<script type="text/javascript" src="'.$CFG->ROOT_DIR.'TV/Rot/rot.js"></script>';
 $JS_SCRIPT[]='<link href="'.$CFG->ROOT_DIR.'TV/Rot/rot.css" media="screen" rel="stylesheet" type="text/css">';
+// check if there is a specific FONT module for this comeptition
+if(is_file($CFG->INCLUDE_PATH.'/Modules/FontManagement/fonts/'.$IsCode.'.css')) {
+    $JS_SCRIPT[]='<link href="'.$CFG->ROOT_DIR.'Modules/FontManagement/fonts/'.$IsCode.'.css" media="screen" rel="stylesheet" type="text/css">';
+}
 
 // gets the main CSS ruleset
 $JS_SCRIPT[]=getCss($TourId, $Rule);
diff --git a/src/TV/Rot/rot-FIN.php b/src/TV/Rot/rot-FIN.php
index 506291b8..eaa48b3c 100644
--- a/src/TV/Rot/rot-FIN.php
+++ b/src/TV/Rot/rot-FIN.php
@@ -21,6 +21,7 @@ function rotFin($TVsettings, $RULE) {
 	$ViewFlag=(in_array('FLAG', $Columns) or in_array('ALL', $Columns));
 	$ViewCode=(in_array('CODE', $Columns) or in_array('ALL', $Columns));
 	$ViewEnds=(in_array('ENDS', $Columns) or in_array('ALL', $Columns));
+	$ViewSchedule=(in_array('SCHED', $Columns));
 // 	$View10s=((in_array('10', $Columns) or in_array('ALL', $Columns)) and $TourType != 14);
 // 	$ViewX9s=(in_array('X9', $Columns) or in_array('ALL', $Columns));
 	$Title2Rows=(in_array('TIT2ROWS', $Columns) ? '<br/>' : ': ');
@@ -240,58 +241,64 @@ function rotFin($TVsettings, $RULE) {
 					$tmp2.='<div class="CountryDescr">'.$item['oppCountryName'].'</div>';
 				}
 
-				if($ViewEnds) {
-					$ends1=explode('|', $item['setPoints']);
-					$ends2=explode('|', $item['oppSetPoints']);
-					if(count($ends1)==count($ends2)) {
-						while($ends1 and end($ends1)==0 and end($ends2)==0) {
-							array_pop($ends1);
-							array_pop($ends2);
-						}
-					}
-
-					if($item['tiebreakDecoded']) {
-						$ends1[]='- '.$item['tiebreakDecoded'];
-					}
-					if($item['oppTiebreakDecoded']) {
-						$ends2[]='- '.$item['oppTiebreakDecoded'];
-					}
-
-					$tmp1.='<div class="EndPoints">'.implode(' ', $ends1).'</div>';
-					$tmp2.='<div class="EndPoints">'.implode(' ', $ends2).'</div>';
-				}
-
-				if($item['tie']==2) {
-					// it is a bye
-					$Score=$rankData['meta']['fields']['bye'];
-				} elseif($item['athlete']) {
-					// archer is there
-					if($section['meta']['matchMode']) {
-						$Score=  $item['setScore'];
-					} else {
-						$Score=  $item['score'] . ($item['tie']==1 ? '*' : '<tt>&nbsp;</tt>');
-					}
-				} else {
-					// it is the bye's opponent?
-					$Score='';
-				}
-				$tmp1.='<div class="Score">'.$Score.'</div>';
-
-				if($item['oppTie']==2) {
-					// it is a bye
-					$Score=$rankData['meta']['fields']['bye'];
-				} elseif($item['oppAthlete']) {
-					// archer is there
-					if($section['meta']['matchMode']) {
-						$Score= $item['oppSetScore'];
-					} else {
-						$Score= $item['oppScore'] . ($item['oppTie']==1 ? '*' : '<tt>&nbsp;</tt>');
-					}
-				} else {
-					// it is the bye's opponent?
-					$Score='';
-				}
-				$tmp2.='<div class="Score">'.$Score.'</div>';
+                if($ViewSchedule) {
+                    // overrides all the following options
+                    $tmp1.='<div class="Schedule">'.($item['scheduledKey']=='0000-00-00 00:00:00' ? '' : date('j M H:i', strtotime($item['scheduledKey']))).'</div>';
+                    $tmp2.='<div class="Schedule"></div>';
+                } else {
+                    if($ViewEnds) {
+                        $ends1=explode('|', $item['setPoints']);
+                        $ends2=explode('|', $item['oppSetPoints']);
+                        if(count($ends1)==count($ends2)) {
+                            while($ends1 and end($ends1)==0 and end($ends2)==0) {
+                                array_pop($ends1);
+                                array_pop($ends2);
+                            }
+                        }
+
+                        if($item['tiebreakDecoded']) {
+                            $ends1[]='- '.$item['tiebreakDecoded'];
+                        }
+                        if($item['oppTiebreakDecoded']) {
+                            $ends2[]='- '.$item['oppTiebreakDecoded'];
+                        }
+
+                        $tmp1.='<div class="EndPoints">'.implode(' ', $ends1).'</div>';
+                        $tmp2.='<div class="EndPoints">'.implode(' ', $ends2).'</div>';
+                    }
+
+                    if($item['tie']==2) {
+                        // it is a bye
+                        $Score=$rankData['meta']['fields']['bye'];
+                    } elseif($item['athlete']) {
+                        // archer is there
+                        if($section['meta']['matchMode']) {
+                            $Score=  $item['setScore'];
+                        } else {
+                            $Score=  $item['score'] . ($item['tie']==1 ? '*' : '<tt>&nbsp;</tt>');
+                        }
+                    } else {
+                        // it is the bye's opponent?
+                        $Score='';
+                    }
+                    $tmp1.='<div class="Score">'.$Score.'</div>';
+
+                    if($item['oppTie']==2) {
+                        // it is a bye
+                        $Score=$rankData['meta']['fields']['bye'];
+                    } elseif($item['oppAthlete']) {
+                        // archer is there
+                        if($section['meta']['matchMode']) {
+                            $Score= $item['oppSetScore'];
+                        } else {
+                            $Score= $item['oppScore'] . ($item['oppTie']==1 ? '*' : '<tt>&nbsp;</tt>');
+                        }
+                    } else {
+                        // it is the bye's opponent?
+                        $Score='';
+                    }
+                    $tmp2.='<div class="Score">'.$Score.'</div>';
+                }
 
 				$tmp1.='</div>';
 				$tmp2.='</div>';
@@ -365,6 +372,7 @@ function getPageDefaults(&$RMain) {
 		'CountryDescr' => 'flex: 0 1 20vw;white-space:nowrap;overflow:hidden;',
 		'DistScore' => 'flex: 0 0 5vw; text-align:right; font-size:0.8em;',
 		'DistPos' => 'flex: 0 0 3vw; text-align:left; font-size:0.7em;',
+		'Schedule' => 'flex: 1 0 12vw; text-align:left; white-space:nowrap; font-size:1.1em;margin-right:0.5rem;',
 		'Score' => 'flex: 0 0 6vw; text-align:right; font-size:1.25em;margin-right:0.5rem;',
 		'Gold' => 'flex: 0 0 3vw; text-align:right; font-size:1em;',
 		'XNine' => 'flex: 0 0 3vw; text-align:right; font-size:1em;',
diff --git a/src/TV/Rot/rot-FINT.php b/src/TV/Rot/rot-FINT.php
index bfa6b018..82e09526 100644
--- a/src/TV/Rot/rot-FINT.php
+++ b/src/TV/Rot/rot-FINT.php
@@ -23,6 +23,7 @@ function rotFint($TVsettings, $RULE) {
 	$ViewAths=(in_array('ATHL', $Columns) or in_array('ALL', $Columns));
 	$ViewByes=(in_array('BYE', $Columns) or in_array('ALL', $Columns));
 	$ViewEnds=(in_array('ENDS', $Columns) or in_array('ALL', $Columns));
+    $ViewSchedule=(in_array('SCHED', $Columns));
 	$Title2Rows=(in_array('TIT2ROWS', $Columns) ? '<br/>' : ': ');
 
 	$options=array();
@@ -247,61 +248,67 @@ function rotFint($TVsettings, $RULE) {
 					$tmp2 .= '</div>';
 				}
 
-				if($ViewEnds) {
-					$ends1=explode('|', $item['setPoints']);
-					$ends2=explode('|', $item['oppSetPoints']);
-					if(count($ends1)==count($ends2)) {
-						while($ends1 and end($ends1)==0 and end($ends2)==0) {
-							array_pop($ends1);
-							array_pop($ends2);
-						}
-					}
-
-					if($item['tiebreakDecoded']) {
-						$ends1[]='- '.$item['tiebreakDecoded'];
-					}
-					if($item['oppTiebreakDecoded']) {
-						$ends2[]='- '.$item['oppTiebreakDecoded'];
-					}
-
-					$tmp1.='<div class="EndPoints">'.implode(' ', $ends1).'</div>';
-					$tmp2.='<div class="EndPoints">'.implode(' ', $ends2).'</div>';
-				}
-
-				if($item['tie']==2) {
-					// it is a bye
-					$Score=$rankData['meta']['fields']['bye'];
-				} elseif($item['countryName']) {
-					// archer is there
-					if($section['meta']['matchMode']) {
-						// sets
-						$Score = $item['setScore'];
-					} else {
-						// cumulative
-						$Score = $item['score'] . ($item['tie']==1 ? '*' : '<tt>&nbsp;</tt>' );
-					}
-				} else {
-					// it is the bye's opponent?
-					$Score='';
-				}
-				$tmp1.='<div class="Score">'.$Score.'</div>';
-
-				if($item['oppTie']==2) {
-					// it is a bye
-					$Score=$rankData['meta']['fields']['bye'];
-				} elseif($item['oppCountryName']) {
-					// archer is there
-					if($section['meta']['matchMode']) {
-						// set system
-						$Score= $item['oppSetScore'];
-					} else {
-						$Score= $item['oppScore'] . ($item['oppTie']==1 ? '*' : '<tt>&nbsp;</tt>' );
-					}
-				} else {
-					// it is the bye's opponent?
-					$Score='';
-				}
-				$tmp2.='<div class="Score">'.$Score.'</div>';
+                if($ViewSchedule) {
+                    // overrides all the following options
+                    $tmp1.='<div class="Schedule">'.($item['scheduledKey']=='0000-00-00 00:00:00' ? '' : date('j M H:i', strtotime($item['scheduledKey']))).'</div>';
+                    $tmp2.='<div class="Schedule"></div>';
+                } else {
+                    if($ViewEnds) {
+                        $ends1=explode('|', $item['setPoints']);
+                        $ends2=explode('|', $item['oppSetPoints']);
+                        if(count($ends1)==count($ends2)) {
+                            while($ends1 and end($ends1)==0 and end($ends2)==0) {
+                                array_pop($ends1);
+                                array_pop($ends2);
+                            }
+                        }
+
+                        if($item['tiebreakDecoded']) {
+                            $ends1[]='- '.$item['tiebreakDecoded'];
+                        }
+                        if($item['oppTiebreakDecoded']) {
+                            $ends2[]='- '.$item['oppTiebreakDecoded'];
+                        }
+
+                        $tmp1.='<div class="EndPoints">'.implode(' ', $ends1).'</div>';
+                        $tmp2.='<div class="EndPoints">'.implode(' ', $ends2).'</div>';
+                    }
+
+                    if($item['tie']==2) {
+                        // it is a bye
+                        $Score=$rankData['meta']['fields']['bye'];
+                    } elseif($item['countryName']) {
+                        // archer is there
+                        if($section['meta']['matchMode']) {
+                            // sets
+                            $Score = $item['setScore'];
+                        } else {
+                            // cumulative
+                            $Score = $item['score'] . ($item['tie']==1 ? '*' : '<tt>&nbsp;</tt>' );
+                        }
+                    } else {
+                        // it is the bye's opponent?
+                        $Score='';
+                    }
+                    $tmp1.='<div class="Score">'.$Score.'</div>';
+
+                    if($item['oppTie']==2) {
+                        // it is a bye
+                        $Score=$rankData['meta']['fields']['bye'];
+                    } elseif($item['oppCountryName']) {
+                        // archer is there
+                        if($section['meta']['matchMode']) {
+                            // set system
+                            $Score= $item['oppSetScore'];
+                        } else {
+                            $Score= $item['oppScore'] . ($item['oppTie']==1 ? '*' : '<tt>&nbsp;</tt>' );
+                        }
+                    } else {
+                        // it is the bye's opponent?
+                        $Score='';
+                    }
+                    $tmp2.='<div class="Score">'.$Score.'</div>';
+                }
 
 				$tmp1.='</div>';
 				$tmp2.='</div>';
@@ -370,6 +377,7 @@ function getPageDefaults(&$RMain) {
 		'Target' => 'flex: 0 0 6vw; text-align:right;margin-right:0.5em;',
 		'Athlete' => 'flex: 1 1 20vw;font-size:0.5em;white-space:nowrap;overflow:hidden;',
 		'CountryDescr' => 'flex: 1 1 25vw;white-space:nowrap;overflow:hidden;',
+        'Schedule' => 'flex: 1 0 12vw; text-align:left; white-space:nowrap; font-size:1.1em;margin-right:0.5rem;',
 		'Arrows' => 'flex: 0 0 5vw; text-align:right; font-size:1em;margin-right:0.5rem;',
 		'DistScore' => 'flex: 0 0 5vw; text-align:right; font-size:0.8em;',
 		'DistPos' => 'flex: 0 0 3vw; text-align:left; font-size:0.7em;',
diff --git a/src/TV/Rot_athl_sch.php b/src/TV/Rot_athl_sch.php
index 4c86f183..7251712e 100644
--- a/src/TV/Rot_athl_sch.php
+++ b/src/TV/Rot_athl_sch.php
@@ -1,14 +1,16 @@
 <?php
 require_once('Common/Fun_FormatText.inc.php');
+require_once('Common/Lib/Obj_RankFactory.php');
 
 $TVsettings->EventFilter=MakeEventFilter($TVsettings->TVPEventInd);
 // get the array of our guys
-$Select = "select EnId from Entries "
-		. "WHERE EnAthlete=1 AND EnIndClEvent=1 AND EnStatus <= 1 AND EnTournament = " . StrSafe_DB($TourId) . " "
-		. ($TVsettings->EventFilter ? " AND CONCAT(EnDivision,EnClass) " . $TVsettings->EventFilter : "") . " "
-		. "order by rand() "
-		. "limit " . ($TVsettings->TVPNumRows ? $TVsettings->TVPNumRows : "1")
-		;
+$Select = "select EnId from Entries 
+    inner join Qualifications on QuId=EnId
+    WHERE EnAthlete=1 AND EnIndClEvent=1 AND EnStatus <= 1 AND EnTournament = " . StrSafe_DB($TourId) . "
+    " . ($TVsettings->EventFilter ? " AND CONCAT(EnDivision,EnClass) " . $TVsettings->EventFilter : "") . "
+    " . (($TVsettings->TVPSession??0) ? " AND QuSession= " . intval($TVsettings->TVPSession) : "") . "
+    order by rand()
+    limit " . ($TVsettings->TVPNumRows ? $TVsettings->TVPNumRows : "1");
 $GUYS=array();
 
 $q=safe_r_sql($Select);
@@ -19,210 +21,71 @@
 include_once('Common/CheckPictures.php');
 CheckPictures($TourCode);
 
-$TourType=getTournamentType($TourId);
+$options=array('tournament' => $RULE->TVRTournament, 'enids'=>$GUYS);
+
+if(isset($TVsettings->TVPEventInd) && !empty($TVsettings->TVPEventInd))
+    $options['events'] = explode('|',$TVsettings->TVPEventInd);
+if(isset($TVsettings->TVPNumRows) && $TVsettings->TVPNumRows>0)
+    $options['cutRank'] = $TVsettings->TVPNumRows;
+//if(isset($TVsettings->TVPSession) && $TVsettings->TVPSession>0)
+//    $options['session'] = $TVsettings->TVPSession;
+
+$rank=Obj_RankFactory::create('DivClass',$options);
+$rank->read();
+$rankData=$rank->getData();
+
+if(!empty($rankData['sections'])) {
+    foreach ($rankData['sections'] as $Category=>$Items) {
+        foreach ($Items['items'] as $Item) {
+            // lo include nelle schede da ritornare
+            $ret[$Item['id']]['head']='';
+            $ret[$Item['id']]['cols']='';
+            $ret[$Item['id']]['fissi']='';
+            $ret[$Item['id']]['type']='DB';
+            $ret[$Item['id']]['style']=$ST;
+            $ret[$Item['id']]['js']=$JS;
+            $ret[$Item['id']]['js'] .= 'FreshDBContent[%1$s]=\'\';'."\n";
+
+            $Photo='';
+            if(is_file(__DIR__.'/'.($pic="Photos/{$TourCode}-En-{$Item['id']}.jpg"))) {
+                $Photo='<img class="athletephoto" src="'.$pic.'" style="width:100%" alternate=""/>';
+            }
+
+            $tmp ='<table width="100%" height="80%" style="font-size:4vh;">';
+            // prima riga, a destra ci va la foto, a sinistra i dati
+            $tmp.='<tr>';
+            if($Photo) {
+                $tmp.='<td style="width:30%" align="right" rowspan="5">'.$Photo.'</td>';
+            }
+            $tmp.='<td width="100%" align="center">' . $Item['familynameUpper'] . ' ' . ($TVsettings->TVPNameComplete==0 ? FirstLetters($Item['givenname']) : $Item['givenname']).'</td>';
+            $tmp.='</tr>';
+
+            $tmp.='<tr><td align="center" class="piccolo"><span class="piccolo">'.get_text('RankingPosition','Tournament').'</span><br/>'.$Item['rank'].'<span class="piccolo">';
+            for ($i=1;$i<=$Items['meta']['numDist'];++$i) {
+                $bits=explode('|', $Item['dist_'.$i]);
+                $tmp .= '<br/>' . $Items['meta']['fields']['dist_'.$i] . ': ' . str_pad($bits[1],3," ",STR_PAD_LEFT) . '<span class="piccolo">/' . str_pad($bits[0],3," ",STR_PAD_LEFT) . '</span>';
+//                else if($i < $SnapDistance)
+//                    $tmp .= str_pad($MyRow->{'QuD' . $i . 'Score'},3," ",STR_PAD_LEFT);
+//                else if($i == $SnapDistance)
+//                    $tmp .= str_pad($MyRow->{'EqScore'},3," ",STR_PAD_LEFT);
+//                else
+//                    $tmp .= str_pad("0",3," ",STR_PAD_LEFT);
+            }
+            $tmp.='</span></td></tr>';
+
+            $tmp.='<tr><td align="center" class="piccolo"><span class="piccolo">'.get_text('Division').' - '.get_text('Class').'</span><br/>'.$Item['div'] . '&nbsp;&nbsp;' . $Item['class'].'</td></tr>';
+
+            $tmp.='<tr><td align="center" class="piccolo"><span class="piccolo">'.get_text('Target').'</span><br/>'.ltrim($Item['target'],'0').'</td></tr>';
+
+            $tmp.='<tr>';
+            $tmp.='<td align="center" class="piccolo"><span class="piccolo">'.get_text('Score','Tournament').'</span><br/>' . $Item['score'] . '</td>';
+            $tmp.='</tr>';
+            $tmp.='';
+            $tmp.='';
+            $tmp.='</table>';
+
+            $ret[$Item['id']]['basso']=$tmp;
+        }
+    }
 
-$ArrowNo=0;
-$SnapDistance=0;
-if(isset($_REQUEST["ArrowNo"]) && is_numeric($_REQUEST["ArrowNo"]))
-	$ArrowNo = $_REQUEST["ArrowNo"];
-else
-{
-	$MyQuery = "SELECT MAX(EqArrowNo) as ArrowNo "
-		. "FROM Entries "
-		. "INNER JOIN Qualifications ON EnId=QuId "
-		. "INNER JOIN ElabQualifications ON EnId=EqId "
-		. "WHERE EnAthlete=1 AND EnIndClEvent=1 AND EnStatus <= 1 AND EnTournament = " . StrSafe_DB($TourId) . " "
-		. ($TVsettings->EventFilter ? " AND CONCAT(EnDivision,EnClass) " . $TVsettings->EventFilter : "") . " "
-		. "GROUP BY QuSession "
-		. "ORDER BY ArrowNo ASC";
-	$Rs=safe_r_sql($MyQuery);
-	if($Rs)
-		$ArrowNo = safe_fetch($Rs)->ArrowNo;
 }
-
-
-if($ArrowNo != 0)
-{
-	$MyQuery = "SELECT MIN(EqDistance) as Distance "
-		. "FROM Entries "
-		. "INNER JOIN Qualifications ON EnId=QuId "
-		. "INNER JOIN ElabQualifications ON EnId=EqId "
-		. "WHERE EnAthlete=1 AND EnTournament=" . StrSafe_DB($TourId) . " AND EqArrowNo=" . StrSafe_DB($ArrowNo) . " "
-		. ($TVsettings->EventFilter ? " AND CONCAT(EnDivision,EnClass) " . $TVsettings->EventFilter : "");
-	$Rs=safe_r_sql($MyQuery);
-	if($Rs)
-		$SnapDistance=safe_fetch($Rs)->Distance;
-}
-
-$Select
-	= "SELECT EnId, EnCode as Bib, EnName AS Name, upper(EnFirstName) AS FirstName, SUBSTRING(QuTargetNo,2) AS TargetNo, CoCode AS NationCode, CoName AS Nation, EnClass AS ClassCode, EnDivision AS DivCode,EnAgeClass as AgeClass,  EnSubClass as SubClass, ClDescription, DivDescription, "
-	. "CONCAT(EnDivision,EnClass) AS MyEvent,ToNumDist as NumDist,Td1, Td2, Td3, Td4, Td5, Td6, Td7, Td8, "
-	. "QuD1Score, QuD1Rank, QuD2Score, QuD2Rank, QuD3Score, QuD3Rank, QuD4Score, QuD4Rank, "
-	. "QuD5Score, QuD5Rank, QuD6Score, QuD6Rank, QuD7Score, QuD7Rank, QuD8Score, QuD8Rank, "
-	. "QuScore, QuGold, QuXnine, ToGolds AS TtGolds, ToXNine AS TtXNine, ";
-
-if($SnapDistance==0) {
-	$Select .= " QuScore as OrderScore, QuGold as OrderGold, QuXnine as OrderXNine, ";
-	$Select .= "'0' as EqDistance, '0' as EqScore, ";
-} else {
-	for($i=1; $i<$SnapDistance; $i++)
-		$Select .= "QuD" . $i . "Score+";
-	$Select .="IFNULL(EqScore,0) AS OrderScore, ";
-	for($i=1; $i<$SnapDistance; $i++)
-		$Select .= "QuD" . $i . "Gold+";
-	$Select .="IFNULL(EqGold,0) AS OrderGold, ";
-	for($i=1; $i<$SnapDistance; $i++)
-		$Select .= "QuD" . $i . "XNine+";
-	$Select .="IFNULL(EqXNine,0) AS OrderXNine, ";
-	$Select .= "EqDistance, IFNULL(EqScore,0) as EqScore, ";
-}
-
-
-$Select .= "ToType, QuD1Xnine, QuD2Xnine, QuD3Xnine, QuD4Xnine, QuD5Xnine, QuD6Xnine, QuD7Xnine, QuD8Xnine "
-	. "FROM Tournament AS t "
-	. "INNER JOIN Entries AS e ON t.ToId=e.EnTournament "
-	. "INNER JOIN Countries AS c ON e.EnCountry=c.CoId AND e.EnTournament=c.CoTournament "
-	. "INNER JOIN Qualifications AS q ON e.EnId=q.QuId "
-	. "INNER JOIN Classes AS cl ON e.EnClass=cl.ClId AND ClTournament=" . StrSafe_DB($TourId) . " "
-	. "INNER JOIN Divisions AS d ON e.EnDivision=d.DivId AND DivTournament=" . StrSafe_DB($TourId) . " ";
-if($SnapDistance!=0)
-	$Select .=  "LEFT JOIN ElabQualifications AS eq ON e.EnId=eq.EqId AND eq.EqArrowNo=" . StrSafe_DB($ArrowNo) . " ";
-
-$Select .= "LEFT JOIN TournamentDistances AS td ON t.ToType=td.TdType and TdTournament=ToId AND CONCAT(TRIM(e.EnDivision),TRIM(e.EnClass)) LIKE TdClasses "
-	. "WHERE EnAthlete=1 AND EnIndClEvent=1 AND EnStatus <= 1 AND ToId = " . StrSafe_DB($TourId) . " "
-	. ($TVsettings->EventFilter ? " AND CONCAT(e.EnDivision,e.EnClass) " . $TVsettings->EventFilter : "") . " "
-	. ($TVsettings->TVPSession ? " AND QuSession = " . StrSafe_DB($TVsettings->TVPSession) : "") . " ";
-
-switch($TourType) {
-	case 14:
-		$Select.= "ORDER BY DivViewOrder, EnDivision, ClViewOrder, EnClass, (QuD1Score+QuD2Score+QuD3Score) DESC, QuD4Score DESC, QuXnine DESC, FirstName, Name ";
-		break;
-	case 32:
-		$Select.= "ORDER BY DivViewOrder, EnDivision, ClViewOrder, EnClass, (QuD1Score+QuD2Score) DESC, (QuD1Xnine + QuD2Xnine) DESC, QuD3Xnine desc, FirstName, Name ";
-		break;
-	default:
-		//Tutto tranne Las Vegas
-		$Select.= "ORDER BY DivViewOrder, EnDivision, ClViewOrder, EnClass, OrderScore DESC, OrderGold DESC, OrderXNine DESC, FirstName, Name ";
-}
-
-$Rs=safe_r_sql($Select);
-
-//print $Select;exit;
-
-//print $Select;exit;
-$MyStrData="";
-
-$MyRank = 1;
-$MyPos = 0;
-$MyScoreOld = 0;
-$MyGoldOld = 0;
-$MyXNineOld = 0;
-$fotow = intval($_SESSION['WINWIDTH']/3);
-
-$count=0;
-
-if (safe_num_rows($Rs)==0) return '';
-
-// Variabili che contengono i punti del precedente atleta per la gestione del rank
-$MyRank = 1;
-$MyPos = 0;
-$MyScoreOld = 0;
-$MyGoldOld = 0;
-$MyXNineOld = 0;
-$oldEventCode = '';
-
-while ($MyRow=safe_fetch($Rs))
-{
-	if($oldEventCode!=$MyRow->MyEvent) {
-		$MyRank = 1;
-		$MyPos = 0;
-	}
-
-	// Sicuramente devo incrementare la posizione
-	++$MyPos;
-	switch(getTournamentType($TourId)) {
-		case 14:
-			if ($MyRow->OrderScore!=$MyScoreOld) {
-				$MyRank = $MyPos;
-			}
-			break;
-		case 32:
-			if ($MyRow->OrderScore!=$MyScoreOld or $MyRow->OrderXNine!=$MyXNineOld) {
-				$MyRank = $MyPos;
-			}
-			break;
-		default:
-	}
-	// Se non ho parimerito il ranking è uguale alla posizione
-	if(getTournamentType($TourId) == 14 or getTournamentType($TourId) == 32) //Tipo Las Vegas
-	{
-	}
-	else	//STANDARD
-	{
-		if (!($MyRow->OrderScore==$MyScoreOld &&
-			$MyRow->OrderGold==$MyGoldOld &&
-			$MyRow->OrderXNine==$MyXNineOld))
-		$MyRank = $MyPos;
-	}
-
-	if(in_array($MyRow->EnId, $GUYS)) {
-		// lo include nelle schede da ritornare
-		$ret[$MyRow->EnId]['head']='';
-		$ret[$MyRow->EnId]['cols']='';
-		$ret[$MyRow->EnId]['fissi']='';
-		$ret[$MyRow->EnId]['type']='DB';
-		$ret[$MyRow->EnId]['style']=$ST;
-		$ret[$MyRow->EnId]['js']=$JS;
-		$ret[$MyRow->EnId]['js'] .= 'FreshDBContent[%1$s]=\'\';'."\n";
-
-		$tmp ='<table width="100%" height="'.($_SESSION['WINHEIGHT']-35).'">';
-		// prima riga, a destra ci va la foto, a sinistra i dati
-		$tmp.='<tr>';
-		$tmp.='<td rowspan="5"><img class="athletephoto" src="Photos/'.$TourCode.'-En-'.$MyRow->EnId.'.jpg" width="'.$fotow.'" alternate=""/></td>';
-		$tmp.='<td width="100%" align="center">' . $MyRow->FirstName . ' ' . ($TVsettings->TVPNameComplete==0 ? FirstLetters($MyRow->Name) : $MyRow->Name).'</td>';
-		$tmp.='</tr>';
-
-		$tmp.='<tr><td align="center" class="piccolo"><span class="piccolo">'.get_text('RankingPosition','Tournament').'</span><br/>'.$MyRank.'<span class="piccolo">';
-		for ($i=1;$i<=$MyRow->NumDist;++$i)
-		{
-			$tmp .= '<br/>' . $MyRow->{'Td' . $i} . ': ' ;
-			if($SnapDistance==0)
-				$tmp .= str_pad($MyRow->{'QuD' . $i . 'Score'},3," ",STR_PAD_LEFT) . '<span class="piccolo">/' . str_pad(($MyRow->ToType!=14 ? $MyRow->{'QuD' . $i . 'Rank'} : $MyRow->{'QuD' . $i . 'Xnine'}),2," ",STR_PAD_LEFT) . '</span>';
-			else if($i < $SnapDistance)
-				$tmp .= str_pad($MyRow->{'QuD' . $i . 'Score'},3," ",STR_PAD_LEFT);
-			else if($i == $SnapDistance)
-				$tmp .= str_pad($MyRow->{'EqScore'},3," ",STR_PAD_LEFT);
-			else
-				$tmp .= str_pad("0",3," ",STR_PAD_LEFT);
-		}
-		$tmp.='</span></td></tr>';
-
-		$tmp.='<tr><td align="center" class="piccolo"><span class="piccolo">'.get_text('Division').' - '.get_text('Class').'</span><br/>'.$MyRow->DivCode . '&nbsp;&nbsp;' . $MyRow->ClassCode.'</td></tr>';
-
-		$tmp.='<tr><td align="center" class="piccolo"><span class="piccolo">'.get_text('Target').'</span><br/>'.$MyRow->TargetNo.'</td></tr>';
-
-		$tmp.='<tr>';
-		$tmp.='<td align="center" class="piccolo"><span class="piccolo">'.get_text('Score','Tournament').'</span><br/>' . $MyRow->OrderScore;
-		$tmp.=($MyRow->OrderScore != $MyRow->QuScore ?  '<br/><span class="piccolo">' . $MyRow->QuScore . '</span>' : "") . '</td>';
-		$tmp.='</tr>';
-		$tmp.='';
-		$tmp.='';
-		$tmp.='</table>';
-
-//		if($MyRow->ToType!=14) {
-//			$tmp.= '<td>' . ($MyRow->ToType!=14 ? $MyRow->NationCode : substr($MyRow->NationCode,0,3)) . ' ' . ($TVsettings->TVPViewNationName==1 ? ($MyRow->Nation) : '') . '</td>';
-//		}
-	//NewDistanze
-
-
-		$ret[$MyRow->EnId]['basso']=$tmp;
-	}
-
-	$MyScoreOld = $MyRow->OrderScore;
-	if($MyRow->ToType!=14)		//Non Considera ORI se "Las Vegas"
-		$MyGoldOld = $MyRow->OrderGold;
-	$MyXNineOld = $MyRow->OrderXNine;
-	$oldEventCode=$MyRow->MyEvent;
-}
-
-?>
\ No newline at end of file
diff --git a/src/TV/Rot_fin_t.php b/src/TV/Rot_fin_t.php
index 608be232..47779c0e 100644
--- a/src/TV/Rot_fin_t.php
+++ b/src/TV/Rot_fin_t.php
@@ -52,7 +52,6 @@
 	// opponents view with picture
 
 	// check the pictures
-	$fotow=min(200, intval($_SESSION['WINHEIGHT']/6)*4/3, intval($_SESSION['WINWIDTH']/7));
 	include_once('Common/CheckPictures.php');
 	CheckPictures($TourId);
 
@@ -122,7 +121,7 @@
 
 						$fot=$CFG->DOCUMENT_PATH.'TV/'.($fotina='Photos/'.$TourCode.'-En-'.$at['id'].'.jpg');
 						$tmpSx.= '<td><b>' . $name . '</b></td>';
-						$tmp4Sx.= '<td>'.(file_exists($fot) ? '<img class="athletephoto" src="'.$fotina.'" width="'.$fotow.'" alternate=""/>':'&nbsp;').'</td>';
+						$tmp4Sx.= '<td>'.(file_exists($fot) ? '<img class="athletephoto" src="'.$fotina.'" width="65%" alternate=""/>':'&nbsp;').'</td>';
 					} else {
 						$tmpSx.= '<td>&nbsp;</td>';
 						$tmp4Sx.= '<td>&nbsp;</td>';
@@ -134,7 +133,7 @@
 
 						$fot=$CFG->DOCUMENT_PATH.'TV/'.($fotina='Photos/'.$TourCode.'-En-'.$at['id'].'.jpg');
 						$tmpDx.= '<td><b>' . $name . '</b></td>';
-						$tmp4Dx.= '<td>'.(file_exists($fot) ? '<img class="athletephoto" src="'.$fotina.'" width="'.$fotow.'" alternate=""/>':'&nbsp;').'</td>';
+						$tmp4Dx.= '<td>'.(file_exists($fot) ? '<img class="athletephoto" src="'.$fotina.'" width="65%" alternate=""/>':'&nbsp;').'</td>';
 					} else {
 						$tmpDx.= '<td>&nbsp;</td>';
 						$tmp4Dx.= '<td>&nbsp;</td>';
diff --git a/src/TV/Rot_list_foto.php b/src/TV/Rot_list_foto.php
index 03fefc96..e9a4ec1b 100644
--- a/src/TV/Rot_list_foto.php
+++ b/src/TV/Rot_list_foto.php
@@ -33,7 +33,6 @@
 
 $Ath4Target=0;
 
-//$fotow=min(200,intval($_SESSION['WINHEIGHT']/6)*4/3); // redefined later
 include_once('Common/CheckPictures.php');
 CheckPictures($TourCode);
 
@@ -75,7 +74,7 @@
 		$ses=GetSessions('Q',true,$MyRow->Session.'_Q', $TourId);
 		$Ath4Target=$ses[0]->SesAth4Target;
 
-		$fotow=min(200,intval($_SESSION['WINWIDTH']/$Ath4Target));
+		$fotow=($Ath4Target <=2 ? 30 : ($Ath4Target == 3 ? 50 : 75));
 
 		// crea l'header della gara
 		$tmp = '';
@@ -121,7 +120,11 @@
 
 	// recupera se si tratta di A, B, eccetera
 	$Num=substr($MyRow->TargetNo,-1);
-	$tab[0][$Num] = '<img class="athletephoto" src="Photos/'.$TourCode.'-En-'.$MyRow->EnId.'.jpg" width="'.$fotow.'" alternate=""/>';
+    $Photo='';
+    if(is_file(__DIR__.'/'.($pic="Photos/{$TourCode}-En-{$MyRow->EnId}.jpg"))) {
+        $Photo='<img class="athletephoto" src="'.$pic.'" width="'.$fotow.'" alternate=""/>';
+    }
+	$tab[0][$Num] = $Photo;
 	$tab[1][$Num] = $MyRow->TargetNo . '&nbsp;&nbsp;' . $MyRow->DivCode . '&nbsp;&nbsp;' . $MyRow->ClassCode;
 	$tab[2][$Num] = $MyRow->FirstName . ' ' . ($TVsettings->TVPNameComplete==0 ? FirstLetters($MyRow->Name) : $MyRow->Name);
 	$tab[3][$Num] = $MyRow->NationCode . ' ' . ($TVsettings->TVPViewNationName==1 ? ($MyRow->Nation) : '');
diff --git a/src/TV/TVscriptlight.js b/src/TV/TVscriptlight.js
index 6a06a643..ae304a88 100644
--- a/src/TV/TVscriptlight.js
+++ b/src/TV/TVscriptlight.js
@@ -54,10 +54,13 @@ function init() {
 }
 
 function start_scroll() {
-	if(TimeCounter-- > 0) return;
+	if(TimeCounter-- > 0) {
+		return;
+	}
 	StartingPoint = StartingPoint + PixelScroll;
 	if(StartingPoint>altezza) {
 		// reload page
+		TimeCounter=TimeToWait;
 		window.location.assign(NextRule);
 		StartingPoint=0;
 	}
diff --git a/src/TV/index.php b/src/TV/index.php
index 7c9923bb..366513d3 100644
--- a/src/TV/index.php
+++ b/src/TV/index.php
@@ -23,6 +23,7 @@
 		}
 		$q=safe_r_sql("select * from TVContents where TVCTournament={$ToId} and TVCId in (".implode(',', $SeqIds).")");
 		while($r=safe_fetch($q)) {
+            $r->TVCContent=base64_encode($r->TVCContent);
 			$JSON['content'][]=$r;
 		}
 		if($JSON) {
@@ -83,8 +84,12 @@
 			// check the sequence ID
 			$q=safe_r_sql("select max(TVCId) as MaxId from TVContents where TVCTournament=$TourId");
 			$r=safe_fetch($q);
-			if($r->MaxId) $StartParam=$r->MaxId+1;
+			if($r->MaxId) {
+                $StartParam=$r->MaxId+1;
+            }
+            $Recreate=false;
 			foreach($JSON->content as $r) {
+                $Recreate=true;
 				$r->TVCTournament=$TourId;
 				if(empty($ContentIds['MM'][$r->TVCId])) {
 					$ContentIds['MM'][$r->TVCId]=$StartParam++;
@@ -92,11 +97,13 @@
 				$r->TVCId=$ContentIds['MM'][$r->TVCId];
 				$SQL=array();
 				foreach($r as $k=>$v) {
+                    if($k=='TVCContent') {
+                        $v=base64_decode($v);
+                    }
 					$SQL[]="$k=".StrSafe_DB($v);
 				}
 				safe_w_sql("insert into TVContents set ".implode(',', $SQL));
 			}
-
 			$StartSeq=1;
 			// check the sequence ID
 			$q=safe_r_sql("select max(TVSId) as MaxId from TVSequence where TVSTournament=$TourId");
@@ -118,6 +125,17 @@
 				safe_w_sql("insert into TVSequence set ".implode(',', $SQL));
 			}
 
+            if($Recreate) {
+                $q=safe_r_sql("select * from TVContents where TVCMimeType in ('image/gif','image/jpeg','image/png') and TVCTournament = $TourId");
+                while($r=safe_fetch($q)) {
+                    $ImName=$CFG->DOCUMENT_PATH.'TV/Photos/TV-'.$_SESSION['TourCodeSafe'].'-'.($r->TVCName=='IdCardFooter' ? $r->TVCName : $r->TVCId).'.jpg';
+                    if(!file_exists($ImName) or filemtime($ImName) < $r->TVCTimestamp) {
+                        if($im=imagecreatefromstring($r->TVCContent)) {
+                            imagejpeg($im, $ImName, 90);
+                        }
+                    }
+                }
+            }
 			cd_redirect();
 		}
 	}
diff --git a/src/Tournament/AccessControlList/UpdateFeature.php b/src/Tournament/AccessControlList/UpdateFeature.php
index 305758e4..962b23ad 100644
--- a/src/Tournament/AccessControlList/UpdateFeature.php
+++ b/src/Tournament/AccessControlList/UpdateFeature.php
@@ -5,57 +5,112 @@
     exit;
 
 $Json = array();
-if(!empty($_REQUEST["IP"]) AND $ip =checkValidIP($_REQUEST["IP"]) AND $ip!='127.0.0.1') {
+if(!empty($_REQUEST["IP"]) AND $_REQUEST["IP"]!='127.0.0.1') {
     $name = empty($_REQUEST["Name"]) ? "" : StrSafe_DB($_REQUEST["Name"],true);
-    $Sql = "INSERT INTO ACL (AclTournament, AclIP, AclNick, AclEnabled) VALUES (".StrSafe_DB($_SESSION['TourId']).",'{$ip}','{$name}',1) 
-      ON DUPLICATE KEY UPDATE AclNick='{$name}'";
-    $q = safe_w_SQL($Sql);
+    if(!empty($_REQUEST["isTemplate"])) {
+        $Sql = "INSERT INTO AclTemplates (AclTeTournament, AclTePattern, AclTeNick, AclTeEnabled) VALUES (" . StrSafe_DB($_SESSION['TourId']) . ",".StrSafe_DB($_REQUEST["IP"]).",'{$name}',1) 
+            ON DUPLICATE KEY UPDATE AclTeNick='{$name}'";
+        $q = safe_w_SQL($Sql);
+    } else if($ip = checkValidIP($_REQUEST["IP"])) {
+        $Sql = "INSERT INTO ACL (AclTournament, AclIP, AclNick, AclEnabled) VALUES (" . StrSafe_DB($_SESSION['TourId']) . ",'{$ip}','{$name}',1) 
+            ON DUPLICATE KEY UPDATE AclNick='{$name}'";
+        $q = safe_w_SQL($Sql);
+    }
 }
-if(!empty($_REQUEST["deleteIP"]) AND $ip = checkValidIP($_REQUEST["deleteIP"])) {
-    $Sql = "DELETE FROM AclDetails WHERE AclDtTournament=".StrSafe_DB($_SESSION['TourId'])." AND AclDtIP='{$ip}'";
-    $q = safe_w_SQL($Sql);
-    $Sql = "DELETE FROM ACL WHERE AclTournament=".StrSafe_DB($_SESSION['TourId'])." AND AclIP='{$ip}'";
-    $q = safe_w_SQL($Sql);
+if(!empty($_REQUEST["deleteIP"])) {
+    if(!empty($_REQUEST["isTemplate"])) {
+        $Sql = "DELETE FROM `AclTemplates`  WHERE `AclTeTournament`=" . StrSafe_DB($_SESSION['TourId']) . " AND `AclTePattern`=" . StrSafe_DB($_REQUEST["deleteIP"]);
+        $q = safe_w_SQL($Sql);
+    } else if($ip = checkValidIP($_REQUEST["deleteIP"])) {
+        $Sql = "DELETE FROM `AclDetails` WHERE `AclDtTournament`=" . StrSafe_DB($_SESSION['TourId']) . " AND `AclDtIP`='{$ip}'";
+        $q = safe_w_SQL($Sql);
+        $Sql = "DELETE FROM `ACL` WHERE `AclTournament`=" . StrSafe_DB($_SESSION['TourId']) . " AND `AclIP`='{$ip}'";
+        $q = safe_w_SQL($Sql);
+    }
 }
 
-if(isset($_REQUEST["featureIP"]) AND $ip = checkValidIP($_REQUEST["featureIP"]) AND isset($_REQUEST["levelID"]) AND preg_match("/^[0-2]{1}$/",$_REQUEST["levelID"])) {
+if(isset($_REQUEST["featureIP"]) AND isset($_REQUEST["levelID"]) AND preg_match("/^[0-2]{1}$/",$_REQUEST["levelID"])) {
     $level = intval($_REQUEST["levelID"]);
-    if($level == AclNoAccess OR (isStarIP($ip) AND $level>AclReadOnly)) {
-        $Sql = "DELETE FROM AclDetails WHERE AclDtTournament=".StrSafe_DB($_SESSION['TourId'])." AND AclDtIP='{$ip}'";
-        safe_w_SQL($Sql);
-    } else {
-        foreach ($listACL as $k=>$v) {
-            $lvl = (array_key_exists($k, $limitedACL) ?  ($limitedACL[$k]<=$level ? $limitedACL[$k] : 0) : $level);
-            $Sql = "INSERT INTO AclDetails (AclDtTournament, AclDtIP, AclDtFeature, AclDtLevel) 
+    if(!empty($_REQUEST["isTemplate"])) {
+        $tmpFeatures = array_fill(0,count($listACL),0);
+        if($level !== AclNoAccess) {
+            foreach ($listACL as $k=>$v) {
+                $tmpFeatures[$k] = (array_key_exists($k, $limitedACL) ?  ($limitedACL[$k]<=$level ? $limitedACL[$k] : 0) : $level);
+            }
+        }
+        $tmpToSave = array();
+        foreach ($tmpFeatures as $k=>$f) {
+            if($f) {
+                $tmpToSave[] = $k.'|0|'.$f;
+            }
+        }
+        safe_w_SQL("UPDATE `AclTemplates` SET `AclTeFeatures`='".implode('#',$tmpToSave)."' WHERE `AclTeTournament`=" . StrSafe_DB($_SESSION['TourId']) . " AND `AclTePattern`=" . StrSafe_DB($_REQUEST["featureIP"]));
+    } else if($ip = checkValidIP($_REQUEST["featureIP"])) {
+        if($level == AclNoAccess OR (isStarIP($ip) AND $level>AclReadOnly)) {
+            $Sql = "DELETE FROM AclDetails WHERE AclDtTournament=".StrSafe_DB($_SESSION['TourId'])." AND AclDtIP='{$ip}'";
+            safe_w_SQL($Sql);
+        } else {
+            foreach ($listACL as $k=>$v) {
+                $lvl = (array_key_exists($k, $limitedACL) ?  ($limitedACL[$k]<=$level ? $limitedACL[$k] : 0) : $level);
+                $Sql = "INSERT INTO AclDetails (AclDtTournament, AclDtIP, AclDtFeature, AclDtLevel) 
               VALUES (".StrSafe_DB($_SESSION['TourId']).", '{$ip}', {$k}, {$lvl}) 
               ON DUPLICATE KEY UPDATE AclDtLevel={$lvl}";
-            safe_w_SQL($Sql);
+                safe_w_SQL($Sql);
+            }
         }
     }
 }
 
-if(isset($_REQUEST["featureIP"]) AND $ip = checkValidIP($_REQUEST["featureIP"]) AND isset($_REQUEST["featureID"]) AND preg_match("/^[0-9]+$/",$_REQUEST["featureID"]) AND ($feature = intval($_REQUEST["featureID"]))<count($listACL)) {
-    $lvl = 0;
-    $Sql = "SELECT AclDtLevel FROM AclDetails WHERE AclDtTournament=".StrSafe_DB($_SESSION['TourId'])." AND AclDtIP='{$ip}' && AclDtFeature={$feature}";
-    $q=safe_r_SQL($Sql);
-    if($r=safe_fetch($q)) {
-        $lvl = $r->AclDtLevel;
-    }
-    if($lvl++ == 2 OR (array_key_exists($feature, $limitedACL) AND $lvl > $limitedACL[$feature]) OR (isStarIP($ip) AND $lvl!=AclReadOnly)) {
-        $Sql = "DELETE FROM AclDetails WHERE AclDtTournament=".StrSafe_DB($_SESSION['TourId'])." AND AclDtIP='{$ip}' && AclDtFeature={$feature}";
-    } else {
-        if(array_key_exists($feature, $limitedACL)) {
-            $lvl = $limitedACL[$feature];
+if(isset($_REQUEST["featureIP"]) AND  isset($_REQUEST["featureID"]) AND preg_match("/^[0-9]+$/",$_REQUEST["featureID"]) AND ($feature = intval($_REQUEST["featureID"]))<count($listACL)) {
+    if(!empty($_REQUEST["isTemplate"])) {
+        $tmpFeatures = array_fill(0,count($listACL),0);
+        $Sql = "SELECT `AclTeFeatures` FROM `AclTemplates` WHERE `AclTeTournament`=" . StrSafe_DB($_SESSION['TourId']) . " AND `AclTePattern`=" . StrSafe_DB($_REQUEST["featureIP"]);
+        $q = safe_r_SQL($Sql);
+        if ($r = safe_fetch($q)) {
+            if ($r->AclTeFeatures) {
+                foreach (explode('#', $r->AclTeFeatures) as $ft) {
+                    $tmp = explode("|", $ft);
+                    $tmpFeatures[$tmp[0]] = intval($tmp[2]);
+                }
+            }
+            if ($tmpFeatures[$feature]++ == 2 or (array_key_exists($feature, $limitedACL) and $tmpFeatures[$feature] > $limitedACL[$feature])) {
+                $tmpFeatures[$feature] = 0;
+            } else {
+                if (array_key_exists($feature, $limitedACL)) {
+                    $tmpFeatures[$feature] = $limitedACL[$feature];
+                }
+            }
+            $tmpToSave = array();
+            foreach ($tmpFeatures as $k=>$f) {
+                if($f) {
+                    $tmpToSave[] = $k.'|0|'.$f;
+                }
+            }
+            safe_w_SQL("UPDATE `AclTemplates` SET `AclTeFeatures`='".implode('#',$tmpToSave)."' WHERE `AclTeTournament`=" . StrSafe_DB($_SESSION['TourId']) . " AND `AclTePattern`=" . StrSafe_DB($_REQUEST["featureIP"]));
         }
-        $Sql = "INSERT INTO AclDetails (AclDtTournament, AclDtIP, AclDtFeature, AclDtLevel) 
-          VALUES (".StrSafe_DB($_SESSION['TourId']).", '{$ip}', {$feature}, {$lvl}) 
+    } else if($ip = checkValidIP($_REQUEST["featureIP"])) {
+        $lvl = 0;
+        $Sql = "SELECT AclDtLevel FROM AclDetails WHERE AclDtTournament=" . StrSafe_DB($_SESSION['TourId']) . " AND AclDtIP='{$ip}' && AclDtFeature={$feature}";
+        $q = safe_r_SQL($Sql);
+        if ($r = safe_fetch($q)) {
+            $lvl = $r->AclDtLevel;
+        }
+        if ($lvl++ == 2 or (array_key_exists($feature, $limitedACL) and $lvl > $limitedACL[$feature]) or (isStarIP($ip) and $lvl != AclReadOnly)) {
+            $Sql = "DELETE FROM AclDetails WHERE AclDtTournament=" . StrSafe_DB($_SESSION['TourId']) . " AND AclDtIP='{$ip}' && AclDtFeature={$feature}";
+        } else {
+            if (array_key_exists($feature, $limitedACL)) {
+                $lvl = $limitedACL[$feature];
+            }
+            $Sql = "INSERT INTO AclDetails (AclDtTournament, AclDtIP, AclDtFeature, AclDtLevel) 
+          VALUES (" . StrSafe_DB($_SESSION['TourId']) . ", '{$ip}', {$feature}, {$lvl}) 
           ON DUPLICATE KEY UPDATE AclDtLevel={$lvl}";
+        }
+        $q = safe_w_SQL($Sql);
     }
-    $q = safe_w_SQL($Sql);
 }
 
 if(!empty($_REQUEST['export'])) {
-	$Export=array('ACL' => array(), 'AclDetails' => array());
+	$Export=array('ACL' => array(), 'AclDetails' => array(), 'AclTemplates' => array());
 	$q=safe_r_sql("select * from ACL where AclTournament={$_SESSION['TourId']}");
 	while($r=safe_fetch($q)) {
 		$Export['ACL'][]=$r;
@@ -64,7 +119,10 @@
 	while($r=safe_fetch($q)) {
 		$Export['AclDetails'][]=$r;
 	}
-
+    $q=safe_r_sql("select * from AclTemplates where AclTeTournament={$_SESSION['TourId']}");
+    while($r=safe_fetch($q)) {
+        $Export['AclTemplates'][]=$r;
+    }
 	// We'll be outputting a gzipped TExt File in UTF-8 pretending it's binary
 	header('Content-type: application/octet-stream');
 	header("Content-Disposition: attachment; filename=\"{$_SESSION['TourCode']}-ACL.ianseo\"");
@@ -78,7 +136,7 @@
     $Json['AclEnable'] = substr($lockEnabled,0,1);
     $Json['AclRecord'] = substr($lockEnabled,1,1);
 } else {
-    $Sql = "SELECT AclIP, AclNick, GROUP_CONCAT(CONCAT_WS('|',AclDtFeature,AclDtLevel) separator '#') as Features
+    $Sql = "SELECT AclIP, AclNick, GROUP_CONCAT(CONCAT_WS('|',AclDtFeature,AclDtSubFeature,AclDtLevel) separator '#') as Features
       FROM ACL
       LEFT JOIN  AclDetails ON AclTournament=AclDtTournament AND AclIP=AclDtIP
       WHERE AclTournament=" . StrSafe_DB($_SESSION['TourId']) . "
@@ -87,11 +145,13 @@
     $q = safe_r_SQL($Sql);
     $tmpIP = array();
     while ($r = safe_fetch($q)) {
-        $tmpFeatures = array();
+        $tmpFeatures = array_fill(0,count($listACL),0);
         if ($r->Features) {
             foreach (explode('#', $r->Features) as $ft) {
                 $tmp = explode("|", $ft);
-                $tmpFeatures[$tmp[0]] = intval($tmp[1]);
+                if($tmp[0]<count($listACL)) {
+                    $tmpFeatures[$tmp[0]] = intval($tmp[2]);
+                }
             }
         }
         $tmpIP[$r->AclIP] = array("Ip" => $r->AclIP, "Name" => $r->AclNick, "Value"=>addslashes($r->AclNick), "Opt" => $tmpFeatures);
@@ -99,7 +159,30 @@
     $tmpSort=array_keys($tmpIP);
     natsort($tmpSort);
     foreach ($tmpSort as $vSort) {
-        $Json[] = $tmpIP[$vSort];
+        $Json['AclList'][] = $tmpIP[$vSort];
+    }
+    $Sql = "SELECT AclTePattern, AclTeNick, AclTeFeatures as Features
+      FROM AclTemplates
+      WHERE AclTeTournament=" . StrSafe_DB($_SESSION['TourId']) . "
+      ORDER BY AclTePattern";
+    $q = safe_r_SQL($Sql);
+    $tmpIP = array();
+    while ($r = safe_fetch($q)) {
+        $tmpFeatures = array_fill(0,count($listACL),0);
+        if ($r->Features) {
+            foreach (explode('#', $r->Features) as $ft) {
+                $tmp = explode("|", $ft);
+                if($tmp[0]<count($listACL)) {
+                    $tmpFeatures[$tmp[0]] = intval($tmp[2]);
+                }
+            }
+        }
+        $tmpIP[$r->AclTePattern] = array("Ip" => $r->AclTePattern, "Name" => $r->AclTeNick, "Value"=>addslashes($r->AclTePattern), "Opt" => $tmpFeatures);
+    }
+    $tmpSort=array_keys($tmpIP);
+    natsort($tmpSort);
+    foreach ($tmpSort as $vSort) {
+        $Json['AclTemplates'][] = $tmpIP[$vSort];
     }
 
 }
diff --git a/src/Tournament/AccessControlList/index.js b/src/Tournament/AccessControlList/index.js
index 3c48fcab..64426e6e 100644
--- a/src/Tournament/AccessControlList/index.js
+++ b/src/Tournament/AccessControlList/index.js
@@ -7,30 +7,44 @@ function ActivateACL() {
 
 function createList(JsonData) {
     $("#ipList").empty();
-    $.each( JsonData, function( i, item ) {
-        trHTML = '<tr id="row_'+i+'" ip="'+item.Ip+'" class="rowHover">' +
+    $.each( JsonData.AclList, function( i, item ) {
+        trHTML = '<tr id="row_0_'+i+'" ip="'+item.Ip+'" class="rowHover">' +
             '<td class="Center">' +
-                '<input type="button" onclick="deleteIp(\''+item.Ip+'\');" value="'+CmdDelete+'"><br>' +
-                '<img src="'+RootDir+'Common/Images/ACL0.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'0\')">'+
-                '<img src="'+RootDir+'Common/Images/ACL1.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'1\')">'+
-                '<img src="'+RootDir+'Common/Images/ACL2.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'2\')">'+
+                '<input type="button" onclick="deleteIp(\''+encodeURI(item.Ip)+'\',0);" value="'+CmdDelete+'"><br>' +
+                '<img src="'+RootDir+'Common/Images/ACL0.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'0\',0)">'+
+                '<img src="'+RootDir+'Common/Images/ACL1.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'1\',0)">'+
+                '<img src="'+RootDir+'Common/Images/ACL2.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'2\',0)">'+
             '</td>' +
-            '<td class="aclIP" onclick="copyDetails(\''+item.Ip+'\',\''+item.Name+'\')">'+item.Ip+'</td>' +
-            '<td onclick="copyDetails(\''+item.Ip+'\',\''+item.Value+'\')">'+item.Name+'</td>';
-        for(var j=0; j<optNo; j++) {
-            if(item.Opt[j]===undefined) {
-                item.Opt[j] = 0
-            }
-            trHTML += '<td class="Center"><img class="ClickableDiv" style="margin: 5px;" id="opt_'+i+'_'+j+'" src="'+RootDir+'Common/Images/ACL'+item.Opt[j]+'.png" onclick="changeFeature('+i+','+j+')"></td>';
+            '<td class="aclIP" onclick="copyDetails(\''+item.Ip+'\',\''+item.Value+'\',0)">'+item.Ip+'</td>' +
+            '<td onclick="copyDetails(\''+item.Ip+'\',\''+item.Value+'\',0)">'+item.Name+'</td>';
+        for(var j=0; j<item.Opt.length; j++) {
+            trHTML += '<td class="Center"><img class="ClickableDiv" style="margin: 5px;" id="opt_'+i+'_'+j+'" src="'+RootDir+'Common/Images/ACL'+item.Opt[j]+'.png" onclick="changeFeature('+i+','+j+',0)"></td>';
         }
         trHTML += '</tr>';
         $('#ipList').append(trHTML);
     });
+    //Templates
+    $("#ipTemplateList").empty();
+    $.each( JsonData.AclTemplates, function( i, item ) {
+        trHTML = '<tr id="row_1_'+i+'" ip="'+item.Ip+'" class="rowHover">' +
+            '<td class="Center">' +
+            '<input type="button" onclick="deleteIp(\''+encodeURI(item.Ip)+'\',1);" value="'+CmdDelete+'"><br>' +
+            '<img src="'+RootDir+'Common/Images/ACL0.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'0\',1)">'+
+            '<img src="'+RootDir+'Common/Images/ACL1.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'1\',1)">'+
+            '<img src="'+RootDir+'Common/Images/ACL2.png" style="height: 12px; margin: 7px 2px 5px ;" onclick="changeAll('+i+',\'2\',1)">'+
+            '</td>' +
+            '<td colspan="2" style="white-space: nowrap;" onclick="copyDetails(\''+item.Value+'\',\''+item.Name+'\',1)"><span class="bold">'+item.Ip+'</span><br>'+item.Name+'</td>';
+        for(var j=0; j<item.Opt.length; j++) {
+            trHTML += '<td class="Center"><img class="ClickableDiv" style="margin: 2px;" id="opt_'+i+'_'+j+'" src="'+RootDir+'Common/Images/ACL'+item.Opt[j]+'.png" size="50%" onclick="changeFeature('+i+','+j+',1)"></td>';
+        }
+        trHTML += '</tr>';
+        $('#ipTemplateList').append(trHTML);
+    });
 }
 
-function copyDetails(ip,nick) {
-    $('#newIP').val(ip);
-    $('#newNick').val(nick);
+function copyDetails(ip,nick,isTemplate) {
+    $((isTemplate ? '#newTemplatePattern' : '#newIP')).val(ip);
+    $((isTemplate ? '#newTemplateNick' : '#newNick')).val(nick);
 }
 
 function updateList() {
@@ -39,36 +53,36 @@ function updateList() {
     });
 }
 
-function deleteIp(Ip) {
+function deleteIp(Ip,isTemplate) {
     if(confirm(AreYouSure)) {
-        $.getJSON('UpdateFeature.php?deleteIP=' +Ip, function (data) {
+        $.getJSON('UpdateFeature.php?deleteIP='+Ip+"&isTemplate="+isTemplate, function (data) {
             createList(data);
         });
     }
 }
 
-function saveIp() {
-    $.getJSON('UpdateFeature.php?IP='+$('#newIP').val()+"&Name="+$('#newNick').val(), function(data) {
-        copyDetails('','');
+function saveIp(isTemplate) {
+    $.getJSON('UpdateFeature.php?IP='+$((isTemplate ? '#newTemplatePattern' : '#newIP')).val()+"&Name="+$((isTemplate ? '#newTemplateNick' : '#newNick')).val()+"&isTemplate="+isTemplate, function(data) {
+        copyDetails('','',isTemplate);
         createList(data);
     });
 }
 
-function changeFeature(id, feature) {
-    var ChangeIp = $('#row_'+id).attr('ip');
-    $.getJSON('UpdateFeature.php?featureIP='+ChangeIp+"&featureID="+feature, function(data) {
-        if(data[id].Ip==ChangeIp) {
-            $('#opt_'+id+'_'+feature).attr('src',RootDir+'Common/Images/ACL'+(data[id].Opt[feature]===undefined ? '0' : data[id].Opt[feature])+'.png');
+function changeFeature(id, feature, isTemplate) {
+    var ChangeIp = $('#row_'+isTemplate+'_'+id).attr('ip');
+    $.getJSON('UpdateFeature.php?featureIP='+ChangeIp+"&featureID="+feature+"&isTemplate="+isTemplate, function(data) {
+        if(data.AclList[id].Ip==ChangeIp) {
+            $('#opt_'+id+'_'+feature).attr('src',RootDir+'Common/Images/ACL'+(data.AclList[id].Opt[feature]===undefined ? '0' : data.AclList[id].Opt[feature])+'.png');
         } else {
             createList(data);
         }
     });
 }
 
-function changeAll(id, level) {
+function changeAll(id, level, isTemplate) {
     if(confirm(AreYouSure)) {
-        var ChangeIp = $('#row_' + id).attr('ip');
-        $.getJSON('UpdateFeature.php?featureIP=' + ChangeIp + "&levelID=" + level, function (data) {
+        var ChangeIp = $('#row_'+isTemplate+'_'+id).attr('ip');
+        $.getJSON('UpdateFeature.php?featureIP=' + ChangeIp + "&levelID=" + level+"&isTemplate="+isTemplate, function (data) {
             createList(data);
         });
     }
diff --git a/src/Tournament/AccessControlList/index.php b/src/Tournament/AccessControlList/index.php
index d836b550..bc2b5508 100644
--- a/src/Tournament/AccessControlList/index.php
+++ b/src/Tournament/AccessControlList/index.php
@@ -24,6 +24,14 @@
 			}
 			safe_w_sql('insert into AclDetails set '.implode(',', $SQL). ' ON DUPLICATE KEY UPDATE '.implode(',', $SQL));
 		}
+        foreach($Import['AclTemplates'] as $row) {
+            $row->AclTeTournament=$_SESSION['TourId'];
+            $SQL=array();
+            foreach($row as $k => $v) {
+                $SQL[]="$k=".StrSafe_DB($v);
+            }
+            safe_w_sql('insert into AclTemplates set '.implode(',', $SQL). ' ON DUPLICATE KEY UPDATE '.implode(',', $SQL));
+        }
 	}
 	unlink($_FILES['importACL']['tmp_name']);
 	CD_redirect('./');
@@ -33,7 +41,6 @@
 $IncludeJquery = true;
 $JS_SCRIPT = array(
     phpVars2js(array(
-        'optNo' => count($listACL),
         'RootDir' => $CFG->ROOT_DIR,
         'CmdDelete' => get_text('CmdDelete', 'Tournament'),
         'AreYouSure' => get_text('MsgAreYouSure')
@@ -45,8 +52,7 @@
 
 include('Common/Templates/head.php');
 
-echo '<div class="Center">
-    <table class="Tabella">';
+echo '<table class="Tabella">';
 echo '<tr><th class="Title" colspan="'.(3+count($listACL)).'">'.get_text('Block_Manage','Tournament').'</th></tr>';
 echo '<tr><th colspan="3">'.get_text('EnableAccess','Tournament').'</th><td colspan="'.count($listACL).'">
     <select onchange="ActivateACL()" id="AclEnable">
@@ -72,15 +78,15 @@
 
 echo '<tr>
     <th class="Title">&nbsp;</th>
-    <th class="Title">'.get_text('Block_IP','Tournament').'</th>
-    <th class="Title">'.get_text('Block_Nick','Tournament').'</th>';
+    <th class="Title"><div class="small">'.get_text('Block_IP','Tournament').'</div></th>
+    <th class="Title"><div class="small">'.get_text('Block_Nick','Tournament').'</div></th>';
 foreach($listACL as $i => $n) {
-    echo '<th class="Title">'.get_text($n, 'Tournament').'</th>';
+    echo '<th class="Title"><div class="small">'.get_text($n, 'Tournament').'</div></th>';
 }
 echo '</tr>';
 
 echo '<tr>';
-echo '<td class="Center"><input type="button" onclick="saveIp();" value="' . get_text('CmdSave') . '"></td>';
+echo '<td class="Center"><input type="button" onclick="saveIp(0);" value="' . get_text('CmdSave') . '"></td>';
 echo '<td><input type="text" id="newIP" value=""></td>';
 echo '<td><input type="text" id="newNick" value=""></td>';
 echo '<td colspan="'.count($listACL).'">&nbsp;</td>';
@@ -89,14 +95,28 @@
 
 echo '<tbody id="ipList"></tbody>';
 echo '<tr><td class="divider" colspan="'.(3+count($listACL)).'"></td></tr>';
+echo '<tr><th class="Title small" colspan="'.(3+count($listACL)).'">'.get_text('Block_TemplateIP','Tournament').'</th></tr>';
+echo '<tr>
+    <th>&nbsp;</th>
+    <th colspan="2">'.get_text('Block_TemplatePattern','Tournament').'</th>';
+foreach($listACL as $i => $n) {
+    echo '<th>'.get_text($n, 'Tournament').'</th>';
+}
+echo '</tr>';
+echo '<tr>';
+echo '<td class="Center"><input type="button" onclick="saveIp(1);" value="' . get_text('CmdSave') . '"></td>';
+echo '<td colspan="2"><input class="w-100" type="text" id="newTemplatePattern" value=""></td>';
+echo '<td colspan="'.count($listACL).'">'.get_text('Block_TemplateName','Tournament').'<input class="w-50 ml-3" type="text" id="newTemplateNick" value=""></td>';
+echo '</tr>';
+echo '<tbody id="ipTemplateList"></tbody>';
+echo '<tr><td class="divider" colspan="'.(3+count($listACL)).'"></td></tr>';
 echo '<tr><td colspan="'.(3+count($listACL)).'">
     <img src="'.$CFG->ROOT_DIR.'Common/Images/ACL0.png" style="vertical-align: middle; margin: 5px;">'. get_text('ACLNoAccess','Tournament') . '<br>
     <img src="'.$CFG->ROOT_DIR.'Common/Images/ACL1.png" style="vertical-align: middle; margin: 5px;">'. get_text('ACLReadOnly','Tournament') . '<br>
     <img src="'.$CFG->ROOT_DIR.'Common/Images/ACL2.png" style="vertical-align: middle; margin: 5px;">'. get_text('ACLReadWrite','Tournament') . '
     </td></tr>';
 echo '<tr><td colspan="'.(3+count($listACL)).'">'.get_text('AclNotes','Tournament', getMyScheme() . '://localhost' . ($_SERVER['SERVER_PORT']!=80 ? $port=':'.$_SERVER['SERVER_PORT'] : '') . $CFG->ROOT_DIR . '?ACLReset=' . $_SESSION["TourCode"]) .'</td></tr>';
-echo '</table>
-    </div>';
+echo '</table>';
 echo '<script>updateList();</script>';
 
 include('Common/Templates/tail.php');
diff --git a/src/Tournament/AddCl.php b/src/Tournament/AddCl.php
index 4847c99b..16cbfe96 100644
--- a/src/Tournament/AddCl.php
+++ b/src/Tournament/AddCl.php
@@ -6,8 +6,9 @@
 require_once('Tournament/Fun_Tournament.local.inc.php');
 checkACL(AclCompetition, AclReadWrite, false);
 
-$JSON=array('error'=>1, 'errormsg'=>'');
+$JSON=array('error'=>1, 'errormsg'=>get_text('MissingData','Errors'));
 if (!CheckTourSession() ||
+        checkACL(AclCompetition, AclReadWrite, false)!=AclReadWrite ||
 		empty($_REQUEST['New_ClId']) ||
 		!isset($_REQUEST['New_ClSex']) ||
 		empty($_REQUEST['New_ClDescription']) ||
@@ -22,13 +23,17 @@
 	JsonOut($JSON);
 }
 
+if (preg_match('/[^a-z0-9]/i', $_REQUEST['New_ClId'])) {
+    $JSON['errormsg']=get_text('InvalidCharacters','Errors', '<span class="text-danger">a-z A-Z 0-9</span>');
+	JsonOut($JSON);
+}
+
 if (!is_numeric($_REQUEST['New_ClAgeFrom']) || !is_numeric($_REQUEST['New_ClAgeTo']) ||
 	$_REQUEST['New_ClAgeFrom']<=0 || $_REQUEST['New_ClAgeTo']<=0 || $_REQUEST['New_ClAgeFrom']>$_REQUEST['New_ClAgeTo']) {
 	$JSON['errormsg']=get_text('ClassFromToError', 'Errors');
 	JsonOut($JSON);
 }
 
-$JSON['error']=0;
 
 $ValidClass=CreateValidClass($_REQUEST['New_ClId'],$_REQUEST['New_ClValidClass']);
 
@@ -51,9 +56,11 @@
 
 if (!safe_w_affected_rows()) {
 	$JSON['errormsg']=get_text('DuplicateEntry','Tournament');
-	$JSON['error']=2;
+    JsonOut($JSON);
 }
 
+$JSON['error']=0;
+
 $JSON['clid']= $_REQUEST['New_ClId'];
 $JSON['cldescr']= $_REQUEST['New_ClDescription'];
 $JSON['clathlete']= $_REQUEST['New_ClAthlete'];
diff --git a/src/Tournament/AddDiv.php b/src/Tournament/AddDiv.php
index a27e3c7a..dcbab788 100644
--- a/src/Tournament/AddDiv.php
+++ b/src/Tournament/AddDiv.php
@@ -5,7 +5,7 @@
 require_once('Common/Fun_FormatText.inc.php');
 require_once('Tournament/Fun_Tournament.local.inc.php');
 
-$JSON=array('error' => 1);
+$JSON=array('error' => 1, 'errormsg'=>get_text('MissingData','Errors'));
 
 if(checkACL(AclCompetition, AclReadWrite, false)!=AclReadWrite
 		or !CheckTourSession()
@@ -18,6 +18,11 @@
 	JsonOut($JSON);
 }
 
+if(preg_match('/[^a-z0-9]/i', $_REQUEST['New_DivId'])) {
+    $JSON['errormsg']=get_text('InvalidCharacters','Errors', '<span class="text-danger">a-z A-Z 0-9</span>');
+    JsonOut($JSON);
+}
+
 $IsAthlete=empty($_REQUEST['New_DivAthlete']) ? 0 : 1;
 $IsPara=empty($_REQUEST['New_DivIsPara']) ? 0 : 1;
 
diff --git a/src/Tournament/AddSubCl.php b/src/Tournament/AddSubCl.php
index 16963327..abf46d20 100644
--- a/src/Tournament/AddSubCl.php
+++ b/src/Tournament/AddSubCl.php
@@ -6,7 +6,7 @@
 require_once('Tournament/Fun_Tournament.local.inc.php');
 checkACL(AclCompetition, AclReadWrite, false);
 
-$JSON=array('error' => 1);
+$JSON=array('error' => 1, 'errormsg'=>get_text('MissingData','Errors'));
 
 if (!CheckTourSession() ||
 		empty($_REQUEST['New_ScId']) ||
@@ -17,7 +17,10 @@
 	JsonOut($JSON);
 }
 
-$JSON['error']=0;
+if (preg_match('/[^a-z0-9]/i', $_REQUEST['New_ScId'])) {
+    $JSON['errormsg']=get_text('InvalidCharacters','Errors', '<span class="text-danger">a-z A-Z 0-9</span>');
+    JsonOut($JSON);
+}
 
 $Insert
 	= "INSERT ignore INTO SubClass (ScId,ScTournament,ScDescription,ScViewOrder) "
@@ -31,9 +34,11 @@
 
 if (!safe_w_affected_rows()) {
 	$JSON['errormsg']=get_text('DuplicateEntry','Tournament');
-	$JSON['error']=2;
+    JsonOut($JSON);
 }
 
+$JSON['error']=0;
+
 $JSON['scid'] =  $_REQUEST['New_ScId'];
 $JSON['scdescr'] = $_REQUEST['New_ScDescription'];
 $JSON['scprogr'] =  intval($_REQUEST['New_ScViewOrder']) ;
diff --git a/src/Tournament/CodeRequest.php b/src/Tournament/CodeRequest.php
index ac94bc6b..9b3a4079 100644
--- a/src/Tournament/CodeRequest.php
+++ b/src/Tournament/CodeRequest.php
@@ -76,7 +76,7 @@
     <tr><td class="Right Bold">'.get_text('To','Tournament').'</td><td id="ToWhenTo">'.$MyRow->ToWhenTo.'</td></tr>';
 
 $Countries=get_Countries();
-echo '<tr><td class="Right Bold">'.get_text('Nation').'</td><td style="background-color:pink">';
+echo '<tr><td class="Right Bold">'.get_text('Natl-Nation','Tournament').'</td><td style="background-color:pink">';
 if($MyRow->ToCountry && !empty($Countries[$MyRow->ToCountry])) {
     echo '<input type="hidden" name="ToNation" id="ToNation" value="'.$MyRow->ToCountry.'">'.$MyRow->ToCountry.'-'.$Countries[$MyRow->ToCountry].'';
 } else {
diff --git a/src/Tournament/Countries.php b/src/Tournament/Countries.php
index 9001732b..e57fbee5 100644
--- a/src/Tournament/Countries.php
+++ b/src/Tournament/Countries.php
@@ -15,6 +15,7 @@
 if(isset($_REQUEST['Export'])) {
 	$q=safe_r_sql("select distinct FlCode, FlJPG
 		from Flags 
+		inner join Countries on CoCode=FlCode and CoTournament={$_SESSION['TourId']}
 		where FlTournament in (-1, {$_SESSION['TourId']})
 			and FlJPG!='' ");
 	if(!safe_num_rows($q)) {
@@ -23,7 +24,7 @@
 
 	$zip = new ZipArchive();
 	$filename = $tmpfname = tempnam("/tmp", $_SESSION['TourCodeSafe']);
-
+	unlink($filename);
 	if ($zip->open($filename, ZipArchive::CREATE)!==TRUE) {
 		exit("cannot open <$filename>\n");
 	}
@@ -45,11 +46,11 @@
 		if($ratio<1.5) {
 			// image is too squarish
 			$DestX=intval((90-(60*$ratio))/2);
-			$DestW=60*$ratio;
+			$DestW=intval(60*$ratio);
 		} elseif($ratio>1.5) {
 			// image is too long
 			$DestY=intval((60-(90/$ratio))/2);
-			$DestH=90/$ratio;
+			$DestH=intval(90/$ratio);
 		}
 
 		imagecopyresampled($img2, $img, $DestX, $DestY, 0, 0, $DestW, $DestH, imagesx($img), imagesy($img));
@@ -67,6 +68,7 @@
 	header('Content-Disposition: attachment; filename="'.$_SESSION['TourCodeSafe'].'.zip"');
 	readfile($filename);
 	unlink($filename);
+	die();
 }
 
 if($_FILES) {
diff --git a/src/Tournament/DeleteManDivClassField.php b/src/Tournament/DeleteManDivClassField.php
index 01d8e2cb..c96895d6 100644
--- a/src/Tournament/DeleteManDivClassField.php
+++ b/src/Tournament/DeleteManDivClassField.php
@@ -43,7 +43,7 @@
 $Rs=safe_w_sql($Delete);
 
 $JSON['which']=$Arr_Tables[$_REQUEST['Tab']][3].$_REQUEST['Id'];
-$JSON['error']=0;
+$JSON['error']=safe_w_affected_rows()==0 ? 1 : 0;
 $JSON['tab']=$_REQUEST['Tab'];
 
 JsonOut($JSON);
diff --git a/src/Tournament/FinalReport/PDFReport.php b/src/Tournament/FinalReport/PDFReport.php
index a5973546..2aa95146 100644
--- a/src/Tournament/FinalReport/PDFReport.php
+++ b/src/Tournament/FinalReport/PDFReport.php
@@ -257,13 +257,13 @@
 						$pdf->Cell(10, 6,  $MyRow->FrqId . ".", 'LTB', 0, 'L', 0);
 						$pdf->Cell(50, 6,  $MyRow->FrqQuestion . ": ", 'BT', 0, 'L', 0);
 						$pdf->SetFont($pdf->FontStd,'B',8);
-						$pdf->Cell(115, 6,  $MyRow->FraAnswer , 'TRB', 1, 'L', 0);
+						$pdf->Cell(115, 6,  $MyRow->FraAnswer??'' , 'TRB', 1, 'L', 0);
 						break;
 					case 1:
 						$mcStartY = $pdf->GetY();
 						$pdf->SetX($pdf->GetX()+60);
 						$pdf->SetFont($pdf->FontStd,'B',8);
-						$pdf->MultiCell(115, 7,  $MyRow->FraAnswer , 'RTB', 'L', 0, 1);
+						$pdf->MultiCell(115, 7,  $MyRow->FraAnswer??'' , 'RTB', 'L', 0, 1);
 						$mcEndY = $pdf->GetY();
 						if($mcStartY>$mcEndY)
 						{
@@ -272,7 +272,7 @@
 						}
 						$pdf->SetY($mcStartY);
 						$pdf->SetFont($pdf->FontStd,'',8);
-						$pdf->Cell(10, $mcEndY-$mcStartY,  $MyRow->FrqId . ".", 'LTB' . (strlen($MyRow->FraAnswer)>0 ? '' : 'B'), 0, 'L', 0);
+						$pdf->Cell(10, $mcEndY-$mcStartY,  $MyRow->FrqId . ".", 'LTB' . (strlen($MyRow->FraAnswer??'')>0 ? '' : 'B'), 0, 'L', 0);
 						$pdf->Cell(50, $mcEndY-$mcStartY,  $MyRow->FrqQuestion . ": ", 'TB', 1, 'L', 0);
 						break;
 					case 2:
@@ -287,14 +287,14 @@
 						$pdf->Cell(10, 6,  $MyRow->FrqId . ".", 'LTB', 0, 'L', 0);
 						$pdf->Cell(50, 6,  $MyRow->FrqQuestion . ": ", 'BT', 0, 'L', 0);
 						$pdf->SetFont($pdf->FontStd,'B',8);
-						$pdf->Cell(115, 6,  $MyRow->FraAnswer , 'TRB', 1, 'L', 0);
+						$pdf->Cell(115, 6,  $MyRow->FraAnswer??'' , 'TRB', 1, 'L', 0);
 						break;
 					case 4:
 						$pdf->SetFont($pdf->FontStd,'',8);
 						$pdf->Cell(10, 6,  $MyRow->FrqId . ".", 'LTB', 0, 'L', 0);
 						$pdf->Cell(50, 6,  $MyRow->FrqQuestion . ": ", 'BT', 0, 'L', 0);
 						$pdf->SetFont($pdf->FontStd,'B',8);
-						$pdf->Cell(115, 6,  str_replace("|",", ",$MyRow->FraAnswer) , 'TRB', 1, 'L', 0);
+						$pdf->Cell(115, 6,  str_replace("|",", ",$MyRow->FraAnswer??'') , 'TRB', 1, 'L', 0);
 						break;
 				}
 			}
diff --git a/src/Tournament/Fun_AJAX_ManDivClass.js b/src/Tournament/Fun_AJAX_ManDivClass.js
index 728cd2ce..4f82e488 100644
--- a/src/Tournament/Fun_AJAX_ManDivClass.js
+++ b/src/Tournament/Fun_AJAX_ManDivClass.js
@@ -1,247 +1,349 @@
+/**
+ * Creates the new Division if all criteria are met
+ */
+function AddDiv() {
+	$.each(['#New_DivId','#New_DivDescription'], function(iKey,item) {
+		$(item).toggleClass('error', $(item).val()=='')
+	});
+	if($('#New_DivId').val()=='' || $('#New_DivDescription').val()=='') {
+		showAlert(MsgRowMustBeComplete);
+		return;
+	}
 
-/*
-													- Fun_AJAX_ManDivClass.js -
-	Contiene le funzioni ajax usate da ManDivClass.php
-*/
-
-/*
-	- UpdateField(Tab, Field)
-	sends data to UpdateManDivClassField.php.
-	Tab è la tabella usata per l'update
-	Field è l'id del campo da usare
-*/
-function UpdateField(Tab, Field) {
-	$.getJSON('UpdateManDivClassField.php?Tab=' + Tab + '&Field=' + Field + '&Value=' + encodeURIComponent($('#'+Field).val()), function(data) {
-		if(data.error==1) {
-			if(data.which!='#') {
-				SetStyle(data.which,'error');
-			}
-		} else {
-			if(data.which!='#') {
-				SetStyle(data.which,'');
+	if($('#New_DivId').val().match(/[^a-z0-9]/i)) {
+		$('#New_DivId').addClass('error');
+		showAlert(MsgInvalidCharacters);
+		return;
+	}
+
+	let form={
+		'New_DivId':$('#New_DivId').val(),
+		'New_DivDescription':$('#New_DivDescription').val(),
+		'New_DivIsPara':$('#New_DivIsPara').val(),
+		'New_DivAthlete':$('#New_DivAthlete').val(),
+		'New_DivViewOrder':$('#New_DivViewOrder').val(),
+	}
+	if(form.New_DivViewOrder=='' || parseInt(form.New_DivViewOrder)<=0) {
+		var order=0;
+		$('[ref="DivViewOrder"]').each(function() {
+			if(parseInt(this.value)>=order) {
+				order=parseInt(this.value)+1;
 			}
+		})
+		form.New_DivViewOrder=order;
+	}
+	$.getJSON('AddDiv.php', form,function(data) {
+		if(data.error!=0) {
+			showAlert(data.errormsg);
+			return;
 		}
+		$('#tbody_div').append('<tr id="Div_'+data.divid+'" ref="'+data.divid+'">' +
+			'<td class="Bold Center">'+data.divid+'</td>' +
+			'<td><input type="text" ref="DivDescription" class="w-100" maxlength="32" value="'+data.divdescr+'" onBlur="UpdateField(this)"></td>' +
+			'<td class="Center"><select ref="DivIsPara" class="w-100" onBlur="UpdateField(this)">' +
+			'<option value="0">'+data.no+'</option>' +
+			'<option value="1"'+(data.divpara==1 ? ' selected="selected"' : '')+'>'+data.yes+'</option>' +
+			'</select></td>' +
+			'<td class="Center"><select ref="DivAthlete"  class="w-100" onBlur="UpdateField(this)">' +
+			'<option value="0">'+data.no+'</option>' +
+			'<option value="1"'+(data.divathlete==1 ? ' selected="selected"' : '')+'>'+data.yes+'</option>' +
+			'</select></td>' +
+			'<td class="Center"><input type="number" ref="DivViewOrder" min="1" class="w-100" value="'+data.divprogr+'" onBlur="UpdateField(this)"></td>' +
+			'<td class="Center"><img src="../Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(this)"></td>' +
+			'</tr>');
+
+		reOrderRows('#tbody_div', 'DivViewOrder');
+
+		// resetto i dati nella riga di inserimento
+		$('#New_DivId').val('');
+		$('#New_DivIsPara').val('0');
+		$('#New_DivDescription').val('');
+		$('#New_DivAthlete').val('0');
+		$('#New_DivViewOrder').val('');
 	});
 }
 
-/*
-	- DeleteRow(Tab,Id,Msg)
-	esegue la post a DeleteManDivClassField.php.
-	Tab è la tabella usata per l'update
-	Id è il valore da eliminare
-	Msg è il messaggio di conferma
-*/
-function DeleteRow(Tab, Id) {
-	if (confirm(MsgAreYouSure)) {
-		$.getJSON('DeleteManDivClassField.php?Tab=' + Tab + '&Id=' + Id, function(data) {
-			if(data.error==0) {
-				if (data.which!='#') {
-					$('#'+data.which).closest('tr').remove();
-				}
+/**
+ * Creates the new Class if all criteria are met
+ */
+function AddCl() {
+	$.each(['#New_ClId','#New_ClDescription','#New_ClAgeFrom','#New_ClAgeTo','#New_ClSex'], function(iKey,item) {
+		$(item).toggleClass('error', $(item).val()=='')
+	});
+	if ($('#New_ClId').val()=='' || $('#New_ClDescription').val()=='' || $('#New_ClAgeFrom').val()=='' || $('#New_ClAgeTo').val()=='' || $('#New_ClSex').val()=='' ) {
+		showAlert(MsgRowMustBeComplete);
+		return;
+	}
+
+	if($('#New_ClId').val().match(/[^a-z0-9]/i)) {
+		$('#New_ClId').addClass('error');
+		showAlert(MsgInvalidCharacters);
+		return;
+	}
+
+	let form = {
+		'New_ClId':$('#New_ClId').val(),
+		'New_ClDescription':$('#New_ClDescription').val(),
+		'New_ClIsPara':$('#New_ClIsPara').val(),
+		'New_ClAthlete':$('#New_ClAthlete').val(),
+		'New_ClViewOrder':$('#New_ClViewOrder').val(),
+		'New_ClAgeFrom':$('#New_ClAgeFrom').val(),
+		'New_ClAgeTo':$('#New_ClAgeTo').val(),
+		'New_ClValidClass':$('#New_ClValidClass').val(),
+		'New_ClSex':$('#New_ClSex').val(),
+		'New_ClValidDivision':$('#New_ClValidDivision').val(),
+	};
+	if(form.New_ClViewOrder=='' || parseInt(form.New_ClViewOrder)<=0) {
+		var order=0;
+		$('[ref="ClViewOrder"]').each(function() {
+			if(parseInt(this.value)>=order) {
+				order=parseInt(this.value)+1;
 			}
-		});
+		})
+		form.New_ClViewOrder=order;
 	}
+	$.getJSON('AddCl.php', form,function(data) {
+		if (data.error!=0) {
+			showAlert(data.errormsg);
+			return;
+		}
+
+		$('#tbody_cl').append('<tr id="Cl_'+data.clid+'" ref="'+data.clid+'">' +
+			'<td class="Bold Center">'+data.clid+'</td>' +
+			'<td><select ref="ClSex" class="w-100" onChange="UpdateField(this);">' +
+			'<option value="0"'+(data.clsex==0 ? ' selected="selected"' : '')+'>'+data.male+'</option>' +
+			'<option value="1"'+(data.clsex==1 ? ' selected="selected"' : '')+'>'+data.female+'</option>' +
+			'<option value="-1"'+(data.clsex==-1 ? ' selected="selected"' : '')+'>'+data.unisex+'</option>' +
+			'</select></td>' +
+			'<td><input type="text" ref="ClDescription" class="w-100" maxlength="32" value="'+data.cldescr+'" onBlur="UpdateField(this)"></td>' +
+			'<td class="Center"><select ref="ClIsPara" class="w-100" onClick="UpdateField(this)">' +
+			'<option value="0">'+data.no+'</option>' +
+			'<option value="1"'+(data.clpara==1 ? ' selected="selected"' : '')+'>'+data.yes+'</option>' +
+			'</select></td>' +
+			'<td class="Center"><select ref="ClAthlete" class="w-100" onClick="UpdateField(this)">' +
+			'<option value="0">'+data.no+'</option>' +
+			'<option value="1"'+(data.clathlete==1 ? ' selected="selected"' : '')+'>'+data.yes+'</option>' +
+			'</select></td>' +
+			'<td class="Center"><input type="number" ref="ClViewOrder" class="w-100" min="1" value="'+data.clprogr+'" onBlur="UpdateField(this)"></td>' +
+			'<td class="Center"><input type="number" ref="ClAgeFrom" class="w-100" min="1" max="125" value="'+data.clagefrom+'" onBlur="UpdateClassAge(this)"></td>' +
+			'<td class="Center"><input type="number" ref="ClAgeTo" class="w-100" min="1" max="125" value="'+data.clageto+'" onBlur="UpdateClassAge(this)"></td>' +
+			'<td class="Center"><input type="text" ref="ClValidClass" class="w-100" maxlength="24" value="'+data.clvalid+'" onBlur="UpdateValidClass(this)"></td>' +
+			'<td class="Center"><input type="text" ref="ClValidDivision" class="w-100" maxlength="255" value="'+data.clvaliddiv+'" onBlur="UpdateValidDivision(this)"></td>' +
+			'<td class="Center"><img src="../Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(this)"></td>' +
+			'</tr>');
+
+		reOrderRows('#tbody_cl', 'ClViewOrder');
+
+		// resetto i dati nella riga di inserimento
+		$('#New_ClId').val('');
+		$('#New_ClSex').val('');
+		$('#New_ClDescription').val('');
+		$('#New_ClAthlete').val(0);
+		$('#New_ClIsPara').val(0);
+		$('#New_ClViewOrder').val('');
+		$('#New_ClAgeFrom').val('');
+		$('#New_ClAgeTo').val('');
+		$('#New_ClValidClass').val('');
+		$('#New_ClValidDivision').val('');
+	});
 }
 
+/**
+ * Creates the new SubClass if all criteria are met
+ */
+function AddSubClass() {
+	$.each(['#New_ScId','#New_ScDescription'], function(iKey,item) {
+		$(item).toggleClass('error', $(item).val()=='')
+	});
+	if ($('#New_ScId').val()=='' || $('#New_ScDescription').val()=='') {
+		showAlert(MsgRowMustBeComplete);
+		return;
+	}
+	if($('#New_ScId').val().match(/[^a-z0-9]/i)) {
+		$('#New_ScId').addClass('error');
+		showAlert(MsgInvalidCharacters);
+		return;
+	}
 
-/*
-	- AddDiv(ErrMsg)
-	esegue la post a AddDiv.php per aggiungere una divisione.
-	ErrMsg è il messaggio di errore
-*/
-function AddDiv() {
-	if($('#New_DivId').val=='' || $('#New_DivDescription').val=='' || $('#New_DivViewOrder').val=='') {
-		alert(MsgRowMustBeComplete);
-	} else {
-		var QueryString
-			= 'New_DivId=' + encodeURIComponent(document.getElementById('New_DivId').value)
-			+ '&New_DivDescription=' + encodeURIComponent(document.getElementById('New_DivDescription').value)
-			+ '&New_DivIsPara=' + encodeURIComponent(document.getElementById('New_DivIsPara').value)
-			+ '&New_DivAthlete=' + encodeURIComponent(document.getElementById('New_DivAthlete').value)
-			+ '&New_DivViewOrder=' + encodeURIComponent(document.getElementById('New_DivViewOrder').value);
-		$.getJSON('AddDiv.php?'+QueryString, function(data) {
-			if (data.error==0) {
-				$('#tbody_div').append('<tr id="Div_'+data.divid+'">' +
-					'<td class="Bold Center">'+data.divid+'</td>' +
-					'<td><input type="text" name="d_DivDescription_'+data.divid+'" id="d_DivDescription_'+data.divid+'" size="56" maxlength="32" value="'+data.divdescr+'" onBlur="UpdateField(\'D\',\'d_DivDescription_'+data.divid+'\')"></td>' +
-					'<td class="Center"><select name="d_DivIsPara_'+data.divid+'" id="d_DivIsPara_'+data.divid+'" onBlur="UpdateField(\'D\',\'d_DivIsPara_'+data.divid+'\')">' +
-					'<option value="0">'+data.no+'</option>' +
-					'<option value="1"'+(data.divpara==1 ? ' selected="selected"' : '')+'>'+data.yes+'</option>' +
-					'</select></td>' +
-					'<td class="Center"><select name="d_DivAthlete_'+data.divid+'" id="d_DivAthlete_'+data.divid+'"  onBlur="UpdateField(\'D\',\'d_DivAthlete_'+data.divid+'\')">' +
-					'<option value="0">'+data.no+'</option>' +
-					'<option value="1"'+(data.divathlete==1 ? ' selected="selected"' : '')+'>'+data.yes+'</option>' +
-					'</select></td>' +
-					'<td class="Center"><input type="text" name="d_DivViewOrder_'+data.divid+'" id="d_DivViewOrder_'+data.divid+'" size="3" maxlength="3" value="'+data.divprogr+'" onBlur="UpdateField(\'D\',\'d_DivViewOrder_'+data.divid+'\')"></td>' +
-					'<td class="Center">' +
-					'<img src="../Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(\'D\',\''+data.divid+'\',\''+data.confirm_msg+'\')">' +
-					'</td>' +
-					'</tr>');
-
-				// resetto i dati nella riga di inserimento
-				$('#New_DivId').val('');
-				$('#New_DivIsPara').val('0');
-				$('#New_DivDescription').val('');
-				$('#New_DivAthlete').val('0');
-				$('#New_DivViewOrder').val('');
+	var form={
+		'New_ScId':$('#New_ScId').val(),
+		'New_ScDescription':$('#New_ScDescription').val(),
+		'New_ScViewOrder':$('#New_ScViewOrder').val(),
+	}
+	if(form.New_ScViewOrder=='' || parseInt(form.New_ScViewOrder)<=0) {
+		var order=0;
+		$('[ref="ScViewOrder"]').each(function() {
+			if(parseInt(this.value)>=order) {
+				order=parseInt(this.value)+1;
 			}
-		});
+		})
+		form.New_ScViewOrder=order;
 	}
+	$.getJSON('AddSubCl.php', form, function(data) {
+		if (data.error!=0) {
+			showAlert(data.errormsg);
+			return;
+		}
+		$('#tbody_subclass').append('<tr id="SubClass_'+data.scid+'" ref="'+data.scid+'">' +
+			'<td class="Bold Center">'+data.scid+'</td>' +
+			'<td><input type="text" ref="ScDescription" class="w-100" maxlength="32" value="'+data.scdescr+'" onBlur="UpdateField(this)"></td>' +
+			'<td class="Center"><input type="number" ref="ScViewOrder" min="1" class="w-100" maxlength="3" value="'+data.scprogr+'" onBlur="UpdateField(this)"></td>' +
+			'<td class="Center"><img src="../Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(this)"></td>' +
+			'</tr>');
+
+		$('#New_ScId').val('');
+		$('#New_ScDescription').val('');
+		$('#New_ScViewOrder').val('');
+	});
 }
 
-/*
-	- UpdateClassAge(Id,FromTo)
-	Esegue la post a UpdateClassAge.php.
-	Se FromTo vale 'From' significa che si sta aggiornando un AgeFrom.
-	Se FromTo vale 'to'  significa che si sta aggiornando un AgeTo
-*/
-
-function UpdateClassAge(Id,FromTo) {
-	var QueryString
-		= 'ClId=' + Id
-		+ '&FromTo=' + FromTo
-		+ '&Age=' + encodeURIComponent($('#d_ClAge' + FromTo + '_' + Id).val())
-		+ '&AlDivs=' + encodeURIComponent($('#d_ClValidDivision_' + Id).val());
-	$.getJSON('UpdateClassAge.php?'+QueryString, function(data) {
-		var ObjId = 'd_ClAge' + data.fromto + '_' + data.clid;
-
-		if (data.error==1) {
-			SetStyle(ObjId,'error');
-		} else {
-			SetStyle(ObjId,'');
+/**
+ * Updates fields through UpdateManDivClassField.php
+ * @param (obj) the object to be updated
+ */
+function UpdateField(obj) {
+	let form={
+		Tab:$(obj).closest('tbody').attr('ref'),
+		Id:$(obj).closest('tr').attr('ref'),
+		Field:$(obj).attr('ref'),
+		Value:obj.value,
+	}
+	$.getJSON('UpdateManDivClassField.php', form, function(data) {
+		$(obj).toggleClass('error', data.error==1)
+		if(data.error==0) {
+			$(obj).val(data.value);
+
+			switch(form.Field) {
+				case 'DivViewOrder':
+					reOrderRows('#tbody_div', form.Field);
+					break;
+				case 'ClViewOrder':
+					reOrderRows('#tbody_cl', form.Field);
+					break;
+				case 'ScViewOrder':
+					reOrderRows('#tbody_subclass', form.Field);
+					break;
+			}
 		}
 	});
 }
 
-/*
-	- UpdateValidClass(Id)
-*/
-function UpdateValidClass(Id) {
-	var QueryString
-		= 'ClId=' + Id
-		+ '&ClList=' + encodeURIComponent(document.getElementById('d_ClValidClass_' + Id).value);
-	$.getJSON('UpdateValidClass.php?'+QueryString, function(data) {
-		var ObjId = 'd_ClValidClass_' + data.clid;
-
-		if (data.error==1) {
-			SetStyle(ObjId,'error');
-		} else {
-			SetStyle(ObjId,'');
-			$('#'+ObjId).val(data.valid);
-		}
+/**
+ * Updates only Class Age fields through UpdateClassAge.php.
+ * @param (obj) the object to be updated
+ */
+function UpdateClassAge(obj) {
+	let form={
+		ClId:$(obj).closest('tr').attr('ref'),
+		Field:$(obj).attr('ref'),
+		Age:obj.value,
+		AlDivs:$(obj).closest('tr').find('.ClValidDivision').val()
+	}
+	$.getJSON('UpdateClassAge.php', form, function(data) {
+		$(obj).toggleClass('error', data.error==1);
 	});
 }
 
-/*
-- UpdateValidDivision(Id)
-*/
-function UpdateValidDivision(Id) {
-	var QueryString
-		= 'ClId=' + Id
-		+ '&ClList=' + encodeURIComponent(document.getElementById('d_ClValidDivision_' + Id).value);
-	$.getJSON('UpdateValidDivision.php?'+QueryString, function(data) {
-		var ObjId = 'd_ClValidDivision_' + data.clid;
-
-		if (data.error==1) {
-			SetStyle(ObjId,'error');
-		} else {
-			SetStyle(ObjId,'');
-			$('#'+ObjId).val(data.valid);
+/**
+ * Updates only Valid Classes fields through UpdateValidClass.php.
+ * @param (obj) the object to be updated
+ */
+function UpdateValidClass(obj) {
+	let form={
+		ClId:$(obj).closest('tr').attr('id').substring(3),
+		ClList:obj.value,
+	}
+	$.getJSON('UpdateValidClass.php', form, function(data) {
+		$(obj).toggleClass('error', data.error==1)
+		if(data.error==0) {
+			obj.value=data.valid;
 		}
 	});
 }
 
-/*
-	- AddCl(ErrMsg)
-	esegue la post a AddCl.php per aggiungere una classe
-	ErrMsg è il messaggio di errore
-*/
-function AddCl() {
-	if ($('#New_ClId').val()=='' ||
-			$('#New_ClDescription').val()=='' ||
-			$('#New_ClViewOrder').val()=='' ||
-			$('#New_ClAgeFrom').val()=='' ||
-			$('#New_ClAgeTo').val()=='' ) {
-		alert(MsgRowMustBeComplete);
-	} else {
-		var QueryString
-			= 'New_ClId=' + encodeURIComponent($('#New_ClId').val())
-			+ '&New_ClDescription=' + encodeURIComponent($('#New_ClDescription').val())
-			+ '&New_ClIsPara=' + encodeURIComponent($('#New_ClIsPara').val())
-			+ '&New_ClAthlete=' + encodeURIComponent($('#New_ClAthlete').val())
-			+ '&New_ClViewOrder=' + encodeURIComponent($('#New_ClViewOrder').val())
-			+ '&New_ClAgeFrom=' + encodeURIComponent($('#New_ClAgeFrom').val())
-			+ '&New_ClAgeTo=' + encodeURIComponent($('#New_ClAgeTo').val())
-			+ '&New_ClValidClass=' + encodeURIComponent($('#New_ClValidClass').val())
-			+ '&New_ClSex=' + encodeURIComponent($('#New_ClSex').val())
-			+ '&New_ClValidDivision=' + encodeURIComponent($('#New_ClValidDivision').val());
-		$.getJSON('AddCl.php?'+QueryString, function(data) {
-			if (data.error==0) {
-				$('#tbody_cl').append('<tr id="Cl_'+data.clid+'">' +
-					'<td class="Bold Center">'+data.clid+'</td>' +
-					'<td><select name="d_ClSex_'+data.clid+'" id="d_ClSex_'+data.clid+'" onChange="UpdateField(\'C\',\'d_ClSex_'+data.clid+'\');">' +
-						'<option value="0"'+(data.clsex==0 ? ' selected="selected"' : '')+'>'+data.male+'</option>' +
-						'<option value="1"'+(data.clsex==1 ? ' selected="selected"' : '')+'>'+data.female+'</option>' +
-						'<option value="-1"'+(data.clsex==-1 ? ' selected="selected"' : '')+'>'+data.unisex+'</option>' +
-						'</select></td>' +
-					'<td><input  type="text" name="d_ClDescription_'+data.clid+'" id="d_ClDescription_'+data.clid+'" size="56" maxlength="32" value="'+data.cldescr+'" onBlur="UpdateField(\'C\',\'d_ClDescription_'+data.clid+'\')"></td>' +
-					'<td class="Center"><select  name="d_ClIsPara_'+data.clid+'" id="d_ClIsPara_'+data.clid+'"  onClick="UpdateField(\'C\',\'d_ClIsPara_'+data.clid+'\')">' +
-						'<option value="0">'+data.no+'</option>' +
-						'<option value="1"'+(data.clpara==1 ? ' selected="selected"' : '')+'>'+data.yes+'</option>' +
-						'</select></td>' +
-					'<td class="Center"><select  name="d_ClAthlete_'+data.clid+'" id="d_ClAthlete_'+data.clid+'"  onClick="UpdateField(\'C\',\'d_ClAthlete_'+data.clid+'\')">' +
-						'<option value="0">'+data.no+'</option>' +
-						'<option value="1"'+(data.clathlete==1 ? ' selected="selected"' : '')+'>'+data.yes+'</option>' +
-						'</select></td>' +
-					'<td class="Center"><input  type="text" name="d_ClViewOrder_'+data.clid+'" id="d_ClViewOrder_'+data.clid+'" size="3" maxlength="3" value="'+data.clprogr+'" onBlur="UpdateField(\'C\',\'d_ClViewOrder_'+data.clid+'\')"></td>' +
-					'<td class="Center"><input  type="text" name="d_ClAgeFrom_'+data.clid+'" id="d_ClAgeFrom_'+data.clid+'" size="3" maxlength="3" value="'+data.clagefrom+'" onBlur="UpdateClassAge(\''+data.clid+'\',\'From\')"></td>' +
-					'<td class="Center"><input  type="text" name="d_ClAgeTo_'+data.clid+'" id="d_ClAgeTo_'+data.clid+'" size="3" maxlength="3" value="'+data.clageto+'" onBlur="UpdateClassAge(\''+data.clid+'\',\'To\')"></td>' +
-					'<td class="Center"><input  type="text" name="d_ClValidClass_'+data.clid+'" id="d_ClValidClass_'+data.clid+'" size="8" maxlength="24" value="'+data.clvalid+'" onBlur="UpdateValidClass(\''+data.clid+'\')"></td>' +
-					'<td class="Center"><input  type="text" name="d_ClValidDivision_'+data.clid+'" id="d_ClValidDivision_'+data.clid+'" size="8" maxlength="255" value="'+data.clvaliddiv+'" onBlur="UpdateValidDivision(\''+data.clid+'\')"></td>' +
-					'<td class="Center"><img src="../Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(\'C\',\''+data.clid+'\')"></td>' +
-					'</tr>');
-
-				// resetto i dati nella riga di inserimento
-				$('#New_ClId').val('');
-				$('#New_ClSex').val(0);
-				$('#New_ClDescription').val('');
-				$('#New_ClAthlete').val(0);
-				$('#New_ClIsPara').val(0);
-				$('#New_ClViewOrder').val('');
-				$('#New_ClAgeFrom').val('');
-				$('#New_ClAgeTo').val('');
-				$('#New_ClValidClass').val('');
-				$('#New_ClValidDivision').val('');
-			} else if(data.error==2) {
-				alert(data.errormsg);
-			}
-		});
+/**
+ * Updates only Valid Divisions fields through UpdateValidDivision.php.
+ * @param (obj) the object to be updated
+ */
+function UpdateValidDivision(obj) {
+	let form={
+		ClId:$(obj).closest('tr').attr('id').substring(3),
+		ClList:obj.value,
 	}
+	$.getJSON('UpdateValidDivision.php', form, function(data) {
+		$(obj).toggleClass('error', data.error==1)
+		if(data.error==0) {
+			obj.value=data.valid;
+		}
+	});
 }
 
-function AddSubClass() {
-	if ($('#New_ScId').val()=='' || $('#New_ScDescription').val()=='' || $('#New_ScViewOrder').val()=='') {
-		alert(MsgRowMustBeComplete);
-	} else {
-		var QueryString
-			= 'New_ScId=' + encodeURIComponent($('#New_ScId').val())
-			+ '&New_ScDescription=' + encodeURIComponent($('#New_ScDescription').val())
-			+ '&New_ScViewOrder=' + encodeURIComponent($('#New_ScViewOrder').val());
-		$.getJSON('AddSubCl.php?'+QueryString, function(data) {
-			if(data.error==0) {
-				$('#tbody_subclass').append('<tr id="SubClass_'+data.scid+'">' +
-					'<td class="Bold Center">'+data.scid+'</td>' +
-					'<td><input type="text" name="d_ScDescription_'+data.scid+'" id="d_ScDescription_'+data.scid+'" size="56" maxlength="32" value="'+data.scdescr+'" onBlur="UpdateField(\'SC\',\'d_ScDescription_'+data.scid+'\')"></td>' +
-					'<td class="Center"><input type="text" name="d_ScViewOrder_'+data.scid+'" id="d_ScViewOrder_'+data.scid+'" size="3" maxlength="3" value="'+data.scprogr+'" onBlur="UpdateField(\'SC\',\'d_ScViewOrder_'+data.scid+'\')"></td>' +
-					'<td class="Center"><img src="../Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(\'SC\',\''+data.scid+'\')"></td>' +
-					'</tr>');
-			} else if (data.error==2) {
-				alert(data.errormsg);
-			}
+/**
+ * Reorders the table based on the new vieworder
+ * @param (type) the ID of the tbody to reorder
+ * @param (field) field ref to reorder on
+ */
+function reOrderRows(type, field) {
+	var tb = $(type);
+	var rows = tb.find('tr');
+	rows.sort(function(a, b) {
+		var keyA = parseInt($(a).find('[ref="'+field+'"]').val());
+		var keyB = parseInt($(b).find('[ref="'+field+'"]').val());
+		if(keyA < keyB) {
+			return -1;
+		}
+		if(keyA > keyB) {
+			return 1;
+		}
+		var CodeA=a.firstElementChild.innerText;
+		var CodeB=b.firstElementChild.innerText;
+		if(CodeA < CodeB) {
+			return -1;
+		}
+		if(CodeA > CodeB) {
+			return 1;
+		}
+		return 0;
+	});
+	$.each(rows, function(index, row) {
+		tb.append(row);
+	});
 
-			$('#New_ScId').val('');
-			$('#New_ScDescription').val('');
-			$('#New_ScViewOrder').val('');
-		});
-	}
+}
+/**
+ * Deletes a row (Division or Class) through DeleteManDivClassField.php.
+ * @param (obj) the object to be deleted
+ */
+function DeleteRow(obj) {
+	$.confirm({
+		title:Warning,
+		content:'<div style="font-size:large;">'+MsgAreYouSure+'</div>',
+		boxWidth: '50%',
+		useBootstrap: false,
+		escapeKey: true,
+		backgroundDismiss: true,
+		type:'red',
+		buttons:{
+			'ok':{
+				text:CmdOk,
+				keys:['enter'],
+				action:function() {
+					let form={
+						Tab:$(obj).closest('tbody').attr('ref'),
+						Id:$(obj).closest('tr').attr('ref')
+					}
+					$.getJSON('DeleteManDivClassField.php', form, function(data) {
+						if(data.error==0) {
+							if (data.which!='#' && data.error==0) {
+								$(obj).closest('tr').remove();
+							}
+						}
+					});
+				}
+			},
+			'cancel':{
+				text:CmdCancel,
+			},
+		}
+	});
 }
diff --git a/src/Tournament/Fun_Tournament.local.inc.php b/src/Tournament/Fun_Tournament.local.inc.php
index 154d5b95..9ed1ef58 100644
--- a/src/Tournament/Fun_Tournament.local.inc.php
+++ b/src/Tournament/Fun_Tournament.local.inc.php
@@ -107,10 +107,9 @@ function GoodNumAth($TheNum)
 	Occorre fare il controllo di non sofrapposione degli anni
 	******************
 */
-	function CheckClassAge($ClId, $Age, $FromTo='From', $ClDivAllowed = '')
-	{
+	function CheckClassAge($ClId, $Age, $FromTo='From', $ClDivAllowed = ''){
 		$Start=0;
-		$End=0;
+		$End=999;
 		$Sex=-1;
 		/*
 		$Select
@@ -126,46 +125,49 @@ function CheckClassAge($ClId, $Age, $FromTo='From', $ClDivAllowed = '')
 		$Select = "";
 
 		if ($FromTo=='From') {
-			$Start=$Age;
-			$Select
-				= "SELECT ClAgeTo,ClSex  FROM Classes WHERE ClId=" . StrSafe_DB($ClId)
-				. " AND ClTournament=" . StrSafe_DB($_SESSION['TourId']) . " "
+			$Start=intval($Age);
+			$Select = "SELECT ClAgeTo, ClSex, ClAthlete
+				FROM Classes 
+				WHERE ClTournament={$_SESSION['TourId']} and ClId=" . StrSafe_DB($ClId)
 				. ($ClDivAllowed ? " AND ClDivisionsAllowed=" . StrSafe_DB($ClDivAllowed) . " " : '');
 			$Rs=safe_r_sql($Select);
-
-			//print $Select . '<br>';
-			if (safe_num_rows($Rs)==1)
-			{
-				$Row=safe_fetch($Rs);
+			if ($Row=safe_fetch($Rs)) {
+				// non athlete classes do not have check
+				if(!$Row->ClAthlete) {
+					return true;
+				}
 				$End=$Row->ClAgeTo;
 				$Sex=$Row->ClSex;
 			}
 		} elseif ($FromTo=='To') {
-			$End=$Age;
-			$Select
-				= "SELECT ClAgeFrom,ClSex FROM Classes WHERE ClId=" . StrSafe_DB($ClId)
-				. " AND ClTournament=" . StrSafe_DB($_SESSION['TourId']) . " "
+			$End=intval($Age);
+			$Select = "SELECT ClAgeFrom, ClSex, ClAthlete
+				FROM Classes WHERE ClTournament={$_SESSION['TourId']} and ClId=" . StrSafe_DB($ClId)
 				. ($ClDivAllowed ? " AND ClDivisionsAllowed=" . StrSafe_DB($ClDivAllowed) . " " : '');
 			//print $Select . '<br>';
 			$Rs=safe_r_sql($Select);
-			if (safe_num_rows($Rs)==1)
-			{
-				$Row=safe_fetch($Rs);
+			if($Row=safe_fetch($Rs)) {
+				// non athlete classes do not have check
+				if(!$Row->ClAthlete) {
+					return true;
+				}
 				$Start=$Row->ClAgeFrom;
 				$Sex=$Row->ClSex;
 			}
 		}
 
-		$Select
-			= "SELECT ClId FROM Classes "
-			. "WHERE (ClId<>" . StrSafe_DB($ClId)
-				. ($ClDivAllowed ? " AND ClDivisionsAllowed=" . StrSafe_DB($ClDivAllowed) : '')
-				. " AND ClSex=" . StrSafe_DB($Sex)
-				. " AND ClTournament=" . StrSafe_DB($_SESSION['TourId'])
-				. " AND ClAthlete=1 "
-				. ") "
-			. " AND ((ClAgeFrom<=" . StrSafe_DB($Start) . " AND ClAgeTo>=" . StrSafe_DB($End) . ") OR "
-			. "(ClAgeFrom<=" . StrSafe_DB($End) . " AND ClAgeTo>=" . StrSafe_DB($End) . ")) ";
+		if($Start>$End) {
+			return false;
+		}
+
+		$Select = "SELECT ClId 
+			FROM Classes
+			WHERE ClTournament={$_SESSION['TourId']} 
+				AND ClAthlete=1
+				AND ClSex={$Sex} 
+				AND ((ClAgeFrom<={$Start} AND ClAgeTo>={$End}) OR (ClAgeFrom<={$End} AND ClAgeTo>={$End}))
+				AND ClId<>" . StrSafe_DB($ClId)
+				. ($ClDivAllowed ? " AND ClDivisionsAllowed=" . StrSafe_DB($ClDivAllowed) : '');
 		$Rs=safe_r_sql($Select);
 
 		return (safe_num_rows($Rs)==0);
@@ -177,29 +179,23 @@ function CheckClassAge($ClId, $Age, $FromTo='From', $ClDivAllowed = '')
 	Ritorna la stringa
 
 */
-	function CreateValidClass($ClId,$ClList)
-	{
-		// mi assicuro che ci sia anche la classe id --NO, tolto per mettere i GM forzati a RM
-		//$StrList=(strpos($ClList,$ClId)===false ? $ClId . ',' : '') . $ClList;
-
-		//mi assicuro che se vuoto, ci sia almeno la ClId
-		$StrList = (strlen(trim($ClList)) ? $ClList : $ClId);
-
-
-		$Arr_List = explode(',',$StrList);
-
-	// paddo a due le eventuali classi con una lettera
-		//foreach ($Arr_List as $Key => $Value)
-		for ($i=0;$i<count($Arr_List);++$i)
-			if (strlen(trim($Arr_List[$i]))<=6 && trim($Arr_List[$i])!='')
-				$Arr_List[$i]=$Arr_List[$i];
-			else	// se l'elemento non va bene, lo tolgo
-				array_splice($Arr_List,$i,1);
-
-
-	// rigenero la lista
-		$StrList = implode(',',$Arr_List);
-		return $StrList;
+	function CreateValidClass($ClId,$ClList) {
+		$ret=[];
+		$ClList=trim($ClList);
+		$ClId=trim($ClId);
+		// if $ClList is empty, set it as $ClId
+		$StrList = ($ClList ?: $ClId);
+
+		$Arr_List = preg_split('/[, ]+/',$StrList);
+
+		foreach ($Arr_List as $CL) {
+			$CL=trim($CL);
+			if ($CL and strlen($CL)<=6) {
+				$ret[]=$CL;
+			}
+		}
+		sort($ret);
+		return implode(',', $ret);
 	}
 
 
@@ -212,7 +208,7 @@ function CreateValidClass($ClId,$ClList)
 	function CreateValidDivision($ClList) {
 		if(empty($ClList)) return '';
 
-		$ClList=explode(',', $ClList);
+		$ClList=preg_split('/[ ,]+/', $ClList);
 		sort($ClList);
 		$Arr_List = array();
 		$q=safe_r_sql("select distinct DivId from Divisions where DivTournament={$_SESSION['TourId']} and DivId in ('".implode("','", $ClList)."') order by DivId");
diff --git a/src/Tournament/ManDistances.php b/src/Tournament/ManDistances.php
index d95a8bdf..5b3bb713 100644
--- a/src/Tournament/ManDistances.php
+++ b/src/Tournament/ManDistances.php
@@ -25,6 +25,7 @@
 $PAGE_TITLE=get_text('ManDistances','Tournament');
 
 $JS_SCRIPT = array(
+    '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/js/Fun_JS.inc.js"></script>',
     '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Tournament/ManDistances.js"></script>',
     '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Tournament/ManDistancesSessions.js"></script>',
 	phpVars2js(array(
diff --git a/src/Tournament/ManDistancesSessions.php b/src/Tournament/ManDistancesSessions.php
index d3d059a5..9138c6f8 100644
--- a/src/Tournament/ManDistancesSessions.php
+++ b/src/Tournament/ManDistancesSessions.php
@@ -48,7 +48,7 @@
 				<td class="Center d-none advanced"><input size="4" maxlength="3" type="text" name="shoot['.$r->SesOrder.']['.$dist.']" onchange="ChangeInfo(this)" value="'.$DistInfo[$r->SesOrder][$dist][2].'"></td>
 				<td class="Center d-none advanced"><input size="4" maxlength="3" type="text" name="offset['.$r->SesOrder.']['.$dist.']" onchange="ChangeInfo(this)" value="'.$DistInfo[$r->SesOrder][$dist][3].'"></td>
 				<td class="Center"><input size="10" maxlength="10" type="date" name="startday['.$r->SesOrder.']['.$dist.']" onblur="ChangeInfo(this)" value="'.$DistInfo[$r->SesOrder][$dist][4].'"></td>
-				<td class="Center"><input size="5" maxlength="3" type="text" name="warmtime['.$r->SesOrder.']['.$dist.']" onchange="ChangeInfo(this)" value="'.$DistInfo[$r->SesOrder][$dist][7].'"></td>
+				<td class="Center"><input size="6" maxlength="5" type="time" name="warmtime['.$r->SesOrder.']['.$dist.']" onchange="ChangeInfo(this)" value="'.$DistInfo[$r->SesOrder][$dist][7].'"></td>
 				<td class="Center"><input size="4" maxlength="3" type="text" name="warmduration['.$r->SesOrder.']['.$dist.']" onchange="ChangeInfo(this)" value="'.$DistInfo[$r->SesOrder][$dist][8].'"></td>
 				<td class="Center"><input size="6" maxlength="5" type="time" name="starttime['.$r->SesOrder.']['.$dist.']" onblur="ChangeInfo(this)" value="'.$DistInfo[$r->SesOrder][$dist][5].'"></td>
 				<td class="Center"><input size="5" maxlength="3" type="text" name="duration['.$r->SesOrder.']['.$dist.']" onchange="ChangeInfo(this)" value="'.$DistInfo[$r->SesOrder][$dist][6].'"></td>
diff --git a/src/Tournament/ManDivClass.php b/src/Tournament/ManDivClass.php
index cb7be8e3..b9e093c2 100644
--- a/src/Tournament/ManDivClass.php
+++ b/src/Tournament/ManDivClass.php
@@ -1,51 +1,58 @@
 <?php
-	define('debug',false);	// settare a true per l'output di debug
-
-	require_once(dirname(dirname(__FILE__)) . '/config.php');
-	require_once('Common/Lib/CommonLib.php');
-	require_once('Common/Fun_FormatText.inc.php');
-	require_once('Tournament/Fun_Tournament.local.inc.php');
-    checkACL(AclCompetition, AclReadWrite);
-
-	if (!CheckTourSession())
-	{
-		print get_text('CrackError');
-		exit;
-	}
-
-	$IncludeJquery = true;
-	$JS_SCRIPT = array(
-        phpVars2js(array(
-            'MsgAreYouSure' => get_text('MsgAreYouSure'),
-	        'MsgRowMustBeComplete' => str_replace('<br>','\n',get_text('MsgRowMustBeComplete')),
-        )),
-		'<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/ajax/ObjXMLHttpRequest.js"></script>',
-		'<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Tournament/Fun_AJAX_ManDivClass.js"></script>',
-		'<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/js/Fun_JS.inc.js"></script>',
-		);
-	$PAGE_TITLE=get_text('ManDivClass','Tournament');
-
-	include('Common/Templates/head.php');
-
-?>
-<div align="center">
-<div class="medium">
-<table class="Tabella">
-	<tr><th class="Title"><?php print get_text('ManDivClass','Tournament');?></th></tr>
-</table>
-<br>
-<table class="Tabella">
-<tr><th class="Title" colspan="6"><?php print get_text('Divisions','Tournament');?></th></tr>
-<tr>
-    <th width="5%"><?php print get_text('Division');?></th>
-    <th width="30%"><?php print get_text('Descr','Tournament');?></th>
-    <th width="10%"><?php print get_text('Para','Records');?></th>
-    <th width="10%"><?php print get_text('Athlete');?></th>
-    <th width="10%"><?php print get_text('Progr');?></th>
-    <th width="15%">&nbsp;</th>
-</tr>
-<tbody id="tbody_div">
-<?php
+define('debug',false);	// settare a true per l'output di debug
+
+require_once(dirname(dirname(__FILE__)) . '/config.php');
+require_once('Common/Lib/CommonLib.php');
+require_once('Common/Fun_FormatText.inc.php');
+require_once('Tournament/Fun_Tournament.local.inc.php');
+checkACL(AclCompetition, AclReadWrite);
+
+if (!CheckTourSession())
+{
+    print get_text('CrackError');
+    exit;
+}
+
+global $CFG;
+
+$IncludeJquery = true;
+$JS_SCRIPT = array(
+    phpVars2js(array(
+        'MsgAreYouSure' => get_text('MsgAreYouSure'),
+        'MsgRowMustBeComplete' => get_text('MsgRowMustBeComplete'),
+        'MsgInvalidCharacters' => get_text('InvalidCharacters','Errors', '<span class="text-danger">a-z A-Z 0-9</span>'),
+        'CmdOk' => get_text('CmdOk'),
+        'CmdCancel' => get_text('CmdCancel'),
+        'Warning' => get_text('Warning', 'Tournament'),
+    )),
+    '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/ajax/ObjXMLHttpRequest.js"></script>',
+    '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Tournament/Fun_AJAX_ManDivClass.js"></script>',
+    '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/js/Fun_JS.inc.js"></script>',
+    );
+$PAGE_TITLE=get_text('ManDivClass','Tournament');
+
+include('Common/Templates/head.php');
+
+$Disabled=(defined('dontEditClassDiv') ? ' disabled="disabled"' : '');
+
+echo '<div align="center">
+    <div class="medium">
+    <table class="Tabella">
+        <tr><th class="Title">'.get_text('ManDivClass','Tournament').'</th></tr>
+    </table>
+    <br>
+    <table class="Tabella">
+    <tr><th class="Title" colspan="6">'.get_text('Divisions','Tournament').'</th></tr>
+    <tr>
+        <th class="wmin-5ch">'.get_text('Division').'</th>
+        <th class="w-75">'.get_text('Descr','Tournament').'</th>
+        <th class="wmin-5ch">'.get_text('Para','Records').'</th>
+        <th class="wmin-5ch">'.get_text('Athlete').'</th>
+        <th class="wmin-5ch">'.get_text('Progr').'</th>
+        <th>&nbsp;</th>
+    </tr>
+    <tbody id="tbody_div" ref="D">';
+
 
 $Select
     = "SELECT * "
@@ -54,64 +61,61 @@
     . "ORDER BY DivViewOrder ASC ";
 $Rs=safe_r_sql($Select);
 
-if (safe_num_rows($Rs)>0) {
-    $Disabled=(defined('dontEditClassDiv') ? ' disabled="disabled"' : '');
-    while ($MyRow=safe_fetch($Rs)) {
-        echo '<tr id="Div_'.$MyRow->DivId.'">
-            <td class="Bold Center">'.$MyRow->DivId.'</td>
-            <td><input type="text" '.$Disabled.' name="d_DivDescription_'.$MyRow->DivId.'" id="d_DivDescription_'.$MyRow->DivId.'" size="56" maxlength="50" value="'.ManageHTML($MyRow->DivDescription).'" onBlur="UpdateField(\'D\',\'d_DivDescription_'.$MyRow->DivId.'\')"></td>
-            <td class="Center"><select '.$Disabled.' name="d_DivIsPara_'.$MyRow->DivId.'" id="d_DivIsPara_'.$MyRow->DivId.'"  onBlur="UpdateField(\'D\',\'d_DivIsPara_'.$MyRow->DivId.'\')">
-                <option value="0">'.get_text('No').'</option>
-                <option value="1"'.($MyRow->DivIsPara?' selected':'').'>'.get_text('Yes').'</option>
-                </select></td>
-            <td class="Center"><select '.$Disabled.' name="d_DivAthlete_'.$MyRow->DivId.'" id="d_DivAthlete_'.$MyRow->DivId.'"  onBlur="UpdateField(\'D\',\'d_DivAthlete_'.$MyRow->DivId.'\')">
-                <option value="0">'.get_text('No').'</option>
-                <option value="1"'.($MyRow->DivAthlete?' selected':'').'>'.get_text('Yes').'</option>
-                </select></td>
-            <td class="Center"><input '.$Disabled.' type="text" name="d_DivViewOrder_'.$MyRow->DivId.'" id="d_DivViewOrder_'.$MyRow->DivId.'" size="3" maxlength="3" value="'.ManageHTML($MyRow->DivViewOrder).'" onBlur="UpdateField(\'D\',\'d_DivViewOrder_'.$MyRow->DivId.'\')"></td>
-            <td class="Center">'.(defined('dontEditClassDiv') ? '&nbsp;' : '<img src="'.$CFG->ROOT_DIR.'Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(\'D\',\''.$MyRow->DivId.'\')">').'</td>
-            </tr>';
-    }
+while ($MyRow=safe_fetch($Rs)) {
+    echo '<tr id="Div_'.$MyRow->DivId.'" ref="'.$MyRow->DivId.'">
+        <td class="Bold Center">'.$MyRow->DivId.'</td>
+        <td><input type="text" '.$Disabled.' class="w-100" ref="DivDescription" maxlength="50" value="'.ManageHTML($MyRow->DivDescription).'" onBlur="UpdateField(this)"></td>
+        <td class="Center"><select '.$Disabled.' ref="DivIsPara" class="w-100" onBlur="UpdateField(this)">
+            <option value="0">'.get_text('No').'</option>
+            <option value="1"'.($MyRow->DivIsPara?' selected':'').'>'.get_text('Yes').'</option>
+            </select></td>
+        <td class="Center"><select '.$Disabled.' ref="DivAthlete" class="w-100" onBlur="UpdateField(this)">
+            <option value="0">'.get_text('No').'</option>
+            <option value="1"'.($MyRow->DivAthlete?' selected':'').'>'.get_text('Yes').'</option>
+            </select></td>
+        <td class="Center"><input '.$Disabled.' type="number" ref="DivViewOrder" class="w-100" value="'.ManageHTML($MyRow->DivViewOrder).'" onBlur="UpdateField(this)"></td>
+        <td class="Center">'.(defined('dontEditClassDiv') ? '&nbsp;' : '<img src="'.$CFG->ROOT_DIR.'Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(this)">').'</td>
+        </tr>';
 }
 
-?>
-</tbody>
-<tr id="NewDiv" class="Spacer"><td colspan="6"></td></tr>
-<?php if(!defined('dontEditClassDiv')) { ?>
-	<tr>
-	<td class="Center"><input type="text" name="New_DivId" id="New_DivId" size="5" maxlength="4"></td>
-	<td><input type="text" name="New_DivDescription" id="New_DivDescription" size="56" maxlength="50"></td>
-	<td class="Center"><select name="New_DivIsPara" id="New_DivIsPara">
-		<option value="0"><?php echo get_text('No'); ?></option>
-		<option value="1"><?php echo get_text('Yes'); ?></option>
-		</select></td>
-	<td class="Center"><select name="New_DivAthlete" id="New_DivAthlete">
-		<option value="0"><?php echo get_text('No'); ?></option>
-		<option value="1"><?php echo get_text('Yes'); ?></option>
-		</select></td>
-	<td class="Center"><input type="text" name="New_DivViewOrder" id="New_DivViewOrder" size="3" maxlength="3"></td>
-	<td class="Center"><input type="button" name="CommandDiv" value="<?php print get_text('CmdSave');?>" onClick="AddDiv();"></td>
-	</tr>
-<?php }?>
-</table>
-<br>
-<table class="Tabella">
-<tr><th class="Title" colspan="11"><?php print get_text('Classes','Tournament');?></th></tr>
-<tr>
-<th width="5%"><?php print get_text('AgeClass', 'Tournament');?></th>
-<th width="5%"><?php print get_text('Sex','Tournament');?></th>
-<th width="30%"><?php print get_text('Descr','Tournament');?></th>
-<th width="10%"><?php print get_text('Para', 'Records');?></th>
-<th width="10%"><?php print get_text('Athlete');?></th>
-<th width="10%"><?php print get_text('Progr');?></th>
-<th width="10%"><?php echo get_text('YearStart','Tournament') ?></th>
-<th width="10%"><?php echo get_text('YearEnd','Tournament') ?></th>
-<th width="15%"><?php echo get_text('ValidClass','Tournament') ?></th>
-<th width="15%"><?php echo get_text('ValidDivisions','Tournament') ?></th>
-<th width="10%">&nbsp;</th>
-</tr>
-<tbody id="tbody_cl">
-<?php
+echo '</tbody>';
+echo '<tr id="NewDiv" class="Spacer"><td colspan="6"></td></tr>';
+
+if(!defined('dontEditClassDiv')) {
+    echo '<tr>
+        <td class="Center"><input type="text" id="New_DivId" class="w-100" maxlength="4"></td>
+        <td><input type="text" id="New_DivDescription" class="w-100" maxlength="50"></td>
+        <td class="Center"><select class="w-100" id="New_DivIsPara">
+            <option value="0">'.get_text('No').'</option>
+            <option value="1">'.get_text('Yes').'</option>
+            </select></td>
+        <td class="Center"><select class="w-100" id="New_DivAthlete">
+            <option value="0">'.get_text('No').'</option>
+            <option value="1">'.get_text('Yes').'</option>
+            </select></td>
+        <td class="Center"><input type="number" id="New_DivViewOrder" class="w-100"></td>
+        <td class="Center"><input type="button" value="'.get_text('CmdSave').'" class="w-100" onClick="AddDiv();"></td>
+        </tr>';
+}
+
+echo '</table>
+    <br>
+    <table class="Tabella">
+    <tr><th class="Title" colspan="11">'.get_text('Classes','Tournament').'</th></tr>
+    <tr>
+    <th class="wmin-7ch">'.get_text('AgeClass', 'Tournament').'</th>
+    <th class="wmin-5ch">'.get_text('Sex','Tournament').'</th>
+    <th class="w-70">'.get_text('Descr','Tournament').'</th>
+    <th class="wmin-5ch">'.get_text('Para', 'Records').'</th>
+    <th class="wmin-5ch">'.get_text('Athlete').'</th>
+    <th class="wmin-5ch">'.get_text('Progr').'</th>
+    <th class="wmin-5ch">'.get_text('YearStart','Tournament').'</th>
+    <th class="wmin-5ch">'.get_text('YearEnd','Tournament').'</th>
+    <th class="w-15">'.get_text('ValidClass','Tournament').'</th>
+    <th class="w-15">'.get_text('ValidDivisions','Tournament').'</th>
+    <th>&nbsp;</th>
+    </tr>
+    <tbody id="tbody_cl" ref="C">';
 	$Select
 		= "SELECT * "
 		. "FROM Classes "
@@ -119,77 +123,72 @@
 		. "ORDER BY ClViewOrder ASC ";
 	$Rs=safe_r_sql($Select);
 
-	if (safe_num_rows($Rs)>0)
-	{
-		while ($MyRow=safe_fetch($Rs))
-		{
-			$id_post=$MyRow->ClId ;
-?>
-<tr id="Cl_<?php print $id_post;?>">
-<td class="Bold Center"><?php print $MyRow->ClId;?></td>
-<td>
-<select <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> name="d_ClSex_<?php print $id_post;?>" id="d_ClSex_<?php print $id_post;?>" onChange="UpdateField('C','d_ClSex_<?php print $id_post;?>')">
-<option value="0"<?php print ($MyRow->ClSex==0 ? ' selected' : '');?>><?php print get_text('ShortMale','Tournament');?></option>
-<option value="1"<?php print ($MyRow->ClSex==1 ? ' selected' : '');?>><?php print get_text('ShortFemale','Tournament');?></option>
-<option value="-1"<?php print ($MyRow->ClSex==-1 ? ' selected' : '');?>><?php print get_text('ShortUnisex','Tournament');?></option>
-</select>
-</td>
-<td><input <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> type="text" name="d_ClDescription_<?php print $id_post;?>" id="d_ClDescription_<?php print $id_post;?>" size="56" maxlength="50" value="<?php print ManageHTML($MyRow->ClDescription);?>" onBlur="UpdateField('C','d_ClDescription_<?php print $id_post;?>')"></td>
-<td class="Center"><select <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> name="d_ClIsPara_<?php print $id_post;?>" id="d_ClIsPara_<?php print $id_post;?>"  onChange="UpdateField('C','d_ClIsPara_<?php print $id_post;?>')">
-	<option value="0"><?php echo get_text('No'); ?></option>
-	<option value="1"<?php print ($MyRow->ClIsPara?' selected':'');?>><?php echo get_text('Yes'); ?></option>
-	</select></td>
-<td class="Center"><select <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> name="d_ClAthlete_<?php print $id_post;?>" id="d_ClAthlete_<?php print $id_post;?>"  onChange="UpdateField('C','d_ClAthlete_<?php print $id_post;?>')">
-	<option value="0"><?php echo get_text('No'); ?></option>
-	<option value="1"<?php print ($MyRow->ClAthlete?' selected':'');?>><?php echo get_text('Yes'); ?></option>
-	</select></td>
-<td class="Center"><input <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> type="text" name="d_ClViewOrder_<?php print $id_post;?>" id="d_ClViewOrder_<?php print $id_post;?>" size="3" maxlength="3" value="<?php print ManageHTML($MyRow->ClViewOrder);?>" onBlur="UpdateField('C','d_ClViewOrder_<?php print $id_post;?>')"></td>
-<td class="Center"><input <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> type="text" name="d_ClAgeFrom_<?php print $id_post;?>" id="d_ClAgeFrom_<?php print $id_post;?>" size="3" maxlength="3" value="<?php print $MyRow->ClAgeFrom;?>" onBlur="UpdateClassAge('<?php print $id_post;?>','From')"></td>
-<td class="Center"><input <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> type="text" name="d_ClAgeTo_<?php print $id_post;?>" id="d_ClAgeTo_<?php print $id_post;?>" size="3" maxlength="3" value="<?php print $MyRow->ClAgeTo;?>" onBlur="UpdateClassAge('<?php print $id_post;?>','To')"></td>
-<td class="Center"><input <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> type="text" name="d_ClValidClass_<?php print $id_post;?>" id="d_ClValidClass_<?php print $id_post;?>" size="8" maxlength="255" value="<?php print $MyRow->ClValidClass;?>" onBlur="UpdateValidClass('<?php print $id_post;?>')"></td>
-<td class="Center"><input <?php print (!defined('dontEditClassDiv') ? '' :' disabled="disabled"');?> type="text" name="d_ClValidDivision_<?php print $id_post;?>" id="d_ClValidDivision_<?php print $id_post;?>" size="8" maxlength="255" value="<?php print $MyRow->ClDivisionsAllowed;?>" onBlur="UpdateValidDivision('<?php print $id_post;?>')"></td>
-<td class="Center"><?= (defined('dontEditClassDiv') ? '&nbsp;' : '<img src="'.$CFG->ROOT_DIR.'Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(\'C\',\''.$id_post.'\')">') ?></td>
-</tr>
+while ($MyRow=safe_fetch($Rs)) {
+    echo '<tr id="Cl_'.$MyRow->ClId.'" ref="'.$MyRow->ClId.'">
+        <td class="Bold Center">'.$MyRow->ClId.'</td>
+        <td><select '.$Disabled.' class="w-100" ref="ClSex" onChange="UpdateField(this)">
+            <option value="0"'.($MyRow->ClSex==0 ? ' selected' : '').'>'.get_text('ShortMale','Tournament').'</option>
+            <option value="1"'.($MyRow->ClSex==1 ? ' selected' : '').'>'.get_text('ShortFemale','Tournament').'</option>
+            <option value="-1"'.($MyRow->ClSex==-1 ? ' selected' : '').'>'.get_text('ShortUnisex','Tournament').'</option>
+            </select></td>
+        <td><input '.$Disabled.' type="text" ref="ClDescription" class="w-100" maxlength="50" value="'.ManageHTML($MyRow->ClDescription).'" onBlur="UpdateField(this)"></td>
+        <td class="Center"><select '.$Disabled.' ref="ClIsPara" class="w-100" onChange="UpdateField(this)">
+            <option value="0">'.get_text('No').'</option>
+            <option value="1"'.($MyRow->ClIsPara?' selected':'').'>'.get_text('Yes').'</option>
+            </select></td>
+        <td class="Center"><select '.$Disabled.' ref="ClAthlete" class="w-100" onChange="UpdateField(this)">
+            <option value="0">'.get_text('No').'</option>
+            <option value="1"'.($MyRow->ClAthlete?' selected':'').'>'.get_text('Yes').'</option>
+            </select></td>
+        <td class="Center"><input '.$Disabled.' type="number" ref="ClViewOrder" min="1" class="w-100" maxlength="3" value="'.ManageHTML($MyRow->ClViewOrder).'" onBlur="UpdateField(this)"></td>
+        <td class="Center"><input '.$Disabled.' type="number" min="1" max="125" ref="ClAgeFrom" class="w-100" maxlength="3" value="'.$MyRow->ClAgeFrom.'" onBlur="UpdateClassAge(this)"></td>
+        <td class="Center"><input '.$Disabled.' type="number" min="1" max="125" ref="ClAgeTo" class="w-100" maxlength="3" value="'.$MyRow->ClAgeTo.'" onBlur="UpdateClassAge(this)"></td>
+        <td class="Center"><input '.$Disabled.' type="text" ref="ClValidClass" class="w-100" size="8" maxlength="255" value="'.$MyRow->ClValidClass.'" onBlur="UpdateValidClass(this)"></td>
+        <td class="Center"><input '.$Disabled.' type="text" ref="ClValidDivision" class="w-100 ClValidDivision" maxlength="255" value="'.$MyRow->ClDivisionsAllowed.'" onBlur="UpdateValidDivision(this)"></td>
+        <td class="Center">'. (defined('dontEditClassDiv') ? '&nbsp;' : '<img src="'.$CFG->ROOT_DIR.'Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(this)">').'</td>
+    </tr>';
+}
 
-<?php
-		}
-	}
 echo '</tbody>';
 
-	if(!defined('dontEditClassDiv')) { ?>
-	<tr id="NewCl" class="Spacer"><td colspan="11"></td></tr>
-	<tr>
-	<td class="Bold Center"><input type="text" name="New_ClId" id="New_ClId" size="7" maxlength="6"></td>
-	<td>
-	<select name="New_ClSex" id="New_ClSex">
-	<option value="0"><?php print get_text('ShortMale','Tournament');?></option>
-	<option value="1"><?php print get_text('ShortFemale','Tournament');?></option>
-	<option value="-1"><?php print get_text('ShortUnisex','Tournament');?></option>
-	</select>
-	</td>
-	<td><input type="text" name="New_ClDescription" id="New_ClDescription" size="56" maxlength="50"></td>
-	<td class="Center"><select name="New_ClIsPara" id="New_ClIsPara">
-		<option value="0"><?php echo get_text('No'); ?></option>
-		<option value="1"><?php echo get_text('Yes'); ?></option>
-		</select></td>
-	<td class="Center"><select name="New_ClAthlete" id="New_ClAthlete">
-		<option value="0"><?php echo get_text('No'); ?></option>
-		<option value="1"><?php echo get_text('Yes'); ?></option>
-		</select></td>
-	<td class="Center"><input type="text" name="New_ClViewOrder" id="New_ClViewOrder" size="3" maxlength="3"></td>
-	<td class="Center"><input type="text" name="New_ClAgeFrom" id="New_ClAgeFrom" size="3" maxlength="3"></td>
-	<td class="Center"><input type="text" name="New_ClAgeTo" id="New_ClAgeTo" size="3" maxlength="3"></td>
-	<td class="Center"><input type="text" name="New_ClValidClass" id="New_ClValidClass" size="8" maxlength="16"></td>
-	<td class="Center"><input type="text" name="New_ClValidDivision" id="New_ClValidDivision" size="8" maxlength="16"></td>
-	<td class="Center"><input type="button" name="CommandDiv" value="<?php print get_text('CmdSave');?>" onClick="AddCl()"></td>
-	</tr>
-<?php }?>
-<tr  class="Spacer"><td colspan="11"></td></tr>
-<tr><td colspan="11" class="Center"><a class="Link" href="ManDistances.php"><?php print get_text('ManDistances','Tournament'); ?></a></td></tr>
-</table>
-</div>
-</div>
-<div id="idOutput"></div>
-<?php
-	include('Common/Templates/tail.php');
-?>
+if(!defined('dontEditClassDiv')) {
+    echo '<tr id="NewCl" class="Spacer"><td colspan="11"></td></tr>
+        <tr>
+        <td class="Bold Center"><input type="text" id="New_ClId" class="w-100" maxlength="6"></td>
+        <td>
+        <select class="w-100" id="New_ClSex">
+        <option value="">---</option>
+        <option value="0">'.get_text('ShortMale','Tournament').'</option>
+        <option value="1">'.get_text('ShortFemale','Tournament').'</option>
+        <option value="-1">'.get_text('ShortUnisex','Tournament').'</option>
+        </select>
+        </td>
+        <td><input type="text" id="New_ClDescription" class="w-100" maxlength="50"></td>
+        <td class="Center"><select class="w-100" id="New_ClIsPara">
+            <option value="0">'.get_text('No').'</option>
+            <option value="1">'.get_text('Yes').'</option>
+            </select></td>
+        <td class="Center"><select class="w-100" id="New_ClAthlete">
+            <option value="0">'.get_text('No').'</option>
+            <option value="1">'.get_text('Yes').'</option>
+            </select></td>
+        <td class="Center"><input type="text" id="New_ClViewOrder" class="w-100" maxlength="3"></td>
+        <td class="Center"><input type="text" id="New_ClAgeFrom" class="w-100" maxlength="3"></td>
+        <td class="Center"><input type="text" id="New_ClAgeTo" class="w-100" maxlength="3"></td>
+        <td class="Center"><input type="text" id="New_ClValidClass" class="w-100" maxlength="16"></td>
+        <td class="Center"><input type="text" id="New_ClValidDivision" class="w-100" maxlength="16"></td>
+        <td class="Center"><input type="button" class="w-100" value="'.get_text('CmdSave').'" onClick="AddCl()"></td>
+        </tr>';
+}
+
+echo '<tr  class="Spacer"><td colspan="11"></td></tr>
+    <tr><td colspan="11" class="Center">
+        <a class="Link mx-3" href="ManDistances.php">'.get_text('ManDistances','Tournament').'</a>
+        <a class="Link mx-3" href="ManSubClass.php">'.get_text('ManSubClasses','Tournament').'</a>
+    </td></tr>
+    </table>
+    </div>
+    </div>
+    <div id="idOutput"></div>';
+
+include('Common/Templates/tail.php');
diff --git a/src/Tournament/ManStaffField.php b/src/Tournament/ManStaffField.php
index effeaf9e..c416e91e 100644
--- a/src/Tournament/ManStaffField.php
+++ b/src/Tournament/ManStaffField.php
@@ -24,15 +24,15 @@
 }
 
 $Genders ='<option value="">---</option>';
-$Genders.='<option value="0">'.get_text('ShortMale', 'Tournament').'</option>';
-$Genders.='<option value="1">'.get_text('ShortFemale', 'Tournament').'</option>';
+$Genders.='<option value="0">'.get_text('GenderShort0').'</option>';
+$Genders.='<option value="1">'.get_text('GenderShort1').'</option>';
 
 $JS_SCRIPT = array(
     phpVars2js(array(
         'NoEmptyField' => get_text('AllFieldsMandatory','Errors'),
         'AreYouSure' => get_text('MsgAreYouSure'),
-        'Gender0' => get_text('ShortMale', 'Tournament'),
-        'Gender1' => get_text('ShortFemale', 'Tournament'),
+        'Gender0' => get_text('GenderShort0'),
+        'Gender1' => get_text('GenderShort1'),
         'TitCode' => get_text('Code', 'Tournament'),
         'TitFName' => get_text('FamilyName', 'Tournament'),
         'TitGName' => get_text('GivenName', 'Tournament'),
diff --git a/src/Tournament/ManStaffField_Edit.php b/src/Tournament/ManStaffField_Edit.php
index d9413101..49edf293 100644
--- a/src/Tournament/ManStaffField_Edit.php
+++ b/src/Tournament/ManStaffField_Edit.php
@@ -30,7 +30,6 @@
 $JSON['error']=0;
 
 if($CanEdit) {
-
 	switch($_REQUEST['act']) {
 		case 'new':
 		case 'edit':
@@ -58,13 +57,20 @@
 				"TiName=".StrSafe_DB($_REQUEST['FamilyName']),
 				"TiGivenName=".StrSafe_DB($_REQUEST['GivenName']),
 				"TiCountry=$CoId",
-				"TiGender=".intval($_REQUEST['Gender']),
+				"TiGender=".intval($_REQUEST['Gender'])
 			);
+            $t = microtime(true);
+            $micro = sprintf("%06d",($t - floor($t)) * 1000000);
+            $d = new DateTime( date('Y-m-d H:i:s.'.$micro, intval($t)));
 
 			if($_REQUEST['ID']=='new') {
+                $SQL[] = "TiTimeStamp='".$d->format('Y-m-d H:i:s.u')."'";
 				safe_w_sql("insert ignore into TournamentInvolved set ".implode(',', $SQL));
 			} else {
 				safe_w_sql("update TournamentInvolved set ".implode(',', $SQL)." where TiId=".intval($_REQUEST['ID']));
+                if(safe_w_affected_rows() != 0) {
+                    safe_w_sql("update TournamentInvolved set TiTimeStamp='".$d->format('Y-m-d H:i:s.u')."' where TiId=".intval($_REQUEST['ID']));
+                }
 			}
 			break;
 		case 'delete':
@@ -87,8 +93,8 @@
 }
 
 $Genders ='<option value="">---</option>';
-$Genders.='<option value="0">'.get_text('ShortMale', 'Tournament').'</option>';
-$Genders.='<option value="1">'.get_text('ShortFemale', 'Tournament').'</option>';
+$Genders.='<option value="0">'.get_text('GenderShort0').'</option>';
+$Genders.='<option value="1">'.get_text('GenderShort1').'</option>';
 
 $JSON['table']='';
 $q=safe_r_sql("SELECT *
diff --git a/src/Tournament/ManStaffField_Find.php b/src/Tournament/ManStaffField_Find.php
index 927ca3b8..1717aee9 100644
--- a/src/Tournament/ManStaffField_Find.php
+++ b/src/Tournament/ManStaffField_Find.php
@@ -47,28 +47,28 @@
 			$Where[1][]="LueName like '%".StrSafe_DB($_REQUEST['GivenName'], true)."%'";
 			$Where[0][]="EnName like '%".StrSafe_DB($_REQUEST['GivenName'], true)."%'";
 		}
-		if(!empty($_REQUEST['Gender'])) {
-			$Where[1][]="LueSex like '%".StrSafe_DB($_REQUEST['Gender'], true)."%'";
-			$Where[0][]="EnSex like '%".StrSafe_DB($_REQUEST['Gender'], true)."%'";
+		if(isset($_REQUEST['Gender']) and preg_match("/^[01]$/",$_REQUEST['Gender'])) {
+			$Where[1][]="LueSex = ".intval($_REQUEST['Gender']);
+			$Where[0][]="EnSex = ".intval($_REQUEST['Gender']);
 		}
-		if(!empty($_REQUEST['CoCode'])) {
-			$Where[1][]="LueCountry like '%".StrSafe_DB($_REQUEST['CoCode'], true)."%'";
-			$Where[0][]="CoCode like '%".StrSafe_DB($_REQUEST['CoCode'], true)."%'";
+		if(!empty($_REQUEST['CountryCode'])) {
+			$Where[1][]="LueCountry like '%".StrSafe_DB($_REQUEST['CountryCode'], true)."%'";
+			$Where[0][]="CoCode like '%".StrSafe_DB($_REQUEST['CountryCode'], true)."%'";
 		}
-		if(!empty($_REQUEST['CoName'])) {
-			$Where[1][]="LueCoShort like '%".StrSafe_DB($_REQUEST['CoName'], true)."%'";
-			$Where[0][]="CoName like '%".StrSafe_DB($_REQUEST['CoName'], true)."%'";
+		if(!empty($_REQUEST['CountryName'])) {
+			$Where[1][]="LueCoShort like '%".StrSafe_DB($_REQUEST['CountryName'], true)."%'";
+			$Where[0][]="CoName like '%".StrSafe_DB($_REQUEST['CountryName'], true)."%'";
 		}
 		if(!$Where[0]) {
 			JsonOut($JSON);
 		}
 		$q=safe_r_sql("("
-			."select '1' as LUE, LueCode as Code, LueFamilyName as FamName, LueName as GivName, LueSex as Gender, LueCountry as CoCode, LueCoShort as CoName, if(LueCtrlCode=0,'',LueCtrlCode) as DOB 
+			."SELECT '1' as LUE, LueCode as Code, LueFamilyName as FamName, LueName as GivName, LueSex as Gender, LueCountry as CoCode, LueCoShort as CoName, if(LueCtrlCode=0,'',LueCtrlCode) as DOB 
 				from LookUpEntries 
 			    inner join Tournament on ToId={$_SESSION['TourId']} and ToIocCode=LueIocCode 
 				where ".implode(' and ', $Where[1])
 			.") union ("
-			."select '0' as LUE, EnCode as Code, EnFirstName as FamName, EnName as GivName, EnSex as Gender, CoCode, CoName, if(EnDob=0,'',EnDob) as DOB 
+			."SELECT '0' as LUE, EnCode as Code, EnFirstName as FamName, EnName as GivName, EnSex as Gender, CoCode, CoName, if(EnDob=0,'',EnDob) as DOB 
 				from Entries 
 			    inner join Countries on CoId=EnCountry and CoTournament=EnTournament 
 				where EnTournament={$_SESSION['TourId']} and ".implode(' and ', $Where[0])."
@@ -76,9 +76,8 @@
 			order by FamName, GivName, LUE");
 
 		while($r=safe_fetch($q)) {
-			$JSON['rows'][]=$r;
+			$JSON['rows'][$r->Code]=$r;
 		}
-
 		break;
 }
 
diff --git a/src/Tournament/ManSubClass.php b/src/Tournament/ManSubClass.php
index f24f97f3..1ecacd17 100644
--- a/src/Tournament/ManSubClass.php
+++ b/src/Tournament/ManSubClass.php
@@ -16,7 +16,11 @@
 $JS_SCRIPT = array(
 	phpVars2js(array(
 		'MsgAreYouSure' => get_text('MsgAreYouSure'),
-		'MsgRowMustBeComplete' => str_replace('<br>','\n',get_text('MsgRowMustBeComplete')),
+		'MsgRowMustBeComplete' => get_text('MsgRowMustBeComplete'),
+        'MsgInvalidCharacters' => get_text('InvalidCharacters','Errors'),
+        'CmdOk' => get_text('CmdOk'),
+        'CmdCancel' => get_text('CmdCancel'),
+        'Warning' => get_text('Warning', 'Tournament'),
 	)),
     '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Common/ajax/ObjXMLHttpRequest.js"></script>',
     '<script type="text/javascript" src="'.$CFG->ROOT_DIR.'Tournament/Fun_AJAX_ManDivClass.js"></script>',
@@ -29,30 +33,36 @@
 
 ?>
 <div align="center">
-<div class="medium">
+<div class="half">
 <table class="Tabella">
 <tr><th class="Title" colspan="4"><?php print get_text('ManSubClasses','Tournament');?></th></tr>
 <tr><th class="Title" colspan="4"><?php print get_text('SubClasses','Tournament');?></th></tr>
 <?php
-	$Rs=safe_r_sql("SELECT * FROM `SubClass` WHERE ScTournament=" . StrSafe_DB($_SESSION['TourId']) . " ORDER BY ScViewOrder ASC ");
 
-	echo '<tr><th width="5%">' . get_text('SubClass','Tournament') . '</th><th width="30%">'. get_text('Descr','Tournament') . '</th><th width="10%">' . get_text('Progr') . '</th><th width="15%">&nbsp;</th></tr>';
-    echo '<tbody id="tbody_subclass">';
-    while ($MyRow=safe_fetch($Rs)) {
-        echo '<tr id="SubClass_' . $MyRow->ScId .'">'.
-                '<td class="Bold Center">'. $MyRow->ScId . '</td>'.
-                '<td><input type="text" name="d_ScDescription_' . $MyRow->ScId .'" id="d_ScDescription_' . $MyRow->ScId . '" size="56" maxlength="32" value="'.$MyRow->ScDescription .'" onBlur="UpdateField(\'SC\',\'d_ScDescription_'. $MyRow->ScId . '\')"></td>'.
-                '<td class="Center"><input type="text" name="d_ScViewOrder_'. $MyRow->ScId . '" id="d_ScViewOrder_' .$MyRow->ScId . '" size="3" maxlength="3" value="'. $MyRow->ScViewOrder . '" onBlur="UpdateField(\'SC\',\'d_ScViewOrder_'. $MyRow->ScId.'\')"></td>'.
-                '<td class="Center"><img src="'.$CFG->ROOT_DIR.'Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(\'SC\',\''.$MyRow->ScId.'\')"></td>'.
-            '</tr>';
-    }
-    echo '</tbody>';
+$Rs=safe_r_sql("SELECT * FROM `SubClass` WHERE ScTournament=" . StrSafe_DB($_SESSION['TourId']) . " ORDER BY ScViewOrder ASC ");
+
+echo '<tr>
+    <th class="wmin-5ch">' . get_text('SubClass','Tournament') . '</th>
+    <th class="w-90">'. get_text('Descr','Tournament') . '</th>
+    <th class="wmin-5ch">' . get_text('Progr') . '</th>
+    <th>&nbsp;</th>
+    </tr>';
+echo '<tbody id="tbody_subclass" ref="SC">';
+while ($MyRow=safe_fetch($Rs)) {
+    echo '<tr id="SubClass_' . $MyRow->ScId .'" ref="' . $MyRow->ScId .'">'.
+            '<td class="Bold Center">'. $MyRow->ScId . '</td>'.
+            '<td><input type="text" ref="ScDescription" class="w-100" maxlength="32" value="'.$MyRow->ScDescription .'" onBlur="UpdateField(this)"></td>'.
+            '<td class="Center"><input type="number" ref="ScViewOrder" class="w-100" maxlength="3" value="'. $MyRow->ScViewOrder . '" onBlur="UpdateField(this)"></td>'.
+            '<td class="Center"><img src="'.$CFG->ROOT_DIR.'Common/Images/drop.png" border="0" alt="#" title="#" onclick="DeleteRow(this)"></td>'.
+        '</tr>';
+}
+echo '</tbody>';
 ?>
 <tr id="NewSubCl" class="Spacer"><td colspan="4"></td></tr>
 <tr>
-<td class="Center"><input type="text" name="New_ScId" id="New_ScId" size="3" maxlength="2"></td>
-<td><input type="text" name="New_ScDescription" id="New_ScDescription" size="56" maxlength="32"></td>
-<td class="Center"><input type="text" name="New_ScViewOrder" id="New_ScViewOrder" size="3" maxlength="3"></td>
+<td class="Center"><input type="text" id="New_ScId" class="w-100" maxlength="2"></td>
+<td><input type="text" id="New_ScDescription" class="w-100" maxlength="32"></td>
+<td class="Center"><input type="number" id="New_ScViewOrder" class="w-100" maxlength="3"></td>
 <td class="Center"><input type="button" name="CommandSc" value="<?php print get_text('CmdSave');?>" onClick="AddSubClass()"></td>
 </tr>
 </table>
diff --git a/src/Tournament/TourDelete.php b/src/Tournament/TourDelete.php
index b70250ce..4b442b94 100644
--- a/src/Tournament/TourDelete.php
+++ b/src/Tournament/TourDelete.php
@@ -8,7 +8,22 @@
 }
 
 if($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
-    if(!in_array(getCodeFromId($_SESSION['TourId']),$_SESSION["AUTH_COMP"])){
+    $AuthFiler = array();
+    if($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
+        $compList = array();
+        foreach ($_SESSION["AUTH_COMP"] as $comp) {
+            if(preg_match('/%/',$comp)) {
+                $AuthFiler[] = 'ToCode LIKE ' . StrSafe_DB($comp);
+            } else {
+                $compList[] = $comp;
+            }
+        }
+        if(count($compList)) {
+            $AuthFiler[] = 'FIND_IN_SET(ToCode, \'' . implode(',', $compList) . '\') != 0 ';
+        }
+    }
+    $q = safe_r_SQL("SELECT ToId FROM Tournament WHERE ToId=" . $_SESSION['TourId']. ' AND (' . (count($AuthFiler) ? implode(' OR ', $AuthFiler) : 'FALSE'). ')');
+    if(safe_num_rows($q)!=1){
         CD_redirect($CFG->ROOT_DIR);
         exit;
     }
diff --git a/src/Tournament/TournamentExport.php b/src/Tournament/TournamentExport.php
index 33608790..384cd3e1 100644
--- a/src/Tournament/TournamentExport.php
+++ b/src/Tournament/TournamentExport.php
@@ -16,7 +16,22 @@
 	}
 
     if($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
-        if(!in_array(getCodeFromId($TourId),$_SESSION["AUTH_COMP"])){
+        $AuthFiler = array();
+        if($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
+            $compList = array();
+            foreach ($_SESSION["AUTH_COMP"] as $comp) {
+                if(preg_match('/%/',$comp)) {
+                    $AuthFiler[] = 'ToCode LIKE ' . StrSafe_DB($comp);
+                } else {
+                    $compList[] = $comp;
+                }
+            }
+            if(count($compList)) {
+                $AuthFiler[] = 'FIND_IN_SET(ToCode, \'' . implode(',', $compList) . '\') != 0 ';
+            }
+        }
+        $q = safe_r_SQL("SELECT ToId FROM Tournament WHERE ToId=" .$TourId . ' AND (' . (count($AuthFiler) ? implode(' OR ', $AuthFiler) : 'FALSE'). ')');
+        if(safe_num_rows($q)!=1){
             CD_redirect($CFG->ROOT_DIR);
             exit;
         }
diff --git a/src/Tournament/TournamentImport.php b/src/Tournament/TournamentImport.php
index 57df5ad9..fc976be6 100644
--- a/src/Tournament/TournamentImport.php
+++ b/src/Tournament/TournamentImport.php
@@ -28,7 +28,20 @@
     }
 
     if($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
-        if(!in_array($importedToCode,$_SESSION["AUTH_COMP"])){
+        $compInList = false;
+        if($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
+            foreach ($_SESSION["AUTH_COMP"] as $comp) {
+                if($importedToCode===$comp) {
+                    $compInList = true;
+                } else {
+                    $pattern = str_replace('%', '.*', preg_quote($comp,'/'));
+                    if(preg_match("/^{$pattern}$/i", $importedToCode)) {
+                        $compInList = true;
+                    }
+                }
+            }
+        }
+        if(!$compInList){
             CD_redirect($CFG->ROOT_DIR);
             exit;
         }
diff --git a/src/Tournament/UpdateClassAge.php b/src/Tournament/UpdateClassAge.php
index f7fdddf7..68e91eac 100644
--- a/src/Tournament/UpdateClassAge.php
+++ b/src/Tournament/UpdateClassAge.php
@@ -6,13 +6,13 @@
 
 checkACL(AclCompetition, AclReadWrite, false);
 
-$JSON=array('error'=>1, 'clid'=>'', 'fromto' => '');
+$JSON=array('error'=>1, 'msg' => '');
 
 if (!CheckTourSession()
 		or !isset($_REQUEST['ClId'])
 		or !isset($_REQUEST['Age'])
-		or !isset($_REQUEST['FromTo'])
-		or ($_REQUEST['FromTo']!='From' and $_REQUEST['FromTo']!='To')
+		or !isset($_REQUEST['Field'])
+		or ($_REQUEST['Field']!='ClAgeFrom' and $_REQUEST['Field']!='ClAgeTo')
 		or IsBlocked(BIT_BLOCK_TOURDATA)
 		or defined('dontEditClassDiv')
 		) {
@@ -22,16 +22,13 @@
 $Age = intval($_REQUEST['Age']);
 $ClId = $_REQUEST['ClId'];
 
-$JSON['clid']=$ClId;
-$JSON['fromto']=$_REQUEST['FromTo'];
-
 $ClDivAllowed=(empty($_REQUEST['AlDivs']) ? '' : $_REQUEST['AlDivs']);
-if (!CheckClassAge($ClId, $Age, $_REQUEST['FromTo'], $ClDivAllowed)) {
+if (!CheckClassAge($ClId, $Age, $_REQUEST['Field']=='ClAgeFrom'?'From':'To', $ClDivAllowed)) {
 	JsonOut($JSON);
 }
 
 $Update = "UPDATE Classes SET "
-	. "ClAge" . $_REQUEST['FromTo'] . "=" . StrSafe_DB($Age) . " "
+    . $_REQUEST['Field'] . "=" . StrSafe_DB($Age) . " "
 	. ", ClDivisionsAllowed=" . StrSafe_DB($ClDivAllowed) . " "
 	. "WHERE ClId=" . StrSafe_DB($ClId) . " AND ClTournament=" . StrSafe_DB($_SESSION['TourId']) . "";
 safe_w_sql($Update);
diff --git a/src/Tournament/UpdateManDivClassField.php b/src/Tournament/UpdateManDivClassField.php
index 440654ac..bcdd679b 100644
--- a/src/Tournament/UpdateManDivClassField.php
+++ b/src/Tournament/UpdateManDivClassField.php
@@ -7,7 +7,7 @@
 define('debug',false);
 
 require_once(dirname(dirname(__FILE__)) . '/config.php');
-$JSON=array('error' => 1, 'which' => '#');
+$JSON=array('error' => 1);
 
 /*
 	- $Arr_Tables
@@ -26,17 +26,36 @@
 		or defined('dontEditClassDiv')
 		or empty($_REQUEST['Tab'])
 		or empty($_REQUEST['Field'])
+		or empty($_REQUEST['Id'])
 		or !isset($_REQUEST['Value'])
 		or !array_key_exists($_REQUEST['Tab'],$Arr_Tables)
 		) {
 	JsonOut($JSON);
 }
 
-$Key=$_REQUEST['Field'];
+$Id=$_REQUEST['Id'];
+$Field=$_REQUEST['Field'];
 $Value=$_REQUEST['Value'];
 
-if (substr($Key,0,2)!='d_') {
-	JsonOut($JSON);
+switch($Field) {
+    case 'DivDescription':
+    case 'DivIsPara':
+    case 'DivAthlete':
+    case 'DivViewOrder':
+    case 'ClSex':
+    case 'ClDescription':
+    case 'ClIsPara':
+    case 'ClAthlete':
+    case 'ClViewOrder':
+    case 'ScDescription':
+    case 'ScViewOrder':
+//    case '':
+//    case '':
+//    case '':
+//    case '':
+        break;
+    default:
+        JsonOut($JSON);
 }
 
 $tt=$Arr_Tables[$_REQUEST['Tab']][0];	// tabella su cui fare l'update
@@ -45,18 +64,12 @@
 $kk3=$Arr_Tables[$_REQUEST['Tab']][3];	// campo 3 da usare come chiave per l'update
 $kk4=$Arr_Tables[$_REQUEST['Tab']][4];	// campo 4 per resettare info del default
 
-$Field='';
-$Id='';
 $ClDivAllowed='';
 
-$tmp=explode('_',$Key);
-$Field=$tmp[1];
-$Id=$tmp[2];
-if(!empty($tmp[3])) $ClDivAllowed=$tmp[3];
-
-if(!preg_match('/^[0-9a-z_]+$/i', $Field)) {
-	JsonOut($JSON);
-}
+//$tmp=explode('_',$Key);
+//$Field=$tmp[1];
+//$Id=$tmp[2];
+//if(!empty($tmp[3])) $ClDivAllowed=$tmp[3];
 
 $Update
 	= "UPDATE " . $tt . " SET "
@@ -72,12 +85,12 @@
 		if($Field=='ClAthlete') safe_w_sql("Update Entries left join Divisions on EnTournament=DivTournament and EnDivision=DivId set EnAthlete=DivAthlete+0 where EnTournament={$_SESSION['TourId']} and EnClass='$Id'");
 		elseif($Field=='DivAthlete') safe_w_sql("Update Entries left join Classes on EnTournament=ClTournament and EnClass=ClId set EnAthlete=ClAthlete+0 where EnTournament={$_SESSION['TourId']} and EnDivision='$Id'");
 	} else {
-		if($Field=='ClAthlete') safe_w_sql("Update Entries set EnAthlete='' where EnTournament={$_SESSION['TourId']} and EnClass='$Id'");
-		elseif($Field=='DivAthlete') safe_w_sql("Update Entries set EnAthlete='' where EnTournament={$_SESSION['TourId']} and EnDivision='$Id'");
+		if($Field=='ClAthlete') safe_w_sql("Update Entries set EnAthlete=0 where EnTournament={$_SESSION['TourId']} and EnClass='$Id'");
+		elseif($Field=='DivAthlete') safe_w_sql("Update Entries set EnAthlete=0 where EnTournament={$_SESSION['TourId']} and EnDivision='$Id'");
 	}
 }
 
 $JSON['error']=0;
-$JSON['which']=$Key;
+$JSON['value']=$Value;
 
 JsonOut($JSON);
diff --git a/src/Tournament/UploadResults-upload.php b/src/Tournament/UploadResults-upload.php
index d24b54ba..211e97bb 100644
--- a/src/Tournament/UploadResults-upload.php
+++ b/src/Tournament/UploadResults-upload.php
@@ -178,7 +178,7 @@
 		if($IsRunArchery) {
 			$RET->ENA=getRunEntries($ORIS, '', 'Alpha');
 		} else {
-			$RET->ENA=getStartListAlphabetical($ORIS);
+			$RET->ENA=getStartListAlphabetical($ORIS, true);
 		}
     }
 
@@ -359,6 +359,10 @@
     if(!empty($_REQUEST['RobinTeam'])) foreach($_REQUEST['RobinTeam'] as $Event) $RET->delete[]=''.$Event; // Round Robin, Team
     if(!empty($_REQUEST['MEDSTD'])) $RET->delete[]='MEDSTD'; // Medal standing
     if(!empty($_REQUEST['MEDLST'])) $RET->delete[]='MEDLST'; // Medallists
+    if(!empty($_REQUEST['RECSTD'])) $RET->delete[]='SRECSTD'; // Record Standing
+    if(!empty($_REQUEST['RECBRK'])) $RET->delete[]='SRECBRK'; // Record Broken
+    if(!empty($_REQUEST['STF'])) $RET->delete[]='STF'; // Record Broken
+    if(!empty($_REQUEST['BOOK'])) $RET->delete[]='BOOK'; // Record Broken
 }
 
 $postdata = http_build_query( array(
diff --git a/src/Tournament/index-getIskConfig.php b/src/Tournament/index-getIskConfig.php
index c3537a39..fe6da302 100644
--- a/src/Tournament/index-getIskConfig.php
+++ b/src/Tournament/index-getIskConfig.php
@@ -8,13 +8,6 @@
 $JSON=array('html' => '');
 
 switch($_REQUEST['api']) {
-	case 'lite':
-	case 'pro':
-		$JSON['html'].=getConfigString($CFG->DOCUMENT_PATH.'Api/ISK/ApiConfig.php');
-		break;
-	case 'live':
-		$JSON['html'].=getConfigString($CFG->DOCUMENT_PATH.'Api/ISK-Live/ApiConfig.php');
-		break;
     case 'ng-lite':
     case 'ng-pro':
     case 'ng-live':
diff --git a/src/Update/ExportAllCompetitions.php b/src/Update/ExportAllCompetitions.php
new file mode 100644
index 00000000..2423aa73
--- /dev/null
+++ b/src/Update/ExportAllCompetitions.php
@@ -0,0 +1,52 @@
+<?php
+
+require_once(dirname(__FILE__, 2) . '/config.php');
+checkACL(AclRoot, AclReadWrite);
+
+if(!empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
+    CD_redirect($CFG->ROOT_DIR.'noAccess.php');
+}
+
+require_once('Common/Fun_Export.php');
+//$TourId=$_SESSION['TourId'];
+//EraseTourSession();
+
+// prepare the dir we will export to
+$TempDir=dirname(__DIR__).'/Tournament/TmpDownload/ianseo_'.mt_rand(100000, mt_getrandmax());
+if((is_dir($TempDir) and !rmdir($TempDir)) or (file_exists($TempDir) and !unlink($TempDir))) {
+    die('Could not prepare temporary directory');
+}
+
+if(!mkdir($TempDir)) {
+    die('Could not create temporary directory');
+}
+$TempDir.='/';
+
+$zip = new ZipArchive;
+$download = 'IanseoCompetitions.zip';
+$zip->open($TempDir.$download, ZipArchive::CREATE);
+
+$Sql = "SELECT ToId, ToCode from Tournament";
+$q=safe_r_SQL($Sql);
+while($r=safe_fetch($q)) {
+    ini_set('max_execution_time','240');
+    $Gara = export_tournament($r->ToId, true);
+    $ToSave = gzcompress(serialize($Gara),9);
+    file_put_contents($TempDir.$r->ToCode.".ianseo", $ToSave);
+    $zip->addFile($TempDir.$r->ToCode.".ianseo", $r->ToCode.".ianseo");
+}
+$zip->close();
+
+// send the zip file
+header('Content-Type: application/zip');
+header("Content-Disposition: attachment; filename = $download");
+header('Content-Length: ' . filesize($TempDir.$download));
+readfile($TempDir.$download);
+
+// Cleanup all the ianseo files
+foreach(glob($TempDir.'*.ianseo') as $filename) {
+    unlink($filename);
+}
+
+unlink($TempDir.$download);
+rmdir($TempDir);
diff --git a/src/Update/index-action.php b/src/Update/index-action.php
index 2bbb749c..5f3741c1 100644
--- a/src/Update/index-action.php
+++ b/src/Update/index-action.php
@@ -61,6 +61,10 @@
         $IN_PHP=true;
         require_once('./UpdateIanseo.php');
         break;
+    case 'updateInnoDb':
+        $JSON['msg']=UpdateToInnoDb(true);
+        $JSON['error']=($JSON['msg']?1:0);
+        break;
 }
 
 JsonOut($JSON);
diff --git a/src/Update/index.js b/src/Update/index.js
index 14ed4ab5..5116d542 100644
--- a/src/Update/index.js
+++ b/src/Update/index.js
@@ -69,3 +69,20 @@ function closeDialog() {
     $('#UpdateBox').remove();
     location.href='../'
 }
+
+function doInnoDbUpdate() {
+    // show turning ianseo...
+    toggleSpinningIanseo(true);
+    let form={
+        act:'updateInnoDb'
+    }
+    $.getJSON('index-action.php', form).always(function(data) {
+        if(data.msg!='') {
+            doAlert(data.msg);
+        }
+        toggleSpinningIanseo(false);
+        $('#InnoDbUpdateTable').addClass('d-none');
+        $('#UpdateTable').removeClass('d-none');
+    })
+}
+
diff --git a/src/Update/index.php b/src/Update/index.php
index 25e87060..65f54cc2 100644
--- a/src/Update/index.php
+++ b/src/Update/index.php
@@ -8,6 +8,15 @@
     CD_redirect($CFG->ROOT_DIR.'noAccess.php');
 }
 
+// check if a major update of Mysql is needed!
+$NeedsUpdate='';
+$UpdateMessage=UpdateToInnoDb(false);
+if($UpdateMessage===true) {
+    // DB needs to be updated!
+    $NeedsUpdate='<div class="alert alert-danger bold">'.get_text('MysqlInnoDbProcess', 'Errors').'</div>';
+    $UpdateMessage= '';
+}
+
 require_once('Common/Lib/CommonLib.php');
 $IncludeJquery = true;
 $JS_SCRIPT=array(
@@ -17,6 +26,7 @@
     )),
     '<link rel="stylesheet" href="index.css">',
     '<script src="./index.js"></script>',
+    '<script src="../Common/js/Fun_JS.inc.js"></script>',
 );
 
 include('Common/Templates/head.php');
@@ -25,17 +35,36 @@
 
 $f=@fopen($FileToCheck, 'w');
 if($f) {
-	echo '<div class="Center">';
-	echo '<table class="Tabella" style="width:50%">';
-    echo '<tr><td colspan="2">'.get_text('UpdatePrepared', 'Install').'</td></tr>';
-	if(!in_array(ProgramRelease, array('STABLE','FITARCO')) or isset($_GET['testing'])) {
-		//@include('Modules/IanseoTeam/IanseoFeatures/isIanseoTeam.php');
-    	echo '<tr><th colspan="2">'.get_text('SpecialUpdate', 'Install').'</th></tr>';
-		echo '<tr><th>' . get_text('Email','Install') . '</th><td><input type="text" name="Email" id="Email"  class="w-100"></td></tr>';
-	}
-	echo '<tr><td class="Center" colspan="2"><input type="button" value="' . get_text('CmdOk') . '" onclick="doUpdate()"></td></tr>';
-	echo '</table>';
-	echo '</form>';
+    echo '<div class="Center" style="width:50%;margin:auto;margin-top:2em">
+        <div class="alert alert-warning bold">
+            <div>'.get_text('BackupTournaments', 'Errors').'</div>';
+    if(in_array('zip',get_loaded_extensions())) {
+        echo '<div class="Button mt-3" onclick="exportAllCompetitions()">' . get_text('ExportAllComps', 'Install') . '</div>';
+    } else {
+        echo '<div class="mt-2">'.get_text('MissingZipExtension', 'Errors').'</div>';;
+    }
+
+    echo '</div>'
+        .$UpdateMessage;
+    if($NeedsUpdate) {
+        echo '<div id="InnoDbUpdateTable">
+            '.$NeedsUpdate.'
+            <div><input type="button" value="' . get_text('CmdOk') . '" onclick="doInnoDbUpdate()"></div>
+            </div>';
+    }
+
+    echo '<div id="UpdateTable" class="text-small '.($NeedsUpdate ? 'd-none' : '').'">
+        <div class="alert alert-success">'.get_text('UpdatePrepared', 'Install') .'</div>';
+
+    if(!in_array(ProgramRelease, array('STABLE','FITARCO')) or isset($_GET['testing'])) {
+        echo '<div class="alert alert-info mt-2">
+            <div>'.get_text('SpecialUpdate', 'Install').'</div>
+            <div style="display:flex" class="mt-2"><div class="w-30 text-right">' . get_text('Email','Install') . ':</div><div class="w-70"><input type="text" name="Email" id="Email"  class="w-100"></div></div>
+            </div>';
+    }
+
+    echo '<div class="alert"><input type="button" value="' . get_text('CmdOk') . '" onclick="doUpdate()"></div>';
+	echo '</div>';
 	echo '</div>';
 	fclose($f);
 	unlink($FileToCheck);
diff --git a/src/index.php b/src/index.php
index edab74b2..95704ee4 100644
--- a/src/index.php
+++ b/src/index.php
@@ -19,6 +19,7 @@
 
 include('Common/Templates/head.php');
 
+echo checkPhpVersion(true);
 
 ?>
 <table class="Tabella">
@@ -56,27 +57,44 @@
 <tr><td colspan="6"><a class="Link" href="<?php echo $CFG->ROOT_DIR ?>Tournament/index.php?New="><?php print get_text('NewTour', 'Tournament');?></a></td></tr>
 <tr class="Divider"><td colspan="6"></td></tr>
 <?php
-/*$Select
-    = "SELECT ToId,ToType,ToCode,ToName,ToCommitee,ToComDescr,ToWhere,DATE_FORMAT(ToWhenFrom,'" . get_text('DateFmtDB') . "') AS DtFrom, "
-    . "DATE_FORMAT(ToWhenTo,'" . get_text('DateFmtDB') . "') AS DtTo,TtName,TtNumDist "
-    . "FROM Tournament LEFT JOIN Tournament*Type ON ToType=TtId "
-    . "ORDER BY ToWhenTo DESC, ToWhenFrom DESC, ToCode ASC";*/
+$AuthFiler = array();
+if($CFG->USERAUTH){
+    if(empty($_SESSION['AUTH_User'])) {
+        echo '<tr><th colspan="6"><a class="Link" href="'.$CFG->ROOT_DIR .'Modules/Authentication/LogIn.php">'.get_text('Login', 'Tournament').'</a></th></tr>';
+        echo '<tr class="Divider"><td colspan="6"></td></tr>';
+    }
+    if(!empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) {
+        $compList = array();
+        foreach (($_SESSION["AUTH_COMP"] ?? array()) as $comp) {
+            if (str_contains($comp, '%')) {
+                $AuthFiler[] = 'ToCode LIKE ' . StrSafe_DB($comp);
+            } else {
+                $compList[] = $comp;
+            }
+        }
+        if (count($compList)) {
+            $AuthFiler[] = 'FIND_IN_SET(ToCode, \'' . implode(',', $compList) . '\') != 0 ';
+        } else {
+            $AuthFiler[] = "ToCode IS NULL ";
+        }
+    }
+}
 $Select
     = "SELECT ToId,ToType,ToCode,ToName,ToCommitee,ToComDescr,ToWhere,DATE_FORMAT(ToWhenFrom,'" . get_text('DateFmtDB') . "') AS DtFrom, "
     . "DATE_FORMAT(ToWhenTo,'" . get_text('DateFmtDB') . "') AS DtTo,ToTypeName AS TtName,ToNumDist AS TtNumDist "
     . "FROM Tournament "
-    . (($CFG->USERAUTH AND !empty($_SESSION['AUTH_ENABLE']) AND empty($_SESSION['AUTH_ROOT'])) ? 'WHERE FIND_IN_SET(ToCode, \'' . implode(',',$_SESSION["AUTH_COMP"]) . '\') != 0 ' : '')
+    . (count($AuthFiler) ? 'WHERE ' . implode(' OR ', $AuthFiler) : '')
     . "ORDER BY ToWhenTo DESC, ToWhenFrom DESC, ToCode ASC";
 $Rs=safe_r_sql($Select);
 //print $Select;
 if (safe_num_rows($Rs)>0) {
     echo '<tr>
-        <th class="Title" width="5%">&nbsp;</th>
-        <th class="Title" width="10%">'.get_text('TourCode','Tournament').'</th>
-        <th class="Title" width="30%">'.get_text('TourName','Tournament').'</th>
-        <th class="Title" width="20%">'.get_text('TourCommitee','Tournament').'</th>
-        <th class="Title" width="18%">'.get_text('TourWhere','Tournament').'</th>
-        <th class="Title" width="17%">'.get_text('TourWhen','Tournament').'</th>
+        <th class="Title w-5">&nbsp;</th>
+        <th class="Title w-10">'.get_text('TourCode','Tournament').'</th>
+        <th class="Title w-30">'.get_text('TourName','Tournament').'</th>
+        <th class="Title w-20">'.get_text('TourCommitee','Tournament').'</th>
+        <th class="Title w-20">'.get_text('TourWhere','Tournament').'</th>
+        <th class="Title w-15">'.get_text('TourWhen','Tournament').'</th>
         </tr>';
     while ($MyRow=safe_fetch($Rs)) {
         print '<tr>';
@@ -88,8 +106,6 @@
         print '<td>' . get_text('From','Tournament') . ' ' . $MyRow->DtFrom . ' ' . get_text('To','Tournament') . ' ' . $MyRow->DtTo . '</td>';
         print '</tr>' . "\n";
     }
-} else {
-    echo '<tr><td colspan="6" class="Bold Center">'.get_text('NoTourExists', 'Tournament').'</td></tr>';
 }
 
 echo '</table>';
diff --git a/src/info.php b/src/info.php
index 968c8df7..c244a430 100644
--- a/src/info.php
+++ b/src/info.php
@@ -1,3 +1,4 @@
 <?php
+require_once('./config.php');
 phpinfo();
 ?>
\ No newline at end of file